diff options
| author | Fariborz Jahanian <fjahanian@apple.com> | 2014-07-29 19:45:49 +0000 |
|---|---|---|
| committer | Fariborz Jahanian <fjahanian@apple.com> | 2014-07-29 19:45:49 +0000 |
| commit | 2056b38faca244fef034c920081d27951f8c364f (patch) | |
| tree | 053dbb490f7f59607f04dec60186be14bb9a9176 | |
| parent | d49d61b07b00f0eca516c99c31ca38e6e7ba8e2c (diff) | |
| download | bcm5719-llvm-2056b38faca244fef034c920081d27951f8c364f.tar.gz bcm5719-llvm-2056b38faca244fef034c920081d27951f8c364f.zip | |
Provide warning name for property attribute warning
mismatch. //rdar://17845264
llvm-svn: 214203
| -rw-r--r-- | clang/include/clang/Basic/DiagnosticGroups.td | 1 | ||||
| -rw-r--r-- | clang/include/clang/Basic/DiagnosticSemaKinds.td | 6 | ||||
| -rw-r--r-- | clang/test/Misc/warning-flags.c | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/clang/include/clang/Basic/DiagnosticGroups.td b/clang/include/clang/Basic/DiagnosticGroups.td index deead56322b..6d77707aabf 100644 --- a/clang/include/clang/Basic/DiagnosticGroups.td +++ b/clang/include/clang/Basic/DiagnosticGroups.td @@ -429,6 +429,7 @@ def SelectorTypeMismatch : DiagGroup<"selector-type-mismatch">; def Selector : DiagGroup<"selector", [SelectorTypeMismatch]>; def Protocol : DiagGroup<"protocol">; def AtProtocol : DiagGroup<"at-protocol">; +def PropertyAttr : DiagGroup<"property-attribute-mismatch">; def SuperSubClassMismatch : DiagGroup<"super-class-method-mismatch">; def OverridingMethodMismatch : DiagGroup<"overriding-method-mismatch">; def VariadicMacros : DiagGroup<"variadic-macros">; diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td index 7e515960cf9..6fbd6aa8167 100644 --- a/clang/include/clang/Basic/DiagnosticSemaKinds.td +++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td @@ -573,7 +573,8 @@ def warn_readonly_property : Warning< "'readwrite' of property inherited from %1">; def warn_property_attribute : Warning< - "'%1' attribute on property %0 does not match the property inherited from %2">; + "'%1' attribute on property %0 does not match the property inherited from %2">, + InGroup<PropertyAttr>; def warn_property_types_are_incompatible : Warning< "property type %0 is incompatible with type %1 inherited from %2">; def warn_protocol_property_mismatch : Warning< @@ -743,7 +744,8 @@ def warn_objc_property_default_assign_on_object : Warning< "default property attribute 'assign' not appropriate for non-GC object">, InGroup<ObjCPropertyNoAttribute>; def warn_property_attr_mismatch : Warning< - "property attribute in class extension does not match the primary class">; + "property attribute in class extension does not match the primary class">, + InGroup<PropertyAttr>; def warn_property_implicitly_mismatched : Warning < "primary property declaration is implicitly strong while redeclaration " "in class extension is weak">, diff --git a/clang/test/Misc/warning-flags.c b/clang/test/Misc/warning-flags.c index f58d2bf52b1..69706be283b 100644 --- a/clang/test/Misc/warning-flags.c +++ b/clang/test/Misc/warning-flags.c @@ -18,7 +18,7 @@ This test serves two purposes: The list of warnings below should NEVER grow. It should gradually shrink to 0. -CHECK: Warnings without flags (103): +CHECK: Warnings without flags (101): CHECK-NEXT: ext_delete_void_ptr_operand CHECK-NEXT: ext_excess_initializers CHECK-NEXT: ext_excess_initializers_in_char_array_initializer @@ -103,8 +103,6 @@ CHECK-NEXT: warn_pp_expr_overflow CHECK-NEXT: warn_pp_line_decimal CHECK-NEXT: warn_pragma_pack_pop_identifer_and_alignment CHECK-NEXT: warn_pragma_pack_show -CHECK-NEXT: warn_property_attr_mismatch -CHECK-NEXT: warn_property_attribute CHECK-NEXT: warn_property_getter_owning_mismatch CHECK-NEXT: warn_property_types_are_incompatible CHECK-NEXT: warn_readonly_property |
