diff options
Diffstat (limited to 'clang/lib/Analysis/CFG.cpp')
| -rw-r--r-- | clang/lib/Analysis/CFG.cpp | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/clang/lib/Analysis/CFG.cpp b/clang/lib/Analysis/CFG.cpp index 96130c25be8..cfda27dd37a 100644 --- a/clang/lib/Analysis/CFG.cpp +++ b/clang/lib/Analysis/CFG.cpp @@ -1039,13 +1039,11 @@ private: if (!areExprTypesCompatible(Expr1, Expr2)) return {}; - Expr::EvalResult L1Result, L2Result; - if (!Expr1->EvaluateAsInt(L1Result, *Context) || - !Expr2->EvaluateAsInt(L2Result, *Context)) - return {}; + llvm::APSInt L1, L2; - llvm::APSInt L1 = L1Result.Val.getInt(); - llvm::APSInt L2 = L2Result.Val.getInt(); + if (!Expr1->EvaluateAsInt(L1, *Context) || + !Expr2->EvaluateAsInt(L2, *Context)) + return {}; // Can't compare signed with unsigned or with different bit width. if (L1.isSigned() != L2.isSigned() || L1.getBitWidth() != L2.getBitWidth()) @@ -1136,16 +1134,13 @@ private: case BO_And: { // If either operand is zero, we know the value // must be false. - Expr::EvalResult LHSResult; - if (Bop->getLHS()->EvaluateAsInt(LHSResult, *Context)) { - llvm::APSInt IntVal = LHSResult.Val.getInt(); + llvm::APSInt IntVal; + if (Bop->getLHS()->EvaluateAsInt(IntVal, *Context)) { if (!IntVal.getBoolValue()) { return TryResult(false); } } - Expr::EvalResult RHSResult; - if (Bop->getRHS()->EvaluateAsInt(RHSResult, *Context)) { - llvm::APSInt IntVal = RHSResult.Val.getInt(); + if (Bop->getRHS()->EvaluateAsInt(IntVal, *Context)) { if (!IntVal.getBoolValue()) { return TryResult(false); } |
