diff options
| author | Anatol Belski <ab@php.net> | 2014-10-07 18:44:15 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-10-07 18:44:15 +0200 |
| commit | 62598740aa8e21b304e28988e74241413d08c81d (patch) | |
| tree | d94cc54a8a390279de2de2e8bd818db86f7ca97f /Zend/zend_execute_API.c | |
| parent | ebaa6a74a51d435c81489d7ea5df41e286135465 (diff) | |
| parent | 75b5dc63695775f6b7a5aa862efbc9766ce642d2 (diff) | |
| download | php-git-62598740aa8e21b304e28988e74241413d08c81d.tar.gz | |
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
Reorder fields for better alignment on both 32-bit and 64-bit systems
Remove useless parts of EX(old_error_reporting)
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 35361663ad..e31f131781 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -733,7 +733,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 && @@ -841,7 +842,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); |