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

Handle loading of field values from LazyCompoundVals in GRExprEngine::VisitMemberExpr(). 

This fixes the crash reported in PR 5316.

llvm-svn: 85578
This commit is contained in:
Ted Kremenek 2009-10-30 05:48:30 +00:00
parent 1cf0b03064
commit e96a30a531
2 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
clang/lib/Analysis/GRExprEngine.cpp
View File

@ -1092,13 +1092,26 @@ void GRExprEngine::VisitMemberExpr(MemberExpr* M, ExplodedNode* Pred,
// FIXME: Should we insert some assumption logic in here to determine
// if "Base" is a valid piece of memory? Before we put this assumption
// later when using FieldOffset lvals (which we no longer have).
SVal L = state->getLValue(Field, state->getSVal(Base));
SVal BaseV = state->getSVal(Base);
if (nonloc::LazyCompoundVal *LVC=dyn_cast<nonloc::LazyCompoundVal>(&BaseV)){
const LazyCompoundValData *D = LVC->getCVData();
const FieldRegion * FR =
getStateManager().getRegionManager().getFieldRegion(Field,
D->getRegion());
if (asLValue)
MakeNode(Dst, M, *I, state->BindExpr(M, L),
ProgramPoint::PostLValueKind);
else
EvalLoad(Dst, M, *I, state, L);
SVal V = D->getState()->getSVal(loc::MemRegionVal(FR));
MakeNode(Dst, M, *I, state->BindExpr(M, V));
}
else {
SVal L = state->getLValue(Field, BaseV);
if (asLValue)
MakeNode(Dst, M, *I, state->BindExpr(M, L),
ProgramPoint::PostLValueKind);
else
EvalLoad(Dst, M, *I, state, L);
}
}
}

16
clang/test/Analysis/misc-ps-region-store.m
View File

@ -415,3 +415,19 @@ int rdar7347252(rdar7347252_SSL1 *s) {
}
return 0;
}
//===----------------------------------------------------------------------===//
// PR 5316 - "crash when accessing field of lazy compound value"
// Previously this caused a crash at the MemberExpr '.chr' when loading
// a field value from a LazyCompoundVal
//===----------------------------------------------------------------------===//
typedef unsigned int pr5316_wint_t;
typedef pr5316_wint_t pr5316_REFRESH_CHAR;
typedef struct {
pr5316_REFRESH_CHAR chr;
}
pr5316_REFRESH_ELEMENT;
static void pr5316(pr5316_REFRESH_ELEMENT *dst, const pr5316_REFRESH_ELEMENT *src) {
while ((*dst++ = *src++).chr != L'\0') ;
}