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

Complete Phase 5.1: Add terminator handling for nested control flow

Browse Source 
Co-authored-by: moe-charm <217100418+moe-charm@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2025-08-13 07:17:45 +00:00
parent ba568f7dfb
commit e75e3e15e8
53 changed files with 6 additions and 2856 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/mir/builder.rs
View File

@ -347,7 +347,9 @@ impl MirBuilder {
self.current_block = Some(then_block);
self.ensure_block_exists(then_block)?;
let then_value = self.build_expression(then_branch)?;
self.emit_instruction(MirInstruction::Jump { target: merge_block })?;
if !self.is_current_block_terminated() {
self.emit_instruction(MirInstruction::Jump { target: merge_block })?;
}
// Build else branch
self.current_block = Some(else_block);
@ -363,7 +365,9 @@ impl MirBuilder {
})?;
void_val
};
self.emit_instruction(MirInstruction::Jump { target: merge_block })?;
if !self.is_current_block_terminated() {
self.emit_instruction(MirInstruction::Jump { target: merge_block })?;
}
// Create merge block with phi function
self.current_block = Some(merge_block);