diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2016-03-02 16:56:39 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2016-03-02 16:56:39 +0300 |
| commit | 908b662f7fcfbc032f70ece82c25fdc8d21de4b3 (patch) | |
| tree | 66bae0d5f5ab918babe3004b386ef2d8a70bda34 | |
| parent | b6bbe33f0555a9f5a2085b1716659a94232fe0da (diff) | |
| download | php-git-908b662f7fcfbc032f70ece82c25fdc8d21de4b3.tar.gz | |
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 56ad4366ff..2a7c8f4894 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 558ca469b5..31d3c01e46 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; |