[cfe-commits] r138776 - in /cfe/trunk: lib/Sema/SemaDeclObjC.cpp test/SemaObjC/warn-missing-super.m

[Nico Weber]

Author: nico
Date: Mon Aug 29 17:59:14 2011
New Revision: 138776

URL: http://llvm.org/viewvc/llvm-project?rev=138776&view=rev
Log:
Do not warn about [super finalize] in arc mode.

Modified:
    cfe/trunk/lib/Sema/SemaDeclObjC.cpp
    cfe/trunk/test/SemaObjC/warn-missing-super.m

Modified: cfe/trunk/lib/Sema/SemaDeclObjC.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDeclObjC.cpp?rev=138776&r1=138775&r2=138776&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaDeclObjC.cpp (original)
+++ cfe/trunk/lib/Sema/SemaDeclObjC.cpp Mon Aug 29 17:59:14 2011
@@ -297,7 +297,9 @@
       ObjCShouldCallSuperDealloc = 
         !Context.getLangOptions().ObjCAutoRefCount &&      
         MDecl->getMethodFamily() == OMF_dealloc;
-      ObjCShouldCallSuperFinalize = MDecl->getMethodFamily() == OMF_finalize;
+      ObjCShouldCallSuperFinalize =
+        !Context.getLangOptions().ObjCAutoRefCount &&      
+        MDecl->getMethodFamily() == OMF_finalize;
     }
   }
 }

Modified: cfe/trunk/test/SemaObjC/warn-missing-super.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/warn-missing-super.m?rev=138776&r1=138775&r2=138776&view=diff
==============================================================================
--- cfe/trunk/test/SemaObjC/warn-missing-super.m (original)
+++ cfe/trunk/test/SemaObjC/warn-missing-super.m Mon Aug 29 17:59:14 2011
@@ -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.