diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2016-03-02 17:50:55 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2016-03-02 17:50:55 +0300 |
| commit | c67c166f930b2f815a805a3376e9244794e20c31 (patch) | |
| tree | 6ec75a15e3dd9c7e9cdb0e1ba06ffb038726a0b9 /Zend/zend_execute_API.c | |
| parent | 960b3755b3ca97f3ea2f98f65f1ac88f24d320ac (diff) | |
| download | php-git-c67c166f930b2f815a805a3376e9244794e20c31.tar.gz | |
Removed zend_fcall_info.symbol_table
Diffstat (limited to 'Zend/zend_execute_API.c')
| -rw-r--r-- | Zend/zend_execute_API.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 733688d2c7..bbf25863c9 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -668,7 +668,7 @@ int call_user_function(HashTable *function_table, zval *object, zval *function_n } /* }}} */ -int call_user_function_ex(HashTable *function_table, zval *object, zval *function_name, zval *retval_ptr, uint32_t param_count, zval params[], int no_separation, zend_array *symbol_table) /* {{{ */ +int _call_user_function_ex(HashTable *function_table, zval *object, zval *function_name, zval *retval_ptr, uint32_t param_count, zval params[], int no_separation) /* {{{ */ { zend_fcall_info fci; @@ -680,7 +680,6 @@ int call_user_function_ex(HashTable *function_table, zval *object, zval *functio fci.param_count = param_count; fci.params = params; fci.no_separation = (zend_bool) no_separation; - fci.symbol_table = symbol_table; return zend_call_function(&fci, NULL); } @@ -851,13 +850,10 @@ 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; - call->symbol_table = fci->symbol_table; + call->symbol_table = NULL; if (EXPECTED((func->op_array.fn_flags & ZEND_ACC_GENERATOR) == 0)) { zend_init_execute_data(call, &func->op_array, fci->retval); zend_execute_ex(call); @@ -1027,7 +1023,6 @@ ZEND_API zend_class_entry *zend_lookup_class_ex(zend_string *name, const zval *k fcall_info.size = sizeof(fcall_info); fcall_info.function_table = EG(function_table); ZVAL_STR_COPY(&fcall_info.function_name, EG(autoload_func)->common.function_name); - fcall_info.symbol_table = NULL; fcall_info.retval = &local_retval; fcall_info.param_count = 1; fcall_info.params = args; |