averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #85987 from meg-gupta/undefcapture

Browse Source 
Tolerate undef closure captures in ClosureLifetimeFixup
This commit is contained in:
Meghana Gupta
2025-12-12 16:31:09 -08:00
committed by GitHub
parent 74c8fcfc66 f30b5841c4
commit 96cd2e1e10
2 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/SILOptimizer/Utils/InstOptUtils.cpp
View File

@@ -1553,6 +1553,9 @@ void swift::insertDeallocOfCapturedArguments(
if (!argValue) {
continue;
}
if (isa<SILUndef>(argValue)) {
continue;
}
SmallVector<SILBasicBlock *, 4> boundary;
auto *asi = cast<AllocStackInst>(argValue);

26
test/SILOptimizer/closure-lifetime-fixup.sil
View File

@@ -164,17 +164,18 @@ bb1:
return %86 : $()
}
sil [ossa] @closureImpl : $@convention(thin) (@guaranteed Klass, @guaranteed Klass) -> Bool
sil [ossa] @closureImpl1 : $@convention(thin) (@guaranteed Klass, @guaranteed Klass) -> Bool
sil [ossa] @closureImpl2 : $@convention(thin) (@guaranteed Klass, @in_guaranteed Klass) -> Bool
sil [ossa] @useClosure : $@convention(thin) (@noescape @callee_guaranteed () -> Bool) -> ()
// Don't crash.
// CHECK-LABEL: sil hidden [ossa] @testUndefined
// CHECK-LABEL: sil hidden [ossa] @testUndefined1
// CHECK: [[PA:%.*]] = partial_apply [callee_guaranteed] [on_stack]
// CHECK: destroy_value [[PA]] : $@noescape @callee_guaranteed () -> Bool
// CHECK: destroy_value
sil hidden [ossa] @testUndefined : $@convention(method) (@guaranteed Klass, @guaranteed Klass) -> () {
sil hidden [ossa] @testUndefined1 : $@convention(method) (@guaranteed Klass, @guaranteed Klass) -> () {
bb0(%0 : @guaranteed $Klass, %1 : @guaranteed $Klass):
%4 = function_ref @closureImpl : $@convention(thin) (@guaranteed Klass, @guaranteed Klass) -> Bool
%4 = function_ref @closureImpl1 : $@convention(thin) (@guaranteed Klass, @guaranteed Klass) -> Bool
%5 = copy_value %1 : $Klass
%6 = partial_apply [callee_guaranteed] %4(%5, undef) : $@convention(thin) (@guaranteed Klass, @guaranteed Klass) -> Bool
%7 = convert_escape_to_noescape [not_guaranteed] %6 : $@callee_guaranteed () -> Bool to $@noescape @callee_guaranteed () -> Bool
@@ -186,6 +187,23 @@ bb0(%0 : @guaranteed $Klass, %1 : @guaranteed $Klass):
return %42 : $()
}
// Don't crash on undef in insertDeallocOfCapturedArguments
// CHECK-LABEL: sil hidden [ossa] @testUndefined2 :
// CHECK: [[PA:%.*]] = partial_apply [callee_guaranteed] [on_stack]
sil hidden [ossa] @testUndefined2 : $@convention(method) (@guaranteed Klass, @in_guaranteed Klass) -> () {
bb0(%0 : @guaranteed $Klass, %1 : $*Klass):
%4 = function_ref @closureImpl2 : $@convention(thin) (@guaranteed Klass, @in_guaranteed Klass) -> Bool
%5 = copy_value %0 : $Klass
%6 = partial_apply [callee_guaranteed] %4(%5, undef) : $@convention(thin) (@guaranteed Klass, @in_guaranteed Klass) -> Bool
%7 = convert_escape_to_noescape [not_guaranteed] %6 : $@callee_guaranteed () -> Bool to $@noescape @callee_guaranteed () -> Bool
%21 = function_ref @useClosure : $@convention(thin) (@noescape @callee_guaranteed () -> Bool) -> ()
%22 = apply %21(%7) : $@convention(thin) (@noescape @callee_guaranteed () -> Bool) -> ()
destroy_value %7 : $@noescape @callee_guaranteed () -> Bool
destroy_value %6 : $@callee_guaranteed () -> Bool
%42 = tuple ()
return %42 : $()
}
sil @simpleClosure : $@convention(thin) () -> ()
// Don't crash.