Merge pull request #33276 from jckarter/opaque-substitution-substitution-5.3

SILGen: Lower formal callee type pre-opaque-type-substitution.

Author: jckarter

lib/SILGen/SILGenApply.cpp

@@ -315,7 +315,8 @@ class Callee {
   CanFunctionType SubstFormalInterfaceType;
 
   /// The substitutions applied to OrigFormalInterfaceType to produce
-  /// SubstFormalInterfaceType.
+  /// SubstFormalInterfaceType, substituted into the current type expansion
+  /// context.
   SubstitutionMap Substitutions;
 
   /// The list of values captured by our callee.
@@ -351,14 +352,14 @@ class Callee {
   /// Constructor for Callee::forDirect.
   Callee(SILGenFunction &SGF, SILDeclRef standaloneFunction,
          AbstractionPattern origFormalType, CanAnyFunctionType substFormalType,
-         SubstitutionMap subs, SILLocation l,
+         SubstitutionMap subs, SubstitutionMap formalSubs, SILLocation l,
          bool callDynamicallyReplaceableImpl = false)
       : kind(callDynamicallyReplaceableImpl
                  ? Kind::StandaloneFunctionDynamicallyReplaceableImpl
                  : Kind::StandaloneFunction),
         Constant(standaloneFunction), OrigFormalInterfaceType(origFormalType),
         SubstFormalInterfaceType(
-            getSubstFormalInterfaceType(substFormalType, subs)),
+            getSubstFormalInterfaceType(substFormalType, formalSubs)),
         Substitutions(subs), Loc(l) {}
 
   /// Constructor called by all for* factory methods except forDirect and
@@ -387,7 +388,9 @@ class Callee {
     auto &ci = SGF.getConstantInfo(SGF.getTypeExpansionContext(), c);
     return Callee(
         SGF, c, ci.FormalPattern, ci.FormalType,
-        subs.mapIntoTypeExpansionContext(SGF.getTypeExpansionContext()), l,
+        subs.mapIntoTypeExpansionContext(SGF.getTypeExpansionContext()),
+        subs,
+        l,
         callPreviousDynamicReplaceableImpl);
   }
 

test/SILGen/opaque_type_substitution_through_substitutions.swift

@@ -0,0 +1,19 @@
+// RUN: %target-swift-emit-silgen -disable-availability-checking -verify %s
+
+// rdar://problem/65683913
+
+@_silgen_name("foo") func foo() -> Int
+
+func createSomeOpaqueObject() -> some CustomStringConvertible {
+    foo()
+}
+
+struct TypeWitness<R> {
+    init(witness _: R) { }
+
+    var type: R.Type { R.self }
+    func getType() -> R.Type { R.self }
+}
+
+let w = TypeWitness(witness: createSomeOpaqueObject())
+print(w.getType())