Merge branch 'PHP-5.5' into PHP-5.6

13 years ago · 6f95a07c41
1 changed files with 1 additions and 1 deletions
--- 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