From: Zoltan Varga Date: Mon, 1 May 2023 15:42:23 +0000 (+0200) Subject: Revert "[mono][llvm] Enable the cold calling conv on osx/linux. (#83519)" (#85554) X-Git-Tag: accepted/tizen/unified/riscv/20231226.055536~2536 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3695b6ddd869e53eb663f7674e0f130eaf895b03;p=platform%2Fupstream%2Fdotnet%2Fruntime.git Revert "[mono][llvm] Enable the cold calling conv on osx/linux. (#83519)" (#85554) This reverts commit a2acc6c6529fc25ed350b239efe459b08b0310a6. Revert this as it causes an assert on osx. --- diff --git a/src/mono/mono/mini/mini-llvm.c b/src/mono/mono/mini/mini-llvm.c index c8d4af7..c1cd999 100644 --- a/src/mono/mono/mini/mini-llvm.c +++ b/src/mono/mono/mini/mini-llvm.c @@ -1220,12 +1220,6 @@ simd_op_to_llvm_type (int opcode) #endif } -#if defined(TARGET_OSX) || defined(TARGET_LINUX) -#define COLD_CCONV_SUPPORTED 1 -#elif !defined(TARGET_WATCHOS) && !defined(TARGET_ARM) && !defined(TARGET_ARM64) -#define COLD_CCONV_SUPPORTED 1 -#endif - static void set_cold_cconv (LLVMValueRef func) { @@ -1233,7 +1227,7 @@ set_cold_cconv (LLVMValueRef func) * xcode10 (watchOS) and ARM/ARM64 doesn't seem to support preserveall, it fails with: * fatal error: error in backend: Unsupported calling convention */ -#ifdef COLD_CCONV_SUPPORTED +#if !defined(TARGET_WATCHOS) && !defined(TARGET_ARM) && !defined(TARGET_ARM64) LLVMSetFunctionCallConv (func, LLVMColdCallConv); #endif } @@ -1241,7 +1235,7 @@ set_cold_cconv (LLVMValueRef func) static void set_call_cold_cconv (LLVMValueRef func) { -#ifdef COLD_CCONV_SUPPORTED +#if !defined(TARGET_WATCHOS) && !defined(TARGET_ARM) && !defined(TARGET_ARM64) LLVMSetInstructionCallConv (func, LLVMColdCallConv); #endif }