SR-11902: Fixed code review issues. Updated tests.

Author: kitaisreal

include/swift/AST/DiagnosticsSema.def

@@ -2710,9 +2710,10 @@ NOTE(missing_member_type_conformance_prevents_synthesis, none,
      "protocol %2, preventing synthesized conformance "
      "of %3 to %2",
      (unsigned, Type, Type, Type))
-NOTE(classes_equatable_hashable_synthesis,none,
-    "currently 'Equatable' and 'Hashable' synthesis is not supported for classes "
-    "because of inheritance.", ())
+NOTE(classes_automatic_protocol_synthesis,none,
+    "automatic synthesis of '%0' is not supported for classes "
+    "because of inheritance.",
+    (StringRef))
 
 // Dynamic Self
 ERROR(dynamic_self_non_method,none,

lib/Sema/DerivedConformanceEquatableHashable.cpp

@@ -168,7 +168,8 @@ void diagnoseFailedDerivation(DeclContext *DC, NominalTypeDecl *nominal,
 
   if (auto *classDecl = dyn_cast<ClassDecl>(nominal)) {
     ctx.Diags.diagnose(classDecl->getLoc(),
-                       diag::classes_equatable_hashable_synthesis);
+                       diag::classes_automatic_protocol_synthesis,
+                       protocol->getName().str());
   }
 }
 

test/Sema/classes_equatable_hashable.swift

@@ -0,0 +1,8 @@
+// RUN: %target-swift-frontend -typecheck -verify -primary-file %s
+
+class Foo: Equatable {} 
+// expected-error@-1 {{type 'Foo' does not conform to protocol 'Equatable'}} expected-note@-1 {{automatic synthesis of 'Equatable' is not supported for classes because of inheritance.}}
+
+class Bar: Hashable {} 
+// expected-error@-1 {{type 'Bar' does not conform to protocol 'Hashable'}} expected-note@-1 {{automatic synthesis of 'Hashable' is not supported for classes because of inheritance.}}
+// expected-error@-2 {{type 'Bar' does not conform to protocol 'Equatable'}} expected-note@-2 {{automatic synthesis of 'Equatable' is not supported for classes because of inheritance.}}