gnh1201/wasm-micro-runtime
1
0
Fork 0
mirror of https://github.com/bytecodealliance/wasm-micro-runtime.git synced 2025-05-08 20:56:13 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

aot: Fix LLVMSetTailCallKind check (#3099)

Browse Source
This commit is contained in:
YAMAMOTO Takashi 2024-01-30 21:50:33 +09:00 committed by GitHub
parent 170ae35131
commit 7e65f9a244
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/iwasm/compilation/aot_llvm.c
View File

@ -533,18 +533,12 @@ aot_add_precheck_function(AOTCompContext *comp_ctx, LLVMModuleRef module,
} }
wasm_runtime_free(params); wasm_runtime_free(params);
params = NULL; params = NULL;
#if LLVM_VERSION_MAJOR < 17
if (aot_target_precheck_can_use_musttail(comp_ctx)) { if (aot_target_precheck_can_use_musttail(comp_ctx)) {
LLVMSetTailCallKind(retval, LLVMTailCallKindMustTail); LLVMSetTailCallKind(retval, LLVMTailCallKindMustTail);
} }
else { else {
LLVMSetTailCallKind(retval, LLVMTailCallKindTail); LLVMSetTailCallKind(retval, LLVMTailCallKindTail);
} }
#else
LLVMSetTailCall(retval, true);
#endif
if (ret_type == VOID_TYPE) { if (ret_type == VOID_TYPE) {
if (!LLVMBuildRetVoid(b)) { if (!LLVMBuildRetVoid(b)) {
goto fail; goto fail;

2
core/iwasm/compilation/aot_llvm_extra2.cpp
View File

@ -163,7 +163,7 @@ LLVMCreateTargetMachineWithOpts(LLVMTargetRef ctarget, const char *triple,
} }
/* https://reviews.llvm.org/D153107 */ /* https://reviews.llvm.org/D153107 */
#if LLVM_VERSION_MAJOR < 17 #if LLVM_VERSION_MAJOR < 18
using namespace llvm; using namespace llvm;
LLVMTailCallKind LLVMTailCallKind

2
core/iwasm/compilation/aot_llvm_extra2.h
View File

@ -17,7 +17,7 @@ LLVMCreateTargetMachineWithOpts(LLVMTargetRef ctarget, const char *triple,
const char *StackUsageOutput); const char *StackUsageOutput);
/* https://reviews.llvm.org/D153107 */ /* https://reviews.llvm.org/D153107 */
#if LLVM_VERSION_MAJOR < 17 #if LLVM_VERSION_MAJOR < 18
typedef enum { typedef enum {
LLVMTailCallKindNone = 0, LLVMTailCallKindNone = 0,
LLVMTailCallKindTail = 1, LLVMTailCallKindTail = 1,