-
Notifications
You must be signed in to change notification settings - Fork 12.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Clang][LLVM][Coroutines] Prevent __coro_gro from outliving __promise (…
…#66706) When dealing with short-circuiting coroutines (e.g. expected), the deferred calls that resolve the get_return_object are currently being emitted after we delete the coroutine frame. This was caught by ASAN when using optimizations -O1 and above: optimizations after inlining would place the __coro_gro in the heap, and subsequent delete of the coroframe followed by the conversion -> BOOM. This patch forbids the GRO to be placed in the coroutine frame, by adding a new metadata node that can be attached to `alloca` instructions. Fix #49843
- Loading branch information
1 parent
c618e13
commit 34415fd
Showing
6 changed files
with
94 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
61 changes: 61 additions & 0 deletions
61
llvm/test/Transforms/Coroutines/coro-alloca-outside-frame.ll
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,61 @@ | ||
; Tests that CoroSplit can succesfully skip allocas that shall not live on the frame | ||
; RUN: opt < %s -passes='cgscc(coro-split),simplifycfg,early-cse' -S -o %t.ll | ||
; RUN: FileCheck --input-file=%t.ll %s | ||
|
||
define ptr @f(i1 %n) presplitcoroutine { | ||
entry: | ||
%x = alloca i64, !coro.outside.frame !{} | ||
%y = alloca i64 | ||
%id = call token @llvm.coro.id(i32 0, ptr null, ptr null, ptr null) | ||
%size = call i32 @llvm.coro.size.i32() | ||
%alloc = call ptr @malloc(i32 %size) | ||
%hdl = call ptr @llvm.coro.begin(token %id, ptr %alloc) | ||
br i1 %n, label %flag_true, label %flag_false | ||
|
||
flag_true: | ||
br label %merge | ||
|
||
flag_false: | ||
br label %merge | ||
|
||
merge: | ||
%alias_phi = phi ptr [ %x, %flag_true ], [ %y, %flag_false ] | ||
%sp1 = call i8 @llvm.coro.suspend(token none, i1 false) | ||
switch i8 %sp1, label %suspend [i8 0, label %resume | ||
i8 1, label %cleanup] | ||
resume: | ||
call void @print(ptr %alias_phi) | ||
br label %cleanup | ||
|
||
cleanup: | ||
%mem = call ptr @llvm.coro.free(token %id, ptr %hdl) | ||
call void @free(ptr %mem) | ||
br label %suspend | ||
|
||
suspend: | ||
call i1 @llvm.coro.end(ptr %hdl, i1 0, token none) | ||
ret ptr %hdl | ||
} | ||
|
||
; %y and %alias_phi would all go to the frame, but not %x | ||
; CHECK: %f.Frame = type { ptr, ptr, i64, ptr, i1 } | ||
; CHECK-LABEL: @f( | ||
; CHECK: %x = alloca i64, align 8, !coro.outside.frame !0 | ||
; CHECK-NOT: %x.reload.addr = getelementptr inbounds %f.Frame, ptr %hdl, i32 0, i32 2 | ||
; CHECK: %y.reload.addr = getelementptr inbounds %f.Frame, ptr %hdl, i32 0, i32 2 | ||
; CHECK: %alias_phi = phi ptr [ %y.reload.addr, %merge.from.flag_false ], [ %x, %entry ] | ||
|
||
declare ptr @llvm.coro.free(token, ptr) | ||
declare i32 @llvm.coro.size.i32() | ||
declare i8 @llvm.coro.suspend(token, i1) | ||
declare void @llvm.coro.resume(ptr) | ||
declare void @llvm.coro.destroy(ptr) | ||
|
||
declare token @llvm.coro.id(i32, ptr, ptr, ptr) | ||
declare i1 @llvm.coro.alloc(token) | ||
declare ptr @llvm.coro.begin(token, ptr) | ||
declare i1 @llvm.coro.end(ptr, i1, token) | ||
|
||
declare void @print(ptr) | ||
declare noalias ptr @malloc(i32) | ||
declare void @free(ptr) |