Repository navigation
Stage 1: remove Pass 2's production imports of Pass 1 #1191
Description
Why
After #1096 PR 1, Stage 1's Pass 1 no longer imports Pass 2 in production code, and a test enforces it. Pass 2 still imports Pass 1, so the two passes are not independent modules.
Remaining Pass 2 → Pass 1 production dependencies
PerComputationCandidateError(pass1/per_computation_candidates.rs) is in effect Stage 1's shared error type:pass2/asap_aware_cse.rsreturns it from 6 functions,pass2/memo/enumeration.rswraps it, and itsTooManyCandidatesvariant is produced only by Pass 2. It is public API (re-exported fromlib.rs).pass2/asap_aware_cse.rsuses the Pass 1 helpersexact_accumulatorandpartitions_over.
Proposed change
- Give Pass 2 its own error type, or move the shared error into a Stage 1 module both passes use (decide on the public name).
- Move
exact_accumulatorandpartitions_overinto a shared module. - Extend the import-direction test to forbid
pass2 → pass1in production code too.
Test modules may keep using the other pass to build fixtures.
Follows #1096.
Metadata
Metadata
Assignees
Labels
No labels
Activity
refactor(stage1): move Pass 1's memo population into pass1; forbid pa…
refactor(stage1): one same_family, boundary_ptrs/nodes_within helpers…
milindsrivastava1997 commentedon Nov 4, 2026
Agreed scope
CseError { Structure(#[from] SchemaDerivationError), Unsupported(&'static str), TooManyCandidates{..} }inpass2/asap_aware_cse.rs, replacingPerComputationCandidateErrorin Pass 2. No code matches its variants: callers only stringify it, drop the candidate, or call.ok().TooManyCandidatesfrom the publicPerComputationCandidateError(only Pass 2 produces it).ErrorBuildingLogicalASAPDagsFromChosenCandidates::RecomposewrapsSchemaDerivationErrordirectly.Pass2RuleErroris unchanged. It is fatal and public, while most helper errors only drop one candidate.src/ir_construction.rsholdingpartitions_over,column_refandexact_family. Both passes import from it.rolled_upbuilds its Sum/Min/MaxSummaryAgginline (reads the value column, no item,UnknownOrSigned), keeping the check that the column resolves. Pass 2 no longer callsexact_accumulator, which would otherwise pull ~300 lines of Pass 1 logic and its error type into a shared module.pass1::/pass2::in production lines (not a barepass1, which Pass 2's entry uses as a parameter name).pass2_does_not_import_pass1, confirmed to fail on the current code first.rolled_up.refactor(stage1): remove Pass 2's production imports of Pass 1 (#1191)
refactor(types): move Stage 1's shared IR helpers into asap-types (#1191
refactor(stage1): remove Pass 2's production imports of Pass 1 (#1191) (