com php-src: Revert "Ensure proper exception handling and EX(opline) state in USER_OPCODE handler": Zend/zend_vm_def.h Z end/zend_vm_execute.h

From: Date: Tue, 20 Oct 2015 15:12:04 +0000
Subject: com php-src: Revert "Ensure proper exception handling and EX(opline) state in USER_OPCODE handler": Zend/zend_vm_def.h Z end/zend_vm_execute.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-89474@lists.php.net to get a copy of this message
Commit: 6ad2c3eb3399ec1417c419d10543b7e7ae8eef9a Author: Xinchen Hui <laruence@gmail.com> Tue, 20 Oct 2015 08:12:04 -0700 Parents: 673ad62eed8385e9b1f569624971599478681afa Branches: PHP-7.0 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6ad2c3eb3399ec1417c419d10543b7e7ae8eef9a Log: Revert "Ensure proper exception handling and EX(opline) state in USER_OPCODE handler" read: http://news.php.net/php.internals/88887 This reverts commit 808f62bb4d9812e9b7b35c87f3e90e5fc2bc244b. 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 f973944..0af6500 100644 --- a/Zend/zend_vm_def..h +++ b/Zend/zend_vm_def.h @@ -7176,14 +7176,10 @@ ZEND_VM_HANDLER(150, ZEND_USER_OPCODE, ANY, ANY) SAVE_OPLINE(); ret = zend_user_opcode_handlers[opline->opcode](execute_data); - - if (EG(exception)) { - HANDLE_EXCEPTION(); - } + LOAD_OPLINE(); switch (ret) { case ZEND_USER_OPCODE_CONTINUE: - LOAD_OPLINE(); ZEND_VM_CONTINUE(); case ZEND_USER_OPCODE_RETURN: if (UNEXPECTED((EX(func)->op_array.fn_flags & ZEND_ACC_GENERATOR) != 0)) { @@ -7199,10 +7195,8 @@ ZEND_VM_HANDLER(150, ZEND_USER_OPCODE, ANY, ANY) LOAD_OPLINE(); ZEND_VM_LEAVE(); case ZEND_USER_OPCODE_DISPATCH: - ZEND_ASSERT(EX(opline) == opline); ZEND_VM_DISPATCH(opline->opcode, opline); default: - ZEND_ASSERT(EX(opline) == opline); ZEND_VM_DISPATCH((zend_uchar)(ret & 0xff), opline); } } diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 728fc49..cd5df3e 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -1566,14 +1566,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_USER_OPCODE_SPEC_HANDLER(ZEND_ SAVE_OPLINE(); ret = zend_user_opcode_handlers[opline->opcode](execute_data); - - if (EG(exception)) { - HANDLE_EXCEPTION(); - } + LOAD_OPLINE(); switch (ret) { case ZEND_USER_OPCODE_CONTINUE: - LOAD_OPLINE(); ZEND_VM_CONTINUE(); case ZEND_USER_OPCODE_RETURN: if (UNEXPECTED((EX(func)->op_array.fn_flags & ZEND_ACC_GENERATOR) != 0)) { @@ -1589,10 +1585,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_USER_OPCODE_SPEC_HANDLER(ZEND_ LOAD_OPLINE(); ZEND_VM_LEAVE(); case ZEND_USER_OPCODE_DISPATCH: - ZEND_ASSERT(EX(opline) == opline); ZEND_VM_DISPATCH(opline->opcode, opline); default: - ZEND_ASSERT(EX(opline) == opline); ZEND_VM_DISPATCH((zend_uchar)(ret & 0xff), opline); } }

« previous php.cvs (#89474) next »