zend_portability: Add ZEND_CONTAINER_OF()#21903
Open
TimWolla wants to merge 2 commits intophp:masterfrom
Open
Conversation
Changes made with Coccinelle:
@@
type T_container;
identifier member;
expression e;
@@
- (T_container *)(((char *)(e)) - offsetof(T_container, member))
+ ZEND_CONTAINER_OF(e, T_container, member)
@@
type T_container;
identifier member;
expression e;
typedef uintptr_t;
@@
- (T_container *)(((uintptr_t)(e)) - offsetof(T_container, member))
+ ZEND_CONTAINER_OF(e, T_container, member)
@@
type T_container;
identifier member;
expression e;
@@
- (const T_container *)(((char *)(e)) - offsetof(T_container, member))
+ ZEND_CONTAINER_OF(e, T_container, member)
@@
type T_container;
identifier member;
expression e;
typedef uintptr_t;
@@
- (const T_container *)(((uintptr_t)(e)) - offsetof(T_container, member))
+ ZEND_CONTAINER_OF(e, T_container, member)
TimWolla
requested review from
DanielEScherzer,
Girgias,
NattyNarwhal,
SakiTakamachi,
adoy,
bukka,
derickr,
devnexen,
dstogov,
kamil-tekiela,
kocsismate and
zeriyoshi
as code owners
github-actions
Bot
added
Extension: openssl
Category: Engine
Extension: intl
Extension: bcmath
Extension: curl
Extension: date
Extension: dba
Extension: dom
Extension: enchant
Extension: fileinfo
Extension: gd
Extension: gmp
Extension: ldap
Extension: mysqli
Extension: odbc
Extension: pdo (core)
labels
github-actions
Bot
added
Extension: pgsql
Extension: reflection
Extension: shmop
Extension: simplexml
Extension: snmp
Extension: soap
Extension: sockets
Extension: spl
Extension: sqlite3
Extension: sysvmsg
Extension: sysvsem
Extension: sysvshm
Extension: tidy
Extension: xml
Extension: xmlreader
Extension: xmlwriter
Extension: xsl
Extension: zend_test
Extension: zip
Extension: zlib
Category: Optimizer
Extension: random
ABI break
Extension: uri
labels
iluuu1994
reviewed
Apr 28, 2026
| #define ZEND_ELEMENT_COUNT(m) | ||
| #endif | ||
|
|
||
| #define ZEND_CONTAINER_OF(ptr, Type, member) ((Type*)((char*)(1 ? (ptr) : &((Type*)0)->member) - offsetof(Type, member))) |
Member
There was a problem hiding this comment.
Nit: This will discard const from ptr. With _Generic it would be possible to retain it. get_bcmath_number_from_obj() looks like the only relevant case, but also looks somewhat questionable. obj should not be const if we return a mutable pointer derived from it.
Member
There was a problem hiding this comment.
get_bcmath_number_from_obj() simply seems to be my mistake.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Changes made with Coccinelle: