diff options
| -rw-r--r-- | lib/StaticAnalyzer/Core/Environment.cpp | 4 | ||||
| -rw-r--r-- | test/Analysis/cxx-crashes.cpp | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/lib/StaticAnalyzer/Core/Environment.cpp b/lib/StaticAnalyzer/Core/Environment.cpp index a0a93c68a3..33f1945ce7 100644 --- a/lib/StaticAnalyzer/Core/Environment.cpp +++ b/lib/StaticAnalyzer/Core/Environment.cpp @@ -56,6 +56,7 @@ SVal Environment::getSVal(const Stmt *E, SValBuilder& svalBuilder) const { return svalBuilder.makeIntVal(cast<IntegerLiteral>(E)); } case Stmt::ImplicitCastExprClass: + case Stmt::CXXFunctionalCastExprClass: case Stmt::CStyleCastExprClass: { // We blast through no-op casts to get the descendant // subexpression that has a value. @@ -75,9 +76,6 @@ SVal Environment::getSVal(const Stmt *E, SValBuilder& svalBuilder) const { case Stmt::CXXBindTemporaryExprClass: E = cast<CXXBindTemporaryExpr>(E)->getSubExpr(); continue; - case Stmt::CXXFunctionalCastExprClass: - E = cast<CXXFunctionalCastExpr>(E)->getSubExpr(); - continue; // Handle all other Stmt* using a lookup. default: break; diff --git a/test/Analysis/cxx-crashes.cpp b/test/Analysis/cxx-crashes.cpp index db2298df89..c15eea862e 100644 --- a/test/Analysis/cxx-crashes.cpp +++ b/test/Analysis/cxx-crashes.cpp @@ -6,6 +6,10 @@ int f1(char *dst) { return !(q >= p); } +long f2(char *c) { + return long(c) & 1; +} + namespace { struct A { }; |