[arcmt] Don't error if an autoreleased variable is returned after the -autorelease.

rdar://12952025

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

diff --git a/lib/ARCMigrate/TransRetainReleaseDealloc.cpp b/lib/ARCMigrate/TransRetainReleaseDealloc.cpp
index aa7e25b39abf4fed0a473a2dfb469b89de0162b2..97d9bffda2748cfe55d71dfdc749fdd3523aa807 100644 (file)
--- a/lib/ARCMigrate/TransRetainReleaseDealloc.cpp
+++ b/lib/ARCMigrate/TransRetainReleaseDealloc.cpp
@@ -162,13 +162,26 @@ public:
 private:
   /// \brief Checks for idioms where an unused -autorelease is common.
   ///
-  /// Currently only returns true for this idiom which is common in property
+  /// Returns true for this idiom which is common in property
   /// setters:
   ///
   ///   [backingValue autorelease];
   ///   backingValue = [newValue retain]; // in general a +1 assign
   ///
+  /// For these as well:
+  ///
+  ///   [[var retain] autorelease];
+  ///   return var;
+  ///
   bool isCommonUnusedAutorelease(ObjCMessageExpr *E) {
+    if (isPlusOneAssignAfterAutorelease(E))
+      return true;
+    if (isReturnedAfterAutorelease(E))
+      return true;
+    return false;
+  }
+
+  bool isReturnedAfterAutorelease(ObjCMessageExpr *E) {
     Expr *Rec = E->getInstanceReceiver();
     if (!Rec)
       return false;
@@ -177,6 +190,46 @@ private:
     if (!RefD)
       return false;
 
+    Stmt *nextStmt = getNextStmt(E);
+    if (!nextStmt)
+      return false;
+
+    // Check for "return <variable>;".
+
+    if (ReturnStmt *RetS = dyn_cast<ReturnStmt>(nextStmt))
+      return RefD == getReferencedDecl(RetS->getRetValue());
+
+    return false;
+  }
+
+  bool isPlusOneAssignAfterAutorelease(ObjCMessageExpr *E) {
+    Expr *Rec = E->getInstanceReceiver();
+    if (!Rec)
+      return false;
+
+    Decl *RefD = getReferencedDecl(Rec);
+    if (!RefD)
+      return false;
+
+    Stmt *nextStmt = getNextStmt(E);
+    if (!nextStmt)
+      return false;
+
+    // Check for "RefD = [+1 retained object];".
+
+    if (BinaryOperator *Bop = dyn_cast<BinaryOperator>(nextStmt)) {
+      if (RefD != getReferencedDecl(Bop->getLHS()))
+        return false;
+      if (isPlusOneAssign(Bop))
+        return true;
+    }
+    return false;
+  }
+
+  Stmt *getNextStmt(Expr *E) {
+    if (!E)
+      return 0;
+
     Stmt *OuterS = E, *InnerS;
     do {
       InnerS = OuterS;
@@ -187,9 +240,7 @@ private:
                       isa<ExprWithCleanups>(OuterS)));
     
     if (!OuterS)
-      return false;
-
-    // Find next statement after the -autorelease.
+      return 0;
 
     Stmt::child_iterator currChildS = OuterS->child_begin();
     Stmt::child_iterator childE = OuterS->child_end();
@@ -198,25 +249,15 @@ private:
         break;
     }
     if (currChildS == childE)
-      return false;
+      return 0;
     ++currChildS;
     if (currChildS == childE)
-      return false;
+      return 0;
 
     Stmt *nextStmt = *currChildS;
     if (!nextStmt)
-      return false;
-    nextStmt = nextStmt->IgnoreImplicit();
-
-    // Check for "RefD = [+1 retained object];".
-    
-    if (BinaryOperator *Bop = dyn_cast<BinaryOperator>(nextStmt)) {
-      if (RefD != getReferencedDecl(Bop->getLHS()))
-        return false;
-      if (isPlusOneAssign(Bop))
-        return true;
-    }
-    return false;
+      return 0;
+    return nextStmt->IgnoreImplicit();
   }
 
   Decl *getReferencedDecl(Expr *E) {
@@ -224,6 +265,17 @@ private:
       return 0;
 
     E = E->IgnoreParenCasts();
+    if (ObjCMessageExpr *ME = dyn_cast<ObjCMessageExpr>(E)) {
+      switch (ME->getMethodFamily()) {
+      case OMF_copy:
+      case OMF_autorelease:
+      case OMF_release:
+      case OMF_retain:
+        return getReferencedDecl(ME->getInstanceReceiver());
+      default:
+        return 0;
+      }
+    }
     if (DeclRefExpr *DRE = dyn_cast<DeclRefExpr>(E))
       return DRE->getDecl();
     if (MemberExpr *ME = dyn_cast<MemberExpr>(E))

diff --git a/test/ARCMT/autoreleases.m b/test/ARCMT/autoreleases.m
index a131bc53391d37420648813fee441d8faf80cf86..d4913943b1cc64bcefe892ad1ed4dfe023fc0ccf 100644 (file)
--- a/test/ARCMT/autoreleases.m
+++ b/test/ARCMT/autoreleases.m
@@ -64,3 +64,8 @@ void test(A *prevVal, A *newVal) {
   [prevVal autorelease];
   prevVal = [newVal retain];
 }
+
+id test2(A* val) {
+  [[val retain] autorelease];
+  return val;
+}

diff --git a/test/ARCMT/autoreleases.m.result b/test/ARCMT/autoreleases.m.result
index 6593fc9199a04b4effb6ac035badab58bf78a68d..76ce8cfb5107b10bfd6c084341ca2d3a83a8b16c 100644 (file)
--- a/test/ARCMT/autoreleases.m.result
+++ b/test/ARCMT/autoreleases.m.result
@@ -60,3 +60,7 @@ int main (int argc, const char * argv[]) {
 void test(A *prevVal, A *newVal) {
   prevVal = newVal;
 }
+
+id test2(A* val) {
+  return val;
+}