fixup! [clang-tidy] New option to remove arguments from the command line

Removed Regex Support

Author: felix642

clang-tools-extra/clang-tidy/ClangTidy.cpp

@@ -582,29 +582,23 @@ runClangTidy(clang::tidy::ClangTidyContext &Context,
       };
 
   // Remove unwanted arguments passed to the compiler
-  ArgumentsAdjuster CompilationArgsToIgnore =
+  ArgumentsAdjuster CompilationArgsToRemove =
       [&Context](const CommandLineArguments &Args, StringRef Filename) {
         ClangTidyOptions Opts = Context.getOptionsForFile(Filename);
         CommandLineArguments AdjustedArgs = Args;
 
-        if (Opts.CompilationArgsToRemoveRegex) {
-          for (StringRef ArgToIgnore : *Opts.CompilationArgsToRemoveRegex) {
-            llvm::Regex ArgToIgnoreRegex(ArgToIgnore);
-            AdjustedArgs.erase(
-                std::remove_if(AdjustedArgs.begin(), AdjustedArgs.end(),
-                               [&](llvm::StringRef Arg) {
-                                 return Arg.starts_with("-") &&
-                                        Arg != "-fsyntax-only" &&
-                                        ArgToIgnoreRegex.match(Arg);
-                               }),
-                AdjustedArgs.end());
+        if (Opts.RemovedArgs) {
+          for (StringRef ArgToIgnore : *Opts.RemovedArgs) {
+            AdjustedArgs.erase(std::remove(AdjustedArgs.begin(),
+                                           AdjustedArgs.end(), ArgToIgnore),
+                               AdjustedArgs.end());
           }
         }
 
         return AdjustedArgs;
       };
 
-  Tool.appendArgumentsAdjuster(CompilationArgsToIgnore);
+  Tool.appendArgumentsAdjuster(CompilationArgsToRemove);
   Tool.appendArgumentsAdjuster(PerFileExtraArgumentsInserter);
   Tool.appendArgumentsAdjuster(getStripPluginsAdjuster());
   Context.setEnableProfiling(EnableCheckProfile);

clang-tools-extra/clang-tidy/ClangTidyOptions.cpp

@@ -227,8 +227,7 @@ template <> struct MappingTraits<ClangTidyOptions> {
                    Options.ExcludeHeaderFilterRegex);
     IO.mapOptional("FormatStyle", Options.FormatStyle);
     IO.mapOptional("User", Options.User);
-    IO.mapOptional("CompilationArgsToRemoveRegex",
-                   Options.CompilationArgsToRemoveRegex);
+    IO.mapOptional("RemovedArgs", Options.RemovedArgs);
     IO.mapOptional("CheckOptions", Options.CheckOptions);
     IO.mapOptional("ExtraArgs", Options.ExtraArgs);
     IO.mapOptional("ExtraArgsBefore", Options.ExtraArgsBefore);
@@ -254,7 +253,7 @@ ClangTidyOptions ClangTidyOptions::getDefaults() {
   Options.SystemHeaders = false;
   Options.FormatStyle = "none";
   Options.User = std::nullopt;
-  Options.CompilationArgsToRemoveRegex = std::nullopt;
+  Options.RemovedArgs = std::nullopt;
   for (const ClangTidyModuleRegistry::entry &Module :
        ClangTidyModuleRegistry::entries())
     Options.mergeWith(Module.instantiate()->getModuleOptions(), 0);
@@ -295,8 +294,7 @@ ClangTidyOptions &ClangTidyOptions::mergeWith(const ClangTidyOptions &Other,
   overrideValue(SystemHeaders, Other.SystemHeaders);
   overrideValue(FormatStyle, Other.FormatStyle);
   overrideValue(User, Other.User);
-  overrideValue(CompilationArgsToRemoveRegex,
-                Other.CompilationArgsToRemoveRegex);
+  mergeVectors(RemovedArgs, Other.RemovedArgs);
   overrideValue(UseColor, Other.UseColor);
   mergeVectors(ExtraArgs, Other.ExtraArgs);
   mergeVectors(ExtraArgsBefore, Other.ExtraArgsBefore);

clang-tools-extra/clang-tidy/ClangTidyOptions.h

@@ -114,7 +114,7 @@ struct ClangTidyOptions {
 
   /// \brief Remove command line arguments sent to the compiler matching this
   /// regex.
-  std::optional<std::vector<std::string>> CompilationArgsToRemoveRegex;
+  std::optional<std::vector<std::string>> RemovedArgs;
 
   /// Helper structure for storing option value with priority of the value.
   struct ClangTidyValue {

clang-tools-extra/docs/ReleaseNotes.rst

@@ -132,12 +132,7 @@ Improvements to clang-tidy
   when run over C files. If ``-std`` is not specified, it defaults to
   ``c99-or-later``.
 
-<<<<<<< HEAD
 - :program:`clang-tidy` no longer attempts to analyze code from system headers
-=======
-<<<<<<< HEAD
-- :program:`clang-tidy` no longer attemps to analyze code from system headers
->>>>>>> 64f91e7543e8 (fixup! [clang-tidy] New option to remove arguments from the command line)
   by default, greatly improving performance. This behavior is disabled if the
   `SystemHeaders` option is enabled.
 

clang-tools-extra/docs/clang-tidy/index.rst

@@ -329,8 +329,10 @@ An overview of all the command-line options:
                                    example, to place the correct user name in
                                    TODO() comments in the relevant check.
     WarningsAsErrors             - Same as '--warnings-as-errors'.
-    CompilationArgsToRemoveRegex - List of arguments to remove from the command
-                                   line sent to the compiler.
+    RemovedArgs                  - List of arguments to remove from the command
+                                   line sent to the compiler. Please note that 
+                                   removing arguments from the command line 
+                                   might lead to false positive or negatives. 
 
     The effective configuration can be inspected using --dump-config:
 
@@ -340,7 +342,7 @@ An overview of all the command-line options:
       WarningsAsErrors:    ''
       HeaderFileExtensions:         ['', 'h','hh','hpp','hxx']
       ImplementationFileExtensions: ['c','cc','cpp','cxx']
-      CompilationArgsToRemoveRegex: ['-Werror', '-f.*']
+      RemovedArgs: ['-Werror']
       HeaderFilterRegex:   ''
       FormatStyle:         none
       InheritParentConfig: true

clang-tools-extra/test/clang-tidy/infrastructure/compilation-args-to-ignore.cpp

@@ -1,9 +1,5 @@
 // RUN: not clang-tidy %s -- -fnot-an-option | FileCheck %s -check-prefix=INVALID-A
-// RUN: clang-tidy %s --config="{CompilationArgsToRemoveRegex: ['-fnot-an-option']}" -- -fnot-an-option
-// RUN: not clang-tidy %s --config="{CompilationArgsToRemoveRegex: ['-f.*']}" -- -fnot-an-option -invalid-option | FileCheck %s -check-prefix=INVALID-B
-// RUN: clang-tidy %s --config="{CompilationArgsToRemoveRegex: ['-f.*', '-invalid-option']}" -- -fnot-an-option -fnot-another-option -finvalid-option -invalid-option
-// RUN: not clang-tidy %s --config="{CompilationArgsToRemoveRegex: ['\$invalid-option']}" -- -finvalid-option | FileCheck %s -check-prefix=INVALID-C
+// RUN: clang-tidy %s --config="{RemovedArgs: ['-fnot-an-option']}" -- -fnot-an-option
+// RUN: clang-tidy %s --config="{RemovedArgs: ['-fnot-another-option', '-fnot-an-option']}" -- -fnot-an-option -fnot-another-option
 
-// INVALID-A: error: unknown argument: '-fnot-an-option' [clang-diagnostic-error]
-// INVALID-B: error: unknown argument: '-invalid-option' [clang-diagnostic-error]
-// INVALID-C: error: unknown argument: '-finvalid-option' [clang-diagnostic-error]
+// INVALID-A: error: unknown argument: '-fnot-an-option' [clang-diagnostic-error]