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

stop using loc::SymbolVal and clean up code with new API. 

llvm-svn: 68703
This commit is contained in:
Zhongxing Xu 2009-04-09 07:39:46 +00:00
parent 48abb5d91f
commit 7e9c193398
3 changed files with 21 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/include/clang/Analysis/PathSensitive/SVals.h
View File

@ -226,8 +226,6 @@ public:
static Loc MakeVal(AddrLabelExpr* E);
static Loc MakeVal(SymbolRef sym);
static Loc MakeNull(BasicValueFactory &BasicVals);
// Implement isa<T> support.

53
clang/lib/Analysis/GRSimpleVals.cpp
View File

@ -260,32 +260,20 @@ SVal GRSimpleVals::EvalBinOp(GRExprEngine& Eng, BinaryOperator::Opcode Op,
}
}
// Pointer arithmetic.
static Loc StripViews(Loc X) {
if (isa<loc::MemRegionVal>(X)) {
const SymbolicRegion *Region =
cast<loc::MemRegionVal>(X).getRegion()->getAs<SymbolicRegion>();
if (Region)
return Loc::MakeVal(Region->getSymbol());
}
return X;
}
SVal GRSimpleVals::EvalBinOp(GRExprEngine& Eng, BinaryOperator::Opcode Op,
Loc L, NonLoc R) {
// Delegate pointer arithmetic to store manager.
return Eng.getStoreManager().EvalBinOp(Op, L, R);
}
// Equality operators for Locs.
// Equality operators for Locs.
// FIXME: All this logic will be revamped when we have MemRegion::getLocation()
// implemented.
SVal GRSimpleVals::EvalEQ(GRExprEngine& Eng, Loc L, Loc R) {
BasicValueFactory& BasicVals = Eng.getBasicVals();
TryAgain:
switch (L.getSubKind()) {
default:
@ -335,14 +323,15 @@ TryAgain:
}
case loc::MemRegionKind: {
// See if 'L' and 'R' both wrap symbols.
Loc LTmp = StripViews(L);
Loc RTmp = StripViews(R);
if (LTmp != L || RTmp != R) {
L = LTmp;
R = RTmp;
goto TryAgain;
if (SymbolRef LSym = L.getAsLocSymbol()) {
if (isa<loc::ConcreteInt>(R)) {
const SymIntExpr *SE =
Eng.getSymbolManager().getSymIntExpr(LSym, BinaryOperator::EQ,
cast<loc::ConcreteInt>(R).getValue(),
Eng.getContext().IntTy);
return nonloc::SymExprVal(SE);
}
}
}
@ -360,7 +349,6 @@ SVal GRSimpleVals::EvalNE(GRExprEngine& Eng, Loc L, Loc R) {
BasicValueFactory& BasicVals = Eng.getBasicVals();
TryAgain:
switch (L.getSubKind()) {
default:
@ -407,15 +395,16 @@ TryAgain:
}
case loc::MemRegionKind: {
// See if 'L' and 'R' both wrap symbols.
Loc LTmp = StripViews(L);
Loc RTmp = StripViews(R);
if (LTmp != L || RTmp != R) {
L = LTmp;
R = RTmp;
goto TryAgain;
if (SymbolRef LSym = L.getAsLocSymbol()) {
if (isa<loc::ConcreteInt>(R)) {
const SymIntExpr* SE =
Eng.getSymbolManager().getSymIntExpr(LSym, BinaryOperator::NE,
cast<loc::ConcreteInt>(R).getValue(),
Eng.getContext().IntTy);
return nonloc::SymExprVal(SE);
}
}
// Fall through:
}
case loc::FuncValKind:

2
clang/lib/Analysis/SVals.cpp
View File

@ -338,8 +338,6 @@ Loc Loc::MakeVal(const MemRegion* R) { return loc::MemRegionVal(R); }
Loc Loc::MakeVal(AddrLabelExpr* E) { return loc::GotoLabel(E->getLabel()); }
Loc Loc::MakeVal(SymbolRef sym) { return loc::SymbolVal(sym); }
Loc Loc::MakeNull(BasicValueFactory &BasicVals) {
return loc::ConcreteInt(BasicVals.getZeroWithPtrWidth());
}