Skip to content

Fix an ICE when attempting to transmute an uninhabited type#50803

Merged
bors merged 2 commits intorust-lang:masterfrom
varkor:never-transmute-never
May 20, 2018
Merged

Fix an ICE when attempting to transmute an uninhabited type#50803
bors merged 2 commits intorust-lang:masterfrom
varkor:never-transmute-never

Conversation

@varkor
Copy link
Contributor

@varkor varkor commented May 16, 2018

Fixes #50570.

@rust-highfive
Copy link
Contributor

rust-highfive commented May 16, 2018

r? @petrochenkov

(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 May 16, 2018
@rust-highfive

This comment has been minimized.

Sign in to view
@varkor varkor force-pushed the never-transmute-never branch from 23cc8da to e6c9a68 Compare May 16, 2018 14:32
hanna-kruppe
hanna-kruppe reviewed May 16, 2018
View reviewed changes
src/test/run-pass/never_transmute_never.rs Outdated
Copy link
Contributor

@hanna-kruppe hanna-kruppe May 16, 2018

Choose a reason for hiding this comment

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

This test doesn't seem to trigger the ICE on current nightly. Possibly because the unused functions get never codegen'd?

NB: I would have expected a compile-pass test instead of run-pass (and with suitable crate type to avoid the dummy main)

Copy link
Contributor Author

@varkor varkor May 16, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

Good point on both counts — I've updated the test; thanks.

@varkor varkor force-pushed the never-transmute-never branch from e6c9a68 to d5de930 Compare May 16, 2018 20:26
@petrochenkov
Copy link
Contributor

petrochenkov commented May 16, 2018

r? @eddyb

@rust-highfive rust-highfive assigned eddyb and unassigned petrochenkov May 16, 2018
eddyb
eddyb reviewed May 17, 2018
View reviewed changes
src/librustc_trans/mir/block.rs Outdated
Copy link
Member

@eddyb eddyb May 17, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

Could you assert_eq!(bx.cx.layout_of(sig.output()).abi, Abi::Uninhabited) here?

@eddyb
Copy link
Member

eddyb commented May 17, 2018

@bors r+

@bors
Copy link
Collaborator

bors commented May 17, 2018

📌 Commit d8cba6b has been approved by eddyb

@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 May 17, 2018
@bors
Copy link
Collaborator

bors commented May 17, 2018

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

@bors bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 17, 2018
@varkor varkor force-pushed the never-transmute-never branch from d8cba6b to e172330 Compare May 17, 2018 17:14
@varkor varkor force-pushed the never-transmute-never branch 2 times, most recently from a400529 to f900333 Compare May 17, 2018 17:16
@eddyb
Copy link
Member

eddyb commented May 17, 2018

@bors r+

@bors
Copy link
Collaborator

bors commented May 17, 2018

📌 Commit f900333 has been approved by eddyb

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 17, 2018
@bors
Copy link
Collaborator

bors commented May 20, 2018

⌛ Testing commit f900333 with merge 21ea121...

bors added a commit that referenced this pull request May 20, 2018
@bors
Auto merge of #50803 - varkor:never-transmute-never, r=eddyb
21ea121 
Fix an ICE when attempting to transmute an uninhabited type

Fixes #50570.
@bors
Copy link
Collaborator

bors commented May 20, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: eddyb
Pushing 21ea121 to master...

@bors bors merged commit f900333 into rust-lang:master May 20, 2018
@varkor varkor deleted the never-transmute-never branch May 20, 2018 09:14
@hanna-kruppe hanna-kruppe mentioned this pull request May 28, 2018
Closed
@varkor varkor mentioned this pull request Jun 23, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

2 more reviewers

@eddyb eddyb eddyb left review comments

@hanna-kruppe hanna-kruppe hanna-kruppe left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@eddyb eddyb

Labels

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.

6 participants

@varkor @rust-highfive @petrochenkov @eddyb @bors @hanna-kruppe