AnonPointeeRegions are now identified by the MemRegion of the pointer pointing
to them.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@60868 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/clang/Analysis/PathSensitive/MemRegion.h b/include/clang/Analysis/PathSensitive/MemRegion.h
index ad06c41..0750738 100644
--- a/include/clang/Analysis/PathSensitive/MemRegion.h
+++ b/include/clang/Analysis/PathSensitive/MemRegion.h
@@ -237,20 +237,21 @@
/// parameters or pointer globals. In RegionStoreManager, we assume pointer
/// parameters or globals point at some anonymous region. Such regions are not
/// the regions associated with the pointer variables themselves. They are
-/// identified with the VarDecl of the pointer variable. We create them lazily.
+/// identified by the MemRegion of the pointer pointing to them. We create
+/// them lazily.
class AnonPointeeRegion : public TypedRegion {
friend class MemRegionManager;
// VD - the pointer variable that points at this region.
- const VarDecl* Pointer;
+ const TypedRegion* Pointer;
- AnonPointeeRegion(const VarDecl* d, MemRegion* sreg)
- : TypedRegion(sreg, AnonPointeeRegionKind), Pointer(d) {}
+ AnonPointeeRegion(const TypedRegion* r, MemRegion* sreg)
+ : TypedRegion(sreg, AnonPointeeRegionKind), Pointer(r) {}
public:
QualType getType(ASTContext& C) const;
- static void ProfileRegion(llvm::FoldingSetNodeID& ID, const VarDecl* PVD,
+ static void ProfileRegion(llvm::FoldingSetNodeID& ID, const TypedRegion* R,
const MemRegion* superRegion);
void Profile(llvm::FoldingSetNodeID& ID) const {
@@ -518,7 +519,7 @@
AnonTypedRegion* getAnonTypedRegion(QualType t, const MemRegion* superRegion);
- AnonPointeeRegion* getAnonPointeeRegion(const VarDecl* d);
+ AnonPointeeRegion* getAnonPointeeRegion(const TypedRegion* r);
bool hasStackStorage(const MemRegion* R);
diff --git a/lib/Analysis/MemRegion.cpp b/lib/Analysis/MemRegion.cpp
index 6aff286..22df07b 100644
--- a/lib/Analysis/MemRegion.cpp
+++ b/lib/Analysis/MemRegion.cpp
@@ -52,7 +52,7 @@
}
QualType AnonPointeeRegion::getType(ASTContext& C) const {
- QualType T = C.getCanonicalType(Pointer->getType());
+ QualType T = C.getCanonicalType(Pointer->getType(C));
PointerType* PTy = cast<PointerType>(T.getTypePtr());
QualType PointeeTy = C.getCanonicalType(PTy->getPointeeType());
@@ -60,10 +60,10 @@
}
void AnonPointeeRegion::ProfileRegion(llvm::FoldingSetNodeID& ID,
- const VarDecl* VD,
+ const TypedRegion* R,
const MemRegion* superRegion) {
ID.AddInteger((unsigned) AnonPointeeRegionKind);
- ID.AddPointer(VD);
+ ID.AddPointer(R);
ID.AddPointer(superRegion);
}
@@ -394,11 +394,11 @@
return R;
}
-AnonPointeeRegion* MemRegionManager::getAnonPointeeRegion(const VarDecl* d) {
+AnonPointeeRegion* MemRegionManager::getAnonPointeeRegion(const TypedRegion* r) {
llvm::FoldingSetNodeID ID;
MemRegion* superRegion = getUnknownRegion();
- AnonPointeeRegion::ProfileRegion(ID, d, superRegion);
+ AnonPointeeRegion::ProfileRegion(ID, r, superRegion);
void* InsertPos;
MemRegion* data = Regions.FindNodeOrInsertPos(ID, InsertPos);
@@ -406,7 +406,7 @@
if (!R) {
R = (AnonPointeeRegion*) A.Allocate<AnonPointeeRegion>();
- new (R) AnonPointeeRegion(d, superRegion);
+ new (R) AnonPointeeRegion(r, superRegion);
Regions.InsertNode(R, InsertPos);
}