Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  fix wrong check of definition_phi->constraint.range.max_ssa_var
This commit is contained in:
Joe Watkins 2017-11-03 17:49:52 +00:00
commit c3ee17065b
No known key found for this signature in database
GPG key ID: F9BA0ADA31CBD89E

View file

@ -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 &&