Skip to content

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

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 2 commits into from
Mar 22, 2020

Conversation

wesleywiser
Copy link
Member

Fixes #70114

r? @oli-obk or @RalfJung

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

This comment has been minimized.

@wesleywiser wesleywiser force-pushed the fix_miri_ice_neg_zst_enum_discr branch from 61ab908 to 4b9cbe0 Compare March 20, 2020 12:20
Copy link
Member

@RalfJung RalfJung left a comment

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.

@wesleywiser wesleywiser force-pushed the fix_miri_ice_neg_zst_enum_discr branch from 4b9cbe0 to 1f39b2e Compare March 20, 2020 23:58
@wesleywiser wesleywiser force-pushed the fix_miri_ice_neg_zst_enum_discr branch from 1f39b2e to 96bbd1c Compare March 21, 2020 11:04
@wesleywiser
Copy link
Member Author

@bors r=RalfJung,eddyb

@bors
Copy link
Collaborator

bors commented Mar 21, 2020

📌 Commit 96bbd1c has been approved by RalfJung,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 Mar 21, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 21, 2020
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:master Mar 22, 2020
@wesleywiser wesleywiser 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
Copy link
Member

pnkfelix commented Apr 1, 2020

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

@pnkfelix pnkfelix removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Apr 1, 2020
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
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
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