Return Option<Type> in clang::Type::ret_type fix #141 #165
Conversation
This file contains hidden or 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
|
|
jeanphilippeD
force-pushed
the
issue141
branch
from
d98f19f to
a7d5f5d
Compare
emilio
requested changes
Oct 29, 2016
| @@ -186,7 +186,8 @@ impl FunctionSig { | |||
| } | |||
| } | |||
|
|
|||
| let ret = try!(Item::from_ty(&ty.ret_type(), None, None, ctx)); | |||
| let ty_ret_type = ty.ret_type().expect("Expected a valid return type"); | |||
There was a problem hiding this comment.
This is not equivalent to the code that was before. If a type was invalid, before it'll generate a Err(Continue), and the try! macro would make us return it earlier.
With this we're panicking, which isn't desirable.
There was a problem hiding this comment.
Thanks you.
I'll update the code.
- Should we add a test for this as well?
- I was under the impression that this code path should not happen (modulo bugs), do you have an idea of what C++ code would trigger it?
Also reduce the scope for unsafe code
jeanphilippeD
force-pushed
the
issue141
branch
from
a7d5f5d to
17494de
Compare
|
Yeah, at that point we indeed should be pretty sure it succeeds. Still feels better to avoid crashing when possible. Thanks for this! @bors-servo r+ |
|
📌 Commit 17494de 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.
Fixes #141