diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2016-12-02 15:40:04 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2016-12-02 15:40:04 +0300 |
| commit | af2d47c9c799dc62d6162481f304f7b14626ac46 (patch) | |
| tree | ba7b6f31e499542fdf086ea711cd19ca4cc6e669 /Zend/zend_vm_execute.h | |
| parent | b3a4de65cd7f46dd7e3c0d4dabbf894d1fdcd85b (diff) | |
| parent | 68558ab71df9bec4f852ad67c7d8fed81b0cb809 (diff) | |
| download | php-git-af2d47c9c799dc62d6162481f304f7b14626ac46.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Eliminated useless exception check
Diffstat (limited to 'Zend/zend_vm_execute.h')
| -rw-r--r-- | Zend/zend_vm_execute.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index cb49393dd3..5c99685c9a 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -1888,7 +1888,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSERT_CHECK_SPEC_HANDLER(ZEND if (RETURN_VALUE_USED(opline)) { ZVAL_TRUE(EX_VAR(opline->result.var)); } - ZEND_VM_JMP(target); + ZEND_VM_SET_OPCODE(target); + ZEND_VM_CONTINUE(); } else { ZEND_VM_NEXT_OPCODE(); } |