Merge pull request #62857 from nate-chandler/opaque-values/1/20230104

[OpaqueValues] Map-into-context back-deploy thunk results.

Author: nate-chandler

lib/SILGen/SILGenBackDeploy.cpp

@@ -133,14 +133,16 @@ static void emitBackDeployForwardApplyAndReturnOrThrow(
 
     // Emit error block.
     SGF.B.emitBlock(errorBB);
-    SILValue error = errorBB->createPhiArgument(fnConv.getSILErrorType(TEC),
-                                                OwnershipKind::Owned);
+    SILValue error = errorBB->createPhiArgument(
+        SGF.F.mapTypeIntoContext(fnConv.getSILErrorType(TEC)),
+        OwnershipKind::Owned);
     SGF.B.createBranch(loc, SGF.ThrowDest.getBlock(), {error});
 
     // Emit normal block.
     SGF.B.emitBlock(normalBB);
-    SILValue result = normalBB->createPhiArgument(fnConv.getSILResultType(TEC),
-                                                  OwnershipKind::Owned);
+    SILValue result = normalBB->createPhiArgument(
+        SGF.F.mapTypeIntoContext(fnConv.getSILResultType(TEC)),
+        OwnershipKind::Owned);
     SmallVector<SILValue, 4> directResults;
     extractAllElements(result, loc, SGF.B, directResults);
 

test/SILGen/opaque_values_silgen.swift

@@ -636,3 +636,12 @@ func takeKeyPathString<T>(_ kp: KeyPath<T, String>) {
 func giveKeyPathString() {
   takeKeyPathString(\StructWithAReadableStringProperty.s)
 }
+
+// CHECK-LABEL: sil {{.*}}@$s20opaque_values_silgen29backDeployingReturningGenericyxxKlFTwb : {{.*}} <T> {{.*}} {
+// Ensure that there aren't any "normal" (in the sense of try_apply) blocks that
+// take unbound generic parameters (τ_0_0).
+// CHECK-NOT: {{bb[0-9]+}}({{%[^,]+}} : @owned $τ_0_0):
+// CHECK-LABEL: } // end sil function '$s20opaque_values_silgen29backDeployingReturningGenericyxxKlFTwb'
+@available(SwiftStdlib 5.1, *)
+@_backDeploy(before: SwiftStdlib 5.8)
+public func backDeployingReturningGeneric<T>(_ t: T) throws -> T { t }