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

Normalize passes keep spans and clean warnings

Browse Source
This commit is contained in:
nyash-codex
2025-11-24 15:02:51 +09:00
parent 466e636af6
commit da1a5558e5
40 changed files with 547 additions and 362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/backend/mir_interpreter/exec.rs
View File

@ -148,9 +148,9 @@ impl MirInterpreter {
) -> Option<crate::ast::Span> {
let idx = inst_index?;
if idx < block.instructions.len() {
block.instruction_span(idx)
block.instruction_with_span(idx).map(|sp| sp.span)
} else if idx == block.instructions.len() {
block.terminator_span()
block.terminator_spanned().map(|sp| sp.span)
} else {
None
}
@ -334,9 +334,10 @@ impl MirInterpreter {
fn execute_block_instructions(&mut self, block: &BasicBlock) -> Result<(), VMError> {
let phi_count = block.phi_instructions().count();
for (idx, inst) in block.non_phi_instructions().enumerate() {
for (idx, sp) in block.iter_spanned_enumerated().skip(phi_count) {
let inst = sp.inst;
self.last_block = Some(block.id);
self.last_inst_index = Some(phi_count + idx);
self.last_inst_index = Some(idx);
self.last_inst = Some(inst.clone());
if Self::trace_enabled() {
eprintln!("[vm-trace] inst bb={:?} {:?}", block.id, inst);