Skip to content

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

Merged
bors merged 1 commit into
rust-lang:masterfrom
Aaron1011:variant-symbol
Jan 12, 2022
Merged

Store a Symbol instead of an Ident in VariantDef/FieldDef#92533
bors merged 1 commit into
rust-lang:masterfrom
Aaron1011:variant-symbol

Conversation

@Aaron1011

@Aaron1011Aaron1011 commented Jan 3, 2022•
edited by RalfJung
Loading

Copy link
Copy Markdown
Contributor

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

rust-highfive commented Jan 3, 2022

Copy link
Copy Markdown
Contributor

Some changes occured to the CTFE / Miri engine

cc @rust-lang/miri

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

rust-highfive commented Jan 3, 2022

Copy link
Copy Markdown
Contributor

r? @matthewjasper

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

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

Aaron1011 commented Jan 3, 2022

Copy link
Copy Markdown
ContributorAuthor

@bors try @rust-timer queue

@rust-timer

rust-timer commented Jan 3, 2022

Copy link
Copy Markdown
Collaborator

Awaiting bors try build completion.

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

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

bors commented Jan 3, 2022

Copy link
Copy Markdown
Collaborator

⌛ Trying commit b7e5ddf59cf8e5c979da2087676b54758f3aadbc with merge 7ba15b7f514570c7f7491ce79be1890d314aa5b1...

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@cjgillotcjgillot self-assigned this Jan 3, 2022
@rustbotrustbot added the T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. label Jan 3, 2022
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Aaron1011

Aaron1011 commented Jan 3, 2022

Copy link
Copy Markdown
ContributorAuthor

@bors try

@bors

bors commented Jan 3, 2022

Copy link
Copy Markdown
Collaborator

⌛ Trying commit c9f2899c677383aa1c5c722a4b24b71ea950801a with merge c1f5740893c9cdd25535dac455ea84154d41ef11...

@petrochenkovpetrochenkov self-assigned this Jan 4, 2022
@bors

bors commented Jan 4, 2022

Copy link
Copy Markdown
Collaborator

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

@rust-timer

rust-timer commented Jan 4, 2022

Copy link
Copy Markdown
Collaborator

Queued c1f5740893c9cdd25535dac455ea84154d41ef11 with parent ddabe07, future comparison URL.

@rust-timer

rust-timer commented Jan 4, 2022

Copy link
Copy Markdown
Collaborator

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

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

Aaron1011 commented Jan 4, 2022

Copy link
Copy Markdown
ContributorAuthor

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.

@Aaron1011Aaron1011 mentioned this pull request Jan 4, 2022
Closed
petrochenkov
petrochenkov approved these changes Jan 4, 2022
View reviewed changes
Comment threadcompiler/rustc_typeck/src/astconv/mod.rs Outdated
@Aaron1011Aaron1011 mentioned this pull request Jan 18, 2022
Closed
@Aaron1011Aaron1011 mentioned this pull request Jan 19, 2022
Merged
Aaron1011 added a commit to Aaron1011/rust that referenced this pull request Jan 19, 2022
@Aaron1011
Store a Symbol instead of an Ident in AssocItem
c8941d3
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(...))]`
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 25, 2022
@bors
Auto merge ofrust-lang#93095- Aaron1011:remove-assoc-ident, r=cjgillot
8cdb3cd
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(...))]`
@Aaron1011Aaron1011 mentioned this pull request Jan 26, 2022
Closed
flip1995 pushed a commit to flip1995/rust that referenced this pull request Jan 27, 2022
@Aaron1011
Store a Symbol instead of an Ident in AssocItem
a35c1e7
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(...))]`
flip1995 pushed a commit to flip1995/rust that referenced this pull request Jan 27, 2022
@bors
Auto merge ofrust-lang#93095- Aaron1011:remove-assoc-ident, r=cjgillot
02516c4
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 was referenced Jan 28, 2022
Closed
Closed
@Aaron1011
Aaron1011 deleted the variant-symbol branch January 31, 2022 03:33
This was referenced Feb 1, 2022
Closed
Closed
Closed
@apirainoapiraino mentioned this pull request Feb 6, 2022
Closed
@Aaron1011Aaron1011 mentioned this pull request Feb 6, 2022
Closed
@ehuss

ehuss commented Feb 8, 2022

Copy link
Copy Markdown
Contributor

@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

Aaron1011 commented Feb 8, 2022•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

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

petrochenkov commented Feb 9, 2022•
edited
Loading

Copy link
Copy Markdown
Contributor

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.

This was referenced Feb 11, 2022
Closed
Closed
Closed
Closed
@Mark-SimulacrumMark-Simulacrum mentioned this pull request Feb 18, 2022
Closed
dario23 added a commit to dario23/rust-semverver that referenced this pull request May 4, 2022
@dario23
Rustup torust-lang/rust#92533
d670419
dario23 added a commit to dario23/rust-semverver that referenced this pull request May 6, 2022
@dario23
Rustup torust-lang/rust#92533
e35c56f
@AaronOAaronO mentioned this pull request May 12, 2022
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cjgillotcjgillotcjgillot left review comments
@camelidcamelidcamelid left review comments
@petrochenkovpetrochenkovpetrochenkov approved these changes

Assignees

@petrochenkovpetrochenkov

Labels

A-incr-compArea: Incremental compilationmerged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.T-rustdocRelevant to the rustdoc team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.60.0

Development

Successfully merging this pull request may close these issues.

12 participants

@Aaron1011@rust-highfive@rust-timer@bors@rust-log-analyzer@michaelwoerister@petrochenkov@cjgillot@ehuss@camelid@matthewjasper@rustbot