Remove `HasDepContext` by merging it into `QueryContext` #151968

Zoxc · 2026-02-01T21:02:14Z

This removes HasDepContext by merging it into QueryContext. with_task is changed to be passed DepContext directly, instead of getting it using HasDepContext from the task context.

Zoxc · 2026-02-01T23:37:25Z

@bors try @rust-timer queue

Remove `HasDepContext` by merging it into `QueryContext`

rust-bors · 2026-02-02T01:48:29Z

☀️ Try build successful (CI)
Build commit: 66c06b5 (66c06b57ae83a898431e299b776b7655b4baa4bc, parent: 57d2fb136650d05efb3ed3ea33b330bfc85844d5)

rust-timer · 2026-02-02T02:29:23Z

Finished benchmarking commit (66c06b5): comparison URL.

Overall result: no relevant changes - no action needed

Benchmarking 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
@rustbot label: -S-waiting-on-perf -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results (primary 2.8%, secondary 4.0%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

	mean	range	count
Regressions ❌ (primary)	2.8%	[2.7%, 2.9%]	2
Regressions ❌ (secondary)	4.0%	[4.0%, 4.0%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	2.8%	[2.7%, 2.9%]	2

Cycles

Results (secondary 5.1%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	5.1%	[5.1%, 5.1%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 473.934s -> 473.46s (-0.10%)
Artifact size: 397.68 MiB -> 397.67 MiB (-0.00%)

rustbot · 2026-02-02T03:00:50Z

r? @BoxyUwU

rustbot has assigned @BoxyUwU.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

Zoxc · 2026-02-02T20:04:44Z

cc @nnethercote @Zalathar

Zalathar · 2026-02-02T21:16:33Z

compiler/rustc_query_system/src/dep_graph/graph.rs

    ) -> (R, DepNodeIndex) {
        match self.data() {
-            Some(data) => data.with_task(key, cx, arg, task, hash_result),
+            Some(data) => data.with_task(key, cx, cx, arg, task, hash_result),


Remark: Passing in cx twice is unfortunate, but I guess there are two different callers of DepGraphData::with_task, and the other one uses a different (tupled) task context.

nnethercote

Feels like there is more juice to be squeezed here -- the double cx arg, and is having both DepContext and QueryContext useful? -- but this is an improvement.

View changes since this review

nnethercote · 2026-02-02T21:56:27Z

@bors r+ rollup

rust-bors · 2026-02-02T21:56:30Z

📌 Commit 424d45c has been approved by nnethercote

It is now in the queue for this repository.

Rollup of 11 pull requests Successful merges: - #151378 (Codegen tests for Arm Cortex-R82) - #151936 (Move the `fingerprint_style` special case into `DepKindVTable` creation) - #152018 (Move bigint helper tracking issues) - #151958 (Add codegen test for SLP vectorization) - #151974 (Update documentation for `Result::ok()`) - #151975 (Work around rustfmt giving up on a large expression) - #151990 (Fix missing unused_variables lint when using a match guard) - #151995 (stabilize ptr_as_ref_unchecked) - #151999 (attribute parsing: pass recovery mode to Parser.) - #152009 (Port rustc_preserve_ub_checks to attr parser) - #152022 (rustc-dev-guide subtree update) Failed merges: - #151968 (Remove `HasDepContext` by merging it into `QueryContext`)

…cote Remove `HasDepContext` by merging it into `QueryContext` This removes `HasDepContext` by merging it into `QueryContext`. `with_task` is changed to be passed `DepContext` directly, instead of getting it using `HasDepContext` from the task context.

BoxyUwU · 2026-02-03T12:04:59Z

r? nnethercote

Rollup of 11 pull requests Successful merges: - rust-lang/rust#151378 (Codegen tests for Arm Cortex-R82) - rust-lang/rust#151936 (Move the `fingerprint_style` special case into `DepKindVTable` creation) - rust-lang/rust#152018 (Move bigint helper tracking issues) - rust-lang/rust#151958 (Add codegen test for SLP vectorization) - rust-lang/rust#151974 (Update documentation for `Result::ok()`) - rust-lang/rust#151975 (Work around rustfmt giving up on a large expression) - rust-lang/rust#151990 (Fix missing unused_variables lint when using a match guard) - rust-lang/rust#151995 (stabilize ptr_as_ref_unchecked) - rust-lang/rust#151999 (attribute parsing: pass recovery mode to Parser.) - rust-lang/rust#152009 (Port rustc_preserve_ub_checks to attr parser) - rust-lang/rust#152022 (rustc-dev-guide subtree update) Failed merges: - rust-lang/rust#151968 (Remove `HasDepContext` by merging it into `QueryContext`)

rustbot · 2026-02-08T17:11:23Z

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.

rust-bors · 2026-02-09T13:34:42Z

☔ The latest upstream changes (presumably #152371) made this pull request unmergeable. Please resolve the merge conflicts.

This comment has been minimized.

Sign in to view

Zoxc force-pushed the rem-has-depcontext branch from 898a9ee to 424d45c Compare February 1, 2026 21:15

This comment has been minimized.

Sign in to view

rust-bors bot pushed a commit that referenced this pull request Feb 1, 2026

Auto merge of #151968 - Zoxc:rem-has-depcontext, r=<try>

66c06b5

Remove `HasDepContext` by merging it into `QueryContext`

rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Feb 1, 2026

This comment has been minimized.

Sign in to view

rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Feb 2, 2026

Zoxc marked this pull request as ready for review February 2, 2026 03:00

rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 2, 2026

rustbot assigned BoxyUwU Feb 2, 2026

rustbot removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Feb 2, 2026

Zalathar reviewed Feb 2, 2026

View reviewed changes

nnethercote approved these changes Feb 2, 2026

View reviewed changes

rust-bors bot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 2, 2026

jhpratt mentioned this pull request Feb 3, 2026

Rollup of 11 pull requests #152025

Merged

JonathanBrouwer mentioned this pull request Feb 3, 2026

Rollup of 2 pull requests #152027

Closed

rust-bors bot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 3, 2026

This comment has been minimized.

Sign in to view

Zoxc force-pushed the rem-has-depcontext branch from 424d45c to de378ea Compare February 3, 2026 09:11

This comment has been minimized.

Sign in to view

rustbot assigned nnethercote and unassigned BoxyUwU Feb 3, 2026

This comment has been minimized.

Sign in to view

Zoxc force-pushed the rem-has-depcontext branch from de378ea to 0ef0ee6 Compare February 6, 2026 02:25

This comment has been minimized.

Sign in to view

Zoxc force-pushed the rem-has-depcontext branch from 0ef0ee6 to a90d6a0 Compare February 6, 2026 12:16

This comment has been minimized.

Sign in to view

Remove HasDepContext by merging it into QueryContext

c629901

Zoxc force-pushed the rem-has-depcontext branch from a90d6a0 to c629901 Compare February 8, 2026 17:11

Uh oh!

Remove HasDepContext by merging it into QueryContext #151968

Are you sure you want to change the base?

Remove HasDepContext by merging it into QueryContext #151968

Uh oh!

Conversation

Zoxc commented Feb 1, 2026

Uh oh!

This comment has been minimized.

Zoxc commented Feb 1, 2026

Uh oh!

This comment has been minimized.

This comment has been minimized.

rust-bors bot commented Feb 2, 2026

Uh oh!

This comment has been minimized.

rust-timer commented Feb 2, 2026

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

rustbot commented Feb 2, 2026

Uh oh!

Zoxc commented Feb 2, 2026

Uh oh!

Zalathar Feb 2, 2026

Choose a reason for hiding this comment

Uh oh!

nnethercote left a comment • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

nnethercote commented Feb 2, 2026

Uh oh!

rust-bors bot commented Feb 2, 2026

Uh oh!

This comment has been minimized.

This comment has been minimized.

BoxyUwU commented Feb 3, 2026

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

rustbot commented Feb 8, 2026

Uh oh!

rust-bors bot commented Feb 9, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Remove `HasDepContext` by merging it into `QueryContext` #151968

Remove `HasDepContext` by merging it into `QueryContext` #151968

nnethercote left a comment •

edited by rustbot

Loading