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

From: Date: Tue, 06 Oct 2026 20:54:49 +0000
Subject: [php-src] master: Merge branch 'PHP-8.6'
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-142042@lists.php.net to get a copy of this message
Author: ndossche (ndossche) Date: 2026-10-06T22:54:24+02:00 Commit: https://github.com/php/php-src/commit/8e6f1ef5e116ba1aa0d00c16aa7e0decfd0a78ff Raw diff: https://github.com/php/php-src/commit/8e6f1ef5e116ba1aa0d00c16aa7e0decfd0a78ff.diff Merge branch 'PHP-8.6' * PHP-8.6: 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 9505e7997cff..85f614e459ba 100644 --- a/ext/opcache/jit/zend_jit_ir.c +++ b/ext/opcache/jit/zend_jit_ir.c @@ -17309,7 +17309,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);

« previous php.cvs (#142042) next »