Compute the correct layout for variants of uninhabited enums #69768

oli-obk · 2020-03-06T10:21:58Z

src/librustc/ty/layout.rs

RalfJung · 2020-03-06T10:32:46Z

fixes #69763

That issue also says to check other code for unnecessary is_uninhabited checks, so maybe we shouldn't close it yet?
@eddyb seems to disagree that we should get rid of these checks in codegen, but I want to at least audit Miri for this.

eddyb · 2020-03-06T10:36:52Z

Oh yeah I missed the bit about #69763, it shouldn't be closed until the plan at the end of #69763 (comment), or something similarly thorough, is implemented.

src/librustc_mir/interpret/operand.rs

eddyb · 2020-03-06T10:41:23Z

@bors r+

bors · 2020-03-06T10:41:24Z

📌 Commit 5c7ef5ce7b16f958a1252b4371943c3355e2da5e has been approved by eddyb

bors · 2020-03-06T10:41:25Z

🌲 The tree is currently closed for pull requests below priority 1000, this pull request will be tested once the tree is reopened

oli-obk · 2020-03-06T11:00:33Z

@bors r=eddyb

bors · 2020-03-06T11:00:34Z

📌 Commit 875959635bf156e9564d245b20c21784c224ee2a has been approved by eddyb

bors · 2020-03-06T11:00:35Z

🌲 The tree is currently closed for pull requests below priority 1000, this pull request will be tested once the tree is reopened

oli-obk · 2020-03-06T11:02:25Z

@bors r=eddyb

bors · 2020-03-06T11:02:26Z

📌 Commit a2dfd7e57fcb0af47d9c4ffdfb60c35a9f50e8dd has been approved by eddyb

bors · 2020-03-06T11:02:27Z

🌲 The tree is currently closed for pull requests below priority 1000, this pull request will be tested once the tree is reopened

src/test/ui/consts/issue-69191.rs

nikomatsakis · 2020-03-06T15:07:34Z

Discussed in today's meeting and decided against backporting this, since #69753 fixes the same problem in a narrow way (though this change is still desired).

RalfJung · 2020-03-06T17:46:29Z

@bors r- because #69753 goes first, and this PR should be rebased on top of that and revert the Miri changes.

Also @oli-obk could you add a corresponding assertion here that checks if i is in-bounds for the fields of this union? I think that should make sure codegen also notices these kinds of MIR incoherences.

eddyb · 2020-03-06T18:09:52Z

Also @oli-obk could you add a corresponding assertion here that checks if i is in-bounds for the fields of this union? I think that should make sure codegen also notices these kinds of MIR incoherences.

cc #64987 (comment)

RalfJung · 2020-03-06T18:27:31Z

@eddyb that PR actually did add the assertion, but it seems someone removed it again later?

RalfJung · 2020-03-06T18:29:03Z

Ah it got reverted in #66250

…d a long lost assertion This reverts part of commit 9712fa4.

@eddyb

…lfJung Compute the correct layout for variants of uninhabited enums r? @eddyb cc @RalfJung fixes rust-lang#69191 cc rust-lang#69763

@eddyb

…lfJung Compute the correct layout for variants of uninhabited enums r? @eddyb cc @RalfJung fixes rust-lang#69191 cc rust-lang#69763

@eddyb

…lfJung Compute the correct layout for variants of uninhabited enums r? @eddyb cc @RalfJung fixes rust-lang#69191 cc rust-lang#69763

@eddyb

…lfJung Compute the correct layout for variants of uninhabited enums r? @eddyb cc @RalfJung fixes rust-lang#69191 cc rust-lang#69763

@eddyb

…lfJung Compute the correct layout for variants of uninhabited enums r? @eddyb cc @RalfJung fixes rust-lang#69191 cc rust-lang#69763

@eddyb

…lfJung Compute the correct layout for variants of uninhabited enums r? @eddyb cc @RalfJung fixes rust-lang#69191 cc rust-lang#69763

@eddyb

…lfJung Compute the correct layout for variants of uninhabited enums r? @eddyb cc @RalfJung fixes rust-lang#69191 cc rust-lang#69763

@ghost

