From a54e824d2322dfd785c2716d0472a8aace2f61b8 Mon Sep 17 00:00:00 2001 From: Ted Kremenek Date: Thu, 30 Sep 2010 01:06:29 +0000 Subject: [PATCH] Include changes to VisitCXXMemberCallExpr (call visitor functions). git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@115120 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Checker/GRCXXExprEngine.cpp | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/lib/Checker/GRCXXExprEngine.cpp b/lib/Checker/GRCXXExprEngine.cpp index 0cae455276..c6be6b681d 100644 --- a/lib/Checker/GRCXXExprEngine.cpp +++ b/lib/Checker/GRCXXExprEngine.cpp @@ -157,13 +157,21 @@ void GRExprEngine::VisitCXXMemberCallExpr(const CXXMemberCallExpr *MCE, VisitLValue(ObjArgExpr, *I, AllArgsEvaluated); } + // Allow checkers to pre-visit the member call. + ExplodedNodeSet PreVisitChecks; + CheckerVisit(MCE, PreVisitChecks, AllArgsEvaluated, PreVisitStmtCallback); + + // Now evaluate the call itself. const CXXMethodDecl *MD = cast(ME->getMemberDecl()); assert(MD && "not a CXXMethodDecl?"); - if (!(MD->isThisDeclarationADefinition() && AMgr.shouldInlineCall())) + if (!(MD->isThisDeclarationADefinition() && AMgr.shouldInlineCall())) { // FIXME: conservative method call evaluation. + CheckerVisit(MCE, Dst, PreVisitChecks, PostVisitStmtCallback); return; + } + ExplodedNodeSet SetupThis; const StackFrameContext *SFC = AMgr.getStackFrame(MD, Pred->getLocationContext(), MCE, @@ -171,15 +179,20 @@ void GRExprEngine::VisitCXXMemberCallExpr(const CXXMemberCallExpr *MCE, Builder->getIndex()); const CXXThisRegion *ThisR = getCXXThisRegion(MD, SFC); CallEnter Loc(MCE, SFC->getAnalysisContext(), Pred->getLocationContext()); - for (ExplodedNodeSet::iterator I = AllArgsEvaluated.begin(), - E = AllArgsEvaluated.end(); I != E; ++I) { + for (ExplodedNodeSet::iterator I = PreVisitChecks.begin(), + E = PreVisitChecks.end(); I != E; ++I) { // Set up 'this' region. const GRState *state = GetState(*I); state = state->bindLoc(loc::MemRegionVal(ThisR),state->getSVal(ObjArgExpr)); - ExplodedNode *N = Builder->generateNode(Loc, state, *I); - if (N) - Dst.Add(N); + SetupThis.Add(Builder->generateNode(Loc, state, *I)); } + + // FIXME: Perform the actual method call. Right now all we do is evaluate + // the arguments. + + // Perform post-visit. + CheckerVisit(MCE, Dst, /* FIXME: don't forget to update later */ SetupThis, + PostVisitStmtCallback); } void GRExprEngine::VisitCXXNewExpr(const CXXNewExpr *CNE, ExplodedNode *Pred, -- 2.40.0