Merge branch 'PHP-8.0' into PHP-8.1

dstogov · dstogov · commit 8e5f54ed0cb3 · 2022-01-10T16:05:01.000+03:00
* PHP-8.0:
  Fix type inference for assign to string offset with invalid index.
diff --git a/Zend/Optimizer/zend_inference.c b/Zend/Optimizer/zend_inference.c
@@ -2667,7 +2667,7 @@ static zend_always_inline int _zend_update_type_info(
 			if (ssa_op->result_def >= 0) {
 				tmp = 0;
 				if (t1 & MAY_BE_STRING) {
-					tmp |= MAY_BE_STRING;
+					tmp |= MAY_BE_STRING | MAY_BE_NULL;
 				}
 				if (t1 & (MAY_BE_ARRAY|MAY_BE_FALSE|MAY_BE_NULL|MAY_BE_UNDEF)) {
 					tmp |= (OP1_DATA_INFO() & (MAY_BE_ANY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_ANY | MAY_BE_ARRAY_OF_REF));

Original file line number	Diff line number	Diff line change
`@@ -2667,7 +2667,7 @@ static zend_always_inline int _zend_update_type_info(`
`2667`	`2667`	`if (ssa_op->result_def >= 0) {`
`2668`	`2668`	`tmp = 0;`
`2669`	`2669`	`if (t1 & MAY_BE_STRING) {`
`2670`		`- tmp \|= MAY_BE_STRING;`
	`2670`	`+ tmp \|= MAY_BE_STRING \| MAY_BE_NULL;`
`2671`	`2671`	`}`
`2672`	`2672`	`if (t1 & (MAY_BE_ARRAY\|MAY_BE_FALSE\|MAY_BE_NULL\|MAY_BE_UNDEF)) {`
`2673`	`2673`	`tmp \|= (OP1_DATA_INFO() & (MAY_BE_ANY \| MAY_BE_ARRAY_KEY_ANY \| MAY_BE_ARRAY_OF_ANY \| MAY_BE_ARRAY_OF_REF));`