Skip to content

Fix ICE caused by truncating a negative ZST enum discriminant - #70126

Merged
bors merged 2 commits into
rust-lang:masterfrom
wesleywiser:fix_miri_ice_neg_zst_enum_discr
Mar 22, 2020
Merged

Fix ICE caused by truncating a negative ZST enum discriminant#70126
bors merged 2 commits into
rust-lang:masterfrom
wesleywiser:fix_miri_ice_neg_zst_enum_discr

Conversation

@wesleywiser

@wesleywiserwesleywiser commented Mar 19, 2020

Copy link
Copy Markdown
Member

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 19, 2020
Centril
Centril reviewed Mar 19, 2020
View reviewed changes
Comment threadsrc/test/ui/consts/issue-70114.rs Outdated
RalfJung
RalfJung reviewed Mar 19, 2020
View reviewed changes
Comment threadsrc/librustc_mir/interpret/cast.rs Outdated
RalfJung
RalfJung reviewed Mar 19, 2020
View reviewed changes
Comment threadsrc/test/ui/consts/issue-70114.rs Outdated
RalfJung
RalfJung reviewed Mar 19, 2020
View reviewed changes
Comment threadsrc/test/ui/consts/issue-70114.rs Outdated
@rust-highfive

This comment has been minimized.

Sign in to view
@wesleywiser
wesleywiserforce-pushed the fix_miri_ice_neg_zst_enum_discr branch from 61ab908 to 4b9cbe0CompareMarch 20, 2020 12:20
RalfJung
RalfJung approved these changes Mar 20, 2020
View reviewed changes

@RalfJungRalfJung left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM too

@rust-highfive

This comment has been minimized.

Sign in to view
@wesleywiser
wesleywiserforce-pushed the fix_miri_ice_neg_zst_enum_discr branch from 4b9cbe0 to 1f39b2eCompareMarch 20, 2020 23:58
RalfJung
RalfJung reviewed Mar 21, 2020
View reviewed changes
Comment threadsrc/librustc_codegen_ssa/mir/rvalue.rs Outdated
@wesleywiser
wesleywiserforce-pushed the fix_miri_ice_neg_zst_enum_discr branch from 1f39b2e to 96bbd1cCompareMarch 21, 2020 11:04
@wesleywiser

wesleywiser commented Mar 21, 2020

Copy link
Copy Markdown
MemberAuthor

@bors r=RalfJung,eddyb

@bors

bors commented Mar 21, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 96bbd1c has been approved by RalfJung,eddyb

@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-review Status: Awaiting review from the assignee but also interested parties. labels Mar 21, 2020
@Dylan-DPC-zzDylan-DPC-zz mentioned this pull request Mar 21, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 21, 2020
@bors
Auto merge ofrust-lang#70246- Dylan-DPC:rollup-vt9wex2, r=Dylan-DPC
c6b172f
Rollup of 10 pull requests
Successful merges:
- rust-lang#70003 (symbol_names: treat ReifyShim like VtableShim.)
- rust-lang#70051 (Allow `hir().find` to return `None`)
- rust-lang#70126 (Fix ICE caused by truncating a negative ZST enum discriminant)
- rust-lang#70197 (For issue 53957: revise unit test to focus on underlying bug of 23076.)
- rust-lang#70215 (ast: Compress `AttrId` from `usize` to `u32`)
- rust-lang#70218 (Fix deprecated Error.description() usage in docs)
- rust-lang#70228 (Remove CARGO_BUILD_TARGET from bootstrap.py)
- rust-lang#70231 (Add explanation message for E0224)
- rust-lang#70232 (Tweak wording for std::io::Read::read function)
- rust-lang#70238 (Add a test for out-of-line module passed through a proc macro)
Failed merges:
r? @ghost
@bors
bors merged commit ecf3ef5 into rust-lang:masterMar 22, 2020
@wesleywiserwesleywiser added beta-nominated Nominated for backporting to the compiler in the beta channel. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Mar 22, 2020
@pnkfelix

pnkfelix commented Apr 1, 2020

Copy link
Copy Markdown
Contributor

Discussed in T-compiler meeting. Declining to beta-backport.

@pnkfelixpnkfelix removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Apr 1, 2020
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@RalfJungRalfJungRalfJung approved these changes
+2 more reviewers
@eddybeddybeddyb approved these changes
@CentrilCentrilCentril left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@oli-obkoli-obk

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

ICE when casting negative discriminant enum values to anything less than bit width

8 participants

@wesleywiser@rust-highfive@bors@pnkfelix@eddyb@RalfJung@Centril@oli-obk