diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2020-02-27 23:38:09 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2020-02-27 23:38:09 +0300 |
| commit | cb881844204dd7b7f8a3661a086345ab29a62420 (patch) | |
| tree | ff7592e9a779118cc30b693886bf1bafdbd511e9 | |
| parent | ac2382d437f2a5e7ba48f530b9f590ee26c86e59 (diff) | |
| parent | 5b51b633e2509852312328d360639dacb35d12e6 (diff) | |
| download | php-git-cb881844204dd7b7f8a3661a086345ab29a62420.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fixed incorrect overflow detection
| -rw-r--r-- | ext/opcache/Optimizer/zend_inference.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/opcache/Optimizer/zend_inference.c b/ext/opcache/Optimizer/zend_inference.c index 7accf73a5d..82d17a9b9c 100644 --- a/ext/opcache/Optimizer/zend_inference.c +++ b/ext/opcache/Optimizer/zend_inference.c @@ -2761,10 +2761,10 @@ static int zend_update_type_info(const zend_op_array *op_array, } if ((t1 & (MAY_BE_ANY|MAY_BE_UNDEF)) == MAY_BE_LONG) { if (!ssa_var_info[ssa_ops[i].op1_use].has_range || - (opline->opcode == ZEND_PRE_DEC && + (opline->opcode == ZEND_POST_DEC && (ssa_var_info[ssa_ops[i].op1_use].range.underflow || ssa_var_info[ssa_ops[i].op1_use].range.min == ZEND_LONG_MIN)) || - (opline->opcode == ZEND_PRE_INC && + (opline->opcode == ZEND_POST_INC && (ssa_var_info[ssa_ops[i].op1_use].range.overflow || ssa_var_info[ssa_ops[i].op1_use].range.max == ZEND_LONG_MAX))) { /* may overflow */ |