From ce2b4b97e5acf922256bcafa304f0429418c14e6 Mon Sep 17 00:00:00 2001
From: tomoaki <whiteunyora@gmail.com>
Date: Sat, 27 Dec 2025 13:18:54 +0900
Subject: [PATCH] refactor(joinir): Tighten plan stage helper visibility

---
 .../joinir/merge/rewriter/stages/plan/entry_resolver.rs     | 6 +++---
 .../merge/rewriter/stages/plan/instruction_rewrite.rs       | 2 +-
 .../joinir/merge/rewriter/stages/plan/tail_call_rewrite.rs  | 2 +-
 .../joinir/merge/rewriter/stages/plan/terminator_rewrite.rs | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/mir/builder/control_flow/joinir/merge/rewriter/stages/plan/entry_resolver.rs b/src/mir/builder/control_flow/joinir/merge/rewriter/stages/plan/entry_resolver.rs
index 49b5dab3..4086663a 100644
--- a/src/mir/builder/control_flow/joinir/merge/rewriter/stages/plan/entry_resolver.rs
+++ b/src/mir/builder/control_flow/joinir/merge/rewriter/stages/plan/entry_resolver.rs
@@ -17,7 +17,7 @@ use std::collections::{BTreeMap, BTreeSet};
 /// Phase 287 P2: Prefer boundary SSOT (loop_header_func_name) over heuristic.
 ///
 /// Returns Option<String> (not &str) to avoid lifetime issues.
-pub(in crate::mir::builder::control_flow::joinir::merge) fn resolve_entry_func_name(
+pub(super) fn resolve_entry_func_name(
     functions_merge: &Vec<(&String, &MirFunction)>,
     boundary: Option<&JoinInlineBoundary>,
     continuation_candidates: &BTreeSet<String>,
@@ -40,7 +40,7 @@ pub(in crate::mir::builder::control_flow::joinir::merge) fn resolve_entry_func_n
 /// Reverse lookup: find function name by target block
 ///
 /// Searches function_entry_map to find which function has the given block as entry.
-pub(in crate::mir::builder::control_flow::joinir::merge) fn resolve_target_func_name<'a>(
+pub(super) fn resolve_target_func_name<'a>(
     function_entry_map: &'a BTreeMap<String, BasicBlockId>,
     target_block: BasicBlockId,
 ) -> Option<&'a str> {
@@ -50,7 +50,7 @@ pub(in crate::mir::builder::control_flow::joinir::merge) fn resolve_target_func_
 }
 
 /// Check if block is MAIN's entry block (pure lexical check)
-pub(in crate::mir::builder::control_flow::joinir::merge) fn is_joinir_main_entry_block(
+pub(super) fn is_joinir_main_entry_block(
     func_name: &str,
     func: &MirFunction,
     old_block_id: BasicBlockId,
diff --git a/src/mir/builder/control_flow/joinir/merge/rewriter/stages/plan/instruction_rewrite.rs b/src/mir/builder/control_flow/joinir/merge/rewriter/stages/plan/instruction_rewrite.rs
index 8817d88f..3e5fe015 100644
--- a/src/mir/builder/control_flow/joinir/merge/rewriter/stages/plan/instruction_rewrite.rs
+++ b/src/mir/builder/control_flow/joinir/merge/rewriter/stages/plan/instruction_rewrite.rs
@@ -29,7 +29,7 @@ use std::collections::BTreeMap;
 /// Process block instructions: filter, remap, detect tail calls
 ///
 /// Returns (filtered_instructions, tail_call_target)
-pub(in crate::mir::builder::control_flow::joinir::merge) fn process_block_instructions(
+pub(super) fn process_block_instructions(
     old_block: &BasicBlock,
     remapper: &mut JoinIrIdRemapper,
     local_block_map: &BTreeMap<BasicBlockId, BasicBlockId>,
diff --git a/src/mir/builder/control_flow/joinir/merge/rewriter/stages/plan/tail_call_rewrite.rs b/src/mir/builder/control_flow/joinir/merge/rewriter/stages/plan/tail_call_rewrite.rs
index 82628db8..6fd02744 100644
--- a/src/mir/builder/control_flow/joinir/merge/rewriter/stages/plan/tail_call_rewrite.rs
+++ b/src/mir/builder/control_flow/joinir/merge/rewriter/stages/plan/tail_call_rewrite.rs
@@ -39,7 +39,7 @@ use std::collections::{BTreeMap, BTreeSet};
 ///
 /// Also records latch incoming for loop header PHI updates.
 #[allow(clippy::too_many_arguments)]
-pub(in crate::mir::builder::control_flow::joinir::merge) fn process_tail_call_params(
+pub(super) fn process_tail_call_params(
     new_block: &mut BasicBlock,
     tail_call_target: (BasicBlockId, &[ValueId]),
     func_name: &str,
diff --git a/src/mir/builder/control_flow/joinir/merge/rewriter/stages/plan/terminator_rewrite.rs b/src/mir/builder/control_flow/joinir/merge/rewriter/stages/plan/terminator_rewrite.rs
index 364151af..3ec4ba4d 100644
--- a/src/mir/builder/control_flow/joinir/merge/rewriter/stages/plan/terminator_rewrite.rs
+++ b/src/mir/builder/control_flow/joinir/merge/rewriter/stages/plan/terminator_rewrite.rs
@@ -45,7 +45,7 @@ use std::collections::{BTreeMap, BTreeSet};
 ///
 /// CRITICAL: CarrierInputsCollector calls at lines 574, 696 - DO NOT MOVE
 #[allow(clippy::too_many_arguments)]
-pub(in crate::mir::builder::control_flow::joinir::merge) fn process_block_terminator(
+pub(super) fn process_block_terminator(
     new_block: &mut BasicBlock,
     old_block: &BasicBlock,
     found_tail_call: bool,