Remove declares inside functions as well

php · Aug 2, 2021 · 9fe3aab · 9fe3aab
1 parent 8356da6
commit 9fe3aab
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
@@ -4062,9 +4062,13 @@ static void preload_link(void)
 		}
 	} ZEND_HASH_FOREACH_END();
 
-	/* Dynamic defs inside methods need to be removed as well. */
+	/* Dynamic defs inside functions and methods need to be removed as well. */
+	zend_op_array *op_array;
+	ZEND_HASH_FOREACH_PTR_FROM(EG(function_table), op_array, EG(persistent_functions_count)) {
+		ZEND_ASSERT(op_array->type == ZEND_USER_FUNCTION);
+		preload_remove_declares(op_array);
+	} ZEND_HASH_FOREACH_END();
 	ZEND_HASH_FOREACH_PTR_FROM(EG(class_table), ce, EG(persistent_classes_count)) {
-		zend_op_array *op_array;
 		ZEND_HASH_FOREACH_PTR(&ce->function_table, op_array) {
 			if (op_array->type == ZEND_USER_FUNCTION) {
 				preload_remove_declares(op_array);

diff --git a/...e/tests/preload_dynamic_def_in_method.inc → ...che/tests/preload_dynamic_def_removal.inc b/...e/tests/preload_dynamic_def_in_method.inc → ...che/tests/preload_dynamic_def_removal.inc
@@ -2,10 +2,17 @@
 class Test {   
     function method() {      
         function dynamic() {   
-            echo "dynamic";
+            echo "dynamic\n";
         }
     }      
 }       
+
+function func() {
+    function dynamic2() {
+        echo "dynamic2\n";
+    }
+}
 
 $test = new Test; 
 $test->method();
+func();
diff --git a/.../tests/preload_dynamic_def_in_method.phpt → ...he/tests/preload_dynamic_def_removal.phpt b/.../tests/preload_dynamic_def_in_method.phpt → ...he/tests/preload_dynamic_def_removal.phpt
@@ -1,10 +1,10 @@
 --TEST--
-Preloading dynamic def in method
+Preloading dynamic def in method/function
 --INI--
 opcache.enable=1
 opcache.enable_cli=1
 opcache.optimization_level=-1
-opcache.preload={PWD}/preload_dynamic_def_in_method.inc
+opcache.preload={PWD}/preload_dynamic_def_removal.inc
 --EXTENSIONS--
 opcache
 --SKIPIF--
@@ -14,6 +14,8 @@ if (PHP_OS_FAMILY == 'Windows') die('skip Preloading is not supported on Windows
 --FILE--
 <?php
 dynamic();
+dynamic2();
 ?>
 --EXPECT--
 dynamic
+dynamic2