Cleanup

Author: arnaud-lb

Zend/tests/partial_application/errors_005.phpt

@@ -12,4 +12,4 @@ try {
 
 ?>
 --EXPECT--
-ArgumentCountError: __invoke(): Argument #3 ($c) must be passed explicitly, because the default value is not known
+ArgumentCountError: Closure::__invoke(): Argument #3 ($c) must be passed explicitly, because the default value is not known

Zend/zend_partial.c

@@ -36,7 +36,7 @@
 #define IS_STATIC_CLOSURE(function) \
 	(((function)->common.fn_flags & (ZEND_ACC_STATIC|ZEND_ACC_CLOSURE)) == (ZEND_ACC_STATIC|ZEND_ACC_CLOSURE))
 
-ZEND_COLD static zend_never_inline void zend_partial_args_underflow(
+static zend_never_inline ZEND_COLD void zend_partial_args_underflow(
 		const zend_function *function, uint32_t args, uint32_t expected)
 {
 	zend_string *symbol = get_function_or_method_name(function);
@@ -50,7 +50,7 @@ ZEND_COLD static zend_never_inline void zend_partial_args_underflow(
 	zend_string_release(symbol);
 }
 
-ZEND_COLD static zend_never_inline void zend_partial_args_overflow(
+static zend_never_inline ZEND_COLD void zend_partial_args_overflow(
 		const zend_function *function, uint32_t args, uint32_t expected)
 {
 	zend_string *symbol = get_function_or_method_name(function);
@@ -338,10 +338,10 @@ static zend_ast *zp_type_to_ast(const zend_type type)
 }
 
 /* Can not use zend_argument_error() as the function is not on the stack */
-ZEND_COLD static void zp_argument_error(zend_class_entry *error_ce,
+static zend_never_inline ZEND_COLD void zp_argument_error(zend_class_entry *error_ce,
 		zend_function *function, uint32_t arg_num, const char *format, ...)
 {
-	zend_string *func_name = function->common.function_name;
+	zend_string *func_name = get_function_or_method_name(function);
 	const char *arg_name = get_function_arg_name(function, arg_num);
 
 	char *message = NULL;
@@ -488,7 +488,7 @@ static zend_string *zp_pfa_name(const zend_op_array *declaring_op_array,
 	return name;
 }
 
-zend_ast *zp_compile_forwarding_call(
+static zend_ast *zp_compile_forwarding_call(
 	zval *this_ptr, zend_function *function,
 	uint32_t argc, zval *argv, zend_array *extra_named_params,
 	zend_string **param_names, bool variadic_partial, uint32_t num_args,
@@ -617,7 +617,7 @@ zend_ast *zp_compile_forwarding_call(
 	return NULL;
 }
 
-uint32_t zp_compute_num_required(zend_function *function,
+static uint32_t zp_compute_num_required(zend_function *function,
 		uint32_t orig_offset, uint32_t new_offset,
 		uint32_t num_required) {
 	if (orig_offset < function->common.num_args) {
@@ -653,7 +653,7 @@ static bool zp_is_non_dynamic_call_func(zend_function *function)
 	return false;
 }
 
-zend_op_array *zp_compile(zval *this_ptr, zend_function *function,
+static zend_op_array *zp_compile(zval *this_ptr, zend_function *function,
 		uint32_t argc, zval *argv, zend_array *extra_named_params,
 		const zend_array *named_positions,
 		const zend_op_array *declaring_op_array,
@@ -662,7 +662,7 @@ zend_op_array *zp_compile(zval *this_ptr, zend_function *function,
 
 	zend_op_array *op_array = NULL;
 
-	if (zp_is_non_dynamic_call_func(function)) {
+	if (UNEXPECTED(zp_is_non_dynamic_call_func(function))) {
 		zend_throw_error(NULL, "Cannot call %.*s() dynamically",
 			(int) ZSTR_LEN(function->common.function_name), ZSTR_VAL(function->common.function_name));
 		return NULL;
@@ -1001,7 +1001,7 @@ zend_op_array *zp_compile(zval *this_ptr, zend_function *function,
 	goto clean;
 }
 
-zend_op_array *zp_get_op_array(zval *this_ptr, zend_function *function,
+static zend_op_array *zp_get_op_array(zval *this_ptr, zend_function *function,
 		uint32_t argc, zval *argv, zend_array *extra_named_params,
 		const zend_array *named_positions,
 		const zend_op_array *declaring_op_array,
@@ -1034,7 +1034,7 @@ zend_op_array *zp_get_op_array(zval *this_ptr, zend_function *function,
 }
 
 /* Bind pre-bound arguments as lexical vars */
-void zp_bind(zval *result, zend_function *function, uint32_t argc, zval *argv,
+static void zp_bind(zval *result, zend_function *function, uint32_t argc, zval *argv,
 		zend_array *extra_named_params) {
 
 	zend_arg_info *arg_infos = function->common.arg_info;