diff options
Diffstat (limited to 'lib/Analysis/CFRefCount.cpp')
| -rw-r--r-- | lib/Analysis/CFRefCount.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/Analysis/CFRefCount.cpp b/lib/Analysis/CFRefCount.cpp index 36c1b79af3..8e120afecc 100644 --- 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)); |