Skip to content

Coro: Remove coro_end and coro_suspend_retcon in private unprocessed functions #3544

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.

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
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 8 additions & 1 deletion llvm/lib/Transforms/Coroutines/CoroCleanup.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ static void lowerSubFn(IRBuilder<> &Builder, CoroSubFnInst *SubFn) {

bool Lowerer::lowerRemainingCoroIntrinsics(Function &F) {
bool Changed = false;

bool IsPrivateAndUnprocessed = F.hasFnAttribute(CORO_PRESPLIT_ATTR) &&
F.hasLocalLinkage();
for (auto IB = inst_begin(F), E = inst_end(F); IB != E;) {
Instruction &I = *IB++;
if (auto *II = dyn_cast<IntrinsicInst>(&I)) {
Expand Down Expand Up @@ -84,6 +85,12 @@ bool Lowerer::lowerRemainingCoroIntrinsics(Function &F) {
case Intrinsic::coro_subfn_addr:
lowerSubFn(Builder, cast<CoroSubFnInst>(II));
break;
case Intrinsic::coro_end:
case Intrinsic::coro_suspend_retcon:
if (IsPrivateAndUnprocessed) {
II->replaceAllUsesWith(UndefValue::get(II->getType()));
} else continue;
break;
case Intrinsic::coro_async_size_replace:
auto *Target = cast<ConstantStruct>(
cast<GlobalVariable>(II->getArgOperand(0)->stripPointerCasts())
Expand Down
55 changes: 55 additions & 0 deletions llvm/test/Transforms/Coroutines/coro-retcon-once-private.ll
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
; RUN: opt < %s -enable-coroutines -passes='default<O0>' -S | FileCheck %s

target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-apple-macosx10.12.0"

; CHECK: define internal { i8*, i32 } @f(i8* %buffer, i32* %array)
; CHECK-NEXT: entry:
; CHECK-NEXT: unreachable

define internal {i8*, i32} @f(i8* %buffer, i32* %array) {
entry:
%id = call token @llvm.coro.id.retcon.once(i32 8, i32 8, i8* %buffer, i8* bitcast (void (i8*, i1)* @prototype to i8*), i8* bitcast (i8* (i32)* @allocate to i8*), i8* bitcast (void (i8*)* @deallocate to i8*))
%hdl = call i8* @llvm.coro.begin(token %id, i8* null)
%load = load i32, i32* %array
%load.pos = icmp sgt i32 %load, 0
br i1 %load.pos, label %pos, label %neg

pos:
%unwind0 = call i1 (...) @llvm.coro.suspend.retcon.i1(i32 %load)
br i1 %unwind0, label %cleanup, label %pos.cont

pos.cont:
store i32 0, i32* %array, align 4
br label %cleanup

neg:
%unwind1 = call i1 (...) @llvm.coro.suspend.retcon.i1(i32 0)
br i1 %unwind1, label %cleanup, label %neg.cont

neg.cont:
store i32 10, i32* %array, align 4
br label %cleanup

cleanup:
call i1 @llvm.coro.end(i8* %hdl, i1 0)
unreachable
}

; Unfortunately, we don't seem to fully optimize this right now due
; to some sort of phase-ordering thing.

declare token @llvm.coro.id.retcon.once(i32, i32, i8*, i8*, i8*, i8*)
declare i8* @llvm.coro.begin(token, i8*)
declare i1 @llvm.coro.suspend.retcon.i1(...)
declare i1 @llvm.coro.end(i8*, i1)
declare i8* @llvm.coro.prepare.retcon(i8*)

declare void @prototype(i8*, i1 zeroext)

declare noalias i8* @allocate(i32 %size)
declare void @deallocate(i8* %ptr)

declare void @print(i32)