[PATCH] D137893: [AsmWriter] Do not write a comma when varargs is the only argument

[Joshua Cao via Phabricator via llvm-commits]

caojoshua created this revision.
Herald added a subscriber: hiraditya.
Herald added a project: All.
caojoshua added a reviewer: chandlerc.
caojoshua edited the summary of this revision.
caojoshua published this revision for review.
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.

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 this for this change, but I modified an existing test that will test for a regression.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D137893

Files:
  llvm/lib/IR/AsmWriter.cpp
  llvm/test/Transforms/Inline/inline-brunch-funnel.ll


Index: llvm/test/Transforms/Inline/inline-brunch-funnel.ll
===================================================================
--- llvm/test/Transforms/Inline/inline-brunch-funnel.ll
+++ llvm/test/Transforms/Inline/inline-brunch-funnel.ll
@@ -9,27 +9,27 @@
 ; 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
 }
Index: llvm/lib/IR/AsmWriter.cpp
===================================================================
--- llvm/lib/IR/AsmWriter.cpp
+++ llvm/lib/IR/AsmWriter.cpp
@@ -4140,7 +4140,6 @@
     // 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 @@
     // 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())


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D137893.474944.patch
Type: text/x-patch
Size: 2292 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20221112/9cfd6eef/attachment.bin>