Adopt %kind in diag::objc_overriding_objc_decl

Slightly alters wording of a diagnostic.

Author: beccadax

include/swift/AST/DiagnosticsSema.def

@@ -5938,8 +5938,7 @@ NOTE(objc_inferring_on_objc_protocol_member,none,
      "inferring '@objc' because the declaration is a member of "
      "an '@objc' protocol", ())
 NOTE(objc_overriding_objc_decl,none,
-     "overriding '@objc' %select{property|subscript|initializer|method}0 %1 "
-     "here", (unsigned, DeclName))
+     "overriding '@objc' %kind0 here", (const ValueDecl *))
 NOTE(objc_witness_objc_requirement,none,
      "satisfying requirement for %0 %1 in protocol %2",
      (DescriptiveDeclKind, DeclName, Identifier))

lib/Sema/TypeCheckDeclObjC.cpp

@@ -110,14 +110,8 @@ void ObjCReason::describe(const Decl *D) const {
     break;
 
   case ObjCReason::OverridesObjC: {
-    unsigned kind = isa<VarDecl>(D) ? 0
-                  : isa<SubscriptDecl>(D) ? 1
-                  : isa<ConstructorDecl>(D) ? 2
-                  : 3;
-
     auto overridden = cast<ValueDecl>(D)->getOverriddenDecl();
-    overridden->diagnose(diag::objc_overriding_objc_decl,
-                         kind, overridden->getName());
+    overridden->diagnose(diag::objc_overriding_objc_decl, overridden);
     break;
   }
 

test/attr/attr_objc.swift

@@ -2104,7 +2104,7 @@ class Super {
   var foo: Int { get { return 3 } } // expected-note 2{{overridden declaration is here}}
 
   @objc // access-note-move{{Super.process(i:)}}
-  func process(i: Int) -> Int { } // expected-note {{overriding '@objc' method 'process(i:)' here}}
+  func process(i: Int) -> Int { } // expected-note {{overriding '@objc' instance method 'process(i:)' here}}
 }
 
 class Sub1 : Super {