mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-27 20:03:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move SAVE_OPLINE() to its original place

Browse Source
This commit is contained in:
Dmitry Stogov 2016-05-25 00:04:53 +03:00
parent 111432a4df
commit 0c71e24964
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zend/zend_vm_def.h
View File

@ -7537,10 +7537,10 @@ ZEND_VM_HANDLER(159, ZEND_DISCARD_EXCEPTION, ANY, ANY)
{ {
USE_OPLINE USE_OPLINE
zval *fast_call = EX_VAR(opline->op1.var); zval *fast_call = EX_VAR(opline->op1.var);
SAVE_OPLINE();
/* check for delayed exception */ /* check for delayed exception */
if (Z_OBJ_P(fast_call) != NULL) { if (Z_OBJ_P(fast_call) != NULL) {
SAVE_OPLINE();
/* discard the previously thrown exception */ /* discard the previously thrown exception */
OBJ_RELEASE(Z_OBJ_P(fast_call)); OBJ_RELEASE(Z_OBJ_P(fast_call));
Z_OBJ_P(fast_call) = NULL; Z_OBJ_P(fast_call) = NULL;

2
Zend/zend_vm_execute.h
View File

@ -1816,10 +1816,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DISCARD_EXCEPTION_SPEC_HANDLER
{ {
USE_OPLINE USE_OPLINE
zval *fast_call = EX_VAR(opline->op1.var); zval *fast_call = EX_VAR(opline->op1.var);
SAVE_OPLINE();
/* check for delayed exception */ /* check for delayed exception */
if (Z_OBJ_P(fast_call) != NULL) { if (Z_OBJ_P(fast_call) != NULL) {
SAVE_OPLINE();
/* discard the previously thrown exception */ /* discard the previously thrown exception */
OBJ_RELEASE(Z_OBJ_P(fast_call)); OBJ_RELEASE(Z_OBJ_P(fast_call));
Z_OBJ_P(fast_call) = NULL; Z_OBJ_P(fast_call) = NULL;