summaryrefslogtreecommitdiffstats
path: root/clang/lib/Sema
diff options
context:
space:
mode:
authorRichard Smith <richard-llvm@metafoo.co.uk>2011-10-16 23:01:09 +0000
committerRichard Smith <richard-llvm@metafoo.co.uk>2011-10-16 23:01:09 +0000
commit00ab3ae72bf624772fa3ae5c269da54fe944aede (patch)
treed9e0bea1ee12731827fdfcce7364f62796164bdd /clang/lib/Sema
parent9aa3943d9efad4509fcdba6ce19291f7bb4b2084 (diff)
downloadbcm5719-llvm-00ab3ae72bf624772fa3ae5c269da54fe944aede.tar.gz
bcm5719-llvm-00ab3ae72bf624772fa3ae5c269da54fe944aede.zip
Slightly simplify a constant expression check. No functional change.
llvm-svn: 142167
Diffstat (limited to 'clang/lib/Sema')
-rw-r--r--clang/lib/Sema/SemaExpr.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp
index 0a0009e6021..83002d56956 100644
--- a/clang/lib/Sema/SemaExpr.cpp
+++ b/clang/lib/Sema/SemaExpr.cpp
@@ -6802,10 +6802,10 @@ inline QualType Sema::CheckLogicalOperands( // C99 6.5.[13,14]
// that isn't 0 or 1 (which indicate a potential logical operation that
// happened to fold to true/false) then warn.
// Parens on the RHS are ignored.
- Expr::EvalResult Result;
- if (RHS.get()->Evaluate(Result, Context) && !Result.HasSideEffects)
+ llvm::APSInt Result;
+ if (RHS.get()->EvaluateAsInt(Result, Context))
if ((getLangOptions().Bool && !RHS.get()->getType()->isBooleanType()) ||
- (Result.Val.getInt() != 0 && Result.Val.getInt() != 1)) {
+ (Result != 0 && Result != 1)) {
Diag(Loc, diag::warn_logical_instead_of_bitwise)
<< RHS.get()->getSourceRange()
<< (Opc == BO_LAnd ? "&&" : "||");
OpenPOWER on IntegriCloud