Place diagnostic warn_ownin_getter_rule under a -W flag. Fixes <rdar://problem/10230626>.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@141088 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td
index 434855f..f8d7111 100644
--- a/include/clang/Basic/DiagnosticSemaKinds.td
+++ b/include/clang/Basic/DiagnosticSemaKinds.td
@@ -502,7 +502,8 @@
"with a user defined setter/getter">;
def warn_ownin_getter_rule : Warning<
"property's synthesized getter follows Cocoa naming"
- " convention for returning 'owned' objects">;
+ " convention for returning 'owned' objects">,
+ InGroup<DiagGroup<"objc-property-matches-cocoa-ownership-rule">>;
def warn_property_getter_owning_mismatch : Warning<
"property declared as returning non-retained objects"
"; getter returning retained objects">;
diff --git a/test/Misc/warning-flags.c b/test/Misc/warning-flags.c
index 1099eff..fe32abe 100644
--- a/test/Misc/warning-flags.c
+++ b/test/Misc/warning-flags.c
@@ -17,7 +17,7 @@
The list of warnings below should NEVER grow. It should gradually shrink to 0.
-CHECK: Warnings without flags (303):
+CHECK: Warnings without flags (302):
CHECK-NEXT: backslash_newline_space
CHECK-NEXT: charize_microsoft_ext
CHECK-NEXT: ext_anon_param_requires_type_specifier
@@ -238,7 +238,6 @@
CHECK-NEXT: warn_octal_escape_too_large
CHECK-NEXT: warn_odr_tag_type_inconsistent
CHECK-NEXT: warn_on_superclass_use
-CHECK-NEXT: warn_ownin_getter_rule
CHECK-NEXT: warn_param_default_argument_redefinition
CHECK-NEXT: warn_parens_disambiguated_as_function_decl
CHECK-NEXT: warn_partial_specs_not_deducible