Canonicalize types before looking for their definitions. #2084
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
|
|
emilio
approved these changes
Jul 29, 2021
dtolnay
suggested changes
Jul 29, 2021
There was a problem hiding this comment.
According to the test failure on tests/headers/layout_cmdline_token.h / tests/expectations/tests/layout_cmdline_token.rs one of the expected outputs needs to be regenerated.
+/// Stores a pointer to the ops struct, and the offset: the place to
+/// write the parsed result in the destination structure.
pub type cmdline_parse_token_hdr_t = cmdline_token_hdr;
...
thread 'header_layout_cmdline_token_h' panicked at 'Header and binding differ! Run with BINDGEN_OVERWRITE_EXPECTED=1 in the environment to automatically overwrite the expectation or with BINDGEN_TESTS_DIFFTOOL=meld to do this manually.'
In some esoteric cases involving nested templates, `ty.declaration().definition()` isn't enough to find the definition: we need `ty.canonical_type().declaration().definition()` instead. Closes rust-lang#2078.
complete type. It might not if we had to avoid recursion when processing types. Detect that case and bail out. This bug was being masked by the fact that we didn't always find definitions for the recursion check and so it didn't trigger, but now that this check is more reliable we have to be careful in more places. The test case was reduced from the GCC STL allocator definition.
pcwalton
force-pushed
the
canonicalize-types
branch
from
c6cc0aa to
6a7dff0
Compare
emilio
approved these changes
Jul 31, 2021
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.
In some esoteric cases involving nested templates,
ty.declaration().definition()isn't enough to find the definition: we needty.canonical_type().declaration().definition()instead.Closes #2078.
r? @emilio