summaryrefslogtreecommitdiffstats
path: root/clang/lib/AST/Decl.cpp
diff options
context:
space:
mode:
authorEli Friedman <eli.friedman@gmail.com>2012-02-06 21:50:18 +0000
committerEli Friedman <eli.friedman@gmail.com>2012-02-06 21:50:18 +0000
commit8f66cdffa00fde5b7536178c05cd4ade1239a529 (patch)
tree7f45753a6a770a8cc6702be3d4d1587ef7fe7910 /clang/lib/AST/Decl.cpp
parentd22b98aad24577c224813c0a301affa9fae8e57f (diff)
downloadbcm5719-llvm-8f66cdffa00fde5b7536178c05cd4ade1239a529.tar.gz
bcm5719-llvm-8f66cdffa00fde5b7536178c05cd4ade1239a529.zip
Fix the result of VarDecl::checkInitIsICE so it is consistently accurate in C++11 mode. PR11928.
llvm-svn: 149908
Diffstat (limited to 'clang/lib/AST/Decl.cpp')
-rw-r--r--clang/lib/AST/Decl.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/AST/Decl.cpp b/clang/lib/AST/Decl.cpp
index 123b14c0560..76d8ec06bf8 100644
--- a/clang/lib/AST/Decl.cpp
+++ b/clang/lib/AST/Decl.cpp
@@ -1413,7 +1413,7 @@ APValue *VarDecl::evaluateValue(
// 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;
OpenPOWER on IntegriCloud