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

[Nico Weber]

Thanks for cleaning up after me!

On Mon, Aug 22, 2011 at 12:07 PM, Ted Kremenek <kremenek at apple.com> wrote:
> Author: kremenek
> Date: Mon Aug 22 14:07:43 2011
> New Revision: 138261
>
> URL: http://llvm.org/viewvc/llvm-project?rev=138261&view=rev
> Log:
> Do not perform check for missing '[super dealloc]' under ARC as calling -dealloc is illegal in that 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=138261&r1=138260&r2=138261&view=diff
> ==============================================================================
> --- cfe/trunk/lib/Sema/SemaDeclObjC.cpp (original)
> +++ cfe/trunk/lib/Sema/SemaDeclObjC.cpp Mon Aug 22 14:07:43 2011
> @@ -292,7 +292,9 @@
>     // 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;
>   }
>  }
>
>
> 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=138261&r1=138260&r2=138261&view=diff
> ==============================================================================
> --- cfe/trunk/test/SemaObjC/warn-missing-super.m (original)
> +++ cfe/trunk/test/SemaObjC/warn-missing-super.m Mon Aug 22 14:07:43 2011
> @@ -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.
>
>
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
>