[php-src] master: Merge branch 'PHP-8.6'

From: Date: Tue, 10 Nov 2026 12:29:17 +0000
Subject: [php-src] master: Merge branch 'PHP-8.6'
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-143530@lists.php.net to get a copy of this message
Author: Ilija Tovilo (iluuu1994) Date: 2026-11-10T13:28:53+01:00 Commit: https://github.com/php/php-src/commit/e4de5892226485578f2322d5025bea80dbb81205 Raw diff: https://github.com/php/php-src/commit/e4de5892226485578f2322d5025bea80dbb81205.diff Merge branch 'PHP-8.6' * PHP-8.6: Add padding to globals to maintain ABI compatibility when adding fields in patches Changed paths: M Zend/zend_globals.h Diff: diff --git a/Zend/zend_globals.h b/Zend/zend_globals.h index ff025343b7af..bf93bf0013a9 100644 --- a/Zend/zend_globals.h +++ b/Zend/zend_globals.h @@ -167,6 +167,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. }; + }; }; @@ -337,6 +345,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

« previous php.cvs (#143530) next »