replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Treat inlining a notail call as a regular, non-tail call 

Otherwise, we end up inlining a musttail call into a non-tail position,
which breaks verifier invariants.

Fixes PR31014

llvm-svn: 329015
This commit is contained in:
Reid Kleckner 2018-04-02 21:23:16 +00:00
parent 3e7d6fc2c6
commit a9e9918ee4
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
llvm/lib/Transforms/Utils/InlineFunction.cpp
View File

@ -1826,6 +1826,10 @@ bool llvm::InlineFunction(CallSite CS, InlineFunctionInfo &IFI,
if (CallInst *CI = dyn_cast<CallInst>(TheCall))
CallSiteTailKind = CI->getTailCallKind();
// For inlining purposes, the "notail" marker is the same as no marker.
if (CallSiteTailKind == CallInst::TCK_NoTail)
CallSiteTailKind = CallInst::TCK_None;
for (Function::iterator BB = FirstNewBlock, E = Caller->end(); BB != E;
++BB) {
for (auto II = BB->begin(); II != BB->end();) {
@ -1885,6 +1889,8 @@ bool llvm::InlineFunction(CallSite CS, InlineFunctionInfo &IFI,
// f -> musttail g -> tail f ==> f -> tail f
// f -> g -> musttail f ==> f -> f
// f -> g -> tail f ==> f -> f
//
// Inlined notail calls should remain notail calls.
CallInst::TailCallKind ChildTCK = CI->getTailCallKind();
if (ChildTCK != CallInst::TCK_NoTail)
ChildTCK = std::min(CallSiteTailKind, ChildTCK);

21
llvm/test/Transforms/Inline/inline-tail.ll
View File

@ -196,3 +196,24 @@ define i32 @test_notail() {
%rv = tail call i32 @notail()
ret i32 %rv
}
; PR31014: Inlining a musttail call through a notail call site should remove
; any tail marking, otherwise we break verifier invariants.
declare void @do_ret(i32)
define void @test_notail_inline_musttail(i32 %a) {
notail call void @inline_musttail(i32 %a)
musttail call void @do_ret(i32 %a)
ret void
}
define internal void @inline_musttail(i32 %a) {
musttail call void @do_ret(i32 %a)
ret void
}
; CHECK-LABEL: define void @test_notail_inline_musttail(i32 %a)
; CHECK: {{^ *}}call void @do_ret(i32 %a)
; CHECK: musttail call void @do_ret(i32 %a)
; CHECK: ret void