Store a `Symbol` instead of an `Ident` in `VariantDef`/`FieldDef` #92533

Aaron1011 · 2022-01-03T20:34:58Z

The field is also renamed from ident to name. In most cases,
we don't actually need the Span. A new ident method is added
to VariantDef and FieldDef, which constructs the full Ident
using tcx.def_ident_span(). This method is used in the cases
where we actually need an Ident.

This makes incremental compilation properly track changes
to the Span, without all of the invalidations caused by storing
a Span directly via an Ident.

rust-highfive · 2022-01-03T20:35:00Z

Some changes occured to the CTFE / Miri engine

cc @rust-lang/miri

rust-highfive · 2022-01-03T20:35:02Z

r? @matthewjasper

(rust-highfive has picked a reviewer for you, use r? to override)

Aaron1011 · 2022-01-03T20:37:32Z

@bors try @rust-timer queue

rust-timer · 2022-01-03T20:37:33Z

Awaiting bors try build completion.

@rustbot label: +S-waiting-on-perf

bors · 2022-01-03T20:37:40Z

⌛ Trying commit b7e5ddf59cf8e5c979da2087676b54758f3aadbc with merge 7ba15b7f514570c7f7491ce79be1890d314aa5b1...

Aaron1011 · 2022-01-03T22:32:57Z

@bors try

bors · 2022-01-03T22:33:05Z

⌛ Trying commit c9f2899c677383aa1c5c722a4b24b71ea950801a with merge c1f5740893c9cdd25535dac455ea84154d41ef11...

bors · 2022-01-04T00:23:34Z

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

rust-timer · 2022-01-04T00:23:36Z

Queued c1f5740893c9cdd25535dac455ea84154d41ef11 with parent ddabe07, future comparison URL.

rust-timer · 2022-01-04T02:59:22Z

Finished benchmarking commit (c1f5740893c9cdd25535dac455ea84154d41ef11): comparison url.

Summary: This change led to large relevant improvements 🎉 in compiler performance.

Large improvement in instruction counts (up to -5.8% on incr-unchanged builds of issue-46449)

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

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 led to changes in compiler perf.

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

Aaron1011 · 2022-01-04T03:23:54Z

The perf improvements appear to be coming entirely from performing fewer Span encodings/decodings. This suggests that we might be able to get some performance wins by further optimizing Span encoding/decoding.

compiler/rustc_typeck/src/astconv/mod.rs

This is the same idea as rust-lang#92533, but for `AssocItem` instead of `VariantDef`/`FieldDef`. With this change, we no longer have any uses of `#[stable_hasher(project(...))]`

Store a `Symbol` instead of an `Ident` in `AssocItem` This is the same idea as rust-lang#92533, but for `AssocItem` instead of `VariantDef`/`FieldDef`. With this change, we no longer have any uses of `#[stable_hasher(project(...))]`

This is the same idea as rust-lang#92533, but for `AssocItem` instead of `VariantDef`/`FieldDef`. With this change, we no longer have any uses of `#[stable_hasher(project(...))]`

Store a `Symbol` instead of an `Ident` in `AssocItem` This is the same idea as rust-lang#92533, but for `AssocItem` instead of `VariantDef`/`FieldDef`. With this change, we no longer have any uses of `#[stable_hasher(project(...))]`

ehuss · 2022-02-08T18:15:39Z

@Aaron1011 Due to the large number of reports of people getting an ICE that seems to be fixed by this, would it make sense to nominate this for a beta backport to 1.59?

Aaron1011 · 2022-02-08T18:33:08Z

While I don't think backporting this will cause any issues, the diff is somewhat large, and might require adjusting if beta has additional uses of field.ident. Also, backporting this alone might not help much, since some of the ICEs are probably actualy fixed by #93095

petrochenkov · 2022-02-09T02:50:55Z

Also, backporting this alone might not help much, since some of the ICEs are probably actualy fixed by #93095

~~And some of them are still not fixed because I still see ICEs like this every day on master when building rustc.~~
That's a mistake, stage1 rustc is still built by the old bootstrap compiler.

rust-highfive assigned matthewjasper Jan 3, 2022

rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jan 3, 2022

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 3, 2022

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

This comment has been minimized.

Sign in to view

cjgillot self-assigned this Jan 3, 2022

Aaron1011 force-pushed the variant-symbol branch from b7e5ddf to ef01dd9 Compare January 3, 2022 21:12

rustbot added the T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. label Jan 3, 2022

This comment has been minimized.

Sign in to view

Aaron1011 force-pushed the variant-symbol branch from ef01dd9 to a57cc29 Compare January 3, 2022 21:28

