commit aeacae523a1c6e5bb99d12754415bbbc3ccb86c9
author Daniel Dunbar <daniel@zuster.org> Thu Sep 29 02:03:01 2011 +0000
committer Daniel Dunbar <daniel@zuster.org> Thu Sep 29 02:03:01 2011 +0000
tree 7c43f87024d9501ff9b216eb86e8e795be4eae22
parent be1aa410274b28fc143c47c814f07c989f4534d6

Basic/Diagnostic: Kill off a few unnecessary functions now that refactoring is done, and add a note that the new setDiagnosticGroup{...} methods only operate on the current diagnostic state.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@140771 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Basic/Diagnostic.cpp

diff --git a/lib/Basic/Diagnostic.cpp b/lib/Basic/Diagnostic.cpp
index 5b81458..cfe617e 100644
--- a/lib/Basic/Diagnostic.cpp
+++ b/lib/Basic/Diagnostic.cpp
@@ -172,7 +172,7 @@
   bool isPragma = L.isValid();
   FullSourceLoc Loc(L, *SourceMgr);
   FullSourceLoc LastStateChangePos = DiagStatePoints.back().Loc;
-  DiagnosticMappingInfo MappingInfo = DiagnosticMappingInfo::MakeInfo(
+  DiagnosticMappingInfo MappingInfo = DiagnosticMappingInfo::Make(
     Map, /*IsUser=*/true, isPragma);
 
   // Common case; setting all the diagnostics of a group in one place.

lib/Basic/DiagnosticIDs.cpp

diff --git a/lib/Basic/DiagnosticIDs.cpp b/lib/Basic/DiagnosticIDs.cpp
index b0d2f44..9d460a5 100644
--- a/lib/Basic/DiagnosticIDs.cpp
+++ b/lib/Basic/DiagnosticIDs.cpp
@@ -185,7 +185,7 @@
 }
 
 static DiagnosticMappingInfo GetDefaultDiagMappingInfo(unsigned DiagID) {
-  DiagnosticMappingInfo Info = DiagnosticMappingInfo::MakeInfo(
+  DiagnosticMappingInfo Info = DiagnosticMappingInfo::Make(
     diag::MAP_FATAL, /*IsUser=*/false, /*IsPragma=*/false);
 
   if (const StaticDiagInfoRec *StaticInfo = GetDiagInfo(DiagID)) {
@@ -243,13 +243,11 @@
   diag::kind Diag)
 {
   std::pair<iterator, bool> Result = DiagMap.insert(
-    std::make_pair(Diag, DiagnosticMappingInfo::MakeUnset()));
+    std::make_pair(Diag, DiagnosticMappingInfo()));
 
   // Initialize the entry if we added it.
-  if (Result.second) {
-    assert(Result.first->second.isUnset() && "unexpected unset entry");
+  if (Result.second)
     Result.first->second = GetDefaultDiagMappingInfo(Diag);
-  }
 
   return Result.first->second;
 }
@@ -598,8 +596,8 @@
       Result = DiagnosticIDs::Fatal;
   }
 
-  // If we are in a system header, we ignore it.
-  // We also want to ignore extensions and warnings in -Werror and
+  // If we are in a system header, we ignore it. We look at the diagnostic class
+  // because we also want to ignore extensions and warnings in -Werror and
   // -pedantic-errors modes, which *map* warnings/extensions to errors.
   if (Result >= DiagnosticIDs::Warning &&
       DiagClass != CLASS_ERROR &&