Fix frameless function name in warnings

iluuu1994 · iluuu1994 · commit 75c9f74a85c3 · 2023-10-31T23:01:26.000+01:00
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
@@ -537,7 +537,7 @@ ZEND_API const char *get_active_function_name(void) /* {{{ */
 		return NULL;
 	}
 
-	func = EG(current_execute_data)->func;
+	func = zend_active_function();
 
 	switch (func->type) {
 		case ZEND_USER_FUNCTION: {
@@ -561,8 +561,6 @@ ZEND_API const char *get_active_function_name(void) /* {{{ */
 
 ZEND_API zend_function *zend_active_function_ex(zend_execute_data *execute_data)
 {
-	ZEND_ASSERT(zend_is_executing());
-
 	zend_function *func = EX(func);
 
 	/* Resolve function if op is a frameless call. */

Original file line number	Diff line number	Diff line change
`@@ -537,7 +537,7 @@ ZEND_API const char get_active_function_name(void) / {{{ */`
`537`	`537`	`return NULL;`
`538`	`538`	`}`
`539`	`539`
`540`		`- func = EG(current_execute_data)->func;`
	`540`	`+ func = zend_active_function();`
`541`	`541`
`542`	`542`	`switch (func->type) {`
`543`	`543`	`case ZEND_USER_FUNCTION: {`
`@@ -561,8 +561,6 @@ ZEND_API const char get_active_function_name(void) / {{{ */`
`561`	`561`
`562`	`562`	`ZEND_API zend_function zend_active_function_ex(zend_execute_data execute_data)`
`563`	`563`	`{`
`564`		`- ZEND_ASSERT(zend_is_executing());`
`565`		`-`
`566`	`564`	`zend_function *func = EX(func);`
`567`	`565`
`568`	`566`	`/* Resolve function if op is a frameless call. */`