Use zend_strings instead of HT

Author: Girgias

Zend/tests/type_declarations/associated/multiple_associated_type.phpt

@@ -0,0 +1,20 @@
+--TEST--
+Multiple associated types
+--FILE--
+<?php
+
+interface I {
+    type K;
+    type V;
+    public function set(K $key, V $value): void;
+    public function get(K $key): V;
+}
+
+class C implements I {
+    public function set(int $key, string $value): void {}
+    public function get(int $key): string {}
+}
+
+?>
+--EXPECTF--
+Fatal error: Declaration of C::set(int $key, string $value): void must be compatible with I::set(K $key, V $value): void in %s on line %d

Zend/zend.h

@@ -219,7 +219,8 @@ struct _zend_class_entry {
 	HashTable *attributes;
 
 	/* Only for interfaces */
-	HashTable *associated_types;
+	zend_string **associated_types;
+	uint32_t num_associated_types;
 
 	uint32_t enum_backing_type;
 	HashTable *backed_enum_table;

Zend/zend_compile.c

@@ -2073,6 +2073,7 @@ ZEND_API void zend_initialize_class_data(zend_class_entry *ce, bool nullify_hand
 	ce->properties_info_table = NULL;
 	ce->attributes = NULL;
 	ce->associated_types = NULL;
+	ce->num_associated_types = 0;
 	ce->enum_backing_type = IS_UNDEF;
 	ce->backed_enum_table = NULL;
 
@@ -7005,8 +7006,14 @@ static zend_type zend_compile_single_typename(zend_ast *ast)
 			if (fetch_type == ZEND_FETCH_CLASS_DEFAULT) {
 				class_name = zend_resolve_class_name_ast(ast);
 				zend_assert_valid_class_name(class_name, "a type name");
-				if (ce && ce->associated_types && zend_hash_exists(ce->associated_types, class_name)) {
-					flags = _ZEND_TYPE_ASSOCIATED_BIT;
+				if (ce && ce->associated_types) {
+					for (uint32_t i = 0; i < ce->num_associated_types; i++) {
+						const zend_string *cur = ce->associated_types[i];
+						if (zend_string_equals(class_name, cur)) {
+							flags = _ZEND_TYPE_ASSOCIATED_BIT;
+							break;
+						}
+					}
 				}
 			} else {
 				ZEND_ASSERT(fetch_type == ZEND_FETCH_CLASS_SELF || fetch_type == ZEND_FETCH_CLASS_PARENT);
@@ -9035,9 +9042,9 @@ static void zend_compile_use_trait(zend_ast *ast) /* {{{ */
 
 
 
-static void zend_compile_associated_type(zend_ast *ast) {
+static void zend_compile_associated_type(const zend_ast *ast) {
 	zend_class_entry *ce = CG(active_class_entry);
-	HashTable *associated_types = ce->associated_types;
+	zend_string **associated_types = ce->associated_types;
 	zend_ast *name_ast = ast->child[0];
 	zend_string *name = zend_ast_get_str(name_ast);
 
@@ -9047,19 +9054,26 @@ static void zend_compile_associated_type(zend_ast *ast) {
 	}
 
 	ZEND_ASSERT(name != NULL);
-	bool persistent = false; // TODO I need to figure this out
+	// TODO This is very jank
+	const bool persistent = ce->type == ZEND_INTERNAL_CLASS;
 	if (associated_types == NULL) {
-		ce->associated_types = pemalloc(sizeof(HashTable), persistent);
-		zend_hash_init(ce->associated_types, 8, NULL, NULL, persistent);
-		associated_types = ce->associated_types;
+		ce->associated_types = pemalloc(sizeof(zend_string*), persistent);
+		ce->associated_types[0] = zend_string_copy(name);
+		ce->num_associated_types = 1;
+		return;
 	}
-	if (zend_hash_exists(associated_types, name)) {
-		zend_error_noreturn(E_COMPILE_ERROR,
-			"Cannot have two associated types with the same name \"%s\"", ZSTR_VAL(name));
+	for (uint32_t i = 0; i < ce->num_associated_types; i++) {
+		const zend_string *cur = ce->associated_types[i];
+		if (zend_string_equals(name, cur)) {
+			zend_error_noreturn(E_COMPILE_ERROR,
+				"Cannot have two associated types with the same name \"%s\"", ZSTR_VAL(name));
+			return;
+		}
 	}
-	zval tmp;
-	ZVAL_UNDEF(&tmp);
-	zend_hash_add_new(associated_types, name, &tmp);
+	uint32_t new_size = ce->num_associated_types + 1;
+	ce->associated_types = perealloc(ce->associated_types, new_size * sizeof(zend_string*), persistent);
+	ce->associated_types[ce->num_associated_types] = zend_string_copy(name);
+	ce->num_associated_types = new_size;
 }
 
 static void zend_compile_implements(zend_ast *ast) /* {{{ */

Zend/zend_inheritance.c

@@ -708,7 +708,7 @@ ZEND_API inheritance_status zend_perform_covariant_type_check(
 
 	if (ZEND_TYPE_IS_ASSOCIATED(proto_type)) {
 		return zend_is_type_subtype_of_associated_type(
-			fe_scope, fe_type_ptr, proto_type_ptr, proto_scope->associated_types);
+			fe_scope, fe_type_ptr, proto_type_ptr, NULL);
 	}
 
 	/* Builtin types may be removed, but not added */

Zend/zend_opcode.c

@@ -352,7 +352,10 @@ ZEND_API void destroy_zend_class(zval *zv)
 				}
 
 				if (ce->associated_types) {
-					zend_hash_release(ce->associated_types);
+					for (uint32_t i = 0; i < ce->num_associated_types; i++) {
+						zend_string_release(ce->associated_types[i]);
+					}
+					efree(ce->associated_types);
 				}
 
 				if (ce->num_interfaces > 0 && !(ce->ce_flags & ZEND_ACC_RESOLVED_INTERFACES)) {
@@ -531,9 +534,13 @@ ZEND_API void destroy_zend_class(zval *zv)
 			if (ce->attributes) {
 				zend_hash_release(ce->attributes);
 			}
-			if (ce->associated_types) {
-				zend_hash_release(ce->associated_types);
+
+		if (ce->associated_types) {
+			for (uint32_t i = 0; i < ce->num_associated_types; i++) {
+				zend_string_release(ce->associated_types[i]);
 			}
+			pefree(ce->associated_types, true);
+		}
 			free(ce);
 			break;
 	}