diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-02-19 10:09:06 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-02-19 10:09:06 +0100 |
| commit | 32c0cbcbc146deebf5cd3dc35fad630e2ba5bdeb (patch) | |
| tree | 58e0775bbea6b9922170a4b65e79e0f5546b67a4 /ext | |
| parent | 12ffee57d6adf38f8dd8b39ea7f7a5e4c462d358 (diff) | |
| parent | f8cd8eb7404e4605bf2f9f0471f7ff4784e5341e (diff) | |
| download | php-git-32c0cbcbc146deebf5cd3dc35fad630e2ba5bdeb.tar.gz | |
Merge remote-tracking branch 'php-src/PHP-7.4' into 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 f2d2f232aa..3bc0650ab4 100644 --- a/ext/opcache/Optimizer/zend_dump.c +++ b/ext/opcache/Optimizer/zend_dump.c @@ -927,8 +927,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() |