Merge branch 'PHP-7.2'

* PHP-7.2:
  Fixed for RESOURCE too
This commit is contained in:
Xinchen Hui 2017-08-19 18:56:18 +08:00
commit e7c85fc3e6

View File

@ -3008,7 +3008,7 @@ static int zend_update_type_info(const zend_op_array *op_array,
if (t1 & MAY_BE_ARRAY) {
tmp |= MAY_BE_RC1;
}
if (t1 & MAY_BE_OBJECT) {
if (t1 & (MAY_BE_OBJECT|MAY_BE_RESOURCE)) {
tmp |= t1 & (MAY_BE_RC1|MAY_BE_RCN);
}
}