phase29ao(p30): move shadow adopt composer ssot

This commit is contained in:
2025-12-30 14:28:42 +09:00
parent a352e7e800
commit a189c9e301
13 changed files with 170 additions and 171 deletions

View File

@ -28,6 +28,7 @@ use crate::mir::loop_pattern_detection::{LoopFeatures, LoopPatternKind};
use crate::mir::builder::control_flow::plan::lowerer::PlanLowerer;
use crate::mir::builder::control_flow::plan::normalizer::PlanNormalizer;
use crate::mir::builder::control_flow::plan::verifier::PlanVerifier;
use crate::mir::builder::control_flow::plan::composer;
use crate::mir::builder::control_flow::plan::single_planner;
/// AST Feature Extractor (declared in mod.rs as pub module, import from parent)
@ -349,7 +350,7 @@ pub(crate) fn route_loop_pattern(
return Err("pattern1 strict/dev adopt failed: facts mismatch".to_string());
}
let core_plan =
PlanNormalizer::normalize_loop_skeleton_from_facts(builder, facts, ctx)?
composer::compose_coreplan_for_pattern1_simplewhile(builder, facts, ctx)?
.ok_or_else(|| {
"pattern1 strict/dev adopt failed: skeleton compose rejected".to_string()
})?;
@ -372,7 +373,7 @@ pub(crate) fn route_loop_pattern(
return Err("pattern3 strict/dev adopt failed: facts mismatch".to_string());
}
let core_plan =
PlanNormalizer::normalize_pattern3_if_phi_from_facts(builder, facts, ctx)?
composer::compose_coreplan_for_pattern3_ifphi(builder, facts, ctx)?
.ok_or_else(|| {
"pattern3 strict/dev adopt failed: compose rejected".to_string()
})?;
@ -398,7 +399,7 @@ pub(crate) fn route_loop_pattern(
if facts.facts.scan_with_init.is_none() {
return Err("pattern6 strict/dev adopt failed: facts mismatch".to_string());
}
let core_plan = PlanNormalizer::normalize_scan_with_init_from_facts(builder, facts, ctx)?
let core_plan = composer::compose_coreplan_for_pattern6_scan_with_init(builder, facts, ctx)?
.ok_or_else(|| "pattern6 strict/dev adopt failed: compose rejected".to_string())?;
PlanVerifier::verify(&core_plan)?;
eprintln!("[coreplan/shadow_adopt:pattern6_scan_with_init]");
@ -418,7 +419,7 @@ pub(crate) fn route_loop_pattern(
if facts.facts.split_scan.is_none() {
return Err("pattern7 strict/dev adopt failed: facts mismatch".to_string());
}
let core_plan = PlanNormalizer::normalize_split_scan_from_facts(builder, facts, ctx)?
let core_plan = composer::compose_coreplan_for_pattern7_split_scan(builder, facts, ctx)?
.ok_or_else(|| "pattern7 strict/dev adopt failed: compose rejected".to_string())?;
PlanVerifier::verify(&core_plan)?;
eprintln!("[coreplan/shadow_adopt:pattern7_split_scan]");
@ -439,7 +440,7 @@ pub(crate) fn route_loop_pattern(
return Err("pattern5 strict/dev adopt failed: facts mismatch".to_string());
}
let core_plan =
PlanNormalizer::normalize_pattern5_infinite_early_exit_from_facts(builder, facts, ctx)?
composer::compose_coreplan_for_pattern5_infinite_early_exit(builder, facts, ctx)?
.ok_or_else(|| {
"pattern5 strict/dev adopt failed: compose rejected".to_string()
})?;
@ -465,7 +466,7 @@ pub(crate) fn route_loop_pattern(
if facts.facts.pattern2_break.is_none() {
return Err("pattern2 strict/dev adopt failed: facts mismatch".to_string());
}
let core_plan = PlanNormalizer::normalize_pattern2_break_from_facts(builder, facts, ctx)?
let core_plan = composer::compose_coreplan_for_pattern2_break_subset(builder, facts, ctx)?
.ok_or_else(|| "pattern2 strict/dev adopt failed: compose rejected".to_string())?;
PlanVerifier::verify(&core_plan)?;
eprintln!("[coreplan/shadow_adopt:pattern2_break_subset]");