Skip to content

Commit 216b2cb

Browse files
authored
Fix a typo in workflow (#1760)
1 parent f870156 commit 216b2cb

2 files changed

Lines changed: 10 additions & 15 deletions

File tree

.github/workflows/compilation_on_android_ubuntu.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ concurrency:
4747

4848
env:
4949
# For BUILD
50-
AOT_BUILD_OPTIONS: " -DWAMR_BUILD_AOT=1 -DWAMR_BUILD_FAST_INTERP=0 -DWAMR_BUILD_INTERP=0 _DWAMR_BUILD_FAST_JIT=0 -DWAMR_BUILD_JIT=0 -DWAMR_BUILD_LAZY_JIT=0"
51-
CLASSIC_INTERP_BUILD_OPTIONS: "-DWAMR_BUILD_AOT=0 -DWAMR_BUILD_FAST_INTERP=0 -DWAMR_BUILD_INTERP=1 _DWAMR_BUILD_FAST_JIT=0 -DWAMR_BUILD_JIT=0 -DWAMR_BUILD_LAZY_JIT=0"
52-
FAST_INTERP_BUILD_OPTIONS: " -DWAMR_BUILD_AOT=0 -DWAMR_BUILD_FAST_INTERP=1 -DWAMR_BUILD_INTERP=1 _DWAMR_BUILD_FAST_JIT=0 -DWAMR_BUILD_JIT=0 -DWAMR_BUILD_LAZY_JIT=0"
53-
FAST_JIT_BUILD_OPTIONS: " -DWAMR_BUILD_AOT=1 -DWAMR_BUILD_FAST_INTERP=0 -DWAMR_BUILD_INTERP=0 _DWAMR_BUILD_FAST_JIT=1 -DWAMR_BUILD_JIT=0 -DWAMR_BUILD_LAZY_JIT=0"
54-
LLVM_LAZY_JIT_BUILD_OPTIONS: " -DWAMR_BUILD_AOT=1 -DWAMR_BUILD_FAST_INTERP=0 -DWAMR_BUILD_INTERP=0 _DWAMR_BUILD_FAST_JIT=0 -DWAMR_BUILD_JIT=1 -DWAMR_BUILD_LAZY_JIT=1"
55-
LLVM_EAGER_JIT_BUILD_OPTIONS: "-DWAMR_BUILD_AOT=1 -DWAMR_BUILD_FAST_INTERP=0 -DWAMR_BUILD_INTERP=0 _DWAMR_BUILD_FAST_JIT=0 -DWAMR_BUILD_JIT=1 -DWAMR_BUILD_LAZY_JIT=0"
50+
AOT_BUILD_OPTIONS: " -DWAMR_BUILD_AOT=1 -DWAMR_BUILD_FAST_INTERP=0 -DWAMR_BUILD_INTERP=0 -DWAMR_BUILD_FAST_JIT=0 -DWAMR_BUILD_JIT=0 -DWAMR_BUILD_LAZY_JIT=0"
51+
CLASSIC_INTERP_BUILD_OPTIONS: "-DWAMR_BUILD_AOT=0 -DWAMR_BUILD_FAST_INTERP=0 -DWAMR_BUILD_INTERP=1 -DWAMR_BUILD_FAST_JIT=0 -DWAMR_BUILD_JIT=0 -DWAMR_BUILD_LAZY_JIT=0"
52+
FAST_INTERP_BUILD_OPTIONS: " -DWAMR_BUILD_AOT=0 -DWAMR_BUILD_FAST_INTERP=1 -DWAMR_BUILD_INTERP=1 -DWAMR_BUILD_FAST_JIT=0 -DWAMR_BUILD_JIT=0 -DWAMR_BUILD_LAZY_JIT=0"
53+
FAST_JIT_BUILD_OPTIONS: " -DWAMR_BUILD_AOT=1 -DWAMR_BUILD_FAST_INTERP=0 -DWAMR_BUILD_INTERP=0 -DWAMR_BUILD_FAST_JIT=1 -DWAMR_BUILD_JIT=0 -DWAMR_BUILD_LAZY_JIT=0"
54+
LLVM_LAZY_JIT_BUILD_OPTIONS: " -DWAMR_BUILD_AOT=1 -DWAMR_BUILD_FAST_INTERP=0 -DWAMR_BUILD_INTERP=0 -DWAMR_BUILD_FAST_JIT=0 -DWAMR_BUILD_JIT=1 -DWAMR_BUILD_LAZY_JIT=1"
55+
LLVM_EAGER_JIT_BUILD_OPTIONS: "-DWAMR_BUILD_AOT=1 -DWAMR_BUILD_FAST_INTERP=0 -DWAMR_BUILD_INTERP=0 -DWAMR_BUILD_FAST_JIT=0 -DWAMR_BUILD_JIT=1 -DWAMR_BUILD_LAZY_JIT=0"
5656
# LLVM
5757
LLVM_CACHE_SUFFIX: "build-llvm_libraries_ex"
5858
# For Spec Test
@@ -183,6 +183,9 @@ jobs:
183183
make_options_feature: "-DWAMR_BUILD_MINI_LOADER=1"
184184
- make_options_run_mode: $LLVM_EAGER_JIT_BUILD_OPTIONS
185185
make_options_feature: "-DWAMR_BUILD_MINI_LOADER=1"
186+
# Fast-JIT mode doesn't support android(X86-32)
187+
- make_options_run_mode: $FAST_JIT_BUILD_OPTIONS
188+
platform: android
186189
steps:
187190
- name: checkout
188191
uses: actions/checkout@v3

core/iwasm/fast-jit/jit_frontend.c

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1286,11 +1286,8 @@ jit_compile_func(JitCompContext *cc)
12861286

12871287
#if WASM_ENABLE_TAIL_CALL != 0
12881288
case WASM_OP_RETURN_CALL:
1289-
if (!cc->enable_tail_call) {
1290-
jit_set_last_error(cc, "unsupported opcode");
1291-
return false;
1292-
}
12931289
read_leb_uint32(frame_ip, frame_ip_end, func_idx);
1290+
12941291
if (!jit_compile_op_call(cc, func_idx, true))
12951292
return false;
12961293
if (!jit_compile_op_return(cc, &frame_ip))
@@ -1301,11 +1298,6 @@ jit_compile_func(JitCompContext *cc)
13011298
{
13021299
uint32 tbl_idx;
13031300

1304-
if (!cc->enable_tail_call) {
1305-
jit_set_last_error(cc, "unsupported opcode");
1306-
return false;
1307-
}
1308-
13091301
read_leb_uint32(frame_ip, frame_ip_end, type_idx);
13101302
#if WASM_ENABLE_REF_TYPES != 0
13111303
read_leb_uint32(frame_ip, frame_ip_end, tbl_idx);

0 commit comments

Comments
 (0)