Remove workaround in RegionStore in r168741 since it is handled more generally by r168757.

llvm-svn: 168774

1 files changed, 8 insertions, 10 deletions

diff --git a/clang/lib/StaticAnalyzer/Core/RegionStore.cpp b/clang/lib/StaticAnalyzer/Core/RegionStore.cpp
index 875a7ce4d4e..aed994df411 100644
--- a/clang/lib/StaticAnalyzer/Core/RegionStore.cpp
+++ b/clang/lib/StaticAnalyzer/Core/RegionStore.cpp
@@ -1581,16 +1581,14 @@ StoreRef RegionStoreManager::BindArray(Store store, const TypedValueRegion* R,
     Size = CAT->getSize().getZExtValue();
 
   // Check if the init expr is a string literal.
-  if (const MemRegion *Reg = Init.getAsRegion()) {
-    if (const StringRegion *S = dyn_cast<StringRegion>(Reg)) {
-      // Treat the string as a lazy compound value.
-      NonLoc V = svalBuilder.makeLazyCompoundVal(StoreRef(store, *this), S);
-      return BindAggregate(store, R, V);
-    }
-    // FIXME: Handle CXXTempObjectRegion, which can occur in cases
-    // where a struct contains an array of structs in C++.
-    assert(isa<CXXTempObjectRegion>(Reg));
-    return BindAggregate(store, R, UnknownVal());
+  if (loc::MemRegionVal *MRV = dyn_cast<loc::MemRegionVal>(&Init)) {
+    const StringRegion *S = cast<StringRegion>(MRV->getRegion());
+
+    // Treat the string as a lazy compound value.
+    nonloc::LazyCompoundVal LCV =
+      cast<nonloc::LazyCompoundVal>(svalBuilder.
+                                makeLazyCompoundVal(StoreRef(store, *this), S));
+    return BindAggregate(store, R, LCV);
   }
 
   // Handle lazy compound values.