---

yaml
---
r: 318455
b: refs/heads/master-rebranch
c: 67b3abe
h: refs/heads/master
i:
  318453: dcd0a00
  318451: 1b43735
  318447: eaf8d67

Author: swift-ci

[refs]

@@ -1457,4 +1457,4 @@ 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: f6b90145b01ae4657b5db2009b8df056428b92e6
+refs/heads/master-rebranch: 67b3abe48199afd3029e7051250a3ecaafed70b4

branches/master-rebranch/lib/Sema/CSDiagnostics.cpp

@@ -134,6 +134,7 @@ ProtocolConformance *RequirementFailure::getConformanceForConditionalReq(
 
 ValueDecl *RequirementFailure::getDeclRef() const {
   auto &cs = getConstraintSystem();
+  auto &TC = getTypeChecker();
 
   auto *anchor = getRawAnchor();
   auto *locator = cs.getConstraintLocator(anchor);
@@ -156,7 +157,7 @@ ValueDecl *RequirementFailure::getDeclRef() const {
   } else if (auto *UDE = dyn_cast<UnresolvedDotExpr>(anchor)) {
     ConstraintLocatorBuilder member(locator);
 
-    if (UDE->getName().isSimpleName(DeclBaseName::createConstructor())) {
+    if (TC.getSelfForInitDelegationInConstructor(getDC(), UDE)) {
       member = member.withPathElement(PathEltKind::ConstructorMember);
     } else {
       member = member.withPathElement(PathEltKind::Member);

branches/master-rebranch/test/Constraints/generics.swift

@@ -677,3 +677,13 @@ protocol C {
 protocol D {
   associatedtype Foo where Foo: String // expected-error {{type 'Self.Foo' constrained to non-protocol, non-class type 'String'}}
 }
+
+func member_ref_with_explicit_init() {
+  struct S<T: P> { // expected-note {{where 'T' = 'Int'}}
+    init(_: T) {}
+    init(_: T, _ other: Int = 42) {}
+  }
+
+  _ = S.init(42)
+  // expected-error@-1 {{generic struct 'S' requires that 'Int' conform to 'P'}}
+}