Make bitfield unit allocation fallible #1141
Merged
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
emilio
approved these changes
Nov 3, 2017
| @@ -466,7 +466,7 @@ impl FieldMethods for RawField { | |||
| fn raw_fields_to_fields_and_bitfield_units<I>( | |||
There was a problem hiding this comment.
Can you add to the doc comment when do we return errors?
src/ir/comp.rs
Outdated
| @@ -1046,6 +1065,7 @@ impl CompInfo { | |||
| /// Get this type's set of fields. | |||
| pub fn fields(&self) -> &[Field] { | |||
| match self.fields { | |||
| CompFields::ErrorComputingBitfieldUnits => &[][..], | |||
There was a problem hiding this comment.
nit: I think the [..] is not needed.
src/ir/comp.rs
Outdated
| @@ -1558,6 +1578,10 @@ impl IsOpaque for CompInfo { | |||
| return true | |||
| } | |||
|
|
|||
| if let CompFields::ErrorComputingBitfieldUnits = self.fields { | |||
There was a problem hiding this comment.
Note when can this happen? (here or somewhere else where it may make sense)
Instead of panicking when we see a bitfield that does not have a layout, return an error up the stack. If we get an error when allocating bitfields into units, then make the whole struct opaque. Fixes rust-lang#1140
fitzgen
force-pushed
the
bitfield-without-layout
branch
from
37cf177
to
43b88c5
Compare
|
Thanks for the review! Good calls on the comments, I've updated the commit. @bors-servo r+ |
|
📌 Commit 43b88c5 has been approved by |
|
@bors-servo r- |
|
@bors-servo r=emilio d'oh |
|
📌 Commit 43b88c5 has been approved by |
|
☀️ Test successful - status-travis |
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.
Instead of panicking when we see a bitfield that does not have a layout, return an error up the stack. If we get an error when allocating bitfields into units, then make the whole struct opaque.
Fixes #1140
r? @pepyakin or @emilio