maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Do not write a comma when varargs is the only argument 

Fixes https://github.com/llvm/llvm-project/issues/56544

AsmWriter always writes ", ..." when a tail call has a varargs argument. This patch only writes the ", " when there is an argument before the varargs argument.

I did not write a dedicated test this for this change, but I modified an existing test that will test for a regression.

Reviewed By: avogelsgesang

Differential Revision: https://reviews.llvm.org/D137893

Signed-off-by: Adrian Vogelsgesang <avogelsgesang@salesforce.com>
This commit is contained in:
Joshua Cao 2022-11-13 22:24:15 -05:00 committed by Adrian Vogelsgesang
parent 3b29159da0
commit 8ad88f129c
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
llvm/lib/IR/AsmWriter.cpp
View File

@ -4140,7 +4140,6 @@ void AssemblyWriter::printInstruction(const Instruction &I) {
// If possible, print out the short form of the call instruction. We can
// only do this if the first argument is a pointer to a nonvararg function,
// and if the return type is not a pointer to a function.
//
Out << ' ';
TypePrinter.print(FTy->isVarArg() ? FTy : RetTy, Out);
Out << ' ';
@ -4156,8 +4155,11 @@ void AssemblyWriter::printInstruction(const Instruction &I) {
// is only to aid readability, musttail calls forward varargs by default.
if (CI->isMustTailCall() && CI->getParent() &&
CI->getParent()->getParent() &&
CI->getParent()->getParent()->isVarArg())
Out << ", ...";
CI->getParent()->getParent()->isVarArg()) {
if (CI->arg_size() > 0)
Out << ", ";
Out << "...";
}
Out << ')';
if (PAL.hasFnAttrs())

8
llvm/test/Transforms/Inline/inline-brunch-funnel.ll
View File

@ -9,27 +9,27 @@ declare void @llvm.icall.branch.funnel(...)
; CHECK-LABEL: define void @fn_musttail(
define void @fn_musttail() {
call void (...) @bf_musttail()
; CHECK: call void (...) @bf_musttail(
; CHECK: call void (...) @bf_musttail()
ret void
}
; CHECK-LABEL: define internal void @bf_musttail(
define internal void @bf_musttail(...) {
musttail call void (...) @llvm.icall.branch.funnel(...)
; CHECK: musttail call void (...) @llvm.icall.branch.funnel(
; CHECK: musttail call void (...) @llvm.icall.branch.funnel(...)
ret void
}
; CHECK-LABEL: define void @fn_musttail_always(
define void @fn_musttail_always() {
call void (...) @bf_musttail_always()
; CHECK: call void (...) @bf_musttail_always(
; CHECK: call void (...) @bf_musttail_always()
ret void
}
; CHECK-LABEL: define internal void @bf_musttail_always(
define internal void @bf_musttail_always(...) alwaysinline {
musttail call void (...) @llvm.icall.branch.funnel(...)
; CHECK: musttail call void (...) @llvm.icall.branch.funnel(
; CHECK: musttail call void (...) @llvm.icall.branch.funnel(...)
ret void
}