Move min/max array fallback into array.c

Author: mehmetcansahin

UPGRADING.INTERNALS

@@ -35,6 +35,8 @@ PHP 8.6 INTERNALS UPGRADE NOTES
   . The zval_dtor() alias of zval_ptr_dtor_nogc() has been removed.
     Call zval_ptr_dtor_nogc() directly instead.
   . The internal zend_copy_parameters_array() function is no longer exposed.
+  . The internal zend_hash_minmax() function is no longer exposed. Scan the
+    HashTable directly and use zend_compare() for value comparisons instead.
   . The zend_make_callable() function has been removed, if a callable zval
     needs to be obtained use the zend_get_callable_zval_from_fcc() function
     instead. If this was used to store a callable, then an FCC should be

Zend/zend_hash.c

@@ -3238,73 +3238,6 @@ ZEND_API int zend_hash_compare(HashTable *ht1, const HashTable *ht2, compare_fun
 }
 
 
-ZEND_API zval* ZEND_FASTCALL zend_hash_minmax(const HashTable *ht, compare_func_t compar, uint32_t flag)
-{
-	uint32_t idx;
-	zval *res;
-
-	IS_CONSISTENT(ht);
-
-	if (ht->nNumOfElements == 0 ) {
-		return NULL;
-	}
-
-	if (HT_IS_PACKED(ht)) {
-		zval *zv;
-
-		idx = 0;
-		while (1) {
-			if (idx == ht->nNumUsed) {
-				return NULL;
-			}
-			if (Z_TYPE(ht->arPacked[idx]) != IS_UNDEF) break;
-			idx++;
-		}
-		res = ht->arPacked + idx;
-		for (; idx < ht->nNumUsed; idx++) {
-			zv = ht->arPacked + idx;
-			if (UNEXPECTED(Z_TYPE_P(zv) == IS_UNDEF)) continue;
-
-			if (flag) {
-				if (compar(res, zv) < 0) { /* max */
-					res = zv;
-				}
-			} else {
-				if (compar(res, zv) > 0) { /* min */
-					res = zv;
-				}
-			}
-		}
-	} else {
-		Bucket *p;
-
-		idx = 0;
-		while (1) {
-			if (idx == ht->nNumUsed) {
-				return NULL;
-			}
-			if (Z_TYPE(ht->arData[idx].val) != IS_UNDEF) break;
-			idx++;
-		}
-		res = &ht->arData[idx].val;
-		for (; idx < ht->nNumUsed; idx++) {
-			p = ht->arData + idx;
-			if (UNEXPECTED(Z_TYPE(p->val) == IS_UNDEF)) continue;
-
-			if (flag) {
-				if (compar(res, &p->val) < 0) { /* max */
-					res = &p->val;
-				}
-			} else {
-				if (compar(res, &p->val) > 0) { /* min */
-					res = &p->val;
-				}
-			}
-		}
-	}
-	return res;
-}
-
 ZEND_API bool ZEND_FASTCALL _zend_handle_numeric_str_ex(const char *key, size_t length, zend_ulong *idx)
 {
 	const char *tmp = key;

Zend/zend_hash.h

@@ -303,8 +303,6 @@ typedef int (*bucket_compare_func_t)(Bucket *a, Bucket *b);
 ZEND_API int   zend_hash_compare(HashTable *ht1, const HashTable *ht2, compare_func_t compar, bool ordered);
 ZEND_API void  ZEND_FASTCALL zend_hash_sort_ex(HashTable *ht, sort_func_t sort_func, bucket_compare_func_t compare_func, bool renumber);
 ZEND_API void  ZEND_FASTCALL zend_array_sort_ex(HashTable *ht, sort_func_t sort_func, bucket_compare_func_t compare_func, bool renumber);
-ZEND_API zval* ZEND_FASTCALL zend_hash_minmax(const HashTable *ht, compare_func_t compar, uint32_t flag);
-
 static zend_always_inline void ZEND_FASTCALL zend_hash_sort(HashTable *ht, bucket_compare_func_t compare_func, bool renumber) {
 	zend_hash_sort_ex(ht, zend_sort, compare_func, renumber);
 }

ext/standard/array.c

@@ -1089,9 +1089,77 @@ PHP_FUNCTION(key)
 }
 /* }}} */
 
