Merge pull request #841 from artemcm/NoPCHHandleInScan

[Dependency Scanning] Do not include PCH-handling command-line flags on the scanning jobs

Author: artemcm

Sources/SwiftDriver/ExplicitModuleBuilds/ModuleDependencyScanning.swift

@@ -48,7 +48,7 @@ public extension Driver {
     commandLine.appendFlag("-frontend")
     commandLine.appendFlag("-scan-dependencies")
     try addCommonFrontendOptions(commandLine: &commandLine, inputs: &inputs,
-                                 bridgingHeaderHandling: .precompiled,
+                                 bridgingHeaderHandling: .ignored,
                                  moduleDependencyGraphUse: .dependencyScan)
     // FIXME: MSVC runtime flags
 
@@ -223,7 +223,7 @@ public extension Driver {
     commandLine.appendFlag("-scan-dependencies")
     commandLine.appendFlag("-import-prescan")
     try addCommonFrontendOptions(commandLine: &commandLine, inputs: &inputs,
-                                 bridgingHeaderHandling: .precompiled,
+                                 bridgingHeaderHandling: .ignored,
                                  moduleDependencyGraphUse: .dependencyScan)
     // FIXME: MSVC runtime flags
 
@@ -254,7 +254,7 @@ public extension Driver {
     commandLine.appendFlag("-frontend")
     commandLine.appendFlag("-scan-dependencies")
     try addCommonFrontendOptions(commandLine: &commandLine, inputs: &inputs,
-                                 bridgingHeaderHandling: .precompiled,
+                                 bridgingHeaderHandling: .ignored,
                                  moduleDependencyGraphUse: .dependencyScan)
 
     let batchScanInputFilePath = try serializeBatchScanningModuleArtifacts(moduleInfos: moduleInfos)

Tests/SwiftDriverTests/ExplicitModuleBuildTests.swift

@@ -758,6 +758,7 @@ final class ExplicitModuleBuildTests: XCTestCase {
       var driver = try Driver(args: ["swiftc",
                                      "-I", cHeadersPath,
                                      "-I", swiftModuleInterfacesPath,
+                                     "-import-objc-header",
                                      "-experimental-explicit-module-build",
                                      "-working-directory", path.pathString,
                                      "-disable-clang-target",
@@ -772,6 +773,9 @@ final class ExplicitModuleBuildTests: XCTestCase {
         scannerCommand.removeFirst()
       }
 
+      // Ensure we do not propagate the ususal PCH-handling arguments to the scanner invocation
+      XCTAssertFalse(scannerCommand.contains("-pch-output-dir"))
+
       // Here purely to dump diagnostic output in a reasonable fashion when things go wrong.
       let lock = NSLock()