Use the same zend_arg_info struct for internal and user functions #19022

arnaud-lb · 2025-07-03T14:06:43Z

Internal functions use char* strings to represent arg names and default values. This differs from user functions, which use zend strings.

Here I unify this by using the same struct, zend_arg_info in both function types.

This simplifies accesses to arg infos. Also, in the PFAs RFC this avoids converting internal arg infos at runtime when applying an internal function.

Girgias

Thanks for having a look at this, I'm overall in favour of unifying those, as it makes it easier to reason about.

See some of my comments, which are mostly nits. :)

Zend/zend_API.c

Zend/zend_inheritance.c

Girgias · 2025-07-03T14:27:13Z

ext/reflection/php_reflection.c

@@ -790,17 +785,15 @@ static void _parameter_string(smart_str *str, zend_function *fptr, struct _zend_
 	if (ZEND_ARG_IS_VARIADIC(arg_info)) {
 		smart_str_appends(str, "...");
 	}
-	smart_str_append_printf(str, "$%s", has_internal_arg_info(fptr)
-		? ((zend_internal_arg_info*)arg_info)->name : ZSTR_VAL(arg_info->name));
+	smart_str_append_printf(str, "$%s", ZSTR_VAL(arg_info->name));


Do we need to do this with a printf? Can't we just append a char and then the zend_string?

You are right, but I want to avoid changes that are not directly related

ACK, let's keep this for a follow-up then :)

ext/reflection/php_reflection.c

Girgias · 2025-07-03T14:28:50Z

sapi/phpdbg/phpdbg_frame.c

 		if (arginfo) {
-			if (func->type == ZEND_INTERNAL_FUNCTION) {
-				arg_name = (char *) ((zend_internal_arg_info *) &arginfo[i])->name;
-			} else {
-				arg_name = ZSTR_VAL(arginfo[i].name);
-			}
+			arg_name = ZSTR_VAL(arginfo[i].name);
 		}
 		smart_str_appends(s, arg_name ? arg_name : "?");


I think this can be improved to prevent a strlen computation within the smart_str_appends.

Co-authored-by: Gina Peter Banyard <[email protected]>

TimWolla · 2025-07-03T15:34:45Z

Zend/zend_API.c

+void zend_convert_internal_arg_info(zend_arg_info *new_arg_info, const zend_internal_arg_info *arg_info, bool is_return_info)
+{
+	if (!is_return_info) {
+		new_arg_info->name = zend_string_init_interned(arg_info->name, strlen(arg_info->name), 1);


Should pass true instead of 1 (same elsewhere).

Indeed! I never remember which functions were converted to bool.

nielsdos · 2025-07-03T15:54:16Z

You can probably get rid of ZEND_ACC_USER_ARG_INFO

arnaud-lb · 2025-07-03T16:16:00Z

Right :) I wanted to do it, but it's not trivial because the flag is also used to signal how arg default values should be fetched. I may try to remove it later.

Girgias · 2025-07-03T16:39:24Z

Zend/zend_API.c

 #endif
-	return get_default_via_ast(default_value_zval, default_value);
+	return get_default_via_ast(default_value_zval, ZSTR_VAL(default_value));


As a follow-up, the get_default_via_ast() function should be changed to accept a zend_string to get rid of an unnecessary strlen() computation :)

nielsdos · 2025-07-03T16:43:21Z

This does seem to have a negative impact on the Valgrind instruction counts though. Probably because of the slightly higher memory requirement if you have the zend_string header too.

DanielEScherzer · 2025-07-03T18:46:27Z

ext/reflection/php_reflection.c

@@ -790,17 +785,15 @@ static void _parameter_string(smart_str *str, zend_function *fptr, struct _zend_
 	if (ZEND_ARG_IS_VARIADIC(arg_info)) {
 		smart_str_appends(str, "...");
 	}
-	smart_str_append_printf(str, "$%s", has_internal_arg_info(fptr)
-		? ((zend_internal_arg_info*)arg_info)->name : ZSTR_VAL(arg_info->name));
+	smart_str_append_printf(str, "$%s", ZSTR_VAL(arg_info->name));

 	if (!required && !ZEND_ARG_IS_VARIADIC(arg_info)) {
 		if (fptr->type == ZEND_INTERNAL_FUNCTION) {
 			smart_str_appends(str, " = ");
 			/* TODO: We don't have a way to fetch the default value for an internal function


Is this comment still correct?

DanielEScherzer · 2025-07-03T18:48:20Z

Zend/zend_API.c

+		zend_type legacy_iterable = ZEND_TYPE_INIT_CLASS_MASK(
+				ZSTR_KNOWN(ZEND_STR_TRAVERSABLE),
+				(type->type_mask | MAY_BE_ARRAY)
+				);


suggest reducing indentation to match the indentation of the start

Suggested change

);

);

DanielEScherzer · 2025-07-03T18:50:41Z

Zend/zend_closures.c

@@ -917,4 +909,13 @@ void zend_closure_bind_var_ex(zval *closure_zv, uint32_t offset, zval *val) /* {
 	zval_ptr_dtor(var);
 	ZVAL_COPY_VALUE(var, val);
 }
+


unrelated newline addition

Use the same zend_arg_info struct for internal and user functions

0731ca6

github-actions bot added Category: Engine Extension: opcache Extension: pdo (core) Extension: reflection SAPI: phpdbg ABI break labels Jul 3, 2025

Girgias reviewed Jul 3, 2025

View reviewed changes

arnaud-lb and others added 5 commits July 3, 2025 16:39

Apply suggestions from code review

c79d568

Co-authored-by: Gina Peter Banyard <[email protected]>

Remove unnecessary memcpy

a42cfc9

Formatting

0dd97dc

COPY

31cd429

Fix signature

9fba6b3

TimWolla reviewed Jul 3, 2025

View reviewed changes

1 -> true

9031567

Cleanup

3e0ec86

arnaud-lb marked this pull request as ready for review July 3, 2025 16:16

arnaud-lb requested review from dstogov, DanielEScherzer and SakiTakamachi as code owners July 3, 2025 16:16

Girgias reviewed Jul 3, 2025

View reviewed changes

DanielEScherzer reviewed Jul 3, 2025

View reviewed changes

Use the same zend_arg_info struct for internal and user functions #19022

Are you sure you want to change the base?

Use the same zend_arg_info struct for internal and user functions #19022

Conversation

arnaud-lb commented Jul 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Girgias left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

nielsdos commented Jul 3, 2025

Uh oh!

arnaud-lb commented Jul 3, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

nielsdos commented Jul 3, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

arnaud-lb commented Jul 3, 2025 •

edited

Loading