Merge pull request #1634 from cachemeifyoucan/eng/PR-129703095-swift-6.0

Author: nkcsgexi

Sources/CSwiftScan/include/swiftscan_header.h

@@ -150,15 +150,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);

Sources/SwiftDriver/ExplicitModuleBuilds/InterModuleDependencies/InterModuleDependencyOracle.swift

@@ -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 {

Sources/SwiftDriver/SwiftScan/DependencyGraphBuilder.swift

@@ -239,6 +239,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
     }

Sources/SwiftDriver/SwiftScan/SwiftScan.swift

@@ -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
   }
@@ -643,6 +647,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 =