Browse Source

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Added missed ~
pull/2776/head
Dmitry Stogov 8 years ago
parent
commit
2a33e357cd
  1. 2
      ext/opcache/Optimizer/zend_inference.c

2
ext/opcache/Optimizer/zend_inference.c

@ -2332,7 +2332,7 @@ static int zend_update_type_info(const zend_op_array *op_array,
if (opline->op1_type == IS_CV) {
if (!(orig & MAY_BE_REF)) {
if (orig & (MAY_BE_UNDEF|MAY_BE_NULL|MAY_BE_FALSE)) {
orig &= (MAY_BE_UNDEF|MAY_BE_NULL|MAY_BE_FALSE);
orig &= ~(MAY_BE_UNDEF|MAY_BE_NULL|MAY_BE_FALSE);
orig |= MAY_BE_OBJECT | MAY_BE_RC1 | MAY_BE_RCN;
}
if (orig & MAY_BE_OBJECT) {

Loading…
Cancel
Save