diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-07-04 18:03:45 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-07-04 18:03:45 +0400 |
| commit | 6bf24f4dd01331122a0f10db392c08605f159826 (patch) | |
| tree | 7fe575ead375355aab6c9b2c8a1593642d658406 /Zend/zend_vm_execute.skl | |
| parent | d2890963e4540a20954afae0e059810312c9dc4e (diff) | |
| download | php-git-6bf24f4dd01331122a0f10db392c08605f159826.tar.gz | |
Removed EG(active_symbol_table) and use corresponding value from EG(current_execute_data)
Diffstat (limited to 'Zend/zend_vm_execute.skl')
| -rw-r--r-- | Zend/zend_vm_execute.skl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Zend/zend_vm_execute.skl b/Zend/zend_vm_execute.skl index ae5bac4db3..51cede9834 100644 --- a/Zend/zend_vm_execute.skl +++ b/Zend/zend_vm_execute.skl @@ -40,9 +40,10 @@ ZEND_API void zend_{%EXECUTOR_NAME%}(zend_op_array *op_array, zval *return_value } else { execute_data = zend_vm_stack_push_call_frame( (zend_function*)op_array, 0, 0, EG(current_execute_data) ? EG(current_execute_data)->called_scope : NULL, Z_OBJ(EG(This)), NULL TSRMLS_CC); + execute_data->symbol_table = &EG(symbol_table); } EX(prev_execute_data) = EG(current_execute_data); - i_init_execute_data(execute_data, op_array, return_value, EG(active_symbol_table) ? VM_FRAME_TOP_CODE : VM_FRAME_TOP_FUNCTION TSRMLS_CC); + i_init_execute_data(execute_data, op_array, return_value, (execute_data->symbol_table) ? VM_FRAME_TOP_CODE : VM_FRAME_TOP_FUNCTION TSRMLS_CC); zend_{%EXECUTOR_NAME%}_ex(execute_data TSRMLS_CC); } |