Merge branch 'PHP-7.3' into PHP-7.4

dstogov · dstogov · commit 49fcbb4810ec · 2019-11-12T13:00:27.000+03:00
* PHP-7.3:
  Fixed wrong constant usage
diff --git a/ext/opcache/Optimizer/zend_ssa.c b/ext/opcache/Optimizer/zend_ssa.c
@@ -448,7 +448,7 @@ static void place_essa_pis(
 			if ((pi = add_pi(arena, op_array, dfg, ssa, j, bt, var))) {
 				pi_type_mask(pi, mask_for_type_check(type));
 			}
-			if (type != IS_RESOURCE) {
+			if (type != MAY_BE_RESOURCE) {
 				/* is_resource() may return false for closed resources */
 				if ((pi = add_pi(arena, op_array, dfg, ssa, j, bf, var))) {
 					pi_not_type_mask(pi, mask_for_type_check(type));

Original file line number	Diff line number	Diff line change
`@@ -448,7 +448,7 @@ static void place_essa_pis(`
`448`	`448`	`if ((pi = add_pi(arena, op_array, dfg, ssa, j, bt, var))) {`
`449`	`449`	`pi_type_mask(pi, mask_for_type_check(type));`
`450`	`450`	`}`
`451`		`- if (type != IS_RESOURCE) {`
	`451`	`+ if (type != MAY_BE_RESOURCE) {`
`452`	`452`	`/* is_resource() may return false for closed resources */`
`453`	`453`	`if ((pi = add_pi(arena, op_array, dfg, ssa, j, bf, var))) {`
`454`	`454`	`pi_not_type_mask(pi, mask_for_type_check(type));`