The Decl of an array region can be VarDecl or FieldDecl. Handle this in RegionStoreMa...

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@58086 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/Analysis/PathSensitive/MemRegion.h b/include/clang/Analysis/PathSensitive/MemRegion.h
index a78059dfedb63748fa07404c2d346a20b3cdb840..e0ecb7180fc52df16a9bbfb45f3fc8891b7ebc2c 100644 (file)
--- 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 bd3dd0911dd4922806c4af646a0ec0f3a2b7a2bb..5c75ab369ece0ba251b16961e17edd116a708586 100644 (file)
--- 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();