Skip to content

Commit c5dfd1e

Browse files
borsbors
committed
Auto merge of #116849 - oli-obk:error_shenanigans, r=<try>
Avoid a `track_errors` by bubbling up most errors from `check_well_formed` I believe `track_errors` is mostly papering over issues that a sufficiently convoluted query graph can hit. I made this change, while the actual change I want to do is to stop bailing out early on errors, and instead use this new `ErrorGuaranteed` to invoke `check_well_formed` for individual items before doing all the `typeck` logic on them. This works towards resolving #97477 and various other ICEs, as well as allowing us to use parallel rustc more (which is currently rather limited/bottlenecked due to the very sequential nature in which we do `rustc_hir_analysis::check_crate`) cc `@SparrowLii` `@Zoxc` for the new `try_par_for_each_in` function
2 parents b9832e7 + 0da8104 commit c5dfd1e

33 files changed

+335
-305
lines changed

‎compiler/rustc_data_structures/src/sync.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ pub use worker_local::{Registry, WorkerLocal};
5454
mod parallel;
5555
#[cfg(parallel_compiler)]
5656
pub use parallel::scope;
57-
pub use parallel::{join, par_for_each_in, par_map, parallel_guard};
57+
pub use parallel::{join, par_for_each_in, par_map, parallel_guard, try_par_for_each_in};
5858

5959
pub use std::sync::atomic::Ordering;
6060
pub use std::sync::atomic::Ordering::SeqCst;

‎compiler/rustc_data_structures/src/sync/parallel.rs

+25
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,15 @@ mod disabled {
7777
})
7878
}
7979

80+
pub fn try_par_for_each_in<T: IntoIterator, E: Copy>(
81+
t: T,
82+
mut for_each: impl FnMut(T::Item) -> Result<(), E>,
83+
) -> Result<(), E> {
84+
parallel_guard(|guard| {
85+
t.into_iter().fold(Ok(()), |ret, i| guard.run(|| for_each(i)).unwrap_or(ret).and(ret))
86+
})
87+
}
88+
8089
pub fn par_map<T: IntoIterator, R, C: FromIterator<R>>(
8190
t: T,
8291
mut map: impl FnMut(<<T as IntoIterator>::IntoIter as Iterator>::Item) -> R,
@@ -167,6 +176,22 @@ mod enabled {
167176
});
168177
}
169178

179+
pub fn try_par_for_each_in<I, T: IntoIterator<Item = I> + IntoParallelIterator<Item = I>, E>(
180+
t: T,
181+
for_each: impl Fn(I) -> Result<(), E> + DynSync + DynSend,
182+
) -> Result<(), E> {
183+
parallel_guard(|guard| {
184+
if mode::is_dyn_thread_safe() {
185+
let for_each = FromDyn::from(for_each);
186+
t.into_par_iter()
187+
.fold(Ok(()), |ret, i| guard.run(|| for_each(i)).unwrap_or(ret).and(ret))
188+
} else {
189+
t.into_iter()
190+
.fold(Ok(()), |ret, i| guard.run(|| for_each(i)).unwrap_or(ret).and(ret))
191+
}
192+
});
193+
}
194+
170195
pub fn par_map<
171196
I,
172197
T: IntoIterator<Item = I> + IntoParallelIterator<Item = I>,

‎compiler/rustc_hir_analysis/src/check/wfcheck.rs

+124-106
Large diffs are not rendered by default.

‎compiler/rustc_hir_analysis/src/lib.rs

+2-4
Original file line numberDiff line numberDiff line change
@@ -205,10 +205,8 @@ pub fn check_crate(tcx: TyCtxt<'_>) -> Result<(), ErrorGuaranteed> {
205205
})?;
206206
}
207207

