[llvm] 44e3735 - llvm-reduce: Preserve original callsite calling conv when removing arguments (#133411)

[via llvm-commits]

Author: Matt Arsenault
Date: 2025-03-28T23:51:09+07:00
New Revision: 44e3735ac18407f23a4e1fea29192449dbe3d4de

URL: https://github.com/llvm/llvm-project/commit/44e3735ac18407f23a4e1fea29192449dbe3d4de
DIFF: https://github.com/llvm/llvm-project/commit/44e3735ac18407f23a4e1fea29192449dbe3d4de.diff

LOG: llvm-reduce: Preserve original callsite calling conv when removing arguments (#133411)

In undefined mismatch cases, this was fixing the callsite to use the calling
convention of the new function. Preserve the original wrong callsite's calling
convention.

Added: 
    llvm/test/tools/llvm-reduce/remove-arguments-preserve-wrong-cc.ll

Modified: 
    llvm/tools/llvm-reduce/deltas/ReduceArguments.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/test/tools/llvm-reduce/remove-arguments-preserve-wrong-cc.ll b/llvm/test/tools/llvm-reduce/remove-arguments-preserve-wrong-cc.ll
new file mode 100644
index 0000000000000..463b06c5d248a
--- /dev/null
+++ b/llvm/test/tools/llvm-reduce/remove-arguments-preserve-wrong-cc.ll
@@ -0,0 +1,27 @@
+; Check that when removing arguments, incorrect callsite calling conventions are preserved
+
+; RUN: llvm-reduce --abort-on-invalid-reduction --delta-passes=arguments --test FileCheck --test-arg --check-prefixes=INTERESTING --test-arg %s --test-arg --input-file %s -o %t
+; RUN: FileCheck --check-prefixes=RESULT %s < %t
+
+; INTERESTING-LABEL: @fastcc_callee(
+define fastcc i32 @fastcc_callee(i32 %a, i32 %b) {
+  ret i32 %a
+}
+
+; INTERESTING-LABEL: @fastcc_callee_decl(
+declare fastcc i32 @fastcc_callee_decl(i32 %a, i32 %b)
+
+; INTERESTING-LABEL: @caller_wrong_callsites(
+; INTERESTING: call
+; INTERESTING: call
+
+; RESULT-LABEL: define i32 @caller_wrong_callsites()
+; RESULT: %call0 = call coldcc i32 @fastcc_callee()
+; RESULT: %call1 = call i32 @fastcc_callee_decl()
+define i32 @caller_wrong_callsites(i32 %x) {
+  %call0 = call coldcc i32 @fastcc_callee(i32 %x, i32 2)
+  %call1 = call ccc i32 @fastcc_callee_decl(i32 %x, i32 2)
+  %result = add i32 %call0, %call1
+  ret i32 %result
+}
+

diff  --git a/llvm/tools/llvm-reduce/deltas/ReduceArguments.cpp b/llvm/tools/llvm-reduce/deltas/ReduceArguments.cpp
index a7689688fdc2b..f1b72a75564de 100644
--- a/llvm/tools/llvm-reduce/deltas/ReduceArguments.cpp
+++ b/llvm/tools/llvm-reduce/deltas/ReduceArguments.cpp
@@ -65,7 +65,7 @@ static void replaceFunctionCalls(Function &OldF, Function &NewF,
       CI->getOperandBundlesAsDefs(OpBundles);
 
       CallInst *NewCI = CallInst::Create(&NewF, Args, OpBundles);
-      NewCI->setCallingConv(NewF.getCallingConv());
+      NewCI->setCallingConv(CI->getCallingConv());
 
       AttrBuilder CallSiteAttrs(Ctx, CI->getAttributes().getFnAttrs());
       NewCI->setAttributes(