fix if block_idx == BlockIdx::NULL

youknowone · youknowone · commit 4bfae75973df · 2026-05-16T16:01:08.000+09:00
diff --git a/crates/codegen/src/ir.rs b/crates/codegen/src/ir.rs
@@ -8262,7 +8262,10 @@ impl CodeInfo {
                     }
                 }
                 if block_has_fallthrough(block) && block.next != BlockIdx::NULL {
-                    stack.push(next_nonempty_block(blocks, block.next));
+                    let next = next_nonempty_block(blocks, block.next);
+                    if next != BlockIdx::NULL {
+                        stack.push(next);
+                    }
                 }
             }
             false
@@ -8308,7 +8311,10 @@ impl CodeInfo {
                     }
                 }
                 if block_has_fallthrough(block) && block.next != BlockIdx::NULL {
-                    stack.push((next_nonempty_block(blocks, block.next), stores_local));
+                    let next = next_nonempty_block(blocks, block.next);
+                    if next != BlockIdx::NULL {
+                        stack.push((next, stores_local));
+                    }
                 }
             }
             false
@@ -8849,7 +8855,10 @@ impl CodeInfo {
                     }
                 }
                 if block_has_fallthrough(block) && block.next != BlockIdx::NULL {
-                    stack.push(next_nonempty_block(blocks, block.next));
+                    let next = next_nonempty_block(blocks, block.next);
+                    if next != BlockIdx::NULL {
+                        stack.push(next);
+                    }
                 }
             }
             false

Original file line number	Diff line number	Diff line change
`@@ -8262,7 +8262,10 @@ impl CodeInfo {`
`8262`	`8262`	`}`
`8263`	`8263`	`}`
`8264`	`8264`	`if block_has_fallthrough(block) && block.next != BlockIdx::NULL {`
`8265`		`- stack.push(next_nonempty_block(blocks, block.next));`
	`8265`	`+ let next = next_nonempty_block(blocks, block.next);`
	`8266`	`+ if next != BlockIdx::NULL {`
	`8267`	`+ stack.push(next);`
	`8268`	`+ }`
`8266`	`8269`	`}`
`8267`	`8270`	`}`
`8268`	`8271`	`false`
`@@ -8308,7 +8311,10 @@ impl CodeInfo {`
`8308`	`8311`	`}`
`8309`	`8312`	`}`
`8310`	`8313`	`if block_has_fallthrough(block) && block.next != BlockIdx::NULL {`
`8311`		`- stack.push((next_nonempty_block(blocks, block.next), stores_local));`
	`8314`	`+ let next = next_nonempty_block(blocks, block.next);`
	`8315`	`+ if next != BlockIdx::NULL {`
	`8316`	`+ stack.push((next, stores_local));`
	`8317`	`+ }`
`8312`	`8318`	`}`
`8313`	`8319`	`}`
`8314`	`8320`	`false`
`@@ -8849,7 +8855,10 @@ impl CodeInfo {`
`8849`	`8855`	`}`
`8850`	`8856`	`}`
`8851`	`8857`	`if block_has_fallthrough(block) && block.next != BlockIdx::NULL {`
`8852`		`- stack.push(next_nonempty_block(blocks, block.next));`
	`8858`	`+ let next = next_nonempty_block(blocks, block.next);`
	`8859`	`+ if next != BlockIdx::NULL {`
	`8860`	`+ stack.push(next);`
	`8861`	`+ }`
`8853`	`8862`	`}`
`8854`	`8863`	`}`
`8855`	`8864`	`false`