From 8a69154c4e662944019deb3009ba86a6ebd5bf8a Mon Sep 17 00:00:00 2001 From: Gina Peter Banyard Date: Mon, 12 Oct 2026 15:52:04 +0100 Subject: [PATCH 1/2] Zend: remove ZEND_LOG_XOR It is unused --- UPGRADING.INTERNALS | 1 + Zend/zend_portability.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/UPGRADING.INTERNALS b/UPGRADING.INTERNALS index 2f6ea7d9ea84..50e83966e378 100644 --- a/UPGRADING.INTERNALS +++ b/UPGRADING.INTERNALS @@ -14,6 +14,7 @@ PHP 8.7 INTERNALS UPGRADE NOTES 1. Internal API changes ======================== +- Removed the ZEND_LOG_XOR() macro. - Removed zend_execute_scripts(). Manually call zend_execute_script() in a loop instead. - Removed ZEND_STATIC_ASSERT(). Use C11 static_assert() directly instead. diff --git a/Zend/zend_portability.h b/Zend/zend_portability.h index a3028efe172b..bd4597784ade 100644 --- a/Zend/zend_portability.h +++ b/Zend/zend_portability.h @@ -556,7 +556,6 @@ extern "C++" { #define ZEND_NORMALIZE_BOOL(n) \ ((n) ? (((n)<0) ? -1 : 1) : 0) #define ZEND_TRUTH(x) ((x) ? 1 : 0) -#define ZEND_LOG_XOR(a, b) (ZEND_TRUTH(a) ^ ZEND_TRUTH(b)) /** * Do a three-way comparison of two integers and returns -1, 0 or 1 From 11774166a63f53056bbc2c16481d9ed8f93292c3 Mon Sep 17 00:00:00 2001 From: Gina Peter Banyard Date: Mon, 12 Oct 2026 15:52:37 +0100 Subject: [PATCH 2/2] Zend: remove ZEND_TRUTH It is unused --- UPGRADING.INTERNALS | 1 + Zend/zend_portability.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/UPGRADING.INTERNALS b/UPGRADING.INTERNALS index 50e83966e378..4c5d74b49e9c 100644 --- a/UPGRADING.INTERNALS +++ b/UPGRADING.INTERNALS @@ -15,6 +15,7 @@ PHP 8.7 INTERNALS UPGRADE NOTES ======================== - Removed the ZEND_LOG_XOR() macro. +- Removed the ZEND_TRUTH() macro. - Removed zend_execute_scripts(). Manually call zend_execute_script() in a loop instead. - Removed ZEND_STATIC_ASSERT(). Use C11 static_assert() directly instead. diff --git a/Zend/zend_portability.h b/Zend/zend_portability.h index bd4597784ade..4906c2947cc5 100644 --- a/Zend/zend_portability.h +++ b/Zend/zend_portability.h @@ -555,7 +555,6 @@ extern "C++" { #define ZEND_STRS(str) (str), (sizeof(str)) #define ZEND_NORMALIZE_BOOL(n) \ ((n) ? (((n)<0) ? -1 : 1) : 0) -#define ZEND_TRUTH(x) ((x) ? 1 : 0) /** * Do a three-way comparison of two integers and returns -1, 0 or 1