replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make SymbolicRegion untyped. 

Layer the type information with a TypedViewRegion on top of the SymbolicRegion.

llvm-svn: 68028
This commit is contained in:
Zhongxing Xu 2009-03-30 06:48:56 +00:00
parent d67a32252c
commit 5415b207e3
3 changed files with 17 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
clang/include/clang/Analysis/PathSensitive/MemRegion.h
View File

@ -39,10 +39,10 @@ class MemRegionManager;
class MemRegion : public llvm::FoldingSetNode {
public:
enum Kind { MemSpaceRegionKind,
SymbolicRegionKind,
AllocaRegionKind,
// Typed regions.
BEG_TYPED_REGIONS,
SymbolicRegionKind,
CompoundLiteralRegionKind,
StringRegionKind, ElementRegionKind,
TypedViewRegionKind,
@ -179,21 +179,18 @@ public:
/// either a real region, a NULL pointer, etc. It essentially is used to
/// map the concept of symbolic values into the domain of regions. Symbolic
/// regions do not need to be typed.
class SymbolicRegion : public TypedRegion {
class SymbolicRegion : public SubRegion {
protected:
const SymbolRef sym;
public:
SymbolicRegion(const SymbolRef s, const MemRegion* sreg)
: TypedRegion(sreg, SymbolicRegionKind), sym(s) {}
: SubRegion(sreg, SymbolicRegionKind), sym(s) {}
SymbolRef getSymbol() const {
return sym;
}
QualType getRValueType(ASTContext& C) const;
QualType getLValueType(ASTContext& C) const;
void Profile(llvm::FoldingSetNodeID& ID) const;
static void ProfileRegion(llvm::FoldingSetNodeID& ID, SymbolRef sym);

22
clang/lib/Analysis/MemRegion.cpp
View File

@ -111,28 +111,6 @@ void ElementRegion::Profile(llvm::FoldingSetNodeID& ID) const {
// getLValueType() and getRValueType()
//===----------------------------------------------------------------------===//
QualType SymbolicRegion::getRValueType(ASTContext& C) const {
// Get the type of the symbol.
QualType T = sym->getType(C);
if (const PointerType* PTy = T->getAsPointerType())
return PTy->getPointeeType();
if (const BlockPointerType* PTy = T->getAsBlockPointerType())
return PTy->getPointeeType();
// There is no rvalue type of id<...>.
if (T->getAsObjCQualifiedIdType())
return QualType();
assert(Loc::IsLocType(T) && "Non-location type.");
return QualType();
}
QualType SymbolicRegion::getLValueType(ASTContext& C) const {
return sym->getType(C);
}
QualType ElementRegion::getRValueType(ASTContext& C) const {
// Strip off typedefs from the ArrayRegion's RvalueType.
QualType T = getArrayRegion()->getRValueType(C)->getDesugaredType();

19
clang/lib/Analysis/RegionStore.cpp
View File

@ -362,9 +362,13 @@ SVal RegionStoreManager::getLValueFieldOrIvar(const GRState* St, SVal Base,
BaseR = cast<loc::MemRegionVal>(BaseL).getRegion();
break;
case loc::SymbolValKind:
BaseR = MRMgr.getSymbolicRegion(cast<loc::SymbolVal>(&BaseL)->getSymbol());
case loc::SymbolValKind: {
SymbolRef Sym = cast<loc::SymbolVal>(&BaseL)->getSymbol();
const SymbolicRegion* SR = MRMgr.getSymbolicRegion(Sym);
// Layer the type information.
BaseR = MRMgr.getTypedViewRegion(Sym->getType(getContext()), SR);
break;
}
case loc::GotoLabelKind:
case loc::FuncValKind:
@ -407,9 +411,14 @@ SVal RegionStoreManager::getLValueElement(const GRState* St,
const TypedRegion* BaseRegion = 0;
BaseRegion = isa<loc::SymbolVal>(Base)
? MRMgr.getSymbolicRegion(cast<loc::SymbolVal>(Base).getSymbol())
: cast<TypedRegion>(cast<loc::MemRegionVal>(Base).getRegion());
if (isa<loc::SymbolVal>(Base)) {
SymbolRef Sym = cast<loc::SymbolVal>(Base).getSymbol();
SymbolicRegion* SR = MRMgr.getSymbolicRegion(Sym);
// Layer the type information.
BaseRegion = MRMgr.getTypedViewRegion(Sym->getType(getContext()), SR);
}
else
BaseRegion = cast<TypedRegion>(cast<loc::MemRegionVal>(Base).getRegion());
// Pointer of any type can be cast and used as array base.
const ElementRegion *ElemR = dyn_cast<ElementRegion>(BaseRegion);