Rename attribute 'objc_suppress_autosynthesis' to 'objc_disable_automatic_synthesis'.
llvm-svn: 147567
This commit is contained in:
parent
778d2bb8d4
commit
dec9d12fc4
|
@ -525,7 +525,7 @@ def ArcWeakrefUnavailable : InheritableAttr {
|
|||
}
|
||||
|
||||
def ObjCSuppressAutosynthesis : InheritableAttr {
|
||||
let Spellings = ["objc_suppress_autosynthesis"];
|
||||
let Spellings = ["objc_disable_automatic_synthesis"];
|
||||
}
|
||||
|
||||
def Unused : InheritableAttr {
|
||||
|
|
|
@ -380,7 +380,7 @@ def note_implementation_declared : Note<
|
|||
def note_class_declared : Note<
|
||||
"class is declared here">;
|
||||
def note_suppressed_class_declare : Note<
|
||||
"class with specified objc_suppress_autosynthesis attribute is declared here">;
|
||||
"class with specified objc_disable_automatic_synthesis attribute is declared here">;
|
||||
def warn_dup_category_def : Warning<
|
||||
"duplicate definition of category %1 on interface %0">;
|
||||
def err_conflicting_super_class : Error<"conflicting super class name %0">;
|
||||
|
@ -1372,7 +1372,7 @@ def err_attribute_wrong_number_arguments : Error<
|
|||
def err_attribute_too_many_arguments : Error<
|
||||
"attribute takes no more than %0 argument%s0">;
|
||||
def err_suppress_autosynthesis : Error<
|
||||
"objc_suppress_autosynthesis attribute may only be specified on a class"
|
||||
"objc_disable_automatic_synthesis attribute may only be specified on a class"
|
||||
"to a class declaration">;
|
||||
def err_attribute_too_few_arguments : Error<
|
||||
"attribute takes at least %0 argument%s0">;
|
||||
|
|
|
@ -169,7 +169,7 @@ public:
|
|||
AT_analyzer_noreturn,
|
||||
AT_annotate,
|
||||
AT_arc_weakref_unavailable,
|
||||
AT_objc_suppress_autosynthesis,
|
||||
AT_objc_disable_automatic_synthesis,
|
||||
AT_availability, // Clang-specific
|
||||
AT_base_check,
|
||||
AT_blocks,
|
||||
|
|
|
@ -108,7 +108,7 @@ AttributeList::Kind AttributeList::getKind(const IdentifierInfo *Name) {
|
|||
.Case("weak", AT_weak)
|
||||
.Case("weakref", AT_weakref)
|
||||
.Case("objc_arc_weak_reference_unavailable", AT_arc_weakref_unavailable)
|
||||
.Case("objc_suppress_autosynthesis", AT_objc_suppress_autosynthesis)
|
||||
.Case("objc_disable_automatic_synthesis", AT_objc_disable_automatic_synthesis)
|
||||
.Case("pure", AT_pure)
|
||||
.Case("mode", AT_mode)
|
||||
.Case("used", AT_used)
|
||||
|
|
|
@ -3620,7 +3620,7 @@ static void ProcessInheritableDeclAttr(Sema &S, Scope *scope, Decl *D,
|
|||
case AttributeList::AT_arc_weakref_unavailable:
|
||||
handleArcWeakrefUnavailableAttr (S, D, Attr);
|
||||
break;
|
||||
case AttributeList::AT_objc_suppress_autosynthesis:
|
||||
case AttributeList::AT_objc_disable_automatic_synthesis:
|
||||
handleObjCSuppressAutosynthesisAttr (S, D, Attr);
|
||||
break;
|
||||
case AttributeList::AT_unused: handleUnusedAttr (S, D, Attr); break;
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
// RUN: %clang_cc1 -x objective-c -fsyntax-only -fobjc-default-synthesize-properties -verify %s
|
||||
// RUN: %clang_cc1 -x objective-c++ -fsyntax-only -fobjc-default-synthesize-properties -verify %s
|
||||
|
||||
#if __has_attribute(objc_suppress_autosynthesis)
|
||||
__attribute ((objc_suppress_autosynthesis))
|
||||
#if __has_attribute(objc_disable_automatic_synthesis)
|
||||
__attribute ((objc_disable_automatic_synthesis))
|
||||
#endif
|
||||
@interface NoAuto // expected-note 2 {{class with specified objc_suppress_autosynthesis attribute is declared here}}
|
||||
@interface NoAuto // expected-note 2 {{class with specified objc_disable_automatic_synthesis attribute is declared here}}
|
||||
@property int NoAutoProp; // expected-note 2 {{property declared here}}
|
||||
@end
|
||||
|
||||
|
@ -12,8 +12,8 @@ __attribute ((objc_suppress_autosynthesis))
|
|||
// expected-warning {{property 'NoAutoProp' requires method 'setNoAutoProp:'}}
|
||||
@end
|
||||
|
||||
__attribute ((objc_suppress_autosynthesis)) // redundant, just for testing
|
||||
@interface Sub : NoAuto // expected-note 3 {{class with specified objc_suppress_autosynthesis attribute is declared here}}
|
||||
__attribute ((objc_disable_automatic_synthesis)) // redundant, just for testing
|
||||
@interface Sub : NoAuto // expected-note 3 {{class with specified objc_disable_automatic_synthesis attribute is declared here}}
|
||||
@property (copy) id SubProperty; // expected-note 2 {{property declared here}}
|
||||
@end
|
||||
|
||||
|
@ -33,9 +33,9 @@ __attribute ((objc_suppress_autosynthesis)) // redundant, just for testing
|
|||
- (id) DeepMustSynthProperty { return 0; }
|
||||
@end
|
||||
|
||||
__attribute ((objc_suppress_autosynthesis))
|
||||
__attribute ((objc_disable_automatic_synthesis))
|
||||
@interface Deep(CAT) // expected-error {{attributes may not be specified on a category}}
|
||||
@end
|
||||
|
||||
__attribute ((objc_suppress_autosynthesis)) // expected-error {{objc_suppress_autosynthesis attribute may only be specified on a class}}
|
||||
__attribute ((objc_disable_automatic_synthesis)) // expected-error {{objc_disable_automatic_synthesis attribute may only be specified on a class}}
|
||||
@protocol P @end
|
||||
|
|
Loading…
Reference in New Issue