Skip to content

Commit ed9b354

Browse files
authored
Coroutines: Handle non-zero stack address space (#67092)
The stack might be in a different address space, in which case, bitcast does not work. We should use addrspacecast. As we do not support typed pointer anymore, so we do not need a bitcast here anymore.
1 parent 80e1732 commit ed9b354

File tree

2 files changed

+59
-2
lines changed

2 files changed

+59
-2
lines changed

llvm/lib/Transforms/Coroutines/CoroFrame.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1766,8 +1766,8 @@ static void insertSpills(const FrameDataInfo &FrameData, coro::Shape &Shape) {
17661766
// Note: If we change the strategy dealing with alignment, we need to refine
17671767
// this casting.
17681768
if (GEP->getType() != Orig->getType())
1769-
return Builder.CreateBitCast(GEP, Orig->getType(),
1770-
Orig->getName() + Twine(".cast"));
1769+
return Builder.CreateAddrSpaceCast(GEP, Orig->getType(),
1770+
Orig->getName() + Twine(".cast"));
17711771
}
17721772
return GEP;
17731773
};
Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
; RUN: opt < %s -passes='cgscc(coro-split)' -S | FileCheck %s
2+
3+
define ptr @f(i1 %n) presplitcoroutine {
4+
entry:
5+
%x = alloca i64, addrspace(5)
6+
%y = alloca i64, addrspace(5)
7+
%id = call token @llvm.coro.id(i32 0, ptr null, ptr null, ptr null)
8+
%size = call i32 @llvm.coro.size.i32()
9+
%alloc = call ptr @malloc(i32 %size)
10+
%hdl = call ptr @llvm.coro.begin(token %id, ptr %alloc)
11+
br i1 %n, label %flag_true, label %flag_false
12+
13+
flag_true:
14+
br label %merge
15+
16+
flag_false:
17+
br label %merge
18+
19+
merge:
20+
%alias_phi = phi ptr addrspace(5) [ %x, %flag_true ], [ %y, %flag_false ]
21+
%sp1 = call i8 @llvm.coro.suspend(token none, i1 false)
22+
switch i8 %sp1, label %suspend [i8 0, label %resume
23+
i8 1, label %cleanup]
24+
resume:
25+
call void @print(ptr addrspace(5) %alias_phi)
26+
br label %cleanup
27+
28+
cleanup:
29+
%mem = call ptr @llvm.coro.free(token %id, ptr %hdl)
30+
call void @free(ptr %mem)
31+
br label %suspend
32+
33+
suspend:
34+
call i1 @llvm.coro.end(ptr %hdl, i1 0)
35+
ret ptr %hdl
36+
}
37+
38+
; CHECK-LABEL: @f(
39+
; CHECK: [[X_ADDR:%[0-9]+]] = getelementptr inbounds %f.Frame, ptr %hdl, i32 0, i32 2
40+
; CHECK: %x.reload.addr = addrspacecast ptr [[X_ADDR]] to ptr addrspace(5)
41+
; CHECK: [[Y_ADDR:%[0-9]+]] = getelementptr inbounds %f.Frame, ptr %hdl, i32 0, i32 3
42+
; CHECK: %y.reload.addr = addrspacecast ptr [[Y_ADDR]] to ptr addrspace(5)
43+
44+
declare ptr @llvm.coro.free(token, ptr)
45+
declare i32 @llvm.coro.size.i32()
46+
declare i8 @llvm.coro.suspend(token, i1)
47+
declare void @llvm.coro.resume(ptr)
48+
declare void @llvm.coro.destroy(ptr)
49+
50+
declare token @llvm.coro.id(i32, ptr, ptr, ptr)
51+
declare i1 @llvm.coro.alloc(token)
52+
declare ptr @llvm.coro.begin(token, ptr)
53+
declare i1 @llvm.coro.end(ptr, i1)
54+
55+
declare void @print(ptr)
56+
declare noalias ptr @malloc(i32)
57+
declare void @free(ptr)

0 commit comments

Comments
 (0)