Skip to content

rustc_target::abi: add Primitive variant to FieldsShape.#70629

Merged
bors merged 1 commit intorust-lang:masterfrom
anyska:fields-variant
Apr 17, 2020
Merged

rustc_target::abi: add Primitive variant to FieldsShape.#70629
bors merged 1 commit intorust-lang:masterfrom
anyska:fields-variant

Conversation

@anyska
Copy link
Contributor

@anyska anyska commented Mar 31, 2020

Originally suggested by @eddyb.

@rust-highfive
Copy link
Contributor

rust-highfive commented Mar 31, 2020

r? @eddyb

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 31, 2020
@bors
Copy link
Collaborator

bors commented Apr 2, 2020

☔ The latest upstream changes (presumably #70692) made this pull request unmergeable. Please resolve the merge conflicts.

@eddyb
Copy link
Member

eddyb commented Apr 2, 2020

r? @oli-obk cc @RalfJung

@rust-highfive rust-highfive assigned oli-obk and unassigned eddyb Apr 2, 2020
RalfJung
RalfJung reviewed Apr 2, 2020
View reviewed changes
oli-obk
oli-obk reviewed Apr 3, 2020
View reviewed changes
oli-obk
oli-obk reviewed Apr 3, 2020
View reviewed changes
RalfJung
RalfJung reviewed Apr 3, 2020
View reviewed changes
oli-obk
oli-obk reviewed Apr 3, 2020
View reviewed changes
RalfJung
RalfJung reviewed Apr 3, 2020
View reviewed changes
oli-obk
oli-obk reviewed Apr 3, 2020
View reviewed changes
oli-obk
oli-obk reviewed Apr 3, 2020
View reviewed changes
oli-obk
oli-obk reviewed Apr 3, 2020
View reviewed changes
RalfJung
RalfJung reviewed Apr 3, 2020
View reviewed changes
@RalfJung

This comment has been minimized.

Sign in to view
@oli-obk oli-obk 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 Apr 3, 2020
@anyska

This comment has been minimized.

Sign in to view
@RalfJung
Copy link
Member

RalfJung commented Apr 3, 2020

@anyska well that is interesting, could you make it print the TyAndLayout that caused the failure?

Oh, I think I have an idea... since uninhabited enums still share the layout with !, we cannot have that assertion there yet. Never mind then. (We could have is_uninhabited() || matches!, maybe, but that is getting silly.)

@eddyb eddyb 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 Apr 4, 2020
@eddyb

This comment has been minimized.

Sign in to view
oli-obk
oli-obk reviewed Apr 6, 2020
View reviewed changes
RalfJung
RalfJung reviewed Apr 6, 2020
View reviewed changes
@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Apr 9, 2020
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Apr 9, 2020
@Dylan-DPC
Rollup merge of rust-lang#70629 - anyska:fields-variant, r=oli-obk
58c7615 
rustc_target::abi: add Primitive variant to FieldsShape.

Originally suggested by @eddyb.
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Apr 9, 2020
Closed
@RalfJung
Copy link
Member

RalfJung commented Apr 10, 2020

Could this have caused #70966 (comment)?

@eddyb
Copy link
Member

eddyb commented Apr 10, 2020

@bors rollup=never (I can't see why this PR would do this but it's the only one in the rollup that should impact an assert like that)

Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Apr 10, 2020
@Dylan-DPC
Rollup merge of rust-lang#70629 - anyska:fields-variant, r=oli-obk
1fd99dc 
rustc_target::abi: add Primitive variant to FieldsShape.

Originally suggested by @eddyb.
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Apr 10, 2020
Closed
@Dylan-DPC-zz
Copy link

Dylan-DPC-zz commented Apr 11, 2020

@bors p=1

@bors
Copy link
Collaborator

bors commented Apr 11, 2020

⌛ Testing commit 15f8d89 with merge 2922f29bbcdde10237e4e2060c1326958a68af23...

@bors
Copy link
Collaborator

bors commented Apr 11, 2020

💔 Test failed - checks-azure

@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 11, 2020
@RalfJung
Copy link
Member

RalfJung commented Apr 11, 2020

Yes this is definitely causing that ICE, at least on targets mips64-unknown-linux-gnuabi64, mips64el-unknown-linux-gnuabi64.

thread 'rustc' panicked at 'assertion failed: `(left == right)`
  left: `Direct(ArgAttributes { regular: (empty), pointee_size: Size { raw: 4 }, pointee_align: Some(Align { pow2: 2 }) })`,
 right: `Direct(ArgAttributes { regular: (empty), pointee_size: Size { raw: 0 }, pointee_align: None })`', <::std::macros::panic macros>:5:6

eddyb
eddyb reviewed Apr 11, 2020
View reviewed changes
@eddyb
Copy link
Member

eddyb commented Apr 16, 2020

@bors r=oli-obk

@bors
Copy link
Collaborator

bors commented Apr 16, 2020

📌 Commit 8f081d5 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 16, 2020
@bors
Copy link
Collaborator

bors commented Apr 17, 2020

⌛ Testing commit 8f081d5 with merge b2c1a60...

@bors
Copy link
Collaborator

bors commented Apr 17, 2020

☀️ Test successful - checks-azure
Approved by: oli-obk
Pushing b2c1a60 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 17, 2020
@bors bors merged commit b2c1a60 into rust-lang:master Apr 17, 2020
@rust-highfive rust-highfive mentioned this pull request Apr 17, 2020
Closed
@rust-highfive
Copy link
Contributor

rust-highfive commented Apr 17, 2020

📣 Toolstate changed by #70629!

Tested on commit b2c1a60.
Direct link to PR: #70629

💔 miri on windows: test-pass → build-fail (cc @oli-obk @eddyb @RalfJung).
💔 miri on linux: test-pass → build-fail (cc @oli-obk @eddyb @RalfJung).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Apr 17, 2020
@rust-highfive
📣 Toolstate changed by rust-lang/rust#70629!
30522c3 
Tested on commit rust-lang/rust@b2c1a60.
Direct link to PR: <rust-lang/rust#70629>

💔 miri on windows: test-pass → build-fail (cc @oli-obk @eddyb @RalfJung).
💔 miri on linux: test-pass → build-fail (cc @oli-obk @eddyb @RalfJung).
@ehuss ehuss mentioned this pull request Apr 19, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@RalfJung RalfJung RalfJung left review comments

@oli-obk oli-obk oli-obk left review comments

+1 more reviewer

@eddyb eddyb eddyb left review comments

Reviewers whose approvals may not affect merge requirements

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.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@anyska @rust-highfive @bors @eddyb @RalfJung @oli-obk @Dylan-DPC-zz