diff options
| -rw-r--r-- | Zend/zend_vm_def.h | 8 | ||||
| -rw-r--r-- | Zend/zend_vm_execute.h | 8 |
2 files changed, 2 insertions, 14 deletions
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index f9739445f5..0af6500b6a 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 728fc49c8f..cd5df3e61c 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); } } |