Remove tls::with_related_context.#153316
Open
nnethercote wants to merge 2 commits intorust-lang:mainfrom
Open
Conversation
rustbot
added
A-query-system
Collaborator
|
|
Contributor
Author
|
@bors try @rust-timer queue |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
rust-bors bot
pushed a commit
that referenced
this pull request
Mar 2, 2026
Remove `tls::with_related_context`.
rustbot
added
the
S-waiting-on-perf
Contributor
This comment has been minimized.
This comment has been minimized.
Collaborator
|
Finished benchmarking commit (f3f58ae): comparison URL. Overall result: ✅ improvements - no action neededBenchmarking this pull request means it may be perf-sensitive – we'll automatically label it not fit for rolling up. You can override this, but we strongly advise not to, due to possible changes in compiler perf. @bors rollup=never Instruction countOur most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.
Max RSS (memory usage)Results (primary -4.9%, secondary -3.1%)A less reliable metric. May be of interest, but not used to determine the overall result above.
CyclesResults (secondary 2.1%)A less reliable metric. May be of interest, but not used to determine the overall result above.
Binary sizeThis benchmark run did not return any relevant results for this metric. Bootstrap: 480.002s -> 480.332s (0.07%) |
rustbot
removed
the
S-waiting-on-perf
Contributor
Author
|
Very minor perf wins, |
Zalathar
reviewed
Mar 3, 2026
Zalathar
reviewed
Mar 3, 2026
Comment on lines
-69
to
+70
| /// new query job while it executes. | ||
| /// Executes a job by changing the `ImplicitCtxt` to point to the new query job while it executes. | ||
| #[inline(always)] | ||
| pub(crate) fn start_query<'tcx, R>( | ||
| tcx: TyCtxt<'tcx>, | ||
| token: QueryJobId, | ||
| pub(crate) fn start_query<R>( |
Member
There was a problem hiding this comment.
Remark: I've been meaning to rename this function at some point, because I find start_query pretty unhelpful for indicating what it actually does and doesn't do.
This function gets the current `ImplicitCtxt` and checks that its `tcx` matches the passed-in `tcx`. It's an extra bit of sanity checking: when you already have a `tcx`, and you need access to the non-`tcx` parts of `ImplicitCtxt`, check that your `tcx` matches the one in `ImplicitCtxt`. However, it's only used in two places: `start_query` and `current_query_job`. The non-checked alternatives (`with_context`, `with_context_opt`) are used in more places, including some where a `tcx` is available. And things would have to go catastrophically wrong for the check to fail -- e.g. if we somehow end up with multiple `TyCtxt`s. In my opinion it's just an extra case to understand in `tls.rs` that adds little value. This commit removes it. This avoids the need for `tcx` parameters in a couple of places. The commit also adjusts how `start_query` sets up its `ImplicitCtxt` to more closely match how similar functions do it, i.e. with `..icx.clone()` for the unchanged fields.
It's unnecessary.
nnethercote
force-pushed
the
rm-with_related_context
branch
from
083dcc1 to
6a07088
Compare
Collaborator
|
This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed. Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers. |
Contributor
rust-bors
bot
added
S-waiting-on-bors
This comment has been minimized.
This comment has been minimized.
rust-bors bot
pushed a commit
that referenced
this pull request
Mar 4, 2026
Remove `tls::with_related_context`. This function gets the current `ImplicitCtxt` and checks that its `tcx` matches the passed-in `tcx`. It's an extra bit of sanity checking: when you already have a `tcx`, and you need access to the non-`tcx` parts of `ImplicitCtxt`, check that your `tcx` matches the one in `ImplicitCtxt`. However, it's only used in two places: `start_query` and `current_query_job`. The non-checked alternatives (`with_context`, `with_context_opt`) are used in more places, including some where a `tcx` is available. And things would have to go catastrophically wrong for the check to fail -- e.g. if we somehow end up with multiple `TyCtxt`s. In my opinion it's just an extra case to understand in `tls.rs` that adds little value. This commit removes it. This avoids the need for `tcx` parameters in a couple of places. The commit also adjusts how `start_query` sets up its `ImplicitCtxt` to more closely match how similar functions do it, i.e. with `..icx.clone()` for the unchanged fields. r? @oli-obk
rust-bors
bot
added
S-waiting-on-review
Contributor
|
💔 Test for 810171f failed: CI. Failed job:
|
Collaborator
|
The job Click to see the possible cause of the failure (guessed by this bot) |
Contributor
Author
|
Failure in a cargo test that seems to assume crates are compiled in a deterministic order, which seems (a) dubious, and (b) not related to this PR. @bors retry |
rust-bors
bot
added
S-waiting-on-bors
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
6 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.
This function gets the current
ImplicitCtxtand checks that itstcxmatches the passed-intcx. It's an extra bit of sanity checking: when you already have atcx, and you need access to the non-tcxparts ofImplicitCtxt, check that yourtcxmatches the one inImplicitCtxt.However, it's only used in two places:
start_queryandcurrent_query_job. The non-checked alternatives (with_context,with_context_opt) are used in more places, including some where atcxis available. And things would have to go catastrophically wrong for the check to fail -- e.g. if we somehow end up with multipleTyCtxts. In my opinion it's just an extra case to understand intls.rsthat adds little value.This commit removes it. This avoids the need for
tcxparameters in a couple of places. The commit also adjusts howstart_querysets up itsImplicitCtxtto more closely match how similar functions do it, i.e. with..icx.clone()for the unchanged fields.r? @oli-obk