---

theblixguy · theblixguy · commit 7db2dda659df · 2019-07-13T21:50:24.000+01:00
yaml --- r: 341815 b: refs/heads/rxwei-patch-1 c: 8fc1c21 h: refs/heads/master i: 341813: 00a892c 341811: ed87553 341807: 7b33332
diff --git a/[refs] b/[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: 3b7b723e0f3671090ab4c6dd160e74611cb7a4fd
+refs/heads/rxwei-patch-1: 8fc1c21951baaa052222c230323f78abd03e8d49
 refs/heads/shahmishal-patch-1: e58ec0f7488258d42bef51bc3e6d7b3dc74d7b2a
 refs/heads/typelist-existential: 4046359efd541fb5c72d69a92eefc0a784df8f5e
 refs/tags/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-20-a: 4319ba09e4fb8650ee86061075c74a016b6baab9
diff --git a/branches/rxwei-patch-1/test/attr/attr_override.swift b/branches/rxwei-patch-1/test/attr/attr_override.swift
@@ -564,11 +564,11 @@ class SR_4206_DerivedConcrete_4: SR_4206_BaseConcrete_4 {
 // Base class not generic w/ method generic, derived class not generic w/ method generic but removed requirement
 
 class SR_4206_BaseConcrete_5 {
-  func foo<T: SR_4206_Protocol_2>(arg: T) {} // expected-note {{overridden declaration is here}}
+  func foo<T: SR_4206_Protocol_2>(arg: T) {}
 }
 
 class SR_4206_DerivedConcrete_5: SR_4206_BaseConcrete_5 {
-  override func foo<T>(arg: T) {} // expected-error {{overridden method 'foo' has generic signature <T> which is incompatible with base method's generic signature <T where T : SR_4206_Protocol_2>}}
+  override func foo<T>(arg: T) {} // Ok?
 }
 
 // Base class not generic w/ method generic, derived class generic w/ method generic but different requirement

Original file line number	Diff line number	Diff line change
`@@ -564,11 +564,11 @@ class SR_4206_DerivedConcrete_4: SR_4206_BaseConcrete_4 {`
`564`	`564`	`// Base class not generic w/ method generic, derived class not generic w/ method generic but removed requirement`
`565`	`565`
`566`	`566`	`class SR_4206_BaseConcrete_5 {`
`567`		`- func foo<T: SR_4206_Protocol_2>(arg: T) {} // expected-note {{overridden declaration is here}}`
	`567`	`+ func foo<T: SR_4206_Protocol_2>(arg: T) {}`
`568`	`568`	`}`
`569`	`569`
`570`	`570`	`class SR_4206_DerivedConcrete_5: SR_4206_BaseConcrete_5 {`
`571`		`- override func foo<T>(arg: T) {} // expected-error {{overridden method 'foo' has generic signature <T> which is incompatible with base method's generic signature <T where T : SR_4206_Protocol_2>}}`
	`571`	`+ override func foo<T>(arg: T) {} // Ok?`
`572`	`572`	`}`
`573`	`573`
`574`	`574`	`// Base class not generic w/ method generic, derived class generic w/ method generic but different requirement`