RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-01-20 18:56:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Coroutines] Fix PR45130

Browse Source 
For now, when final suspend can be simplified by simplifySuspendPoint,
handleFinalSuspend is executed as well to remove last case in switch
instruction. This patch fixes it.

Differential Revision: https://reviews.llvm.org/D76345
This commit is contained in:
Jun Ma 2020-03-18 11:42:16 +08:00
parent dda08b0f66
commit 030942f981
2 changed files with 56 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Transforms/Coroutines/CoroSplit.cpp
View File

@ -1157,7 +1157,10 @@ static void simplifySuspendPoints(coro::Shape &Shape) {
if (N == 0)
return;
while (true) {
if (simplifySuspendPoint(cast<CoroSuspendInst>(S[I]), Shape.CoroBegin)) {
auto SI = cast<CoroSuspendInst>(S[I]);
// Leave final.suspend to handleFinalSuspend since it is undefined behavior
// to resume a coroutine suspended at the final suspend point.
if (!SI->isFinal() && simplifySuspendPoint(SI, Shape.CoroBegin)) {
if (--N == I)
break;
std::swap(S[I], S[N]);

52
test/Transforms/Coroutines/no-suspend.ll
View File

@ -362,6 +362,58 @@ suspend:
ret void
}
; SimplifySuspendPoint should not simplify final suspend point
;
; CHECK-LABEL: define void @cannot_simplify_final_suspend(
; CHECK-NEXT: entry:
; CHECK-NEXT: llvm.coro.id
;
define void @cannot_simplify_final_suspend() "coroutine.presplit"="1" personality i32 0 {
entry:
%id = call token @llvm.coro.id(i32 0, i8* null, i8* null, i8* null)
%need.dyn.alloc = call i1 @llvm.coro.alloc(token %id)
br i1 %need.dyn.alloc, label %dyn.alloc, label %coro.begin
dyn.alloc:
%size = call i32 @llvm.coro.size.i32()
%alloc = call i8* @malloc(i32 %size)
br label %coro.begin
coro.begin:
%phi = phi i8* [ null, %entry ], [ %alloc, %dyn.alloc ]
%hdl = call noalias i8* @llvm.coro.begin(token %id, i8* %phi)
br label %body
body:
%save = call token @llvm.coro.save(i8* %hdl)
%subfn = call i8* @llvm.coro.subfn.addr(i8* %hdl, i8 1)
%bcast = bitcast i8* %subfn to void (i8*)*
invoke fastcc void %bcast(i8* %hdl) to label %real_susp unwind label %lpad
real_susp:
%0 = call i8 @llvm.coro.suspend(token %save, i1 1)
switch i8 %0, label %suspend [i8 0, label %resume
i8 1, label %pre.cleanup]
resume:
call void @print(i32 0)
br label %cleanup
pre.cleanup:
call void @print(i32 1)
br label %cleanup
cleanup:
%mem = call i8* @llvm.coro.free(token %id, i8* %hdl)
call void @free(i8* %mem)
br label %suspend
suspend:
call i1 @llvm.coro.end(i8* %hdl, i1 false)
ret void
lpad:
%lpval = landingpad { i8*, i32 }
cleanup
call void @print(i32 2)
resume { i8*, i32 } %lpval
}
declare i8* @malloc(i32)
declare void @free(i8*)
declare void @print(i32)