Merge branch 'PHP-8.0' into PHP-8.1

nikic · nikic · commit 37337507ecbf · 2021-09-21T14:54:34.000+02:00
* PHP-8.0:
  Don't unconditionally add array value type for undef
diff --git a/Zend/Optimizer/zend_inference.c b/Zend/Optimizer/zend_inference.c
@@ -2104,7 +2104,7 @@ static uint32_t assign_dim_result_type(
 		 * key type exists iff a value type exists even in dead code that may use empty types. */
 		if (value_type & (MAY_BE_ANY|MAY_BE_UNDEF)) {
 			if (value_type & MAY_BE_UNDEF) {
-				tmp |= MAY_BE_ARRAY_OF_NULL;
+				value_type |= MAY_BE_NULL;
 			}
 			if (dim_op_type == IS_UNUSED) {
 				tmp |= MAY_BE_HASH_ONLY(arr_type) ? MAY_BE_ARRAY_NUMERIC_HASH : MAY_BE_ARRAY_KEY_LONG;
diff --git a/ext/opcache/tests/invalid_array_key_type.phpt b/ext/opcache/tests/invalid_array_key_type.phpt
@@ -13,6 +13,9 @@ function test(\SplObjectStorage $definitions = null) {
     $definitions[$argument] = 1;
     $definitions[$argument] += 1;
 }
+function test2() {
+    $a[[]] = $undef;
+}
 
 ?>
 ===DONE===

Original file line number	Diff line number	Diff line change
`@@ -2104,7 +2104,7 @@ static uint32_t assign_dim_result_type(`
`2104`	`2104`	`* key type exists iff a value type exists even in dead code that may use empty types. */`
`2105`	`2105`	`if (value_type & (MAY_BE_ANY\|MAY_BE_UNDEF)) {`
`2106`	`2106`	`if (value_type & MAY_BE_UNDEF) {`
`2107`		`- tmp \|= MAY_BE_ARRAY_OF_NULL;`
	`2107`	`+ value_type \|= MAY_BE_NULL;`
`2108`	`2108`	`}`
`2109`	`2109`	`if (dim_op_type == IS_UNUSED) {`
`2110`	`2110`	`tmp \|= MAY_BE_HASH_ONLY(arr_type) ? MAY_BE_ARRAY_NUMERIC_HASH : MAY_BE_ARRAY_KEY_LONG;`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,9 @@ function test(\SplObjectStorage $definitions = null) {`
`13`	`13`	`$definitions[$argument] = 1;`
`14`	`14`	`$definitions[$argument] += 1;`
`15`	`15`	`}`
	`16`	`+function test2() {`
	`17`	`+ $a[[]] = $undef;`
	`18`	`+}`
`16`	`19`
`17`	`20`	`?>`
`18`	`21`	`===DONE===`