From 772e99f509ea0646593dc9eb2b006a84d6ae9627 Mon Sep 17 00:00:00 2001 From: Ilija Tovilo Date: Tue, 10 Nov 2026 01:25:43 +0100 Subject: [PATCH] Add padding to globals to maintain ABI compatibility when adding fields in patches --- Zend/zend_globals.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Zend/zend_globals.h b/Zend/zend_globals.h index c3034f8c8edc..81d04b5b1596 100644 --- a/Zend/zend_globals.h +++ b/Zend/zend_globals.h @@ -169,6 +169,14 @@ struct _zend_compiler_globals { #ifdef ZTS uint32_t copied_functions_count; #endif + + /* Padding to maintain ABI compatibility for ZTS compile-time offsets. For + * supported versions, add fields to this nested struct. For master, move them + * to the top-level struct. */ + union { + uint64_t padding[8]; + // struct { Add here. }; + }; }; @@ -339,6 +347,12 @@ struct _zend_executor_globals { void *reserved[ZEND_MAX_RESERVED_RESOURCES]; zend_oom_info delayed_oom; + + /* See comment on zend_compiler_globals.padding. */ + union { + uint64_t padding[8]; + // struct { Add here. }; + }; }; #ifdef ZTS