diff options
| author | Joe Watkins <krakjoe@php.net> | 2017-11-03 17:49:52 +0000 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2017-11-03 17:49:52 +0000 |
| commit | c3ee17065bc3952f140bceb0232fbff59dfb55f4 (patch) | |
| tree | 5da3233716b5510af14fd86e2b087cafe54b2848 /ext/opcache | |
| parent | 0166e5c4660b4d6e10b9e310cc89e12c3b53005a (diff) | |
| parent | 21dbd2ffcd6522325d23a77bcae1c2d123a553b2 (diff) | |
| download | php-git-c3ee17065bc3952f140bceb0232fbff59dfb55f4.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
fix wrong check of definition_phi->constraint.range.max_ssa_var
Diffstat (limited to 'ext/opcache')
| -rw-r--r-- | ext/opcache/Optimizer/zend_inference.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/opcache/Optimizer/zend_inference.c b/ext/opcache/Optimizer/zend_inference.c index 943620cf11..922f736ef3 100644 --- a/ext/opcache/Optimizer/zend_inference.c +++ b/ext/opcache/Optimizer/zend_inference.c @@ -1585,7 +1585,7 @@ static void zend_infer_ranges_warmup(const zend_op_array *op_array, zend_ssa *ss ssa->vars[j].definition_phi->has_range_constraint && ssa->vars[j].definition_phi->constraint.range.negative && ssa->vars[j].definition_phi->constraint.range.min_ssa_var < 0 && - ssa->vars[j].definition_phi->constraint.range.min_ssa_var < 0) { + ssa->vars[j].definition_phi->constraint.range.max_ssa_var < 0) { zend_ssa_range_constraint *constraint = &ssa->vars[j].definition_phi->constraint.range; if (tmp.min == ssa->var_info[j].range.min && |