Fix issue #1535: use correct names for function parameters in function pointer arguments. #1536
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
Mar 10, 2019
src/ir/function.rs
Outdated
| _ => panic!() | ||
| } | ||
| let cursor_args = cursor.args().unwrap().into_iter(); | ||
| let type_args = ty.args().unwrap_or_else(Vec::new).into_iter(); |
| .map(Some) | ||
| .chain(std::iter::repeat(None)) | ||
| ) | ||
| .take_while(|(cur, ty)| cur.is_some() || ty.is_some()) |
There was a problem hiding this comment.
Maybe add a note that we could use itertools::zip_longest (https://docs.rs/itertools/0.7.8/itertools/trait.Itertools.html#method.zip_longest) if we wanted to?
This is fine for now to avoid introducing a new dependency unnecessarily.
| @@ -1 +1 @@ | |||
| void foo(void (*bar)()); | |||
There was a problem hiding this comment.
Can we keep both functions? Having more tests doesn't really hurt :)
|
Thanks a lot for working on this @flowbish! |
|
Updated the branch, thanks for taking a look. |
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.
Issue #1535 showed that parameter names were incorrect in function pointers arguments.
This was caused by the incorrect cursor being passed through in determining argument types and names -- the cursor was recycled the function declaration, causing bindgen to recycle the parameter names.
This patch fixes it by using the correct cursor when constructing the argument types.
Argument types can be found in either the cursor or the type, but argument names may only be
found on the cursor. We often have access to both a type and a cursor for each argument, but
in some cases we may only have one.
Prefer using the type as the source of truth for the argument's type, but fall back to
inspecting the cursor (this happens for Objective C interfaces).
Prefer using the cursor for the argument's type, but fall back to using the parent's cursor
(this happens for function pointer return types).