Skip to content

Fix ossa borrow completion #64975

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
Apr 6, 2023
Merged

Fix ossa borrow completion #64975

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
3 changes: 2 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 @@ -388,8 +388,9 @@ bool OwnershipUseVisitor<Impl>::visitGuaranteedUse(Operand *use) {
case OperandOwnership::ForwardingUnowned:
case OperandOwnership::UnownedInstantaneousUse:
case OperandOwnership::BitwiseEscape:
case OperandOwnership::EndBorrow:
return handleUsePoint(use, UseLifetimeConstraint::NonLifetimeEnding);
case OperandOwnership::EndBorrow:
return handleUsePoint(use, UseLifetimeConstraint::LifetimeEnding);

case OperandOwnership::Reborrow:
if (!asImpl().handleOuterReborrow(use))
Expand Down
57 changes: 57 additions & 0 deletions test/SILOptimizer/ossa_lifetime_completion.sil
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ import Builtin

class C {}

public enum FakeOptional<T> {
case none
case some(T)
}

// CHECK-LABEL: begin running test 1 of 1 on eagerConsumneOwnedArg: ossa-lifetime-completion with: @argument
// CHECK-LABEL: OSSA lifetime completion: %0 = argument of bb0 : $C
// CHECK: sil [ossa] @eagerConsumneOwnedArg : $@convention(thin) (@owned C) -> () {
Expand Down Expand Up @@ -45,3 +50,55 @@ bb3:
%r = tuple ()
return %r : $()
}

// CHECK-LABEL: sil [ossa] @borrowTest : $@convention(method) (@owned C) -> () {
// CHECK: bb1:
// CHECK-NEXT: end_borrow
// CHECK-NEXT: br bb3
// CHECK-LABEL: } // end sil function 'borrowTest'
sil [ossa] @borrowTest : $@convention(method) (@owned C) -> () {
bb0(%0 : @owned $C):
test_specification "ossa-lifetime-completion @instruction[0]"
%borrow = begin_borrow %0 : $C
cond_br undef, bb1, bb2

bb1:
end_borrow %borrow : $C
br bb3

bb2:
end_borrow %borrow : $C
br bb3

bb3:
destroy_value %0 : $C
%r = tuple ()
return %r : $()
}

// CHECK-LABEL: sil [ossa] @enumTest : $@convention(method) (@guaranteed FakeOptional<C>) -> () {
// CHECK: bb2
// CHECK: destroy_value
// CHECK: br bb3
// CHECK-LABEL: } // end sil function 'enumTest'
sil [ossa] @enumTest : $@convention(method) (@guaranteed FakeOptional<C>) -> () {
bb0(%0 : @guaranteed $FakeOptional<C>):
test_specification "ossa-lifetime-completion @instruction[0]"
%copy = copy_value %0 : $FakeOptional<C>
%borrow = begin_borrow %copy : $FakeOptional<C>
switch_enum %borrow : $FakeOptional<C>, case #FakeOptional.some!enumelt: bb1, case #FakeOptional.none!enumelt: bb2

bb1(%some : @guaranteed $C):
end_borrow %borrow : $FakeOptional<C>
destroy_value %copy : $FakeOptional<C>
br bb3

bb2:
end_borrow %borrow : $FakeOptional<C>
br bb3

bb3:
%r = tuple ()
return %r : $()
}