diff options
| -rw-r--r-- | include/clang/Analysis/PathSensitive/MemRegion.h | 3 | ||||
| -rw-r--r-- | lib/Analysis/RegionStore.cpp | 12 |
2 files changed, 12 insertions, 3 deletions
diff --git a/include/clang/Analysis/PathSensitive/MemRegion.h b/include/clang/Analysis/PathSensitive/MemRegion.h index a78059dfed..e0ecb7180f 100644 --- a/include/clang/Analysis/PathSensitive/MemRegion.h +++ b/include/clang/Analysis/PathSensitive/MemRegion.h @@ -192,7 +192,8 @@ protected: static void ProfileRegion(llvm::FoldingSetNodeID& ID, const Decl* D, const MemRegion* superRegion, Kind k); -public: +public: + const Decl* getDecl() const { return D; } void Profile(llvm::FoldingSetNodeID& ID) const; }; diff --git a/lib/Analysis/RegionStore.cpp b/lib/Analysis/RegionStore.cpp index bd3dd0911d..5c75ab369e 100644 --- a/lib/Analysis/RegionStore.cpp +++ b/lib/Analysis/RegionStore.cpp @@ -181,10 +181,18 @@ SVal RegionStoreManager::getLValueElement(const GRState* St, SVal RegionStoreManager::ArrayToPointer(SVal Array) { const MemRegion* ArrayR = cast<loc::MemRegionVal>(&Array)->getRegion(); - const VarDecl* D = cast<VarRegion>(ArrayR)->getDecl(); + const Decl* D = cast<DeclRegion>(ArrayR)->getDecl(); + + QualType ArrayTy; + if (const VarDecl* VD = dyn_cast<VarDecl>(D)) + ArrayTy = VD->getType(); + else if (const FieldDecl* FD = dyn_cast<FieldDecl>(D)) + ArrayTy = FD->getType(); + else + assert(0 && "unknown decl"); if (const ConstantArrayType* CAT = - dyn_cast<ConstantArrayType>(D->getType().getTypePtr())) { + dyn_cast<ConstantArrayType>(ArrayTy.getTypePtr())) { BasicValueFactory& BasicVals = StateMgr.getBasicVals(); |