refactor(scan_stage): remove stmt_infos field from EcmaView#9276
Merged
Conversation
Member
Author
How to use the Graphite Merge QueueAdd the label graphite: merge-when-ready to this PR to add it to the merge queue. You must have a Graphite account in order to use the merge queue. Sign up using this link. An organization admin has enabled the Graphite Merge Queue in this repository. Please do not merge from GitHub as this will restart CI on PRs being processed by the merge queue. This stack of pull requests is managed by Graphite. Learn more about stacking. |
Merging this PR will not alter performance
Comparing Footnotes
|
graphite-app
Bot
changed the base branch from
04-30-detach_stmt_info
to
graphite-base/9276
April 30, 2026 07:53
graphite-app
Bot
force-pushed
the
04-30-remove_stmt_infos_from_ecmaview
branch
from
April 30, 2026 07:57
5f96fd2 to
ef6e6ca
Compare
graphite-app
Bot
force-pushed
the
graphite-base/9276
branch
from
April 30, 2026 07:57
82b35fe to
55b8525
Compare
graphite-app
Bot
force-pushed
the
04-30-remove_stmt_infos_from_ecmaview
branch
from
April 30, 2026 07:58
ef6e6ca to
8287925
Compare
✅ Deploy Preview for rolldown-rs canceled.
|
IWANABETHATGUY
force-pushed
the
04-30-remove_stmt_infos_from_ecmaview
branch
2 times, most recently
from
April 30, 2026 09:20
5f96fd2 to
b01d243
Compare
h-a-n-a
approved these changes
May 2, 2026
Member
Author
Merge activity
|
related to #9242 Stacked on #9274. Routes per-module `StmtInfos` through a side `IndexVec<ModuleIdx, StmtInfos>` on `ScanStageOutput` / `NormalizedScanStageOutput` (carried via `EcmaRelated` and `RuntimeModuleTaskResult`) instead of storing it on each `EcmaView`. After #9274, `EcmaView.stmt_infos` was just an empty `StmtInfos::new()` placeholder for the entire link/generate lifetime — `LinkStage::new` `mem::replace`d the real value out into `LinkStage.stmt_infos` immediately, and every reader went through the side table. This PR removes the field entirely. Changes: - `EcmaRelated` and `RuntimeModuleTaskResult` carry `stmt_infos: StmtInfos`. - `IntermediateNormalModules` collects per-module `stmt_infos` parallel to `index_ecma_ast`; the module loader builds a side `HybridIndexVec<ModuleIdx, StmtInfos>` at output time (external modules get an empty `StmtInfos::new()` placeholder). - `ScanStageOutput` / `NormalizedScanStageOutput` carry the side table; `ScanStageCache::merge` and `create_output` thread it through. - `LinkStage::new` `mem::take`s `scan_stage_output.stmt_infos` directly (no per-module `mem::replace` walk). - `defer_sync_scan_data` reads `&scan_stage_output.stmt_infos[module_idx]` instead of `&normal.stmt_infos`. - `EcmaView.stmt_infos` field removed.
graphite-app
Bot
force-pushed
the
04-30-remove_stmt_infos_from_ecmaview
branch
from
May 5, 2026 06:00
b01d243 to
45adf2b
Compare
graphite-app Bot
pushed a commit
that referenced
this pull request
May 5, 2026
#9278) Stacked on #9276. Closed #9242 Replaces `EcmaAst::allocator(&self) -> &Allocator` with `with_fields(&mut self, |fields| ...)`, a closure-based accessor that bundles read-only access to `source`/`source_type`/`allocator`/`comments`/`program`. The `&mut self` receiver makes the soundness invariant of `unsafe impl Sync for EcmaAst` locally checkable. ## Why `oxc::allocator::Allocator` is `!Sync` (it holds `Cell<NonNull<u8>>` and `Cell<Option<NonNull<ChunkFooter>>>` for bumpalo''s bump pointer). The `unsafe impl Sync for EcmaAst {}` is sound only by convention: `&EcmaAst` is treated as read-only at runtime. But `pub fn allocator(&self) -> &Allocator` punched a hole in that — anyone with a shared `&EcmaAst` (e.g., a rayon `par_iter` worker) could call `ast.allocator()` and then `Allocator::alloc` (which mutates internal `Cell`s through `&self`), racing with another worker. `Sync` cannot be removed — it''s required by parallel chunk rendering in `render_chunk_to_assets.rs` and indirectly by `anyhow::Error::new(SendError<ModuleLoaderMsg>)` in `file_emitter.rs`. So the goal is to make the unsoundness statically harder to reach. ## Changes - `EcmaAst::with_fields(&mut self, |fields| ...)` is the only public way to obtain `&Allocator`. Built on the existing `ProgramCell::with_mut`, reborrowed `&mut Program → &Program`. - `pub fn allocator(&self)` removed. The 3 callers all migrate cleanly: - `clone_with_another_arena` reads `self.program.borrow_owner().allocator.used_bytes()` directly. - `ecma_module_view_factory::create_ecma_view` wraps the `AstScanner::new` + `scanner.scan` block in `ast.with_fields(...)`. - `runtime_module_task::make_ecma_ast` does the same. - `unsafe impl Send for EcmaAst {}` and `unsafe impl Sync for EcmaAst {}` now have `// SAFETY:` blocks spelling out the invariant and naming the call sites that depend on `Sync`. ## Verification - `cargo check --workspace --all-targets` clean. - `cargo clippy --workspace --all-targets -- --deny warnings` clean. - `cargo test -p rolldown --test integration -- --skip ''hmr''` — all 1666 non-HMR integration tests pass. - `rg -n ''ast\.allocator\(\)'' crates/` — zero results.
Merged
shulaoda
added a commit
that referenced
this pull request
May 7, 2026
## [1.0.0] - 2026-05-07 ### 🐛 Bug Fixes - dev/lazy: lazily compiled modules should be watched (#9301) by @h-a-n-a - implement dynamic dominator merge logic (#9270) by @TheAlexLichter - dev: apply __toCommonJS interop when CJS requires ESM in HMR finalizer (#9261) by @h-a-n-a ### 🚜 Refactor - ecma_ast: tighten allocator access to enforce Sync invariant (#9278) by @IWANABETHATGUY - scan_stage: remove stmt_infos field from EcmaView (#9276) by @IWANABETHATGUY - link_stage: detach stmt_infos from EcmaView (#9274) by @IWANABETHATGUY - link_stage: detach depended_runtime_helper from EcmaView to remove unsafe (#9265) by @IWANABETHATGUY - link_stage: remove unsafe in determine_module_exports_kind (#9253) by @IWANABETHATGUY ### 📚 Documentation - getting-started: remove RC warning for 1.0.0 release (#9310) by @shulaoda - getting-started: update version references for 1.0.0 release (#9309) by @shulaoda - add Vite+ tab to getting-started snippets (#9285) by @shulaoda - lazy-barrel: clarify own-exports behavior for import-then-export records (#9298) by @shulaoda - restructure top navigation around Learn vs Reference (#9284) by @shulaoda - builtin-plugins: add bundle analyzer plugin docs (#9292) by @shulaoda - design doc for reference_needed_symbols (#9264) by @IWANABETHATGUY ### ⚡ Performance - devtools: write logs on a background thread (#9219) by @IWANABETHATGUY ### ⚙️ Miscellaneous Tasks - mark esbuild/ts/parameter_props_use_define_for_class_fields_true as passed (#9308) by @sapphi-red - deps: upgrade oxc to 0.129.0 (#9297) by @shulaoda - deps: update rollup submodule for tests to v4.60.3 (#9294) by @sapphi-red - deps: update test262 submodule for tests (#9295) by @sapphi-red - ai: add rolldown REPL decode skill (#9245) by @Dunqing
pull Bot
pushed a commit
to olrtg/rolldown
that referenced
this pull request
May 7, 2026
## [1.0.0] - 2026-05-07 ### 🐛 Bug Fixes - dev/lazy: lazily compiled modules should be watched (rolldown#9301) by @h-a-n-a - implement dynamic dominator merge logic (rolldown#9270) by @TheAlexLichter - dev: apply __toCommonJS interop when CJS requires ESM in HMR finalizer (rolldown#9261) by @h-a-n-a ### 🚜 Refactor - ecma_ast: tighten allocator access to enforce Sync invariant (rolldown#9278) by @IWANABETHATGUY - scan_stage: remove stmt_infos field from EcmaView (rolldown#9276) by @IWANABETHATGUY - link_stage: detach stmt_infos from EcmaView (rolldown#9274) by @IWANABETHATGUY - link_stage: detach depended_runtime_helper from EcmaView to remove unsafe (rolldown#9265) by @IWANABETHATGUY - link_stage: remove unsafe in determine_module_exports_kind (rolldown#9253) by @IWANABETHATGUY ### 📚 Documentation - getting-started: remove RC warning for 1.0.0 release (rolldown#9310) by @shulaoda - getting-started: update version references for 1.0.0 release (rolldown#9309) by @shulaoda - add Vite+ tab to getting-started snippets (rolldown#9285) by @shulaoda - lazy-barrel: clarify own-exports behavior for import-then-export records (rolldown#9298) by @shulaoda - restructure top navigation around Learn vs Reference (rolldown#9284) by @shulaoda - builtin-plugins: add bundle analyzer plugin docs (rolldown#9292) by @shulaoda - design doc for reference_needed_symbols (rolldown#9264) by @IWANABETHATGUY ### ⚡ Performance - devtools: write logs on a background thread (rolldown#9219) by @IWANABETHATGUY ### ⚙️ Miscellaneous Tasks - mark esbuild/ts/parameter_props_use_define_for_class_fields_true as passed (rolldown#9308) by @sapphi-red - deps: upgrade oxc to 0.129.0 (rolldown#9297) by @shulaoda - deps: update rollup submodule for tests to v4.60.3 (rolldown#9294) by @sapphi-red - deps: update test262 submodule for tests (rolldown#9295) by @sapphi-red - ai: add rolldown REPL decode skill (rolldown#9245) by @Dunqing Co-authored-by: shulaoda <[email protected]>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.

