Skip to content

Add padding to globals to maintain ABI compatibility when adding fields in patches #25356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
iluuu1994 wants to merge 1 commit into from
Closed

Add padding to globals to maintain ABI compatibility when adding fields in patches #25356

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions Zend/zend_globals.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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. };
};
};


Expand Down Expand Up @@ -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
Expand Down
Loading