Revert kind change

Author: iluuu1994

Zend/zend_compile.c

@@ -710,7 +710,7 @@ void zend_stop_lexing(void)
 }
 
 static inline void zend_begin_loop(
-		uint8_t free_opcode, const znode *loop_var, zend_brk_cont_kind kind) /* {{{ */
+		uint8_t free_opcode, const znode *loop_var, bool is_switch) /* {{{ */
 {
 	zend_brk_cont_element *brk_cont_element;
 	int parent = CG(context).current_brk_cont;
@@ -719,7 +719,7 @@ static inline void zend_begin_loop(
 	CG(context).current_brk_cont = CG(context).last_brk_cont;
 	brk_cont_element = get_next_brk_cont_element();
 	brk_cont_element->parent = parent;
-	brk_cont_element->kind = kind;
+	brk_cont_element->is_switch = is_switch;
 
 	uint32_t start = get_next_op_number();
 	info.opcode_start = start;
@@ -5828,8 +5828,7 @@ static void zend_compile_break_continue(zend_ast *ast) /* {{{ */
 			ZEND_ASSERT(cur != -1);
 		}
 
-		if (CG(context).brk_cont_array[cur].kind == ZEND_BRK_CONT_KIND_SWITCH_MATCH_STMT
-		 || CG(context).brk_cont_array[cur].kind == ZEND_BRK_CONT_KIND_MATCH_EXPR) {
+		if (CG(context).brk_cont_array[cur].is_switch) {
 			if (depth == 1) {
 				if (CG(context).brk_cont_array[cur].parent == -1) {
 					zend_error(E_WARNING,
@@ -5967,7 +5966,7 @@ static void zend_compile_while(zend_ast *ast) /* {{{ */
 
 	opnum_jmp = zend_emit_jump(0);
 
-	zend_begin_loop(ZEND_NOP, NULL, ZEND_BRK_CONT_KIND_LOOP);
+	zend_begin_loop(ZEND_NOP, NULL, 0);
 
 	opnum_start = get_next_op_number();
 	zend_compile_stmt(stmt_ast);
@@ -5990,7 +5989,7 @@ static void zend_compile_do_while(zend_ast *ast) /* {{{ */
 	znode cond_node;
 	uint32_t opnum_start, opnum_cond;
 
-	zend_begin_loop(ZEND_NOP, NULL, ZEND_BRK_CONT_KIND_LOOP);
+	zend_begin_loop(ZEND_NOP, NULL, 0);
 
 	opnum_start = get_next_op_number();
 	zend_compile_stmt(stmt_ast);
@@ -6041,7 +6040,7 @@ static void zend_compile_for(zend_ast *ast) /* {{{ */
 
 	opnum_jmp = zend_emit_jump(0);
 
-	zend_begin_loop(ZEND_NOP, NULL, ZEND_BRK_CONT_KIND_LOOP);
+	zend_begin_loop(ZEND_NOP, NULL, 0);
 
 	opnum_start = get_next_op_number();
 	zend_compile_stmt(stmt_ast);
@@ -6103,7 +6102,7 @@ static void zend_compile_foreach(zend_ast *ast) /* {{{ */
 	opnum_reset = get_next_op_number();
 	opline = zend_emit_op(&reset_node, by_ref ? ZEND_FE_RESET_RW : ZEND_FE_RESET_R, &expr_node, NULL);
 
-	zend_begin_loop(ZEND_FE_FREE, &reset_node, ZEND_BRK_CONT_KIND_LOOP);
+	zend_begin_loop(ZEND_FE_FREE, &reset_node, 0);
 
 	opnum_fetch = get_next_op_number();
 	opline = zend_emit_op(NULL, by_ref ? ZEND_FE_FETCH_RW : ZEND_FE_FETCH_R, &reset_node, NULL);
@@ -6276,7 +6275,7 @@ static void zend_compile_switch(zend_ast *ast) /* {{{ */
 
 	zend_compile_expr(&expr_node, expr_ast);
 
-	zend_begin_loop(ZEND_FREE, &expr_node, ZEND_BRK_CONT_KIND_SWITCH_MATCH_STMT);
+	zend_begin_loop(ZEND_FREE, &expr_node, 1);
 
 	case_node.op_type = IS_TMP_VAR;
 	case_node.u.op.var = get_temporary_variable();
@@ -6460,7 +6459,7 @@ static void zend_compile_match(znode *result, zend_ast *ast)
 		zend_stack_push(&CG(loop_var_stack), &info);
 	}
 
-	zend_begin_loop(ZEND_FREE, &expr_node, result ? ZEND_BRK_CONT_KIND_MATCH_EXPR : ZEND_BRK_CONT_KIND_SWITCH_MATCH_STMT);
+	zend_begin_loop(ZEND_FREE, &expr_node, /* is_switch */ true);
 
 	znode case_node;
 	case_node.op_type = IS_TMP_VAR;

Zend/zend_compile.h

@@ -155,20 +155,12 @@ struct _zend_op {
 #endif
 };
 
-typedef enum {
-	ZEND_BRK_CONT_KIND_LOOP,
-	/* switch or match with unused result. */
-	ZEND_BRK_CONT_KIND_SWITCH_MATCH_STMT,
-	/* match with used result. */
-	ZEND_BRK_CONT_KIND_MATCH_EXPR,
-} zend_brk_cont_kind;
-
 typedef struct _zend_brk_cont_element {
 	int start;
 	int cont;
 	int brk;
 	int parent;
-	zend_brk_cont_kind kind;
+	bool is_switch;
 } zend_brk_cont_element;
 
 typedef struct _zend_label {