diff --git a/clang/lib/Analysis/RegionStore.cpp b/clang/lib/Analysis/RegionStore.cpp
index 0a31bc8..536e149 100644
--- a/clang/lib/Analysis/RegionStore.cpp
+++ b/clang/lib/Analysis/RegionStore.cpp
@@ -233,6 +233,9 @@
 }
 
 Store RegionStoreManager::Bind(Store store, Loc LV, SVal V) {
+  if (LV.getSubKind() == loc::SymbolValKind)
+    return store;
+
   assert(LV.getSubKind() == loc::MemRegionKind);
 
   const MemRegion* R = cast<loc::MemRegionVal>(LV).getRegion();
@@ -373,7 +376,8 @@
 
 Store RegionStoreManager::InitializeStructToUndefined(Store store, QualType T,
                                                       MemRegion* BaseR) {
-  const RecordType* RT = cast<RecordType>(T.getTypePtr());
+  QualType CT = T->getCanonicalTypeInternal();
+  const RecordType* RT = cast<RecordType>(CT.getTypePtr());
   RecordDecl* RD = RT->getDecl();
   assert(RD->isDefinition());