Revert 70293.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@70313 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Analysis/CFRefCount.cpp b/lib/Analysis/CFRefCount.cpp
index 8a8c704..538f4f2 100644
--- a/lib/Analysis/CFRefCount.cpp
+++ b/lib/Analysis/CFRefCount.cpp
@@ -1904,6 +1904,13 @@
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();