From 8cc8eac7e9009f0ada56c4d6393cfe656d236d2f Mon Sep 17 00:00:00 2001
From: Dmitry Stogov <dmitry@zend.com>
Date: Wed, 6 Mar 2024 11:02:56 +0300
Subject: [PATCH] Update IR

IR commit: c63708b3664568d847b6db07ea380778f5c0313a

Fix recently introduced nightly test failures
ir_cfg.c:2305: ir_schedule_blocks_bottom_up: Assertion `bb->flags & (1<<2)' failed
---
 ext/opcache/jit/ir/ir_cfg.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ext/opcache/jit/ir/ir_cfg.c b/ext/opcache/jit/ir/ir_cfg.c
index 9396f4946f2..b14f9bd8ab9 100644
--- a/ext/opcache/jit/ir/ir_cfg.c
+++ b/ext/opcache/jit/ir/ir_cfg.c
@@ -2299,10 +2299,10 @@ restart:
 	/* 4. Merge empty entry blocks */
 	if ((ctx->flags & IR_MERGE_EMPTY_ENTRIES) && ctx->entries_count) {
 		for (i = 0; i < ctx->entries_count; i++) {
-			b = ctx->cfg_map[ctx->entries[i]];
+			b = ctx->entries[i];
+			IR_ASSERT(ctx->cfg_blocks[b].flags & IR_BB_ENTRY);
 			if (b && chains[b].head == b && chains[b].tail == b) {
 				bb = &ctx->cfg_blocks[b];
-				IR_ASSERT(bb->flags & IR_BB_ENTRY);
 				if (bb->flags & IR_BB_EMPTY) {
 					uint32_t successor;