[Clang][ScanDeps] Actually pass the non path command line modifications.

Author: Bigcheese

clang/lib/Tooling/DependencyScanning/DependencyScanningTool.cpp

@@ -128,6 +128,11 @@ DependencyScanningTool::getFullDependencies(
         if (MD.ImportedByMainFile)
           FD.ClangModuleDeps.push_back({MD.ModuleName, ContextHash});
       }
+      
+      FD.AdditionalNonPathCommandLine = {
+        "-fno-implicit-modules",
+        "-fno-implicit-module-maps",
+      };
 
       FullDependenciesResult FDR;
 

clang/lib/Tooling/DependencyScanning/ModuleDepCollector.cpp

@@ -53,8 +53,6 @@ void dependencies::detail::appendCommonModuleArguments(
         }
       };
 
-  Result.push_back("-fno-implicit-modules");
-  Result.push_back("-fno-implicit-module-maps");
   AddArgs(Modules);
 }
 
@@ -159,6 +157,10 @@ void ModuleDepCollectorPP::handleTopLevelModule(const Module *M) {
       *MF, true, true, [&](const serialization::InputFile &IF, bool isSystem) {
         MD.FileDeps.insert(IF.getFile()->getName());
       });
+  MD.NonPathCommandLine = {
+    "-remove-preceeding-explicit-module-build-incompatible-options",
+    "-fno-implicit-modules", "-emit-module", "-fmodule-name=" + MD.ModuleName,
+  };
 
   llvm::DenseSet<const Module *> AddedModules;
   addAllSubmoduleDeps(M, MD, AddedModules);

clang/test/ClangScanDeps/modules-full.cpp

@@ -31,8 +31,10 @@
 // CHECK-NEXT:       ],
 // CHECK-NEXT:       "clang-modulemap-file": "[[PREFIX]]/Inputs/module.modulemap",
 // CHECK-NEXT:       "command-line": [
+// CHECK-NEXT:         "-remove-preceeding-explicit-module-build-incompatible-options",
 // CHECK-NEXT:         "-fno-implicit-modules",
-// CHECK-NEXT:         "-fno-implicit-module-maps",
+// CHECK-NEXT:         "-emit-module",
+// CHECK-NEXT:         "-fmodule-name=header1",
 // CHECK-NEXT:         "-fmodule-file=[[PREFIX]]/module-cache/[[CONTEXT_HASH_H1]]/header2-{{[A-Z0-9]+}}.pcm",
 // CHECK-NEXT:         "-fmodule-map-file=[[PREFIX]]/Inputs/module.modulemap"
 // CHECK-NEXT:       ],
@@ -47,8 +49,10 @@
 // CHECK-NEXT:       "clang-module-deps": [],
 // CHECK-NEXT:       "clang-modulemap-file": "[[PREFIX]]/Inputs/module.modulemap",
 // CHECK-NEXT:       "command-line": [
+// CHECK-NEXT:         "-remove-preceeding-explicit-module-build-incompatible-options",
 // CHECK-NEXT:         "-fno-implicit-modules",
-// CHECK-NEXT:         "-fno-implicit-module-maps"
+// CHECK-NEXT:         "-emit-module",
+// CHECK-NEXT:         "-fmodule-name=header1"
 // CHECK-NEXT:       ],
 // CHECK-NEXT:       "context-hash": "[[CONTEXT_HASH_H2:[A-Z0-9]+]]",
 // CHECK-NEXT:       "file-deps": [
@@ -61,8 +65,10 @@
 // CHECK-NEXT:       "clang-module-deps": [],
 // CHECK-NEXT:       "clang-modulemap-file": "[[PREFIX]]/Inputs/module.modulemap",
 // CHECK-NEXT:       "command-line": [
+// CHECK-NEXT:         "-remove-preceeding-explicit-module-build-incompatible-options",
 // CHECK-NEXT:         "-fno-implicit-modules",
-// CHECK-NEXT:         "-fno-implicit-module-maps"
+// CHECK-NEXT:         "-emit-module",
+// CHECK-NEXT:         "-fmodule-name=header2"
 // CHECK-NEXT:       ],
 // CHECK-NEXT:       "context-hash": "[[CONTEXT_HASH_H1]]",
 // CHECK-NEXT:       "file-deps": [

clang/test/Index/Core/scan-deps.m

@@ -19,11 +19,11 @@
 // CHECK-NEXT:       [[PREFIX]]/Inputs/module/SubModA.h
 // CHECK-NEXT:       [[PREFIX]]/Inputs/module/SubSubModA.h
 // CHECK-NEXT:       [[PREFIX]]/Inputs/module/module.modulemap
-// CHECK-NEXT:     build-args:
+// CHECK-NEXT:     build-args: -remove-preceeding-explicit-module-build-incompatible-options -fno-implicit-modules -emit-module -fmodule-name=ModA
 // CHECK-NEXT: dependencies:
 // CHECK-NEXT:   context-hash: [[CONTEXT_HASH]]
 // CHECK-NEXT:   module-deps:
 // CHECK-NEXT:     ModA:[[CONTEXT_HASH]]
 // CHECK-NEXT:   file-deps:
 // CHECK-NEXT:     [[PREFIX]]/scan-deps.m
-// CHECK-NEXT:   additional-build-args:
+// CHECK-NEXT:   additional-build-args: -fno-implicit-modules -fno-implicit-module-maps

clang/tools/libclang/CDependencies.cpp

@@ -121,6 +121,11 @@ class FullDependencyConsumer : public DependencyConsumer {
         FD.ClangModuleDeps.push_back({MD.ModuleName, ContextHash});
     }
 
+    FD.AdditionalNonPathCommandLine = {
+      "-fno-implicit-modules",
+      "-fno-implicit-module-maps",
+    };
+    
     FullDependenciesResult FDR;
 
     for (auto &&M : ClangModuleDeps) {
@@ -178,7 +183,7 @@ static CXFileDependencies *getFullDependencies(
       for (const ClangModuleDep &CMD : MD.ClangModuleDeps)
         Modules.push_back(CMD.ModuleName + ":" + CMD.ContextHash);
       M.ModuleDeps = cxstring::createSet(Modules);
-      M.BuildArguments = cxstring::createSet(std::vector<std::string>{});
+      M.BuildArguments = cxstring::createSet(MD.NonPathCommandLine);
     }
     MDC(Context, MDS);
   }
@@ -191,7 +196,8 @@ static CXFileDependencies *getFullDependencies(
   for (const ClangModuleDep &CMD : FD.ClangModuleDeps)
     Modules.push_back(CMD.ModuleName + ":" + CMD.ContextHash);
   FDeps->ModuleDeps = cxstring::createSet(Modules);
-  FDeps->AdditionalArguments = cxstring::createSet(std::vector<std::string>{});
+  FDeps->AdditionalArguments =
+    cxstring::createSet(FD.AdditionalNonPathCommandLine);
   return FDeps;
 }