diff options
| -rw-r--r-- | clang/lib/Sema/SemaDeclObjC.cpp | 5 | ||||
| -rw-r--r-- | clang/test/SemaObjC/warn-missing-super.m | 12 |
2 files changed, 13 insertions, 4 deletions
diff --git a/clang/lib/Sema/SemaDeclObjC.cpp b/clang/lib/Sema/SemaDeclObjC.cpp index 0822edf7049..f1a26370775 100644 --- a/clang/lib/Sema/SemaDeclObjC.cpp +++ b/clang/lib/Sema/SemaDeclObjC.cpp @@ -335,10 +335,11 @@ void Sema::ActOnStartOfObjCMethodDef(Scope *FnBodyScope, Decl *D) { // Only do this if the current class actually has a superclass. if (IC->getSuperClass()) { ObjCShouldCallSuperDealloc = - !Context.getLangOptions().ObjCAutoRefCount && + !(Context.getLangOptions().ObjCAutoRefCount || + Context.getLangOptions().getGC() == LangOptions::GCOnly) && MDecl->getMethodFamily() == OMF_dealloc; ObjCShouldCallSuperFinalize = - !Context.getLangOptions().ObjCAutoRefCount && + Context.getLangOptions().getGC() != LangOptions::NonGC && MDecl->getMethodFamily() == OMF_finalize; } } diff --git a/clang/test/SemaObjC/warn-missing-super.m b/clang/test/SemaObjC/warn-missing-super.m index c25a6916620..5dcdb572925 100644 --- a/clang/test/SemaObjC/warn-missing-super.m +++ b/clang/test/SemaObjC/warn-missing-super.m @@ -41,8 +41,16 @@ // RUN: %clang_cc1 -fsyntax-only %s 2>&1 | FileCheck %s // CHECK: warn-missing-super.m:23:1: warning: method possibly missing a [super dealloc] call -// CHECK: warn-missing-super.m:25:1: warning: method possibly missing a [super finalize] call -// CHECK: 2 warnings generated. +// CHECK: 1 warning generated. + +// RUN: %clang_cc1 -fsyntax-only -fobjc-gc %s 2>&1 | FileCheck --check-prefix=CHECK-GC %s +// CHECK-GC: warn-missing-super.m:23:1: warning: method possibly missing a [super dealloc] call +// CHECK-GC: warn-missing-super.m:25:1: warning: method possibly missing a [super finalize] call +// CHECK-GC: 2 warnings generated. + +// RUN: %clang_cc1 -fsyntax-only -fobjc-gc-only %s 2>&1 | FileCheck --check-prefix=CHECK-GC-ONLY %s +// CHECK-GC-ONLY: warn-missing-super.m:25:1: warning: method possibly missing a [super finalize] call +// CHECK-GC-ONLY: 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:35:4: error: ARC forbids explicit message send of 'dealloc' |
