PHP-7 zend_call_function() doesn't support symbol_table substitution

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 56ad4366ff87331497a4a979d3d8affa0d850cb4..2a7c8f4894c7104a028be4e2ec5a82293d307824 100644 (file)
--- 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 558ca469b57af3ce32114218a3fd086544022ea9..31d3c01e46c31a2871c8171557e778835c55be48 100644 (file)
--- 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;