rustc: don't trip an assertion for enums with present but uninhabited variants. #50735
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
eddyb
added
the
beta-nominated
rust-highfive
added
the
S-waiting-on-review
|
Beta-nominated because the assert failure was introduced in the already-backported #50622. |
nikomatsakis
approved these changes
May 14, 2018
|
@bors r+ cc @rust-lang/compiler -- approving for backport |
|
📌 Commit 29b4c7b has been approved by |
bors
added
S-waiting-on-bors
nikomatsakis
added
the
beta-accepted
|
@bors p=80 (added to the backports PR) |
bors
added a commit
that referenced
this pull request
May 14, 2018
rustc: don't trip an assertion for enums with present but uninhabited variants. Fixes #50731. r? @nikomatsakis
estebank
reviewed
May 14, 2018
| @@ -888,6 +888,11 @@ impl<'a, 'tcx> LayoutCx<'tcx, TyCtxt<'a, 'tcx, 'tcx>> { | |||
| if x < min { min = x; } | |||
| if x > max { max = x; } | |||
| } | |||
| // We might have no inhabited variants, so pretend there's at least one. | |||
| if (min, max) == (i128::max_value(), i128::min_value()) { | |||
There was a problem hiding this comment.
Just to make sure, is (min, max) = max(), min() correct?
There was a problem hiding this comment.
Jup. These are the initial values for both, so that means the loop was empty or all variants uninhabited
There was a problem hiding this comment.
(and the loop can't be empty, thanks to a condition much earlier)
|
☀️ Test successful - status-appveyor, status-travis |
alexcrichton
removed
the
beta-nominated
bors
added a commit
that referenced
this pull request
May 15, 2018
[beta] Process backports Merged on master: * #50648: Fix volatile_store and nontemporal_store * #50735: rustc: don't trip an assertion for enums with present but uninhabited variants. * #50693: typeck: Save the index of private fields * #50748: Update stdsimd module * #50694: Fix self referential impl Trait substitutions r? @alexcrichton
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #50731.
r? @nikomatsakis