Merge pull request swiftlang#25370 from xedin/rdar-51587755-5.1

[5.1][Diagnostics] Clarify requirement failure source when it's anchored a…

Author: xedin

lib/Sema/CSDiagnostics.cpp

@@ -131,9 +131,17 @@ Optional<SelectedOverload> FailureDiagnostic::getChoiceFor(Expr *expr) {
 }
 
 Type RequirementFailure::getOwnerType() const {
-  return getType(getRawAnchor())
-      ->getInOutObjectType()
-      ->getMetatypeInstanceType();
+  auto *anchor = getRawAnchor();
+
+  // If diagnostic is anchored at assignment expression
+  // it means that requirement failure happend while trying
+  // to convert source to destination, which means that
+  // owner type is actually not an assignment expression
+  // itself but its source.
+  if (auto *assignment = dyn_cast<AssignExpr>(anchor))
+    anchor = assignment->getSrc();
+
+  return getType(anchor)->getInOutObjectType()->getMetatypeInstanceType();
 }
 
 const GenericContext *RequirementFailure::getGenericContext() const {

test/Constraints/sr10906.swift

@@ -0,0 +1,24 @@
+// RUN: %target-typecheck-verify-swift
+
+protocol ViewDataSource: class {
+  func foo<T>() -> [T]
+}
+
+class View {
+  weak var delegate: ViewDataSource?
+}
+
+final class ViewController<T> {
+  let view = View()
+  init() {
+    view.delegate = self
+    // expected-error@-1 {{generic class 'ViewController' requires the types 'T' and 'String' be equivalent}}
+  }
+}
+
+extension ViewController: ViewDataSource where T == String {
+// expected-note@-1 {{requirement from conditional conformance of 'ViewController<T>' to 'ViewDataSource'}}
+  func foo<T>() -> [T] {
+    return []
+  }
+}