Do not perform check for missing '[super dealloc]' under ARC as calling -dealloc...

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

diff --git a/lib/Sema/SemaDeclObjC.cpp b/lib/Sema/SemaDeclObjC.cpp
index 92fe9ec6eeee02d64499e6d248c9e53e956eec4b..7a9d6d50729b39df9d741da426eb69ab318087b0 100644 (file)
--- a/lib/Sema/SemaDeclObjC.cpp
+++ b/lib/Sema/SemaDeclObjC.cpp
@@ -292,7 +292,9 @@ void Sema::ActOnStartOfObjCMethodDef(Scope *FnBodyScope, Decl *D) {
     // Finally, in ActOnFinishFunctionBody() (SemaDecl), warn if flag is set.
     // Only do this if the current class actually has a superclass.
     if (IC->getSuperClass())
-      ObjCShouldCallSuperDealloc = MDecl->getMethodFamily() == OMF_dealloc;
+      ObjCShouldCallSuperDealloc = 
+        !Context.getLangOptions().ObjCAutoRefCount &&      
+        MDecl->getMethodFamily() == OMF_dealloc;
   }
 }
 

diff --git a/test/SemaObjC/warn-missing-super.m b/test/SemaObjC/warn-missing-super.m
index 8d04bf28667d52afa81c1631c2673a2f2708c878..19c6b62577ea0a08a3a7c55a96ccfe318295e3a0 100644 (file)
--- a/test/SemaObjC/warn-missing-super.m
+++ b/test/SemaObjC/warn-missing-super.m
@@ -1,5 +1,3 @@
-// RUN: %clang_cc1 -fsyntax-only -verify %s
-
 @protocol NSCopying @end
 
 @interface NSObject <NSCopying>
@@ -18,7 +16,7 @@
 
 @implementation Subclass1
 - (void)dealloc {
-}  // expected-warning{{method possibly missing a [super dealloc] call}}
+}
 @end
 
 @interface Subclass2 : NSObject
@@ -30,3 +28,11 @@
   [super dealloc];  // Shouldn't warn
 }
 @end
+
+// RUN: %clang_cc1 -fsyntax-only %s 2>&1 | FileCheck %s
+// CHECK: warn-missing-super.m:19:1: warning: method possibly missing a [super dealloc] call
+// CHECK: 1 warning generated.
+
+// RUN: %clang_cc1 -fsyntax-only -triple x86_64-apple-darwin10 -fobjc-nonfragile-abi -fobjc-arc %s 2>&1 | FileCheck --check-prefix=CHECK-ARC %s
+// CHECK-ARC: warn-missing-super.m:28:4: error: ARC forbids explicit message send of 'dealloc'
+// CHECK-ARC: 1 error generated.