Rollup of 9 pull requests Successful merges: - rust-lang#69618 (Clarify the relationship between `forget()` and `ManuallyDrop`.) - rust-lang#69768 (Compute the correct layout for variants of uninhabited enums) - rust-lang#69935 (codegen/mir: support polymorphic `InstanceDef`s) - rust-lang#70103 (Clean up E0437 explanation) - rust-lang#70131 (Add regression test for TAIT lifetime inference (issue rust-lang#55099)) - rust-lang#70133 (remove unused imports) - rust-lang#70145 (doc: Add quote to .init_array) - rust-lang#70146 (Clean up e0438 explanation) - rust-lang#70150 (triagebot.toml: accept cleanup-crew) Failed merges: r? @ghost

rust-highfive assigned eddyb Mar 6, 2020

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 6, 2020

eddyb approved these changes Mar 6, 2020

View reviewed changes

RalfJung reviewed Mar 6, 2020

View reviewed changes

src/librustc/ty/layout.rs Show resolved Hide resolved

lqd reviewed Mar 6, 2020

View reviewed changes

src/librustc_mir/interpret/operand.rs Outdated Show resolved Hide resolved

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 Mar 6, 2020

eddyb mentioned this pull request Mar 6, 2020

Do not ICE when matching an uninhabited enum's field #69753

Merged

RalfJung reviewed Mar 6, 2020

View reviewed changes

src/test/ui/consts/issue-69191.rs Outdated Show resolved Hide resolved

pnkfelix mentioned this pull request Mar 6, 2020

beta regression: ICE on Tried to access field 0 of union Layout #69191

Closed

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 Mar 6, 2020

Compute the correct layout for variants of uninhabited enums and read…

cdc7304

…d a long lost assertion This reverts part of commit 9712fa4.

oli-obk force-pushed the union_field_ice branch from 35bb0fb to cdc7304 Compare March 11, 2020 12:56

Centril mentioned this pull request Mar 11, 2020

Rollup of 8 pull requests #69927

Closed

Centril mentioned this pull request Mar 11, 2020

Rollup of 9 pull requests #69931

Closed

Dylan-DPC-zz mentioned this pull request Mar 14, 2020

Rollup of 7 pull requests #69990

Closed

JohnTitor mentioned this pull request Mar 14, 2020

Rollup of 8 pull requests #69996

Closed

Dylan-DPC-zz mentioned this pull request Mar 17, 2020

Rollup of 7 pull requests #70063

Closed

Manishearth mentioned this pull request Mar 17, 2020

Rollup of 12 pull requests #70085

Closed

Centril mentioned this pull request Mar 19, 2020

Rollup of 5 pull requests #70141

Closed

JohnTitor mentioned this pull request Mar 20, 2020

Rollup of 9 pull requests #70174

Merged

bors merged commit 3554f2d into rust-lang:master Mar 20, 2020

oli-obk deleted the union_field_ice branch March 22, 2020 21:33

Compute the correct layout for variants of uninhabited enums #69768

Compute the correct layout for variants of uninhabited enums #69768

Uh oh!

Conversation

oli-obk commented Mar 6, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

RalfJung commented Mar 6, 2020

Uh oh!

eddyb commented Mar 6, 2020

Uh oh!

Uh oh!

eddyb commented Mar 6, 2020

Uh oh!

bors commented Mar 6, 2020

Uh oh!

bors commented Mar 6, 2020

Uh oh!

oli-obk commented Mar 6, 2020

Uh oh!

bors commented Mar 6, 2020

Uh oh!

bors commented Mar 6, 2020

Uh oh!

oli-obk commented Mar 6, 2020

Uh oh!

bors commented Mar 6, 2020

Uh oh!

bors commented Mar 6, 2020

Uh oh!

Uh oh!

nikomatsakis commented Mar 6, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

RalfJung commented Mar 6, 2020

Uh oh!

eddyb commented Mar 6, 2020

Uh oh!

RalfJung commented Mar 6, 2020

Uh oh!

RalfJung commented Mar 6, 2020

Uh oh!

Uh oh!

oli-obk commented Mar 6, 2020 •

edited

Loading

nikomatsakis commented Mar 6, 2020 •

edited

Loading