From: Ted Kremenek Date: Thu, 19 Feb 2009 23:47:02 +0000 (+0000) Subject: retain/release checker: Generate an intermediate simulation node for "leak" X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=33b6f6352d3c7e4eb026ce129f48a72061a4e129;p=clang retain/release checker: Generate an intermediate simulation node for "leak" transitions and then generate a subsequent node that removes the dead symbol bindings. This should drastically improve caching in the simulation graph when retain-counted objects are being tracked. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@65082 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Analysis/CFRefCount.cpp b/lib/Analysis/CFRefCount.cpp index c86b960af1..36c1b79af3 100644 --- a/lib/Analysis/CFRefCount.cpp +++ b/lib/Analysis/CFRefCount.cpp @@ -1245,6 +1245,7 @@ void RefVal::print(std::ostream& Out) const { typedef llvm::ImmutableMap RefBindings; static int RefBIndex = 0; +static std::pair LeakProgramPointTag(&RefBIndex, 0); namespace clang { template<> @@ -2745,8 +2746,7 @@ void CFRefCount::EvalDeadSymbols(ExplodedNodeSet& Dst, const GRState* St, SymbolReaper& SymReaper) { - // FIXME: a lot of copy-and-paste from EvalEndPath. Refactor. - + // FIXME: a lot of copy-and-paste from EvalEndPath. Refactor. RefBindings B = St->get(); llvm::SmallVector, 10> Leaked; @@ -2759,7 +2759,7 @@ void CFRefCount::EvalDeadSymbols(ExplodedNodeSet& Dst, bool hasLeak = false; std::pair X - = HandleSymbolDeath(Eng.getStateManager(), St, 0, *I, *T, hasLeak); + = HandleSymbolDeath(Eng.getStateManager(), St, 0, *I, *T, hasLeak); St = X.first; @@ -2767,23 +2767,44 @@ void CFRefCount::EvalDeadSymbols(ExplodedNodeSet& Dst, Leaked.push_back(std::make_pair(*I,X.second)); } - if (Leaked.empty()) - return; - - ExplodedNode* N = Builder.MakeNode(Dst, S, Pred, St); - - if (!N) - return; + if (!Leaked.empty()) { + // Create a new intermediate node representing the leak point. We + // use a special program point that represents this checker-specific + // transition. We use the address of RefBIndex as a unique tag for this + // checker. We will create another node (if we don't cache out) that + // removes the retain-count bindings from the state. + // NOTE: We use 'generateNode' so that it does interplay with the + // auto-transition logic. + ExplodedNode* N = + Builder.generateNode(PostStmtCustom(S, &LeakProgramPointTag), St, Pred); - for (llvm::SmallVector, 10>::iterator - I = Leaked.begin(), E = Leaked.end(); I != E; ++I) { + if (!N) + return; + + // Generate the bug reports. + for (llvm::SmallVectorImpl >::iterator + I = Leaked.begin(), E = Leaked.end(); I != E; ++I) { + + CFRefBug *BT = static_cast(I->second ? leakAtReturn + : leakWithinFunction); + assert(BT && "BugType not initialized."); + CFRefLeakReport* report = new CFRefLeakReport(*BT, *this, N, I->first, Eng); + BR->EmitReport(report); + } - CFRefBug *BT = static_cast(I->second ? leakAtReturn - : leakWithinFunction); - assert(BT && "BugType not initialized."); - CFRefLeakReport* report = new CFRefLeakReport(*BT, *this, N, I->first, Eng); - BR->EmitReport(report); + Pred = N; } + + // Now generate a new node that nukes the old bindings. + GRStateRef state(St, Eng.getStateManager()); + RefBindings::Factory& F = state.get_context(); + + for (SymbolReaper::dead_iterator I = SymReaper.dead_begin(), + E = SymReaper.dead_end(); I!=E; ++I) + B = F.Remove(B, *I); + + state = state.set(B); + Builder.MakeNode(Dst, S, Pred, state); } void CFRefCount::ProcessNonLeakError(ExplodedNodeSet& Dst,