Merge pull request #1887 from swiftlang/revert-1877-AddSourceOnlyImportDeps

Revert "[Explicit Module Builds] Adopt new direct-import field for Swift source modules"

Author: mikeash

Sources/CSwiftScan/include/swiftscan_header.h

@@ -141,8 +141,6 @@ typedef struct {
   (*swiftscan_swift_textual_detail_get_is_framework)(swiftscan_module_details_t);
   swiftscan_string_set_t *
   (*swiftscan_swift_textual_detail_get_swift_overlay_dependencies)(swiftscan_module_details_t);
-  swiftscan_string_set_t *
-  (*swiftscan_swift_textual_detail_get_swift_source_import_module_dependencies)(swiftscan_module_details_t);
   swiftscan_string_ref_t
   (*swiftscan_swift_textual_detail_get_module_cache_key)(swiftscan_module_details_t);
   swiftscan_string_ref_t

Sources/SwiftDriver/ExplicitModuleBuilds/InterModuleDependencies/InterModuleDependencyGraph.swift

@@ -136,10 +136,7 @@ public struct SwiftModuleDetails: Codable, Hashable {
   public var isFramework: Bool?
 
   /// A set of Swift Overlays of Clang Module Dependencies
-  public var swiftOverlayDependencies: [ModuleDependencyId]?
-
-  /// A set of directly-imported in source module dependencies
-  public var sourceImportDependencies: [ModuleDependencyId]?
+  var swiftOverlayDependencies: [ModuleDependencyId]?
 
   /// The module cache key of the output module.
   public var moduleCacheKey: String?

Sources/SwiftDriver/ExplicitModuleBuilds/InterModuleDependencies/InterModuleDependencyOracle.swift

@@ -147,13 +147,6 @@ public class InterModuleDependencyOracle {
     return swiftScan.supportsLinkLibraries
   }
 
-  @_spi(Testing) public func supportsSeparateImportOnlyDependencise() throws -> Bool {
-    guard let swiftScan = swiftScanLibInstance else {
-      fatalError("Attempting to query supported scanner API with no scanner instance.")
-    }
-    return swiftScan.supportsSeparateImportOnlyDependencise
-  }
-
   @_spi(Testing) public func getScannerDiagnostics() throws -> [ScannerDiagnosticPayload]? {
     guard let swiftScan = swiftScanLibInstance else {
       fatalError("Attempting to reset scanner cache with no scanner instance.")

Sources/SwiftDriver/SwiftScan/DependencyGraphBuilder.swift

@@ -200,16 +200,6 @@ private extension SwiftScan {
       swiftOverlayDependencies = nil
     }
 
-    let sourceImportedDependencies: [ModuleDependencyId]?
-    if supportsSeparateImportOnlyDependencise,
-       let encodedImportedDepsRef = api.swiftscan_swift_textual_detail_get_swift_source_import_module_dependencies(moduleDetailsRef) {
-      let encodedImportedDepsendencies = try toSwiftStringArray(encodedImportedDepsRef.pointee)
-      sourceImportedDependencies =
-        try encodedImportedDepsendencies.map { try decodeModuleNameAndKind(from: $0, moduleAliases: moduleAliases) }
-    } else {
-      sourceImportedDependencies = nil
-    }
-
     return SwiftModuleDetails(moduleInterfacePath: moduleInterfacePath,
                               compiledModuleCandidates: compiledModuleCandidates,
                               bridgingHeader: bridgingHeader,
@@ -218,7 +208,6 @@ private extension SwiftScan {
                               contextHash: contextHash,
                               isFramework: isFramework,
                               swiftOverlayDependencies: swiftOverlayDependencies,
-                              sourceImportDependencies: sourceImportedDependencies,
                               moduleCacheKey: moduleCacheKey,
                               chainedBridgingHeaderPath: chainedBridgingHeaderPath,
                               chainedBridgingHeaderContent: chainedBridgingHeaderContent)

Sources/SwiftDriver/SwiftScan/SwiftScan.swift

@@ -246,10 +246,6 @@ private extension String {
     return api.swiftscan_swift_textual_detail_get_swift_overlay_dependencies != nil
   }
 
-  @_spi(Testing) public var supportsSeparateImportOnlyDependencise: Bool {
-    return api.swiftscan_swift_textual_detail_get_swift_source_import_module_dependencies != nil
-  }
-
   @_spi(Testing) public var supportsScannerDiagnostics : Bool {
     return api.swiftscan_scanner_diagnostics_query != nil &&
            api.swiftscan_scanner_diagnostics_reset != nil &&
@@ -577,10 +573,6 @@ private extension swiftscan_functions_t {
     self.swiftscan_swift_textual_detail_get_swift_overlay_dependencies =
       loadOptional("swiftscan_swift_textual_detail_get_swift_overlay_dependencies")
 
-    // Directly-imported source dependencies
-    self.swiftscan_swift_textual_detail_get_swift_source_import_module_dependencies =
-      loadOptional("swiftscan_swift_textual_detail_get_swift_source_import_module_dependencies")
-
     // Header dependencies of binary modules
     self.swiftscan_swift_binary_detail_get_header_dependencies =
       loadOptional("swiftscan_swift_binary_detail_get_header_dependencies")

Tests/SwiftDriverTests/ExplicitModuleBuildTests.swift

@@ -619,30 +619,18 @@ final class ExplicitModuleBuildTests: XCTestCase {
                                      "-I", stdlibPath.nativePathString(escaped: true),
                                      "-I", shimsPath.nativePathString(escaped: true),
                                      "-explicit-module-build",
-                                     "-disable-implicit-concurrency-module-import",
-                                     "-disable-implicit-string-processing-module-import",
                                      "-import-objc-header", bridgingHeaderpath.nativePathString(escaped: true),
                                      main.nativePathString(escaped: true)] + sdkArgumentsForTesting)
 
       let jobs = try driver.planBuild()
       // Figure out which Triples to use.
       let dependencyGraph = try driver.gatherModuleDependencies()
       let mainModuleInfo = try dependencyGraph.moduleInfo(of: .swift("testExplicitModuleBuildJobs"))
-
-      guard case .swift(let mainModuleDetails) = mainModuleInfo.details else {
+      guard case .swift(_) = mainModuleInfo.details else {
         XCTFail("Main module does not have Swift details field")
         return
       }
 
-      if try driver.interModuleDependencyOracle.supportsSeparateImportOnlyDependencise() {
-          let directImportedDependencies = try XCTUnwrap(mainModuleDetails.sourceImportDependencies)
-        XCTAssertEqual(mainModuleDetails.sourceImportDependencies, [.swift("Swift"),
-                                                                    .swift("SwiftOnoneSupport"),
-                                                                    .swift("E"),
-                                                                    .swift("G"),
-                                                                    .clang("C")])
-      }
-
       for job in jobs {
         XCTAssertEqual(job.outputs.count, 1)
         let outputFilePath = job.outputs[0].file
@@ -662,6 +650,12 @@ final class ExplicitModuleBuildTests: XCTestCase {
           } else if pathMatchesSwiftModule(path: outputFilePath, "Swift") {
             try checkExplicitModuleBuildJob(job: job, moduleId: .swift("Swift"),
                                             dependencyGraph: dependencyGraph)
+          } else if pathMatchesSwiftModule(path: outputFilePath, "_Concurrency") {
+            try checkExplicitModuleBuildJob(job: job, moduleId: .swift("_Concurrency"),
+                                            dependencyGraph: dependencyGraph)
+          } else if pathMatchesSwiftModule(path: outputFilePath, "_StringProcessing") {
+            try checkExplicitModuleBuildJob(job: job, moduleId: .swift("_StringProcessing"),
+                                            dependencyGraph: dependencyGraph)
           } else if pathMatchesSwiftModule(path: outputFilePath, "SwiftOnoneSupport") {
             try checkExplicitModuleBuildJob(job: job, moduleId: .swift("SwiftOnoneSupport"),
                                             dependencyGraph: dependencyGraph)