Update array_element_type inference for previous change

nikic · nikic · commit 102bcb5c05d9 · 2018-06-25T14:27:02.000+02:00
LIST_R and DIM_IS return value can't be MAY_BE_REF anymore.
diff --git a/ext/opcache/Optimizer/zend_inference.c b/ext/opcache/Optimizer/zend_inference.c
@@ -2059,7 +2059,7 @@ uint32_t zend_array_element_type(zend_op *opline, uint32_t t1)
 				tmp |= MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_ANY | MAY_BE_ARRAY_OF_REF;
 			}
 			if (t1 & MAY_BE_ARRAY_OF_REF) {
-				if (opline->opcode == ZEND_FETCH_DIM_R) {
+				if (!write) {
 					/* can't be REF  because of ZVAL_COPY_DEREF() usage */
 					tmp |= MAY_BE_RC1 | MAY_BE_RCN;
 				} else {

Original file line number	Diff line number	Diff line change
`@@ -2059,7 +2059,7 @@ uint32_t zend_array_element_type(zend_op *opline, uint32_t t1)`
`2059`	`2059`	`tmp \|= MAY_BE_ARRAY_KEY_ANY \| MAY_BE_ARRAY_OF_ANY \| MAY_BE_ARRAY_OF_REF;`
`2060`	`2060`	`}`
`2061`	`2061`	`if (t1 & MAY_BE_ARRAY_OF_REF) {`
`2062`		`- if (opline->opcode == ZEND_FETCH_DIM_R) {`
	`2062`	`+ if (!write) {`
`2063`	`2063`	`/* can't be REF because of ZVAL_COPY_DEREF() usage */`
`2064`	`2064`	`tmp \|= MAY_BE_RC1 \| MAY_BE_RCN;`
`2065`	`2065`	`} else {`