Merge branch 'PHP-7.2'

laruence · laruence · commit e7c85fc3e67a · 2017-08-19T18:56:18.000+08:00
* PHP-7.2:
  Fixed for RESOURCE too
diff --git a/ext/opcache/Optimizer/zend_inference.c b/ext/opcache/Optimizer/zend_inference.c
@@ -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);
 					}
 				}

Original file line number	Diff line number	Diff line change
`@@ -3008,7 +3008,7 @@ static int zend_update_type_info(const zend_op_array *op_array,`
`3008`	`3008`	`if (t1 & MAY_BE_ARRAY) {`
`3009`	`3009`	`tmp \|= MAY_BE_RC1;`
`3010`	`3010`	`}`
`3011`		`- if (t1 & MAY_BE_OBJECT) {`
	`3011`	`+ if (t1 & (MAY_BE_OBJECT\|MAY_BE_RESOURCE)) {`
`3012`	`3012`	`tmp \|= t1 & (MAY_BE_RC1\|MAY_BE_RCN);`
`3013`	`3013`	`}`
`3014`	`3014`	`}`