[llvm] b4bfe29 - AArch64/GlobalISel: Fix using wrong calling convention for calls

[Matt Arsenault via llvm-commits]

Author: Matt Arsenault
Date: 2021-03-01T08:46:33-05:00
New Revision: b4bfe29415ba9524f56d4ea57eb3adbdb4a82fc9

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

LOG: AArch64/GlobalISel: Fix using wrong calling convention for calls

This was reusing the parent function calling convention instead of the
callee. I'm not sure if there's a case where there's an observable
difference.

I previously missed this in b72a23650f573299aec30846fb844c3558921fb8

Added: 
    

Modified: 
    llvm/lib/Target/AArch64/GISel/AArch64CallLowering.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/lib/Target/AArch64/GISel/AArch64CallLowering.cpp b/llvm/lib/Target/AArch64/GISel/AArch64CallLowering.cpp
index c5b8e221b071..ed6b231e5add 100644
--- a/llvm/lib/Target/AArch64/GISel/AArch64CallLowering.cpp
+++ b/llvm/lib/Target/AArch64/GISel/AArch64CallLowering.cpp
@@ -994,7 +994,7 @@ bool AArch64CallLowering::lowerCall(MachineIRBuilder &MIRBuilder,
 
   SmallVector<ArgInfo, 8> InArgs;
   if (!Info.OrigRet.Ty->isVoidTy())
-    splitToValueTypes(Info.OrigRet, InArgs, DL, MRI, F.getCallingConv());
+    splitToValueTypes(Info.OrigRet, InArgs, DL, MRI, Info.CallConv);
 
   // If we can lower as a tail call, do that instead.
   bool CanTailCallOpt =