208-
tcx.sess.track_errors(|| {
209-
tcx.sess.time("wf_checking", || {
210-
tcx.hir().par_for_each_module(|module| tcx.ensure().check_mod_type_wf(module))
211-
});
208+
tcx.sess.time("wf_checking", || {
209+
tcx.hir().try_par_for_each_module(|module| tcx.check_mod_type_wf(module))
212210
})?;
213211

214212
// NOTE: This is copy/pasted in librustdoc/core.rs and should be kept in sync.

‎compiler/rustc_middle/src/hir/map/mod.rs

+13-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use rustc_ast as ast;
66
use rustc_data_structures::fingerprint::Fingerprint;
77
use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
88
use rustc_data_structures::svh::Svh;
9-
use rustc_data_structures::sync::{par_for_each_in, DynSend, DynSync};
9+
use rustc_data_structures::sync::{par_for_each_in, try_par_for_each_in, DynSend, DynSync};
1010
use rustc_hir::def::{DefKind, Res};
1111
use rustc_hir::def_id::{DefId, LocalDefId, LocalModDefId, LOCAL_CRATE};
1212
use rustc_hir::definitions::{DefKey, DefPath, DefPathData, DefPathHash};
@@ -16,7 +16,7 @@ use rustc_index::Idx;
1616
use rustc_middle::hir::nested_filter;
1717
use rustc_span::def_id::StableCrateId;
1818
use rustc_span::symbol::{kw, sym, Ident, Symbol};
19-
use rustc_span::Span;
19+
use rustc_span::{ErrorGuaranteed, Span};
2020
use rustc_target::spec::abi::Abi;
2121

2222
#[inline]
@@ -632,6 +632,17 @@ impl<'hir> Map<'hir> {
632632
})
633633
}
634634

635+
#[inline]
636+
pub fn try_par_for_each_module(
637+
self,
638+
f: impl Fn(LocalModDefId) -> Result<(), ErrorGuaranteed> + DynSend + DynSync,
639+
) -> Result<(), ErrorGuaranteed> {
640+
let crate_items = self.tcx.hir_crate_items(());
641+
try_par_for_each_in(&crate_items.submodules[..], |module| {
642+
f(LocalModDefId::new_unchecked(module.def_id))
643+
})
644+
}
645+
635646
/// Returns an iterator for the nodes in the ancestor tree of the `current_id`
636647
/// until the crate root is reached. Prefer this over your own loop using `parent_id`.
637648
#[inline]

‎compiler/rustc_middle/src/hir/mod.rs

+22-10
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ pub mod place;
99
use crate::query::Providers;
1010
use crate::ty::{EarlyBinder, ImplSubject, TyCtxt};
1111
use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
12-
use rustc_data_structures::sync::{par_for_each_in, DynSend, DynSync};
12+
use rustc_data_structures::sync::{try_par_for_each_in, DynSend, DynSync};
1313
use rustc_hir::def::DefKind;
1414
use rustc_hir::def_id::{DefId, LocalDefId, LocalModDefId};
1515
use rustc_hir::*;
1616
use rustc_query_system::ich::StableHashingContext;
17-
use rustc_span::{ExpnId, DUMMY_SP};
17+
use rustc_span::{ErrorGuaranteed, ExpnId, DUMMY_SP};
1818

1919
/// Top-level HIR node for current owner. This only contains the node for which
2020
/// `HirId::local_id == 0`, and excludes bodies.
@@ -78,20 +78,32 @@ impl ModuleItems {
7878
self.owners().map(|id| id.def_id)
7979
}
8080

