Skip to content

DestroyHoisting: support of abort_apply instruction. #27956

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
Oct 31, 2019
Merged

DestroyHoisting: support of abort_apply instruction. #27956

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
22 changes: 16 additions & 6 deletions lib/SILOptimizer/Transforms/DestroyHoisting.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,8 @@ class DestroyHoisting {

void getUsedLocationsOfAddr(Bits &bits, SILValue addr);

void getUsedLocationsOfOperands(Bits &bits, SILInstruction *I);

void getUsedLocationsOfInst(Bits &bits, SILInstruction *Inst);

void moveDestroys(MemoryDataflow &dataFlow);
Expand Down Expand Up @@ -308,6 +310,12 @@ void DestroyHoisting::getUsedLocationsOfAddr(Bits &bits, SILValue addr) {
}
}

void DestroyHoisting::getUsedLocationsOfOperands(Bits &bits, SILInstruction *I) {
for (Operand &op : I->getAllOperands()) {
getUsedLocationsOfAddr(bits, op.get());
}
}

// Set all bits of locations which instruction \p I is using. It's including
// parent and sub-locations (see comment in getUsedLocationsOfAddr).
void DestroyHoisting::getUsedLocationsOfInst(Bits &bits, SILInstruction *I) {
Expand All @@ -319,18 +327,20 @@ void DestroyHoisting::getUsedLocationsOfInst(Bits &bits, SILInstruction *I) {
}
break;
case SILInstructionKind::EndApplyInst:
// Operands passed to begin_apply are alive throughout the end_apply.
I = cast<EndApplyInst>(I)->getBeginApply();
LLVM_FALLTHROUGH;
// Operands passed to begin_apply are alive throughout an end_apply ...
getUsedLocationsOfOperands(bits, cast<EndApplyInst>(I)->getBeginApply());
break;
case SILInstructionKind::AbortApplyInst:
// ... or abort_apply.
getUsedLocationsOfOperands(bits, cast<AbortApplyInst>(I)->getBeginApply());
break;
case SILInstructionKind::LoadInst:
case SILInstructionKind::StoreInst:
case SILInstructionKind::CopyAddrInst:
case SILInstructionKind::ApplyInst:
case SILInstructionKind::TryApplyInst:
case SILInstructionKind::YieldInst:
for (Operand &op : I->getAllOperands()) {
getUsedLocationsOfAddr(bits, op.get());
}
getUsedLocationsOfOperands(bits, I);
break;
case SILInstructionKind::DebugValueAddrInst:
case SILInstructionKind::DestroyAddrInst:
Expand Down
18 changes: 18 additions & 0 deletions test/SILOptimizer/destroy_hoisting.sil
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,3 +230,21 @@ bb1:
%r = tuple ()
return %r : $()
}

// CHECK-LABEL: sil [ossa] @test_abort_apply
// CHECK: abort_apply
// CHECK-NEXT: destroy_addr %0
// CHECK-NEXT: br bb1
// CHECK: bb1:
// CHECK: return
sil [ossa] @test_abort_apply : $@convention(thin) (@in S, Int) -> () {
bb0(%0 : $*S, %1 : $Int):
%f = function_ref @coro : $@yield_once @convention(thin) (@in S) -> @yields @inout Int
(%i, %t) = begin_apply %f(%0) : $@yield_once @convention(thin) (@in S) -> @yields @inout Int
abort_apply %t
br bb1
bb1:
destroy_addr %0 : $*S
%r = tuple ()
return %r : $()
}