Skip to content

[LifetimeCompletion] Handle project_box. #72556

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 2 commits into from
Mar 26, 2024
Merged

[LifetimeCompletion] Handle project_box. #72556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e23b7f
[Gardening] Test: Improve match name.
nate-chandler Mar 25, 2024
57eb1db
[LifetimeCompletion] Handle project_box.
nate-chandler Mar 25, 2024
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
8 changes: 7 additions & 1 deletion include/swift/SIL/OwnershipUseVisitor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,6 +391,11 @@ bool OwnershipUseVisitor<Impl>::visitGuaranteedUse(Operand *use) {
return true;

case OperandOwnership::PointerEscape:
// TODO: Change ProjectBox ownership to InteriorPointer and allow them to
// take owned values.
if (isa<ProjectBoxInst>(use->getUser())) {
return visitInteriorPointerUses(use);
}
if (!asImpl().handlePointerEscape(use))
return false;

Expand Down Expand Up @@ -443,7 +448,8 @@ bool OwnershipUseVisitor<Impl>::visitGuaranteedUse(Operand *use) {

template <typename Impl>
bool OwnershipUseVisitor<Impl>::visitInteriorPointerUses(Operand *use) {
assert(use->getOperandOwnership() == OperandOwnership::InteriorPointer);
assert(use->getOperandOwnership() == OperandOwnership::InteriorPointer ||
isa<ProjectBoxInst>(use->getUser()));

if (auto scopedAddress = ScopedAddressValue::forUse(use)) {
// e.g. client may need to insert end_borrow if scopedAddress is a store_borrow.
Expand Down
25 changes: 22 additions & 3 deletions test/SILOptimizer/ossa_lifetime_completion.sil
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,12 +266,12 @@ exit:
}

// CHECK-LABEL: sil [ossa] @availability_boundary_2_after_loop : {{.*}} {
// CHECK: [[REGISTER_1:%[^,]+]] = move_value [lexical]
// CHECK: [[LEXICAL:%[^,]+]] = move_value [lexical]
// CHECK: br [[CONDITION_1:bb[0-9]+]]
// CHECK: [[CONDITION_1]]:
// CHECK: cond_br undef, [[CONDITION_2:bb[0-9]+]], [[PREHEADER:bb[0-9]+]]
// CHECK: [[CONDITION_2]]:
// CHECK: destroy_value [[REGISTER_1]]
// CHECK: destroy_value [[LEXICAL]]
// CHECK: cond_br undef, [[EXIT:bb[0-9]+]], [[TO_DIE_2:bb[0-9]+]]
// CHECK: [[PREHEADER]]:
// CHECK: br [[HEADER:bb[0-9]+]]
Expand All @@ -282,7 +282,7 @@ exit:
// CHECK: [[BACKEDGE]]:
// CHECK: br [[HEADER]]
// CHECK: [[TO_DIE_1]]:
// CHECK: destroy_value [[REGISTER_1]]
// CHECK: destroy_value [[LEXICAL]]
// CHECK: br [[DIE:bb[0-9]+]]
// CHECK: [[TO_DIE_2]]:
// CHECK: br [[DIE]]
Expand Down Expand Up @@ -395,3 +395,22 @@ exit:
%retval = tuple ()
return %retval : $()
}

// CHECK-LABEL: sil [ossa] @project_box_deadend : {{.*}} {
// CHECK: bb0([[C:%[^,]+]] :
// CHECK: [[BOX:%[^,]+]] = alloc_box
// CHECK: [[BOX_BORROW:%[^,]+]] = begin_borrow [[BOX]]
// CHECK: [[ADDR:%[^,]+]] = project_box [[BOX_BORROW]]
// CHECK: store [[C]] to [init] [[ADDR]]
// CHECK: end_borrow [[BOX_BORROW]]
// CHECK: unreachable
// CHECK-LABEL: } // end sil function 'project_box_deadend'
sil [ossa] @project_box_deadend : $@convention(thin) (@owned C) -> () {
bb0(%0 : @owned $C):
%2 = alloc_box ${ var C }
%3 = begin_borrow %2 : ${ var C }
specify_test "ossa-lifetime-completion %3"
%4 = project_box %3 : ${ var C }, 0
store %0 to [init] %4 : $*C
unreachable
}