retain/release checker: Always generate an "autorelease" summary for an "autorelease" message, and have the summary processing logic treat it as a no-op in GC mode. This change is motivated to encode more of the semantics in the summaries themselves for eventual better diagnostics.

llvm-svn: 63241

1 files changed, 9 insertions, 9 deletions

diff --git a/clang/lib/Analysis/CFRefCount.cpp b/clang/lib/Analysis/CFRefCount.cpp
index 625eda4fb19..2d5cb5f5b89 100644
--- a/clang/lib/Analysis/CFRefCount.cpp
+++ b/clang/lib/Analysis/CFRefCount.cpp
@@ -979,13 +979,11 @@ void RetainSummaryManager::InitializeClassMethodSummaries() {
                 getPersistentSummary(RetEffect::MakeNotOwned(RetEffect::ObjC)));
   
   // Create the [NSAutoreleasePool addObject:] summary.
-  if (!isGCEnabled()) {    
-    ScratchArgs.push_back(std::make_pair(0, Autorelease));
-    addClsMethSummary(&Ctx.Idents.get("NSAutoreleasePool"),
-                      GetUnarySelector("addObject", Ctx),
-                      getPersistentSummary(RetEffect::MakeNoRet(),
-                                           DoNothing, DoNothing));
-  }
+  ScratchArgs.push_back(std::make_pair(0, Autorelease));
+  addClsMethSummary(&Ctx.Idents.get("NSAutoreleasePool"),
+                    GetUnarySelector("addObject", Ctx),
+                    getPersistentSummary(RetEffect::MakeNoRet(),
+                                         DoNothing, DoNothing));
 }
 
 void RetainSummaryManager::InitializeMethodSummaries() {
@@ -1023,7 +1021,7 @@ void RetainSummaryManager::InitializeMethodSummaries() {
   addNSObjectMethSummary(GetNullarySelector("drain", Ctx), Summ);
 
   // Create the "autorelease" selector.
-  Summ = getPersistentSummary(E, isGCEnabled() ? DoNothing : Autorelease);
+  Summ = getPersistentSummary(E, Autorelease);
   addNSObjectMethSummary(GetNullarySelector("autorelease", Ctx), Summ);
   
   // For NSWindow, allocated objects are (initially) self-owned.  
@@ -2076,7 +2074,9 @@ RefBindings CFRefCount::Update(RefBindings B, SymbolRef sym,
       }      
       return B;
 
-    case Autorelease:          
+    case Autorelease:
+      if (isGCEnabled()) return B;      
+      // Fall-through.      
     case StopTracking:
       return RefBFactory.Remove(B, sym);