This comment has been minimized.

Sign in to view

Aaron1011 force-pushed the variant-symbol branch from a57cc29 to c9f2899 Compare January 3, 2022 21:38

This comment has been minimized.

Sign in to view

petrochenkov self-assigned this Jan 4, 2022

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

Aaron1011 mentioned this pull request Jan 4, 2022

Allow recovering symbol_name query when there are no substs #92503

Closed

petrochenkov approved these changes Jan 4, 2022

View reviewed changes

compiler/rustc_typeck/src/astconv/mod.rs Outdated Show resolved Hide resolved

Aaron1011 mentioned this pull request Jan 18, 2022

Got a compiler error, looks like incremental compilation. Hope this is useful #93029

Closed

Aaron1011 mentioned this pull request Jan 19, 2022

Store a Symbol instead of an Ident in AssocItem #93095

Merged

Aaron1011 mentioned this pull request Jan 26, 2022

ICE when incrementally compiling code #93336

Closed

This was referenced Jan 28, 2022

ICE: thread 'rustc' panicked at 'index out of bounds: the len is 52 but the index is 58', compiler/rustc_query_impl/src/on_disk_cache.rs:726:18 #93371

Closed

thread 'rustc' panicked at 'no entry found for key' #93421

Closed

Aaron1011 deleted the variant-symbol branch January 31, 2022 03:33

This was referenced Feb 1, 2022

ICE thread 'rustc' panicked at 'no entry found for key' #93554

Closed

index out of bounds: the len is 466 but the index is 466', compiler/rustc_query_impl/src/on_disk_cache.rs:726:18 #93326

Closed

ICE with incremental compilation in async code #93584

Closed

apiraino mentioned this pull request Feb 6, 2022

rustdoc ICE: 'no entry found for key' with static referencing external type #93698

Closed

Aaron1011 mentioned this pull request Feb 6, 2022

Investigate usages of #[stable_hasher(project(name))] #91921

Closed

Mark-Simulacrum mentioned this pull request Feb 18, 2022

ICE index OOB in 1.59.0-beta.8 🚨 #94124

Closed

dario23 added a commit to dario23/rust-semverver that referenced this pull request May 4, 2022

Rustup to rust-lang/rust#92533

d670419

dario23 added a commit to dario23/rust-semverver that referenced this pull request May 6, 2022

Rustup to rust-lang/rust#92533

e35c56f

AaronO mentioned this pull request May 12, 2022

chore: upgrade to Rust 1.60 denoland/deno#14590

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Store a `Symbol` instead of an `Ident` in `VariantDef`/`FieldDef` #92533

Store a `Symbol` instead of an `Ident` in `VariantDef`/`FieldDef` #92533

Aaron1011 commented Jan 3, 2022 •

edited by RalfJung

rust-highfive commented Jan 3, 2022

rust-highfive commented Jan 3, 2022

Aaron1011 commented Jan 3, 2022

rust-timer commented Jan 3, 2022

bors commented Jan 3, 2022

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

Aaron1011 commented Jan 3, 2022

bors commented Jan 3, 2022

bors commented Jan 4, 2022

rust-timer commented Jan 4, 2022

rust-timer commented Jan 4, 2022

Aaron1011 commented Jan 4, 2022

ehuss commented Feb 8, 2022

Aaron1011 commented Feb 8, 2022 •

edited

petrochenkov commented Feb 9, 2022 •

edited

Store a Symbol instead of an Ident in VariantDef/FieldDef #92533

Store a Symbol instead of an Ident in VariantDef/FieldDef #92533

Conversation

Aaron1011 commented Jan 3, 2022 • edited by RalfJung

rust-highfive commented Jan 3, 2022

rust-highfive commented Jan 3, 2022

Aaron1011 commented Jan 3, 2022

rust-timer commented Jan 3, 2022

bors commented Jan 3, 2022

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

Aaron1011 commented Jan 3, 2022

bors commented Jan 3, 2022

bors commented Jan 4, 2022

rust-timer commented Jan 4, 2022

rust-timer commented Jan 4, 2022

Aaron1011 commented Jan 4, 2022

ehuss commented Feb 8, 2022

Aaron1011 commented Feb 8, 2022 • edited

petrochenkov commented Feb 9, 2022 • edited

Store a `Symbol` instead of an `Ident` in `VariantDef`/`FieldDef` #92533

Store a `Symbol` instead of an `Ident` in `VariantDef`/`FieldDef` #92533

Aaron1011 commented Jan 3, 2022 •

edited by RalfJung

Aaron1011 commented Feb 8, 2022 •

edited

petrochenkov commented Feb 9, 2022 •

edited