---

yaml
---
r: 341819
b: refs/heads/rxwei-patch-1
c: 5279f20
h: refs/heads/master
i:
  341817: 8b1f136
  341815: 7db2dda

Author: theblixguy

[refs]

@@ -1015,7 +1015,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-08-18-a: b10b1fce14385faa6d44f6b933e95
 refs/heads/rdar-43033749-fix-batch-mode-no-diags-swift-5.0-branch: a14e64eaad30de89f0f5f0b2a782eed7ecdcb255
 refs/heads/revert-19006-error-bridging-integer-type: 8a9065a3696535305ea53fe9b71f91cbe6702019
 refs/heads/revert-19050-revert-19006-error-bridging-integer-type: ecf752d54b05dd0a20f510f0bfa54a3fec3bcaca
-refs/heads/rxwei-patch-1: f5213d0d3fc3693807f5f18df7a362c2255a6d17
+refs/heads/rxwei-patch-1: 5279f2038edfbdd8865d4058777332cce684bde6
 refs/heads/shahmishal-patch-1: e58ec0f7488258d42bef51bc3e6d7b3dc74d7b2a
 refs/heads/typelist-existential: 4046359efd541fb5c72d69a92eefc0a784df8f5e
 refs/tags/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-20-a: 4319ba09e4fb8650ee86061075c74a016b6baab9

branches/rxwei-patch-1/include/swift/AST/DiagnosticsSema.def

@@ -2342,8 +2342,8 @@ WARNING(override_swift3_objc_inference,none,
         (DescriptiveDeclKind, DeclName, Identifier))
 ERROR(override_method_different_generic_sig,none,
       "overridden method %0 has generic signature %1 which is incompatible with "
-      "base method's generic signature %2",
-      (DeclBaseName, StringRef, StringRef))
+      "base method's generic signature %2; expected generic signature to be %3",
+      (DeclBaseName, StringRef, StringRef, StringRef))
 
 // Inheritance
 ERROR(duplicate_inheritance,none,

branches/rxwei-patch-1/lib/Sema/TypeCheckDeclOverride.cpp

@@ -1055,7 +1055,8 @@ bool OverrideMatcher::checkOverride(ValueDecl *baseDecl,
               decl, diag::override_method_different_generic_sig,
               decl->getBaseName(),
               derivedGenericCtx->getGenericSignature()->getAsString(),
-              baseGenericCtx->getGenericSignature()->getAsString());
+              baseGenericCtx->getGenericSignature()->getAsString(),
+              newSig->getAsString());
           diags.diagnose(baseDecl, diag::overridden_here);
           emittedMatchError = true;
         }

branches/rxwei-patch-1/test/attr/attr_override.swift

@@ -548,7 +548,7 @@ class SR_4206_BaseGeneric_3<T> {
 }
 
 class SR_4206_DerivedGeneric_3<T>: SR_4206_BaseGeneric_3<T> {
-  override func foo<T: SR_4206_Protocol_1>(arg: T) {} // expected-error {{overridden method 'foo' has generic signature <T, T where T : SR_4206_Protocol_1> which is incompatible with base method's generic signature <T, T>}}
+  override func foo<T: SR_4206_Protocol_1>(arg: T) {} // expected-error {{overridden method 'foo' has generic signature <T, T where T : SR_4206_Protocol_1> which is incompatible with base method's generic signature <T, T>; expected generic signature to be <T, T>}}
 }
 
 // Base class not generic w/ method generic, derived class not generic w/ method generic but different requirement
@@ -558,7 +558,7 @@ class SR_4206_BaseConcrete_4 {
 }
 
 class SR_4206_DerivedConcrete_4: SR_4206_BaseConcrete_4 {
-  override func foo<T: SR_4206_Protocol_1>(arg: T) {} // expected-error {{overridden method 'foo' has generic signature <T where T : SR_4206_Protocol_1> which is incompatible with base method's generic signature <T>}}
+  override func foo<T: SR_4206_Protocol_1>(arg: T) {} // expected-error {{overridden method 'foo' has generic signature <T where T : SR_4206_Protocol_1> which is incompatible with base method's generic signature <T>; expected generic signature to be <T>}}
 }
 
 // Base class not generic w/ method generic, derived class not generic w/ method generic but removed requirement
@@ -578,7 +578,7 @@ class SR_4206_BaseConcrete_6 {
 }
 
 class SR_4206_DerivedGeneric_6<T>: SR_4206_BaseConcrete_6 {
-  override func foo<T: SR_4206_Protocol_1>(arg: T) {} // expected-error {{overridden method 'foo' has generic signature <T, T where T : SR_4206_Protocol_1> which is incompatible with base method's generic signature <T where T : SR_4206_Protocol_2>}}
+  override func foo<T: SR_4206_Protocol_1>(arg: T) {} // expected-error {{overridden method 'foo' has generic signature <T, T where T : SR_4206_Protocol_1> which is incompatible with base method's generic signature <T where T : SR_4206_Protocol_2>; expected generic signature to be <T, T where T : SR_4206_Protocol_2>}}
 }
 
 // Misc //