fix stuff

Author: Girgias

Zend/tests/type_declarations/abstract_generics/extended_interface_abstract_generic_types.phpt renamed to Zend/tests/type_declarations/abstract_generics/constraints/extended_interface_abstract_generic_types.phpt

@@ -3,11 +3,11 @@ Abstract generic type behaviour in extended interface
 --FILE--
 <?php
 
-interface IWG<T1> {
+interface I<T1> {
     public function foo(T1 $param): T1;
 }
 
-interface I2<T2> extends IWG<T2> {
+interface I2<T2> extends I<T2> {
     public function bar(int $o, T2 $param): T2;
 }
 

Zend/tests/type_declarations/abstract_generics/extended_interface_abstract_generic_types_basic.phpt

@@ -732,7 +732,6 @@ static void compiler_globals_ctor(zend_compiler_globals *compiler_globals) /* {{
 
 	compiler_globals->script_encoding_list = NULL;
 	compiler_globals->current_linking_class = NULL;
-	compiler_globals->bound_associated_types = NULL;
 
 	/* Map region is going to be created and resized at run-time. */
 	compiler_globals->map_ptr_real_base = NULL;

Zend/zend.c

@@ -218,7 +218,8 @@ struct _zend_class_entry {
 	zend_trait_precedence **trait_precedences;
 	HashTable *attributes;
 
-	/* Only for interfaces */
+	/* The bound_types HashTable is a map: "lower_case_interface_names" => map<int|string, zend_type>
+	 * Where an integer index refers to the position, and the string to the name of the generic parameter */
 	HashTable *bound_types;
 	zend_generic_parameter *generic_parameters;
 	uint32_t num_generic_parameters;

Zend/zend.h

@@ -465,7 +465,6 @@ void init_compiler(void) /* {{{ */
 	CG(delayed_autoloads) = NULL;
 	CG(unlinked_uses) = NULL;
 	CG(current_linking_class) = NULL;
-	CG(bound_generic_types) = NULL;
 }
 /* }}} */
 
@@ -494,12 +493,6 @@ void shutdown_compiler(void) /* {{{ */
 		CG(unlinked_uses) = NULL;
 	}
 	CG(current_linking_class) = NULL;
-	/* This can happen during a fatal error */
-	if (CG(bound_generic_types)) {
-		zend_hash_destroy(CG(bound_generic_types));
-		FREE_HASHTABLE(CG(bound_generic_types));
-		CG(bound_generic_types) = NULL;
-	}
 }
 /* }}} */
 

Zend/zend_compile.c

@@ -151,8 +151,6 @@ struct _zend_compiler_globals {
 	HashTable *delayed_autoloads;
 	HashTable *unlinked_uses;
 	zend_class_entry *current_linking_class;
-	/* Those are initialized and destroyed by zend_do_inheritance_ex() */
-	HashTable *bound_generic_types;
 
 	uint32_t rtd_key_counter;
 

Zend/zend_globals.h

@@ -333,6 +333,23 @@ ZEND_API void destroy_zend_class(zval *zv)
 		return;
 	}
 
+	bool persistent = ce->type == ZEND_INTERNAL_CLASS;
+	/* Common to internal and user classes */
+	if (ce->attributes) {
+		zend_hash_release(ce->attributes);
+	}
+	if (ce->bound_types) {
+		zend_hash_release(ce->bound_types);
+	}
+	if (ce->num_generic_parameters > 0) {
+		for (uint32_t generic_param_index = 0; generic_param_index < ce->num_generic_parameters; generic_param_index++) {
+			const zend_generic_parameter generic_param = ce->generic_parameters[generic_param_index];
+			zend_string_release(generic_param.name);
+			zend_type_release(generic_param.constraint, persistent);
+		}
+		pefree(ce->generic_parameters, persistent);
+	}
+
 	switch (ce->type) {
 		case ZEND_USER_CLASS:
 			if (!(ce->ce_flags & ZEND_ACC_CACHED)) {
@@ -347,22 +364,6 @@ ZEND_API void destroy_zend_class(zval *zv)
 					zend_string_release_ex(ce->doc_comment, 0);
 				}
 
-				if (ce->attributes) {
-					zend_hash_release(ce->attributes);
-				}
-
-				if (ce->bound_types) {
-					zend_hash_release(ce->bound_types);
-				}
-				if (ce->num_generic_parameters > 0) {
-					for (uint32_t generic_param_index = 0; generic_param_index < ce->num_generic_parameters; generic_param_index++) {
-						const zend_generic_parameter generic_param = ce->generic_parameters[generic_param_index];
-						zend_string_release_ex(generic_param.name, false);
-						zend_type_release(generic_param.constraint, false);
-					}
-					efree(ce->generic_parameters);
-				}
-
 				if (ce->num_interfaces > 0 && !(ce->ce_flags & ZEND_ACC_RESOLVED_INTERFACES)) {
 					uint32_t i;
 
@@ -536,20 +537,6 @@ ZEND_API void destroy_zend_class(zval *zv)
 			if (ce->properties_info_table) {
 				free(ce->properties_info_table);
 			}
-			if (ce->attributes) {
-				zend_hash_release(ce->attributes);
-			}
-			if (ce->bound_types) {
-				zend_hash_release(ce->bound_types);
-			}
-			if (ce->num_generic_parameters > 0) {
-				for (uint32_t generic_param_index = 0; generic_param_index < ce->num_generic_parameters; generic_param_index++) {
-					const zend_generic_parameter generic_param = ce->generic_parameters[generic_param_index];
-					zend_string_release(generic_param.name);
-					zend_type_release(generic_param.constraint, true);
-				}
-				free(ce->generic_parameters);
-			}
 			free(ce);
 			break;
 	}