diff options
author | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2012-02-27 20:21:34 +0000 |
---|---|---|
committer | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2012-02-27 20:21:34 +0000 |
commit | 91d0098dc81c34f309aba499c74f839d03b937b2 (patch) | |
tree | e44300a4dea775fe46e1f87a8865ba4dd1cb17e0 /clang | |
parent | 8fe40cd659fffeedb934108d486df0d6c63a66ad (diff) | |
download | bcm5719-llvm-91d0098dc81c34f309aba499c74f839d03b937b2.tar.gz bcm5719-llvm-91d0098dc81c34f309aba499c74f839d03b937b2.zip |
Revert testing code I committed by mistake in r151464.
llvm-svn: 151548
Diffstat (limited to 'clang')
-rw-r--r-- | clang/lib/AST/ExprConstant.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/clang/lib/AST/ExprConstant.cpp b/clang/lib/AST/ExprConstant.cpp index 0cb8e808714..44e41864f0b 100644 --- a/clang/lib/AST/ExprConstant.cpp +++ b/clang/lib/AST/ExprConstant.cpp @@ -406,7 +406,7 @@ namespace { /// certain things in certain situations. struct EvalInfo { ASTContext &Ctx; -CCValue WVal; + /// EvalStatus - Contains information about the evaluation. Expr::EvalStatus &EvalStatus; @@ -1205,10 +1205,10 @@ static bool HandleConversionToBool(const CCValue &Val, bool &Result) { static bool EvaluateAsBooleanCondition(const Expr *E, bool &Result, EvalInfo &Info) { assert(E->isRValue() && "missing lvalue-to-rvalue conv in bool condition"); - //CCValue Val; - if (!Evaluate(Info.WVal, Info, E)) + CCValue Val; + if (!Evaluate(Val, Info, E)) return false; - return HandleConversionToBool(Info.WVal, Result); + return HandleConversionToBool(Val, Result); } template<typename T> |