Simplify

Author: iluuu1994

ext/opcache/jit/zend_jit_ir.c

@@ -10744,30 +10744,12 @@ static int zend_jit_constructor(zend_jit_ctx *jit, const zend_op *opline, const
 		}
 	}
 
-	/* Find the predecessor index of b in next_block. */
-	zend_basic_block *bb_next = &ssa->cfg.blocks[next_block];
-	int pred_i = -1;
-	for (pred_i = 0; pred_i < bb_next->predecessors_count; pred_i++) {
-		if (b == ssa->cfg.predecessors[bb_next->predecessor_offset + pred_i]) {
-			break;
-		}
-	}
-	ZEND_ASSERT(pred_i != -1);
-
-	/* override predecessors of the next block */
-	if (!jit->ctx.control) {
-		ZEND_ASSERT(jit->bb_edges[jit->bb_predecessors[next_block] + pred_i]);
-		ir_IF_TRUE(if_skip_constructor);
-		ir_MERGE_2(jit->bb_edges[jit->bb_predecessors[next_block] + pred_i], ir_END());
-		jit->bb_edges[jit->bb_predecessors[next_block] + pred_i] = ir_END();
-	} else {
-		ZEND_ASSERT(!jit->bb_edges[jit->bb_predecessors[next_block] + pred_i]);
-		/* merge current control path with the true branch of constructor skip condition */
-		ir_MERGE_WITH_EMPTY_TRUE(if_skip_constructor);
-		jit->bb_edges[jit->bb_predecessors[next_block] + pred_i] = ir_END();
+	/* merge current control path with the true branch of constructor skip condition */
+	ZEND_ASSERT(jit->ctx.control);
+	ir_MERGE_WITH_EMPTY_TRUE(if_skip_constructor);
+	_zend_jit_add_predecessor_ref(jit, next_block, b, ir_END());
 
-		jit->b = -1;
-	}
+	jit->b = -1;
 
 	return 1;
 }