File tree 4 files changed +17
-3
lines changed
ExplicitModuleBuilds/InterModuleDependencies
4 files changed +17
-3
lines changed Original file line number Diff line number Diff line change @@ -165,15 +165,19 @@ typedef struct {
165
165
(* swiftscan_swift_binary_detail_get_module_doc_path )(swiftscan_module_details_t );
166
166
swiftscan_string_ref_t
167
167
(* swiftscan_swift_binary_detail_get_module_source_info_path )(swiftscan_module_details_t );
168
- swiftscan_string_set_t *
169
- (* swiftscan_swift_binary_detail_get_header_dependencies )(swiftscan_module_details_t );
168
+ swiftscan_string_ref_t
169
+ (* swiftscan_swift_binary_detail_get_header_dependency )(swiftscan_module_details_t );
170
170
bool
171
171
(* swiftscan_swift_binary_detail_get_is_framework )(swiftscan_module_details_t );
172
172
swiftscan_string_ref_t
173
173
(* swiftscan_swift_binary_detail_get_module_cache_key )(swiftscan_module_details_t );
174
174
swiftscan_string_set_t *
175
175
(* swiftscan_swift_binary_detail_get_header_dependency_module_dependencies )(swiftscan_module_details_t );
176
176
177
+ //=== Swift Binary Module Details deprecated APIs--------------------------===//
178
+ swiftscan_string_set_t *
179
+ (* swiftscan_swift_binary_detail_get_header_dependencies )(swiftscan_module_details_t );
180
+
177
181
//=== Swift Placeholder Module Details query APIs -------------------------===//
178
182
swiftscan_string_ref_t
179
183
(* swiftscan_swift_placeholder_detail_get_compiled_module_path )(swiftscan_module_details_t );
Original file line number Diff line number Diff line change @@ -150,7 +150,7 @@ public class InterModuleDependencyOracle {
150
150
guard let swiftScan = swiftScanLibInstance else {
151
151
fatalError ( " Attempting to query supported scanner API with no scanner instance. " )
152
152
}
153
- return swiftScan. supportsBinaryModuleHeaderDependencies
153
+ return swiftScan. supportsBinaryModuleHeaderDependencies || swiftScan . supportsBinaryModuleHeaderDependency
154
154
}
155
155
156
156
@_spi ( Testing) public func supportsBridgingHeaderPCHCommand( ) throws -> Bool {
Original file line number Diff line number Diff line change @@ -264,6 +264,10 @@ private extension SwiftScan {
264
264
if supportsBinaryModuleHeaderDependencies {
265
265
headerDependencies = try getOptionalPathArrayDetail ( from: moduleDetailsRef,
266
266
using: api. swiftscan_swift_binary_detail_get_header_dependencies)
267
+ } else if supportsBinaryModuleHeaderDependency,
268
+ let header = try getOptionalPathDetail ( from: moduleDetailsRef,
269
+ using: api. swiftscan_swift_binary_detail_get_header_dependency) {
270
+ headerDependencies = [ header]
267
271
} else {
268
272
headerDependencies = nil
269
273
}
Original file line number Diff line number Diff line change @@ -298,6 +298,10 @@ private extension String {
298
298
return api. swiftscan_swift_binary_detail_get_header_dependencies != nil
299
299
}
300
300
301
+ @_spi ( Testing) public var supportsBinaryModuleHeaderDependency : Bool {
302
+ return api. swiftscan_swift_binary_detail_get_header_dependency != nil
303
+ }
304
+
301
305
@_spi ( Testing) public var supportsStringDispose : Bool {
302
306
return api. swiftscan_string_dispose != nil
303
307
}
@@ -655,6 +659,8 @@ private extension swiftscan_functions_t {
655
659
// Header dependencies of binary modules
656
660
self . swiftscan_swift_binary_detail_get_header_dependencies =
657
661
try loadOptional ( " swiftscan_swift_binary_detail_get_header_dependencies " )
662
+ self . swiftscan_swift_binary_detail_get_header_dependency =
663
+ try loadOptional ( " swiftscan_swift_binary_detail_get_header_dependency " )
658
664
659
665
// Per-scan-query diagnostic output
660
666
self . swiftscan_dependency_graph_get_diagnostics =
You can’t perform that action at this time.
0 commit comments