Rollup merge of #156214 - qaijuang:fix-lints-that-dont-need-to-run-incr, r=nnethercote

JonathanBrouwer · web-flow · commit 565ee3731255 · 2026-05-08T11:35:34.000+02:00
Do not cache `lints_that_dont_need_to_run` across sessions The `lints_that_dont_need_to_run` query depends on the lint store (which includes internal lints under `-Zunstable-options`). Because that flag is deliberately not part of the incremental command-line hash, incremental builds could load stale results from sessions with a different lint configuration, leading to an ICE. This PR marks the query `eval_always` so it is recomputed for the current session instead of being loaded from cache. Fixes #156182.
diff --git a/compiler/rustc_middle/src/queries.rs b/compiler/rustc_middle/src/queries.rs
@@ -565,6 +565,9 @@ rustc_queries! {
 
     query lints_that_dont_need_to_run(_: ()) -> &'tcx UnordSet<LintId> {
         arena_cache
+        // This depends on the lint store, which includes internal lints when the
+        // untracked `-Zunstable-options` flag is set.
+        eval_always
         desc { "Computing all lints that are explicitly enabled or with a default level greater than Allow" }
     }
 
diff --git a/tests/incremental/commandline-args.rs b/tests/incremental/commandline-args.rs
@@ -1,14 +1,15 @@
 // Test that changing a tracked commandline argument invalidates
 // the cache while changing an untracked one doesn't.
 
-//@ revisions:rpass1 rpass2 rpass3 rpass4
+//@ revisions:rpass1 rpass2 rpass3 rpass4 rpass5
 //@ compile-flags: -Z query-dep-graph
 
 #![feature(rustc_attrs)]
 
 #![rustc_partition_codegened(module="commandline_args", cfg="rpass2")]
 #![rustc_partition_reused(module="commandline_args", cfg="rpass3")]
 #![rustc_partition_codegened(module="commandline_args", cfg="rpass4")]
+#![rustc_partition_reused(module="commandline_args", cfg="rpass5")]
 
 // Between revisions 1 and 2, we are changing the debuginfo-level, which should
 // invalidate the cache. Between revisions 2 and 3, we are adding `--diagnostic-width`
@@ -18,6 +19,10 @@
 //@[rpass2] compile-flags: -C debuginfo=2
 //@[rpass3] compile-flags: -C debuginfo=2 --diagnostic-width=80
 //@[rpass4] compile-flags: -C debuginfo=2 --diagnostic-width=80 --remap-path-prefix=/home/bors/r=src
+// Regression test for https://github.com/rust-lang/rust/issues/156182.
+// `-Zunstable-options` enables internal lints, so the lint store changes without
+// changing the incremental command-line hash.
+//@[rpass5] compile-flags: -C debuginfo=2 --diagnostic-width=80 --remap-path-prefix=/home/bors/r=src -Zunstable-options
 //@ ignore-backends: gcc
 
 pub fn main() {

Original file line number	Diff line number	Diff line change
`@@ -565,6 +565,9 @@ rustc_queries! {`
`565`	`565`
`566`	`566`	`query lints_that_dont_need_to_run(_: ()) -> &'tcx UnordSet<LintId> {`
`567`	`567`	`arena_cache`
	`568`	`+ // This depends on the lint store, which includes internal lints when the`
	`569`	+ // untracked `-Zunstable-options` flag is set.
	`570`	`+ eval_always`
`568`	`571`	`desc { "Computing all lints that are explicitly enabled or with a default level greater than Allow" }`
`569`	`572`	`}`
`570`	`573`