-static int php_data_compare(const void *f, const void *s) /* {{{ */
+static zval *php_array_data_minmax(const HashTable *array, bool max) /* {{{ */
 {
-	return zend_compare((zval*)f, (zval*)s);
+	uint32_t idx;
+	zval *res;
+
+	if (array->nNumOfElements == 0) {
+		return NULL;
+	}
+
+	if (HT_IS_PACKED(array)) {
+		zval *zv;
+
+		idx = 0;
+		while (1) {
+			if (idx == array->nNumUsed) {
+				return NULL;
+			}
+			if (Z_TYPE(array->arPacked[idx]) != IS_UNDEF) {
+				break;
+			}
+			idx++;
+		}
+		res = array->arPacked + idx;
+		for (; idx < array->nNumUsed; idx++) {
+			zv = array->arPacked + idx;
+			if (UNEXPECTED(Z_TYPE_P(zv) == IS_UNDEF)) {
+				continue;
+			}
+
+			if (max) {
+				if (zend_compare(res, zv) < 0) {
+					res = zv;
+				}
+			} else {
+				if (zend_compare(res, zv) > 0) {
+					res = zv;
+				}
+			}
+		}
+	} else {
+		Bucket *p;
+
+		idx = 0;
+		while (1) {
+			if (idx == array->nNumUsed) {
+				return NULL;
+			}
+			if (Z_TYPE(array->arData[idx].val) != IS_UNDEF) {
+				break;
+			}
+			idx++;
+		}
+		res = &array->arData[idx].val;
+		for (; idx < array->nNumUsed; idx++) {
+			p = array->arData + idx;
+			if (UNEXPECTED(Z_TYPE(p->val) == IS_UNDEF)) {
+				continue;
+			}
+
+			if (max) {
+				if (zend_compare(res, &p->val) < 0) {
+					res = &p->val;
+				}
+			} else {
+				if (zend_compare(res, &p->val) > 0) {
+					res = &p->val;
+				}
+			}
+		}
+	}
+	return res;
 }
 /* }}} */
 
@@ -1101,7 +1169,7 @@ static zend_always_inline bool php_array_minmax(HashTable *array, zval *return_v
 	zend_long result_lval = 0;
 	double result_dval = 0.0;
 	/* IS_LONG or IS_DOUBLE while every value scanned so far has that exact type,
-	 * IS_UNDEF once a value forces the generic php_data_compare() fallback. */
+	 * IS_UNDEF once a value forces the generic zend_compare() fallback. */
 	uint8_t fast_type = IS_UNDEF;
 
 	ZEND_HASH_FOREACH_VAL(array, entry) {
@@ -1148,7 +1216,7 @@ static zend_always_inline bool php_array_minmax(HashTable *array, zval *return_v
 
 		fast_type = IS_UNDEF;
 
-		int cmp = php_data_compare(result, value);
+		int cmp = zend_compare(result, value);
 		if (max ? cmp < 0 : cmp > 0) {
 			result = value;
 		}
@@ -1193,7 +1261,7 @@ PHP_FUNCTION(min)
 				return;
 			}
 
-			zval *result = zend_hash_minmax(array, php_data_compare, 0);
+			zval *result = php_array_data_minmax(array, false);
 			if (result) {
 				RETURN_COPY_DEREF(result);
 			} else {
@@ -1326,7 +1394,7 @@ PHP_FUNCTION(max)
 				return;
 			}
 
-			zval *result = zend_hash_minmax(array, php_data_compare, 1);
+			zval *result = php_array_data_minmax(array, true);
 			if (result) {
 				RETURN_COPY_DEREF(result);
 			} else {