---

yaml
---
r: 340330
b: refs/heads/rxwei-patch-1
c: ae5a427
h: refs/heads/master

Author: slavapestov

[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: 6e90172010d810b5a831b811a3deae884ff6d4de
+refs/heads/rxwei-patch-1: ae5a427193a42b9e7427d3f12453d3c03a9dcb12
 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/lib/AST/ProtocolConformance.cpp

@@ -966,8 +966,23 @@ Witness SelfProtocolConformance::getWitness(ValueDecl *requirement,
 ConcreteDeclRef
 RootProtocolConformance::getWitnessDeclRef(ValueDecl *requirement,
                                            LazyResolver *resolver) const {
-  if (auto witness = getWitness(requirement, resolver))
-    return witness.getDeclRef();
+  if (auto witness = getWitness(requirement, resolver)) {
+    auto *witnessDecl = witness.getDecl();
+
+    // If the witness is generic, you have to call getWitness() and build
+    // your own substitutions in terms of the synthetic environment.
+    if (auto *witnessDC = dyn_cast<DeclContext>(witnessDecl))
+      assert(!witnessDC->isInnermostContextGeneric());
+
+    // If the witness is not generic, use type substitutions from the
+    // witness's parent. Don't use witness.getSubstitutions(), which
+    // are written in terms of the synthetic environment.
+    auto subs =
+      getType()->getContextSubstitutionMap(getDeclContext()->getParentModule(),
+                                           witnessDecl->getDeclContext());
+    return ConcreteDeclRef(witness.getDecl(), subs);
+  }
+
   return ConcreteDeclRef();
 }
 

branches/rxwei-patch-1/test/SILGen/literals.swift

@@ -320,3 +320,26 @@ struct FileReference: _ExpressibleByFileReferenceLiteral {
 func makeFileReferenceLiteral() -> FileReference {
   return #fileLiteral(resourceName: makeTmpString())
 }
+
+class ReferenceColor<T> { required init() {} }
+
+protocol Silly {
+  init()
+  init(_colorLiteralRed red: Float, green: Float, blue: Float, alpha: Float)
+}
+
+extension Silly {
+  init(_colorLiteralRed red: Float, green: Float, blue: Float, alpha: Float) {
+    self.init()
+  }
+}
+
+extension ReferenceColor : Silly, _ExpressibleByColorLiteral {}
+
+func makeColorLiteral<T>() -> ReferenceColor<T> {
+  return #colorLiteral(red: 1.358, green: -0.074, blue: -0.012, alpha: 1.0)
+}
+
+// CHECK-LABEL: sil hidden [ossa] @$s8literals16makeColorLiteralAA09ReferenceC0CyxGylF : $@convention(thin) <T> () -> @owned ReferenceColor<T>
+// CHECK: [[FN:%.*]] = function_ref @$s8literals5SillyPAAE16_colorLiteralRed5green4blue5alphaxSf_S3ftcfC : $@convention(method) <τ_0_0 where τ_0_0 : Silly> (Float, Float, Float, Float, @thick τ_0_0.Type) -> @out τ_0_0
+// CHECK: apply [[FN]]<ReferenceColor<T>>(