move some stuff around and clean up memory on shutdown

Author: withinboredom

Zend/zend.c

@@ -1195,6 +1195,7 @@ void zend_shutdown(void) /* {{{ */
 	free(GLOBAL_CONSTANTS_TABLE);
 	zend_shutdown_strtod();
 	zend_attributes_shutdown();
+	zend_type_free_interned_trees();
 
 #ifdef ZTS
 	GLOBAL_FUNCTION_TABLE = NULL;

Zend/zend_API.c

@@ -2900,12 +2900,13 @@ ZEND_END_ARG_INFO()
 
 static HashTable *interned_type_tree = NULL;
 
-// todo: move to zend_types.h
-#define ADD_TO_TREE(list, count, value) \
-	do { \
-		list = erealloc(list, sizeof(zend_type) * (count + 1)); \
-		list[count++] = value; \
-	} while (0)
+ZEND_API void zend_type_free_interned_trees(void) {
+	zend_type_node *tree = NULL;
+	ZEND_HASH_FOREACH_PTR(interned_type_tree, tree) {
+		pefree(tree, 1);
+	} ZEND_HASH_FOREACH_END();
+	pefree(interned_type_tree, 1);
+}
 
 static int compare_simple_types(const zend_type a, const zend_type b) {
 	const uint32_t a_mask = ZEND_TYPE_FULL_MASK(a);
@@ -3088,10 +3089,10 @@ ZEND_API zend_type_node *zend_type_to_interned_tree(const zend_type type) {
 
 		if (child->kind == kind) {
 			for (uint32_t i = 0; child->compound.num_types; i++) {
-				ADD_TO_TREE(children, num_children, child->compound.types[i]);
+				ADD_TO_TYPE_TREE(children, num_children, child->compound.types[i]);
 			}
 		} else {
-			ADD_TO_TREE(children, num_children, child);
+			ADD_TO_TYPE_TREE(children, num_children, child);
 		}
 	} ZEND_TYPE_LIST_FOREACH_END();
 

Zend/zend_API.h

@@ -449,6 +449,7 @@ ZEND_API zend_result zend_update_class_constants(zend_class_entry *class_type);
 ZEND_API HashTable *zend_separate_class_constants_table(zend_class_entry *class_type);
 
 ZEND_API zend_type_node *zend_type_to_interned_tree(zend_type type);
+ZEND_API void zend_type_free_interned_trees(void);
 
 static zend_always_inline HashTable *zend_class_constants_table(zend_class_entry *ce) {
 	if ((ce->ce_flags & ZEND_ACC_HAS_AST_CONSTANTS) && ZEND_MAP_PTR(ce->mutable_data)) {

Zend/zend_types.h

@@ -814,6 +814,13 @@ static zend_always_inline uint32_t zval_gc_info(uint32_t gc_type_info) {
 #define IS_TYPE_REFCOUNTED			(1<<0)
 #define IS_TYPE_COLLECTABLE			(1<<1)
 
+#define ADD_TO_TYPE_TREE(list, count, value) \
+do { \
+	list = erealloc(list, sizeof(zend_type) * (count + 1)); \
+	list[count++] = value; \
+} while (0)
+
+
 #if 1
 /* This optimized version assumes that we have a single "type_flag" */
 /* IS_TYPE_COLLECTABLE may be used only with IS_TYPE_REFCOUNTED */