Merge pull request #33949 from jckarter/serialized-capture-opaque-type-subst-assert-5.3

[5.3] SILGen: Relax assertion that incorrectly tripped on lowered opaque capture types.

Author: jckarter

lib/SILGen/SILGenThunk.cpp

@@ -144,8 +144,14 @@ SILGenFunction::emitGlobalFunctionRef(SILLocation loc, SILDeclRef constant,
   }
 
   auto f = SGM.getFunction(constant, NotForDefinition);
-  assert(f->getLoweredFunctionTypeInContext(B.getTypeExpansionContext()) ==
-         constantInfo.SILFnType);
+#ifndef NDEBUG
+  auto constantFnTypeInContext =
+    SGM.Types.getLoweredType(constantInfo.SILFnType,
+                             B.getTypeExpansionContext())
+             .castTo<SILFunctionType>();
+  assert(f->getLoweredFunctionTypeInContext(B.getTypeExpansionContext())
+          == constantFnTypeInContext);
+#endif
   if (callPreviousDynamicReplaceableImpl)
     return B.createPreviousDynamicFunctionRef(loc, f);
   else

test/SILGen/serialized-capture-opaque-type-subst.swift

@@ -0,0 +1,12 @@
+// RUN: %target-swift-frontend -disable-availability-checking -emit-silgen -verify %s
+
+public func foo() -> some Any { return 1 }
+
+public struct XY<X, Y> { public init(x: X, y: Y) { fatalError() } }
+
+@inlinable
+public func bar() -> () -> Any {
+    let xy = XY(x: 1, y: foo())
+
+    return { xy }
+}