Treat throw inside block as non-terminator

Author: iluuu1994

Zend/zend_compile.c

@@ -317,6 +317,7 @@ void zend_oparray_context_begin(zend_oparray_context *prev_context) /* {{{ */
 	CG(context).brk_cont_array = NULL;
 	CG(context).labels = NULL;
 	CG(context).has_unfinished_calls = false;
+	CG(context).in_block_expr = false;
 }
 /* }}} */
 
@@ -5350,11 +5351,13 @@ static void zend_compile_throw(znode *result, zend_ast *ast) /* {{{ */
 	zend_compile_expr(&expr_node, expr_ast);
 
 	zend_op *opline = zend_emit_op(NULL, ZEND_THROW, &expr_node, NULL);
-	if (result) {
+	if (result || CG(context).in_block_expr) {
 		/* Mark this as an "expression throw" for opcache. */
 		opline->extended_value = ZEND_THROW_IS_EXPR;
-		result->op_type = IS_CONST;
-		ZVAL_TRUE(&result->u.constant);
+		if (result) {
+			result->op_type = IS_CONST;
+			ZVAL_TRUE(&result->u.constant);
+		}
 	}
 }
 /* }}} */
@@ -6139,7 +6142,7 @@ static void zend_compile_match(znode *result, zend_ast *ast)
 		if (opline->op1_type == IS_CONST) {
 			Z_TRY_ADDREF_P(CT_CONSTANT(opline->op1));
 		}
-		if (arms->children == 0) {
+		if (arms->children == 0 || CG(context).in_block_expr) {
 			/* Mark this as an "expression throw" for opcache. */
 			opline->extended_value = ZEND_THROW_IS_EXPR;
 		}
@@ -6188,8 +6191,11 @@ static void zend_compile_match(znode *result, zend_ast *ast)
 
 		znode body_node;
 		if (body_ast->kind == ZEND_AST_MATCH_ARM_BLOCK) {
+			bool prev_in_block_expr = CG(context).in_block_expr;
+			CG(context).in_block_expr = true;
 			zend_compile_stmt_list(body_ast->child[0]);
 			zend_compile_expr(&body_node, body_ast->child[1]);
+			CG(context).in_block_expr = prev_in_block_expr;
 		} else {
 			zend_compile_expr(&body_node, body_ast);
 		}
@@ -9633,11 +9639,13 @@ static void zend_compile_exit(znode *result, zend_ast *ast) /* {{{ */
 	}
 
 	zend_op *opline = zend_emit_op(NULL, ZEND_EXIT, &expr_node, NULL);
-	if (result) {
+	if (result || CG(context).in_block_expr) {
 		/* Mark this as an "expression throw" for opcache. */
 		opline->extended_value = ZEND_THROW_IS_EXPR;
-		result->op_type = IS_CONST;
-		ZVAL_TRUE(&result->u.constant);
+		if (result) {
+			result->op_type = IS_CONST;
+			ZVAL_TRUE(&result->u.constant);
+		}
 	}
 }
 /* }}} */

Zend/zend_compile.h

@@ -191,6 +191,7 @@ typedef struct _zend_oparray_context {
 	HashTable *labels;
 	/* Whether we're currently evaluating function arguments. */
 	bool       has_unfinished_calls;
+	bool       in_block_expr;
 } zend_oparray_context;
 
 /* Class, property and method flags                  class|meth.|prop.|const*/