[php-src] master: Merge branch 'PHP-8.6'
| From: | Weilin Du | Date: | Sat, 24 Oct 2026 09:18:05 +0000 |
| Subject: | [php-src] master: Merge branch 'PHP-8.6' | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-142665@lists.php.net to get a copy of this message | ||
Author: Weilin Du (LamentXU123)
Date: 2026-10-24T17:17:15+08:00
Commit: https://github.com/php/php-src/commit/4ae838f85ee7a8813240236af5082a12ec883943
Raw diff: https://github.com/php/php-src/commit/4ae838f85ee7a8813240236af5082a12ec883943.diff
Merge branch 'PHP-8.6'
* PHP-8.6:
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 8868f0e4f6e7..4757c7b4cfdd 100644
--- a/ext/opcache/jit/zend_jit_trace.c
+++ b/ext/opcache/jit/zend_jit_trace.c
@@ -3811,7 +3811,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;