Skip to content

Mark payload fields of ScalarPair enums as Scalar::Union when they're not always initialized#96197

Merged
bors merged 2 commits intorust-lang:masterfrom
erikdesjardins:scalarpairenum
Apr 22, 2022
Merged

Mark payload fields of ScalarPair enums as Scalar::Union when they're not always initialized#96197
bors merged 2 commits intorust-lang:masterfrom
erikdesjardins:scalarpairenum

Conversation

@erikdesjardins
Copy link
Copy Markdown
Contributor

@erikdesjardins erikdesjardins commented Apr 19, 2022

Fixes #96158

r? @RalfJung

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Apr 19, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 19, 2022
@erikdesjardins
Copy link
Copy Markdown
Contributor Author

erikdesjardins commented Apr 19, 2022

I guess this is only layout code
r? @oli-obk

@rust-highfive rust-highfive assigned oli-obk and unassigned RalfJung Apr 19, 2022
@oli-obk
Copy link
Copy Markdown
Contributor

oli-obk commented Apr 19, 2022

@bors r+ rollup=never this is strictly a bugfix, but it may have minor perf effects

Thanks for fixing this so fast. I should've reviews those fishy parts better when implemented union scalars

@bors
Copy link
Copy Markdown
Collaborator

bors commented Apr 19, 2022

📌 Commit 1bbae50 has been approved by oli-obk

@bors 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-review Status: Awaiting review from the assignee but also interested parties. labels Apr 19, 2022
@bors
Copy link
Copy Markdown
Collaborator

bors commented Apr 21, 2022

⌛ Testing commit 1bbae50 with merge 5c8ffbfda550e4f8e79cb3f8f153572e19d5ce29...

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Copy Markdown
Collaborator

bors commented Apr 21, 2022

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 21, 2022
@oli-obk
Copy link
Copy Markdown
Contributor

oli-obk commented Apr 21, 2022

Looks like the alignments are higher on arm. Maybe ignore the test there?

@oli-obk
Copy link
Copy Markdown
Contributor

oli-obk commented Apr 22, 2022

@bors r+

@bors
Copy link
Copy Markdown
Collaborator

bors commented Apr 22, 2022

📌 Commit 4dcc1aa has been approved by oli-obk

@bors 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-review Status: Awaiting review from the assignee but also interested parties. labels Apr 22, 2022
@bors
Copy link
Copy Markdown
Collaborator

bors commented Apr 22, 2022

⌛ Testing commit 4dcc1aa with merge a8272f2...

@bors
Copy link
Copy Markdown
Collaborator

bors commented Apr 22, 2022

☀️ Test successful - checks-actions
Approved by: oli-obk
Pushing a8272f2 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 22, 2022
@bors bors merged commit a8272f2 into rust-lang:master Apr 22, 2022
@rustbot rustbot added this to the 1.62.0 milestone Apr 22, 2022
@rust-timer
Copy link
Copy Markdown
Collaborator

rust-timer commented Apr 22, 2022

Finished benchmarking commit (a8272f2): comparison url.

Summary: This benchmark run did not return any relevant results.

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

@erikdesjardins erikdesjardins deleted the scalarpairenum branch April 22, 2022 18:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@oli-obk oli-obk

Labels

merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.62.0

Development

Successfully merging this pull request may close these issues.

enum padding incorrectly has Scalar::Initialized layout

8 participants

@erikdesjardins @oli-obk @bors @rust-log-analyzer @rust-timer @RalfJung @rust-highfive @rustbot