Fix the mono calling convention on arm64+linux.

vargaz · vargaz · commit 8415fd85ce15 · 2018-10-08T23:38:37.000+02:00
diff --git a/lib/Target/AArch64/AArch64CallingConvention.td b/lib/Target/AArch64/AArch64CallingConvention.td
@@ -357,3 +357,12 @@ def CC_AArch64_Mono_DarwinPCS : CallingConv<[
 
   CCDelegateTo<CC_AArch64_DarwinPCS>
 ]>;
+
+def CC_AArch64_Mono_AAPCS : CallingConv<[
+
+  // Mono marks the parameter it wants to pass in this non-abi register with
+  // the 'inreg' attribute.
+  CCIfInReg<CCAssignToReg<[X15]>>,
+
+  CCDelegateTo<CC_AArch64_AAPCS>
+]>;
diff --git a/lib/Target/AArch64/AArch64ISelLowering.cpp b/lib/Target/AArch64/AArch64ISelLowering.cpp
@@ -2717,7 +2717,12 @@ CCAssignFn *AArch64TargetLowering::CCAssignFnForCall(CallingConv::ID CC,
   case CallingConv::Win64:
     return IsVarArg ? CC_AArch64_Win64_VarArg : CC_AArch64_AAPCS;
   case CallingConv::Mono:
-    return CC_AArch64_Mono_DarwinPCS;
+      if (Subtarget->isTargetDarwin())
+          return CC_AArch64_Mono_DarwinPCS;
+      else if (Subtarget->isTargetWindows())
+          report_fatal_error("Unsupported calling convention.");
+      else
+          return CC_AArch64_Mono_AAPCS;
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -2717,7 +2717,12 @@ CCAssignFn *AArch64TargetLowering::CCAssignFnForCall(CallingConv::ID CC,`
`2717`	`2717`	`case CallingConv::Win64:`
`2718`	`2718`	`return IsVarArg ? CC_AArch64_Win64_VarArg : CC_AArch64_AAPCS;`
`2719`	`2719`	`case CallingConv::Mono:`
`2720`		`- return CC_AArch64_Mono_DarwinPCS;`
	`2720`	`+ if (Subtarget->isTargetDarwin())`
	`2721`	`+ return CC_AArch64_Mono_DarwinPCS;`
	`2722`	`+ else if (Subtarget->isTargetWindows())`
	`2723`	`+ report_fatal_error("Unsupported calling convention.");`
	`2724`	`+ else`
	`2725`	`+ return CC_AArch64_Mono_AAPCS;`
`2721`	`2726`	`}`
`2722`	`2727`	`}`
`2723`	`2728`