From 18ecb32bc0081e666e1edcde570349dc4ea816bf Mon Sep 17 00:00:00 2001 From: Gina Peter Banyard Date: Sat, 31 Oct 2026 08:33:20 +0000 Subject: [PATCH 1/2] Zend: remove ZEND_RETURN_{VAL|REF} As those are unused and seemingly conflict with ZEND_RETURN_{VALUE|REFERENCE} --- Zend/zend_compile.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index ec6d8b09bbe7..c5753a3ae453 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -1196,9 +1196,6 @@ static zend_always_inline bool zend_check_arg_send_type(const zend_function *zf, #define QUICK_ARG_MAY_BE_SENT_BY_REF(zf, arg_num) \ ZEND_CHECK_ARG_FLAG(zf, arg_num, ZEND_SEND_PREFER_REF) -#define ZEND_RETURN_VAL 0 -#define ZEND_RETURN_REF 1 - #define ZEND_BIND_VAL 0 #define ZEND_BIND_REF 1 #define ZEND_BIND_IMPLICIT 2 From cf5b799c97dd9aa86468b8a5078fdbfa96354ee1 Mon Sep 17 00:00:00 2001 From: Gina Peter Banyard Date: Sat, 31 Oct 2026 09:22:06 +0000 Subject: [PATCH 2/2] Zend: remove ZEND_RETURN_{VALUE|REFERENCE} As ZEND_RETURN_VALUE is used once in the ZEND_BEGIN_ARG_INFO() macro definition to pass to ZEND_BEGIN_ARG_INFO_EX(). However every other call to ZEND_BEGIN_ARG_INFO_EX() just uses 0/1 directly. --- Zend/zend_API.h | 2 +- Zend/zend_compile.h | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/Zend/zend_API.h b/Zend/zend_API.h index d1064970dcd5..f6c7c0b2a698 100644 --- a/Zend/zend_API.h +++ b/Zend/zend_API.h @@ -217,7 +217,7 @@ typedef struct _zend_fcall_info_cache { static const zend_internal_arg_info name[] = { \ { (const char*)(uintptr_t)(required_num_args), ZEND_TYPE_INIT_NONE(_ZEND_ARG_INFO_FLAGS(return_reference, 0, 0)), NULL }, #define ZEND_BEGIN_ARG_INFO(name, _unused) \ - ZEND_BEGIN_ARG_INFO_EX(name, {}, ZEND_RETURN_VALUE, -1) + ZEND_BEGIN_ARG_INFO_EX(name, {}, 0, -1) #define ZEND_END_ARG_INFO() }; /* Name macros */ diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index c5753a3ae453..4e99b40a8646 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -580,10 +580,6 @@ struct _zend_op_array { void *reserved[ZEND_MAX_RESERVED_RESOURCES]; }; - -#define ZEND_RETURN_VALUE 0 -#define ZEND_RETURN_REFERENCE 1 - #define INTERNAL_FUNCTION_PARAMETERS zend_execute_data *execute_data, zval *return_value #define INTERNAL_FUNCTION_PARAM_PASSTHRU execute_data, return_value