diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2016-03-02 16:57:08 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2016-03-02 16:57:08 +0300 |
| commit | 960b3755b3ca97f3ea2f98f65f1ac88f24d320ac (patch) | |
| tree | b212de5443b19c615ff39aa9a2cfa95a0010d441 | |
| parent | 701edb8c82439ed5986be0718a5246cd37452f96 (diff) | |
| parent | 908b662f7fcfbc032f70ece82c25fdc8d21de4b3 (diff) | |
| download | php-git-960b3755b3ca97f3ea2f98f65f1ac88f24d320ac.tar.gz | |
Merge branch 'PHP-7.0'
* PHP-7.0:
PHP-7 zend_call_function() doesn't support symbol_table substitution
| -rw-r--r-- | Zend/zend_execute_API.c | 3 | ||||
| -rw-r--r-- | sapi/phpdbg/phpdbg_prompt.c | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index ed2170d5df..733688d2c7 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -851,6 +851,9 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache) / ZEND_ADD_CALL_FLAG(call, ZEND_CALL_CLOSURE); } + /* PHP-7 doesn't support symbol_table substitution for functions */ + ZEND_ASSERT(fci->symbol_table == NULL); + if (func->type == ZEND_USER_FUNCTION) { int call_via_handler = (func->common.fn_flags & ZEND_ACC_CALL_VIA_TRAMPOLINE) != 0; EG(scope) = func->common.scope; diff --git a/sapi/phpdbg/phpdbg_prompt.c b/sapi/phpdbg/phpdbg_prompt.c index edfdba688e..5b3b546466 100644 --- a/sapi/phpdbg/phpdbg_prompt.c +++ b/sapi/phpdbg/phpdbg_prompt.c @@ -121,7 +121,8 @@ static inline int phpdbg_call_register(phpdbg_param_t *stack) /* {{{ */ ZVAL_STRINGL(&fci.function_name, lc_name, name->len); fci.size = sizeof(zend_fcall_info); fci.function_table = &PHPDBG_G(registered); - fci.symbol_table = zend_rebuild_symbol_table(); + //???fci.symbol_table = zend_rebuild_symbol_table(); + fci.symbol_table = NULL; fci.object = NULL; fci.retval = &fretval; fci.no_separation = 1; |