diff options
| author | Xinchen Hui <laruence@gmail.com> | 2013-12-13 11:37:43 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2013-12-13 11:37:43 +0800 |
| commit | 6f95a07c411fa78092427c6edd2d867d0f085b73 (patch) | |
| tree | 21650071bfcef573bd7045cb362cbc2cfb558f9a | |
| parent | bc748ba38ce93025178a0f9de6c444f5cd25ad1d (diff) | |
| parent | ef73f85079e7563cb82afde35f0e89321257f0d9 (diff) | |
| download | php-git-6f95a07c411fa78092427c6edd2d867d0f085b73.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
| -rw-r--r-- | Zend/zend_opcode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_opcode.c b/Zend/zend_opcode.c index 89563ed47b..ac16e81ef1 100644 --- a/Zend/zend_opcode.c +++ b/Zend/zend_opcode.c @@ -496,7 +496,7 @@ static void zend_check_finally_breakout(zend_op_array *op_array, zend_uint op_nu CG(in_compilation) = 1; CG(active_op_array) = op_array; CG(zend_lineno) = op_array->opcodes[op_num].lineno; - zend_error(E_COMPILE_ERROR, "jump into a finally block is disallowed"); + zend_error_noreturn(E_COMPILE_ERROR, "jump into a finally block is disallowed"); } else if ((op_num >= op_array->try_catch_array[i].finally_op && op_num <= op_array->try_catch_array[i].finally_end) && (dst_num > op_array->try_catch_array[i].finally_end |