maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Moved implementation of "RemoveDeadBindings" from the main 

GRConstants logic to ValueStateManager.

llvm-svn: 46888
This commit is contained in:
Ted Kremenek 2008-02-08 19:17:19 +00:00
parent 5d9073c776
commit 80ff44ff30
3 changed files with 82 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
clang/Analysis/GRConstants.cpp
View File

@ -192,11 +192,13 @@ public:
/// nodes by processing the 'effects' of a branch condition.
void ProcessBranch(Expr* Condition, Stmt* Term, BranchNodeBuilder& builder);
/// RemoveDeadBindings - Return a new state that is the same as 'M' except
/// RemoveDeadBindings - Return a new state that is the same as 'St' except
/// that all subexpression mappings are removed and that any
/// block-level expressions that are not live at 'S' also have their
/// mappings removed.
StateTy RemoveDeadBindings(Stmt* S, StateTy M);
inline StateTy RemoveDeadBindings(Stmt* S, StateTy St) {
return StateMgr.RemoveDeadBindings(St, S, Liveness);
}
StateTy SetValue(StateTy St, Stmt* S, const RValue& V);
@ -509,76 +511,6 @@ void GRConstants::ProcessStmt(Stmt* S, StmtNodeBuilder& builder) {
Builder = NULL;
}
GRConstants::StateTy GRConstants::RemoveDeadBindings(Stmt* Loc, StateTy M) {
// This code essentially performs a "mark-and-sweep" of the VariableBindings.
// The roots are any Block-level exprs and Decls that our liveness algorithm
// tells us are live. We then see what Decls they may reference, and keep
// those around. This code more than likely can be made faster, and the
// frequency of which this method is called should be experimented with
// for optimum performance.
llvm::SmallVector<ValueDecl*, 10> WList;
for (StateTy::vb_iterator I = M.begin(), E = M.end(); I!=E ; ++I) {
// Remove old bindings for subexpressions.
if (I.getKey().isSubExpr()) {
M = StateMgr.Remove(M, I.getKey());
continue;
}
if (I.getKey().isBlkExpr()) {
if (Liveness.isLive(Loc, cast<Stmt>(I.getKey()))) {
if (isa<lval::DeclVal>(I.getData())) {
lval::DeclVal LV = cast<lval::DeclVal>(I.getData());
WList.push_back(LV.getDecl());
}
}
else
M = StateMgr.Remove(M, I.getKey());
continue;
}
assert (I.getKey().isDecl());
if (VarDecl* V = dyn_cast<VarDecl>(cast<ValueDecl>(I.getKey())))
if (Liveness.isLive(Loc, V))
WList.push_back(V);
}
llvm::SmallPtrSet<ValueDecl*, 10> Marked;
while (!WList.empty()) {
ValueDecl* V = WList.back();
WList.pop_back();
if (Marked.count(V))
continue;
Marked.insert(V);
if (V->getType()->isPointerType()) {
const LValue& LV = cast<LValue>(GetValue(M, lval::DeclVal(V)));
if (!isa<lval::DeclVal>(LV))
continue;
const lval::DeclVal& LVD = cast<lval::DeclVal>(LV);
WList.push_back(LVD.getDecl());
}
}
for (StateTy::vb_iterator I = M.begin(), E = M.end(); I!=E ; ++I)
if (I.getKey().isDecl())
if (VarDecl* V = dyn_cast<VarDecl>(cast<ValueDecl>(I.getKey())))
if (!Marked.count(V))
M = StateMgr.Remove(M, V);
return M;
}
GRConstants::NodeTy*
GRConstants::Nodify(NodeSet& Dst, Stmt* S, NodeTy* Pred, StateTy St) {

71
clang/Analysis/ValueState.cpp
View File

@ -31,6 +31,77 @@ const llvm::APSInt* ValueState::getSymVal(SymbolID sym) const {
return T ? T->getValue().second : NULL;
}
ValueState
ValueStateManager::RemoveDeadBindings(ValueState St, Stmt* Loc,
const LiveVariables& Liveness) {
// This code essentially performs a "mark-and-sweep" of the VariableBindings.
// The roots are any Block-level exprs and Decls that our liveness algorithm
// tells us are live. We then see what Decls they may reference, and keep
// those around. This code more than likely can be made faster, and the
// frequency of which this method is called should be experimented with
// for optimum performance.
llvm::SmallVector<ValueDecl*, 10> WList;
for (StateTy::vb_iterator I = St.begin(), E = St.end(); I!=E ; ++I) {
// Remove old bindings for subexpressions.
if (I.getKey().isSubExpr()) {
St = Remove(St, I.getKey());
continue;
}
if (I.getKey().isBlkExpr()) {
if (Liveness.isLive(Loc, cast<Stmt>(I.getKey()))) {
if (isa<lval::DeclVal>(I.getData())) {
lval::DeclVal LV = cast<lval::DeclVal>(I.getData());
WList.push_back(LV.getDecl());
}
}
else
St = Remove(St, I.getKey());
continue;
}
assert (I.getKey().isDecl());
if (VarDecl* V = dyn_cast<VarDecl>(cast<ValueDecl>(I.getKey())))
if (Liveness.isLive(Loc, V))
WList.push_back(V);
}
llvm::SmallPtrSet<ValueDecl*, 10> Marked;
while (!WList.empty()) {
ValueDecl* V = WList.back();
WList.pop_back();
if (Marked.count(V))
continue;
Marked.insert(V);
if (V->getType()->isPointerType()) {
const LValue& LV = cast<LValue>(GetValue(St, lval::DeclVal(V)));
if (!isa<lval::DeclVal>(LV))
continue;
const lval::DeclVal& LVD = cast<lval::DeclVal>(LV);
WList.push_back(LVD.getDecl());
}
}
for (StateTy::vb_iterator I = St.begin(), E = St.end(); I!=E ; ++I)
if (I.getKey().isDecl())
if (VarDecl* V = dyn_cast<VarDecl>(cast<ValueDecl>(I.getKey())))
if (!Marked.count(V))
St = Remove(St, V);
return St;
}
RValue ValueStateManager::GetValue(const StateTy& St, const LValue& LV,

9
clang/Analysis/ValueState.h
View File

@ -241,13 +241,18 @@ public:
ValueManager& getValueManager() { return ValMgr; }
SymbolManager& getSymbolManager() { return SymMgr; }
StateTy RemoveDeadBindings(StateTy St, Stmt* Loc,
const LiveVariables& Liveness);
StateTy SetValue(StateTy St, Stmt* S, bool isBlkExpr, const RValue& V);
StateTy SetValue(StateTy St, const LValue& LV, const RValue& V);
RValue GetValue(const StateTy& St, Stmt* S, bool* hasVal = NULL);
RValue GetValue(const StateTy& St, const LValue& LV, QualType* T = NULL);
RValue GetValue(const StateTy& St, const LValue& LV, QualType* T = NULL);
LValue GetLValue(const StateTy& St, Stmt* S);
StateTy Add(StateTy St, VarBindKey K, const RValue& V);
StateTy Remove(StateTy St, VarBindKey K);