[SILGen] Ensure that we have a scope for error conversions in reabstraction thunks

DougGregor · DougGregor · commit 4f773c225001 · 2023-11-09T11:13:38.000-08:00
diff --git a/lib/SILGen/SILGenApply.cpp b/lib/SILGen/SILGenApply.cpp
@@ -5727,6 +5727,8 @@ SILValue SILGenFunction::emitApplyWithRethrow(SILLocation loc, SILValue fn,
   {
     B.emitBlock(errorBB);
 
+    Scope scope(Cleanups, CleanupLocation(loc));
+
     // Grab the inner error.
     SILValue innerError;
     bool hasInnerIndirectError = fnConv.hasIndirectSILErrorResults();
diff --git a/test/Profiler/coverage_closure_returns_never.swift b/test/Profiler/coverage_closure_returns_never.swift
@@ -6,7 +6,6 @@
 // CHECK-NOT:  increment_profiler_counter
 // CHECK:      [[LOAD:%.*]] = load {{.*}} : $*Never
 // CHECK-NEXT: debug_value [[LOAD]] : $Never
-// CHECK-NEXT: debug_value undef : $any Error, var, name "$error", argno
 // CHECK-NEXT: unreachable
 
 func closure_with_fatal_error(_ arr: [Never]) {

Original file line number	Diff line number	Diff line change
`@@ -5727,6 +5727,8 @@ SILValue SILGenFunction::emitApplyWithRethrow(SILLocation loc, SILValue fn,`
`5727`	`5727`	`{`
`5728`	`5728`	`B.emitBlock(errorBB);`
`5729`	`5729`
	`5730`	`+ Scope scope(Cleanups, CleanupLocation(loc));`
	`5731`	`+`
`5730`	`5732`	`// Grab the inner error.`
`5731`	`5733`	`SILValue innerError;`
`5732`	`5734`	`bool hasInnerIndirectError = fnConv.hasIndirectSILErrorResults();`