Merge branch 'PHP-8.0'

dstogov · dstogov · commit 977134352d50 · 2020-11-16T18:17:17.000+03:00
* PHP-8.0:
  Fixed MAY_BE_INDIRECT inference
diff --git a/ext/opcache/Optimizer/zend_inference.c b/ext/opcache/Optimizer/zend_inference.c
@@ -1949,6 +1949,9 @@ uint32_t zend_array_element_type(uint32_t t1, zend_uchar op_type, int write, int
 		} else {
 			tmp |= MAY_BE_ANY | MAY_BE_REF | MAY_BE_RC1 | MAY_BE_RCN | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_ANY | MAY_BE_ARRAY_OF_REF;
 	    }
+		if (write) {
+			tmp |= MAY_BE_INDIRECT;
+		}
 	}
 	if (t1 & MAY_BE_ARRAY) {
 		if (insert) {

Original file line number	Diff line number	Diff line change
`@@ -1949,6 +1949,9 @@ uint32_t zend_array_element_type(uint32_t t1, zend_uchar op_type, int write, int`
`1949`	`1949`	`} else {`
`1950`	`1950`	`tmp \|= MAY_BE_ANY \| MAY_BE_REF \| MAY_BE_RC1 \| MAY_BE_RCN \| MAY_BE_ARRAY_KEY_ANY \| MAY_BE_ARRAY_OF_ANY \| MAY_BE_ARRAY_OF_REF;`
`1951`	`1951`	`}`
	`1952`	`+ if (write) {`
	`1953`	`+ tmp \|= MAY_BE_INDIRECT;`
	`1954`	`+ }`
`1952`	`1955`	`}`
`1953`	`1956`	`if (t1 & MAY_BE_ARRAY) {`
`1954`	`1957`	`if (insert) {`