diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2018-01-30 22:06:05 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2018-01-30 22:06:05 +0300 |
| commit | 7141631cc886fbb9c58af2deb2d324346de2980d (patch) | |
| tree | 7dfef243dcca1bef25d6af086d721c249fa89b26 /Zend/zend_execute.c | |
| parent | acbd348969ea9f9a334c74dcc309da62e9bdc24e (diff) | |
| download | php-git-7141631cc886fbb9c58af2deb2d324346de2980d.tar.gz | |
Change FETCH/ISSET instruction modifiers:
- Get rid of ZEND_ISEMPTY and ZEND_ISSET_ISEMPTY_MASK. Use just single ZEND_ISSET bit to make distinct between isset() and empty()
- Use ZEND_FETCH_GLOBAL, ZEND_FETCH_LOCAL and ZEND_FETCH_GLOBAL_LOCK as bitmask
- Removed unused ZEND_FETCH_STANDARD
- Extended ZEND_FETCH_ARG_MASK
Diffstat (limited to 'Zend/zend_execute.c')
| -rw-r--r-- | Zend/zend_execute.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index c660988f9c..50d518cefc 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -1519,11 +1519,10 @@ static zend_always_inline HashTable *zend_get_target_symbol_table(int fetch_type { HashTable *ht; - if (EXPECTED(fetch_type == ZEND_FETCH_GLOBAL_LOCK) || - EXPECTED(fetch_type == ZEND_FETCH_GLOBAL)) { + if (EXPECTED(fetch_type & (ZEND_FETCH_GLOBAL_LOCK | ZEND_FETCH_GLOBAL))) { ht = &EG(symbol_table); } else { - ZEND_ASSERT(fetch_type == ZEND_FETCH_LOCAL); + ZEND_ASSERT(fetch_type & ZEND_FETCH_LOCAL); if (!(EX_CALL_INFO() & ZEND_CALL_HAS_SYMBOL_TABLE)) { zend_rebuild_symbol_table(); } |