commit 8f66cdffa00fde5b7536178c05cd4ade1239a529
author Eli Friedman <eli.friedman@gmail.com> Mon Feb 06 21:50:18 2012 +0000
committer Eli Friedman <eli.friedman@gmail.com> Mon Feb 06 21:50:18 2012 +0000
tree 7f45753a6a770a8cc6702be3d4d1587ef7fe7910
parent d22b98aad24577c224813c0a301affa9fae8e57f

Fix the result of VarDecl::checkInitIsICE so it is consistently accurate in C++11 mode.  PR11928.

llvm-svn: 149908

clang/lib/AST/Decl.cpp

diff --git a/clang/lib/AST/Decl.cpp b/clang/lib/AST/Decl.cpp
index 123b14c..76d8ec0 100644
--- a/clang/lib/AST/Decl.cpp
+++ b/clang/lib/AST/Decl.cpp
@@ -1413,7 +1413,7 @@
   // expression as a side-effect.
   if (getASTContext().getLangOptions().CPlusPlus0x && !Eval->CheckedICE) {
     Eval->CheckedICE = true;
-    Eval->IsICE = Notes.empty();
+    Eval->IsICE = Result && Notes.empty();
   }
 
   return Result ? &Eval->Evaluated : 0;