diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2018-07-26 12:58:07 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2018-07-26 12:58:07 +0300 |
| commit | ab8094c666048b747481df0b9da94e08cadc4160 (patch) | |
| tree | 3ac94d92f4b07fe2d1d98db81203c85572bea82c /Zend/zend_execute_API.c | |
| parent | 7a41e4c0d0ddb2cfb91e31b210d7bceb158d2ab4 (diff) | |
| download | php-git-ab8094c666048b747481df0b9da94e08cadc4160.tar.gz | |
Pack zend_constant.flags and zend_constant.module_number into reserved space inside zend_constant.value.
Diffstat (limited to 'Zend/zend_execute_API.c')
| -rw-r--r-- | Zend/zend_execute_API.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 35d0a91871..8dfeaf28ca 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -101,7 +101,7 @@ static void zend_extension_deactivator(zend_extension *extension) /* {{{ */ static int clean_non_persistent_constant_full(zval *zv) /* {{{ */ { zend_constant *c = Z_PTR_P(zv); - return (c->flags & CONST_PERSISTENT) ? ZEND_HASH_APPLY_KEEP : ZEND_HASH_APPLY_REMOVE; + return (ZEND_CONSTANT_FLAGS(c) & CONST_PERSISTENT) ? ZEND_HASH_APPLY_KEEP : ZEND_HASH_APPLY_REMOVE; } /* }}} */ @@ -319,7 +319,7 @@ void shutdown_executor(void) /* {{{ */ } else { ZEND_HASH_REVERSE_FOREACH_STR_KEY_VAL(EG(zend_constants), key, zv) { zend_constant *c = Z_PTR_P(zv); - if (c->flags & CONST_PERSISTENT) { + if (ZEND_CONSTANT_FLAGS(c) & CONST_PERSISTENT) { break; } zval_ptr_dtor_nogc(&c->value); |