Skip to content

[SwiftScan] Fix headerDependencies in SwiftPrebuiltExternalModuleDetails #1633

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 12, 2024
Merged

[SwiftScan] Fix headerDependencies in SwiftPrebuiltExternalModuleDetails #1633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions Sources/CSwiftScan/include/swiftscan_header.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,15 +165,19 @@ typedef struct {
(*swiftscan_swift_binary_detail_get_module_doc_path)(swiftscan_module_details_t);
swiftscan_string_ref_t
(*swiftscan_swift_binary_detail_get_module_source_info_path)(swiftscan_module_details_t);
swiftscan_string_set_t *
(*swiftscan_swift_binary_detail_get_header_dependencies)(swiftscan_module_details_t);
swiftscan_string_ref_t
(*swiftscan_swift_binary_detail_get_header_dependency)(swiftscan_module_details_t);
bool
(*swiftscan_swift_binary_detail_get_is_framework)(swiftscan_module_details_t);
swiftscan_string_ref_t
(*swiftscan_swift_binary_detail_get_module_cache_key)(swiftscan_module_details_t);
swiftscan_string_set_t *
(*swiftscan_swift_binary_detail_get_header_dependency_module_dependencies)(swiftscan_module_details_t);

//=== Swift Binary Module Details deprecated APIs--------------------------===//
swiftscan_string_set_t *
(*swiftscan_swift_binary_detail_get_header_dependencies)(swiftscan_module_details_t);

//=== Swift Placeholder Module Details query APIs -------------------------===//
swiftscan_string_ref_t
(*swiftscan_swift_placeholder_detail_get_compiled_module_path)(swiftscan_module_details_t);
Expand Down
2 changes: 1 addition & 1 deletion ...wiftDriver/ExplicitModuleBuilds/InterModuleDependencies/InterModuleDependencyOracle.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ public class InterModuleDependencyOracle {
guard let swiftScan = swiftScanLibInstance else {
fatalError("Attempting to query supported scanner API with no scanner instance.")
}
return swiftScan.supportsBinaryModuleHeaderDependencies
return swiftScan.supportsBinaryModuleHeaderDependencies || swiftScan.supportsBinaryModuleHeaderDependency
}

@_spi(Testing) public func supportsBridgingHeaderPCHCommand() throws -> Bool {
Expand Down
4 changes: 4 additions & 0 deletions Sources/SwiftDriver/SwiftScan/DependencyGraphBuilder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,10 @@ private extension SwiftScan {
if supportsBinaryModuleHeaderDependencies {
headerDependencies = try getOptionalPathArrayDetail(from: moduleDetailsRef,
using: api.swiftscan_swift_binary_detail_get_header_dependencies)
} else if supportsBinaryModuleHeaderDependency,
let header = try getOptionalPathDetail(from: moduleDetailsRef,
using: api.swiftscan_swift_binary_detail_get_header_dependency) {
headerDependencies = [header]
} else {
headerDependencies = nil
}
Expand Down
6 changes: 6 additions & 0 deletions Sources/SwiftDriver/SwiftScan/SwiftScan.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,10 @@ private extension String {
return api.swiftscan_swift_binary_detail_get_header_dependencies != nil
}

@_spi(Testing) public var supportsBinaryModuleHeaderDependency : Bool {
return api.swiftscan_swift_binary_detail_get_header_dependency != nil
}

@_spi(Testing) public var supportsStringDispose : Bool {
return api.swiftscan_string_dispose != nil
}
Expand Down Expand Up @@ -655,6 +659,8 @@ private extension swiftscan_functions_t {
// Header dependencies of binary modules
self.swiftscan_swift_binary_detail_get_header_dependencies =
try loadOptional("swiftscan_swift_binary_detail_get_header_dependencies")
self.swiftscan_swift_binary_detail_get_header_dependency =
try loadOptional("swiftscan_swift_binary_detail_get_header_dependency")

// Per-scan-query diagnostic output
self.swiftscan_dependency_graph_get_diagnostics =
Expand Down