Add tests

Co-authored-by: Tim Düsterhus <[email protected]>

Author: arnaud-lb

Zend/tests/gh19543-001.phpt

@@ -0,0 +1,15 @@
+--TEST--
+GH-19543 001: GC treats ZEND_WEAKREF_TAG_MAP references as WeakMap references
+--FILE--
+<?php
+
+$e = new Exception();
+$a = new stdClass();
+zend_weakmap_attach($e, $a);
+unset($a);
+gc_collect_cycles();
+
+?>
+==DONE==
+--EXPECT--
+==DONE==

Zend/tests/gh19543-002.phpt

@@ -0,0 +1,17 @@
+--TEST--
+GH-19543 001: GC treats ZEND_WEAKREF_TAG_MAP references as WeakMap references
+--FILE--
+<?php
+
+$e = new Exception();
+$a = new stdClass();
+zend_weakmap_attach($e, $a);
+unset($a);
+$e2 = $e;
+unset($e2); // add to roots
+gc_collect_cycles();
+
+?>
+==DONE==
+--EXPECT--
+==DONE==

ext/zend_test/php_test.h

@@ -50,7 +50,7 @@ ZEND_BEGIN_MODULE_GLOBALS(zend_test)
 	int observer_fiber_switch;
 	int observer_fiber_destroy;
 	int observer_execute_internal;
-	HashTable global_weakmap;
+	HashTable *global_weakmap;
 	int replace_zend_execute_ex;
 	int register_passes;
 	bool print_stderr_mshutdown;

ext/zend_test/test.c

@@ -340,7 +340,7 @@ static ZEND_FUNCTION(zend_weakmap_attach)
 			Z_PARAM_ZVAL(value)
 	ZEND_PARSE_PARAMETERS_END();
 
-	if (zend_weakrefs_hash_add(&ZT_G(global_weakmap), obj, value)) {
+	if (zend_weakrefs_hash_add(ZT_G(global_weakmap), obj, value)) {
 		Z_TRY_ADDREF_P(value);
 		RETURN_TRUE;
 	}
@@ -355,13 +355,13 @@ static ZEND_FUNCTION(zend_weakmap_remove)
 			Z_PARAM_OBJ(obj)
 	ZEND_PARSE_PARAMETERS_END();
 
-	RETURN_BOOL(zend_weakrefs_hash_del(&ZT_G(global_weakmap), obj) == SUCCESS);
+	RETURN_BOOL(zend_weakrefs_hash_del(ZT_G(global_weakmap), obj) == SUCCESS);
 }
 
 static ZEND_FUNCTION(zend_weakmap_dump)
 {
 	ZEND_PARSE_PARAMETERS_NONE();
-	RETURN_ARR(zend_array_dup(&ZT_G(global_weakmap)));
+	RETURN_ARR(zend_array_dup(ZT_G(global_weakmap)));
 }
 
 static ZEND_FUNCTION(zend_get_current_func_name)
@@ -1311,18 +1311,20 @@ PHP_MSHUTDOWN_FUNCTION(zend_test)
 
 PHP_RINIT_FUNCTION(zend_test)
 {
-	zend_hash_init(&ZT_G(global_weakmap), 8, NULL, ZVAL_PTR_DTOR, 0);
+	ZT_G(global_weakmap) = emalloc(sizeof(HashTable));
+	zend_hash_init(ZT_G(global_weakmap), 8, NULL, ZVAL_PTR_DTOR, 0);
 	ZT_G(observer_nesting_depth) = 0;
 	return SUCCESS;
 }
 
 PHP_RSHUTDOWN_FUNCTION(zend_test)
 {
 	zend_ulong obj_key;
-	ZEND_HASH_FOREACH_NUM_KEY(&ZT_G(global_weakmap), obj_key) {
-		zend_weakrefs_hash_del(&ZT_G(global_weakmap), zend_weakref_key_to_object(obj_key));
+	ZEND_HASH_FOREACH_NUM_KEY(ZT_G(global_weakmap), obj_key) {
+		zend_weakrefs_hash_del(ZT_G(global_weakmap), zend_weakref_key_to_object(obj_key));
 	} ZEND_HASH_FOREACH_END();
-	zend_hash_destroy(&ZT_G(global_weakmap));
+	zend_hash_destroy(ZT_G(global_weakmap));
+	efree(ZT_G(global_weakmap));
 
 	if (ZT_G(zend_test_heap))  {
 		free(ZT_G(zend_test_heap));