81-
pub fn par_items(&self, f: impl Fn(ItemId) + DynSend + DynSync) {
82-
par_for_each_in(&self.items[..], |&id| f(id))
81+
pub fn par_items(
82+
&self,
83+
f: impl Fn(ItemId) -> Result<(), ErrorGuaranteed> + DynSend + DynSync,
84+
) -> Result<(), ErrorGuaranteed> {
85+
try_par_for_each_in(&self.items[..], |&id| f(id))
8386
}
8487

85-
pub fn par_trait_items(&self, f: impl Fn(TraitItemId) + DynSend + DynSync) {
86-
par_for_each_in(&self.trait_items[..], |&id| f(id))
88+
pub fn par_trait_items(
89+
&self,
90+
f: impl Fn(TraitItemId) -> Result<(), ErrorGuaranteed> + DynSend + DynSync,
91+
) -> Result<(), ErrorGuaranteed> {
92+
try_par_for_each_in(&self.trait_items[..], |&id| f(id))
8793
}
8894

89-
pub fn par_impl_items(&self, f: impl Fn(ImplItemId) + DynSend + DynSync) {
90-
par_for_each_in(&self.impl_items[..], |&id| f(id))
95+
pub fn par_impl_items(
96+
&self,
97+
f: impl Fn(ImplItemId) -> Result<(), ErrorGuaranteed> + DynSend + DynSync,
98+
) -> Result<(), ErrorGuaranteed> {
99+
try_par_for_each_in(&self.impl_items[..], |&id| f(id))
91100
}
92101

93-
pub fn par_foreign_items(&self, f: impl Fn(ForeignItemId) + DynSend + DynSync) {
94-
par_for_each_in(&self.foreign_items[..], |&id| f(id))
102+
pub fn par_foreign_items(
103+
&self,
104+
f: impl Fn(ForeignItemId) -> Result<(), ErrorGuaranteed> + DynSend + DynSync,
105+
) -> Result<(), ErrorGuaranteed> {
106+
try_par_for_each_in(&self.foreign_items[..], |&id| f(id))
95107
}
96108
}
97109

‎compiler/rustc_middle/src/query/mod.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -975,8 +975,9 @@ rustc_queries! {
975975
desc { |tcx| "checking that impls are well-formed in {}", describe_as_module(key, tcx) }
976976
}
977977

978-
query check_mod_type_wf(key: LocalModDefId) -> () {
978+
query check_mod_type_wf(key: LocalModDefId) -> Result<(), ErrorGuaranteed> {
979979
desc { |tcx| "checking that types are well-formed in {}", describe_as_module(key, tcx) }
980+
cache_on_disk_if { true }
980981
}
981982

982983
query collect_mod_item_types(key: LocalModDefId) -> () {
@@ -1509,8 +1510,9 @@ rustc_queries! {
15091510
feedable
15101511
}
15111512

1512-
query check_well_formed(key: hir::OwnerId) -> () {
1513+
query check_well_formed(key: hir::OwnerId) -> Result<(), ErrorGuaranteed> {
15131514
desc { |tcx| "checking that `{}` is well-formed", tcx.def_path_str(key) }
1515+
cache_on_disk_if { true }
15141516
}
15151517

15161518
// The `DefId`s of all non-generic functions and statics in the given crate

‎src/tools/clippy/tests/ui/crashes/ice-6252.stderr

+2-12
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,6 @@ help: you might be missing a type parameter
2424
LL | impl<N, M, VAL> TypeVal<usize> for Multiply<N, M> where N: TypeVal<VAL> {}
2525
| +++++
2626

27-
error[E0046]: not all trait items implemented, missing: `VAL`
28-
--> $DIR/ice-6252.rs:11:1
29-
|
30-
LL | const VAL: T;
31-
| ------------ `VAL` from trait
32-
...
33-
LL | impl<N, M> TypeVal<usize> for Multiply<N, M> where N: TypeVal<VAL> {}
34-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ missing `VAL` in implementation
35-
36-
error: aborting due to 3 previous errors
27+
error: aborting due to 2 previous errors
3728

38-
Some errors have detailed explanations: E0046, E0412.
39-
For more information about an error, try `rustc --explain E0046`.
29+
For more information about this error, try `rustc --explain E0412`.

‎tests/ui/associated-consts/issue-105330.rs

+3-6
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,10 @@ impl TraitWAssocConst for impl Demo { //~ ERROR E0404
99
}
1010

1111
fn foo<A: TraitWAssocConst<A=32>>() { //~ ERROR E0658
12-
foo::<Demo>()(); //~ ERROR E0271
13-
//~^ ERROR E0618
14-
//~| ERROR E0277
12+
foo::<Demo>()();
1513
}
1614

17-
fn main<A: TraitWAssocConst<A=32>>() { //~ ERROR E0131
15+
fn main<A: TraitWAssocConst<A=32>>() {
1816
//~^ ERROR E0658
19-
foo::<Demo>(); //~ ERROR E0277
20-
//~^ ERROR E0271
17+
foo::<Demo>();
2118
}

‎tests/ui/associated-consts/issue-105330.stderr

+4-82
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ LL | fn foo<A: TraitWAssocConst<A=32>>() {
2525
= help: add `#![feature(associated_const_equality)]` to the crate attributes to enable
2626

2727
error[E0658]: associated const equality is incomplete
28-
--> $DIR/issue-105330.rs:17:29
28+
--> $DIR/issue-105330.rs:15:29
2929
|
3030
LL | fn main<A: TraitWAssocConst<A=32>>() {
3131
| ^^^^
@@ -39,85 +39,7 @@ error[E0562]: `impl Trait` only allowed in function and inherent method argument
3939
LL | impl TraitWAssocConst for impl Demo {
4040
| ^^^^^^^^^
4141

42-
error[E0131]: `main` function is not allowed to have generic parameters
43-
--> $DIR/issue-105330.rs:17:8
44-
|
45-
LL | fn main<A: TraitWAssocConst<A=32>>() {
46-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^ `main` cannot have generic parameters
47-
48-
error[E0277]: the trait bound `Demo: TraitWAssocConst` is not satisfied
49-
--> $DIR/issue-105330.rs:12:11
50-
|
51-
LL | foo::<Demo>()();
52-
| ^^^^ the trait `TraitWAssocConst` is not implemented for `Demo`
53-
|
54-
help: this trait has no implementations, consider adding one
55-
--> $DIR/issue-105330.rs:1:1
56-
|
57-
LL | pub trait TraitWAssocConst {
58-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
59-
note: required by a bound in `foo`
60-
--> $DIR/issue-105330.rs:11:11
61-
|
62-
LL | fn foo<A: TraitWAssocConst<A=32>>() {
63-
| ^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `foo`
64-
65-
error[E0271]: type mismatch resolving `<Demo as TraitWAssocConst>::A == 32`
66-
--> $DIR/issue-105330.rs:12:11
67-
|
68-
LL | foo::<Demo>()();
69-
| ^^^^ expected `32`, found `<Demo as TraitWAssocConst>::A`
70-
|
71-
= note: expected constant `32`
72-
found constant `<Demo as TraitWAssocConst>::A`
73-
note: required by a bound in `foo`
74-
--> $DIR/issue-105330.rs:11:28
75-
|
76-
LL | fn foo<A: TraitWAssocConst<A=32>>() {
77-
| ^^^^ required by this bound in `foo`
78-
79-
error[E0618]: expected function, found `()`
80-
--> $DIR/issue-105330.rs:12:5
81-
|
82-
LL | fn foo<A: TraitWAssocConst<A=32>>() {
83-
| ----------------------------------- `foo::<Demo>` defined here returns `()`
84-
LL | foo::<Demo>()();
85-
| ^^^^^^^^^^^^^--
86-
| |
87-
| call expression requires function
88-
89-
error[E0277]: the trait bound `Demo: TraitWAssocConst` is not satisfied
90-
--> $DIR/issue-105330.rs:19:11
91-
|
92-
LL | foo::<Demo>();
93-
| ^^^^ the trait `TraitWAssocConst` is not implemented for `Demo`
94-
|
95-
help: this trait has no implementations, consider adding one
96-
--> $DIR/issue-105330.rs:1:1
97-
|
98-
LL | pub trait TraitWAssocConst {
99-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
100-
note: required by a bound in `foo`
101-
--> $DIR/issue-105330.rs:11:11
102-
|
103-
LL | fn foo<A: TraitWAssocConst<A=32>>() {
104-
| ^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `foo`
105-
106-
error[E0271]: type mismatch resolving `<Demo as TraitWAssocConst>::A == 32`
107-
--> $DIR/issue-105330.rs:19:11
108-
|
109-
LL | foo::<Demo>();
110-
| ^^^^ expected `32`, found `<Demo as TraitWAssocConst>::A`
111-
|
112-
= note: expected constant `32`
113-
found constant `<Demo as TraitWAssocConst>::A`
114-
note: required by a bound in `foo`
115-
--> $DIR/issue-105330.rs:11:28
116-
|
117-
LL | fn foo<A: TraitWAssocConst<A=32>>() {
118-
| ^^^^ required by this bound in `foo`
119-
120-
error: aborting due to 11 previous errors
42+
error: aborting due to 5 previous errors
12143

122-
Some errors have detailed explanations: E0131, E0271, E0277, E0404, E0562, E0618, E0658.
123-
For more information about an error, try `rustc --explain E0131`.
44+
Some errors have detailed explanations: E0404, E0562, E0658.
45+
For more information about an error, try `rustc --explain E0404`.

‎tests/ui/associated-consts/issue-58022.rs

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ impl Bar<[u8]> {
1111
const SIZE: usize = 32;
1212

1313
fn new(slice: &[u8; Self::SIZE]) -> Self {
14+
//~^ ERROR: the size for values of type `[u8]` cannot be known at compilation time
1415
Foo(Box::new(*slice))
1516
//~^ ERROR: expected function, tuple struct or tuple variant, found trait `Foo`
1617
}

‎tests/ui/associated-consts/issue-58022.stderr

+18-4
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,27 @@ LL |
77
LL | fn new(slice: &[u8; Foo::SIZE]) -> Self;
88
| ^^^^^^^^^ cannot refer to the associated constant of trait
99

10+
error[E0277]: the size for values of type `[u8]` cannot be known at compilation time
11+
--> $DIR/issue-58022.rs:13:41
12+
|
13+
LL | fn new(slice: &[u8; Self::SIZE]) -> Self {
14+
| ^^^^ doesn't have a size known at compile-time
15+
|
16+
= help: within `Bar<[u8]>`, the trait `Sized` is not implemented for `[u8]`
17+
note: required because it appears within the type `Bar<[u8]>`
18+
--> $DIR/issue-58022.rs:8:12
19+
|
20+
LL | pub struct Bar<T: ?Sized>(T);
21+
| ^^^
22+
= note: the return type of a function must have a statically known size
23+
1024
error[E0423]: expected function, tuple struct or tuple variant, found trait `Foo`
11-
--> $DIR/issue-58022.rs:14:9
25+
--> $DIR/issue-58022.rs:15:9
1226
|
1327
LL | Foo(Box::new(*slice))
1428
| ^^^ not a function, tuple struct or tuple variant
1529

16-
error: aborting due to 2 previous errors
30+
error: aborting due to 3 previous errors
1731

18-
Some errors have detailed explanations: E0423, E0790.
19-
For more information about an error, try `rustc --explain E0423`.
32+
Some errors have detailed explanations: E0277, E0423, E0790.
33+
For more information about an error, try `rustc --explain E0277`.

‎tests/ui/async-await/issue-66312.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ trait Test<T> {
66

77
async fn f() {
88
let x = Some(2);
9-
if x.is_some() {
9+
if x.is_some() { //~ ERROR mismatched types
1010
println!("Some");
1111
}
1212
}

‎tests/ui/async-await/issue-66312.stderr

+9-2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,13 @@ LL | fn is_some(self: T);
77
= note: type of `self` must be `Self` or a type that dereferences to it
88
= help: consider changing to `self`, `&self`, `&mut self`, `self: Box<Self>`, `self: Rc<Self>`, `self: Arc<Self>`, or `self: Pin<P>` (where P is one of the previous types except `Self`)
99

10-
error: aborting due to previous error
10+
error[E0308]: mismatched types
11+
--> $DIR/issue-66312.rs:9:8
12+
|
13+
LL | if x.is_some() {
14+
| ^^^^^^^^^^^ expected `bool`, found `()`
15+
16+
error: aborting due to 2 previous errors
1117

12-
For more information about this error, try `rustc --explain E0307`.
18+
Some errors have detailed explanations: E0307, E0308.
19+
For more information about an error, try `rustc --explain E0307`.

‎tests/ui/const-generics/generic_arg_infer/infer-arg-test.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ fn bad_infer_fn<_>() {}
1515

1616

1717
fn main() {
18-
let a: All<_, _, _>;
18+
let a: All<_, _, _>; //~ ERROR struct takes 2 generic arguments but 3
1919
all_fn();
2020
let v: [u8; _];
2121
let v: [u8; 10] = [0; _];

0 commit comments

Comments
 (0)