Do not warn about [super finalize] in arc mode.

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

diff --git a/lib/Sema/SemaDeclObjC.cpp b/lib/Sema/SemaDeclObjC.cpp
index 11bcb4f08304789c3d54b58e7b1273c06a6fe111..ef978f0730a1b398c962314b54e46507ce1fa0b2 100644 (file)
--- a/lib/Sema/SemaDeclObjC.cpp
+++ b/lib/Sema/SemaDeclObjC.cpp
@@ -297,7 +297,9 @@ void Sema::ActOnStartOfObjCMethodDef(Scope *FnBodyScope, Decl *D) {
       ObjCShouldCallSuperDealloc = 
         !Context.getLangOptions().ObjCAutoRefCount &&      
         MDecl->getMethodFamily() == OMF_dealloc;
-      ObjCShouldCallSuperFinalize = MDecl->getMethodFamily() == OMF_finalize;
+      ObjCShouldCallSuperFinalize =
+        !Context.getLangOptions().ObjCAutoRefCount &&      
+        MDecl->getMethodFamily() == OMF_finalize;
     }
   }
 }

diff --git a/test/SemaObjC/warn-missing-super.m b/test/SemaObjC/warn-missing-super.m
index ff0c415872fc34628905f57cc256a360f44723fc..c25a6916620f1cc9db0186d89d53965251cdb7b1 100644 (file)
--- a/test/SemaObjC/warn-missing-super.m
+++ b/test/SemaObjC/warn-missing-super.m
@@ -45,6 +45,5 @@
 // CHECK: 2 warnings 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:25:1: warning: method possibly missing a [super finalize] call
 // CHECK-ARC: warn-missing-super.m:35:4: error: ARC forbids explicit message send of 'dealloc'
-// CHECK-ARC: 1 warning and 1 error generated.
+// CHECK-ARC: 1 error generated.