Make opaque types regular HIR nodes #129244

cjgillot · 2024-08-18T16:55:08Z

Having opaque types as HIR owner introduces all sorts of complications. This PR proposes to make them regular HIR nodes instead.

I haven't gone through all the test changes yet, so there may be a few surprises.

Many thanks to @camelid for the first draft.
Fixes #129023

Fixes #129099
Fixes #125843
Fixes #119716
Fixes #121422

rustbot · 2024-08-18T16:55:16Z

r? @michaelwoerister

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

rustbot · 2024-08-18T16:55:18Z

HIR ty lowering was modified

cc @fmease

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

compiler/rustc_hir_analysis/src/collect.rs

compiler/rustc_privacy/src/lib.rs

tests/ui/async-await/in-trait/async-generics-and-bounds.stderr

tests/ui/async-await/multiple-lifetimes/ret-impl-trait-one.stderr

petrochenkov · 2024-08-20T13:04:35Z

compiler/rustc_ast_lowering/src/index.rs

+    fn visit_opaque_ty(&mut self, opaq: &'hir OpaqueTy<'hir>) {
+        self.insert(opaq.span, opaq.hir_id, Node::OpaqueTy(opaq));
+
+        self.with_parent(opaq.hir_id, |this| {


This still creates a mismatch between HirId and DefId parenting.
The opaque's HirId is included into the parenting chain here, but its corresponding DefId is not included because it is created late.

compiler/rustc_middle/src/hir/mod.rs

compiler/rustc_middle/src/query/mod.rs

compiler/rustc_privacy/src/lib.rs

petrochenkov · 2024-08-20T13:45:59Z

Ignoring all the ID parenting questions, the change looks reasonable to me because

It reduces weirdness
- We have some other nodes, like closures, that could could technically be "outlined" into items, but they are typically kept inline, and opaques now behave analogously to closures
It doesn't complicate the compiler logic while reducing weirdness

Regarding DefIds, HirIds and parenting, the change is not strictly necessary (#129023 (comment)) to fix the HIR ownership issues, and I'd like to discuss that topic separately (see my other messages in #129023).

cjgillot · 2024-08-22T21:11:32Z

Until I fix clippy:
@bors try @rust-timer queue

Make opaque types regular HIR nodes Having opaque types as HIR owner introduces all sorts of complications. This PR proposes to make them regular HIR nodes instead. I haven't gone through all the test changes yet, so there may be a few surprises. Many thanks to `@camelid` for the first draft. Fixes rust-lang#129023 Fixes rust-lang#129099 Fixes rust-lang#125843 Fixes rust-lang#119716 Fixes rust-lang#121422

bors · 2024-08-22T21:12:44Z

⌛ Trying commit b66cc38 with merge b64686e...

bors · 2024-08-22T23:08:09Z

☀️ Try build successful - checks-actions
Build commit: b64686e (b64686e62be3a3e957a5559eae0d8cd2f7cbee0c)

rust-timer · 2024-08-23T01:19:07Z

Finished benchmarking commit (b64686e): 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.3%	[-0.4%, -0.2%]	13
Improvements ✅ (secondary)	-0.6%	[-1.3%, -0.1%]	22
All ❌✅ (primary)	-0.3%	[-0.4%, -0.2%]	13

Max RSS (memory usage)

Results (primary -2.0%, secondary 2.7%)

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)	2.7%	[1.6%, 3.9%]	2
Improvements ✅ (primary)	-2.0%	[-2.7%, -1.3%]	11
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-2.0%	[-2.7%, -1.3%]	11

Cycles

Results (secondary -5.7%)

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)	-5.7%	[-8.3%, -3.0%]	2
All ❌✅ (primary)	-	-	0

Binary size

Results (secondary 0.0%)

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.0%	[0.0%, 0.0%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Bootstrap: 749.145s -> 754.024s (0.65%)
Artifact size: 338.93 MiB -> 339.22 MiB (0.09%)

bors · 2024-08-23T11:48:35Z

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

bors · 2024-08-25T09:01:45Z

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

This introduce an additional collection of opaques on HIR, as they can no longer be listed using the free item list.

bors · 2024-09-07T21:21:51Z

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

rustbot assigned michaelwoerister Aug 18, 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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Aug 18, 2024

cjgillot mentioned this pull request Aug 18, 2024

Opaque types should not be HIR items (and thus not be HIR owners) #129023

Closed

compiler-errors self-assigned this Aug 18, 2024

This comment has been minimized.

Sign in to view

cjgillot commented Aug 18, 2024

View reviewed changes

This comment has been minimized.

Sign in to view

camelid mentioned this pull request Aug 18, 2024

Delay def creation for expression-like nodes #129247

Open

petrochenkov self-assigned this Aug 18, 2024

michaelwoerister removed their assignment Aug 19, 2024

petrochenkov reviewed Aug 20, 2024

View reviewed changes

petrochenkov 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-review Status: Awaiting review from the assignee but also interested parties. labels Aug 20, 2024

This comment was marked as resolved.

Sign in to view

petrochenkov mentioned this pull request Aug 20, 2024

Fix anon const def-creation when macros are involved #129137

Merged

cjgillot mentioned this pull request Aug 22, 2024

Remap impl-trait lifetimes on HIR instead of AST lowering #129383

Draft

cjgillot force-pushed the opaque-hir branch from 90b8f3a to b66cc38 Compare August 22, 2024 01:20

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 Aug 22, 2024

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 Aug 23, 2024

cjgillot force-pushed the opaque-hir branch from b66cc38 to 421f2f6 Compare August 23, 2024 01:24

cjgillot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 23, 2024

petrochenkov removed their assignment Aug 23, 2024

cjgillot force-pushed the opaque-hir branch from 421f2f6 to 01ccab5 Compare August 24, 2024 00:06

cjgillot and others added 12 commits September 1, 2024 12:53

Make query backtrace more useful.

435b924

Make naming more consistent.

6a8d93c

rm ItemKind::OpaqueTy

56da53c

This introduce an additional collection of opaques on HIR, as they can no longer be listed using the free item list.

WfCheck opaques.

ac87276

Visit opaques for visibilities.

d94b9cc

Bless ui tests.

e4f827c

Remove stray fixmes.

679a6ab

Simplify bound var resolution.

456e4c5

Promote crash tests to ui.

a405c58

Bless incremental tests.

658e100

Remove bool from hir::OpaqueDef.

7f711b3

Adapt clippy.

7782194

cjgillot force-pushed the opaque-hir branch from 01ccab5 to 7782194 Compare September 1, 2024 16:57

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Make opaque types regular HIR nodes #129244

Make opaque types regular HIR nodes #129244

cjgillot commented Aug 18, 2024 •

edited

Loading

rustbot commented Aug 18, 2024

rustbot commented Aug 18, 2024

This comment has been minimized.

This comment has been minimized.

petrochenkov Aug 20, 2024

petrochenkov commented Aug 20, 2024 •

edited

Loading

This comment was marked as resolved.

This comment has been minimized.

cjgillot commented Aug 22, 2024

This comment has been minimized.

bors commented Aug 22, 2024

bors commented Aug 22, 2024

This comment has been minimized.

rust-timer commented Aug 23, 2024

bors commented Aug 23, 2024

bors commented Aug 25, 2024

bors commented Sep 7, 2024

Make opaque types regular HIR nodes #129244

Are you sure you want to change the base?

Make opaque types regular HIR nodes #129244

Conversation

cjgillot commented Aug 18, 2024 • edited Loading

rustbot commented Aug 18, 2024

rustbot commented Aug 18, 2024

This comment has been minimized.

This comment has been minimized.

petrochenkov Aug 20, 2024

Choose a reason for hiding this comment

petrochenkov commented Aug 20, 2024 • edited Loading

This comment was marked as resolved.

This comment has been minimized.

cjgillot commented Aug 22, 2024

This comment has been minimized.

bors commented Aug 22, 2024

bors commented Aug 22, 2024

This comment has been minimized.

rust-timer commented Aug 23, 2024

Overall result: ✅ improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

bors commented Aug 23, 2024

bors commented Aug 25, 2024

bors commented Sep 7, 2024

cjgillot commented Aug 18, 2024 •

edited

Loading

petrochenkov commented Aug 20, 2024 •

edited

Loading