summaryrefslogtreecommitdiffstats
path: root/clang/include
diff options
context:
space:
mode:
Diffstat (limited to 'clang/include')
-rw-r--r--clang/include/clang/Basic/Attr.td2
-rw-r--r--clang/include/clang/Basic/DiagnosticSemaKinds.td4
-rw-r--r--clang/include/clang/Sema/AttributeList.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/clang/include/clang/Basic/Attr.td b/clang/include/clang/Basic/Attr.td
index 0302c5e3fd8..3377fee62d5 100644
--- a/clang/include/clang/Basic/Attr.td
+++ b/clang/include/clang/Basic/Attr.td
@@ -525,7 +525,7 @@ def ArcWeakrefUnavailable : InheritableAttr {
}
def ObjCSuppressAutosynthesis : InheritableAttr {
- let Spellings = ["objc_suppress_autosynthesis"];
+ let Spellings = ["objc_disable_automatic_synthesis"];
}
def Unused : InheritableAttr {
diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td
index d3a726ccc86..e4382ec17f3 100644
--- a/clang/include/clang/Basic/DiagnosticSemaKinds.td
+++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td
@@ -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">;
diff --git a/clang/include/clang/Sema/AttributeList.h b/clang/include/clang/Sema/AttributeList.h
index a0d7c4a5656..1d0cfd1489a 100644
--- a/clang/include/clang/Sema/AttributeList.h
+++ b/clang/include/clang/Sema/AttributeList.h
@@ -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,
OpenPOWER on IntegriCloud