diff --git a/ext/opcache/jit/ir/ir_gcm.c b/ext/opcache/jit/ir/ir_gcm.c
index 0dbde2fecec..0d816ab88e2 100644
--- a/ext/opcache/jit/ir/ir_gcm.c
+++ b/ext/opcache/jit/ir/ir_gcm.c
@@ -112,6 +112,25 @@ static uint32_t ir_gcm_select_best_block(ir_ctx *ctx, ir_ref ref, uint32_t lca)
 		bb = &ctx->cfg_blocks[b];
 		if (bb->loop_depth < loop_depth) {
 			if (!bb->loop_depth) {
+#if 1
+				/* Avoid LICM if LOOP doesn't have a pre-header block */
+				ir_block *loop_bb = &ctx->cfg_blocks[best];
+
+				if (!(loop_bb->flags & IR_BB_LOOP_HEADER)) {
+					loop_bb = &ctx->cfg_blocks[loop_bb->loop_header];
+				}
+				if (loop_bb->predecessors_count > 2) {
+					int n = loop_bb->predecessors_count;
+					uint32_t *p = ctx->cfg_edges + loop_bb->predecessors;
+
+					while (n && *p != b) {
+						n--; p++;
+					}
+					if (!n) {
+						break;
+					}
+				}
+#endif
 				best = b;
 				break;
 			}
diff --git a/ext/opcache/tests/jit/gh16355.phpt b/ext/opcache/tests/jit/gh16355.phpt
new file mode 100644
index 00000000000..b84a8b5255f
--- /dev/null
+++ b/ext/opcache/tests/jit/gh16355.phpt
@@ -0,0 +1,19 @@
+--TEST--
+GH-16355 (Assertion failure in ext/opcache/jit/ir/ir_ra.c:1139)
+--EXTENSIONS--
+opcache
+--INI--
+opcache.jit=1203
+opcache.jit_buffer_size=64M
+--FILE--
+<?php
+function test($in, $cond) {
+    if ($cond) {
+        eval('');
+    }
+    while (stream_bucket_make_writeable($in)) {}
+}
+?>
+DONE
+--EXPECT--
+DONE