Revert JIT changes

No longer necessary since disabling QM_ASSIGN optimization for ZEND_NEW

Author: iluuu1994

ext/opcache/jit/zend_jit.c

@@ -2845,7 +2845,7 @@ static int zend_jit(const zend_op_array *op_array, zend_ssa *ssa, const zend_op
 							const zend_op *next_opline = opline + 1;
 
 							ZEND_ASSERT(b + 1 == ssa->cfg.blocks[b].successors[0]);
-							zend_jit_constructor(&ctx, next_opline, op_array, ssa, call_level, b, b + 1);
+							zend_jit_constructor(&ctx, next_opline, op_array, ssa, call_level, b + 1);
 						}
 
 						/* We skip over the DO_FCALL, so decrement call_level ourselves. */

ext/opcache/jit/zend_jit_ir.c

@@ -10728,7 +10728,7 @@ static int zend_jit_do_fcall(zend_jit_ctx *jit, const zend_op *opline, const zen
 	return 1;
 }
 
-static int zend_jit_constructor(zend_jit_ctx *jit, const zend_op *opline, const zend_op_array *op_array, zend_ssa *ssa, int call_level, int b, int next_block)
+static int zend_jit_constructor(zend_jit_ctx *jit, const zend_op *opline, const zend_op_array *op_array, zend_ssa *ssa, int call_level, int next_block)
 {
 	ir_ref if_skip_constructor = jit_IF_ex(jit, jit_CMP_IP(jit, IR_NE, opline), next_block);
 
@@ -10744,12 +10744,21 @@ static int zend_jit_constructor(zend_jit_ctx *jit, const zend_op *opline, const
 		}
 	}
 
-	/* 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());
+	/* override predecessors of the next block */
+	ZEND_ASSERT(jit->ssa->cfg.blocks[next_block].predecessors_count == 1);
+	if (!jit->ctx.control) {
+		ZEND_ASSERT(jit->bb_edges[jit->bb_predecessors[next_block]]);
+		ir_IF_TRUE(if_skip_constructor);
+		ir_MERGE_2(jit->bb_edges[jit->bb_predecessors[next_block]], ir_END());
+		jit->bb_edges[jit->bb_predecessors[next_block]] = ir_END();
+	} else {
+		ZEND_ASSERT(!jit->bb_edges[jit->bb_predecessors[next_block]]);
+		/* 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]] = ir_END();
 
-	jit->b = -1;
+		jit->b = -1;
+	}
 
 	return 1;
 }