Merge `check_mod_impl_wf` and `check_mod_type_wf` #121154

oli-obk · 2024-02-15T17:26:22Z

This still causes some funny diagnostics, but I'm not sure they can be fixed without a larger change, which I'd like to avoid here.

Reducing the number of times we iterate over the same items at this high level helps avoid parallel-compiler bottlenecks.

oli-obk · 2024-02-15T17:26:31Z

@bors try @rust-timer queue

rustbot · 2024-02-15T17:26:31Z

r? @compiler-errors

rustbot has assigned @compiler-errors.
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

bors · 2024-02-15T17:27:41Z

⌛ Trying commit ade1cd7 with merge 24e3e17...

Merge `check_mod_impl_wf` and `check_mod_type_wf` This still causes some funny diagnostics, but I'm not sure they can be fixed without a larger change, which I'd like to avoid here.

oli-obk · 2024-02-15T17:28:59Z

compiler/rustc_hir_analysis/src/lib.rs

-        // Check impls constrain their parameters
-        let res =
-            tcx.hir().try_par_for_each_module(|module| tcx.ensure().check_mod_impl_wf(module));
+        tcx.hir().par_for_each_module(|module| {
+            let _ = tcx.ensure().check_mod_type_wf(module);
+        });

        for &trait_def_id in tcx.all_local_trait_impls(()).keys() {
            let _ = tcx.ensure().coherent_trait(trait_def_id);
        }
        // these queries are executed for side-effects (error reporting):
        let _ = tcx.ensure().crate_inherent_impls(());
        let _ = tcx.ensure().crate_inherent_impls_overlap_check(());
-        res
-    })?;
+    });


Just removing this early abort causes annoying diagnostics that are hard to make good. So what I did instead was to inline the check_mod_impl_wf checks directly into the individual check_well_formed of impl items and early abort per item. So that only items with errors in impl_wf checks don't get their type_wf run, but other items do

oli-obk · 2024-02-15T17:30:30Z

compiler/rustc_resolve/src/late.rs

-                    if let GenericParamKind::Lifetime = param.kind {
-                        // Record lifetime res, so lowering knows there is something fishy.
-                        self.record_lifetime_param(param.id, LifetimeRes::Error);
-                    }
+                    let rib = match param.kind {
+                        GenericParamKind::Lifetime => {
+                            // Record lifetime res, so lowering knows there is something fishy.
+                            self.record_lifetime_param(param.id, LifetimeRes::Error);
+                            continue;
+                        }
+                        GenericParamKind::Type { .. } => &mut function_type_rib,
+                        GenericParamKind::Const { .. } => &mut function_value_rib,
+                    };
+
+                    self.r.record_partial_res(param.id, PartialRes::new(Res::Err));
+                    rib.bindings.insert(ident, Res::Err);


Without this change we'd get a "duplicate generic param T" error followed by an "unused generic param T" error for

struct Foo<T, T>(T);

The latter error makes no sense, so I turned the second T into a Res::Err, which hides follow-up errors

Add as a comment too.

oli-obk · 2024-02-15T17:31:50Z

compiler/rustc_traits/src/codegen.rs

+    if impl_source.has_infer() {
+        infcx.tcx.dcx().has_errors().unwrap();
+        return Err(CodegenObligationError::FulfillmentError);
+    }


Unused lifetimes on an impl get replaced with inference vars, but never resolved, causing the return value of a query to contain inference vars, which is

bad

ICEs in stable hashing (good!)

Can we put this comment as a comment in the code?

oli-obk · 2024-02-15T17:32:24Z

tests/ui/impl-trait/issues/issue-87340.stderr

+error[E0282]: type annotations needed
+  --> $DIR/issue-87340.rs:11:23
+   |
+LL |     fn f() -> Self::I {}
+   |                       ^^ cannot infer type for type parameter `T`


annoying to prevent, but I'll figure it out, preferably in a follow-up PR

bors · 2024-02-15T18:54:47Z

☀️ Try build successful - checks-actions
Build commit: 24e3e17 (24e3e17dc6525afe6e8d963e58ec5bb1e8a62f5e)

