diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2020-09-08 16:47:30 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2020-09-08 16:47:30 +0300 |
| commit | a6a96116ac590ded65e8e8d4aac9d6412537c688 (patch) | |
| tree | 3fbe9ba83cb84b3c4b8181ac15a93f7f551c1cb2 /Zend/zend_vm_def.h | |
| parent | 02b645e47a3cd5812175b155edb31c64190e8306 (diff) | |
| download | php-git-a6a96116ac590ded65e8e8d4aac9d6412537c688.tar.gz | |
micro-optimization
Diffstat (limited to 'Zend/zend_vm_def.h')
| -rw-r--r-- | Zend/zend_vm_def.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 6138ecb263..9c96328fc4 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -3729,12 +3729,8 @@ ZEND_VM_C_LABEL(try_function_name): call = NULL; } - FREE_OP2(); - if (UNEXPECTED(!call)) { - HANDLE_EXCEPTION(); - } - if (OP2_TYPE & (IS_VAR|IS_TMP_VAR)) { + FREE_OP2(); if (UNEXPECTED(EG(exception))) { if (call) { if (call->func->common.fn_flags & ZEND_ACC_CALL_VIA_TRAMPOLINE) { @@ -3745,6 +3741,8 @@ ZEND_VM_C_LABEL(try_function_name): } HANDLE_EXCEPTION(); } + } else if (!call) { + HANDLE_EXCEPTION(); } call->prev_execute_data = EX(call); |