Skip to content

Setup proc-macro metadata at encoding instead of decoding - #79353

Merged
bors merged 1 commit into
rust-lang:masterfrom
cjgillot:procmacro
Nov 28, 2020
Merged

Setup proc-macro metadata at encoding instead of decoding#79353
bors merged 1 commit into
rust-lang:masterfrom
cjgillot:procmacro

Conversation

@cjgillot

@cjgillotcjgillot commented Nov 23, 2020

Copy link
Copy Markdown
Contributor

This should improve the common non-proc-macro case for metadata decoding.

@rust-highfive

rust-highfive commented Nov 23, 2020

Copy link
Copy Markdown
Contributor

r? @lcnr

(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 Nov 23, 2020
@jonas-schievink

jonas-schievink commented Nov 23, 2020

Copy link
Copy Markdown
Contributor

@bors try @rust-timer queue

@rust-timer

rust-timer commented Nov 23, 2020

Copy link
Copy Markdown
Collaborator

Awaiting bors try build completion

@bors

bors commented Nov 23, 2020

Copy link
Copy Markdown
Collaborator

⌛ Trying commit d9d6b836427f03853ee316391ddff4ff815e4e18 with merge a7328d96f1234b84898788717e82a5d0762c05a6...

@petrochenkovpetrochenkov self-assigned this Nov 23, 2020
@bors

bors commented Nov 23, 2020

Copy link
Copy Markdown
Collaborator

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

@rust-timer

rust-timer commented Nov 23, 2020

Copy link
Copy Markdown
Collaborator

Queued a7328d96f1234b84898788717e82a5d0762c05a6 with parent 40cf721, future comparison URL.

@rust-timer

rust-timer commented Nov 23, 2020

Copy link
Copy Markdown
Collaborator

Finished benchmarking try commit (a7328d96f1234b84898788717e82a5d0762c05a6): comparison url.

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. Please note that if the perf results are neutral, you should likely undo the rollup=never given below by specifying rollup- to bors.

Importantly, though, if the results of this run are non-neutral do not roll this PR up -- it will mask other regressions or improvements in the roll up.

@bors rollup=never
@rustbot modify labels: +S-waiting-on-review -S-waiting-on-perf

lcnr
lcnr approved these changes Nov 23, 2020
View reviewed changes

@lcnrlcnr left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

and it seems like a small perf improvement to me.

@lcnr

lcnr commented Nov 23, 2020

Copy link
Copy Markdown
Contributor

@petrochenkov assigned themselves, so leaving the final approval to them

r? @petrochenkov

@petrochenkov

petrochenkov commented Nov 23, 2020

Copy link
Copy Markdown
Contributor

Hmm, looks like this PR basically reverts recently landed #76897.
@cjgillot@Aaron1011 could you discuss this with each other?

@petrochenkov

petrochenkov commented Nov 23, 2020

Copy link
Copy Markdown
Contributor

I'm not sure which side is more important to optimize here.
Non-macro crates are more common, but macro crates are on the critical path in build graphs.

@petrochenkovpetrochenkov 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 Nov 23, 2020
@cjgillot

cjgillot commented Nov 23, 2020

Copy link
Copy Markdown
ContributorAuthor

I was not aware of @Aaron1011's PR.
@petrochenkov I don't really see how this reverts their PR, can you expand on what you mean here?

@petrochenkov

petrochenkov commented Nov 24, 2020

Copy link
Copy Markdown
Contributor

@cjgillot
This PR is "let's do everything at encoding time", that PR is "let's do everything at decoding time".
I'll look in more detail today/tomorrow.

@petrochenkovpetrochenkov 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 Nov 24, 2020
@Aaron1011

Aaron1011 commented Nov 24, 2020

Copy link
Copy Markdown
Contributor

Part of my motivation for #76897 was to stop encoding invalid metadata for proc macros (i.e. encoding CrateNums for upstream dependencies, which we can't decode). This PR leaves that logic untouched (e.g. the empty_proc_macro!(self) calls).

I have no objection to this PR.

petrochenkov
petrochenkov reviewed Nov 26, 2020
View reviewed changes
Comment threadcompiler/rustc_metadata/src/rmeta/encoder.rs Outdated
Comment threadcompiler/rustc_metadata/src/rmeta/encoder.rs Outdated

@petrochenkovpetrochenkovNov 26, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be nicer to pre-record macro kind and name into Crate::proc_macros, but seems ok as is.

@petrochenkov

petrochenkov commented Nov 26, 2020

Copy link
Copy Markdown
Contributor

Ok, I see what this PR does now, it's pretty different from #76897.

@petrochenkovpetrochenkov 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 Nov 26, 2020
@petrochenkov

petrochenkov commented Nov 27, 2020

Copy link
Copy Markdown
Contributor

r=me after squashing commits.

@cjgillot
Encode proc_macro directly.
9dd32e1
Encode proc_macro name directly.
Do not store None values.
@cjgillot

cjgillot commented Nov 27, 2020

Copy link
Copy Markdown
ContributorAuthor

Squashed.

@petrochenkov

petrochenkov commented Nov 27, 2020

Copy link
Copy Markdown
Contributor

Thanks!
@bors r+

@bors

bors commented Nov 27, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 9dd32e1 has been approved by petrochenkov

@borsbors 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 Nov 27, 2020
@bors

bors commented Nov 28, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 9dd32e1 with merge f8e5209...

@bors

bors commented Nov 28, 2020

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: petrochenkov
Pushing f8e5209 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Nov 28, 2020
@bors
bors merged commit f8e5209 into rust-lang:masterNov 28, 2020
@rustbotrustbot added this to the 1.50.0 milestone Nov 28, 2020
@cjgillot
cjgillot deleted the procmacro branch December 5, 2020 14:57
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@petrochenkovpetrochenkovpetrochenkov left review comments
@lcnrlcnrlcnr approved these changes

Assignees

@petrochenkovpetrochenkov

Labels

merged-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.

Projects

None yet

Milestone

1.50.0

Development

Successfully merging this pull request may close these issues.

9 participants

@cjgillot@rust-highfive@jonas-schievink@rust-timer@bors@lcnr@petrochenkov@Aaron1011@rustbot