polymorphize: I used if T used in I: Foo<T>
#75518
Merged
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
rust-highfive
added
the
S-waiting-on-review
lcnr
reviewed
Aug 14, 2020
lcnr
reviewed
Aug 14, 2020
This commit adjusts polymorphization's handling of predicates so that after ensuring that `T` is used in `I: Foo<T>` if `I` is used, it now ensures that `I` is used if `T` is used in `I: Foo<T>`. This is necessary to mark generic parameters that only exist in impl parameters as used - thereby avoiding symbol clashes when using the new mangling scheme. Signed-off-by: David Wood <[email protected]>
davidtwco
force-pushed
the
issue-75326-polymorphization-symbol-mangling-v0-predicates
branch
from
f80f2da to
bf3ef26
Compare
|
While I think that this restriction is somewhat unfortunate this does look correct to me now. @bors r+ rollup |
|
📌 Commit bf3ef26 has been approved by |
bors
added
S-waiting-on-bors
eddyb
reviewed
Aug 14, 2020
| @@ -318,3 +373,36 @@ impl<'a, 'tcx> TypeVisitor<'tcx> for UsedGenericParametersVisitor<'a, 'tcx> { | |||
| } | |||
| } | |||
| } | |||
|
|
|||
| /// Visitor used to check if a generic parameter is used. | |||
| struct IsUsedGenericParams<'a> { | |||
There was a problem hiding this comment.
Maybe this should be called HasUsedGenericParams?
eddyb
reviewed
Aug 14, 2020
| debug!("mark_used_by_predicates: checking projection ty"); | ||
| if is_ty_used(unused_parameters, proj.ty) { | ||
| debug!("mark_used_by_predicates: used!"); | ||
| mark_ty(unused_parameters, self_ty); |
There was a problem hiding this comment.
I think this is overly simplistic, I suspect you can replace I: Iterator<...> with (): WeirdIterator<I, ...>.
Any treatment of the Self parameter as special is suspicious by default, IMO.
eddyb
reviewed
Aug 14, 2020
Comment on lines
+152
to
175
| // Consider `T` used if `I` is used in predicates of the form | ||
| // `I: Iterator<Item = T>` | ||
| debug!("mark_used_by_predicates: checking self"); | ||
| if is_ty_used(unused_parameters, trait_ref.self_ty()) { | ||
| debug!("mark_used_by_predicates: used!"); | ||
| for ty in trait_ref.substs.types() { | ||
| mark_ty(unused_parameters, ty); | ||
| } | ||
|
|
||
| // No need to check for a type being used in the substs if `self_ty` was | ||
| // used. | ||
| continue; | ||
| } | ||
|
|
||
| // Consider `I` used if `T` is used in predicates of the form | ||
| // `I: Iterator<Item = &'a (T, E)>` (see rust-lang/rust#75326) | ||
| debug!("mark_used_by_predicates: checking substs"); | ||
| for ty in trait_ref.substs.types() { | ||
| debug!("unused_generic_params: (trait) ty={:?}", ty); | ||
| mark_ty(unused_parameters, ty); | ||
| if is_ty_used(unused_parameters, ty) { | ||
| debug!("mark_used_by_predicates: used!"); | ||
| mark_ty(unused_parameters, trait_ref.self_ty()); | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
This sounds like an overly complicated way to handle "if any parameters are used, all are".
Notable strangeness:
substs.types()will includeself_tyso some of this code already seems redundant with itself.types()makes me wonder: what about const generics?
|
☀️ Test successful - checks-actions, checks-azure |
davidtwco
deleted the
issue-75326-polymorphization-symbol-mangling-v0-predicates
branch
|
I'll address @eddyb's comments in a follow-up. |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Aug 20, 2020
…simplification-correction, r=eddyb polymorphize: if any param in a predicate is used, then all are used Addresses [review](rust-lang#75518 (comment)) [comments](rust-lang#75518 (comment)) [from](rust-lang#75518 (comment)) @eddyb in rust-lang#75518 that I didn't get to resolve before bors merged. This PR modifies polymorphization's handling of predicates so that if any generic parameter is used in a predicate then all parameters in that predicate are used. r? @eddyb
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 #75326.
This PR adjusts polymorphization's handling of predicates so that after ensuring that
Tis used inI: Foo<T>ifIis used, it now ensures thatIis used ifTis used inI: Foo<T>. This is necessary to mark generic parameters that only exist in impl parameters as used - thereby avoiding symbol clashes when using the new mangling scheme.With this PR, rustc will now fully bootstrap with polymorphization and the new symbol mangling scheme enabled - not all tests pass, but I'm not sure how much of that is the interaction of the two features, I'll be looking into that soon. All tests pass with only polymorphization enabled.
r? @lcnr (this isn't sufficiently complex that I need to add to eddy's review queue)
cc @eddyb