related to #9242
Stacked on #9274.
Routes per-module
StmtInfosthrough a sideIndexVec<ModuleIdx, StmtInfos>onScanStageOutput/NormalizedScanStageOutput(carried viaEcmaRelatedandRuntimeModuleTaskResult) instead of storing it on eachEcmaView.After #9274,
EcmaView.stmt_infoswas just an emptyStmtInfos::new()placeholder for the entire link/generate lifetime —LinkStage::newmem::replaced the real value out intoLinkStage.stmt_infosimmediately, and every reader went through the side table. This PR removes the field entirely.Changes:
EcmaRelatedandRuntimeModuleTaskResultcarrystmt_infos: StmtInfos.IntermediateNormalModulescollects per-modulestmt_infosparallel toindex_ecma_ast; the module loader builds a sideHybridIndexVec<ModuleIdx, StmtInfos>at output time (external modules get an emptyStmtInfos::new()placeholder).ScanStageOutput/NormalizedScanStageOutputcarry the side table;ScanStageCache::mergeandcreate_outputthread it through.LinkStage::newmem::takesscan_stage_output.stmt_infosdirectly (no per-modulemem::replacewalk).defer_sync_scan_datareads&scan_stage_output.stmt_infos[module_idx]instead of&normal.stmt_infos.EcmaView.stmt_infosfield removed.