tomoaki/hakorune
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

builder: pre-pin comparison operands in if_form and loop_builder (lower_if_in_loop/build_loop) to slots; utils: pin_to_slot pub(crate) and entry materialize for pinned slots only; continue JSON VM debug

Browse Source
This commit is contained in:
Selfhosting Dev
2025-09-26 04:17:56 +09:00
parent fd56b8049a
commit 6e1bf149fc
11 changed files with 1112 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/mir/builder/ops.rs
View File

@ -58,7 +58,7 @@ impl super::MirBuilder {
// Comparison operations
BinaryOpType::Comparison(op) => {
// 80/20: If both operands originate from IntegerBox, cast to integer first
let (lhs2, rhs2) = if self
let (lhs2_raw, rhs2_raw) = if self
.value_origin_newbox
.get(&lhs)
.map(|s| s == "IntegerBox")
@ -87,6 +87,9 @@ impl super::MirBuilder {
} else {
(lhs, rhs)
};
// Materialize operands in the current block to avoid dominance/undef issues
let lhs2 = lhs2_raw;
let rhs2 = rhs2_raw;
self.emit_instruction(MirInstruction::Compare {
dst,
op,
@ -110,8 +113,9 @@ impl super::MirBuilder {
) -> Result<ValueId, String> {
let is_and = matches!(operator, BinaryOperator::And);
// Evaluate LHS only once
let lhs_val = self.build_expression(left)?;
// Evaluate LHS only once and pin to a slot so it can be reused safely across blocks
let lhs_val0 = self.build_expression(left)?;
let lhs_val = self.pin_to_slot(lhs_val0, "@sc_lhs")?;
// Prepare blocks
let then_block = self.block_gen.next();