ext/*: Make X_from_obj(zend_object *obj) functions macros#22183
Open
TimWolla wants to merge 3 commits into
Open
ext/*: Make X_from_obj(zend_object *obj) functions macros#22183TimWolla wants to merge 3 commits into
X_from_obj(zend_object *obj) functions macros#22183TimWolla wants to merge 3 commits into
Conversation
With the introduction of the `ZEND_CONTAINER_OF()` macro we can now preserve
whether or not the `zend_object *` is `const` when extracting the
class-specific struct. This change will allow to use `const zend_object *` in
more locations.
Changes performed with Coccinelle followed by some manual cleanup for comment
and whitespace formatting:
@A@
attribute name zend_always_inline;
type T;
identifier obj;
identifier f;
typedef zend_object;
@@
T* f(zend_object *obj) { return ZEND_CONTAINER_OF(obj, T, std); }
+ #define f(obj) ZEND_CONTAINER_OF(obj, T, std)
@@
identifier a.f;
@@
- f(...) { ... }
@b@
attribute name zend_always_inline;
type T;
identifier obj;
identifier f;
typedef zend_object;
@@
T* f(zend_object *obj) { return ZEND_CONTAINER_OF(obj, T, zo); }
+ #define f(obj) ZEND_CONTAINER_OF(obj, T, zo)
@@
identifier b.f;
@@
- f(...) { ... }
TimWolla
requested review from
DanielEScherzer,
Girgias,
NattyNarwhal,
SakiTakamachi,
adoy,
bukka,
derickr,
devnexen,
kamil-tekiela,
kocsismate and
zeriyoshi
as code owners
github-actions
Bot
added
Extension: openssl
Extension: intl
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)
Extension: pgsql
Extension: reflection
Extension: shmop
Extension: simplexml
labels
github-actions
Bot
added
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: zip
Extension: zlib
Extension: random
ABI break
Extension: uri
labels
Girgias
approved these changes
May 30, 2026
| php_socket *php_socket; | ||
|
|
||
| ZEND_PARSE_PARAMETERS_START(1, 1) | ||
| Z_PARAM_OBJECT_OF_CLASS(arg1, socket_ce) |
Member
There was a problem hiding this comment.
Possible follow-up, but maybe we should refactor this to use the version that returns a zend_object rather than zval?
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
2 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.
With the introduction of the
ZEND_CONTAINER_OF()macro we can now preserve whether or not thezend_object *isconstwhen extracting the class-specific struct. This change will allow to useconst zend_object *in more locations.Changes performed with Coccinelle followed by some manual cleanup for comment and whitespace formatting: