From 80297b1d90de16b8f574848a9a2fb46f957f246a Mon Sep 17 00:00:00 2001 From: Fariborz Jahanian Date: Tue, 15 May 2012 16:33:04 +0000 Subject: [PATCH] objective-c nonfragile abi: discourage ivar declarations in @interface by issuing warning (off by default) under opt'ed in flag -Winterface-block-ivar. // rdar://10763173 llvm-svn: 156825 --- clang/include/clang/Basic/DiagnosticSemaKinds.td | 3 +++ clang/lib/Sema/SemaDecl.cpp | 6 ++++- clang/test/SemaObjC/no-ivar-in-interface-block.m | 32 ++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 clang/test/SemaObjC/no-ivar-in-interface-block.m diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td index 72e9b86..2a34b53 100644 --- a/clang/include/clang/Basic/DiagnosticSemaKinds.td +++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td @@ -3024,6 +3024,9 @@ def err_redefinition_of_enumerator : Error<"redefinition of enumerator %0">; def err_duplicate_member : Error<"duplicate member %0">; def err_misplaced_ivar : Error< "ivars may not be placed in %select{categories|class extension}0">; +def warn_ivar_in_interface_block : Warning< + "declaration of ivar in the interface block is deprecated">, + InGroup>, DefaultIgnore; def ext_enum_value_not_int : Extension< "ISO C restricts enumerator values to range of 'int' (%0 is too " "%select{small|large}1)">; diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp index 9e7f28b..7c87aa1 100644 --- a/clang/lib/Sema/SemaDecl.cpp +++ b/clang/lib/Sema/SemaDecl.cpp @@ -9540,7 +9540,11 @@ Decl *Sema::ActOnIvar(Scope *S, S->AddDecl(NewID); IdResolver.AddDecl(NewID); } - + + if (LangOpts.ObjCNonFragileABI2 && + !NewID->isInvalidDecl() && isa(EnclosingDecl)) + Diag(Loc, diag::warn_ivar_in_interface_block); + return NewID; } diff --git a/clang/test/SemaObjC/no-ivar-in-interface-block.m b/clang/test/SemaObjC/no-ivar-in-interface-block.m new file mode 100644 index 0000000..ce98586 --- /dev/null +++ b/clang/test/SemaObjC/no-ivar-in-interface-block.m @@ -0,0 +1,32 @@ +// RUN: %clang_cc1 -fsyntax-only -verify -Winterface-block-ivar %s +// rdar://10763173 + +@interface I +{ + @protected int P_IVAR; // expected-warning {{declaration of ivar in the interface block is deprecated}} + + @public int PU_IVAR; // expected-warning {{declaration of ivar in the interface block is deprecated}} + + @private int PRV_IVAR; // expected-warning {{declaration of ivar in the interface block is deprecated}} +} +@end + +@interface I() +{ + int I1; + int I2; +} +@end + +@interface I() +{ + int I3, I4; +} +@end + +@implementation I +{ + int I5; + int I6; +} +@end -- 2.7.4