Skip to content

Fix register allocarion for result of ASSIGN_OBJ #17994

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 7, 2025
Merged

Fix register allocarion for result of ASSIGN_OBJ #17994

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 15 additions & 20 deletions ext/opcache/jit/zend_jit_ir.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14748,13 +14748,6 @@ static int zend_jit_assign_obj(zend_jit_ctx *jit,
// CACHE_PTR_EX(cache_slot + 2, NULL);
}

if (RETURN_VALUE_USED(opline) && Z_MODE(res_addr) == IS_REG) {
zend_jit_addr real_addr = ZEND_ADDR_MEM_ZVAL(ZREG_FP, opline->result.var);
if (!zend_jit_load_reg(jit, real_addr, res_addr, res_info)) {
return 0;
}
}

ir_END_list(end_inputs);
ir_IF_FALSE(if_has_prop_info);
}
Expand Down Expand Up @@ -14820,12 +14813,6 @@ static int zend_jit_assign_obj(zend_jit_ctx *jit,
arg3,
arg4);

if (RETURN_VALUE_USED(opline) && Z_MODE(res_addr) == IS_REG) {
zend_jit_addr real_addr = ZEND_ADDR_MEM_ZVAL(ZREG_FP, opline->result.var);
if (!zend_jit_load_reg(jit, real_addr, res_addr, res_info)) {
return 0;
}
}
ir_END_list(end_inputs);
}
}
Expand All @@ -14838,7 +14825,14 @@ static int zend_jit_assign_obj(zend_jit_ctx *jit,
return 0;
}
} else {
if (!zend_jit_assign_to_variable(jit, opline, prop_addr, prop_addr, -1, -1, (opline+1)->op1_type, val_addr, val_info, res_addr, 0, 0)) {
zend_jit_addr real_res_addr;

if (res_addr && Z_MODE(res_addr) == IS_REG) {
real_res_addr = ZEND_ADDR_MEM_ZVAL(ZREG_FP, opline->result.var);
} else {
real_res_addr = res_addr;
}
if (!zend_jit_assign_to_variable(jit, opline, prop_addr, prop_addr, -1, -1, (opline+1)->op1_type, val_addr, val_info, real_res_addr, 0, 0)) {
return 0;
}
}
Expand Down Expand Up @@ -14888,12 +14882,6 @@ static int zend_jit_assign_obj(zend_jit_ctx *jit,
ir_ADD_OFFSET(run_time_cache, opline->extended_value & ~ZEND_FETCH_OBJ_FLAGS),
arg5);

if (RETURN_VALUE_USED(opline) && Z_MODE(res_addr) == IS_REG) {
zend_jit_addr real_addr = ZEND_ADDR_MEM_ZVAL(ZREG_FP, opline->result.var);
if (!zend_jit_load_reg(jit, real_addr, res_addr, res_info)) {
return 0;
}
}
ir_END_list(end_inputs);
}

Expand All @@ -14914,6 +14902,13 @@ static int zend_jit_assign_obj(zend_jit_ctx *jit,
jit_FREE_OP(jit, opline->op1_type, opline->op1, op1_info, opline);
}

if (RETURN_VALUE_USED(opline) && Z_MODE(res_addr) == IS_REG) {
zend_jit_addr real_addr = ZEND_ADDR_MEM_ZVAL(ZREG_FP, opline->result.var);
if (!zend_jit_load_reg(jit, real_addr, res_addr, res_info)) {
return 0;
}
}

if (may_throw) {
zend_jit_check_exception(jit);
}
Expand Down
Loading