[PATCH] D132801: [driver] Additional ignoring of module-map related flags, if modules are disabled

[Argyrios Kyrtzidis via Phabricator via cfe-commits]

akyrtzi updated this revision to Diff 456483.
akyrtzi added a comment.

Merge the new `RUN` line together with the prior 2.


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D132801/new/

https://reviews.llvm.org/D132801

Files:
  clang/lib/Driver/ToolChains/Clang.cpp
  clang/test/Driver/modules.m


Index: clang/test/Driver/modules.m
===================================================================
--- clang/test/Driver/modules.m
+++ clang/test/Driver/modules.m
@@ -75,8 +75,8 @@
 // RUN: %clang -fno-modules -fbuild-session-timestamp=123 -### %s 2>&1 | FileCheck -check-prefix=SESSION_FLAG %s
 // SESSION_FLAG-NOT: -fbuild-session-timestamp
 
-// RUN: %clang -fno-modules -fmodules-validate-once-per-build-session -### %s 2>&1 | FileCheck -check-prefix=VALIDATE_ONCE_FLAG %s
-// VALIDATE_ONCE_FLAG-NOT: -fmodules-validate-once-per-build-session
-
-// RUN: %clang -fno-modules -fmodules-validate-system-headers -### %s 2>&1 | FileCheck -check-prefix=VALIDATE_SYSTEM_FLAG %s
-// VALIDATE_SYSTEM_FLAG-NOT: -fmodules-validate-system-headers
+// RUN: %clang -fno-modules -fmodules-validate-once-per-build-session -fmodules-validate-system-headers -fmodule-map-file=module.modulemap \
+// RUN:   -### %s 2>&1 | FileCheck -check-prefix=IGNORED_FLAGS %s
+// IGNORED_FLAGS-NOT: -fmodules-validate-once-per-build-session
+// IGNORED_FLAGS-NOT: -fmodules-validate-system-headers
+// IGNORED_FLAGS-NOT: -fmodule-map-file
Index: clang/lib/Driver/ToolChains/Clang.cpp
===================================================================
--- clang/lib/Driver/ToolChains/Clang.cpp
+++ clang/lib/Driver/ToolChains/Clang.cpp
@@ -3726,25 +3726,29 @@
                      options::OPT_fno_modules_validate_input_files_content,
                      false))
       CmdArgs.push_back("-fvalidate-ast-input-files-content");
-  }
-
-  // -fmodule-name specifies the module that is currently being built (or
-  // used for header checking by -fmodule-maps).
-  Args.AddLastArg(CmdArgs, options::OPT_fmodule_name_EQ);
 
-  // -fmodule-map-file can be used to specify files containing module
-  // definitions.
-  Args.AddAllArgs(CmdArgs, options::OPT_fmodule_map_file);
-
-  // -fbuiltin-module-map can be used to load the clang
-  // builtin headers modulemap file.
-  if (Args.hasArg(options::OPT_fbuiltin_module_map)) {
-    SmallString<128> BuiltinModuleMap(D.ResourceDir);
-    llvm::sys::path::append(BuiltinModuleMap, "include");
-    llvm::sys::path::append(BuiltinModuleMap, "module.modulemap");
-    if (llvm::sys::fs::exists(BuiltinModuleMap))
-      CmdArgs.push_back(
-          Args.MakeArgString("-fmodule-map-file=" + BuiltinModuleMap));
+    // -fmodule-name specifies the module that is currently being built (or
+    // used for header checking by -fmodule-maps).
+    Args.AddLastArg(CmdArgs, options::OPT_fmodule_name_EQ);
+
+    // -fmodule-map-file can be used to specify files containing module
+    // definitions.
+    Args.AddAllArgs(CmdArgs, options::OPT_fmodule_map_file);
+
+    // -fbuiltin-module-map can be used to load the clang
+    // builtin headers modulemap file.
+    if (Args.hasArg(options::OPT_fbuiltin_module_map)) {
+      SmallString<128> BuiltinModuleMap(D.ResourceDir);
+      llvm::sys::path::append(BuiltinModuleMap, "include");
+      llvm::sys::path::append(BuiltinModuleMap, "module.modulemap");
+      if (llvm::sys::fs::exists(BuiltinModuleMap))
+        CmdArgs.push_back(
+            Args.MakeArgString("-fmodule-map-file=" + BuiltinModuleMap));
+    }
+  } else {
+    Args.ClaimAllArgs(options::OPT_fmodule_name_EQ);
+    Args.ClaimAllArgs(options::OPT_fmodule_map_file);
+    Args.ClaimAllArgs(options::OPT_fbuiltin_module_map);
   }
 
   // The -fmodule-file=<name>=<file> form specifies the mapping of module


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D132801.456483.patch
Type: text/x-patch
Size: 3452 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20220829/d3287e5e/attachment.bin>