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

Author: Weilin Du (LamentXU123) Date: 2026-10-24T17:16:39+08:00 Commit: https://github.com/php/php-src/commit/e36968e988028883b922964fce5aa91d2ee22138 Raw diff: https://github.com/php/php-src/commit/e36968e988028883b922964fce5aa91d2ee22138.diff Merge branch 'PHP-8.4' into PHP-8.5 * PHP-8.4: JIT: Fix upper-bound inference in tracing JIT comparisons (#24633) Changed paths: M ext/opcache/jit/zend_jit_trace.c Diff: diff --git a/ext/opcache/jit/zend_jit_trace.c b/ext/opcache/jit/zend_jit_trace.c index fe303cad200a..f5e0bcfbcf59 100644 --- a/ext/opcache/jit/zend_jit_trace.c +++ b/ext/opcache/jit/zend_jit_trace.c @@ -3796,7 +3796,7 @@ static void zend_jit_trace_update_condition_ranges(const zend_op *opline, const zend_jit_trace_set_var_range( &ssa->var_info[ssa_op->op2_use], op2_min, - op2_max != ZEND_LONG_MIN ?MIN(op2_max, op1_max - 1) : op1_max); + op1_max != ZEND_LONG_MIN ? MIN(op2_max, op1_max - 1) : op2_max); } } break;