Rename last associated macro stuff to generic

Author: Girgias

Zend/zend_compile.c

@@ -1437,6 +1437,7 @@ static zend_string *add_intersection_type(zend_string *str,
 zend_string *zend_type_to_string_resolved(const zend_type type, zend_class_entry *scope) {
 	zend_string *str = NULL;
 
+	ZEND_ASSERT(!ZEND_TYPE_IS_GENERIC_PARAM_NAME(type) && "Generic type declarations do not exist yet");
 	/* Pure intersection type */
 	if (ZEND_TYPE_IS_INTERSECTION(type)) {
 		ZEND_ASSERT(!ZEND_TYPE_IS_UNION(type));
@@ -1457,8 +1458,6 @@ zend_string *zend_type_to_string_resolved(const zend_type type, zend_class_entry
 			str = add_type_string(str, resolved, /* is_intersection */ false);
 			zend_string_release(resolved);
 		} ZEND_TYPE_LIST_FOREACH_END();
-	} else if (ZEND_TYPE_IS_ASSOCIATED(type)) {
-		ZEND_ASSERT(false && "Generic type declarations do not exist yet");
 	} else if (ZEND_TYPE_HAS_NAME(type)) {
 		str = resolve_class_name(ZEND_TYPE_NAME(type), scope);
 	}
@@ -7220,7 +7219,7 @@ static zend_type zend_compile_typename_ex(
 			single_type = zend_compile_single_typename(type_ast);
 			uint32_t single_type_mask = ZEND_TYPE_PURE_MASK(single_type);
 
-			if (ZEND_TYPE_IS_ASSOCIATED(single_type)) {
+			if (ZEND_TYPE_IS_GENERIC_PARAM_NAME(single_type)) {
 				zend_error_noreturn(E_COMPILE_ERROR, "Generic type cannot be part of a union type");
 			}
 			if (single_type_mask == MAY_BE_ANY) {
@@ -7305,7 +7304,7 @@ static zend_type zend_compile_typename_ex(
 			zend_ast *type_ast = list->child[i];
 			zend_type single_type = zend_compile_single_typename(type_ast);
 
-			if (ZEND_TYPE_IS_ASSOCIATED(single_type)) {
+			if (ZEND_TYPE_IS_GENERIC_PARAM_NAME(single_type)) {
 				zend_error_noreturn(E_COMPILE_ERROR, "Generic type cannot be part of an intersection type");
 			}
 			/* An intersection of union types cannot exist so invalidate it
@@ -7374,10 +7373,10 @@ static zend_type zend_compile_typename_ex(
 	if ((type_mask & MAY_BE_NULL) && is_marked_nullable) {
 		zend_error_noreturn(E_COMPILE_ERROR, "null cannot be marked as nullable");
 	}
-	if (ZEND_TYPE_IS_ASSOCIATED(type) && is_marked_nullable) {
+	if (ZEND_TYPE_IS_GENERIC_PARAM_NAME(type) && is_marked_nullable) {
 		zend_error_noreturn(E_COMPILE_ERROR, "Generic type cannot be part of a union type");
 	}
-	if (ZEND_TYPE_IS_ASSOCIATED(type) && force_allow_null) {
+	if (ZEND_TYPE_IS_GENERIC_PARAM_NAME(type) && force_allow_null) {
 		zend_error_noreturn(E_COMPILE_ERROR, "Generic type cannot be part of a union type (implicitly nullable due to default null value)");
 	}
 
@@ -9173,7 +9172,7 @@ static void zend_compile_generic_params(zend_ast *params_ast)
 
 		if (param_ast->child[1]) {
 			constraint_type = zend_compile_typename(param_ast->child[1]);
-			if (ZEND_TYPE_IS_ASSOCIATED(constraint_type)) {
+			if (ZEND_TYPE_IS_GENERIC_PARAM_NAME(constraint_type)) {
 				zend_error_noreturn(E_COMPILE_ERROR,
 					"Cannot use generic parameter %s to constrain generic parameter %s",
 					ZSTR_VAL(ZEND_TYPE_NAME(constraint_type)), ZSTR_VAL(name));

Zend/zend_inheritance.c

@@ -723,12 +723,12 @@ ZEND_API inheritance_status zend_perform_covariant_type_check(
 	}
 
 	/* If we check for concrete return type */
-	if (ZEND_TYPE_IS_ASSOCIATED(proto_type)) {
+	if (ZEND_TYPE_IS_GENERIC_PARAM_NAME(proto_type)) {
 		return zend_is_type_subtype_of_generic_type(
 			fe_scope, fe_type_ptr, proto_scope, proto_type_ptr);
 	}
 	/* If we check for concrete parameter type */
-	if (ZEND_TYPE_IS_ASSOCIATED(fe_type)) {
+	if (ZEND_TYPE_IS_GENERIC_PARAM_NAME(fe_type)) {
 		return zend_is_type_subtype_of_generic_type(
 			proto_scope, proto_type_ptr, fe_scope, fe_type_ptr);
 	}
@@ -2248,7 +2248,7 @@ ZEND_ATTRIBUTE_NONNULL static void bind_generic_types_for_inherited_interfaces(z
 		);
 		ZEND_HASH_FOREACH_KEY_PTR(interface_bound_types_for_inherited_iface, generic_param_index, generic_param_name, bound_type_ptr) {
 			zend_type bound_type = *bound_type_ptr;
-			if (ZEND_TYPE_IS_ASSOCIATED(bound_type)) {
+			if (ZEND_TYPE_IS_GENERIC_PARAM_NAME(bound_type)) {
 				ZEND_ASSERT(ce_bound_types_for_direct_iface != NULL &&
 					"If a bound type is generic then we must have bound types for the current interface");
 				const zend_type *ce_bound_type_ptr = zend_hash_find_ptr(ce_bound_types_for_direct_iface, ZEND_TYPE_NAME(bound_type));
@@ -2347,7 +2347,7 @@ static void do_interface_implementation(zend_class_entry *ce, zend_class_entry *
 			ZEND_ASSERT(bound_type_ptr != NULL);
 
 			/* We are currently extending another interface */
-			if (ZEND_TYPE_IS_ASSOCIATED(*bound_type_ptr)) {
+			if (ZEND_TYPE_IS_GENERIC_PARAM_NAME(*bound_type_ptr)) {
 				ZEND_ASSERT(ce->ce_flags & ZEND_ACC_INTERFACE);
 				ZEND_ASSERT(ce->num_generic_parameters > 0);
 				ZEND_ASSERT(ZEND_TYPE_HAS_NAME(*bound_type_ptr));

Zend/zend_types.h

@@ -149,12 +149,12 @@ typedef struct {
 #define _ZEND_TYPE_EXTRA_FLAGS_SHIFT 26
 #define _ZEND_TYPE_MASK ((1u << 26) - 1)
 /* Only one of these bits may be set. */
-#define _ZEND_TYPE_ASSOCIATED_BIT (1u << 25)
+#define _ZEND_TYPE_GENERIC_PARAM_NAME_BIT (1u << 25)
 #define _ZEND_TYPE_NAME_BIT (1u << 24)
 // Used to signify that type.ptr is not a `zend_string*` but a `const char*`,
 #define _ZEND_TYPE_LITERAL_NAME_BIT (1u << 23)
 #define _ZEND_TYPE_LIST_BIT (1u << 22)
-#define _ZEND_TYPE_KIND_MASK (_ZEND_TYPE_LIST_BIT|_ZEND_TYPE_NAME_BIT|_ZEND_TYPE_LITERAL_NAME_BIT|_ZEND_TYPE_ASSOCIATED_BIT)
+#define _ZEND_TYPE_KIND_MASK (_ZEND_TYPE_LIST_BIT|_ZEND_TYPE_NAME_BIT|_ZEND_TYPE_LITERAL_NAME_BIT|_ZEND_TYPE_GENERIC_PARAM_NAME_BIT)
 /* For BC behaviour with iterable type */
 #define _ZEND_TYPE_ITERABLE_BIT (1u << 21)
 /* Whether the type list is arena allocated */
@@ -172,7 +172,7 @@ typedef struct {
 	(((t).type_mask & _ZEND_TYPE_MASK) != 0)
 
 /* If a type is complex it means it's either a list with a union or intersection,
- * the void pointer is a class name, or the type is an associated type (which implies it is a name) */
+ * the void pointer is a class name, or the type is a generic parameter name */
 #define ZEND_TYPE_IS_COMPLEX(t) \
 	((((t).type_mask) & _ZEND_TYPE_KIND_MASK) != 0)
 
@@ -185,8 +185,8 @@ typedef struct {
 #define ZEND_TYPE_HAS_LIST(t) \
 	((((t).type_mask) & _ZEND_TYPE_LIST_BIT) != 0)
 
-#define ZEND_TYPE_IS_ASSOCIATED(t) \
-	((((t).type_mask) & _ZEND_TYPE_ASSOCIATED_BIT) != 0)
+#define ZEND_TYPE_IS_GENERIC_PARAM_NAME(t) \
+	((((t).type_mask) & _ZEND_TYPE_GENERIC_PARAM_NAME_BIT) != 0)
 
 #define ZEND_TYPE_IS_ITERABLE_FALLBACK(t) \
 	((((t).type_mask) & _ZEND_TYPE_ITERABLE_BIT) != 0)