Merge branch 'PHP-8.2' into PHP-8.3

nielsdos · nielsdos · commit 04a2a42f2a6b · 2023-09-30T01:27:29.000+02:00
* PHP-8.2: Revert "Fix GH-10008: Narrowing occurred during type inference of ZEND_ADD_ARRAY_ELEMENT"
diff --git a/NEWS b/NEWS
@@ -2,10 +2,6 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? ????, PHP 8.3.0RC4
 
-- Core:
-  . Fixed bug GH-10008 (Narrowing occurred during type inference of
-    ZEND_ADD_ARRAY_ELEMENT). (nielsdos, arnaud-lb)
-
 - CType:
   . Fixed bug GH-11997 (ctype_alnum 5 times slower in PHP 8.1 or greater).
     (nielsdos)
diff --git a/Zend/Optimizer/zend_inference.c b/Zend/Optimizer/zend_inference.c
@@ -1942,21 +1942,6 @@ ZEND_API uint32_t zend_array_element_type(uint32_t t1, uint8_t op_type, int writ
 	return tmp;
 }
 
-static zend_always_inline uint32_t assign_long_dim_array_result_type(uint32_t arr_type)
-{
-	/* Rules:
-	 * HASH_ONLY      -> MAY_BE_ARRAY_NUMERIC_HASH
-	 * PACKED_ONLY    -> MAY_BE_ARRAY_NUMERIC_HASH | MAY_BE_ARRAY_PACKED (== MAY_BE_ARRAY_KEY_LONG)
-	 * HASH || PACKED -> MAY_BE_ARRAY_NUMERIC_HASH | MAY_BE_ARRAY_PACKED (== MAY_BE_ARRAY_KEY_LONG)
-	 * 0              -> MAY_BE_ARRAY_NUMERIC_HASH
-	 */
-	if (MAY_BE_PACKED(arr_type)) {
-		return MAY_BE_ARRAY_KEY_LONG;
-	} else {
-		return MAY_BE_ARRAY_NUMERIC_HASH;
-	}
-}
-
 static uint32_t assign_dim_array_result_type(
 		uint32_t arr_type, uint32_t dim_type, uint32_t value_type, uint8_t dim_op_type) {
 	uint32_t tmp = 0;
@@ -1970,13 +1955,13 @@ static uint32_t assign_dim_array_result_type(
 			if (arr_type & (MAY_BE_UNDEF|MAY_BE_NULL|MAY_BE_FALSE)) {
 				tmp |= MAY_BE_ARRAY_PACKED;
 			}
-			tmp |= assign_long_dim_array_result_type(arr_type);
+			tmp |= MAY_BE_HASH_ONLY(arr_type) ? MAY_BE_ARRAY_NUMERIC_HASH : MAY_BE_ARRAY_KEY_LONG;
 		} else {
 			if (dim_type & (MAY_BE_LONG|MAY_BE_FALSE|MAY_BE_TRUE|MAY_BE_RESOURCE|MAY_BE_DOUBLE)) {
 				if (arr_type & (MAY_BE_UNDEF|MAY_BE_NULL|MAY_BE_FALSE)) {
 					tmp |= MAY_BE_ARRAY_PACKED;
 				}
-				tmp |= assign_long_dim_array_result_type(arr_type);
+				tmp |= MAY_BE_HASH_ONLY(arr_type) ? MAY_BE_ARRAY_NUMERIC_HASH : MAY_BE_ARRAY_KEY_LONG;
 			}
 			if (dim_type & MAY_BE_STRING) {
 				tmp |= MAY_BE_ARRAY_KEY_STRING;
@@ -1985,7 +1970,7 @@ static uint32_t assign_dim_array_result_type(
 					if (arr_type & (MAY_BE_UNDEF|MAY_BE_NULL|MAY_BE_FALSE)) {
 						tmp |= MAY_BE_ARRAY_PACKED;
 					}
-					tmp |= assign_long_dim_array_result_type(arr_type);
+					tmp |= MAY_BE_HASH_ONLY(arr_type) ? MAY_BE_ARRAY_NUMERIC_HASH : MAY_BE_ARRAY_KEY_LONG;
 				}
 			}
 			if (dim_type & (MAY_BE_UNDEF|MAY_BE_NULL)) {
@@ -3305,15 +3290,17 @@ static zend_always_inline zend_result _zend_update_type_info(
 							key_type |= MAY_BE_ARRAY_PACKED;
 						}
 						if (t1 & MAY_BE_ARRAY) {
-							key_type |= assign_long_dim_array_result_type(t1);
+							key_type |= MAY_BE_HASH_ONLY(t1) ?
+								MAY_BE_ARRAY_NUMERIC_HASH : MAY_BE_ARRAY_KEY_LONG;
 						}
 					} else {
 						if (t2 & (MAY_BE_LONG|MAY_BE_FALSE|MAY_BE_TRUE|MAY_BE_RESOURCE|MAY_BE_DOUBLE)) {
 							if (t1 & (MAY_BE_UNDEF|MAY_BE_NULL|MAY_BE_FALSE)) {
 								key_type |= MAY_BE_ARRAY_PACKED;
 							}
 							if (t1 & MAY_BE_ARRAY) {
-								key_type |= assign_long_dim_array_result_type(t1);
+								key_type |= MAY_BE_HASH_ONLY(t1) ?
+									MAY_BE_ARRAY_NUMERIC_HASH : MAY_BE_ARRAY_KEY_LONG;
 						    }
 						}
 						if (t2 & MAY_BE_STRING) {
@@ -3324,7 +3311,8 @@ static zend_always_inline zend_result _zend_update_type_info(
 									key_type |= MAY_BE_ARRAY_PACKED;
 								}
 								if (t1 & MAY_BE_ARRAY) {
-									key_type |= assign_long_dim_array_result_type(t1);
+									key_type |= MAY_BE_HASH_ONLY(t1) ?
+										MAY_BE_ARRAY_NUMERIC_HASH : MAY_BE_ARRAY_KEY_LONG;
 							    }
 							}
 						}
diff --git a/ext/opcache/tests/opt/gh10008.phpt b/ext/opcache/tests/opt/gh10008.phpt

Original file line number	Diff line number	Diff line change
`@@ -1942,21 +1942,6 @@ ZEND_API uint32_t zend_array_element_type(uint32_t t1, uint8_t op_type, int writ`
`1942`	`1942`	`return tmp;`
`1943`	`1943`	`}`
`1944`	`1944`
`1945`		`-static zend_always_inline uint32_t assign_long_dim_array_result_type(uint32_t arr_type)`
`1946`		`-{`
`1947`		`- /* Rules:`
`1948`		`- * HASH_ONLY -> MAY_BE_ARRAY_NUMERIC_HASH`
`1949`		`- * PACKED_ONLY -> MAY_BE_ARRAY_NUMERIC_HASH \| MAY_BE_ARRAY_PACKED (== MAY_BE_ARRAY_KEY_LONG)`
`1950`		`- * HASH \|\| PACKED -> MAY_BE_ARRAY_NUMERIC_HASH \| MAY_BE_ARRAY_PACKED (== MAY_BE_ARRAY_KEY_LONG)`
`1951`		`- * 0 -> MAY_BE_ARRAY_NUMERIC_HASH`
`1952`		`- */`
`1953`		`- if (MAY_BE_PACKED(arr_type)) {`
`1954`		`- return MAY_BE_ARRAY_KEY_LONG;`
`1955`		`- } else {`
`1956`		`- return MAY_BE_ARRAY_NUMERIC_HASH;`
`1957`		`- }`
`1958`		`-}`
`1959`		`-`
`1960`	`1945`	`static uint32_t assign_dim_array_result_type(`
`1961`	`1946`	`uint32_t arr_type, uint32_t dim_type, uint32_t value_type, uint8_t dim_op_type) {`
`1962`	`1947`	`uint32_t tmp = 0;`
`@@ -1970,13 +1955,13 @@ static uint32_t assign_dim_array_result_type(`
`1970`	`1955`	`if (arr_type & (MAY_BE_UNDEF\|MAY_BE_NULL\|MAY_BE_FALSE)) {`
`1971`	`1956`	`tmp \|= MAY_BE_ARRAY_PACKED;`
`1972`	`1957`	`}`
`1973`		`- tmp \|= assign_long_dim_array_result_type(arr_type);`
	`1958`	`+ tmp \|= MAY_BE_HASH_ONLY(arr_type) ? MAY_BE_ARRAY_NUMERIC_HASH : MAY_BE_ARRAY_KEY_LONG;`
`1974`	`1959`	`} else {`
`1975`	`1960`	`if (dim_type & (MAY_BE_LONG\|MAY_BE_FALSE\|MAY_BE_TRUE\|MAY_BE_RESOURCE\|MAY_BE_DOUBLE)) {`
`1976`	`1961`	`if (arr_type & (MAY_BE_UNDEF\|MAY_BE_NULL\|MAY_BE_FALSE)) {`
`1977`	`1962`	`tmp \|= MAY_BE_ARRAY_PACKED;`
`1978`	`1963`	`}`
`1979`		`- tmp \|= assign_long_dim_array_result_type(arr_type);`
	`1964`	`+ tmp \|= MAY_BE_HASH_ONLY(arr_type) ? MAY_BE_ARRAY_NUMERIC_HASH : MAY_BE_ARRAY_KEY_LONG;`
`1980`	`1965`	`}`
`1981`	`1966`	`if (dim_type & MAY_BE_STRING) {`
`1982`	`1967`	`tmp \|= MAY_BE_ARRAY_KEY_STRING;`
`@@ -1985,7 +1970,7 @@ static uint32_t assign_dim_array_result_type(`
`1985`	`1970`	`if (arr_type & (MAY_BE_UNDEF\|MAY_BE_NULL\|MAY_BE_FALSE)) {`
`1986`	`1971`	`tmp \|= MAY_BE_ARRAY_PACKED;`
`1987`	`1972`	`}`
`1988`		`- tmp \|= assign_long_dim_array_result_type(arr_type);`
	`1973`	`+ tmp \|= MAY_BE_HASH_ONLY(arr_type) ? MAY_BE_ARRAY_NUMERIC_HASH : MAY_BE_ARRAY_KEY_LONG;`
`1989`	`1974`	`}`
`1990`	`1975`	`}`
`1991`	`1976`	`if (dim_type & (MAY_BE_UNDEF\|MAY_BE_NULL)) {`
`@@ -3305,15 +3290,17 @@ static zend_always_inline zend_result _zend_update_type_info(`
`3305`	`3290`	`key_type \|= MAY_BE_ARRAY_PACKED;`
`3306`	`3291`	`}`
`3307`	`3292`	`if (t1 & MAY_BE_ARRAY) {`
`3308`		`- key_type \|= assign_long_dim_array_result_type(t1);`
	`3293`	`+ key_type \|= MAY_BE_HASH_ONLY(t1) ?`
	`3294`	`+ MAY_BE_ARRAY_NUMERIC_HASH : MAY_BE_ARRAY_KEY_LONG;`
`3309`	`3295`	`}`
`3310`	`3296`	`} else {`
`3311`	`3297`	`if (t2 & (MAY_BE_LONG\|MAY_BE_FALSE\|MAY_BE_TRUE\|MAY_BE_RESOURCE\|MAY_BE_DOUBLE)) {`
`3312`	`3298`	`if (t1 & (MAY_BE_UNDEF\|MAY_BE_NULL\|MAY_BE_FALSE)) {`
`3313`	`3299`	`key_type \|= MAY_BE_ARRAY_PACKED;`
`3314`	`3300`	`}`
`3315`	`3301`	`if (t1 & MAY_BE_ARRAY) {`
`3316`		`- key_type \|= assign_long_dim_array_result_type(t1);`
	`3302`	`+ key_type \|= MAY_BE_HASH_ONLY(t1) ?`
	`3303`	`+ MAY_BE_ARRAY_NUMERIC_HASH : MAY_BE_ARRAY_KEY_LONG;`
`3317`	`3304`	`}`
`3318`	`3305`	`}`
`3319`	`3306`	`if (t2 & MAY_BE_STRING) {`
`@@ -3324,7 +3311,8 @@ static zend_always_inline zend_result _zend_update_type_info(`
`3324`	`3311`	`key_type \|= MAY_BE_ARRAY_PACKED;`
`3325`	`3312`	`}`
`3326`	`3313`	`if (t1 & MAY_BE_ARRAY) {`
`3327`		`- key_type \|= assign_long_dim_array_result_type(t1);`
	`3314`	`+ key_type \|= MAY_BE_HASH_ONLY(t1) ?`
	`3315`	`+ MAY_BE_ARRAY_NUMERIC_HASH : MAY_BE_ARRAY_KEY_LONG;`
`3328`	`3316`	`}`
`3329`	`3317`	`}`
`3330`	`3318`	`}`