christoph/wamr
1
Fork 0
Code Releases Activity

Fix Fast JIT issues reported by instrument test (#1488)

Browse Source 
- Add checks for `pack_argv`
- Fix the checks in creating cc entry/exit basic blocks
This commit is contained in:
Qiang
2022-09-22 19:37:59 +08:00
committed by GitHub
parent ee210d019f
commit 32d2d16908
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/iwasm/fast-jit/jit_ir.c
View File

@ -380,9 +380,19 @@ jit_cc_init(JitCompContext *cc, unsigned htab_size)
/* Create entry and exit blocks. They must be the first two
blocks respectively. */
if (!(entry_block = jit_cc_new_basic_block(cc, 0))
|| !(exit_block = jit_cc_new_basic_block(cc, 0)))
if (!(entry_block = jit_cc_new_basic_block(cc, 0)))
goto fail;
if (!(exit_block = jit_cc_new_basic_block(cc, 0))) {
jit_basic_block_delete(entry_block);
goto fail;
}
/* Record the entry and exit labels, whose indexes must be 0 and 1
respectively. */
cc->entry_label = jit_basic_block_label(entry_block);
cc->exit_label = jit_basic_block_label(exit_block);
bh_assert(jit_reg_no(cc->entry_label) == 0
&& jit_reg_no(cc->exit_label) == 1);
if (!(cc->exce_basic_blocks =
jit_calloc(sizeof(JitBasicBlock *) * JIT_EXCE_NUM)))
@ -392,13 +402,6 @@ jit_cc_init(JitCompContext *cc, unsigned htab_size)
jit_calloc(sizeof(JitIncomingInsnList) * JIT_EXCE_NUM)))
goto fail;
/* Record the entry and exit labels, whose indexes must be 0 and 1
respectively. */
cc->entry_label = jit_basic_block_label(entry_block);
cc->exit_label = jit_basic_block_label(exit_block);
bh_assert(jit_reg_no(cc->entry_label) == 0
&& jit_reg_no(cc->exit_label) == 1);
cc->hreg_info = jit_codegen_get_hreg_info();
bh_assert(cc->hreg_info->info[JIT_REG_KIND_I32].num > 3);