Inline zend_active_function()

Author: iluuu1994

Zend/zend_execute.h

@@ -372,8 +372,18 @@ ZEND_API const char *get_active_class_name(const char **space);
 ZEND_API const char *get_active_function_name(void);
 ZEND_API const char *get_active_function_arg_name(uint32_t arg_num);
 ZEND_API const char *get_function_arg_name(const zend_function *func, uint32_t arg_num);
-ZEND_API zend_function *zend_active_function(void);
 ZEND_API zend_function *zend_active_function_ex(zend_execute_data *execute_data);
+
+static zend_always_inline zend_function *zend_active_function(void)
+{
+	zend_function *func = EG(current_execute_data)->func;
+	if (ZEND_USER_CODE(func->type)) {
+		return zend_active_function_ex(EG(current_execute_data));
+	} else {
+		return func;
+	}
+}
+
 ZEND_API zend_string *get_active_function_or_method_name(void);
 ZEND_API zend_string *get_function_or_method_name(const zend_function *func);
 ZEND_API const char *zend_get_executed_filename(void);

Zend/zend_execute_API.c

@@ -559,11 +559,6 @@ ZEND_API const char *get_active_function_name(void) /* {{{ */
 }
 /* }}} */
 
-ZEND_API zend_function *zend_active_function(void)
-{
-	return zend_active_function_ex(EG(current_execute_data));
-}
-
 ZEND_API zend_function *zend_active_function_ex(zend_execute_data *execute_data)
 {
 	ZEND_ASSERT(zend_is_executing());