Add zend_argument_type_error_ex, zend_argument_error_ex by arnaud-lb · Pull Request #21829 · php/php-src

arnaud-lb · 2026-04-22T08:43:51Z

These variants take the function as parameter instead of inferring it from the call stack. This is useful in ZEND_TYPE_ASSERT, and will be used in PFA impl.

UPGRADING.INTERNALS:

  . Added zend_argument_error_ex(), zend_argument_type_error_ex()
  . zend_argument_error_variadic() now takes an additional `function` parameter

Girgias

I think this makes a lot of sense :)

TimWolla

Either way LGTM, consider adding the new functions to UPGRADING.INTERNALS with a short note.

These variants take the function as parameter instead of infering it from the call stack. This is useful in ZEND_TYPE_ASSERT, and will be used in PFA impl.

TimWolla · 2026-05-06T19:23:32Z

+ZEND_API ZEND_COLD void zend_argument_error_ex(const zend_function *function,
+		uint32_t arg_num, zend_class_entry *error_ce, const char *format, ...)


I'm only noticing now that error_ce and arg_num are flipped compared to the existing zend_argument_error(). That should be adjusted.

Suggested change

ZEND_API ZEND_COLD void zend_argument_error_ex(const zend_function *function,

uint32_t arg_num, zend_class_entry *error_ce, const char *format, ...)

ZEND_API ZEND_COLD void zend_argument_error_ex(const zend_function *function,

zend_class_entry *error_ce, uint32_t arg_num, const char *format, ...)