rust-timer · 2024-02-15T22:38:16Z

Finished benchmarking commit (24e3e17): comparison URL.

Overall result: ✅ improvements - no action needed

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR may lead to changes in compiler perf.

@bors rollup=never
@rustbot label: -S-waiting-on-perf -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-1.5%	[-6.7%, -0.2%]	5
All ❌✅ (primary)	-	-	0

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

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

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	1.1%	[1.1%, 1.1%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-3.1%	[-4.9%, -1.3%]	2
All ❌✅ (primary)	-	-	0

Binary size

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

Bootstrap: 638.252s -> 637.587s (-0.10%)
Artifact size: 306.28 MiB -> 306.30 MiB (0.01%)

bors · 2024-02-20T09:41:05Z

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

bors · 2024-02-21T01:54:16Z

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

bors · 2024-02-21T18:48:07Z

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

Merge `collect_mod_item_types` query into `check_well_formed` follow-up to rust-lang#121154 r? `@ghost`

bors · 2024-02-26T15:21:36Z

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

bors · 2024-03-02T03:11:53Z

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

oli-obk · 2024-03-07T06:33:47Z

@bors r=estebank

bors · 2024-03-07T06:33:49Z

📌 Commit 8206cff has been approved by estebank

It is now in the queue for this repository.

bors · 2024-03-07T10:18:03Z

⌛ Testing commit 8206cff with merge 8c9a75b...

bors · 2024-03-07T12:32:13Z

☀️ Test successful - checks-actions
Approved by: estebank
Pushing 8c9a75b to master...

Merge `collect_mod_item_types` query into `check_well_formed` follow-up to rust-lang#121154 this removes more potential parallel-compiler bottlenecks and moves diagnostics for the same items next to each other, instead of grouping diagnostics by analysis kind

rust-timer · 2024-03-07T13:46:30Z

Finished benchmarking commit (8c9a75b): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

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

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

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

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

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

Binary size

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

Bootstrap: 647.185s -> 648.501s (0.20%)
Artifact size: 172.72 MiB -> 172.69 MiB (-0.02%)

Merge `collect_mod_item_types` query into `check_well_formed` follow-up to rust-lang#121154 this removes more potential parallel-compiler bottlenecks and moves diagnostics for the same items next to each other, instead of grouping diagnostics by analysis kind

Merge `collect_mod_item_types` query into `check_well_formed` follow-up to rust-lang/rust#121154 this removes more potential parallel-compiler bottlenecks and moves diagnostics for the same items next to each other, instead of grouping diagnostics by analysis kind

Silence some follow-up errors on trait impls in case the trait has conflicting or otherwise incoherent impls fixes rust-lang#123292 Also removes a bunch of extra diagnostics that were introduced in rust-lang#121154 and rust-lang#120558

Silence some follow-up errors on trait impls in case the trait has conflicting or otherwise incoherent impls fixes #123292 Also removes a bunch of extra diagnostics that were introduced in rust-lang/rust#121154 and rust-lang/rust#120558

rustbot assigned compiler-errors Feb 15, 2024

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Feb 15, 2024

This comment has been minimized.

Sign in to view

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

oli-obk commented Feb 15, 2024

View reviewed changes

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 15, 2024

oli-obk force-pushed the track_errors11 branch from ade1cd7 to 13d26b3 Compare February 16, 2024 00:01

oli-obk force-pushed the track_errors11 branch from 13d26b3 to 15c5aba Compare February 20, 2024 10:43

oli-obk force-pushed the track_errors11 branch from 15c5aba to e58e32c Compare February 21, 2024 09:03

oli-obk force-pushed the track_errors11 branch from e58e32c to fbe7943 Compare February 23, 2024 09:01

oli-obk mentioned this pull request Feb 23, 2024

Merge collect_mod_item_types query into check_well_formed #121500

Merged

bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 23, 2024

Auto merge of rust-lang#121500 - oli-obk:track_errors12, r=<try>

f7e3a77

Merge `collect_mod_item_types` query into `check_well_formed` follow-up to rust-lang#121154 r? `@ghost`

oli-obk force-pushed the track_errors11 branch from fbe7943 to 5c27d71 Compare February 27, 2024 18:22

bors 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 Mar 7, 2024

bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 7, 2024

bors merged commit 8c9a75b into rust-lang:master Mar 7, 2024
12 checks passed

rustbot added this to the 1.78.0 milestone Mar 7, 2024

This was referenced Mar 7, 2024

Increase parallelism in various locations #115003

Open

Make TAITs and ATPITs capture late-bound lifetimes in scope #122103

Merged

oli-obk deleted the track_errors11 branch March 7, 2024 13:48

matthiaskrgr mentioned this pull request Mar 9, 2024

ICE: const variables should not be hashed: ?0c #122214

Open

This was referenced Mar 15, 2024

ICE: impl .. was matchable against Binder { .. } but now is not #122529

Open

ICE: unexpected inference var #122549

Closed

ICE: assertion failed: !ty.has_non_region_infer() #122638

Open

matthiaskrgr mentioned this pull request Mar 27, 2024

ICE: unexpected inference var #123141

Open

matthiaskrgr mentioned this pull request Apr 4, 2024

ICE: relating different kinds: {const error}: &'static str KeyNil #123457

Closed

oli-obk mentioned this pull request Apr 9, 2024

Silence some follow-up errors on trait impls in case the trait has conflicting or otherwise incoherent impls #123674

Merged

cushionbadak mentioned this pull request Apr 16, 2024

ICE: type variables should not be hashed? #123953

Open

matthiaskrgr mentioned this pull request Apr 20, 2024

ICE: tried to combine ConstKind::Infer/ConstKind::Infer(InferConst::Var) #124151

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge `check_mod_impl_wf` and `check_mod_type_wf` #121154

Merge `check_mod_impl_wf` and `check_mod_type_wf` #121154

oli-obk commented Feb 15, 2024 •

edited

oli-obk commented Feb 15, 2024

rustbot commented Feb 15, 2024

This comment has been minimized.

bors commented Feb 15, 2024

oli-obk Feb 15, 2024

oli-obk Feb 15, 2024

estebank Mar 7, 2024

oli-obk Feb 15, 2024

estebank Mar 7, 2024

oli-obk Feb 15, 2024 •

edited

This comment has been minimized.

bors commented Feb 15, 2024

This comment has been minimized.

rust-timer commented Feb 15, 2024

bors commented Feb 20, 2024

bors commented Feb 21, 2024

bors commented Feb 21, 2024

bors commented Feb 26, 2024

bors commented Mar 2, 2024

oli-obk commented Mar 7, 2024

bors commented Mar 7, 2024

bors commented Mar 7, 2024

bors commented Mar 7, 2024

rust-timer commented Mar 7, 2024

Merge check_mod_impl_wf and check_mod_type_wf #121154

Merge check_mod_impl_wf and check_mod_type_wf #121154

Conversation

oli-obk commented Feb 15, 2024 • edited

oli-obk commented Feb 15, 2024

rustbot commented Feb 15, 2024

This comment has been minimized.

bors commented Feb 15, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

oli-obk Feb 15, 2024 • edited

Choose a reason for hiding this comment

This comment has been minimized.

bors commented Feb 15, 2024

This comment has been minimized.

rust-timer commented Feb 15, 2024

Overall result: ✅ improvements - no action needed

bors commented Feb 20, 2024

bors commented Feb 21, 2024

bors commented Feb 21, 2024

bors commented Feb 26, 2024

bors commented Mar 2, 2024

oli-obk commented Mar 7, 2024

bors commented Mar 7, 2024

bors commented Mar 7, 2024

bors commented Mar 7, 2024

rust-timer commented Mar 7, 2024

Overall result: no relevant changes - no action needed

Merge `check_mod_impl_wf` and `check_mod_type_wf` #121154

Merge `check_mod_impl_wf` and `check_mod_type_wf` #121154

oli-obk commented Feb 15, 2024 •

edited

oli-obk Feb 15, 2024 •

edited