Revert "[clang] Introduce diagnostics suppression mappings (llvm#112517)"

This reverts commit 12e3ed8.
This reverts commit 41e3919.

There are some buildbot breakages in
https://lab.llvm.org/buildbot/#/builders/18/builds/6832.

Author: kadircet

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

@@ -81,8 +81,7 @@ ExpandModularHeadersPPCallbacks::ExpandModularHeadersPPCallbacks(
   Diags.setSourceManager(&Sources);
   // FIXME: Investigate whatever is there better way to initialize DiagEngine
   // or whatever DiagEngine can be shared by multiple preprocessors
-  ProcessWarningOptions(Diags, Compiler.getDiagnosticOpts(),
-                        Compiler.getVirtualFileSystem());
+  ProcessWarningOptions(Diags, Compiler.getDiagnosticOpts());
 
   LangOpts.Modules = false;
 

clang/docs/ReleaseNotes.rst

@@ -870,9 +870,6 @@ New features
   attribute, the compiler can generate warnings about the use of any language features, or calls to
   other functions, which may block.
 
-- Introduced ``-warning-suppression-mappings`` flag to control diagnostic
-  suppressions per file. See `documentation <https://clang.llvm.org/docs/WarningSuppressionMappings.html>_` for details.
-
 Crash and bug fixes
 ^^^^^^^^^^^^^^^^^^^
 

clang/docs/UsersManual.rst

@@ -151,10 +151,6 @@ Options to Control Error and Warning Messages
   instantiation backtrace for a single warning or error. The default is 10, and
   the limit can be disabled with `-ftemplate-backtrace-limit=0`.
 
-.. option:: --warning-suppression-mappings=foo.txt
-
-   :ref:`Suppress certain diagnostics for certain files. <warning_suppression_mappings>`
-
 .. _cl_diag_formatting:
 
 Formatting of Diagnostics
@@ -1319,34 +1315,6 @@ with its corresponding `Wno-` option.
 Note that when combined with :option:`-w` (which disables all warnings),
 disabling all warnings wins.
 
-.. _warning_suppression_mappings:
-
-Controlling Diagnostics via Suppression Mappings
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Warning suppression mappings enable users to suppress Clang's diagnostics in a
-per-file granular manner. Enabling enforcement of diagnostics in specific parts
-of the project, even if there are violations in some headers.
-
-.. code-block:: console
-
-  $ cat mappings.txt
-  [unused]
-  src:foo/*
-
-  $ clang --warning-suppression-mappings=mapping.txt -Wunused foo/bar.cc
-  # This compilation won't emit any unused findings for sources under foo/
-  # directory. But it'll still complain for all the other sources, e.g:
-  $ cat foo/bar.cc
-  #include "dir/include.h" // Clang flags unused declarations here.
-  #include "foo/include.h" // but unused warnings under this source is omitted.
-  #include "next_to_bar_cc.h" // as are unused warnings from this header file.
-  // Further, unused warnings in the remainder of bar.cc are also omitted.
-
-
-See :doc:`WarningSuppressionMappings` for details about the file format and
-functionality.
-
 Controlling Static Analyzer Diagnostics
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 

clang/docs/WarningSuppressionMappings.rst

@@ -22,7 +22,6 @@ Using Clang as a Compiler
    ClangCommandLineReference
    AttributeReference
    DiagnosticsReference
-   WarningSuppressionMappings
    CrossCompilation
    ClangStaticAnalyzer
    ThreadSafetyAnalysis

clang/docs/index.rst

@@ -20,7 +20,6 @@
 #include "clang/Basic/Specifiers.h"
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/DenseMap.h"
-#include "llvm/ADT/FunctionExtras.h"
 #include "llvm/ADT/IntrusiveRefCntPtr.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/StringRef.h"
@@ -41,10 +40,6 @@
 namespace llvm {
 class Error;
 class raw_ostream;
-class MemoryBuffer;
-namespace vfs {
-class FileSystem;
-} // namespace vfs
 } // namespace llvm
 
 namespace clang {
@@ -560,10 +555,6 @@ class DiagnosticsEngine : public RefCountedBase<DiagnosticsEngine> {
   void *ArgToStringCookie = nullptr;
   ArgToStringFnTy ArgToStringFn;
 
-  /// Whether the diagnostic should be suppressed in FilePath.
-  llvm::unique_function<bool(diag::kind, llvm::StringRef /*FilePath*/) const>
-      DiagSuppressionMapping;
-
 public:
   explicit DiagnosticsEngine(IntrusiveRefCntPtr<DiagnosticIDs> Diags,
                              IntrusiveRefCntPtr<DiagnosticOptions> DiagOpts,
@@ -955,27 +946,6 @@ class DiagnosticsEngine : public RefCountedBase<DiagnosticsEngine> {
     return (Level)Diags->getDiagnosticLevel(DiagID, Loc, *this);
   }
 
-  /// Diagnostic suppression mappings can be used to suppress specific
-  /// diagnostics in specific files.
-  /// Mapping file is expected to be a special case list with sections denoting
-  /// diagnostic groups and `src` entries for globs to suppress. `emit` category
-  /// can be used to disable suppression. Longest glob that matches a filepath
-  /// takes precedence. For example:
-  ///   [unused]
-  ///   src:clang/*
-  ///   src:clang/foo/*=emit
-  ///   src:clang/foo/bar/*
-  ///
-  /// Such a mappings file suppress all diagnostics produced by -Wunused in all
-  /// sources under `clang/` directory apart from `clang/foo/`. Diagnostics
-  /// under `clang/foo/bar/` will also be suppressed. Note that the FilePath is
-  /// matched against the globs as-is.
-  /// These take presumed locations into account, and can still be overriden by
-  /// clang-diagnostics pragmas.
-  void setDiagSuppressionMapping(llvm::MemoryBuffer &Input);
-  bool isSuppressedViaMapping(diag::kind DiagId,
-                              llvm::StringRef FilePath) const;
-
   /// Issue the message to the client.
   ///
   /// This actually returns an instance of DiagnosticBuilder which emits the
@@ -1789,7 +1759,7 @@ const char ToggleHighlight = 127;
 /// warning options specified on the command line.
 void ProcessWarningOptions(DiagnosticsEngine &Diags,
                            const DiagnosticOptions &Opts,
-                           llvm::vfs::FileSystem &VFS, bool ReportDiags = true);
+                           bool ReportDiags = true);
 void EscapeStringForDiagnostic(StringRef Str, SmallVectorImpl<char> &OutStr);
 } // namespace clang
 

