diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-10-07 17:12:12 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-10-07 17:12:12 +0400 |
| commit | 33e137d409f552f35bf73ccb76c37b1ee0d65e2f (patch) | |
| tree | f2d4921cf02f174e426338964cdbe44eb26a05c1 /Zend/zend_execute_API.c | |
| parent | e24c24c1087c6405e842fdd7afcd84b224eb75bf (diff) | |
| download | php-git-33e137d409f552f35bf73ccb76c37b1ee0d65e2f.tar.gz | |
Merged EX(frame_kind) and EX(flags) into single word
Diffstat (limited to 'Zend/zend_execute_API.c')
| -rw-r--r-- | Zend/zend_execute_API.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 1da64bb978..f6bd9d1ca7 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -736,7 +736,8 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache TS } func = fci_cache->function_handler; - call = zend_vm_stack_push_call_frame(func, fci->param_count, 0, fci_cache->called_scope, fci_cache->object, NULL TSRMLS_CC); + call = zend_vm_stack_push_call_frame(VM_FRAME_TOP_FUNCTION, + func, fci->param_count, fci_cache->called_scope, fci_cache->object, NULL TSRMLS_CC); calling_scope = fci_cache->calling_scope; fci->object = fci_cache->object; if (fci->object && @@ -844,7 +845,7 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache TS EG(scope) = func->common.scope; call->symbol_table = fci->symbol_table; if (EXPECTED((func->op_array.fn_flags & ZEND_ACC_GENERATOR) == 0)) { - zend_init_execute_data(call, &func->op_array, fci->retval, VM_FRAME_TOP_FUNCTION TSRMLS_CC); + zend_init_execute_data(call, &func->op_array, fci->retval TSRMLS_CC); zend_execute_ex(call TSRMLS_CC); } else { zend_generator_create_zval(call, &func->op_array, fci->retval TSRMLS_CC); |