Fall back to opaque types rather than panicking on parse failure #612
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
|
Potentially solves #584 but I haven't tried to reduce those failures yet. |
emilio
approved these changes
Apr 4, 2017
src/ir/context.rs
Outdated
| @@ -424,7 +424,9 @@ impl<'ctx> BindgenContext<'ctx> { | |||
| for (id, ty, loc, parent_id) in typerefs { | |||
| let _resolved = { | |||
| let resolved = Item::from_ty(&ty, loc, parent_id, self) | |||
| .expect("What happened?"); | |||
| .unwrap_or_else(|_| { | |||
| Item::new_opaque_type(self.next_item_id(), &ty, self) | |||
There was a problem hiding this comment.
I believe we want to leave a warning here or something.
src/ir/ty.rs
Outdated
| if let Ok(complex) = CompInfo::from_ty(potential_id, | ||
| ty, | ||
| Some(location), | ||
| ctx) { |
There was a problem hiding this comment.
Perhaps using match + a separate variable may look a bit cleaner?
let complex = CompInfo::from_ty(..);
match complex {
Ok(complex) => TypeKind::Comp(complex),
Err(..) => {
warn!(...);
return Ok(ParseResult::New(...));
}
}(or even without the variable)
Also, ditto re. warning.
|
@bors-servo r=emilio Thanks! Review comments addressed. |
|
📌 Commit f2ef3d1 has been approved by |
bors-servo
pushed a commit
that referenced
this pull request
Apr 4, 2017
Fall back to opaque types rather than panicking on parse failure Getting closer to figuring out some of the other template related issues in clang 4.0, but not quite ready to land them yet. Figure this should probably land in the meantime. This is just a better fallback in the face of the unknown for panics that we've had reports of in the wild, but which I haven't had time to creduce. r? @emilio
|
☀️ 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.
Getting closer to figuring out some of the other template related issues in clang 4.0, but not quite ready to land them yet. Figure this should probably land in the meantime. This is just a better fallback in the face of the unknown for panics that we've had reports of in the wild, but which I haven't had time to creduce.
r? @emilio