diff options
author | Ted Kremenek <kremenek@apple.com> | 2011-01-14 20:34:15 +0000 |
---|---|---|
committer | Ted Kremenek <kremenek@apple.com> | 2011-01-14 20:34:15 +0000 |
commit | db0594bfc013131f88429add4eb653c285fa94fb (patch) | |
tree | 59a777a9a0c80f939f021c90db0061cba47b3ed3 | |
parent | 2ccf047adf877f5e821210b1ce1a2c8289acadc0 (diff) |
Rename 'RemoveDeadBindings()' to 'removeDeadBindings()'
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@123460 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | include/clang/StaticAnalyzer/PathSensitive/ConstraintManager.h | 2 | ||||
-rw-r--r-- | include/clang/StaticAnalyzer/PathSensitive/Environment.h | 2 | ||||
-rw-r--r-- | include/clang/StaticAnalyzer/PathSensitive/GRState.h | 2 | ||||
-rw-r--r-- | include/clang/StaticAnalyzer/PathSensitive/Store.h | 2 | ||||
-rw-r--r-- | lib/StaticAnalyzer/BasicConstraintManager.cpp | 4 | ||||
-rw-r--r-- | lib/StaticAnalyzer/BasicStore.cpp | 6 | ||||
-rw-r--r-- | lib/StaticAnalyzer/Checkers/ExprEngine.cpp | 2 | ||||
-rw-r--r-- | lib/StaticAnalyzer/Environment.cpp | 4 | ||||
-rw-r--r-- | lib/StaticAnalyzer/FlatStore.cpp | 2 | ||||
-rw-r--r-- | lib/StaticAnalyzer/GRState.cpp | 8 | ||||
-rw-r--r-- | lib/StaticAnalyzer/RangeConstraintManager.cpp | 4 | ||||
-rw-r--r-- | lib/StaticAnalyzer/RegionStore.cpp | 26 |
12 files changed, 32 insertions, 32 deletions
diff --git a/include/clang/StaticAnalyzer/PathSensitive/ConstraintManager.h b/include/clang/StaticAnalyzer/PathSensitive/ConstraintManager.h index 81f4558e6a..e19067dedf 100644 --- a/include/clang/StaticAnalyzer/PathSensitive/ConstraintManager.h +++ b/include/clang/StaticAnalyzer/PathSensitive/ConstraintManager.h @@ -48,7 +48,7 @@ public: virtual bool isEqual(const GRState *state, SymbolRef sym, const llvm::APSInt& V) const = 0; - virtual const GRState *RemoveDeadBindings(const GRState *state, + virtual const GRState *removeDeadBindings(const GRState *state, SymbolReaper& SymReaper) = 0; virtual void print(const GRState *state, llvm::raw_ostream& Out, diff --git a/include/clang/StaticAnalyzer/PathSensitive/Environment.h b/include/clang/StaticAnalyzer/PathSensitive/Environment.h index 8f2ebce670..da4f8571bf 100644 --- a/include/clang/StaticAnalyzer/PathSensitive/Environment.h +++ b/include/clang/StaticAnalyzer/PathSensitive/Environment.h @@ -94,7 +94,7 @@ public: Environment bindExprAndLocation(Environment Env, const Stmt *S, SVal location, SVal V); - Environment RemoveDeadBindings(Environment Env, + Environment removeDeadBindings(Environment Env, SymbolReaper &SymReaper, const GRState *ST, llvm::SmallVectorImpl<const MemRegion*>& RegionRoots); }; diff --git a/include/clang/StaticAnalyzer/PathSensitive/GRState.h b/include/clang/StaticAnalyzer/PathSensitive/GRState.h index d148f46e5a..48cc7a7fd5 100644 --- a/include/clang/StaticAnalyzer/PathSensitive/GRState.h +++ b/include/clang/StaticAnalyzer/PathSensitive/GRState.h @@ -484,7 +484,7 @@ public: ConstraintManager& getConstraintManager() { return *ConstraintMgr; } SubEngine& getOwningEngine() { return Eng; } - const GRState* RemoveDeadBindings(const GRState* St, + const GRState* removeDeadBindings(const GRState* St, const StackFrameContext *LCtx, SymbolReaper& SymReaper); diff --git a/include/clang/StaticAnalyzer/PathSensitive/Store.h b/include/clang/StaticAnalyzer/PathSensitive/Store.h index a4836d4a1d..620f50c056 100644 --- a/include/clang/StaticAnalyzer/PathSensitive/Store.h +++ b/include/clang/StaticAnalyzer/PathSensitive/Store.h @@ -153,7 +153,7 @@ public: /// casted and 'CastToTy' the result type of the cast. const MemRegion *CastRegion(const MemRegion *region, QualType CastToTy); - virtual Store RemoveDeadBindings(Store store, const StackFrameContext *LCtx, + virtual Store removeDeadBindings(Store store, const StackFrameContext *LCtx, SymbolReaper& SymReaper, llvm::SmallVectorImpl<const MemRegion*>& RegionRoots) = 0; diff --git a/lib/StaticAnalyzer/BasicConstraintManager.cpp b/lib/StaticAnalyzer/BasicConstraintManager.cpp index 8bdc4fa003..bbffa1a2fb 100644 --- a/lib/StaticAnalyzer/BasicConstraintManager.cpp +++ b/lib/StaticAnalyzer/BasicConstraintManager.cpp @@ -90,7 +90,7 @@ public: bool isEqual(const GRState* state, SymbolRef sym, const llvm::APSInt& V) const; - const GRState* RemoveDeadBindings(const GRState* state, SymbolReaper& SymReaper); + const GRState* removeDeadBindings(const GRState* state, SymbolReaper& SymReaper); void print(const GRState* state, llvm::raw_ostream& Out, const char* nl, const char *sep); @@ -276,7 +276,7 @@ bool BasicConstraintManager::isEqual(const GRState* state, SymbolRef sym, /// Scan all symbols referenced by the constraints. If the symbol is not alive /// as marked in LSymbols, mark it as dead in DSymbols. const GRState* -BasicConstraintManager::RemoveDeadBindings(const GRState* state, +BasicConstraintManager::removeDeadBindings(const GRState* state, SymbolReaper& SymReaper) { ConstEqTy CE = state->get<ConstEq>(); diff --git a/lib/StaticAnalyzer/BasicStore.cpp b/lib/StaticAnalyzer/BasicStore.cpp index 35bcf945fb..42fd3391f1 100644 --- a/lib/StaticAnalyzer/BasicStore.cpp +++ b/lib/StaticAnalyzer/BasicStore.cpp @@ -72,9 +72,9 @@ public: /// conversions between arrays and pointers. SVal ArrayToPointer(Loc Array) { return Array; } - /// RemoveDeadBindings - Scans a BasicStore of 'state' for dead values. + /// removeDeadBindings - Scans a BasicStore of 'state' for dead values. /// It updatees the GRState object in place with the values removed. - Store RemoveDeadBindings(Store store, const StackFrameContext *LCtx, + Store removeDeadBindings(Store store, const StackFrameContext *LCtx, SymbolReaper& SymReaper, llvm::SmallVectorImpl<const MemRegion*>& RegionRoots); @@ -278,7 +278,7 @@ Store BasicStoreManager::Remove(Store store, Loc loc) { } } -Store BasicStoreManager::RemoveDeadBindings(Store store, +Store BasicStoreManager::removeDeadBindings(Store store, const StackFrameContext *LCtx, SymbolReaper& SymReaper, llvm::SmallVectorImpl<const MemRegion*>& RegionRoots) diff --git a/lib/StaticAnalyzer/Checkers/ExprEngine.cpp b/lib/StaticAnalyzer/Checkers/ExprEngine.cpp index 381d81d59b..f3c305a388 100644 --- a/lib/StaticAnalyzer/Checkers/ExprEngine.cpp +++ b/lib/StaticAnalyzer/Checkers/ExprEngine.cpp @@ -557,7 +557,7 @@ void ExprEngine::ProcessStmt(const CFGStmt S, StmtNodeBuilder& builder) { } const StackFrameContext *SFC = LC->getCurrentStackFrame(); - CleanedState = StateMgr.RemoveDeadBindings(St, SFC, SymReaper); + CleanedState = StateMgr.removeDeadBindings(St, SFC, SymReaper); } else { CleanedState = EntryNode->getState(); } diff --git a/lib/StaticAnalyzer/Environment.cpp b/lib/StaticAnalyzer/Environment.cpp index 1c74352d2c..08ebf39b58 100644 --- a/lib/StaticAnalyzer/Environment.cpp +++ b/lib/StaticAnalyzer/Environment.cpp @@ -140,7 +140,7 @@ static inline bool IsLocation(const Stmt *S) { return (bool) (((uintptr_t) S) & 0x1); } -// RemoveDeadBindings: +// removeDeadBindings: // - Remove subexpression bindings. // - Remove dead block expression bindings. // - Keep live block expression bindings: @@ -148,7 +148,7 @@ static inline bool IsLocation(const Stmt *S) { // see ScanReachableSymbols. // - Mark the region in DRoots if the binding is a loc::MemRegionVal. Environment -EnvironmentManager::RemoveDeadBindings(Environment Env, +EnvironmentManager::removeDeadBindings(Environment Env, SymbolReaper &SymReaper, const GRState *ST, llvm::SmallVectorImpl<const MemRegion*> &DRoots) { diff --git a/lib/StaticAnalyzer/FlatStore.cpp b/lib/StaticAnalyzer/FlatStore.cpp index 1558db7483..e6cb58d819 100644 --- a/lib/StaticAnalyzer/FlatStore.cpp +++ b/lib/StaticAnalyzer/FlatStore.cpp @@ -45,7 +45,7 @@ public: } SVal ArrayToPointer(Loc Array); - Store RemoveDeadBindings(Store store, const StackFrameContext *LCtx, + Store removeDeadBindings(Store store, const StackFrameContext *LCtx, SymbolReaper& SymReaper, llvm::SmallVectorImpl<const MemRegion*>& RegionRoots){ return store; diff --git a/lib/StaticAnalyzer/GRState.cpp b/lib/StaticAnalyzer/GRState.cpp index 9c578dda68..60832e8f79 100644 --- a/lib/StaticAnalyzer/GRState.cpp +++ b/lib/StaticAnalyzer/GRState.cpp @@ -36,7 +36,7 @@ GRStateManager::~GRStateManager() { } const GRState* -GRStateManager::RemoveDeadBindings(const GRState* state, +GRStateManager::removeDeadBindings(const GRState* state, const StackFrameContext *LCtx, SymbolReaper& SymReaper) { @@ -49,14 +49,14 @@ GRStateManager::RemoveDeadBindings(const GRState* state, llvm::SmallVector<const MemRegion*, 10> RegionRoots; GRState NewState = *state; - NewState.Env = EnvMgr.RemoveDeadBindings(NewState.Env, SymReaper, + NewState.Env = EnvMgr.removeDeadBindings(NewState.Env, SymReaper, state, RegionRoots); // Clean up the store. - NewState.St = StoreMgr->RemoveDeadBindings(NewState.St, LCtx, + NewState.St = StoreMgr->removeDeadBindings(NewState.St, LCtx, SymReaper, RegionRoots); state = getPersistentState(NewState); - return ConstraintMgr->RemoveDeadBindings(state, SymReaper); + return ConstraintMgr->removeDeadBindings(state, SymReaper); } const GRState *GRStateManager::MarshalState(const GRState *state, diff --git a/lib/StaticAnalyzer/RangeConstraintManager.cpp b/lib/StaticAnalyzer/RangeConstraintManager.cpp index c89fa50b16..5f0a386c1a 100644 --- a/lib/StaticAnalyzer/RangeConstraintManager.cpp +++ b/lib/StaticAnalyzer/RangeConstraintManager.cpp @@ -243,7 +243,7 @@ public: return i ? *i == V : false; } - const GRState* RemoveDeadBindings(const GRState* St, SymbolReaper& SymReaper); + const GRState* removeDeadBindings(const GRState* St, SymbolReaper& SymReaper); void print(const GRState* St, llvm::raw_ostream& Out, const char* nl, const char *sep); @@ -268,7 +268,7 @@ const llvm::APSInt* RangeConstraintManager::getSymVal(const GRState* St, /// Scan all symbols referenced by the constraints. If the symbol is not alive /// as marked in LSymbols, mark it as dead in DSymbols. const GRState* -RangeConstraintManager::RemoveDeadBindings(const GRState* state, +RangeConstraintManager::removeDeadBindings(const GRState* state, SymbolReaper& SymReaper) { ConstraintRangeTy CR = state->get<ConstraintRange>(); diff --git a/lib/StaticAnalyzer/RegionStore.cpp b/lib/StaticAnalyzer/RegionStore.cpp index 7760ec006a..3ec067e74f 100644 --- a/lib/StaticAnalyzer/RegionStore.cpp +++ b/lib/StaticAnalyzer/RegionStore.cpp @@ -356,9 +356,9 @@ public: // Part of public interface to class. // State pruning. //===------------------------------------------------------------------===// - /// RemoveDeadBindings - Scans the RegionStore of 'state' for dead values. + /// removeDeadBindings - Scans the RegionStore of 'state' for dead values. /// It returns a new Store with these values removed. - Store RemoveDeadBindings(Store store, const StackFrameContext *LCtx, + Store removeDeadBindings(Store store, const StackFrameContext *LCtx, SymbolReaper& SymReaper, llvm::SmallVectorImpl<const MemRegion*>& RegionRoots); @@ -1682,17 +1682,17 @@ RegionBindings RegionStoreManager::removeBinding(RegionBindings B, //===----------------------------------------------------------------------===// namespace { -class RemoveDeadBindingsWorker : - public ClusterAnalysis<RemoveDeadBindingsWorker> { +class removeDeadBindingsWorker : + public ClusterAnalysis<removeDeadBindingsWorker> { llvm::SmallVector<const SymbolicRegion*, 12> Postponed; SymbolReaper &SymReaper; const StackFrameContext *CurrentLCtx; public: - RemoveDeadBindingsWorker(RegionStoreManager &rm, GRStateManager &stateMgr, + removeDeadBindingsWorker(RegionStoreManager &rm, GRStateManager &stateMgr, RegionBindings b, SymbolReaper &symReaper, const StackFrameContext *LCtx) - : ClusterAnalysis<RemoveDeadBindingsWorker>(rm, stateMgr, b, + : ClusterAnalysis<removeDeadBindingsWorker>(rm, stateMgr, b, /* includeGlobals = */ false), SymReaper(symReaper), CurrentLCtx(LCtx) {} @@ -1706,7 +1706,7 @@ public: }; } -void RemoveDeadBindingsWorker::VisitAddedToCluster(const MemRegion *baseR, +void removeDeadBindingsWorker::VisitAddedToCluster(const MemRegion *baseR, RegionCluster &C) { if (const VarRegion *VR = dyn_cast<VarRegion>(baseR)) { @@ -1740,13 +1740,13 @@ void RemoveDeadBindingsWorker::VisitAddedToCluster(const MemRegion *baseR, } } -void RemoveDeadBindingsWorker::VisitCluster(const MemRegion *baseR, +void removeDeadBindingsWorker::VisitCluster(const MemRegion *baseR, BindingKey *I, BindingKey *E) { for ( ; I != E; ++I) VisitBindingKey(*I); } -void RemoveDeadBindingsWorker::VisitBinding(SVal V) { +void removeDeadBindingsWorker::VisitBinding(SVal V) { // Is it a LazyCompoundVal? All referenced regions are live as well. if (const nonloc::LazyCompoundVal *LCS = dyn_cast<nonloc::LazyCompoundVal>(&V)) { @@ -1771,7 +1771,7 @@ void RemoveDeadBindingsWorker::VisitBinding(SVal V) { SymReaper.markLive(*SI); } -void RemoveDeadBindingsWorker::VisitBindingKey(BindingKey K) { +void removeDeadBindingsWorker::VisitBindingKey(BindingKey K) { const MemRegion *R = K.getRegion(); // Mark this region "live" by adding it to the worklist. This will cause @@ -1804,7 +1804,7 @@ void RemoveDeadBindingsWorker::VisitBindingKey(BindingKey K) { VisitBinding(*V); } -bool RemoveDeadBindingsWorker::UpdatePostponed() { +bool removeDeadBindingsWorker::UpdatePostponed() { // See if any postponed SymbolicRegions are actually live now, after // having done a scan. bool changed = false; @@ -1822,13 +1822,13 @@ bool RemoveDeadBindingsWorker::UpdatePostponed() { return changed; } -Store RegionStoreManager::RemoveDeadBindings(Store store, +Store RegionStoreManager::removeDeadBindings(Store store, const StackFrameContext *LCtx, SymbolReaper& SymReaper, llvm::SmallVectorImpl<const MemRegion*>& RegionRoots) { RegionBindings B = GetRegionBindings(store); - RemoveDeadBindingsWorker W(*this, StateMgr, B, SymReaper, LCtx); + removeDeadBindingsWorker W(*this, StateMgr, B, SymReaper, LCtx); W.GenerateClusters(); // Enqueue the region roots onto the worklist. |