Separate InterpCx usage by ConstAnalysis phases#159586
Merged
Merged
Conversation
`ConstAnalysis` has a `RefCell<InterpCx>`. During the analysis phase the accesses are read-only, but the visiting phase (performed by `Collector`) requires mutation, because of calls to `try_make_constant`. This commit removes the `RefCell` by having two `InterpCx` instances: a read-only one for the `ConstAnalysis` and a mutable one for the visiting phase, stored in `Collector`. This removes the need for the `OperandCollector::ecx` field, and for many `borrow`/`borrow_mut` calls.
Collaborator
|
Some changes occurred to MIR optimizations cc @rust-lang/wg-mir-opt |
rustbot
added
S-waiting-on-review
Contributor
rust-bors
Bot
added
the
S-waiting-on-bors
rust-bors
Bot
removed
the
S-waiting-on-review
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Jul 20, 2026
…li-obk Separate `InterpCx` usage by `ConstAnalysis` phases `ConstAnalysis` has a `RefCell<InterpCx>`. During the analysis phase the accesses are read-only, but the visiting phase (performed by `Collector`) requires mutation, because of calls to `try_make_constant`. This commit removes the `RefCell` by having two `InterpCx` instances: a read-only one for the `ConstAnalysis` and a mutable one for the visiting phase, stored in `Collector`. This removes the need for the `OperandCollector::ecx` field, and for many `borrow`/`borrow_mut` calls. r? @cjgillot
rust-bors Bot
pushed a commit
that referenced
this pull request
Jul 20, 2026
…uwer Rollup of 10 pull requests Successful merges: - #159600 (`rust-analyzer` subtree update) - #158046 (proc_macro: preserve file module spans for inner attrs) - #159000 (Small cleanups to the incr comp session code) - #159449 (Enable single Location to issue multiple borrows) - #159587 (Improve `AttrItem::span`) - #159460 (Do not mark unnormalized const aliases as rigid when normalizing param env) - #159529 (Add regression test for nested replacement ranges in `collect_tokens`) - #159585 (Minor `TokenStream` improvements) - #159586 (Separate `InterpCx` usage by `ConstAnalysis` phases) - #159603 (Clarify `push_stream`/`push_tree`) Failed merges: - #159590 (Remove some dead code)
rust-bors Bot
pushed a commit
that referenced
this pull request
Jul 20, 2026
…uwer Rollup of 18 pull requests Successful merges: - #159600 (`rust-analyzer` subtree update) - #158046 (proc_macro: preserve file module spans for inner attrs) - #159000 (Small cleanups to the incr comp session code) - #159189 (Account for type alias projections in E0308 "expected/found" shortening logic) - #159449 (Enable single Location to issue multiple borrows) - #159544 (Suggest valid command-line crate names) - #159587 (Improve `AttrItem::span`) - #159594 (feat(rustc_hir_typeck): suggest `impl Fn` return for capturing closures) - #159597 (std: use `arc4random_buf` from libc) - #159599 (Resolver: Record at least 1 ambiguous trait if main decl is not a trait.) - #158061 (Make `pin!()` more foolproof.) - #159460 (Do not mark unnormalized const aliases as rigid when normalizing param env) - #159529 (Add regression test for nested replacement ranges in `collect_tokens`) - #159571 (Remove unused bundled library lookup for the local crate) - #159585 (Minor `TokenStream` improvements) - #159586 (Separate `InterpCx` usage by `ConstAnalysis` phases) - #159602 (Remove `ItemLike`) - #159603 (Clarify `push_stream`/`push_tree`) Failed merges: - #159590 (Remove some dead code)
rust-timer
added a commit
that referenced
this pull request
Jul 20, 2026
Rollup merge of #159586 - nnethercote:ConstAnalysis-ecx, r=oli-obk Separate `InterpCx` usage by `ConstAnalysis` phases `ConstAnalysis` has a `RefCell<InterpCx>`. During the analysis phase the accesses are read-only, but the visiting phase (performed by `Collector`) requires mutation, because of calls to `try_make_constant`. This commit removes the `RefCell` by having two `InterpCx` instances: a read-only one for the `ConstAnalysis` and a mutable one for the visiting phase, stored in `Collector`. This removes the need for the `OperandCollector::ecx` field, and for many `borrow`/`borrow_mut` calls. r? @cjgillot
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
4 participants
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.
ConstAnalysishas aRefCell<InterpCx>. During the analysis phase the accesses are read-only, but the visiting phase (performed byCollector) requires mutation, because of calls totry_make_constant.This commit removes the
RefCellby having twoInterpCxinstances: a read-only one for theConstAnalysisand a mutable one for the visiting phase, stored inCollector. This removes the need for theOperandCollector::ecxfield, and for manyborrow/borrow_mutcalls.r? @cjgillot