Refactor compilation of intersection type

Girgias · Girgias · commit 29637ecf1895 · 2021-04-02T02:03:28.000+01:00
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
@@ -6302,6 +6302,8 @@ static zend_type zend_compile_typename(
 		type_list = do_alloca(ZEND_TYPE_LIST_SIZE(list->children), use_heap);
 		type_list->num_types = 0;
 
+		ZEND_ASSERT(list->children > 1);
+
 		for (uint32_t i = 0; i < list->children; i++) {
 			zend_ast *type_ast = list->child[i];
 			zend_type single_type = zend_compile_single_typename(type_ast);
@@ -6320,42 +6322,30 @@ static zend_type zend_compile_typename(
 			}
 			zend_string_release_ex(standard_type_str, false);
 
-			if (!ZEND_TYPE_IS_COMPLEX(type)) {
-				/* The first class type can be stored directly as the type ptr payload. */
-				ZEND_TYPE_SET_PTR(type, ZEND_TYPE_NAME(single_type));
-				ZEND_TYPE_FULL_MASK(type) |= _ZEND_TYPE_NAME_BIT;
-			} else {
-				if (type_list->num_types == 0) {
-					/* Switch from single name to name list. */
-					type_list->num_types = 1;
-					type_list->types[0] = type;
-					ZEND_TYPE_FULL_MASK(type_list->types[0]) &= ~_ZEND_TYPE_MAY_BE_MASK;
-					ZEND_TYPE_SET_LIST(type, type_list);
-				}
-
-				type_list->types[type_list->num_types++] = single_type;
+			/* Add type to the type list */
+			type_list->types[type_list->num_types++] = single_type;
 
-				/* Check for trivially redundant class types */
-				for (size_t i = 0; i < type_list->num_types - 1; i++) {
-					if (zend_string_equals_ci(
-							ZEND_TYPE_NAME(type_list->types[i]), ZEND_TYPE_NAME(single_type))) {
-						zend_string *single_type_str = zend_type_to_string(single_type);
-						zend_error_noreturn(E_COMPILE_ERROR,
-							"Duplicate type %s is redundant", ZSTR_VAL(single_type_str));
-					}
+			/* Check for trivially redundant class types */
+			for (size_t i = 0; i < type_list->num_types - 1; i++) {
+				if (zend_string_equals_ci(
+					ZEND_TYPE_NAME(type_list->types[i]), ZEND_TYPE_NAME(single_type))) {
+					zend_string *single_type_str = zend_type_to_string(single_type);
+					zend_error_noreturn(E_COMPILE_ERROR,
+						"Duplicate type %s is redundant", ZSTR_VAL(single_type_str));
 				}
 			}
 		}
 
-		if (type_list->num_types) {
-			zend_type_list *list = zend_arena_alloc(
-				&CG(arena), ZEND_TYPE_LIST_SIZE(type_list->num_types));
-			memcpy(list, type_list, ZEND_TYPE_LIST_SIZE(type_list->num_types));
-			ZEND_TYPE_SET_LIST(type, list);
-			ZEND_TYPE_FULL_MASK(type) |= _ZEND_TYPE_ARENA_BIT;
-			/* Inform that the type list is an intersection type */
-			ZEND_TYPE_FULL_MASK(type) |= _ZEND_TYPE_INTERSECTION_BIT;
-		}
+		ZEND_ASSERT(type_list->num_types > 1);
+
+		/* TODO Can be arena allocated directly? */
+		zend_type_list *reduced_list = zend_arena_alloc(
+			&CG(arena), ZEND_TYPE_LIST_SIZE(type_list->num_types));
+		memcpy(reduced_list, type_list, ZEND_TYPE_LIST_SIZE(type_list->num_types));
+		ZEND_TYPE_SET_LIST(type, reduced_list);
+		ZEND_TYPE_FULL_MASK(type) |= _ZEND_TYPE_ARENA_BIT;
+		/* Inform that the type list is an intersection type */
+		ZEND_TYPE_FULL_MASK(type) |= _ZEND_TYPE_INTERSECTION_BIT;
 
 		free_alloca(type_list, use_heap);
 	} else {
