- Unify standard method calls to emit_unified_call; route via RouterPolicy and apply rewrite::{special,known} at a single entry.\n- Stabilize emit-time invariants: LocalSSA finalize + BlockSchedule PHI→Copy→Call ordering; metadata propagation on copies.\n- Known rewrite default ON (userbox only, strict guards) with opt-out flag NYASH_REWRITE_KNOWN_DEFAULT=0.\n- Expand TypeAnnotation whitelist (is_digit_char/is_hex_digit_char/is_alpha_char/Map.has).\n- Docs: unified-method-resolution design note; Quick Reference normalization note; selfhosting/quickstart.\n- Tools: add tools/selfhost_smoke.sh (dev-only).\n- Keep behavior unchanged for Unknown/core/user-instance via BoxCall fallback; all tests green (quick/integration).
88 lines
3.8 KiB
Rust
88 lines
3.8 KiB
Rust
use crate::mir::builder::MirBuilder;
|
|
use crate::mir::{MirInstruction, ValueId};
|
|
|
|
/// BlockScheduleBox — manage physical insertion points within a block.
|
|
/// Contract: PHI group → materialize group (Copy/Id) → body (Call etc.)
|
|
pub struct BlockScheduleBox;
|
|
|
|
impl BlockScheduleBox {
|
|
/// Insert a Copy immediately after PHI nodes. Returns the local value id.
|
|
pub fn ensure_after_phis_copy(builder: &mut MirBuilder, src: ValueId) -> Result<ValueId, String> {
|
|
if let Some(bb) = builder.current_block {
|
|
if let Some(&cached) = builder.schedule_mat_map.get(&(bb, src)) {
|
|
return Ok(cached);
|
|
}
|
|
let dst = builder.value_gen.next();
|
|
builder.insert_copy_after_phis(dst, src)?;
|
|
builder.schedule_mat_map.insert((bb, src), dst);
|
|
return Ok(dst);
|
|
}
|
|
Err("No current block".into())
|
|
}
|
|
|
|
/// Emit a Copy right before the next emitted instruction (best-effort):
|
|
/// place it at the tail of the current block. Returns the local value id.
|
|
pub fn emit_before_call_copy(builder: &mut MirBuilder, src: ValueId) -> Result<ValueId, String> {
|
|
// Prefer to reuse the after-phis materialized id for this src in this block
|
|
let base = Self::ensure_after_phis_copy(builder, src)?;
|
|
let dst = builder.value_gen.next();
|
|
builder.emit_instruction(MirInstruction::Copy { dst, src: base })?;
|
|
// Propagate metadata to keep dst consistent with base
|
|
crate::mir::builder::metadata::propagate::propagate(builder, base, dst);
|
|
Ok(dst)
|
|
}
|
|
|
|
/// Dev-only: verify simple block order invariants.
|
|
/// - PHI group must be at the block head (no PHI after first non-PHI)
|
|
/// - If a Copy immediately precedes a Call-like instruction, prefer that Copy's src
|
|
/// to be the previously materialized after-PHIs id (best-effort warning only).
|
|
pub fn verify_order(builder: &mut MirBuilder) {
|
|
if std::env::var("NYASH_BLOCK_SCHEDULE_VERIFY").ok().as_deref() != Some("1") {
|
|
return;
|
|
}
|
|
let (f_opt, bb_opt) = (builder.current_function.as_ref(), builder.current_block);
|
|
let (Some(fun), Some(bb_id)) = (f_opt, bb_opt) else { return; };
|
|
let Some(bb) = fun.get_block(bb_id) else { return; };
|
|
|
|
// 1) PHI group must be at head
|
|
let mut seen_non_phi = false;
|
|
for (idx, inst) in bb.instructions.iter().enumerate() {
|
|
match inst {
|
|
MirInstruction::Phi { .. } => {
|
|
if seen_non_phi {
|
|
eprintln!("[block-schedule][verify] WARN: PHI found after non-PHI at bb={:?} idx={}", bb_id, idx);
|
|
}
|
|
}
|
|
_ => { seen_non_phi = true; }
|
|
}
|
|
}
|
|
|
|
// 2) If a Copy is immediately before a Call-like, prefer it to be derived from after-PHIs copy
|
|
let is_call_like = |mi: &MirInstruction| -> bool {
|
|
matches!(mi,
|
|
MirInstruction::Call { .. } |
|
|
MirInstruction::BoxCall { .. } |
|
|
MirInstruction::PluginInvoke { .. } |
|
|
MirInstruction::ExternCall { .. }
|
|
)
|
|
};
|
|
for w in bb.instructions.windows(2) {
|
|
if let [MirInstruction::Copy { dst: _, src }, call] = w {
|
|
if is_call_like(call) {
|
|
// best-effort: src should be one of the after-PHIs materialized ids for this bb
|
|
let derived_ok = builder
|
|
.schedule_mat_map
|
|
.values()
|
|
.any(|&v| v == *src);
|
|
if !derived_ok {
|
|
eprintln!(
|
|
"[block-schedule][verify] WARN: tail Copy src=%{} is not from after-PHIs in bb={:?}",
|
|
src.0, bb_id
|
|
);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|