Add clean_module_functions() (#8763)

Add clean_module_functions() to clean functions which are registered by zend_register_functions().
The general logic of clean_module_functions() is consistent with clean_module_classes().

Author: twose

Zend/zend_API.c

@@ -2968,6 +2968,24 @@ static void clean_module_classes(int module_number) /* {{{ */
 }
 /* }}} */
 
+static int clean_module_function(zval *el, void *arg) /* {{{ */
+{
+	zend_function *fe = (zend_function *) Z_PTR_P(el);
+	zend_module_entry *module = (zend_module_entry *) arg;
+	if (fe->common.type == ZEND_INTERNAL_FUNCTION && fe->internal_function.module == module) {
+		return ZEND_HASH_APPLY_REMOVE;
+	} else {
+		return ZEND_HASH_APPLY_KEEP;
+	}
+}
+/* }}} */
+
+static void clean_module_functions(zend_module_entry *module) /* {{{ */
+{
+	zend_hash_apply_with_argument(CG(function_table), clean_module_function, module);
+}
+/* }}} */
+
 void module_destructor(zend_module_entry *module) /* {{{ */
 {
 #if ZEND_RC_DEBUG
@@ -3015,6 +3033,8 @@ void module_destructor(zend_module_entry *module) /* {{{ */
 	module->module_started=0;
 	if (module->type == MODULE_TEMPORARY && module->functions) {
 		zend_unregister_functions(module->functions, -1, NULL);
+		/* Clean functions registered separately from module->functions */
+		clean_module_functions(module);
 	}
 
 #if HAVE_LIBDL

ext/dl_test/dl_test.c

@@ -52,6 +52,23 @@ PHP_FUNCTION(dl_test_test2)
 }
 /* }}}*/
 
+/* {{{ PHP_DL_TEST_USE_REGISTER_FUNCTIONS_DIRECTLY */
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_dl_test_use_register_functions_directly, 0, 0, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+PHP_FUNCTION(dl_test_use_register_functions_directly)
+{
+	ZEND_PARSE_PARAMETERS_NONE();
+
+	RETURN_STRING("OK");
+}
+
+static const zend_function_entry php_dl_test_use_register_functions_directly_functions[] = {
+	ZEND_FENTRY(dl_test_use_register_functions_directly, ZEND_FN(dl_test_use_register_functions_directly), arginfo_dl_test_use_register_functions_directly,  0)
+	ZEND_FE_END
+};
+/* }}} */
+
 /* {{{ INI */
 PHP_INI_BEGIN()
 	STD_PHP_INI_BOOLEAN("dl_test.long",      "0", PHP_INI_ALL, OnUpdateLong,       long_value,       zend_dl_test_globals, dl_test_globals)
@@ -69,6 +86,10 @@ PHP_MINIT_FUNCTION(dl_test)
 		REGISTER_INI_ENTRIES();
 	}
 
+	if (getenv("PHP_DL_TEST_USE_REGISTER_FUNCTIONS_DIRECTLY")) {
+		zend_register_functions(NULL, php_dl_test_use_register_functions_directly_functions, NULL, type);
+	}
+
 	return SUCCESS;
 }
 /* }}} */

ext/standard/tests/general_functions/dl-use_register_functions_directly.phpt

@@ -0,0 +1,25 @@
+--TEST--
+dl(): use zend_register_functions() directly
+--ENV--
+PHP_DL_TEST_USE_REGISTER_FUNCTIONS_DIRECTLY=1
+--SKIPIF--
+<?php require dirname(__DIR__, 3) . "/dl_test/tests/skip.inc"; ?>
+--FILE--
+<?php
+
+if (extension_loaded('dl_test')) {
+    exit('Error: dl_test is already loaded');
+}
+
+if (PHP_OS_FAMILY === 'Windows') {
+    $loaded = dl('php_dl_test.dll');
+} else {
+    $loaded = dl('dl_test.so');
+}
+
+var_dump($loaded);
+var_dump(dl_test_use_register_functions_directly());
+?>
+--EXPECT--
+bool(true)
+string(2) "OK"