Improve jumps

Author: iluuu1994

Zend/zend_compile.c

@@ -6659,9 +6659,10 @@ static zend_type zend_compile_single_typename(zend_ast *ast);
 static void zend_pm_context_init(zend_pm_context *context)
 {
 	zend_stack_init(&context->labels, sizeof(uint32_t));
-	/* Avoid offset 0. */
+	/* Avoid offsets 0 and 1. */
 	uint32_t dummy = 0;
 	zend_stack_push(&context->labels, &dummy);
+	zend_stack_push(&context->labels, &dummy);
 
 	zend_stack_init(&context->bindings, sizeof(zend_pm_binding));
 }
@@ -6700,6 +6701,7 @@ static void zend_pm_labels_replace(zend_pm_context *context, uint32_t start_opnu
 				}
 				break;
 			case ZEND_JMPZ_EX:
+			case ZEND_JMPNZ_EX:
 				if (opline->op2.opline_num >= label_lower_bound) {
 					opline->op2.opline_num = labels[-opline->op2.opline_num];
 				}
@@ -6716,6 +6718,42 @@ static void zend_pm_emit_jmpz_ex(znode *result, uint32_t opnum_target)
 	SET_NODE(opline->result, result);
 }
 
+static void zend_pm_emit_jmpnz_ex(znode *result, uint32_t opnum_target)
+{
+	zend_op *opline = zend_emit_op(NULL, ZEND_JMPNZ_EX, result, NULL);
+	opline->op2.opline_num = opnum_target;
+	SET_NODE(opline->result, result);
+}
+
+static void zend_pm_kill_last_op_if_jmp(zend_pm_context *context)
+{
+	zend_op_array *op_array = CG(active_op_array);
+	zend_op *opline = &op_array->opcodes[op_array->last - 1];
+
+#if ZEND_DEBUG
+	uint32_t *labels = zend_stack_base(&context->labels);
+	uint32_t label_lower_bound = -zend_stack_count(&context->labels);
+#endif
+
+	switch (opline->opcode) {
+		case ZEND_JMP:
+#if ZEND_DEBUG
+			ZEND_ASSERT(opline->op1.opline_num >= label_lower_bound && labels[-opline->op1.opline_num] == op_array->last);
+#endif
+			MAKE_NOP(opline);
+			op_array->last--;
+			break;
+		case ZEND_JMPZ_EX:
+		case ZEND_JMPNZ_EX:
+#if ZEND_DEBUG
+			ZEND_ASSERT(opline->op2.opline_num >= label_lower_bound && labels[-opline->op2.opline_num] == op_array->last);
+#endif
+			MAKE_NOP(opline);
+			op_array->last--;
+			break;
+	}
+}
+
 static void zend_pm_compile_expr_like(zend_ast *ast, znode *result, znode *expr_node, bool consume_expr, uint32_t false_opnum)
 {
 	znode value;
@@ -6754,8 +6792,8 @@ static void zend_pm_compile_or(zend_ast *ast, znode *result, znode *expr_node, b
 			zend_pm_label_set_next(context, next_label);
 		}
 		next_label = zend_pm_label_create(context);
-		zend_compile_pattern(ast_list->child[i], result, expr_node, false, next_label, context);
-		zend_emit_jump(true_label);
+		zend_compile_pattern(ast_list->child[i], result, expr_node, false, (uint32_t)-1, context);
+		zend_pm_emit_jmpnz_ex(result, true_label);
 	}
 	zend_pm_label_set_next(context, next_label);
 
@@ -6933,6 +6971,11 @@ static void zend_pm_compile_container(
 
 static void zend_compile_pattern(zend_ast *ast, znode *result, znode *expr_node, bool consume_expr, uint32_t false_opnum, zend_pm_context *context)
 {
+	bool create_label = false_opnum == (uint32_t)-1;
+	if (create_label) {
+		false_opnum = zend_pm_label_create(context);
+	}
+
 	switch (ast->kind) {
 		case ZEND_AST_EXPR_LIKE_PATTERN:
 			zend_pm_compile_expr_like(ast, result, expr_node, consume_expr, false_opnum);
@@ -6957,6 +7000,11 @@ static void zend_compile_pattern(zend_ast *ast, znode *result, znode *expr_node,
 			break;
 		EMPTY_SWITCH_DEFAULT_CASE();
 	}
+
+	if (create_label) {
+		zend_pm_label_set_next(context, false_opnum);
+		zend_pm_kill_last_op_if_jmp(context);
+	}
 }
 
 static void zend_pm_count_bindings(zend_ast **ast_ptr, void *context)
@@ -7005,12 +7053,14 @@ static void zend_emit_is(znode *result, znode *expr_node, bool consume_expr, zen
 	}
 
 	uint32_t start_opnum = get_next_op_number();
-	uint32_t false_label = zend_pm_label_create(&context);
+	uint32_t false_label = context.num_bindings ? zend_pm_label_create(&context) : -1;
 	zend_compile_pattern(pattern_ast, result, &expr_copy_node, consume_expr, false_label, &context);
 
 	if (context.num_bindings) {
-		zend_pm_binding *binding = zend_stack_base(&context.bindings);
-		zend_pm_binding *binding_end = zend_stack_top(&context.bindings);
+		zend_pm_binding *binding, *binding_end;
+
+		binding = zend_stack_base(&context.bindings);
+		binding_end = zend_stack_top(&context.bindings);
 		zend_op *binding_init_op = &CG(active_op_array)->opcodes[first_binding_init_opnum];
 		while (binding <= binding_end) {
 			znode var_node;
@@ -7030,22 +7080,17 @@ static void zend_emit_is(znode *result, znode *expr_node, bool consume_expr, zen
 			binding++;
 			binding_init_op++;
 		}
-	}
-
-	if (context.num_bindings) {
 		uint32_t jmp_end = zend_emit_jump(0);
-		zend_pm_label_set_next(&context, false_label);
 
-		zend_pm_binding *binding = zend_stack_base(&context.bindings);
-		zend_pm_binding *binding_end = zend_stack_top(&context.bindings);
+		zend_pm_label_set_next(&context, false_label);
+		binding = zend_stack_base(&context.bindings);
+		binding_end = zend_stack_top(&context.bindings);
 		while (binding <= binding_end) {
 			zend_emit_op(NULL, ZEND_FREE, &binding->value, NULL);
 			binding++;
 		}
 
 		zend_update_jump_target_to_next(jmp_end);
-	} else {
-		zend_pm_label_set_next(&context, false_label);
 	}
 
 	zend_pm_labels_replace(&context, start_opnum);