Revert "[clang-cl] Accept #pragma warning(disable : N) for some N"

because it causes `error: error reading '/wd4091'` errors in
compiler-rt builds.

Author: amykhuang

clang/include/clang/Basic/CLWarnings.h

@@ -807,9 +807,6 @@ class DiagnosticsEngine : public RefCountedBase<DiagnosticsEngine> {
   bool setSeverityForGroup(diag::Flavor Flavor, StringRef Group,
                            diag::Severity Map,
                            SourceLocation Loc = SourceLocation());
-  bool setSeverityForGroup(diag::Flavor Flavor, diag::Group Group,
-                           diag::Severity Map,
-                           SourceLocation Loc = SourceLocation());
 
   /// Set the warning-as-error flag for the given diagnostic group.
   ///

clang/include/clang/Basic/Diagnostic.h

@@ -19,13 +19,6 @@ namespace clang {
 #undef GET_CATEGORY_TABLE
       DiagCat_NUM_CATEGORIES
     };
-
-    enum class Group {
-#define DIAG_ENTRY(GroupName, FlagNameOffset, Members, SubGroups) GroupName,
-#include "clang/Basic/DiagnosticGroups.inc"
-#undef CATEGORY
-#undef DIAG_ENTRY
-    };
   }  // end namespace diag
 }  // end namespace clang
 

clang/include/clang/Basic/DiagnosticCategories.h

@@ -396,7 +396,6 @@ def Dangling : DiagGroup<"dangling", [DanglingField,
                                       DanglingGsl,
                                       ReturnStackAddress]>;
 def DistributedObjectModifiers : DiagGroup<"distributed-object-modifiers">;
-def DllexportExplicitInstantiationDecl : DiagGroup<"dllexport-explicit-instantiation-decl">;
 def ExcessInitializers : DiagGroup<"excess-initializers">;
 def ExpansionToDefined : DiagGroup<"expansion-to-defined">;
 def FlagEnum : DiagGroup<"flag-enum">;

clang/include/clang/Basic/DiagnosticGroups.td

