Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

fix discriminant type in generator transform #72502

Merged
merged 2 commits into from
May 24, 2020
Merged

fix discriminant type in generator transform #72502

merged 2 commits into from
May 24, 2020

Conversation

RalfJung
Copy link
Member

The generator transform assumed that the discriminant type is always isize, which is not correct, leading to ICEs in Miri when some extra sanity checking got enabled.

r? @jonas-schievink @eddyb

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 23, 2020
@jonas-schievink
Copy link
Contributor

That's right, it's always u32 currently (although the memory layout code chooses the smallest integer that fits all states).

@bors r+ rollup

@bors
Copy link
Contributor

bors commented May 23, 2020

📌 Commit 89aac16 has been approved by jonas-schievink

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

@bors r-
Let's see if this passes all tests first.

@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 23, 2020
@RalfJung RalfJung mentioned this pull request May 23, 2020
Merged
@jonas-schievink
Copy link
Contributor

Ah, yeah. Probably some of the mir-opt output has changed.

@rust-highfive

This comment has been minimized.

Sign in to view
@RalfJung
Copy link
Member Author

@jonas-schievink okay the PR now includes the blessed tests.

@jonas-schievink
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented May 23, 2020

📌 Commit b388f96 has been approved by jonas-schievink

@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 23, 2020
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request May 23, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request May 24, 2020
@bors
Auto merge of rust-lang#72516 - Dylan-DPC:rollup-cc4w96z, r=Dylan-DPC
3137f8e 
Rollup of 5 pull requests

Successful merges:

 - rust-lang#71618 (Preserve substitutions when making trait obligations for suggestions)
 - rust-lang#72092 (Unblock font loading in rustdoc.css)
 - rust-lang#72400 (Add missing ASM arena declarations to librustc_middle)
 - rust-lang#72489 (Fix ice-72487)
 - rust-lang#72502 (fix discriminant type in generator transform)

Failed merges:

r? @ghost
@bors bors merged commit 1e79144 into rust-lang:master May 24, 2020
@RalfJung RalfJung deleted the generator-discr-ty branch May 24, 2020 07:43
@SimonSapin SimonSapin mentioned this pull request May 26, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@jonas-schievink jonas-schievink

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.

None yet
4 participants
@RalfJung @jonas-schievink @bors @rust-highfive