As discussed with Ted offline, re-apply r70293.

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

diff --git a/lib/Analysis/CFRefCount.cpp b/lib/Analysis/CFRefCount.cpp
index 97efd28c06b75c099161955851a913117ddad06b..004eecad151f3ec5a96feb1abbefcd41908d4517 100644 (file)
--- a/lib/Analysis/CFRefCount.cpp
+++ b/lib/Analysis/CFRefCount.cpp
@@ -1919,14 +1919,7 @@ void CFRefCount::EvalSummary(ExplodedNodeSet<GRState>& Dst,
         //  disambiguate conjured symbols. 
         
         const TypedRegion* R = dyn_cast<TypedRegion>(MR->getRegion());
-        
-        // Blast through TypedViewRegions to get the original region type.
-        while (R) {
-          const TypedViewRegion* ATR = dyn_cast<TypedViewRegion>(R);
-          if (!ATR) break;
-          R = dyn_cast<TypedRegion>(ATR->getSuperRegion());
-        }
-        
+
         if (R) {          
           // Is the invalidated variable something that we were tracking?
           SymbolRef Sym = state.GetSValAsScalarOrLoc(R).getAsLocSymbol();