Skip to content

StackPromotion: fix a crash due to a problem in liferange evaluation #67331

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 18, 2023
Merged

StackPromotion: fix a crash due to a problem in liferange evaluation #67331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions SwiftCompilerSources/Sources/Optimizer/FunctionPasses/StackPromotion.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,14 +289,13 @@ private extension BasicBlockRange {
/// Returns true if there is a direct edge connecting this range with the `otherRange`.
func hasControlFlowEdge(to otherRange: BasicBlockRange) -> Bool {
func isOnlyInOtherRange(_ block: BasicBlock) -> Bool {
return !inclusiveRangeContains(block) &&
otherRange.inclusiveRangeContains(block) && block != otherRange.begin
return !inclusiveRangeContains(block) && otherRange.inclusiveRangeContains(block)
}

for lifeBlock in inclusiveRange {
assert(otherRange.inclusiveRangeContains(lifeBlock), "range must be a subset of other range")
for succ in lifeBlock.successors {
if isOnlyInOtherRange(succ) {
if isOnlyInOtherRange(succ) && succ != otherRange.begin {
return true
}
// The entry of the begin-block is conceptually not part of the range. We can check if
Expand Down
24 changes: 24 additions & 0 deletions test/SILOptimizer/stack_promotion.sil
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1209,3 +1209,27 @@ bb3:
br bb3
}

// CHECK-LABEL: sil @inner_liferange_jumps_to_outer_in_header_block
// CHECK: alloc_ref $XX
// CHECK-LABEL: } // end sil function 'inner_liferange_jumps_to_outer_in_header_block'
sil @inner_liferange_jumps_to_outer_in_header_block : $@convention(thin) (@owned XX) -> () {
bb0(%0 : $XX):
%1 = alloc_stack $XX
br bb1(%0 : $XX)

bb1(%2 : $XX):
strong_release %2 : $XX
%4 = alloc_ref $XX
store %4 to %1 : $*XX
cond_br undef, bb2, bb3

bb2:
br bb1(%4 : $XX)

bb3:
strong_release %4 : $XX
dealloc_stack %1 : $*XX
%r = tuple ()
return %r : $()
}