OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 6
Code Issues Packages Projects Releases Wiki Activity

Teach GRSimpleVals::EvalNE and GRSimplVals::EvalEQ about TypedRegionViews and 

SymbolicRegions. This fixes a serious regression when checking symbolic pointers
against null.

llvm-svn: 66444
This commit is contained in:
Ted Kremenek 2009-03-09 20:35:15 +00:00
parent 85875f7120
commit 06eb672f24
1 changed files with 41 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -262,6 +262,17 @@ 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) {
@ -275,6 +286,7 @@ SVal GRSimpleVals::EvalEQ(GRExprEngine& Eng, Loc L, Loc R) {
BasicValueFactory& BasicVals = Eng.getBasicVals();
TryAgain:
switch (L.getSubKind()) {
default:
@ -320,7 +332,20 @@ SVal GRSimpleVals::EvalEQ(GRExprEngine& Eng, Loc L, Loc R) {
return UnknownVal();
}
case loc::MemRegionKind:
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;
}
}
// Fall-through.
case loc::FuncValKind:
case loc::GotoLabelKind:
return NonLoc::MakeIntTruthVal(BasicVals, L == R);
@ -333,6 +358,7 @@ SVal GRSimpleVals::EvalNE(GRExprEngine& Eng, Loc L, Loc R) {
BasicValueFactory& BasicVals = Eng.getBasicVals();
TryAgain:
switch (L.getSubKind()) {
default:
@ -378,7 +404,18 @@ SVal GRSimpleVals::EvalNE(GRExprEngine& Eng, Loc L, Loc R) {
break;
}
case loc::MemRegionKind:
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;
}
}
case loc::FuncValKind:
case loc::GotoLabelKind:
return NonLoc::MakeIntTruthVal(BasicVals, L != R);