hir: Make sure all `HirId`s have corresponding HIR `Node`s #120206

petrochenkov · 2024-01-21T18:17:28Z

And then remove tcx.opt_hir_node(hir_id) in favor of tcx.hir_node(hir_id).

rustbot · 2024-01-21T18:17:36Z

r? @davidtwco

(rustbot has picked a reviewer for you, use r? to override)

rustbot · 2024-01-21T18:17:38Z

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

compiler-errors · 2024-01-21T19:47:28Z

this is great!

perf run just to check 🤷, but i'll honestly probably approve this even if there is a minimal perf hit

@bors try @rust-timer queue

hir: Make sure all `HirId`s have corresponding HIR `Node`s And then remove `tcx.opt_hir_node(hir_id)` in favor of `tcx.hir_node(hir_id)`.

bors · 2024-01-21T19:48:38Z

⌛ Trying commit f26f870 with merge 21fc882...

bors · 2024-01-21T21:14:09Z

☀️ Try build successful - checks-actions
Build commit: 21fc882 (21fc88249b233ad0825d9a3df1d0893f2c5400ed)

compiler/rustc_metadata/src/rmeta/encoder.rs

src/tools/clippy/tests/ui/manual_map_option_2.stderr

rust-timer · 2024-01-21T22:32:29Z

Finished benchmarking commit (21fc882): comparison URL.

Overall result: no relevant changes - 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 benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

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

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)	2.7%	[2.5%, 3.0%]	6
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Binary size

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

Bootstrap: 663.041s -> 663.48s (0.07%)
Artifact size: 308.37 MiB -> 308.33 MiB (-0.01%)

compiler/rustc_ast_lowering/src/index.rs

cjgillot · 2024-01-21T23:02:47Z

compiler/rustc_hir/src/hir.rs

