diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-09-09 11:54:44 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2015-09-09 11:54:44 +0300 |
| commit | b1be126788162052707f5553ae1cafca0faa06ce (patch) | |
| tree | 4fa2595a1fea701677d0ff35d6807cc74620a148 /Zend/zend_vm_execute.h | |
| parent | b00a315806ca1ac24b3e1ff97764f9813ad664e6 (diff) | |
| download | php-git-b1be126788162052707f5553ae1cafca0faa06ce.tar.gz | |
Avoid useless EG(exception) checks
Diffstat (limited to 'Zend/zend_vm_execute.h')
| -rw-r--r-- | Zend/zend_vm_execute.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index a9cb1e6207..2889de55f2 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -15912,10 +15912,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FE_FETCH_R_SPEC_VAR_HANDLER(ZE } } else { zend_error(E_WARNING, "Invalid argument supplied for foreach()"); -fe_fetch_r_exit: - if (EXPECTED(!EG(exception))) { - ZEND_VM_SET_RELATIVE_OPCODE(opline, opline->extended_value); + if (UNEXPECTED(EG(exception))) { + HANDLE_EXCEPTION(); } +fe_fetch_r_exit: + ZEND_VM_SET_RELATIVE_OPCODE(opline, opline->extended_value); ZEND_VM_CONTINUE(); } @@ -16103,10 +16104,11 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FE_FETCH_RW_SPEC_VAR_HANDLER(Z } } else { zend_error(E_WARNING, "Invalid argument supplied for foreach()"); -fe_fetch_w_exit: - if (EXPECTED(!EG(exception))) { - ZEND_VM_SET_RELATIVE_OPCODE(opline, opline->extended_value); + if (UNEXPECTED(EG(exception))) { + HANDLE_EXCEPTION(); } +fe_fetch_w_exit: + ZEND_VM_SET_RELATIVE_OPCODE(opline, opline->extended_value); ZEND_VM_CONTINUE(); } |