[cfe-commits] r57107 - in /cfe/trunk: include/clang/Analysis/PathSensitive/Store.h lib/Analysis/BasicStore.cpp lib/Analysis/GRState.cpp
Ted Kremenek
kremenek at apple.com
Mon Oct 6 08:19:20 PDT 2008
Looks good!
On Oct 5, 2008, at 5:12 AM, Zhongxing Xu wrote:
> Author: zhongxingxu
> Date: Sun Oct 5 07:12:48 2008
> New Revision: 57107
>
> URL: http://llvm.org/viewvc/llvm-project?rev=57107&view=rev
> Log:
> Remove redundant parameter and rename StMgr to StateMgr.
>
> Modified:
> cfe/trunk/include/clang/Analysis/PathSensitive/Store.h
> cfe/trunk/lib/Analysis/BasicStore.cpp
> cfe/trunk/lib/Analysis/GRState.cpp
>
> Modified: cfe/trunk/include/clang/Analysis/PathSensitive/Store.h
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Analysis/PathSensitive/Store.h?rev=57107&r1=57106&r2=57107&view=diff
>
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- cfe/trunk/include/clang/Analysis/PathSensitive/Store.h (original)
> +++ cfe/trunk/include/clang/Analysis/PathSensitive/Store.h Sun Oct
> 5 07:12:48 2008
> @@ -39,14 +39,14 @@
> virtual RVal GetRVal(Store St, LVal LV, QualType T = QualType()) =
> 0;
> virtual Store SetRVal(Store St, LVal LV, RVal V) = 0;
> virtual Store Remove(Store St, LVal LV) = 0;
> - virtual Store getInitialStore(GRStateManager& StateMgr) = 0;
> + virtual Store getInitialStore() = 0;
>
> virtual Store
> RemoveDeadBindings(Store store, Stmt* Loc, const LiveVariables&
> Live,
> llvm::SmallVectorImpl<const MemRegion*>&
> RegionRoots,
> LiveSymbolsTy& LSymbols, DeadSymbolsTy&
> DSymbols) = 0;
>
> - virtual Store AddDecl(Store store, GRStateManager& StMgr,
> + virtual Store AddDecl(Store store,
> const VarDecl* VD, Expr* Ex,
> RVal InitVal = UndefinedVal(), unsigned
> Count = 0) = 0;
>
>
> Modified: cfe/trunk/lib/Analysis/BasicStore.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Analysis/BasicStore.cpp?rev=57107&r1=57106&r2=57107&view=diff
>
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- cfe/trunk/lib/Analysis/BasicStore.cpp (original)
> +++ cfe/trunk/lib/Analysis/BasicStore.cpp Sun Oct 5 07:12:48 2008
> @@ -25,10 +25,10 @@
>
> class VISIBILITY_HIDDEN BasicStoreManager : public StoreManager {
> VarBindingsTy::Factory VBFactory;
> - GRStateManager& StMgr;
> + GRStateManager& StateMgr;
>
> public:
> - BasicStoreManager(GRStateManager& mgr) : StMgr(mgr) {}
> + BasicStoreManager(GRStateManager& mgr) : StateMgr(mgr) {}
>
> virtual ~BasicStoreManager() {}
>
> @@ -36,7 +36,7 @@
> virtual Store SetRVal(Store St, LVal LV, RVal V);
> virtual Store Remove(Store St, LVal LV);
>
> - virtual Store getInitialStore(GRStateManager& StateMgr);
> + virtual Store getInitialStore();
>
> virtual Store
> RemoveDeadBindings(Store store, Stmt* Loc, const LiveVariables&
> Live,
> @@ -45,7 +45,7 @@
>
> virtual void iterBindings(Store store, BindingsHandler& f);
>
> - virtual Store AddDecl(Store store, GRStateManager& StateMgr,
> + virtual Store AddDecl(Store store,
> const VarDecl* VD, Expr* Ex,
> RVal InitVal = UndefinedVal(), unsigned
> Count = 0);
>
> @@ -164,7 +164,7 @@
> // Iterate over the variable bindings.
> for (VarBindingsTy::iterator I=B.begin(), E=B.end(); I!=E ; ++I)
> if (Liveness.isLive(Loc, I.getKey())) {
> - RegionRoots.push_back(StMgr.getRegion(I.getKey()));
> + RegionRoots.push_back(StateMgr.getRegion(I.getKey()));
> RVal X = I.getData();
>
> for (symbol_iterator SI=X.symbol_begin(), SE=X.symbol_end();
> SI!=SE; ++SI)
> @@ -198,7 +198,7 @@
>
> // Remove dead variable bindings.
> for (VarBindingsTy::iterator I=B.begin(), E=B.end(); I!=E ; ++I) {
> - const VarRegion* R =
> cast<VarRegion>(StMgr.getRegion(I.getKey()));
> + const VarRegion* R =
> cast<VarRegion>(StateMgr.getRegion(I.getKey()));
>
> if (!Marked.count(R)) {
> store = Remove(store, lval::MemRegionVal(R));
> @@ -212,7 +212,7 @@
> return store;
> }
>
> -Store BasicStoreManager::getInitialStore(GRStateManager& StateMgr) {
> +Store BasicStoreManager::getInitialStore() {
> // The LiveVariables information already has a compilation of all
> VarDecls
> // used in the function. Iterate through this set, and
> "symbolicate"
> // any VarDecl whose value originally comes from outside the
> function.
> @@ -240,14 +240,14 @@
> ? RVal::GetSymbolValue(StateMgr.getSymbolManager(),
> VD)
> : UndefinedVal();
>
> - St = SetRVal(St, StMgr.getLVal(VD), X);
> + St = SetRVal(St, StateMgr.getLVal(VD), X);
> }
> }
> }
> return St;
> }
>
> -Store BasicStoreManager::AddDecl(Store store, GRStateManager&
> StateMgr,
> +Store BasicStoreManager::AddDecl(Store store,
> const VarDecl* VD, Expr* Ex,
> RVal InitVal, unsigned Count) {
>
> @@ -280,16 +280,16 @@
> if (!Ex) {
> QualType T = VD->getType();
> if (LVal::IsLValType(T))
> - store = SetRVal(store, StMgr.getLVal(VD),
> + store = SetRVal(store, StateMgr.getLVal(VD),
> lval::ConcreteInt(BasicVals.getValue(0,
> T)));
> else if (T->isIntegerType())
> - store = SetRVal(store, StMgr.getLVal(VD),
> + store = SetRVal(store, StateMgr.getLVal(VD),
> nonlval::ConcreteInt(BasicVals.getValue(0,
> T)));
> else {
> // assert(0 && "ignore other types of variables");
> }
> } else {
> - store = SetRVal(store, StMgr.getLVal(VD), InitVal);
> + store = SetRVal(store, StateMgr.getLVal(VD), InitVal);
> }
> }
> } else {
> @@ -307,7 +307,7 @@
> : cast<RVal>(nonlval::SymbolVal(Sym));
> }
>
> - store = SetRVal(store, StMgr.getLVal(VD), V);
> + store = SetRVal(store, StateMgr.getLVal(VD), V);
> }
> }
>
> @@ -337,7 +337,7 @@
>
> for (VarBindingsTy::iterator I=B.begin(), E=B.end(); I != E; ++I) {
>
> - f.HandleBinding(*this, store,
> StMgr.getRegion(I.getKey()),I.getData());
> + f.HandleBinding(*this, store,
> StateMgr.getRegion(I.getKey()),I.getData());
> }
> }
>
>
> Modified: cfe/trunk/lib/Analysis/GRState.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Analysis/GRState.cpp?rev=57107&r1=57106&r2=57107&view=diff
>
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- cfe/trunk/lib/Analysis/GRState.cpp (original)
> +++ cfe/trunk/lib/Analysis/GRState.cpp Sun Oct 5 07:12:48 2008
> @@ -79,10 +79,10 @@
> Store NewStore;
>
> if (Ex)
> - NewStore = StMgr->AddDecl(OldStore, *this, VD, Ex,
> + NewStore = StMgr->AddDecl(OldStore, VD, Ex,
> GetRVal(St, Ex), Count);
> else
> - NewStore = StMgr->AddDecl(OldStore, *this, VD, Ex);
> + NewStore = StMgr->AddDecl(OldStore, VD, Ex);
>
> if (NewStore == OldStore)
> return St;
> @@ -107,7 +107,7 @@
> const GRState* GRStateManager::getInitialState() {
>
> GRState StateImpl(EnvMgr.getInitialEnvironment(),
> - StMgr->getInitialStore(*this),
> + StMgr->getInitialStore(),
> GDMFactory.GetEmptyMap());
>
> return getPersistentState(StateImpl);
>
>
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
More information about the cfe-commits
mailing list