archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.4'

Browse source 
* PHP-8.4:
  Fix GH-16393: Assertion failure in ext/opcache/jit/zend_jit.c:2897
This commit is contained in:
Dmitry Stogov 2024-10-15 12:03:46 +03:00
commit 023d66dc1f
No known key found for this signature in database
2 changed files with 30 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
ext/opcache/jit/zend_jit.c
View file

@ -2871,26 +2871,29 @@ static void zend_jit_cleanup_func_info(zend_op_array *op_array)
} }
} }
static int zend_real_jit_func(zend_op_array *op_array, zend_script *script, const zend_op *rt_opline) static int zend_real_jit_func(zend_op_array *op_array, zend_script *script, const zend_op *rt_opline, uint8_t trigger)
{ {
zend_ssa ssa; zend_ssa ssa;
void *checkpoint; void *checkpoint;
zend_func_info *func_info; zend_func_info *func_info;
uint8_t orig_trigger;
if (*dasm_ptr == dasm_end) { if (*dasm_ptr == dasm_end) {
return FAILURE; return FAILURE;
} }
orig_trigger = JIT_G(trigger);
JIT_G(trigger) = trigger;
checkpoint = zend_arena_checkpoint(CG(arena)); checkpoint = zend_arena_checkpoint(CG(arena));
/* Build SSA */ /* Build SSA */
memset(&ssa, 0, sizeof(zend_ssa)); memset(&ssa, 0, sizeof(zend_ssa));
if (op_array->fn_flags & ZEND_ACC_CLOSURE) { if (op_array->fn_flags & ZEND_ACC_CLOSURE) {
if (JIT_G(trigger) == ZEND_JIT_ON_FIRST_EXEC) { if (trigger == ZEND_JIT_ON_FIRST_EXEC) {
zend_jit_op_array_extension *jit_extension = (zend_jit_op_array_extension*)ZEND_FUNC_INFO(op_array); zend_jit_op_array_extension *jit_extension = (zend_jit_op_array_extension*)ZEND_FUNC_INFO(op_array);
op_array = (zend_op_array*) jit_extension->op_array; op_array = (zend_op_array*) jit_extension->op_array;
} else if (JIT_G(trigger) == ZEND_JIT_ON_HOT_COUNTERS) { } else if (trigger == ZEND_JIT_ON_HOT_COUNTERS) {
zend_jit_op_array_hot_extension *jit_extension = (zend_jit_op_array_hot_extension*)ZEND_FUNC_INFO(op_array); zend_jit_op_array_hot_extension *jit_extension = (zend_jit_op_array_hot_extension*)ZEND_FUNC_INFO(op_array);
op_array = (zend_op_array*) jit_extension->op_array; op_array = (zend_op_array*) jit_extension->op_array;
} else { } else {
@ -2925,11 +2928,13 @@ static int zend_real_jit_func(zend_op_array *op_array, zend_script *script, cons
zend_jit_cleanup_func_info(op_array); zend_jit_cleanup_func_info(op_array);
zend_arena_release(&CG(arena), checkpoint); zend_arena_release(&CG(arena), checkpoint);
JIT_G(trigger) = orig_trigger;
return SUCCESS; return SUCCESS;
jit_failure: jit_failure:
zend_jit_cleanup_func_info(op_array); zend_jit_cleanup_func_info(op_array);
zend_arena_release(&CG(arena), checkpoint); zend_arena_release(&CG(arena), checkpoint);
JIT_G(trigger) = orig_trigger;
return FAILURE; return FAILURE;
} }
@ -2960,7 +2965,7 @@ static int ZEND_FASTCALL zend_runtime_jit(void)
opline->handler = jit_extension->orig_handler; opline->handler = jit_extension->orig_handler;
/* perform real JIT for this function */ /* perform real JIT for this function */
zend_real_jit_func(op_array, NULL, NULL); zend_real_jit_func(op_array, NULL, NULL, ZEND_JIT_ON_FIRST_EXEC);
} zend_catch { } zend_catch {
do_bailout = true; do_bailout = true;
} zend_end_try(); } zend_end_try();
@ -3006,7 +3011,7 @@ void zend_jit_check_funcs(HashTable *function_table, bool is_method) {
jit_extension = (zend_jit_op_array_extension*)ZEND_FUNC_INFO(op_array); jit_extension = (zend_jit_op_array_extension*)ZEND_FUNC_INFO(op_array);
opline->handler = jit_extension->orig_handler; opline->handler = jit_extension->orig_handler;
if (((double)counter / (double)zend_jit_profile_counter) > JIT_G(prof_threshold)) { if (((double)counter / (double)zend_jit_profile_counter) > JIT_G(prof_threshold)) {
zend_real_jit_func(op_array, NULL, NULL); zend_real_jit_func(op_array, NULL, NULL, ZEND_JIT_ON_PROF_REQUEST);
} }
} }
} ZEND_HASH_FOREACH_END(); } ZEND_HASH_FOREACH_END();
@ -3032,7 +3037,7 @@ void ZEND_FASTCALL zend_jit_hot_func(zend_execute_data *execute_data, const zend
} }
/* perform real JIT for this function */ /* perform real JIT for this function */
zend_real_jit_func(op_array, NULL, opline); zend_real_jit_func(op_array, NULL, opline, ZEND_JIT_ON_HOT_COUNTERS);
} zend_catch { } zend_catch {
do_bailout = 1; do_bailout = 1;
} zend_end_try(); } zend_end_try();
@ -3203,7 +3208,7 @@ int zend_jit_op_array(zend_op_array *op_array, zend_script *script)
} else if (JIT_G(trigger) == ZEND_JIT_ON_HOT_TRACE) { } else if (JIT_G(trigger) == ZEND_JIT_ON_HOT_TRACE) {
return zend_jit_setup_hot_trace_counters(op_array); return zend_jit_setup_hot_trace_counters(op_array);
} else if (JIT_G(trigger) == ZEND_JIT_ON_SCRIPT_LOAD) { } else if (JIT_G(trigger) == ZEND_JIT_ON_SCRIPT_LOAD) {
return zend_real_jit_func(op_array, script, NULL); return zend_real_jit_func(op_array, script, NULL, ZEND_JIT_ON_SCRIPT_LOAD);
} else { } else {
ZEND_UNREACHABLE(); ZEND_UNREACHABLE();
} }

18
ext/opcache/tests/jit/gh16393.phpt Normal file
View file

@ -0,0 +1,18 @@
--TEST--
GH-16393 (Assertion failure in ext/opcache/jit/zend_jit.c:2897)
--EXTENSIONS--
opcache
--INI--
opcache.jit=1215
opcache.jit_buffer_size=64M
--FILE--
<?php
ini_set('opcache.jit', 'tracing');
class Test {
}
$appendProp2 = (function() {
})->bindTo($test, Test::class);
$appendProp2();
?>
--EXPECTF--
Warning: Undefined variable $test in %sgh16393.php on line 6