php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix duplicate pattern usage in Z_TRY_(ADD|DEL)REF_P (GH-17097)

Browse Source 
GCC produces exactly the same binary with and without this change (without
extensions), which demonstrates two things:

* There is no additional register pressure.
* All usages of the macros were correct in older branches, i.e. the expressions
  did not have any side-effects.
This commit is contained in:
Ilija Tovilo
2024-12-09 18:45:29 +01:00
committed by GitHub
parent 5a482a139c
commit 3590890716
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Zend/zend_types.h
View File

@@ -1273,14 +1273,16 @@ static zend_always_inline uint32_t zval_gc_info(uint32_t gc_type_info) {
#define Z_DELREF(z) Z_DELREF_P(&(z))
#define Z_TRY_ADDREF_P(pz) do { \
if (Z_REFCOUNTED_P((pz))) { \
Z_ADDREF_P((pz)); \
zval *_pz = (pz); \
if (Z_REFCOUNTED_P(_pz)) { \
Z_ADDREF_P(_pz); \
} \
} while (0)
#define Z_TRY_DELREF_P(pz) do { \
if (Z_REFCOUNTED_P((pz))) { \
Z_DELREF_P((pz)); \
zval *_pz = (pz); \
if (Z_REFCOUNTED_P(_pz)) { \
Z_DELREF_P(_pz); \
} \
} while (0)