commit 51e47df5a57430f1b691b04258e663cce68aef9d
author Eli Friedman <eli.friedman@gmail.com> Tue Feb 21 22:41:33 2012 +0000
committer Eli Friedman <eli.friedman@gmail.com> Tue Feb 21 22:41:33 2012 +0000
tree 9a406576e50e18aff9b96303e5960c9ca6e53112
parent 2789d8e753a9bdd36f2f90ba03ba4fb7521bcbb1

Fix a crash in the diangostic code in EvalConstant.  PR12043.



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

lib/AST/ExprConstant.cpp

diff --git a/lib/AST/ExprConstant.cpp b/lib/AST/ExprConstant.cpp
index 4ae5ab4..5420876 100644
--- a/lib/AST/ExprConstant.cpp
+++ b/lib/AST/ExprConstant.cpp
@@ -538,8 +538,10 @@
                                  = diag::note_invalid_subexpr_in_const_expr,
                                unsigned ExtraNotes = 0) {
       // Don't override a previous diagnostic.
-      if (!EvalStatus.Diag || !EvalStatus.Diag->empty())
+      if (!EvalStatus.Diag || !EvalStatus.Diag->empty()) {
+        HasActiveDiagnostic = false;
         return OptionalDiagnostic();
+      }
       return Diag(Loc, DiagId, ExtraNotes);
     }