diff options
| author | Nikita Popov <nikic@php.net> | 2015-07-21 18:06:19 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2015-07-21 21:13:34 +0200 |
| commit | 7c661bd30408c4acbd623ee310e468b4e2bb97bb (patch) | |
| tree | 4088fe76eb518c99a8062ca60d29056cde4342d1 /Zend/zend_vm_execute.h | |
| parent | 2141ab9be5c2b07c24534552753f8227473efa07 (diff) | |
| download | php-git-7c661bd30408c4acbd623ee310e468b4e2bb97bb.tar.gz | |
Remove FAST_CALL_FROM_CATCH
This was generated for a return from a try block with both a catch
and a finally. However at this point no exception can be active,
because it either didn't exist in the first place or was explicitly
discarded using DISCARD_EXCEPTION.
Diffstat (limited to 'Zend/zend_vm_execute.h')
| -rw-r--r-- | Zend/zend_vm_execute.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 2be1016018..9b4d2107fa 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -1609,12 +1609,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FAST_CALL_SPEC_HANDLER(ZEND_OP USE_OPLINE zval *fast_call = EX_VAR(opline->result.var); - if ((opline->extended_value & ZEND_FAST_CALL_FROM_CATCH) && - UNEXPECTED(EG(prev_exception) != NULL)) { - /* in case of unhandled exception jump to catch block instead of finally */ - ZEND_VM_SET_OPCODE(&EX(func)->op_array.opcodes[opline->op2.opline_num]); - ZEND_VM_CONTINUE(); - } if (opline->extended_value == ZEND_FAST_CALL_FROM_FINALLY && UNEXPECTED(Z_OBJ_P(fast_call) != NULL)) { fast_call->u2.lineno = (uint32_t)-1; } else { |