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

MIR builder (modularized): fix Call emission to new schema; switch AwaitExpression; drop legacy Array* cases. Tests: fix optimizer test get_block signature. Interpreter: annotate unreachable legacy constructor path in execute_new().

Browse Source
This commit is contained in:
Moe Charm
2025-08-25 19:52:42 +09:00
parent b8e416fb03
commit 8fb99d0763
3 changed files with 22 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/mir/builder_modularized/expressions.rs
View File

@ -182,16 +182,24 @@ impl MirBuilder {
for arg in args {
arg_values.push(self.build_expression(arg)?);
}
let dst = self.value_gen.next();
// For now, treat all function calls as Box method calls
self.emit_instruction(MirInstruction::Call {
dst,
function: name,
arguments: arg_values,
// Prepare function identifier as a const String value id
let func_val = self.value_gen.next();
self.emit_instruction(MirInstruction::Const {
dst: func_val,
value: ConstValue::String(name),
})?;
// Destination for the call result
let dst = self.value_gen.next();
// Emit Call with conservative read effects
self.emit_instruction(MirInstruction::Call {
dst: Some(dst),
func: func_val,
args: arg_values,
effects: EffectMask::READ.add(Effect::ReadHeap),
})?;
Ok(dst)
}
@ -461,49 +469,11 @@ impl MirBuilder {
self.build_field_access(*object.clone(), field.clone())
},
ASTNode::ArrayAccess { array, index, .. } => {
// Build array and index expressions
let array_val = self.build_expression(*array)?;
let index_val = self.build_expression(*index)?;
// Generate ArrayGet instruction
let result = self.value_gen.next();
self.emit_instruction(MirInstruction::ArrayGet {
dst: result,
array: array_val,
index: index_val,
effects: EffectMask::READ.add(Effect::ReadHeap),
})?;
Ok(result)
},
ASTNode::ArrayLiteral { elements, .. } => {
// Create new ArrayBox
let array_val = self.build_new_expression("ArrayBox".to_string(), vec![])?;
// Add each element
for elem in elements {
let elem_val = self.build_expression(elem)?;
// array.push(elem)
self.emit_instruction(MirInstruction::BoxCall {
dst: None,
box_val: array_val,
method: "push".to_string(),
args: vec![elem_val],
effects: EffectMask::WRITE.add(Effect::WriteHeap),
})?;
}
Ok(array_val)
},
ASTNode::New { class, arguments, .. } => {
self.build_new_expression(class.clone(), arguments.clone())
},
ASTNode::Await { expression, .. } => {
ASTNode::AwaitExpression { expression, .. } => {
self.build_await_expression(*expression)
},
@ -618,4 +588,4 @@ impl MirBuilder {
Ok(result_id)
}
}
}