commit bbbeea11a8fa600dc77d2e88a9dfe4c914ab0d1d
author Argyrios Kyrtzidis <akyrtzi@gmail.com> Sat Mar 26 18:58:17 2011 +0000
committer Argyrios Kyrtzidis <akyrtzi@gmail.com> Sat Mar 26 18:58:17 2011 +0000
tree 55ad212c3cd69d8965215a20a9fcd6d0fe8f460e
parent 85222c6b2f20bc82e9598f8aeda07c22dc71e352

For Diagnostic::Reset() also reset the state related to #pragma diagnostic. Fixes rdar://9170766.

llvm-svn: 128346

clang/lib/Basic/Diagnostic.cpp

diff --git a/clang/lib/Basic/Diagnostic.cpp b/clang/lib/Basic/Diagnostic.cpp
index dc81f88..7601d49 100644
--- a/clang/lib/Basic/Diagnostic.cpp
+++ b/clang/lib/Basic/Diagnostic.cpp
@@ -51,11 +51,6 @@
   ErrorLimit = 0;
   TemplateBacktraceLimit = 0;
 
-  // Create a DiagState and DiagStatePoint representing diagnostic changes
-  // through command-line.
-  DiagStates.push_back(DiagState());
-  PushDiagStatePoint(&DiagStates.back(), SourceLocation());
-
   Reset();
 }
 
@@ -102,6 +97,16 @@
   // displayed.
   LastDiagLevel = (DiagnosticIDs::Level)-1;
   DelayedDiagID = 0;
+
+  // Clear state related to #pragma diagnostic.
+  DiagStates.clear();
+  DiagStatePoints.clear();
+  DiagStateOnPushStack.clear();
+
+  // Create a DiagState and DiagStatePoint representing diagnostic changes
+  // through command-line.
+  DiagStates.push_back(DiagState());
+  PushDiagStatePoint(&DiagStates.back(), SourceLocation());
 }
 
 void Diagnostic::SetDelayedDiagnostic(unsigned DiagID, llvm::StringRef Arg1,