diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-04-23 12:16:37 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2015-04-23 12:16:37 +0300 |
| commit | 49cf7c5d120876b52fb187e4c13f4adc4fc4d9a6 (patch) | |
| tree | 98dd1e2611a86e363a9c8f35f91a033eb5c1d0e6 /Zend/zend_vm_execute.skl | |
| parent | 801768f72ceb5682b3bc6c10827f747d93753a58 (diff) | |
| download | php-git-49cf7c5d120876b52fb187e4c13f4adc4fc4d9a6.tar.gz | |
Don't propogate "fake" EX(called_scope) and EX(This) into each internal function.
They need quite seldom and it's cheaper to get them from corresponfing upper stack frame.
Diffstat (limited to 'Zend/zend_vm_execute.skl')
| -rw-r--r-- | Zend/zend_vm_execute.skl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_vm_execute.skl b/Zend/zend_vm_execute.skl index 5bbc390f5b..02fe6bdc36 100644 --- a/Zend/zend_vm_execute.skl +++ b/Zend/zend_vm_execute.skl @@ -29,7 +29,7 @@ ZEND_API void zend_{%EXECUTOR_NAME%}(zend_op_array *op_array, zval *return_value } execute_data = zend_vm_stack_push_call_frame(ZEND_CALL_TOP_CODE, - (zend_function*)op_array, 0, EG(current_execute_data) ? EG(current_execute_data)->called_scope : NULL, EG(current_execute_data) ? Z_OBJ(EG(current_execute_data)->This) : NULL); + (zend_function*)op_array, 0, zend_get_called_scope(EG(current_execute_data)), zend_get_this_object(EG(current_execute_data))); if (EG(current_execute_data)) { execute_data->symbol_table = zend_rebuild_symbol_table(); } else { |