Place diagnostic warn_atomic_property_rule under a -W flag. Fixes <rdar://problem...

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@141089 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td
index f8d7111ddf2e0e64ed597f550269bad80862e94e..19fe1c5ad06af691008cadccf8f232cc77218301 100644 (file)
--- a/include/clang/Basic/DiagnosticSemaKinds.td
+++ b/include/clang/Basic/DiagnosticSemaKinds.td
@@ -499,7 +499,8 @@ def warn_objc_property_retain_of_block : Warning<
     "- use copy attribute instead">, InGroup<ObjCRetainBlockProperty>;
 def warn_atomic_property_rule : Warning<
   "writable atomic property %0 cannot pair a synthesized setter/getter "
-  "with a user defined setter/getter">;
+  "with a user defined setter/getter">,
+  InGroup<DiagGroup<"atomic-property-with-user-defined-accessor">>;
 def warn_ownin_getter_rule : Warning<
   "property's synthesized getter follows Cocoa naming"
   " convention for returning 'owned' objects">,

diff --git a/test/Misc/warning-flags.c b/test/Misc/warning-flags.c
index fe32abe60911c38eddb69bdd855611c316462550..c785546ebbc5761bf67b7ddc6a26632cc7a4e360 100644 (file)
--- a/test/Misc/warning-flags.c
+++ b/test/Misc/warning-flags.c
@@ -17,7 +17,7 @@ This test serves two purposes:
 
 The list of warnings below should NEVER grow.  It should gradually shrink to 0.
 
-CHECK: Warnings without flags (302):
+CHECK: Warnings without flags (301):
 CHECK-NEXT:   backslash_newline_space
 CHECK-NEXT:   charize_microsoft_ext
 CHECK-NEXT:   ext_anon_param_requires_type_specifier
@@ -123,7 +123,6 @@ CHECK-NEXT:   w_asm_qualifier_ignored
 CHECK-NEXT:   warn_accessor_property_type_mismatch
 CHECK-NEXT:   warn_anon_bitfield_width_exceeds_type_size
 CHECK-NEXT:   warn_asm_label_on_auto_decl
-CHECK-NEXT:   warn_atomic_property_rule
 CHECK-NEXT:   warn_attribute_ibaction
 CHECK-NEXT:   warn_attribute_iboutlet
 CHECK-NEXT:   warn_attribute_ignored