ext/standard/array.c: simplify DEFINE_SORT_VARIANTS macro

- Remove DEFINE_SORT_VARIANTS_USING macro layer
- Inline the implementation directly in DEFINE_SORT_VARIANTS
- Move enum helper functions after DEFINE_SORT_VARIANTS usage

Author: jmarble

ext/standard/array.c

@@ -110,94 +110,20 @@ static zend_never_inline ZEND_COLD int stable_sort_fallback(Bucket *a, Bucket *b
 static int php_array_compare_transitive(zval *op1, zval *op2);
 
 /* Generate inlined unstable and stable variants, and non-inlined reversed variants. */
-#define DEFINE_SORT_VARIANTS_USING(name, impl) \
+#define DEFINE_SORT_VARIANTS(name) \
 	static zend_never_inline int php_array_##name##_unstable(Bucket *a, Bucket *b) { \
-		return (impl)(a, b); \
+		return php_array_##name##_unstable_i(a, b); \
 	} \
 	static zend_never_inline int php_array_##name(Bucket *a, Bucket *b) { \
-		RETURN_STABLE_SORT(a, b, (impl)(a, b)); \
+		RETURN_STABLE_SORT(a, b, php_array_##name##_unstable_i(a, b)); \
 	} \
 	static zend_never_inline int php_array_reverse_##name##_unstable(Bucket *a, Bucket *b) { \
 		return php_array_##name##_unstable(a, b) * -1; \
 	} \
 	static zend_never_inline int php_array_reverse_##name(Bucket *a, Bucket *b) { \
 		RETURN_STABLE_SORT(a, b, php_array_reverse_##name##_unstable(a, b)); \
-	} \
-
-#define DEFINE_SORT_VARIANTS(name) \
-	DEFINE_SORT_VARIANTS_USING(name, php_array_##name##_unstable_i)
-
-static zend_always_inline bool php_array_is_enum_zval(zval *zv)
-{
-	return Z_TYPE_P(zv) == IS_OBJECT && (Z_OBJCE_P(zv)->ce_flags & ZEND_ACC_ENUM);
-}
-
-static zend_always_inline int php_array_compare_enum_zvals(zval *lhs, zval *rhs)
-{
-	const bool lhs_enum = php_array_is_enum_zval(lhs);
-	const bool rhs_enum = php_array_is_enum_zval(rhs);
-
-	if (lhs_enum && rhs_enum) {
-		zend_object *lhs_obj = Z_OBJ_P(lhs);
-		zend_object *rhs_obj = Z_OBJ_P(rhs);
-
-		if (lhs_obj == rhs_obj) {
-			return 0;
-		}
-
-		if (lhs_obj->ce != rhs_obj->ce) {
-			return zend_compare_non_numeric_strings(lhs_obj->ce->name, rhs_obj->ce->name);
-		}
-
-		if (lhs_obj->ce->enum_backing_type != IS_UNDEF) {
-			zval *lhs_value = zend_enum_fetch_case_value(lhs_obj);
-			zval *rhs_value = zend_enum_fetch_case_value(rhs_obj);
-
-			if (lhs_obj->ce->enum_backing_type == IS_LONG) {
-				zend_long lhs_long = Z_LVAL_P(lhs_value);
-				zend_long rhs_long = Z_LVAL_P(rhs_value);
-				if (lhs_long != rhs_long) {
-					return lhs_long < rhs_long ? -1 : 1;
-				}
-			} else {
-				ZEND_ASSERT(lhs_obj->ce->enum_backing_type == IS_STRING);
-				zend_string *lhs_str = Z_STR_P(lhs_value);
-				zend_string *rhs_str = Z_STR_P(rhs_value);
-				if (lhs_str != rhs_str) {
-					zend_ulong lhs_hash = ZSTR_HASH(lhs_str);
-					zend_ulong rhs_hash = ZSTR_HASH(rhs_str);
-					if (lhs_hash != rhs_hash) {
-						return lhs_hash < rhs_hash ? -1 : 1;
-					}
-					int cmp = zend_compare_non_numeric_strings(lhs_str, rhs_str);
-					if (cmp != 0) {
-						return cmp;
-					}
-				}
-			}
-		}
-
-		zend_string *lhs_case = Z_STR_P(zend_enum_fetch_case_name(lhs_obj));
-		zend_string *rhs_case = Z_STR_P(zend_enum_fetch_case_name(rhs_obj));
-		if (lhs_case != rhs_case) {
-			zend_ulong lhs_hash = ZSTR_HASH(lhs_case);
-			zend_ulong rhs_hash = ZSTR_HASH(rhs_case);
-			if (lhs_hash != rhs_hash) {
-				return lhs_hash < rhs_hash ? -1 : 1;
-			}
-			int cmp = zend_compare_non_numeric_strings(lhs_case, rhs_case);
-			if (cmp != 0) {
-				return cmp;
-			}
-		}
-
-		/* Should not happen for userland enums, but keep ordering deterministic for transitivity. */
-		return lhs_obj->handle < rhs_obj->handle ? -1 : 1;
 	}
 
-	return lhs_enum ? 1 : -1;
-}
-
 static zend_always_inline int php_array_key_compare_numeric_unstable_i(Bucket *f, Bucket *s) /* {{{ */
 {
 	if (f->key == NULL && s->key == NULL) {
@@ -399,6 +325,77 @@ DEFINE_SORT_VARIANTS(data_compare_string_locale);
 DEFINE_SORT_VARIANTS(natural_compare);
 DEFINE_SORT_VARIANTS(natural_case_compare);
 
+static zend_always_inline bool php_array_is_enum_zval(zval *zv)
+{
+	return Z_TYPE_P(zv) == IS_OBJECT && (Z_OBJCE_P(zv)->ce_flags & ZEND_ACC_ENUM);
+}
+
+static zend_always_inline int php_array_compare_enum_zvals(zval *lhs, zval *rhs)
+{
+	const bool lhs_enum = php_array_is_enum_zval(lhs);
+	const bool rhs_enum = php_array_is_enum_zval(rhs);
+
+	if (lhs_enum && rhs_enum) {
+		zend_object *lhs_obj = Z_OBJ_P(lhs);
+		zend_object *rhs_obj = Z_OBJ_P(rhs);
+
+		if (lhs_obj == rhs_obj) {
+			return 0;
+		}
+
+		if (lhs_obj->ce != rhs_obj->ce) {
+			return zend_compare_non_numeric_strings(lhs_obj->ce->name, rhs_obj->ce->name);
+		}
+
+		if (lhs_obj->ce->enum_backing_type != IS_UNDEF) {
+			zval *lhs_value = zend_enum_fetch_case_value(lhs_obj);
+			zval *rhs_value = zend_enum_fetch_case_value(rhs_obj);
+
+			if (lhs_obj->ce->enum_backing_type == IS_LONG) {
+				zend_long lhs_long = Z_LVAL_P(lhs_value);
+				zend_long rhs_long = Z_LVAL_P(rhs_value);
+				if (lhs_long != rhs_long) {
+					return lhs_long < rhs_long ? -1 : 1;
+				}
+			} else {
+				ZEND_ASSERT(lhs_obj->ce->enum_backing_type == IS_STRING);
+				zend_string *lhs_str = Z_STR_P(lhs_value);
+				zend_string *rhs_str = Z_STR_P(rhs_value);
+				if (lhs_str != rhs_str) {
+					zend_ulong lhs_hash = ZSTR_HASH(lhs_str);
+					zend_ulong rhs_hash = ZSTR_HASH(rhs_str);
+					if (lhs_hash != rhs_hash) {
+						return lhs_hash < rhs_hash ? -1 : 1;
+					}
+					int cmp = zend_compare_non_numeric_strings(lhs_str, rhs_str);
+					if (cmp != 0) {
+						return cmp;
+					}
+				}
+			}
+		}
+
+		zend_string *lhs_case = Z_STR_P(zend_enum_fetch_case_name(lhs_obj));
+		zend_string *rhs_case = Z_STR_P(zend_enum_fetch_case_name(rhs_obj));
+		if (lhs_case != rhs_case) {
+			zend_ulong lhs_hash = ZSTR_HASH(lhs_case);
+			zend_ulong rhs_hash = ZSTR_HASH(rhs_case);
+			if (lhs_hash != rhs_hash) {
+				return lhs_hash < rhs_hash ? -1 : 1;
+			}
+			int cmp = zend_compare_non_numeric_strings(lhs_case, rhs_case);
+			if (cmp != 0) {
+				return cmp;
+			}
+		}
+
+		/* Should not happen for userland enums, but keep ordering deterministic for transitivity. */
+		return lhs_obj->handle < rhs_obj->handle ? -1 : 1;
+	}
+
+	return lhs_enum ? 1 : -1;
+}
+
 static int php_array_hash_compare_transitive(zval *zv1, zval *zv2) /* {{{ */
 {
 	return php_array_compare_transitive(zv1, zv2);