Merge branch 'PHP-8.1'

nikic · nikic · commit 2067388fe689 · 2021-09-21T17:04:12.000+02:00
* PHP-8.1:
  Fix range() return type inference for undef operand
diff --git a/Zend/Optimizer/zend_func_info.c b/Zend/Optimizer/zend_func_info.c
@@ -75,7 +75,8 @@ static uint32_t zend_range_info(const zend_call_info *call_info, const zend_ssa
 				|| (t3 & (MAY_BE_DOUBLE|MAY_BE_STRING))) {
 			tmp |= MAY_BE_ARRAY_OF_DOUBLE;
 		}
-		if ((t1 & (MAY_BE_ANY-(MAY_BE_STRING|MAY_BE_DOUBLE))) && (t2 & (MAY_BE_ANY-(MAY_BE_STRING|MAY_BE_DOUBLE)))) {
+		if ((t1 & ((MAY_BE_ANY|MAY_BE_UNDEF)-(MAY_BE_STRING|MAY_BE_DOUBLE)))
+				&& (t2 & ((MAY_BE_ANY|MAY_BE_UNDEF)-(MAY_BE_STRING|MAY_BE_DOUBLE)))) {
 			if ((t3 & MAY_BE_ANY) != MAY_BE_DOUBLE) {
 				tmp |= MAY_BE_ARRAY_OF_LONG;
 			}
diff --git a/ext/opcache/tests/invalid_array_key_type.phpt b/ext/opcache/tests/invalid_array_key_type.phpt
@@ -16,6 +16,9 @@ function test(\SplObjectStorage $definitions = null) {
 function test2() {
     $a[[]] = $undef;
 }
+function test3() {
+    foreach (range(0, $undef) as $v) { }
+}
 
 ?>
 ===DONE===

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,8 @@ static uint32_t zend_range_info(const zend_call_info *call_info, const zend_ssa`
`75`	`75`	`\|\| (t3 & (MAY_BE_DOUBLE\|MAY_BE_STRING))) {`
`76`	`76`	`tmp \|= MAY_BE_ARRAY_OF_DOUBLE;`
`77`	`77`	`}`
`78`		`- if ((t1 & (MAY_BE_ANY-(MAY_BE_STRING\|MAY_BE_DOUBLE))) && (t2 & (MAY_BE_ANY-(MAY_BE_STRING\|MAY_BE_DOUBLE)))) {`
	`78`	`+ if ((t1 & ((MAY_BE_ANY\|MAY_BE_UNDEF)-(MAY_BE_STRING\|MAY_BE_DOUBLE)))`
	`79`	`+ && (t2 & ((MAY_BE_ANY\|MAY_BE_UNDEF)-(MAY_BE_STRING\|MAY_BE_DOUBLE)))) {`
`79`	`80`	`if ((t3 & MAY_BE_ANY) != MAY_BE_DOUBLE) {`
`80`	`81`	`tmp \|= MAY_BE_ARRAY_OF_LONG;`
`81`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,9 @@ function test(\SplObjectStorage $definitions = null) {`
`16`	`16`	`function test2() {`
`17`	`17`	`$a[[]] = $undef;`
`18`	`18`	`}`
	`19`	`+function test3() {`
	`20`	`+ foreach (range(0, $undef) as $v) { }`
	`21`	`+}`
`19`	`22`
`20`	`23`	`?>`
`21`	`24`	`===DONE===`