diff options
| author | Xinchen Hui <laruence@php.net> | 2014-07-19 17:19:57 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2014-07-19 17:19:57 +0800 |
| commit | 1c0e22f50c70cdcd62c4b8ccae0ca5ecd7c0ad26 (patch) | |
| tree | 1d85b97c059b2f09ab3611dd9d0390b62b2b18d9 /Zend/zend_vm_execute.h | |
| parent | a3e8a1091879dbea294f0398941acaa6abdb0af5 (diff) | |
| parent | 1d2f232bd29dd29045c7389cf9d23b1ad2fd4db8 (diff) | |
| download | php-git-1c0e22f50c70cdcd62c4b8ccae0ca5ecd7c0ad26.tar.gz | |
Merge branch 'PHP-5.6'
Diffstat (limited to 'Zend/zend_vm_execute.h')
| -rw-r--r-- | Zend/zend_vm_execute.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 4f47bb1e9f..0151ea0684 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -1344,7 +1344,7 @@ static int ZEND_FASTCALL ZEND_FAST_CALL_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS) { USE_OPLINE - if ((opline->extended_value & ZEND_FAST_CALL_FOR_CATCH) && + 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(op_array)->opcodes[opline->op2.opline_num]); @@ -1360,7 +1360,7 @@ static int ZEND_FASTCALL ZEND_FAST_RET_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS) { if (EX(fast_ret)) { ZEND_VM_SET_OPCODE(EX(fast_ret) + 1); - if ((EX(fast_ret)->extended_value & ZEND_FAST_CALL_FOR_FINALLY)) { + if ((EX(fast_ret)->extended_value & ZEND_FAST_CALL_FROM_FINALLY)) { EX(fast_ret) = &EX(op_array)->opcodes[EX(fast_ret)->op2.opline_num]; } ZEND_VM_CONTINUE(); |