More fixes for Stylo #640
Merged
More fixes for Stylo #640
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
We have a couple knobs to turn for item resolution, such as whether we keep going through type references and type aliases. It makes sense to have a single, easy place to configure these knobs.
This commit adds a bunch of debug logging to the template type parameters analysis. I've essentially adding this same code and then never committed it, like three or four different times. Because I keep re-writing it, I think it is worth keeping around in a more permanent fashion.
This commit makes the test-one.sh script log the input header as well as the emitted bindings to stdout.
In stylo bindings generation, we were hitting bugs where the analysis saw a template type parameter behind a type ref to a type alias, and this was then used as an argument to a template instantiation. Because of the indirection, the analysis got confused and ignored the template argument because it was "not" a named template type, and therefore we didn't care about its usage. This commit makes sure that we keep resolving through type references and aliases to find the inner named template type parameter to add to the current item's usage set. Fixes rust-lang#638.
…nctions The method was getting fairly large, and it is a little easier to read if we break it down into smaller parts.
It had some incorrectness where there was a difference between the abstract `self_template_param_usage` and `template_param_usage` functions. In reality, they are different cases of the same function. The comment was misleading in that it implied that we run both on the same IR item, when in fact we will only run one or the other. I've tried to make it more clear in the new version of the comment.
The trait is all about accessing template parameters, and is also implemented for things that are not template declarations or definitions, but do end up using template parameters one way or another. The new name makes more sense.
Organizationally, it makes more sense.
|
|
emilio
approved these changes
Apr 17, 2017
src/ir/named.rs
Outdated
| // parameters, but we can push the issue down the line to them. | ||
| Some(&TypeKind::TemplateInstantiation(ref inst)) | ||
| if !self.whitelisted_items.contains(&inst.template_definition()) => { | ||
| debug!(" instantiation of blacklisted template, uses all template \ |
Contributor
There was a problem hiding this comment.
These should probably be trace!, but no big deal.
Member
Author
There was a problem hiding this comment.
Is trace! a lower level than debug!? If so, then yes I can definitely do that
These logs are pretty loud, so let's knock em down a log level.
Member
Author
|
Thanks for the review! Just pushed a new commit going @bors-servo r=emilio |
|
📌 Commit 9689db6 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
4 participants
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.
See each commit message for details. bce1330 is the big correctness fix for a bug we were hitting in stylo.
r? @emilio