Merge pull request #34291 from artemcm/NeverForgetAnArgument

[Dependency Scanner] Always add NonPathCommandLine arguments from Clang scan-deps result

Author: artemcm

lib/ClangImporter/ClangModuleDependencyScanner.cpp

@@ -245,6 +245,15 @@ void ClangImporter::recordModuleDependencies(
       }
     }
 
+    // Add all args the non-path arguments required to be passed in, according
+    // to the Clang scanner
+    for (const auto &clangArg : clangModuleDep.NonPathCommandLine) {
+      swiftArgs.push_back("-Xcc");
+      swiftArgs.push_back("-Xclang");
+      swiftArgs.push_back("-Xcc");
+      swiftArgs.push_back(clangArg);
+    }
+
     // Swift frontend action: -emit-pcm
     swiftArgs.push_back("-emit-pcm");
     swiftArgs.push_back("-module-name");

test/ScanDependencies/Inputs/CHeaders/module.modulemap

@@ -8,7 +8,7 @@ module B {
   export *
 }
 
-module C {
+module C [system] {
   header "C.h"
   export *
 }

test/ScanDependencies/module_deps.swift

@@ -105,6 +105,10 @@ import SubE
 // CHECK-NEXT: "-only-use-extra-clang-opts"
 // CHECK-NEXT: "-Xcc"
 // CHECK-NEXT: "clang"
+// CHECK:      "-fsystem-module",
+// CHECK-NEXT: "-emit-pcm",
+// CHECK-NEXT: "-module-name",
+// CHECK-NEXT: "C"
 
 /// --------Swift module E
 // CHECK: "swift": "E"