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 | d411a4b23077b29e19c9371bbb19b054a374d922 (patch) | |
tree | 4b0b381b5fb736340e3869ea55b62a2858a55c23 /lib/AST/ExprConstant.cpp | |
parent | 361ae9a83e1e3098adabaaad34d0925b30358f38 (diff) |
Revert testing code I committed by mistake in r151464.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@151548 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/AST/ExprConstant.cpp')
-rw-r--r-- | lib/AST/ExprConstant.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/AST/ExprConstant.cpp b/lib/AST/ExprConstant.cpp index 0cb8e80871..44e41864f0 100644 --- a/lib/AST/ExprConstant.cpp +++ b/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> |