Removed -Wundeclared-selector and -Wreadonly-setter-attrs from

-Wmost group (too noisy). Placed warning on parameter type
misatch between methods in sub and super class under
-Wsuper-class-method-mismatch (also too noisy).

llvm-svn: 79745

3 files changed, 9 insertions, 6 deletions

diff --git a/clang/include/clang/Basic/DiagnosticGroups.td b/clang/include/clang/Basic/DiagnosticGroups.td
index 60719f1b4a7..5a701078a02 100644
--- a/clang/include/clang/Basic/DiagnosticGroups.td
+++ b/clang/include/clang/Basic/DiagnosticGroups.td
@@ -97,6 +97,7 @@ def UnusedVariable : DiagGroup<"unused-variable">;
 def ReadOnlySetterAttrs : DiagGroup<"readonly-setter-attrs">;
 def Reorder : DiagGroup<"reorder">;
 def UndeclaredSelector : DiagGroup<"undeclared-selector">;
+def SuperSubClassMismatch : DiagGroup<"super-class-method-mismatch">;
 def : DiagGroup<"variadic-macros">;
 def VectorConversions : DiagGroup<"vector-conversions">;      // clang specific
 def VolatileRegisterVar : DiagGroup<"volatile-register-var">;
@@ -137,9 +138,11 @@ def Most : DiagGroup<"most", [
     UnusedVariable,
     VectorConversions,
     VolatileRegisterVar,
-    ReadOnlySetterAttrs,
-    Reorder,
-    UndeclaredSelector
+    // FIXME. Too many errors (-Werror) in a key project.
+    // ReadOnlySetterAttrs,
+    Reorder
+    // FIXME. Too many errors (-Werror) in a key project.
+    // UndeclaredSelector
  ]>;
 
 // -Wall is -Wmost -Wparentheses
diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td
index 20862c3bfeb..0a90af13c7d 100644
--- a/clang/include/clang/Basic/DiagnosticSemaKinds.td
+++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td
@@ -2093,7 +2093,7 @@ def error_protected_ivar_access : Error<"instance variable %0 is protected">,
 def warn_maynot_respond : Warning<"%0  may not respond to %1">;
 def warn_attribute_method_def : Warning<
   "method attribute can only be specified on method declarations">;
-def ext_typecheck_base_super : ExtWarn<
+def ext_typecheck_base_super : Warning<
   "method parameter type %0 does not match "
-  "super class method parameter type %1">;
+  "super class method parameter type %1">, InGroup<SuperSubClassMismatch>, DefaultIgnore;
 }
diff --git a/clang/test/SemaObjC/warn-superclass-method-mismatch.m b/clang/test/SemaObjC/warn-superclass-method-mismatch.m
index 5efe3e8d10e..f123a3f2dda 100644
--- a/clang/test/SemaObjC/warn-superclass-method-mismatch.m
+++ b/clang/test/SemaObjC/warn-superclass-method-mismatch.m
@@ -1,4 +1,4 @@
-// RUN: clang-cc  -fsyntax-only -verify %s
+// RUN: clang-cc  -fsyntax-only -Wsuper-class-method-mismatch -verify %s
 
 @interface Root
 -(void) method_r: (char)ch : (float*)f1 : (int*) x; // expected-note {{previous declaration is here}}