Merge pull request #81080 from slavapestov/fix-rdar149353285-6.2

[6.2] SIL: Use SubstitutionMap::mapIntoTypeExpansionContext() in SILTypeSubstituter

Author: slavapestov

lib/SIL/IR/SILTypeSubstitution.cpp

@@ -68,20 +68,7 @@ class SILTypeSubstituter :
     if (!typeExpansionContext.shouldLookThroughOpaqueTypeArchetypes())
       return subs;
 
-    return subs.subst([&](SubstitutableType *s) -> Type {
-        return substOpaqueTypesWithUnderlyingTypes(s->getCanonicalType(),
-                                                   typeExpansionContext);
-      }, [&](CanType dependentType,
-             Type conformingReplacementType,
-             ProtocolDecl *conformedProtocol) -> ProtocolConformanceRef {
-        return substOpaqueTypesWithUnderlyingTypes(
-               ProtocolConformanceRef::forAbstract(conformingReplacementType,
-                                                   conformedProtocol),
-               conformingReplacementType->getCanonicalType(),
-               typeExpansionContext);
-      },
-      SubstFlags::SubstituteOpaqueArchetypes |
-      SubstFlags::PreservePackExpansionLevel);
+    return subs.mapIntoTypeExpansionContext(typeExpansionContext);
   }
 
   // Substitute a function type.

test/SILGen/subst_function_type_opaque.swift

@@ -0,0 +1,23 @@
+// RUN: %target-swift-emit-silgen %s
+
+public protocol P {}
+
+extension P {
+}
+
+public struct S: P {
+  public func callAsFunction<V>(_: () -> V) { }
+}
+
+public func f() -> some P {
+  S()
+}
+
+public struct G<T: P>: P {
+  public init(_: () -> T) {}
+}
+
+S() {
+  return G { return f() }
+}
+