diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-11-28 10:21:18 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-11-28 10:21:18 +0300 |
| commit | 9a36cb1a07c247766278a888612ecbac812bece9 (patch) | |
| tree | 6f3fbdc11f02d89dda86cf8822ff1e4c25e507b9 /Zend/zend_execute.c | |
| parent | 4dcc8a63715b1bb42518e9c217ea493007016932 (diff) | |
| download | php-git-9a36cb1a07c247766278a888612ecbac812bece9.tar.gz | |
Get rid of EX(scope). In most cases we use EG(scope) anyway. EX(scope) was used to switch EG(scope) back after call, but it's possibleto use EX(func)->common.scope instead.
Diffstat (limited to 'Zend/zend_execute.c')
| -rw-r--r-- | Zend/zend_execute.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 2fbd1d5011..d956a5205b 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -1484,7 +1484,6 @@ static zend_always_inline void i_init_func_execute_data(zend_execute_data *execu { uint32_t first_extra_arg, num_args; ZEND_ASSERT(EX(func) == (zend_function*)op_array); - ZEND_ASSERT(EX(scope) == EG(scope)); EX(opline) = op_array->opcodes; EX(call) = NULL; @@ -1553,7 +1552,6 @@ static zend_always_inline void i_init_code_execute_data(zend_execute_data *execu EX(opline) = op_array->opcodes; EX(call) = NULL; EX(return_value) = return_value; - EX(scope) = EG(scope); zend_attach_symbol_table(execute_data); @@ -1578,7 +1576,6 @@ static zend_always_inline void i_init_execute_data(zend_execute_data *execute_da EX(opline) = op_array->opcodes; EX(call) = NULL; EX(return_value) = return_value; - EX(scope) = EG(scope); if (UNEXPECTED(EX(symbol_table) != NULL)) { zend_attach_symbol_table(execute_data); @@ -1690,7 +1687,6 @@ ZEND_API zend_execute_data *zend_create_generator_execute_data(zend_execute_data } EX(symbol_table) = NULL; - EX(scope) = EG(scope); i_init_func_execute_data(execute_data, op_array, return_value TSRMLS_CC); |