[clang] c6cf360 - Revert "[objc_direct] Small updates to help with adoption."
Pierre Habouzit via cfe-commits
cfe-commits at lists.llvm.org
Thu Jan 30 18:21:48 PST 2020
Author: Pierre Habouzit
Date: 2020-01-30T18:21:25-08:00
New Revision: c6cf3602e27b76669f785f5fd34b928a889b9db5
URL: https://github.com/llvm/llvm-project/commit/c6cf3602e27b76669f785f5fd34b928a889b9db5
DIFF: https://github.com/llvm/llvm-project/commit/c6cf3602e27b76669f785f5fd34b928a889b9db5.diff
LOG: Revert "[objc_direct] Small updates to help with adoption."
This reverts commit bebb8e2596af8fe97f9b6356ff06e4e80580cf32.
Pushed by accident, not yet reviewed
Added:
Modified:
clang/include/clang/Basic/Attr.td
clang/include/clang/Basic/AttrDocs.td
clang/include/clang/Basic/DiagnosticSemaKinds.td
clang/lib/Sema/SemaDeclObjC.cpp
clang/lib/Sema/SemaExprObjC.cpp
clang/lib/Sema/SemaObjCProperty.cpp
clang/test/Misc/pragma-attribute-supported-attributes-list.test
clang/test/SemaObjC/method-direct.m
Removed:
clang/test/FixIt/fixit-objc-direct.m
clang/test/SemaObjC/category-direct-properties.m
################################################################################
diff --git a/clang/include/clang/Basic/Attr.td b/clang/include/clang/Basic/Attr.td
index 79ced9c54dbe..7d01181e7c01 100644
--- a/clang/include/clang/Basic/Attr.td
+++ b/clang/include/clang/Basic/Attr.td
@@ -1905,7 +1905,7 @@ def ObjCDirect : Attr {
def ObjCDirectMembers : Attr {
let Spellings = [Clang<"objc_direct_members">];
- let Subjects = SubjectList<[ObjCImpl, ObjCInterface, ObjCCategory], ErrorDiag>;
+ let Subjects = SubjectList<[ObjCImpl, ObjCCategory], ErrorDiag>;
let LangOpts = [ObjC];
let Documentation = [ObjCDirectMembersDocs];
}
diff --git a/clang/include/clang/Basic/AttrDocs.td b/clang/include/clang/Basic/AttrDocs.td
index cc9d3c80c0da..114dea0ba359 100644
--- a/clang/include/clang/Basic/AttrDocs.td
+++ b/clang/include/clang/Basic/AttrDocs.td
@@ -4118,7 +4118,7 @@ documentation for more information.
def ObjCDirectMembersDocs : Documentation {
let Category = DocCatDecl;
let Content = [{
-The ``objc_direct_members`` attribute can be placed on an Objective-C
+The ``objc_direct_members`` attribute can be placed on an Objective-C
``@interface`` or ``@implementation`` to mark that methods declared
therein should be considered direct by default. See the documentation
for ``objc_direct`` for more information about direct methods.
@@ -4127,7 +4127,9 @@ When ``objc_direct_members`` is placed on an ``@interface`` block, every
method in the block is considered to be declared as direct. This includes any
implicit method declarations introduced by property declarations. If the method
redeclares a non-direct method, the declaration is ill-formed, exactly as if the
-method was annotated with the ``objc_direct`` attribute.
+method was annotated with the ``objc_direct`` attribute. ``objc_direct_members``
+cannot be placed on the primary interface of a class, only on category or class
+extension interfaces.
When ``objc_direct_members`` is placed on an ``@implementation`` block,
methods defined in the block are considered to be declared as direct unless
diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td
index 045d83ef499b..5e88c6ee86ab 100644
--- a/clang/include/clang/Basic/DiagnosticSemaKinds.td
+++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td
@@ -1002,8 +1002,8 @@ def err_objc_direct_on_protocol : Error<
"'objc_direct' attribute cannot be applied to %select{methods|properties}0 "
"declared in an Objective-C protocol">;
def err_objc_direct_duplicate_decl : Error<
- "%select{|direct }0%select{method|property}1 declaration conflicts "
- "with previous %select{|direct }2declaration of method %3">;
+ "%select{|direct }0method declaration conflicts "
+ "with previous %select{|direct }1declaration of method %2">;
def err_objc_direct_impl_decl_mismatch : Error<
"direct method was declared in %select{the primary interface|an extension|a category}0 "
"but is implemented in %select{the primary interface|a category|a
diff erent category}1">;
diff --git a/clang/lib/Sema/SemaDeclObjC.cpp b/clang/lib/Sema/SemaDeclObjC.cpp
index a18569182253..5fdf6aeed5b4 100644
--- a/clang/lib/Sema/SemaDeclObjC.cpp
+++ b/clang/lib/Sema/SemaDeclObjC.cpp
@@ -4859,8 +4859,8 @@ Decl *Sema::ActOnMethodDeclaration(
} else if (ObjCMethod->isDirectMethod() || IMD->isDirectMethod()) {
Diag(ObjCMethod->getLocation(),
diag::err_objc_direct_duplicate_decl)
- << ObjCMethod->isDirectMethod() << /* method */ 0
- << IMD->isDirectMethod() << ObjCMethod->getDeclName();
+ << ObjCMethod->isDirectMethod() << IMD->isDirectMethod()
+ << ObjCMethod->getDeclName();
Diag(IMD->getLocation(), diag::note_previous_declaration);
}
}
diff --git a/clang/lib/Sema/SemaExprObjC.cpp b/clang/lib/Sema/SemaExprObjC.cpp
index 984fec6ef147..7914dc57f9e1 100644
--- a/clang/lib/Sema/SemaExprObjC.cpp
+++ b/clang/lib/Sema/SemaExprObjC.cpp
@@ -2570,16 +2570,6 @@ ExprResult Sema::BuildClassMessage(TypeSourceInfo *ReceiverTypeInfo,
diag::err_illegal_message_expr_incomplete_type))
return ExprError();
- if (Method && Method->isDirectMethod() && SuperLoc.isValid()) {
- Diag(SuperLoc, diag::err_messaging_super_with_direct_method)
- << FixItHint::CreateReplacement(
- SuperLoc, getLangOpts().ObjCAutoRefCount
- ? "self"
- : Method->getClassInterface()->getName());
- Diag(Method->getLocation(), diag::note_direct_method_declared_at)
- << Method->getDeclName();
- }
-
// Warn about explicit call of +initialize on its own class. But not on 'super'.
if (Method && Method->getMethodFamily() == OMF_initialize) {
if (!SuperLoc.isValid()) {
@@ -2784,7 +2774,9 @@ ExprResult Sema::BuildInstanceMessage(Expr *Receiver,
ReceiverType->isIntegerType())) {
// Implicitly convert integers and pointers to 'id' but emit a warning.
// But not in ARC.
- Diag(Loc, diag::warn_bad_receiver_type) << ReceiverType << RecRange;
+ Diag(Loc, diag::warn_bad_receiver_type)
+ << ReceiverType
+ << Receiver->getSourceRange();
if (ReceiverType->isPointerType()) {
Receiver = ImpCastExprToType(Receiver, Context.getObjCIdType(),
CK_CPointerToObjCPointerCast).get();
@@ -2935,10 +2927,11 @@ ExprResult Sema::BuildInstanceMessage(Expr *Receiver,
// definition is found in a module that's not visible.
const ObjCInterfaceDecl *forwardClass = nullptr;
if (RequireCompleteType(Loc, OCIType->getPointeeType(),
- getLangOpts().ObjCAutoRefCount
- ? diag::err_arc_receiver_forward_instance
- : diag::warn_receiver_forward_instance,
- RecRange)) {
+ getLangOpts().ObjCAutoRefCount
+ ? diag::err_arc_receiver_forward_instance
+ : diag::warn_receiver_forward_instance,
+ Receiver? Receiver->getSourceRange()
+ : SourceRange(SuperLoc))) {
if (getLangOpts().ObjCAutoRefCount)
return ExprError();
@@ -3000,7 +2993,8 @@ ExprResult Sema::BuildInstanceMessage(Expr *Receiver,
return ExprError();
} else {
// Reject other random receiver types (e.g. structs).
- Diag(Loc, diag::err_bad_receiver_type) << ReceiverType << RecRange;
+ Diag(Loc, diag::err_bad_receiver_type)
+ << ReceiverType << Receiver->getSourceRange();
return ExprError();
}
}
@@ -3023,27 +3017,14 @@ ExprResult Sema::BuildInstanceMessage(Expr *Receiver,
// is what we think it is, so we reject it.
if (ReceiverType->isObjCClassType() && !isImplicit &&
!(Receiver->isObjCSelfExpr() && getLangOpts().ObjCAutoRefCount)) {
- DiagnosticBuilder Builder = Diag(
- Receiver->getExprLoc(), diag::err_messaging_class_with_direct_method);
- if (Receiver->isObjCSelfExpr()) {
- Builder.AddFixItHint(FixItHint::CreateReplacement(
- RecRange, Method->getClassInterface()->getName()));
- }
- Builder.~DiagnosticBuilder();
+ Diag(Receiver->getExprLoc(),
+ diag::err_messaging_class_with_direct_method);
Diag(Method->getLocation(), diag::note_direct_method_declared_at)
<< Method->getDeclName();
}
if (SuperLoc.isValid()) {
- DiagnosticBuilder Builder =
- Diag(SuperLoc, diag::err_messaging_super_with_direct_method);
- if (ReceiverType->isObjCClassType()) {
- Builder.AddFixItHint(FixItHint::CreateReplacement(
- SuperLoc, Method->getClassInterface()->getName()));
- } else {
- Builder.AddFixItHint(FixItHint::CreateReplacement(SuperLoc, "self"));
- }
- Builder.~DiagnosticBuilder();
+ Diag(SuperLoc, diag::err_messaging_super_with_direct_method);
Diag(Method->getLocation(), diag::note_direct_method_declared_at)
<< Method->getDeclName();
}
diff --git a/clang/lib/Sema/SemaObjCProperty.cpp b/clang/lib/Sema/SemaObjCProperty.cpp
index 4284b63c7028..f6717f4cbe5e 100644
--- a/clang/lib/Sema/SemaObjCProperty.cpp
+++ b/clang/lib/Sema/SemaObjCProperty.cpp
@@ -2421,40 +2421,6 @@ void Sema::ProcessPropertyDecl(ObjCPropertyDecl *property) {
DiagnosePropertyAccessorMismatch(property, GetterMethod,
property->getLocation());
- // synthesizing accessors must not result in a direct method that is not
- // monomorphic
- if (!GetterMethod) {
- if (const ObjCCategoryDecl *CatDecl = dyn_cast<ObjCCategoryDecl>(CD)) {
- auto *ExistingGetter = CatDecl->getClassInterface()->lookupMethod(
- property->getGetterName(), !IsClassProperty, true, false, CatDecl);
- if (ExistingGetter) {
- if (ExistingGetter->isDirectMethod() || property->isDirectProperty()) {
- Diag(property->getLocation(), diag::err_objc_direct_duplicate_decl)
- << property->isDirectProperty() << 1 /* property */
- << ExistingGetter->isDirectMethod()
- << ExistingGetter->getDeclName();
- Diag(ExistingGetter->getLocation(), diag::note_previous_declaration);
- }
- }
- }
- }
-
- if (!property->isReadOnly() && !SetterMethod) {
- if (const ObjCCategoryDecl *CatDecl = dyn_cast<ObjCCategoryDecl>(CD)) {
- auto *ExistingSetter = CatDecl->getClassInterface()->lookupMethod(
- property->getSetterName(), !IsClassProperty, true, false, CatDecl);
- if (ExistingSetter) {
- if (ExistingSetter->isDirectMethod() || property->isDirectProperty()) {
- Diag(property->getLocation(), diag::err_objc_direct_duplicate_decl)
- << property->isDirectProperty() << 1 /* property */
- << ExistingSetter->isDirectMethod()
- << ExistingSetter->getDeclName();
- Diag(ExistingSetter->getLocation(), diag::note_previous_declaration);
- }
- }
- }
- }
-
if (!property->isReadOnly() && SetterMethod) {
if (Context.getCanonicalType(SetterMethod->getReturnType()) !=
Context.VoidTy)
diff --git a/clang/test/FixIt/fixit-objc-direct.m b/clang/test/FixIt/fixit-objc-direct.m
deleted file mode 100644
index 67d0debf10c1..000000000000
--- a/clang/test/FixIt/fixit-objc-direct.m
+++ /dev/null
@@ -1,30 +0,0 @@
-// Objective-C recovery
-// RUN: not %clang_cc1 -triple x86_64-apple-darwin10 -fdiagnostics-parseable-fixits -x objective-c %s 2>&1 | FileCheck -check-prefix=CHECK-MRR %s
-// RUN: not %clang_cc1 -triple x86_64-apple-darwin10 -fobjc-arc -fdiagnostics-parseable-fixits -x objective-c %s 2>&1 | FileCheck -check-prefix=CHECK-ARC %s
-
-__attribute__((objc_root_class))
- at interface Root
-+ (void)classDirectMethod __attribute__((objc_direct));
-+ (void)classDirectMethod2 __attribute__((objc_direct));
-- (void)instanceDirectMethod __attribute__((objc_direct));
- at end
-
- at interface A : Root
- at end
-
- at implementation A
-+ (void)classMethod {
- // CHECK-MRR: {18:4-18:8}:"Root"
- [self classDirectMethod];
-}
-+ (void)classMethod2 {
- // CHECK-MRR: {23:4-23:9}:"Root"
- // CHECK-ARC: {23:4-23:9}:"self"
- [super classDirectMethod2];
-}
-- (void)instanceMethod {
- // CHECK-MRR: {28:4-28:9}:"self"
- // CHECK-ARC: {28:4-28:9}:"self"
- [super instanceDirectMethod];
-}
- at end
diff --git a/clang/test/Misc/pragma-attribute-supported-attributes-list.test b/clang/test/Misc/pragma-attribute-supported-attributes-list.test
index 3e29eb48da6c..76401ef46b6c 100644
--- a/clang/test/Misc/pragma-attribute-supported-attributes-list.test
+++ b/clang/test/Misc/pragma-attribute-supported-attributes-list.test
@@ -107,7 +107,7 @@
// CHECK-NEXT: ObjCClassStub (SubjectMatchRule_objc_interface)
// CHECK-NEXT: ObjCDesignatedInitializer (SubjectMatchRule_objc_method)
// CHECK-NEXT: ObjCDirect (SubjectMatchRule_objc_method)
-// CHECK-NEXT: ObjCDirectMembers (SubjectMatchRule_objc_implementation, SubjectMatchRule_objc_interface, SubjectMatchRule_objc_category)
+// CHECK-NEXT: ObjCDirectMembers (SubjectMatchRule_objc_implementation, SubjectMatchRule_objc_category)
// CHECK-NEXT: ObjCException (SubjectMatchRule_objc_interface)
// CHECK-NEXT: ObjCExplicitProtocolImpl (SubjectMatchRule_objc_protocol)
// CHECK-NEXT: ObjCExternallyRetained (SubjectMatchRule_variable_not_is_parameter, SubjectMatchRule_function, SubjectMatchRule_block, SubjectMatchRule_objc_method)
diff --git a/clang/test/SemaObjC/category-direct-properties.m b/clang/test/SemaObjC/category-direct-properties.m
deleted file mode 100644
index a041a77b8bf8..000000000000
--- a/clang/test/SemaObjC/category-direct-properties.m
+++ /dev/null
@@ -1,273 +0,0 @@
-// RUN: %clang_cc1 -fsyntax-only -verify -Wselector-type-mismatch %s
-
-__attribute__((objc_root_class))
- at interface Inteface_Implementation
- at property(nonatomic, readonly) int normal_normal;
- at property(nonatomic, readonly, direct) int direct_normal;
- at property(nonatomic, readonly) int normal_direct; // expected-note {{previous declaration is here}}
- at property(nonatomic, readonly, direct) int direct_direct;
- at end
-
- at implementation Inteface_Implementation
-- (int)normal_normal {
- return 42;
-}
-- (int)direct_normal {
- return 42;
-}
-- (int)normal_direct __attribute__((objc_direct)) { // expected-error {{direct method implementation was previously declared not direct}}
- return 42;
-}
-- (int)direct_direct __attribute__((objc_direct)) {
- return 42;
-}
- at end
-
-__attribute__((objc_root_class))
- at interface Inteface_Extension
- at property(nonatomic, readonly) int normal_normal;
- at property(nonatomic, readonly, direct) int direct_normal;
- at property(nonatomic, readonly) int normal_direct;
- at property(nonatomic, readonly, direct) int direct_direct;
- at end
-
- at interface Inteface_Extension ()
- at property(nonatomic, readwrite) int normal_normal;
- at property(nonatomic, readwrite) int direct_normal;
- at property(nonatomic, readwrite, direct) int normal_direct;
- at property(nonatomic, readwrite, direct) int direct_direct;
- at end
-
- at implementation Inteface_Extension
- at end
-
-__attribute__((objc_root_class))
- at interface Extension_Implementation
- at end
-
- at interface Extension_Implementation ()
- at property(nonatomic, readwrite) int normal_normal;
- at property(nonatomic, readwrite, direct) int direct_normal;
- at property(nonatomic, readwrite) int normal_direct; // expected-note {{previous declaration is here}}
- at property(nonatomic, readwrite, direct) int direct_direct;
- at end
-
- at implementation Extension_Implementation
-- (int)normal_normal {
- return 42;
-}
-- (int)direct_normal {
- return 42;
-}
-- (int)normal_direct __attribute__((objc_direct)) { // expected-error {{direct method implementation was previously declared not direct}}
- return 42;
-}
-- (int)direct_direct __attribute__((objc_direct)) {
- return 42;
-}
- at end
-
-__attribute__((objc_root_class))
- at interface Inteface_Category
- at property(nonatomic, readonly) int normal_normal;
- at property(nonatomic, readonly, direct) int direct_normal; // expected-note {{previous declaration is here}}
- at property(nonatomic, readonly) int normal_direct; // expected-note {{previous declaration is here}}
- at property(nonatomic, readonly, direct) int direct_direct; // expected-note {{previous declaration is here}}
- at end
-
- at interface Inteface_Category (SomeCategory)
- at property(nonatomic, readonly) int normal_normal;
- at property(nonatomic, readonly) int direct_normal; // expected-error {{property declaration conflicts with previous direct declaration of method 'direct_normal'}}
- at property(nonatomic, readonly, direct) int normal_direct; // expected-error {{direct property declaration conflicts with previous declaration of method 'normal_direct'}}
- at property(nonatomic, readonly, direct) int direct_direct; // expected-error {{direct property declaration conflicts with previous direct declaration of method 'direct_direct'}}
- at end
-
- at implementation Inteface_Category
- at end
-
-__attribute__((objc_root_class))
- at interface Extension_Category
- at end
-
- at interface Extension_Category ()
- at property(nonatomic, readonly) int normal_normal;
- at property(nonatomic, readonly, direct) int direct_normal; // expected-note {{previous declaration is here}}
- at property(nonatomic, readonly) int normal_direct; // expected-note {{previous declaration is here}}
- at property(nonatomic, readonly, direct) int direct_direct; // expected-note {{previous declaration is here}}
- at end
-
- at interface Extension_Category (SomeCategory)
- at property(nonatomic, readonly) int normal_normal;
- at property(nonatomic, readonly) int direct_normal; // expected-error {{property declaration conflicts with previous direct declaration of method 'direct_normal'}}
- at property(nonatomic, readonly, direct) int normal_direct; // expected-error {{direct property declaration conflicts with previous declaration of method 'normal_direct'}}
- at property(nonatomic, readonly, direct) int direct_direct; // expected-error {{direct property declaration conflicts with previous direct declaration of method 'direct_direct'}}
- at end
-
- at implementation Extension_Category
- at end
-
-__attribute__((objc_root_class))
- at interface Implementation_Category
- at end
-
- at interface Implementation_Category (SomeCategory)
- at property(nonatomic, readonly) int normal_normal;
- at property(nonatomic, readonly, direct) int direct_normal; // expected-note {{previous declaration is here}}
- at property(nonatomic, readonly) int normal_direct; // expected-note {{previous declaration is here}}
- at property(nonatomic, readonly, direct) int direct_direct; // expected-note {{previous declaration is here}}
- at end
-
- at implementation Implementation_Category
-- (int)normal_normal {
- return 42;
-}
-- (int)direct_normal { // expected-error {{direct method was declared in a category but is implemented in the primary interface}}
- return 42;
-}
-- (int)normal_direct __attribute__((objc_direct)) { // expected-error {{direct method was declared in a category but is implemented in the primary interface}}
- return 42;
-}
-- (int)direct_direct __attribute__((objc_direct)) { // expected-error {{direct method was declared in a category but is implemented in the primary interface}}
- return 42;
-}
- at end
-
-__attribute__((objc_root_class))
- at interface Category_Category
- at end
-
- at interface Category_Category (SomeCategory)
- at property(nonatomic, readonly) int normal_normal;
- at property(nonatomic, readonly, direct) int direct_normal; // expected-note {{previous declaration is here}}
- at property(nonatomic, readonly) int normal_direct; // expected-note {{previous declaration is here}}
- at property(nonatomic, readonly, direct) int direct_direct; // expected-note {{previous declaration is here}}
- at end
-
- at interface Category_Category (SomeOtherCategory)
- at property(nonatomic, readonly) int normal_normal;
- at property(nonatomic, readonly) int direct_normal; // expected-error {{property declaration conflicts with previous direct declaration of method 'direct_normal'}}
- at property(nonatomic, readonly, direct) int normal_direct; // expected-error {{direct property declaration conflicts with previous declaration of method 'normal_direct'}}
- at property(nonatomic, readonly, direct) int direct_direct; // expected-error {{direct property declaration conflicts with previous direct declaration of method 'direct_direct'}}
- at end
-
- at implementation Category_Category
- at end
-
-__attribute__((objc_root_class))
- at interface Category_CategoryImplementation
- at end
-
- at interface Category_CategoryImplementation (SomeCategory)
- at property(nonatomic, readonly) int normal_normal;
- at property(nonatomic, readonly, direct) int direct_normal;
- at property(nonatomic, readonly) int normal_direct; // expected-note {{previous declaration is here}}
- at property(nonatomic, readonly, direct) int direct_direct;
- at end
-
- at implementation Category_CategoryImplementation (SomeCategory)
-- (int)normal_normal {
- return 42;
-}
-- (int)direct_normal {
- return 42;
-}
-- (int)normal_direct __attribute__((objc_direct)) { // expected-error {{direct method implementation was previously declared not direct}}
- return 42;
-}
-- (int)direct_direct __attribute__((objc_direct)) {
- return 42;
-}
- at end
-
- at implementation Category_CategoryImplementation
- at end
-
-__attribute__((objc_root_class))
- at interface Interface_CategoryImplementation
- at property(nonatomic, readonly) int normal_normal;
- at property(nonatomic, readonly, direct) int direct_normal; // expected-note {{previous declaration is here}}
- at property(nonatomic, readonly) int normal_direct; // expected-note {{previous declaration is here}}
- at property(nonatomic, readonly, direct) int direct_direct; // expected-note {{previous declaration is here}}
- at end
-
- at interface Interface_CategoryImplementation (SomeCategory)
- at end
-
- at implementation Interface_CategoryImplementation (SomeCategory)
-- (int)normal_normal {
- return 42;
-}
-- (int)direct_normal { // expected-error {{direct method was declared in the primary interface but is implemented in a category}}
- return 42;
-}
-- (int)normal_direct __attribute__((objc_direct)) { // expected-error {{direct method was declared in the primary interface but is implemented in a category}}
- return 42;
-}
-- (int)direct_direct __attribute__((objc_direct)) { // expected-error {{direct method was declared in the primary interface but is implemented in a category}}
- return 42;
-}
- at end
-
- at implementation Interface_CategoryImplementation
- at end
-
-__attribute__((objc_root_class))
- at interface Extension_CategoryImplementation
- at end
-
- at interface Extension_CategoryImplementation ()
- at property(nonatomic, readonly) int normal_normal;
- at property(nonatomic, readonly, direct) int direct_normal; // expected-note {{previous declaration is here}}
- at property(nonatomic, readonly) int normal_direct; // expected-note {{previous declaration is here}}
- at property(nonatomic, readonly, direct) int direct_direct; // expected-note {{previous declaration is here}}
- at end
-
- at interface Extension_CategoryImplementation (SomeCategory)
- at end
-
- at implementation Extension_CategoryImplementation (SomeCategory)
-- (int)normal_normal {
- return 42;
-}
-- (int)direct_normal { // expected-error {{direct method was declared in an extension but is implemented in a
diff erent category}}
- return 42;
-}
-- (int)normal_direct __attribute__((objc_direct)) { // expected-error {{direct method was declared in an extension but is implemented in a
diff erent category}}
- return 42;
-}
-- (int)direct_direct __attribute__((objc_direct)) { // expected-error {{direct method was declared in an extension but is implemented in a
diff erent category}}
- return 42;
-}
- at end
-
-__attribute__((objc_root_class))
- at interface OtherCategory_CategoryImplementation
- at end
-
- at interface OtherCategory_CategoryImplementation (SomeCategory)
- at end
-
- at interface OtherCategory_CategoryImplementation (SomeOtherCategory)
- at property(nonatomic, readonly) int normal_normal;
- at property(nonatomic, readonly, direct) int direct_normal; // expected-note {{previous declaration is here}}
- at property(nonatomic, readonly) int normal_direct; // expected-note {{previous declaration is here}}
- at property(nonatomic, readonly, direct) int direct_direct; // expected-note {{previous declaration is here}}
- at end
-
- at implementation OtherCategory_CategoryImplementation (SomeCategory)
-- (int)normal_normal {
- return 42;
-}
-- (int)direct_normal { // expected-error {{direct method was declared in a category but is implemented in a
diff erent category}}
- return 42;
-}
-- (int)normal_direct __attribute__((objc_direct)) { // expected-error {{direct method was declared in a category but is implemented in a
diff erent category}}
- return 42;
-}
-- (int)direct_direct __attribute__((objc_direct)) { // expected-error {{direct method was declared in a category but is implemented in a
diff erent category}}
- return 42;
-}
- at end
-
- at implementation OtherCategory_CategoryImplementation
- at end
diff --git a/clang/test/SemaObjC/method-direct.m b/clang/test/SemaObjC/method-direct.m
index 0ece3f4d8632..c2cbdbebdaf4 100644
--- a/clang/test/SemaObjC/method-direct.m
+++ b/clang/test/SemaObjC/method-direct.m
@@ -18,7 +18,6 @@ - (void)rootDirect __attribute__((objc_direct)); // expected-note {{previou
+ (void)classRootDirect __attribute__((objc_direct)); // expected-note {{previous declaration is here}};
- (void)otherRootDirect __attribute__((objc_direct)); // expected-note {{direct method 'otherRootDirect' declared here}}
+ (void)otherClassRootDirect __attribute__((objc_direct)); // expected-note {{direct method 'otherClassRootDirect' declared here}}
-+ (void)otherOtherClassRootDirect __attribute__((objc_direct)); // expected-note {{direct method 'otherOtherClassRootDirect' declared here}}
- (void)notDirectInIface; // expected-note {{previous declaration is here}}
+ (void)classNotDirectInIface; // expected-note {{previous declaration is here}}
@end
@@ -49,6 +48,11 @@ - (void)rootCategoryDirect2 __attribute__((objc_direct)); // expected-note
+ (void)classRootCategoryDirect2 __attribute__((objc_direct)); // expected-note {{previous declaration is here}}
@end
+__attribute__((objc_root_class, objc_direct_members)) // expected-error {{'objc_direct_members' attribute only applies to Objective-C implementation declarations and Objective-C containers}}
+ at interface SubDirectFail : Root
+- (instancetype)init;
+ at end
+
@interface Sub : Root <Proto>
/* invalid overrides with directs */
- (void)rootRegular __attribute__((objc_direct)); // expected-error {{methods that override superclass methods cannot be direct}}
@@ -90,8 +94,6 @@ + (void)someRootDirectMethod { // expected-note {{direct method 'someRootDirectM
+ (void)otherClassRootDirect {
[self someRootDirectMethod]; // expected-error {{messaging a Class with a method that is possibly direct}}
}
-+ (void)otherOtherClassRootDirect {
-}
- (void)rootExtensionDirect {
}
+ (void)classRootExtensionDirect {
@@ -133,9 +135,6 @@ @implementation ValidSub
- (void)someValidSubMethod {
[super otherRootDirect]; // expected-error {{messaging super with a direct method}}
}
-+ (void)someValidSubMethod {
- [super otherOtherClassRootDirect]; // expected-error {{messaging super with a direct method}}
-}
@end
extern void callMethod(id obj, Class cls);
More information about the cfe-commits
mailing list