2025-09-16 01:54:00 +09:00
|
|
|
|
use super::MirBuilder;
|
2025-09-17 07:43:07 +09:00
|
|
|
|
use crate::ast::ASTNode;
|
2025-09-25 10:23:14 +09:00
|
|
|
|
use crate::mir::{BasicBlockId, MirInstruction, ValueId};
|
2025-09-17 07:43:07 +09:00
|
|
|
|
use std::collections::HashMap;
|
2025-09-16 01:54:00 +09:00
|
|
|
|
|
2025-09-25 10:23:14 +09:00
|
|
|
|
// Local helper has moved to phi_core::if_phi; keep call sites minimal
|
2025-09-16 01:54:00 +09:00
|
|
|
|
|
|
|
|
|
|
impl MirBuilder {
|
2025-09-19 02:07:38 +09:00
|
|
|
|
/// Merge all variables modified in then/else relative to pre_if_snapshot.
|
|
|
|
|
|
/// In PHI-off mode inserts edge copies from branch exits to merge. In PHI-on mode emits Phi.
|
|
|
|
|
|
/// `skip_var` allows skipping a variable already merged elsewhere (e.g., bound to an expression result).
|
|
|
|
|
|
pub(super) fn merge_modified_vars(
|
|
|
|
|
|
&mut self,
|
2025-09-25 06:43:15 +09:00
|
|
|
|
_then_block: super::BasicBlockId,
|
2025-09-19 02:07:38 +09:00
|
|
|
|
else_block: super::BasicBlockId,
|
2025-11-01 13:46:34 +09:00
|
|
|
|
then_exit_block_opt: Option<super::BasicBlockId>,
|
2025-09-25 06:15:22 +09:00
|
|
|
|
else_exit_block_opt: Option<super::BasicBlockId>,
|
2025-09-19 02:07:38 +09:00
|
|
|
|
pre_if_snapshot: &std::collections::HashMap<String, super::ValueId>,
|
|
|
|
|
|
then_map_end: &std::collections::HashMap<String, super::ValueId>,
|
|
|
|
|
|
else_map_end_opt: &Option<std::collections::HashMap<String, super::ValueId>>,
|
|
|
|
|
|
skip_var: Option<&str>,
|
|
|
|
|
|
) -> Result<(), String> {
|
2025-09-25 10:23:14 +09:00
|
|
|
|
let changed = crate::mir::phi_core::if_phi::compute_modified_names(
|
|
|
|
|
|
pre_if_snapshot,
|
|
|
|
|
|
then_map_end,
|
|
|
|
|
|
else_map_end_opt,
|
|
|
|
|
|
);
|
2025-09-26 05:28:20 +09:00
|
|
|
|
use std::collections::HashSet;
|
|
|
|
|
|
let changed_set: HashSet<String> = changed.iter().cloned().collect();
|
2025-09-19 02:07:38 +09:00
|
|
|
|
for name in changed {
|
|
|
|
|
|
if skip_var.map(|s| s == name).unwrap_or(false) {
|
|
|
|
|
|
continue;
|
|
|
|
|
|
}
|
2025-09-25 10:23:14 +09:00
|
|
|
|
let pre = match pre_if_snapshot.get(name.as_str()) {
|
2025-09-19 02:07:38 +09:00
|
|
|
|
Some(v) => *v,
|
|
|
|
|
|
None => continue, // unknown before-if; skip
|
|
|
|
|
|
};
|
2025-09-25 10:23:14 +09:00
|
|
|
|
let then_v = then_map_end.get(name.as_str()).copied().unwrap_or(pre);
|
2025-09-19 02:07:38 +09:00
|
|
|
|
let else_v = else_map_end_opt
|
|
|
|
|
|
.as_ref()
|
2025-09-25 10:23:14 +09:00
|
|
|
|
.and_then(|m| m.get(name.as_str()).copied())
|
2025-09-19 02:07:38 +09:00
|
|
|
|
.unwrap_or(pre);
|
2025-09-23 07:25:58 +09:00
|
|
|
|
// フェーズM: 常にPHI命令を使用(no_phi_mode撤廃)
|
2025-09-25 06:15:22 +09:00
|
|
|
|
// incoming の predecessor は "実際に merge に遷移してくる出口ブロック" を使用する
|
2025-11-01 13:46:34 +09:00
|
|
|
|
let mut inputs: Vec<(super::BasicBlockId, super::ValueId)> = Vec::new();
|
|
|
|
|
|
if let Some(tp) = then_exit_block_opt { inputs.push((tp, then_v)); }
|
2025-11-03 23:21:48 +09:00
|
|
|
|
if let Some(ep) = else_exit_block_opt { inputs.push((ep, else_v)); }
|
2025-11-01 13:46:34 +09:00
|
|
|
|
match inputs.len() {
|
|
|
|
|
|
0 => {}
|
|
|
|
|
|
1 => {
|
|
|
|
|
|
let (_pred, v) = inputs[0];
|
|
|
|
|
|
self.variable_map.insert(name, v);
|
|
|
|
|
|
}
|
|
|
|
|
|
_ => {
|
|
|
|
|
|
if let Some(func) = self.current_function.as_mut() { func.update_cfg(); }
|
|
|
|
|
|
if let (Some(func), Some(cur_bb)) = (&self.current_function, self.current_block) {
|
|
|
|
|
|
crate::mir::phi_core::common::debug_verify_phi_inputs(func, cur_bb, &inputs);
|
|
|
|
|
|
}
|
2025-11-06 23:57:24 +09:00
|
|
|
|
let merged = self.insert_phi(inputs)?;
|
2025-11-01 13:46:34 +09:00
|
|
|
|
self.variable_map.insert(name, merged);
|
|
|
|
|
|
}
|
2025-11-01 13:28:56 +09:00
|
|
|
|
}
|
2025-09-19 02:07:38 +09:00
|
|
|
|
}
|
2025-09-26 05:28:20 +09:00
|
|
|
|
|
|
|
|
|
|
// Ensure pinned synthetic slots ("__pin$...") have a block-local definition at the merge,
|
|
|
|
|
|
// even if their values did not change across branches. This avoids undefined uses when
|
|
|
|
|
|
// subsequent blocks re-use pinned values without modifications.
|
|
|
|
|
|
for (pin_name, pre_val) in pre_if_snapshot.iter() {
|
|
|
|
|
|
if !pin_name.starts_with("__pin$") { continue; }
|
|
|
|
|
|
if skip_var.map(|s| s == pin_name.as_str()).unwrap_or(false) { continue; }
|
|
|
|
|
|
if changed_set.contains(pin_name) { continue; }
|
|
|
|
|
|
let then_v = then_map_end.get(pin_name.as_str()).copied().unwrap_or(*pre_val);
|
|
|
|
|
|
let else_v = else_map_end_opt
|
|
|
|
|
|
.as_ref()
|
|
|
|
|
|
.and_then(|m| m.get(pin_name.as_str()).copied())
|
|
|
|
|
|
.unwrap_or(*pre_val);
|
2025-11-01 13:46:34 +09:00
|
|
|
|
let mut inputs: Vec<(super::BasicBlockId, super::ValueId)> = Vec::new();
|
|
|
|
|
|
if let Some(tp) = then_exit_block_opt { inputs.push((tp, then_v)); }
|
2025-11-03 23:21:48 +09:00
|
|
|
|
if let Some(ep) = else_exit_block_opt { inputs.push((ep, else_v)); }
|
2025-11-01 13:46:34 +09:00
|
|
|
|
match inputs.len() {
|
|
|
|
|
|
0 => {}
|
|
|
|
|
|
1 => {
|
|
|
|
|
|
let (_pred, v) = inputs[0];
|
|
|
|
|
|
self.variable_map.insert(pin_name.clone(), v);
|
|
|
|
|
|
}
|
|
|
|
|
|
_ => {
|
|
|
|
|
|
if let Some(func) = self.current_function.as_mut() { func.update_cfg(); }
|
|
|
|
|
|
if let (Some(func), Some(cur_bb)) = (&self.current_function, self.current_block) {
|
|
|
|
|
|
crate::mir::phi_core::common::debug_verify_phi_inputs(func, cur_bb, &inputs);
|
|
|
|
|
|
}
|
2025-11-17 00:48:18 +09:00
|
|
|
|
let merged = self.next_value_id();
|
2025-11-05 18:57:03 +09:00
|
|
|
|
if let (Some(func), Some(cur_bb)) = (self.current_function.as_mut(), self.current_block) {
|
|
|
|
|
|
crate::mir::ssot::cf_common::insert_phi_at_head(func, cur_bb, merged, inputs);
|
|
|
|
|
|
} else {
|
|
|
|
|
|
self.emit_instruction(MirInstruction::Phi { dst: merged, inputs })?;
|
|
|
|
|
|
}
|
2025-11-01 13:46:34 +09:00
|
|
|
|
self.variable_map.insert(pin_name.clone(), merged);
|
|
|
|
|
|
}
|
2025-09-26 05:28:20 +09:00
|
|
|
|
}
|
|
|
|
|
|
}
|
2025-09-19 02:07:38 +09:00
|
|
|
|
Ok(())
|
|
|
|
|
|
}
|
2025-09-16 01:54:00 +09:00
|
|
|
|
/// Normalize Phi creation for if/else constructs.
|
|
|
|
|
|
/// This handles variable reassignment patterns and ensures a single exit value.
|
|
|
|
|
|
pub(super) fn normalize_if_else_phi(
|
|
|
|
|
|
&mut self,
|
|
|
|
|
|
then_block: BasicBlockId,
|
|
|
|
|
|
else_block: BasicBlockId,
|
2025-09-25 06:15:22 +09:00
|
|
|
|
then_exit_block_opt: Option<BasicBlockId>,
|
|
|
|
|
|
else_exit_block_opt: Option<BasicBlockId>,
|
2025-09-16 01:54:00 +09:00
|
|
|
|
then_value_raw: ValueId,
|
|
|
|
|
|
else_value_raw: ValueId,
|
|
|
|
|
|
pre_if_var_map: &HashMap<String, ValueId>,
|
|
|
|
|
|
then_ast_for_analysis: &ASTNode,
|
|
|
|
|
|
else_ast_for_analysis: &Option<ASTNode>,
|
|
|
|
|
|
then_var_map_end: &HashMap<String, ValueId>,
|
|
|
|
|
|
else_var_map_end_opt: &Option<HashMap<String, ValueId>>,
|
|
|
|
|
|
pre_then_var_value: Option<ValueId>,
|
|
|
|
|
|
) -> Result<ValueId, String> {
|
|
|
|
|
|
// If only the then-branch assigns a variable (e.g., `if c { x = ... }`) and the else
|
|
|
|
|
|
// does not assign the same variable, bind that variable to a Phi of (then_value, pre_if_value).
|
2025-09-25 10:23:14 +09:00
|
|
|
|
let assigned_var_then = crate::mir::phi_core::if_phi::extract_assigned_var(then_ast_for_analysis);
|
2025-09-17 07:43:07 +09:00
|
|
|
|
let assigned_var_else = else_ast_for_analysis
|
|
|
|
|
|
.as_ref()
|
2025-09-25 10:23:14 +09:00
|
|
|
|
.and_then(|a| crate::mir::phi_core::if_phi::extract_assigned_var(a));
|
2025-11-17 00:48:18 +09:00
|
|
|
|
let result_val = self.next_value_id();
|
2025-09-16 01:54:00 +09:00
|
|
|
|
|
2025-09-23 07:25:58 +09:00
|
|
|
|
// フェーズM: no_phi_mode分岐削除(常にPHI命令を使用)
|
2025-09-16 23:49:36 +09:00
|
|
|
|
|
2025-09-16 01:54:00 +09:00
|
|
|
|
if let Some(var_name) = assigned_var_then.clone() {
|
2025-09-17 07:43:07 +09:00
|
|
|
|
let else_assigns_same = assigned_var_else
|
|
|
|
|
|
.as_ref()
|
|
|
|
|
|
.map(|s| s == &var_name)
|
|
|
|
|
|
.unwrap_or(false);
|
2025-09-16 01:54:00 +09:00
|
|
|
|
// Resolve branch-end values for the assigned variable
|
2025-09-17 07:43:07 +09:00
|
|
|
|
let then_value_for_var = then_var_map_end
|
|
|
|
|
|
.get(&var_name)
|
|
|
|
|
|
.copied()
|
|
|
|
|
|
.unwrap_or(then_value_raw);
|
2025-11-13 20:16:20 +09:00
|
|
|
|
// Check if else branch actually modified the variable (even if not as last expression)
|
|
|
|
|
|
let else_modified_var = else_var_map_end_opt
|
|
|
|
|
|
.as_ref()
|
|
|
|
|
|
.and_then(|m| m.get(&var_name).copied());
|
2025-09-16 01:54:00 +09:00
|
|
|
|
let else_value_for_var = if else_assigns_same {
|
2025-09-17 07:43:07 +09:00
|
|
|
|
else_var_map_end_opt
|
|
|
|
|
|
.as_ref()
|
|
|
|
|
|
.and_then(|m| m.get(&var_name).copied())
|
|
|
|
|
|
.unwrap_or(else_value_raw)
|
2025-11-13 20:16:20 +09:00
|
|
|
|
} else if let Some(else_modified) = else_modified_var {
|
|
|
|
|
|
// Else modifies the variable (even if not as the last expression)
|
|
|
|
|
|
else_modified
|
2025-09-16 01:54:00 +09:00
|
|
|
|
} else {
|
2025-11-13 20:16:20 +09:00
|
|
|
|
// Else doesn't modify the variable: use pre-if value if available
|
2025-09-16 01:54:00 +09:00
|
|
|
|
pre_then_var_value.unwrap_or(else_value_raw)
|
|
|
|
|
|
};
|
2025-11-01 13:46:34 +09:00
|
|
|
|
// Build inputs from reachable predecessors only
|
|
|
|
|
|
let mut inputs: Vec<(BasicBlockId, ValueId)> = Vec::new();
|
|
|
|
|
|
if let Some(tp) = then_exit_block_opt { inputs.push((tp, then_value_for_var)); }
|
2025-11-03 23:21:48 +09:00
|
|
|
|
if let Some(ep) = else_exit_block_opt { inputs.push((ep, else_value_for_var)); }
|
2025-11-01 13:46:34 +09:00
|
|
|
|
match inputs.len() {
|
|
|
|
|
|
0 => {}
|
|
|
|
|
|
1 => {
|
|
|
|
|
|
// Direct bind (no PHI needed)
|
|
|
|
|
|
self.variable_map = pre_if_var_map.clone();
|
|
|
|
|
|
self.variable_map.insert(var_name, inputs[0].1);
|
|
|
|
|
|
return Ok(inputs[0].1);
|
|
|
|
|
|
}
|
|
|
|
|
|
_ => {
|
|
|
|
|
|
if let Some(func) = self.current_function.as_mut() { func.update_cfg(); }
|
|
|
|
|
|
if let (Some(func), Some(cur_bb)) = (&self.current_function, self.current_block) {
|
|
|
|
|
|
crate::mir::phi_core::common::debug_verify_phi_inputs(func, cur_bb, &inputs);
|
|
|
|
|
|
}
|
2025-11-06 23:57:24 +09:00
|
|
|
|
self.insert_phi_with_dst(result_val, inputs)?;
|
2025-11-01 13:46:34 +09:00
|
|
|
|
}
|
2025-11-01 13:28:56 +09:00
|
|
|
|
}
|
2025-09-16 01:54:00 +09:00
|
|
|
|
self.variable_map = pre_if_var_map.clone();
|
|
|
|
|
|
self.variable_map.insert(var_name, result_val);
|
|
|
|
|
|
} else {
|
|
|
|
|
|
// No variable assignment pattern detected – just emit Phi for expression result
|
2025-11-01 13:46:34 +09:00
|
|
|
|
let mut inputs: Vec<(BasicBlockId, ValueId)> = Vec::new();
|
|
|
|
|
|
if let Some(tp) = then_exit_block_opt { inputs.push((tp, then_value_raw)); }
|
2025-11-03 23:21:48 +09:00
|
|
|
|
if let Some(ep) = else_exit_block_opt { inputs.push((ep, else_value_raw)); }
|
2025-11-01 13:46:34 +09:00
|
|
|
|
match inputs.len() {
|
|
|
|
|
|
0 => { /* leave result_val as fresh, but unused; synthesize void */
|
|
|
|
|
|
let v = crate::mir::builder::emission::constant::emit_void(self);
|
|
|
|
|
|
return Ok(v);
|
|
|
|
|
|
}
|
|
|
|
|
|
1 => {
|
|
|
|
|
|
return Ok(inputs[0].1);
|
|
|
|
|
|
}
|
|
|
|
|
|
_ => {
|
|
|
|
|
|
if let Some(func) = self.current_function.as_mut() { func.update_cfg(); }
|
|
|
|
|
|
if let (Some(func), Some(cur_bb)) = (&self.current_function, self.current_block) {
|
|
|
|
|
|
crate::mir::phi_core::common::debug_verify_phi_inputs(func, cur_bb, &inputs);
|
|
|
|
|
|
}
|
2025-11-06 23:57:24 +09:00
|
|
|
|
self.insert_phi_with_dst(result_val, inputs)?;
|
2025-11-01 13:46:34 +09:00
|
|
|
|
}
|
2025-09-25 10:23:14 +09:00
|
|
|
|
}
|
2025-09-16 01:54:00 +09:00
|
|
|
|
// Merge variable map conservatively to pre-if snapshot (no new bindings)
|
|
|
|
|
|
self.variable_map = pre_if_var_map.clone();
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
Ok(result_val)
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|