[php-src] master: Merge branch 'PHP-8.5' into PHP-8.6

Author: ndossche (ndossche) Date: 2026-10-06T22:54:17+02:00 Commit: https://github.com/php/php-src/commit/29af2f15bcb460e0d29b8f3e3437343577487c95 Raw diff: https://github.com/php/php-src/commit/29af2f15bcb460e0d29b8f3e3437343577487c95.diff Merge branch 'PHP-8.5' into PHP-8.6 * PHP-8.5: Fix merge Changed paths: M ext/opcache/jit/zend_jit_ir.c Diff: diff --git a/ext/opcache/jit/zend_jit_ir.c b/ext/opcache/jit/zend_jit_ir.c index c2f06cb0e0e8..bf5b5a14f5fa 100644 --- a/ext/opcache/jit/zend_jit_ir.c +++ b/ext/opcache/jit/zend_jit_ir.c @@ -17228,7 +17228,9 @@ static int zend_jit_trace_handler(zend_jit_ctx *jit, const zend_op_array *op_arr opline->opcode == ZEND_DO_FCALL_BY_NAME || opline->opcode == ZEND_DO_FCALL || opline->opcode == ZEND_GENERATOR_CREATE || - opline->opcode == ZEND_INCLUDE_OR_EVAL) { + opline->opcode == ZEND_INCLUDE_OR_EVAL || + /* May enter a simple get hook. */ + opline->opcode == ZEND_FETCH_OBJ_R) { ir_ref addr = jit_EG(current_execute_data);