TimWolla · 2026-05-06T19:23:47Z


 	if (type == E_ERROR) {
-		zend_argument_error_variadic(zend_ce_value_error, arg_num, format, va);
+		zend_argument_error_variadic(zend_active_function(), arg_num, zend_ce_value_error, format, va);


Suggested change

zend_argument_error_variadic(zend_active_function(), arg_num, zend_ce_value_error, format, va);

zend_argument_error_variadic(zend_active_function(), zend_ce_value_error, arg_num, format, va);

TimWolla · 2026-05-06T19:24:07Z

+ZEND_API ZEND_COLD void ZEND_FASTCALL zend_argument_error_variadic(
+		const zend_function *function, uint32_t arg_num,
+		zend_class_entry *error_ce, const char *format, va_list va)


Suggested change

ZEND_API ZEND_COLD void ZEND_FASTCALL zend_argument_error_variadic(

const zend_function *function, uint32_t arg_num,

zend_class_entry *error_ce, const char *format, va_list va)

ZEND_API ZEND_COLD void ZEND_FASTCALL zend_argument_error_variadic(

const zend_function *function, zend_class_entry *error_ce,

uint32_t arg_num, const char *format, va_list va)

TimWolla · 2026-05-06T19:24:19Z

+	va_list va;
+
+	va_start(va, format);
+	zend_argument_error_variadic(function, arg_num, error_ce, format, va);


Suggested change

zend_argument_error_variadic(function, arg_num, error_ce, format, va);

zend_argument_error_variadic(function, error_ce, arg_num, format, va);

TimWolla · 2026-05-06T19:24:35Z


 	va_start(va, format);
-	zend_argument_error_variadic(error_ce, arg_num, format, va);
+	zend_argument_error_variadic(function, arg_num, error_ce, format, va);


Suggested change

zend_argument_error_variadic(function, arg_num, error_ce, format, va);

zend_argument_error_variadic(function, error_ce, arg_num, format, va);

TimWolla · 2026-05-06T19:24:45Z

+	va_list va;
+
+	va_start(va, format);
+	zend_argument_error_variadic(function, arg_num, zend_ce_type_error, format, va);


Suggested change

zend_argument_error_variadic(function, arg_num, zend_ce_type_error, format, va);

zend_argument_error_variadic(function, zend_ce_type_error, arg_num, format, va);

TimWolla · 2026-05-06T19:24:54Z


 	va_start(va, format);
-	zend_argument_error_variadic(zend_ce_type_error, arg_num, format, va);
+	zend_argument_error_variadic(function, arg_num, zend_ce_type_error, format, va);


Suggested change

zend_argument_error_variadic(function, arg_num, zend_ce_type_error, format, va);

zend_argument_error_variadic(function, zend_ce_type_error, arg_num, format, va);

TimWolla · 2026-05-06T19:25:03Z


 	va_start(va, format);
-	zend_argument_error_variadic(zend_ce_value_error, arg_num, format, va);
+	zend_argument_error_variadic(function, arg_num, zend_ce_value_error, format, va);


Suggested change

zend_argument_error_variadic(function, arg_num, zend_ce_value_error, format, va);

zend_argument_error_variadic(function, zend_ce_value_error, arg_num, format, va);

TimWolla · 2026-05-06T19:25:45Z

+ZEND_API ZEND_COLD void ZEND_FASTCALL zend_argument_error_variadic(
+		const zend_function *function, uint32_t arg_num,
+		zend_class_entry *error_ce, const char *format, va_list va);
 ZEND_API ZEND_COLD void zend_argument_error(zend_class_entry *error_ce, uint32_t arg_num, const char *format, ...);
+ZEND_API ZEND_COLD void zend_argument_error_ex(const zend_function *function,
+		uint32_t arg_num, zend_class_entry *error_ce, const char *format, ...);
 ZEND_API ZEND_COLD void zend_argument_type_error(uint32_t arg_num, const char *format, ...);
+ZEND_API ZEND_COLD void zend_argument_type_error_ex(
+		const zend_function *function, uint32_t arg_num,
+		const char *format, ...);


Suggested change

ZEND_API ZEND_COLD void ZEND_FASTCALL zend_argument_error_variadic(

const zend_function *function, uint32_t arg_num,

zend_class_entry *error_ce, const char *format, va_list va);

ZEND_API ZEND_COLD void zend_argument_error(zend_class_entry *error_ce, uint32_t arg_num, const char *format, ...);

ZEND_API ZEND_COLD void zend_argument_error_ex(const zend_function *function,

uint32_t arg_num, zend_class_entry *error_ce, const char *format, ...);

ZEND_API ZEND_COLD void zend_argument_type_error(uint32_t arg_num, const char *format, ...);

ZEND_API ZEND_COLD void zend_argument_type_error_ex(

const zend_function *function, uint32_t arg_num,

const char *format, ...);

ZEND_API ZEND_COLD void ZEND_FASTCALL zend_argument_error_variadic(

const zend_function *function, zend_class_entry *error_ce,

uint32_t arg_num, const char *format, va_list va);

ZEND_API ZEND_COLD void zend_argument_error(zend_class_entry *error_ce, uint32_t arg_num, const char *format, ...);

ZEND_API ZEND_COLD void zend_argument_error_ex(const zend_function *function,

zend_class_entry *error_ce, uint32_t arg_num, const char *format, ...);

ZEND_API ZEND_COLD void zend_argument_type_error(uint32_t arg_num, const char *format, ...);

ZEND_API ZEND_COLD void zend_argument_type_error_ex(

const zend_function *function, uint32_t arg_num,

const char *format, ...);

github-actions Bot added Category: Engine ABI break labels Apr 22, 2026

arnaud-lb marked this pull request as ready for review April 22, 2026 09:37

arnaud-lb requested a review from dstogov as a code owner April 22, 2026 09:37

arnaud-lb requested a review from TimWolla April 22, 2026 13:35

Girgias approved these changes Apr 22, 2026

View reviewed changes

TimWolla approved these changes Apr 22, 2026

View reviewed changes

Comment thread Zend/zend_API.c

arnaud-lb added 2 commits May 6, 2026 11:25

Add zend_argument_type_error_ex, zend_argument_error_ex

add4d02

These variants take the function as parameter instead of infering it from the call stack. This is useful in ZEND_TYPE_ASSERT, and will be used in PFA impl.

Reduce API surface

2fd627d

arnaud-lb force-pushed the zend-error-ex branch from ca1b289 to 2fd627d Compare May 6, 2026 09:27

arnaud-lb requested a review from bukka as a code owner May 6, 2026 09:27

github-actions Bot added the Extension: openssl label May 6, 2026

arnaud-lb requested a review from TimWolla May 6, 2026 09:29

TimWolla reviewed May 6, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add zend_argument_type_error_ex, zend_argument_error_ex#21829

Add zend_argument_type_error_ex, zend_argument_error_ex#21829
arnaud-lb wants to merge 2 commits intophp:masterfrom
arnaud-lb:zend-error-ex

arnaud-lb commented Apr 22, 2026 •

edited

Loading

Uh oh!

Girgias left a comment

Uh oh!

TimWolla left a comment

Uh oh!

Uh oh!

TimWolla May 6, 2026

Uh oh!

TimWolla May 6, 2026

Uh oh!

TimWolla May 6, 2026

Uh oh!

TimWolla May 6, 2026

Uh oh!

TimWolla May 6, 2026

Uh oh!

TimWolla May 6, 2026

Uh oh!

TimWolla May 6, 2026

Uh oh!

TimWolla May 6, 2026

Uh oh!

TimWolla May 6, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

		ZEND_API ZEND_COLD void zend_argument_error_ex(const zend_function *function,
		uint32_t arg_num, zend_class_entry error_ce, const char format, ...)

	zend_argument_error_variadic(zend_active_function(), arg_num, zend_ce_value_error, format, va);
	zend_argument_error_variadic(zend_active_function(), zend_ce_value_error, arg_num, format, va);

	zend_argument_error_variadic(function, arg_num, error_ce, format, va);
	zend_argument_error_variadic(function, error_ce, arg_num, format, va);

	zend_argument_error_variadic(function, arg_num, zend_ce_type_error, format, va);
	zend_argument_error_variadic(function, zend_ce_type_error, arg_num, format, va);

Conversation

arnaud-lb commented Apr 22, 2026 • 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!

TimWolla left a comment

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!

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!

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!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

arnaud-lb commented Apr 22, 2026 •

edited

Loading