diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Analysis/LiveVariables.cpp | 7 | ||||
| -rw-r--r-- | lib/StaticAnalyzer/Core/ObjCMessage.cpp | 8 |
2 files changed, 11 insertions, 4 deletions
diff --git a/lib/Analysis/LiveVariables.cpp b/lib/Analysis/LiveVariables.cpp index be6e659bd9..c800c70a38 100644 --- a/lib/Analysis/LiveVariables.cpp +++ b/lib/Analysis/LiveVariables.cpp @@ -352,9 +352,10 @@ void TransferFunctions::Visit(Stmt *S) { case Stmt::CXXMemberCallExprClass: { // Include the implicit "this" pointer as being live. CXXMemberCallExpr *CE = cast<CXXMemberCallExpr>(S); - val.liveStmts = - LV.SSetFact.add(val.liveStmts, - CE->getImplicitObjectArgument()->IgnoreParens()); + if (Expr *ImplicitObj = CE->getImplicitObjectArgument()) { + ImplicitObj = ImplicitObj->IgnoreParens(); + val.liveStmts = LV.SSetFact.add(val.liveStmts, ImplicitObj); + } break; } case Stmt::DeclStmtClass: { diff --git a/lib/StaticAnalyzer/Core/ObjCMessage.cpp b/lib/StaticAnalyzer/Core/ObjCMessage.cpp index 112c468210..0974fe877a 100644 --- a/lib/StaticAnalyzer/Core/ObjCMessage.cpp +++ b/lib/StaticAnalyzer/Core/ObjCMessage.cpp @@ -148,7 +148,13 @@ SVal CallOrObjCMessage::getCXXCallee() const { const CallExpr *ActualCall = CallE.get<const CallExpr *>(); const Expr *callee = cast<CXXMemberCallExpr>(ActualCall)->getImplicitObjectArgument(); - return State->getSVal(callee); + + // FIXME: Will eventually need to cope with member pointers. This is + // a limitation in getImplicitObjectArgument(). + if (!callee) + return UnknownVal(); + + return State->getSVal(callee); } SVal |