@@ -25,8 +25,6 @@ namespace clang {
 
   // Import the diagnostic enums themselves.
   namespace diag {
-    enum class Group;
-
     // Size of each of the diagnostic categories.
     enum {
       DIAG_SIZE_COMMON        =  300,
@@ -226,10 +224,6 @@ class DiagnosticIDs : public RefCountedBase<DiagnosticIDs> {
   ///
   static bool isBuiltinExtensionDiag(unsigned DiagID, bool &EnabledByDefault);
 
-  /// Given a group ID, returns the flag that toggles the group.
-  /// For example, for Group::DeprecatedDeclarations, returns
-  /// "deprecated-declarations".
-  static StringRef getWarningOptionForGroup(diag::Group);
 
   /// Return the lowest-level warning option that enables the specified
   /// diagnostic.

clang/include/clang/Basic/DiagnosticIDs.h

@@ -3396,7 +3396,7 @@ def warn_attribute_dllimport_static_field_definition : Warning<
   InGroup<DiagGroup<"dllimport-static-field-def">>;
 def warn_attribute_dllexport_explicit_instantiation_decl : Warning<
   "explicit instantiation declaration should not be 'dllexport'">,
-  InGroup<DllexportExplicitInstantiationDecl>;
+  InGroup<DiagGroup<"dllexport-explicit-instantiation-decl">>;
 def warn_attribute_dllexport_explicit_instantiation_def : Warning<
   "'dllexport' attribute ignored on explicit instantiation definition">,
   InGroup<IgnoredAttributes>;

clang/include/clang/Basic/DiagnosticSemaKinds.td

@@ -6106,7 +6106,16 @@ def _SLASH_WX_ : CLFlag<"WX-">,
   HelpText<"Do not treat warnings as errors (default)">,
   Alias<W_Joined>, AliasArgs<["no-error"]>;
 def _SLASH_w_flag : CLFlag<"w">, HelpText<"Disable all warnings">, Alias<w>;
-def _SLASH_wd : CLCompileJoined<"wd">;
+def _SLASH_wd4005 : CLFlag<"wd4005">, Alias<W_Joined>,
+  AliasArgs<["no-macro-redefined"]>;
+def _SLASH_wd4018 : CLFlag<"wd4018">, Alias<W_Joined>,
+  AliasArgs<["no-sign-compare"]>;
+def _SLASH_wd4100 : CLFlag<"wd4100">, Alias<W_Joined>,
+  AliasArgs<["no-unused-parameter"]>;
+def _SLASH_wd4910 : CLFlag<"wd4910">, Alias<W_Joined>,
+  AliasArgs<["no-dllexport-explicit-instantiation-decl"]>;
+def _SLASH_wd4996 : CLFlag<"wd4996">, Alias<W_Joined>,
+  AliasArgs<["no-deprecated-declarations"]>;
 def _SLASH_vd : CLJoined<"vd">, HelpText<"Control vtordisp placement">,
   Alias<vtordisp_mode_EQ>;
 def _SLASH_X : CLFlag<"X">,

clang/include/clang/Driver/Options.td

@@ -39,7 +39,6 @@ endif()
 add_clang_library(clangBasic
   Attributes.cpp
   Builtins.cpp
-  CLWarnings.cpp
   CharInfo.cpp
   CodeGenOptions.cpp
   Cuda.cpp

clang/lib/Basic/CLWarnings.cpp

@@ -408,14 +408,6 @@ bool DiagnosticsEngine::setSeverityForGroup(diag::Flavor Flavor,
   return false;
 }
 
-bool DiagnosticsEngine::setSeverityForGroup(diag::Flavor Flavor,
-                                            diag::Group Group,
-                                            diag::Severity Map,
-                                            SourceLocation Loc) {
-  return setSeverityForGroup(Flavor, Diags->getWarningOptionForGroup(Group),
-                             Map, Loc);
-}
-
 bool DiagnosticsEngine::setDiagnosticGroupWarningAsError(StringRef Group,
                                                          bool Enabled) {
   // If we are enabling this feature, just set the diagnostic mappings to map to

clang/lib/Basic/CMakeLists.txt

@@ -609,23 +609,17 @@ namespace {
 
 // Second the table of options, sorted by name for fast binary lookup.
 static const WarningOption OptionTable[] = {
-#define DIAG_ENTRY(GroupName, FlagNameOffset, Members, SubGroups)              \
-  {FlagNameOffset, Members, SubGroups},
+#define GET_DIAG_TABLE
 #include "clang/Basic/DiagnosticGroups.inc"
-#undef DIAG_ENTRY
+#undef GET_DIAG_TABLE
 };
 
-StringRef DiagnosticIDs::getWarningOptionForGroup(diag::Group Group) {
-  return OptionTable[static_cast<int>(Group)].getName();
-}
-
 /// getWarningOptionForDiag - Return the lowest-level warning option that
 /// enables the specified diagnostic.  If there is no -Wfoo flag that controls
 /// the diagnostic, this returns null.
 StringRef DiagnosticIDs::getWarningOptionForDiag(unsigned DiagID) {
   if (const StaticDiagInfoRec *Info = GetDiagInfo(DiagID))
-    return getWarningOptionForGroup(
-        static_cast<diag::Group>(Info->getOptionGroupIndex()));
+    return OptionTable[Info->getOptionGroupIndex()].getName();
   return StringRef();
 }
 

clang/lib/Basic/Diagnostic.cpp

@@ -22,7 +22,6 @@
 #include "Hexagon.h"
 #include "MSP430.h"
 #include "PS4CPU.h"
-#include "clang/Basic/CLWarnings.h"
 #include "clang/Basic/CharInfo.h"
 #include "clang/Basic/CodeGenOptions.h"
 #include "clang/Basic/LangOptions.h"
@@ -5439,26 +5438,7 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
 
   Args.AddAllArgs(CmdArgs, options::OPT_R_Group);
 
-  for (const Arg *A :
-       Args.filtered(options::OPT_W_Group, options::OPT__SLASH_wd)) {
-    A->claim();
-    if (A->getOption().getID() == options::OPT__SLASH_wd) {
-      unsigned WarningNumber;
-      if (StringRef(A->getValue()).getAsInteger(10, WarningNumber)) {
-        D.Diag(diag::err_drv_invalid_int_value)
-            << A->getAsString(Args) << A->getValue();
-        continue;
-      }
-
-      if (auto Group = diagGroupFromCLWarningID(WarningNumber)) {
-        CmdArgs.push_back(Args.MakeArgString(
-            "-Wno-" + DiagnosticIDs::getWarningOptionForGroup(*Group)));
-        continue;
-      }
-    }
-    A->render(Args, CmdArgs);
-  }
-
+  Args.AddAllArgs(CmdArgs, options::OPT_W_Group);
   if (Args.hasFlag(options::OPT_pedantic, options::OPT_no_pedantic, false))
     CmdArgs.push_back("-pedantic");
   Args.AddLastArg(CmdArgs, options::OPT_pedantic_errors);

clang/lib/Basic/DiagnosticIDs.cpp

@@ -12,7 +12,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang/Lex/Pragma.h"
-#include "clang/Basic/CLWarnings.h"
 #include "clang/Basic/Diagnostic.h"
 #include "clang/Basic/DiagnosticLex.h"
 #include "clang/Basic/FileManager.h"
@@ -1414,15 +1413,12 @@ struct PragmaWarningHandler : public PragmaHandler {
           return;
         }
       }
-      PP.getDiagnostics().pushMappings(DiagLoc);
       if (Callbacks)
         Callbacks->PragmaWarningPush(DiagLoc, Level);
     } else if (II && II->isStr("pop")) {
       // #pragma warning( pop )
       PP.Lex(Tok);
-      if (!PP.getDiagnostics().popMappings(DiagLoc))
-        PP.Diag(Tok, diag::warn_pragma_diagnostic_cannot_pop);
-      else if (Callbacks)
+      if (Callbacks)
         Callbacks->PragmaWarningPop(DiagLoc);
     } else {
       // #pragma warning( warning-specifier : warning-number-list
@@ -1486,22 +1482,6 @@ struct PragmaWarningHandler : public PragmaHandler {
           }
           Ids.push_back(int(Value));
         }
-
-        // Only act on disable for now.
-        diag::Severity SV = diag::Severity();
-        if (Specifier == PPCallbacks::PWS_Disable)
-          SV = diag::Severity::Ignored;
-        if (SV != diag::Severity())
-          for (int Id : Ids) {
-            if (auto Group = diagGroupFromCLWarningID(Id)) {
-              bool unknownDiag = PP.getDiagnostics().setSeverityForGroup(
-                  diag::Flavor::WarningOrError, *Group, SV, DiagLoc);
-              assert(!unknownDiag &&
-                     "wd table should only contain known diags");
-              (void)unknownDiag;
-            }
-          }
-
         if (Callbacks)
           Callbacks->PragmaWarning(DiagLoc, Specifier, Ids);
 

clang/lib/Driver/ToolChains/Clang.cpp

@@ -353,7 +353,7 @@
 // CHECK-C11: -std=c11
 
 // For some warning ids, we can map from MSVC warning to Clang warning.
-// RUN: %clang_cl -wd4005 -wd4100 -wd4910 -wd4996 -wd12345678 -### -- %s 2>&1 | FileCheck -check-prefix=Wno %s
+// RUN: %clang_cl -wd4005 -wd4100 -wd4910 -wd4996 -### -- %s 2>&1 | FileCheck -check-prefix=Wno %s
 // Wno: "-cc1"
 // Wno: "-Wno-macro-redefined"
 // Wno: "-Wno-unused-parameter"

clang/lib/Lex/Pragma.cpp

@@ -66,10 +66,9 @@ const DiagnosticRecord &diagtool::getDiagnosticForID(short DiagID) {
 
 // Second the table of options, sorted by name for fast binary lookup.
 static const GroupRecord OptionTable[] = {
-#define DIAG_ENTRY(GroupName, FlagNameOffset, Members, SubGroups)              \
-  {FlagNameOffset, Members, SubGroups},
+#define GET_DIAG_TABLE
 #include "clang/Basic/DiagnosticGroups.inc"
-#undef DIAG_ENTRY
+#undef GET_DIAG_TABLE
 };
 
 llvm::StringRef GroupRecord::getName() const {

clang/test/Driver/cl-options.c

@@ -129,7 +129,6 @@ namespace {
   };
 
   struct GroupInfo {
-    llvm::StringRef GroupName;
     std::vector<const Record*> DiagsInGroup;
     std::vector<std::string> SubGroups;
     unsigned IDNo;
@@ -175,7 +174,6 @@ static void groupDiagnostics(const std::vector<Record*> &Diags,
     Record *Group = DiagGroups[i];
     GroupInfo &GI =
         DiagsInGroup[std::string(Group->getValueAsString("GroupName"))];
-    GI.GroupName = Group->getName();
     GI.Defs.push_back(Group);
 
     std::vector<Record*> SubGroups = Group->getValueAsListOfDefs("SubGroups");
@@ -1281,8 +1279,8 @@ void clang::EmitClangDiagsDefs(RecordKeeper &Records, raw_ostream &OS,
     OS << ", \"";
     OS.write_escaped(DiagTextBuilder.buildForDefinition(&R)) << '"';
 
-    // Warning group associated with the diagnostic. This is stored as an index
-    // into the alphabetically sorted warning group table.
+    // Warning associated with the diagnostic. This is stored as an index into
+    // the alphabetically sorted warning table.
     if (DefInit *DI = dyn_cast<DefInit>(R.getValueInit("Group"))) {
       std::map<std::string, GroupInfo>::iterator I = DiagsInGroup.find(
           std::string(DI->getDef()->getValueAsString("GroupName")));
@@ -1489,20 +1487,18 @@ static void emitDiagTable(std::map<std::string, GroupInfo> &DiagsInGroup,
   for (auto const &I: DiagsInGroup)
     MaxLen = std::max(MaxLen, (unsigned)I.first.size());
 
-  OS << "\n#ifdef DIAG_ENTRY\n";
+  OS << "\n#ifdef GET_DIAG_TABLE\n";
   unsigned SubGroupIndex = 1, DiagArrayIndex = 1;
   for (auto const &I: DiagsInGroup) {
     // Group option string.
-    OS << "DIAG_ENTRY(";
-    OS << I.second.GroupName << " /* ";
-
+    OS << "  { /* ";
     if (I.first.find_first_not_of("abcdefghijklmnopqrstuvwxyz"
                                    "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
                                    "0123456789!@#$%^*-+=:?") !=
         std::string::npos)
       PrintFatalError("Invalid character in diagnostic group '" + I.first +
                       "'");
-    OS << I.first << " */, ";
+    OS << I.first << " */ " << std::string(MaxLen - I.first.size(), ' ');
     // Store a pascal-style length byte at the beginning of the string.
     std::string Name = char(I.first.size()) + I.first;
     OS << GroupNames.GetOrAddStringOffset(Name, false) << ", ";
@@ -1521,7 +1517,7 @@ static void emitDiagTable(std::map<std::string, GroupInfo> &DiagsInGroup,
         DiagArrayIndex += DiagsInPedantic.size();
       DiagArrayIndex += V.size() + 1;
     } else {
-      OS << "0, ";
+      OS << "/* Empty */     0, ";
     }
 
     // Subgroups.
@@ -1534,12 +1530,12 @@ static void emitDiagTable(std::map<std::string, GroupInfo> &DiagsInGroup,
         SubGroupIndex += GroupsInPedantic.size();
       SubGroupIndex += SubGroups.size() + 1;
     } else {
-      OS << "0";
+      OS << "/* Empty */         0";
     }
 
-    OS << ")\n";
+    OS << " },\n";
   }
-  OS << "#endif // DIAG_ENTRY\n\n";
+  OS << "#endif // GET_DIAG_TABLE\n\n";
 }
 
 /// Emit the table of diagnostic categories.

clang/test/Sema/pragma-warning.cpp

@@ -55,7 +55,6 @@ static_library("Basic") {
   sources = [
     "Attributes.cpp",
     "Builtins.cpp",
-    "CLWarnings.cpp",
     "CharInfo.cpp",
     "CodeGenOptions.cpp",
     "Cuda.cpp",