christoph/wamr
1
Fork 0
Code Releases Activity

fix(aot): ensure value_cmp does not exceed br_count in branch table compilation (#4065)

Browse Source
This commit is contained in:
liang.he
2025-02-06 20:05:33 +08:00
committed by GitHub
parent e6a47d5cee
commit 7b724e2382
1 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
core/iwasm/compilation/aot_emit_control.c
View File

@ -1218,6 +1218,28 @@ aot_compile_op_br_table(AOTCompContext *comp_ctx, AOTFuncContext *func_ctx,
return aot_handle_next_reachable_block(comp_ctx, func_ctx, p_frame_ip); return aot_handle_next_reachable_block(comp_ctx, func_ctx, p_frame_ip);
} }
/*
* if (value_cmp > br_count)
* value_cmp = br_count;
*/
LLVMValueRef br_count_value = I32_CONST(br_count);
CHECK_LLVM_CONST(br_count_value);
LLVMValueRef clap_value_cmp_cond =
LLVMBuildICmp(comp_ctx->builder, LLVMIntUGT, value_cmp, br_count_value,
"cmp_w_br_count");
if (!clap_value_cmp_cond) {
aot_set_last_error("llvm build icmp failed.");
return false;
}
value_cmp = LLVMBuildSelect(comp_ctx->builder, clap_value_cmp_cond,
br_count_value, value_cmp, "clap_value_cmp");
if (!value_cmp) {
aot_set_last_error("llvm build select failed.");
return false;
}
if (!LLVMIsEfficientConstInt(value_cmp)) { if (!LLVMIsEfficientConstInt(value_cmp)) {
if (comp_ctx->aot_frame) { if (comp_ctx->aot_frame) {
if (comp_ctx->enable_gc if (comp_ctx->enable_gc