diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-02-19 10:12:01 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-02-19 10:12:01 +0100 |
| commit | f37c70c7fbe87001eaa1490d60dfc067b8c3c0bc (patch) | |
| tree | 14c42281f10ddb5adbae19c57a26c1c5cc4eb340 /ext | |
| parent | 1016e3a927165ec571473ee89eab04512c935f21 (diff) | |
| parent | 32c0cbcbc146deebf5cd3dc35fad630e2ba5bdeb (diff) | |
| download | php-git-f37c70c7fbe87001eaa1490d60dfc067b8c3c0bc.tar.gz | |
Merge branch 'PHP-7.4'
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/opcache/Optimizer/zend_cfg.c | 4 | ||||
| -rw-r--r-- | ext/opcache/Optimizer/zend_dump.c | 7 | ||||
| -rw-r--r-- | ext/opcache/Optimizer/zend_func_info.h | 3 |
3 files changed, 10 insertions, 4 deletions
diff --git a/ext/opcache/Optimizer/zend_cfg.c b/ext/opcache/Optimizer/zend_cfg.c index d6c6565779..ccfdaa3425 100644 --- a/ext/opcache/Optimizer/zend_cfg.c +++ b/ext/opcache/Optimizer/zend_cfg.c @@ -419,9 +419,11 @@ int zend_build_cfg(zend_arena **arena, const zend_op_array *op_array, uint32_t b break; case ZEND_EXT_NOP: case ZEND_EXT_STMT: + flags |= ZEND_FUNC_HAS_EXTENDED_STMT; + break; case ZEND_EXT_FCALL_BEGIN: case ZEND_EXT_FCALL_END: - flags |= ZEND_FUNC_HAS_EXTENDED_INFO; + flags |= ZEND_FUNC_HAS_EXTENDED_FCALL; break; case ZEND_FREE: if (opline->extended_value == ZEND_FREE_SWITCH) { diff --git a/ext/opcache/Optimizer/zend_dump.c b/ext/opcache/Optimizer/zend_dump.c index 0cc0875898..6f5d8ace18 100644 --- a/ext/opcache/Optimizer/zend_dump.c +++ b/ext/opcache/Optimizer/zend_dump.c @@ -924,8 +924,11 @@ void zend_dump_op_array(const zend_op_array *op_array, uint32_t dump_flags, cons if (func_flags & ZEND_FUNC_NO_LOOPS) { fprintf(stderr, ", no_loops"); } - if (func_flags & ZEND_FUNC_HAS_EXTENDED_INFO) { - fprintf(stderr, ", extended_info"); + if (func_flags & ZEND_FUNC_HAS_EXTENDED_STMT) { + fprintf(stderr, ", extended_stmt"); + } + if (func_flags & ZEND_FUNC_HAS_EXTENDED_FCALL) { + fprintf(stderr, ", extended_fcall"); } //TODO: this is useful only for JIT??? #if 0 diff --git a/ext/opcache/Optimizer/zend_func_info.h b/ext/opcache/Optimizer/zend_func_info.h index 7042d6dd9c..7eeb363da5 100644 --- a/ext/opcache/Optimizer/zend_func_info.h +++ b/ext/opcache/Optimizer/zend_func_info.h @@ -31,7 +31,8 @@ #define ZEND_FUNC_RECURSIVE (1<<7) #define ZEND_FUNC_RECURSIVE_DIRECTLY (1<<8) #define ZEND_FUNC_RECURSIVE_INDIRECTLY (1<<9) -#define ZEND_FUNC_HAS_EXTENDED_INFO (1<<10) +#define ZEND_FUNC_HAS_EXTENDED_FCALL (1<<10) +#define ZEND_FUNC_HAS_EXTENDED_STMT (1<<11) /* The following flags are valid only for return values of internal functions * returned by zend_get_func_info() |