1
0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00

Fix RC inference of op1 of FETCH_OBJ and INIT_METHOD_CALL

Fixes GH-17151
Closes GH-17152
This commit is contained in:
Dmitry Stogov
2024-12-18 15:38:49 +01:00
committed by Ilija Tovilo
parent cbe9d67efc
commit 6666cc83c5
3 changed files with 7 additions and 0 deletions

2
NEWS
View File

@@ -51,6 +51,8 @@ PHP NEWS
. opcache_get_configuration() properly reports jit_prof_threshold. (cmb)
. Fixed bug GH-17140 (Assertion failure in JIT trace exit with
ZEND_FETCH_DIM_FUNC_ARG). (nielsdos, Dmitry)
. Fixed bug GH-17151 (Incorrect RC inference of op1 of FETCH_OBJ and
INIT_METHOD_CALL). (Dmitry, ilutov)
- PCNTL:
. Fix memory leak in cleanup code of pcntl_exec() when a non stringable

View File

@@ -1968,6 +1968,10 @@ static uint32_t get_ssa_alias_types(zend_ssa_alias_kind alias) {
/* TODO: support for array keys and ($str . "")*/ \
__type |= MAY_BE_RCN; \
} \
if ((__type & MAY_BE_RC1) && (__type & MAY_BE_OBJECT)) {\
/* TODO: object may be captured by magic handlers */\
__type |= MAY_BE_RCN; \
} \
if (__ssa_var->alias) { \
__type |= get_ssa_alias_types(__ssa_var->alias); \
} \

View File

@@ -14426,6 +14426,7 @@ result_fetched:
ir_MERGE_list(slow_inputs);
jit_SET_EX_OPLINE(jit, opline);
op1_info |= MAY_BE_RC1 | MAY_BE_RCN; /* object may be captured/released in magic handler */
if (opline->opcode == ZEND_FETCH_OBJ_W) {
ir_CALL_1(IR_VOID, ir_CONST_FC_FUNC(zend_jit_fetch_obj_w_slow), obj_ref);
ir_END_list(end_inputs);