com php-src: Throw exception will override EX(opline): Zend/zend_vm_def.h Zend/zend_vm_execute.h

From: Date: Mon, 20 Apr 2015 03:58:23 +0000
Subject: com php-src: Throw exception will override EX(opline): Zend/zend_vm_def.h Zend/zend_vm_execute.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-86396@lists.php.net to get a copy of this message
Commit: 1c3b99c4ff20bdce1c589318c39e7fd20d6f9ee2 Author: Xinchen Hui <laruence@php.net> Mon, 20 Apr 2015 11:58:23 +0800 Parents: d66045fe73fb646f15a45286313231908e656a37 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1c3b99c4ff20bdce1c589318c39e7fd20d6f9ee2 Log: Throw exception will override EX(opline) Changed paths: M Zend/zend_vm_def.h M Zend/zend_vm_execute.h Diff: diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index c3022ef..9198964 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(); } - LOAD_OPLINE(); + opline = EX(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 efa0893..489529e 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -1893,7 +1893,7 @@ call_trampoline_end: ZEND_VM_RETURN(); } - LOAD_OPLINE(); + opline = EX(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(); }

« previous php.cvs (#86396) next »