Allow anonymous template types #575
Merged
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 various assertions that the only way that some template parameter related methods will return `None` is if the template definition is marked opaque. These assertions fail in the presence of test cases with unnamed template types, because we never save an IR item for the template type, and subsequently think that the template definition has no template parameters. The assertions are in fact sound and correct, so it doesn't make sense to remove them. Instead it is more correct to save IR items for the anonymous template types and simply let the template usage analysis prevent them from getting codegen'd. Fixes rust-lang#574
Not sure why rustfmt hasn't caught this before...
|
|
fitzgen
changed the title
emilio
reviewed
Mar 11, 2017
src/ir/comp.rs
Outdated
| @@ -357,8 +359,8 @@ impl CompInfo { | |||
|
|
|||
| let has_destructor = self.has_destructor || | |||
| match self.kind { | |||
| CompKind::Union => false, | |||
| CompKind::Struct => { | |||
| CompKind::Union => false, | |||
There was a problem hiding this comment.
I don't think these changes are really acceptable in general.
Is this only due to a newer version of rustfmt?
src/ir/module.rs
Outdated
| @@ -63,7 +63,7 @@ impl DotAttributes for Module { | |||
| _ctx: &BindgenContext, | |||
| out: &mut W) | |||
| -> io::Result<()> | |||
| where W: io::Write, | |||
| where W: io::Write | |||
There was a problem hiding this comment.
Also, it's no longer respecting the trailing comma in where clauses?
src/ir/named.rs
Outdated
| .or_insert(vec![]) | ||
| .push(item); | ||
| }, | ||
| dependencies.entry(sub_item) |
There was a problem hiding this comment.
This change seems also wrong to me.
src/main.rs
Outdated
| @@ -52,8 +52,8 @@ pub fn main() { | |||
| Ok((builder, output, verbose)) => { | |||
|
|
|||
| let builder_result = panic::catch_unwind(|| { | |||
| builder.generate().expect("Unable to generate bindings") | |||
| }); | |||
| builder.generate().expect("Unable to generate bindings") | |||
There was a problem hiding this comment.
This is also way off I believe.
fitzgen
force-pushed
the
issue-574-anonymous-template-parameters-and-assertion-failure
branch
from
b8cfd9f to
b7f7850
Compare
|
Thanks for the review! Dropped the last commit. Yeah, this is latest @bors-servo r+ |
|
📌 Commit b7f7850 has been approved by |
bors-servo
pushed a commit
that referenced
this pull request
Mar 13, 2017
…and-assertion-failure, r=fitzgen Allow anonymous template types We have various assertions that the only way that some template parameter related methods will return `None` is if the template definition is marked opaque. These assertions fail in the presence of test cases with unnamed template types, because we never save an IR item for the template type, and subsequently think that the template definition has no template parameters. The assertions are in fact sound and correct, so it doesn't make sense to remove them. Instead it is more correct to save IR items for the anonymous template types and simply let the template usage analysis prevent them from getting codegen'd. Fixes #574 r? @emilio
|
@bors-servo r- |
|
@bors-servo r=emilio |
|
📌 Commit b7f7850 has been approved by |
|
FWIW, filed rust-lang/rustfmt#1376 for the |
|
☀️ Test successful - status-travis |
fitzgen
deleted the
issue-574-anonymous-template-parameters-and-assertion-failure
branch
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.
We have various assertions that the only way that some template parameter related methods will return
Noneis if the template definition is marked opaque. These assertions fail in the presence of test cases with unnamed template types, because we never save an IR item for the template type, and subsequently think that the template definition has no template parameters. The assertions are in fact sound and correct, so it doesn't make sense to remove them. Instead it is more correct to save IR items for the anonymous template types and simply let the template usage analysis prevent them from gettingcodegen'd.
Fixes #574
r? @emilio