commit ebea9aff0da1848d805d367f0c882e1a4188e284
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 980bc170c20e0928dfba86eb693a0cc840a20298
parent d6e765c69f3e2eb313e3f1be997529839009c91c

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

llvm-svn: 151100

clang/lib/AST/ExprConstant.cpp

diff --git a/clang/lib/AST/ExprConstant.cpp b/clang/lib/AST/ExprConstant.cpp
index 4ae5ab4..5420876 100644
--- a/clang/lib/AST/ExprConstant.cpp
+++ b/clang/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);
     }