diff options
| author | Xinchen Hui <laruence@php.net> | 2015-04-20 10:51:55 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-04-20 10:53:58 +0800 |
| commit | a819404e9e4a96ee80975e05de053a6e210f6c41 (patch) | |
| tree | d452bbf829648c09877bc0363830b581745bd604 | |
| parent | b1bd6f502faa546d575eb24adcd2c4ca69628614 (diff) | |
| download | php-git-a819404e9e4a96ee80975e05de053a6e210f6c41.tar.gz | |
Refix opline usage
| -rw-r--r-- | Zend/zend_vm_def.h | 6 | ||||
| -rw-r--r-- | Zend/zend_vm_execute.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 25f6bf85d6..c3022ef0d0 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -7857,7 +7857,7 @@ ZEND_VM_C_LABEL(call_trampoline_end): ZEND_VM_RETURN(); } - opline = execute_data->opline; + LOAD_OPLINE(); if (object) { OBJ_RELEASE(object); @@ -7866,8 +7866,8 @@ ZEND_VM_C_LABEL(call_trampoline_end): if (UNEXPECTED(EG(exception) != NULL)) { zend_throw_exception_internal(NULL); - if (RETURN_VALUE_USED(opline)) { - zval_ptr_dtor(EX_VAR(opline->result.var)); + if (RETURN_VALUE_USED(OPLINE)) { + zval_ptr_dtor(EX_VAR(OPLINE->result.var)); } HANDLE_EXCEPTION_LEAVE(); } diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 56a40f8dc8..efa0893892 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -1893,7 +1893,7 @@ call_trampoline_end: ZEND_VM_RETURN(); } - opline = execute_data->opline; + LOAD_OPLINE(); if (object) { OBJ_RELEASE(object); @@ -1902,8 +1902,8 @@ call_trampoline_end: if (UNEXPECTED(EG(exception) != NULL)) { zend_throw_exception_internal(NULL); - if (RETURN_VALUE_USED(opline)) { - zval_ptr_dtor(EX_VAR(opline->result.var)); + if (RETURN_VALUE_USED(OPLINE)) { + zval_ptr_dtor(EX_VAR(OPLINE->result.var)); } HANDLE_EXCEPTION_LEAVE(); } |