Change AllocaRegion to subclass TypedRegion. We need to know ElementRegion's

type when assigning to it.

llvm-svn: 59229

1 files changed, 12 insertions, 2 deletions

diff --git a/clang/lib/Analysis/MemRegion.cpp b/clang/lib/Analysis/MemRegion.cpp
index ae575f11646..a292d98e605 100644
--- a/clang/lib/Analysis/MemRegion.cpp
+++ b/clang/lib/Analysis/MemRegion.cpp
@@ -105,8 +105,18 @@ void ElementRegion::Profile(llvm::FoldingSetNodeID& ID) const {
 
 QualType ElementRegion::getType(ASTContext& C) const {
   QualType T = cast<TypedRegion>(superRegion)->getType(C);
-  ArrayType* AT = cast<ArrayType>(T.getTypePtr());
-  return AT->getElementType();
+
+  if (isa<ArrayType>(T.getTypePtr())) {
+    ArrayType* AT = cast<ArrayType>(T.getTypePtr());
+    return AT->getElementType();
+  }
+  else if (isa<AllocaRegion>(superRegion)) {
+    PointerType* PtrT = cast<PointerType>(T.getTypePtr());
+    QualType PTy = PtrT->getPointeeType();
+    return C.getCanonicalType(PTy);
+  }
+  else
+    assert(0 && "SuperRegion type unsupported.");
 }
 
 //===----------------------------------------------------------------------===//