Fix crash from <rdar://problem/6562655>: 'init' method only return a receiver alias...

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

diff --git a/lib/Analysis/CFRefCount.cpp b/lib/Analysis/CFRefCount.cpp
index 36c1b79af317318a73812e1dc84079a24f79d293..8e120afecc2618879b256917bdb056745cadddbc 100644 (file)
--- a/lib/Analysis/CFRefCount.cpp
+++ b/lib/Analysis/CFRefCount.cpp
@@ -915,8 +915,11 @@ RetainSummary*
 RetainSummaryManager::getInitMethodSummary(ObjCMessageExpr* ME) {
   assert(ScratchArgs.empty());
     
+  // 'init' methods only return an alias if the return type is a location type.
+  QualType T = ME->getType();
   RetainSummary* Summ =
-    getPersistentSummary(RetEffect::MakeReceiverAlias());
+    getPersistentSummary(Loc::IsLocType(T) ? RetEffect::MakeReceiverAlias()
+                                           : RetEffect::MakeNoRet());
   
   ObjCMethodSummaries[ME] = Summ;
   return Summ;
@@ -1608,7 +1611,7 @@ void CFRefCount::EvalSummary(ExplodedNodeSet<GRState>& Dst,
         unsigned Count = Builder.getCurrentBlockCount();
         SymbolRef Sym = Eng.getSymbolManager().getConjuredSymbol(Ex, Count);
         
-        SVal X = Loc::IsLocType(Ex->getType())
+        SVal X = Loc::IsLocType(T)
                ? cast<SVal>(loc::SymbolVal(Sym)) 
                : cast<SVal>(nonloc::SymbolVal(Sym));