---

hborla · hborla · commit 91472aec3cba · 2019-09-17T15:21:21.000-07:00
yaml --- r: 344045 b: refs/heads/master-rebranch c: 85e6f73 h: refs/heads/master i: 344043: bd49792
diff --git a/[refs] b/[refs]
@@ -1455,7 +1455,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-02-a: ddd2b2976aa9bfde5f20fe37f6bd2
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-03-a: 171cc166f2abeb5ca2a4003700a8a78a108bd300
 refs/heads/benlangmuir-patch-1: baaebaf39d52f3bf36710d4fe40cf212e996b212
 refs/heads/i-do-redeclare: 8c4e6d5de5c1e3f0a2cedccf319df713ea22c48e
-refs/heads/master-rebranch: ea2acc6f9509578a43f3711cf25d6bcce43ca788
+refs/heads/master-rebranch: 85e6f73b1f40c27e96e34bed52d783259c040e0e
 refs/heads/rdar-53901732: 9bd06af3284e18a109cdbf9aa59d833b24eeca7b
 refs/heads/revert-26776-subst-always-returns-a-type: 1b8e18fdd391903a348970a4c848995d4cdd789c
 refs/heads/tensorflow-merge: 8b854f62f80d4476cb383d43c4aac2001dde3cec
diff --git a/branches/master-rebranch/lib/Sema/CSDiagnostics.cpp b/branches/master-rebranch/lib/Sema/CSDiagnostics.cpp
@@ -598,7 +598,9 @@ bool MissingConformanceFailure::diagnoseAsError() {
     return true;
   }
 
-  if (diagnoseTypeCannotConform(anchor, nonConformingType, protocolType)) {
+  if (diagnoseTypeCannotConform((atParameterPos ?
+                                getArgumentAt(Apply, *atParameterPos) : anchor),
+                                nonConformingType, protocolType)) {
       return true;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -598,7 +598,9 @@ bool MissingConformanceFailure::diagnoseAsError() {`
`598`	`598`	`return true;`
`599`	`599`	`}`
`600`	`600`
`601`		`- if (diagnoseTypeCannotConform(anchor, nonConformingType, protocolType)) {`
	`601`	`+ if (diagnoseTypeCannotConform((atParameterPos ?`
	`602`	`+ getArgumentAt(Apply, *atParameterPos) : anchor),`
	`603`	`+ nonConformingType, protocolType)) {`
`602`	`604`	`return true;`
`603`	`605`	`}`
`604`	`606`