diff options
Diffstat (limited to 'include/clang')
| -rw-r--r-- | include/clang/Analysis/PathSensitive/Environment.h | 4 | ||||
| -rw-r--r-- | include/clang/Analysis/PathSensitive/GRExprEngine.h | 16 | ||||
| -rw-r--r-- | include/clang/Analysis/PathSensitive/GRState.h | 22 |
3 files changed, 21 insertions, 21 deletions
diff --git a/include/clang/Analysis/PathSensitive/Environment.h b/include/clang/Analysis/PathSensitive/Environment.h index faceada99b..7b1ae9f881 100644 --- a/include/clang/Analysis/PathSensitive/Environment.h +++ b/include/clang/Analysis/PathSensitive/Environment.h @@ -139,8 +139,8 @@ public: return Environment(F.GetEmptyMap(), F.GetEmptyMap()); } - Environment SetSVal(const Environment& Env, Expr* E, SVal V, - bool isBlkExpr, bool Invalidate); + Environment BindExpr(const Environment& Env, Expr* E, SVal V, + bool isBlkExpr, bool Invalidate); Environment RemoveDeadBindings(Environment Env, Stmt* Loc, const LiveVariables& Liveness, diff --git a/include/clang/Analysis/PathSensitive/GRExprEngine.h b/include/clang/Analysis/PathSensitive/GRExprEngine.h index 6031c8b745..af5a10346e 100644 --- a/include/clang/Analysis/PathSensitive/GRExprEngine.h +++ b/include/clang/Analysis/PathSensitive/GRExprEngine.h @@ -405,22 +405,22 @@ protected: public: - const GRState* SetSVal(const GRState* St, Expr* Ex, SVal V) { - return StateMgr.SetSVal(St, Ex, V); + const GRState* BindExpr(const GRState* St, Expr* Ex, SVal V) { + return StateMgr.BindExpr(St, Ex, V); } - const GRState* SetSVal(const GRState* St, const Expr* Ex, SVal V) { - return SetSVal(St, const_cast<Expr*>(Ex), V); + const GRState* BindExpr(const GRState* St, const Expr* Ex, SVal V) { + return BindExpr(St, const_cast<Expr*>(Ex), V); } protected: - const GRState* SetBlkExprSVal(const GRState* St, Expr* Ex, SVal V) { - return StateMgr.SetSVal(St, Ex, V, true, false); + const GRState* BindBlkExpr(const GRState* St, Expr* Ex, SVal V) { + return StateMgr.BindExpr(St, Ex, V, true, false); } - const GRState* SetSVal(const GRState* St, Loc LV, SVal V) { - return StateMgr.SetSVal(St, LV, V); + const GRState* BindLoc(const GRState* St, Loc LV, SVal V) { + return StateMgr.BindLoc(St, LV, V); } SVal GetSVal(const GRState* St, Expr* Ex) { diff --git a/include/clang/Analysis/PathSensitive/GRState.h b/include/clang/Analysis/PathSensitive/GRState.h index 5d91b2fa61..175b17954d 100644 --- a/include/clang/Analysis/PathSensitive/GRState.h +++ b/include/clang/Analysis/PathSensitive/GRState.h @@ -398,11 +398,11 @@ public: return St->getEnvironment().GetBlkExprSVal(Ex, BasicVals); } - const GRState* SetSVal(const GRState* St, Expr* Ex, SVal V, - bool isBlkExpr, bool Invalidate) { + const GRState* BindExpr(const GRState* St, Expr* Ex, SVal V, + bool isBlkExpr, bool Invalidate) { const Environment& OldEnv = St->getEnvironment(); - Environment NewEnv = EnvMgr.SetSVal(OldEnv, Ex, V, isBlkExpr, Invalidate); + Environment NewEnv = EnvMgr.BindExpr(OldEnv, Ex, V, isBlkExpr, Invalidate); if (NewEnv == OldEnv) return St; @@ -412,8 +412,8 @@ public: return getPersistentState(NewSt); } - const GRState* SetSVal(const GRState* St, Expr* Ex, SVal V, - bool Invalidate = true) { + const GRState* BindExpr(const GRState* St, Expr* Ex, SVal V, + bool Invalidate = true) { bool isBlkExpr = false; @@ -426,7 +426,7 @@ public: return St; } - return SetSVal(St, Ex, V, isBlkExpr, Invalidate); + return BindExpr(St, Ex, V, isBlkExpr, Invalidate); } SVal ArrayToPointer(SVal Array) { @@ -456,11 +456,11 @@ public: return StoreMgr->GetRegionSVal(St->getStore(), R); } - void SetSVal(GRState& St, Loc LV, SVal V) { + void BindLoc(GRState& St, Loc LV, SVal V) { St.St = StoreMgr->Bind(St.St, LV, V); } - const GRState* SetSVal(const GRState* St, Loc LV, SVal V); + const GRState* BindLoc(const GRState* St, Loc LV, SVal V); void Unbind(GRState& St, Loc LV) { St.St = StoreMgr->Remove(St.St, LV); @@ -558,16 +558,16 @@ public: } GRStateRef SetSVal(Expr* Ex, SVal V, bool isBlkExpr, bool Invalidate) { - return GRStateRef(Mgr->SetSVal(St, Ex, V, isBlkExpr, Invalidate), *Mgr); + return GRStateRef(Mgr->BindExpr(St, Ex, V, isBlkExpr, Invalidate), *Mgr); } GRStateRef SetSVal(Expr* Ex, SVal V, bool Invalidate = true) { - return GRStateRef(Mgr->SetSVal(St, Ex, V, Invalidate), *Mgr); + return GRStateRef(Mgr->BindExpr(St, Ex, V, Invalidate), *Mgr); } GRStateRef SetSVal(Loc LV, SVal V) { GRState StImpl = *St; - Mgr->SetSVal(StImpl, LV, V); + Mgr->BindLoc(StImpl, LV, V); return GRStateRef(Mgr->getPersistentState(StImpl), *Mgr); } |