+    #[allow(rustc::pass_by_value)]
+    ArrayLenInfer(&'hir Span),
+    #[allow(rustc::pass_by_value)]
+    Err(&'hir Span),


Do we really need to store that span? Could we return DUMMY_SP when needed?

We could return DUMMY_SP, yes.
index_hir just has a close enough real span that can be used, so I used it (that makes Node::span always return real spans).

compiler/rustc_hir/src/hir.rs

petrochenkov · 2024-01-27T16:06:59Z

TODO: Also need to check whether these HirIds could be removed instead, maybe they are not really necessary and were added by mistake.

The HirId in Let turned out to be unnecessary, other HirIds from this PR are used in more substantial ways.
Blocked on #120428.
@rustbot blocked

…errors hir: Two preparatory changes for rust-lang#120206 cc rust-lang#120206 r? `@compiler-errors`

…iaskrgr Rollup of 5 pull requests Successful merges: - rust-lang#120358 (Bump Fuchsia, build tests, and use 8 core bots) - rust-lang#120402 (Make the coroutine def id of an async closure the child of the closure def id) - rust-lang#120420 (Stop using derivative in rustc_pattern_analysis) - rust-lang#120425 (Remove unnecessary unit returns in query declarations) - rust-lang#120428 (hir: Two preparatory changes for rust-lang#120206) r? `@ghost` `@rustbot` modify labels: rollup

petrochenkov · 2024-02-07T07:39:35Z

@bors r=compiler-errors

bors · 2024-02-07T07:39:37Z

📌 Commit 3e8c8d8 has been approved by compiler-errors

It is now in the queue for this repository.

…rrors hir: Make sure all `HirId`s have corresponding HIR `Node`s And then remove `tcx.opt_hir_node(hir_id)` in favor of `tcx.hir_node(hir_id)`.

…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#119592 (resolve: Unload speculatively resolved crates before freezing cstore) - rust-lang#120103 (Make it so that async-fn-in-trait is compatible with a concrete future in implementation) - rust-lang#120206 (hir: Make sure all `HirId`s have corresponding HIR `Node`s) - rust-lang#120214 (match lowering: consistently lower bindings deepest-first) - rust-lang#120596 ([rustdoc] Correctly generate path for non-local items in source code pages) - rust-lang#120688 (GVN: also turn moves into copies with projections) - rust-lang#120702 (docs: also check the inline stmt during redundant link check) - rust-lang#120739 (improve pretty printing for associated items in trait objects) r? `@ghost` `@rustbot` modify labels: rollup

hir: Stop keeping prefixes for most of `use` list stems And make sure all other imports have non-empty resolution lists. Addresses one of FIXMEs in rust-lang/rust#120206.

…rrors hir: Make sure all `HirId`s have corresponding HIR `Node`s And then remove `tcx.opt_hir_node(hir_id)` in favor of `tcx.hir_node(hir_id)`.

…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#119592 (resolve: Unload speculatively resolved crates before freezing cstore) - rust-lang#120103 (Make it so that async-fn-in-trait is compatible with a concrete future in implementation) - rust-lang#120206 (hir: Make sure all `HirId`s have corresponding HIR `Node`s) - rust-lang#120214 (match lowering: consistently lower bindings deepest-first) - rust-lang#120596 ([rustdoc] Correctly generate path for non-local items in source code pages) - rust-lang#120688 (GVN: also turn moves into copies with projections) - rust-lang#120727 (exhaustiveness: Prefer "`0..MAX` not covered" to "`_` not covered") - rust-lang#120734 (Add `SubdiagnosticMessageOp` as a trait alias.) - rust-lang#120739 (improve pretty printing for associated items in trait objects) r? `@ghost` `@rustbot` modify labels: rollup

…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#119592 (resolve: Unload speculatively resolved crates before freezing cstore) - rust-lang#120103 (Make it so that async-fn-in-trait is compatible with a concrete future in implementation) - rust-lang#120206 (hir: Make sure all `HirId`s have corresponding HIR `Node`s) - rust-lang#120214 (match lowering: consistently lower bindings deepest-first) - rust-lang#120688 (GVN: also turn moves into copies with projections) - rust-lang#120702 (docs: also check the inline stmt during redundant link check) - rust-lang#120727 (exhaustiveness: Prefer "`0..MAX` not covered" to "`_` not covered") - rust-lang#120734 (Add `SubdiagnosticMessageOp` as a trait alias.) - rust-lang#120739 (improve pretty printing for associated items in trait objects) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#120206 - petrochenkov:somehir, r=compiler-errors hir: Make sure all `HirId`s have corresponding HIR `Node`s And then remove `tcx.opt_hir_node(hir_id)` in favor of `tcx.hir_node(hir_id)`.

hir: Refactor getters for HIR parents See individual commits. I ended up removing on of the FIXMEs from rust-lang#120206 instead of addressing it.

Rollup merge of rust-lang#120872 - petrochenkov:opthirpar, r=cjgillot hir: Refactor getters for HIR parents See individual commits. I ended up removing on of the FIXMEs from rust-lang#120206 instead of addressing it.

…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#119592 (resolve: Unload speculatively resolved crates before freezing cstore) - rust-lang#120103 (Make it so that async-fn-in-trait is compatible with a concrete future in implementation) - rust-lang#120206 (hir: Make sure all `HirId`s have corresponding HIR `Node`s) - rust-lang#120214 (match lowering: consistently lower bindings deepest-first) - rust-lang#120688 (GVN: also turn moves into copies with projections) - rust-lang#120702 (docs: also check the inline stmt during redundant link check) - rust-lang#120727 (exhaustiveness: Prefer "`0..MAX` not covered" to "`_` not covered") - rust-lang#120734 (Add `SubdiagnosticMessageOp` as a trait alias.) - rust-lang#120739 (improve pretty printing for associated items in trait objects) r? `@ghost` `@rustbot` modify labels: rollup

Create some minimal HIR for associated opaque types `LocalDefId`s for opaque types in traits and impls are created after AST -> HIR lowering, so they don't have corresponding HIR and return their various properties through fed queries. In this PR I also feed some core HIR-related queries for these `LocalDefId`s (which happen to be HIR owners). As a result all `LocalDefId`s now have corresponding `HirId`s and HIR nodes, and "optional" methods like `opt_local_def_id_to_hir_id` and `opt_hir_node_by_def_id` can be removed. Follow up to rust-lang#120206.

Create some minimal HIR for associated opaque types `LocalDefId`s for opaque types in traits and impls are created after AST -> HIR lowering, so they don't have corresponding HIR and return their various properties through fed queries. In this PR I also feed some core HIR-related queries for these `LocalDefId`s (which happen to be HIR owners). As a result all `LocalDefId`s now have corresponding `HirId`s and HIR nodes, and "optional" methods like `opt_local_def_id_to_hir_id` and `opt_hir_node_by_def_id` can be removed. Follow up to rust-lang/rust#120206.

rustbot assigned davidtwco Jan 21, 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 Jan 21, 2024

This comment has been minimized.

Sign in to view

compiler-errors assigned compiler-errors and unassigned davidtwco Jan 21, 2024

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

This comment has been minimized.

Sign in to view

compiler-errors reviewed Jan 21, 2024

View reviewed changes

compiler/rustc_metadata/src/rmeta/encoder.rs Show resolved Hide resolved

src/tools/clippy/tests/ui/manual_map_option_2.stderr Outdated Show resolved Hide resolved

rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Jan 21, 2024

cjgillot reviewed Jan 21, 2024

View reviewed changes

This comment was marked as resolved.

Sign in to view

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 Jan 24, 2024

rustbot added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 27, 2024

petrochenkov mentioned this pull request Jan 27, 2024

hir: Two preparatory changes for #120206 #120428

Merged

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jan 28, 2024

Rollup merge of rust-lang#120428 - petrochenkov:somehir2, r=compiler-…

4a759f0

…errors hir: Two preparatory changes for rust-lang#120206 cc rust-lang#120206 r? `@compiler-errors`

matthiaskrgr mentioned this pull request Jan 28, 2024

Rollup of 5 pull requests #120437

Closed

petrochenkov added 2 commits February 7, 2024 09:38

hir: Remove fn opt_hir_id and fn opt_span

a61019b

hir: Add some FIXMEs for future work

3e8c8d8

petrochenkov force-pushed the somehir branch from be80c82 to 3e8c8d8 Compare February 7, 2024 07:38

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 7, 2024

matthiaskrgr mentioned this pull request Feb 7, 2024

Rollup of 8 pull requests #120755

Closed

matthiaskrgr mentioned this pull request Feb 8, 2024

Rollup of 9 pull requests #120766

Closed

matthiaskrgr mentioned this pull request Feb 8, 2024

Rollup of 9 pull requests #120767

Merged

bors merged commit bf2ba86 into rust-lang:master Feb 8, 2024
11 checks passed

rustbot added this to the 1.78.0 milestone Feb 8, 2024

This was referenced Feb 10, 2024

hir: Refactor getters for HIR parents #120872

Merged

Create some minimal HIR for associated opaque types #120943

Merged

petrochenkov mentioned this pull request Mar 19, 2024

Ensure nested statics have a HIR node to prevent various queries from ICEing #122719

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

hir: Make sure all `HirId`s have corresponding HIR `Node`s #120206

hir: Make sure all `HirId`s have corresponding HIR `Node`s #120206

petrochenkov commented Jan 21, 2024

rustbot commented Jan 21, 2024

rustbot commented Jan 21, 2024

compiler-errors commented Jan 21, 2024

This comment has been minimized.

bors commented Jan 21, 2024

bors commented Jan 21, 2024

This comment has been minimized.

rust-timer commented Jan 21, 2024

cjgillot Jan 21, 2024

petrochenkov Jan 22, 2024

This comment was marked as resolved.

petrochenkov commented Jan 27, 2024

petrochenkov commented Feb 7, 2024

bors commented Feb 7, 2024

hir: Make sure all HirIds have corresponding HIR Nodes #120206

hir: Make sure all HirIds have corresponding HIR Nodes #120206

Conversation

petrochenkov commented Jan 21, 2024

rustbot commented Jan 21, 2024

rustbot commented Jan 21, 2024

compiler-errors commented Jan 21, 2024

This comment has been minimized.

bors commented Jan 21, 2024

bors commented Jan 21, 2024

This comment has been minimized.

rust-timer commented Jan 21, 2024

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

cjgillot Jan 21, 2024

Choose a reason for hiding this comment

petrochenkov Jan 22, 2024

Choose a reason for hiding this comment

This comment was marked as resolved.

petrochenkov commented Jan 27, 2024

petrochenkov commented Feb 7, 2024

bors commented Feb 7, 2024

hir: Make sure all `HirId`s have corresponding HIR `Node`s #120206

hir: Make sure all `HirId`s have corresponding HIR `Node`s #120206