diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-11-28 10:33:03 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-11-28 10:33:03 +0300 |
| commit | 1da14c9f81084e3b740e2d2d770292386b95a38a (patch) | |
| tree | 7a49f4bb7875977f57b7d77c89a7275595f7c582 /Zend/zend_execute_API.c | |
| parent | 11384ba77b9ee58beff7a08d230ed277153bb8f4 (diff) | |
| download | php-git-1da14c9f81084e3b740e2d2d770292386b95a38a.tar.gz | |
Pack EX(frame_info) into EX(This).u1.v.reserved. Rename "frame"kind" into "call_kind" and VM_FRAME_... into ZEND_CALL_...
Diffstat (limited to 'Zend/zend_execute_API.c')
| -rw-r--r-- | Zend/zend_execute_API.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index f0fc735183..286858f688 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -736,7 +736,7 @@ 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(VM_FRAME_TOP_FUNCTION, + call = zend_vm_stack_push_call_frame(ZEND_CALL_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; @@ -835,9 +835,8 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache TS } if (!fci->object) { Z_OBJ(call->This) = NULL; - Z_TYPE_INFO(call->This) = IS_UNDEF; } else { - ZVAL_OBJ(&call->This, fci->object); + Z_OBJ(call->This) = fci->object; GC_REFCOUNT(fci->object)++; } |