diff options
| -rw-r--r-- | lib/StaticAnalyzer/Checkers/ExprEngine.cpp | 10 | ||||
| -rw-r--r-- | test/Analysis/lvalue.cpp | 6 |
2 files changed, 14 insertions, 2 deletions
diff --git a/lib/StaticAnalyzer/Checkers/ExprEngine.cpp b/lib/StaticAnalyzer/Checkers/ExprEngine.cpp index 7c1d313453..ca960142ee 100644 --- a/lib/StaticAnalyzer/Checkers/ExprEngine.cpp +++ b/lib/StaticAnalyzer/Checkers/ExprEngine.cpp @@ -3241,8 +3241,14 @@ void ExprEngine::VisitBinaryOperator(const BinaryOperator* B, LHSVal = svalBuilder.evalCast(Result, LTy, CTy); } - evalStore(Tmp3, B, LHS, *I4, state->BindExpr(B, Result), - location, LHSVal); + // In C++, assignment and compound assignment operators return an + // lvalue. + if (B->isLValue()) + state = state->BindExpr(B, location); + else + state = state->BindExpr(B, Result); + + evalStore(Tmp3, B, LHS, *I4, state, location, LHSVal); } } } diff --git a/test/Analysis/lvalue.cpp b/test/Analysis/lvalue.cpp new file mode 100644 index 0000000000..f19c59d9d2 --- /dev/null +++ b/test/Analysis/lvalue.cpp @@ -0,0 +1,6 @@ +// RUN: %clang_cc1 -analyze -analyzer-check-objc-mem -analyzer-store=region -verify %s + +int f1() { + int x = 0, y = 1; + return x += y; // Should bind a location to 'x += y'. No crash. +} |