diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-10-01 10:46:13 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-10-01 10:46:13 +0400 |
| commit | 9f7564b12b6e57d018bbc158e00f41499017d29e (patch) | |
| tree | a7e80a2c37ca655213dd330bd72627378cc15732 /Zend/zend_vm_execute.h | |
| parent | 63dc9bbc027dc22ad4ef580c964744cd7db7fc33 (diff) | |
| download | php-git-9f7564b12b6e57d018bbc158e00f41499017d29e.tar.gz | |
Removed zend_execute_data->prev_nested_call. Reuse prev_execute_data instead.
Diffstat (limited to 'Zend/zend_vm_execute.h')
| -rw-r--r-- | Zend/zend_vm_execute.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 17858c2875..cb6fd8b5e2 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -495,7 +495,7 @@ static int ZEND_FASTCALL ZEND_DO_FCALL_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS) zend_function *fbc = call->func; SAVE_OPLINE(); - EX(call) = call->prev_nested_call; + EX(call) = call->prev_execute_data; if (UNEXPECTED((fbc->common.fn_flags & (ZEND_ACC_ABSTRACT|ZEND_ACC_DEPRECATED)) != 0)) { if (UNEXPECTED((fbc->common.fn_flags & ZEND_ACC_ABSTRACT) != 0)) { zend_error_noreturn(E_ERROR, "Cannot call abstract method %s::%s()", fbc->common.scope->name->val, fbc->common.function_name->val); @@ -1312,7 +1312,7 @@ static int ZEND_FASTCALL ZEND_HANDLE_EXCEPTION_SPEC_HANDLER(ZEND_OPCODE_HANDLER } OBJ_RELEASE(call->object); } - EX(call) = call->prev_nested_call; + EX(call) = call->prev_execute_data; zend_vm_stack_free_call_frame(call TSRMLS_CC); call = EX(call); } while (call); |