diff options
| -rw-r--r-- | lib/Sema/SemaDeclObjC.cpp | 4 | ||||
| -rw-r--r-- | test/SemaObjC/warn-missing-super.m | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/Sema/SemaDeclObjC.cpp b/lib/Sema/SemaDeclObjC.cpp index 11bcb4f083..ef978f0730 100644 --- 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 ff0c415872..c25a691662 100644 --- 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. |