Merge pull request #69518 from slavapestov/fix-regression-typed-throws

SILGen: Fix crash when emitting throwing closure as opaque

Author: slavapestov

lib/SILGen/SILGenProlog.cpp

@@ -1768,14 +1768,15 @@ static void emitIndirectErrorParameter(SILGenFunction &SGF,
 
   // The calling convention always uses minimal resilience expansion.
   auto errorConvType = SGF.SGM.Types.getLoweredType(
-      errorTypeInContext, TypeExpansionContext::minimal());
+      origErrorType, errorTypeInContext, TypeExpansionContext::minimal());
 
   // And the abstraction pattern may force an indirect return even if the
   // concrete type wouldn't normally be returned indirectly.
   if (!SILModuleConventions::isThrownIndirectlyInSIL(errorConvType,
                                                      SGF.SGM.M)) {
     if (!SILModuleConventions(SGF.SGM.M).useLoweredAddresses()
-        || origErrorType.getErrorConvention(SGF.SGM.Types) != AbstractionPattern::Indirect)
+        || origErrorType.getErrorConvention(SGF.SGM.Types)
+            != AbstractionPattern::Indirect)
       return;
   }
 
@@ -1813,10 +1814,16 @@ uint16_t SILGenFunction::emitBasicProlog(
 
   llvm::Optional<AbstractionPattern> origErrorType;
   if (errorType) {
-    origErrorType = origClosureType
-      ? origClosureType->getFunctionThrownErrorType()
-      : AbstractionPattern(genericSig.getCanonicalSignature(),
-                           (*errorType)->getCanonicalType());
+    if (origClosureType &&
+        !origClosureType->isTypeParameterOrOpaqueArchetype()) {
+      origErrorType =
+          origClosureType->getFunctionThrownErrorType();
+    } else {
+      origErrorType =
+          AbstractionPattern(genericSig.getCanonicalSignature(),
+                             (*errorType)->getCanonicalType());
+    }
+
     emitIndirectErrorParameter(*this, *errorType, *origErrorType, DC);
   }
 

test/SILGen/literal_closure_reabstraction_throws.swift

@@ -0,0 +1,13 @@
+// RUN: %target-swift-emit-silgen -verify %s | %FileCheck %s
+
+func callee<T>(_: T) {}
+
+func g() throws {}
+
+func caller() {
+  callee { try g() }
+}
+
+// CHECK-LABEL: sil private [ossa] @$s36literal_closure_reabstraction_throws6calleryyFyyKcfU_ : $@convention(thin) @substituted <τ_0_0> () -> (@out τ_0_0, @error any Error) for <()> {
+// CHECK: bb0(%0 : $*()):
+// CHECK:  debug_value undef : $any Error, var, name "$error", argno 1