clang/include/clang/Basic/Diagnostic.h

@@ -834,7 +834,4 @@ def err_drv_triple_version_invalid : Error<
 
 def warn_missing_include_dirs : Warning<
   "no such include directory: '%0'">, InGroup<MissingIncludeDirs>, DefaultIgnore;
-
-def err_drv_malformed_warning_suppression_mapping : Error<
-  "failed to process suppression mapping file '%0': %1">;
 }

clang/include/clang/Basic/DiagnosticDriverKinds.td

@@ -108,9 +108,6 @@ class DiagnosticOptions : public RefCountedBase<DiagnosticOptions>{
   /// The file to serialize diagnostics to (non-appending).
   std::string DiagnosticSerializationFile;
 
-  /// Path for the file that defines diagnostic suppression mappings.
-  std::string DiagnosticSuppressionMappingsFile;
-
   /// The list of -W... options used to alter the diagnostic mappings, with the
   /// prefixes removed.
   std::vector<std::string> Warnings;

clang/include/clang/Basic/DiagnosticOptions.h

@@ -9019,8 +9019,3 @@ def wasm_opt : Flag<["--"], "wasm-opt">,
   Group<m_Group>,
   HelpText<"Enable the wasm-opt optimizer (default)">,
   MarshallingInfoNegativeFlag<LangOpts<"NoWasmOpt">>;
-
-def warning_suppression_mappings_EQ : Joined<["--"],
-  "warning-suppression-mappings=">, Group<Diag_Group>,
-  HelpText<"File containing diagnostic suppresion mappings. See user manual "
-  "for file format.">, Visibility<[ClangOption, CC1Option]>;

clang/include/clang/Driver/Options.td

@@ -24,7 +24,6 @@
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/BuryPointer.h"
 #include "llvm/Support/FileSystem.h"
-#include "llvm/Support/VirtualFileSystem.h"
 #include <cassert>
 #include <list>
 #include <memory>
@@ -702,10 +701,11 @@ class CompilerInstance : public ModuleLoader {
   /// used by some diagnostics printers (for logging purposes only).
   ///
   /// \return The new object on success, or null on failure.
-  static IntrusiveRefCntPtr<DiagnosticsEngine> createDiagnostics(
-      DiagnosticOptions *Opts, DiagnosticConsumer *Client = nullptr,
-      bool ShouldOwnClient = true, const CodeGenOptions *CodeGenOpts = nullptr,
-      IntrusiveRefCntPtr<llvm::vfs::FileSystem> VFS = nullptr);
+  static IntrusiveRefCntPtr<DiagnosticsEngine>
+  createDiagnostics(DiagnosticOptions *Opts,
+                    DiagnosticConsumer *Client = nullptr,
+                    bool ShouldOwnClient = true,
+                    const CodeGenOptions *CodeGenOpts = nullptr);
 
   /// Create the file manager and replace any existing one with it.
   ///