codegen/mir: support polymorphic InstanceDefs
#69935
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
nikomatsakis
requested changes
Mar 11, 2020
eddyb
reviewed
Mar 12, 2020
This commit modifies the use of `subst_and_normalize_erasing_regions` on parts of the MIR bodies returned from `instance_mir`, so that `InstanceDef::CloneShim` and `InstanceDef::DropGlue` (where there is a type) do not perform substitutions. This avoids double substitutions and enables polymorphic `InstanceDef`s. Signed-off-by: David Wood <david@davidtw.co>
eddyb
approved these changes
Mar 12, 2020
nikomatsakis
approved these changes
Mar 13, 2020
|
@bors r=eddyb if I'm not mistaken |
|
📌 Commit bee1513 has been approved by |
bors
added
S-waiting-on-bors
Merged
Centril
added a commit
to Centril/rust
that referenced
this pull request
Mar 19, 2020
codegen/mir: support polymorphic `InstanceDef`s cc rust-lang#69925 This PR modifies the use of `subst_and_normalize_erasing_regions` on parts of the MIR bodies returned from `instance_mir`, so that `InstanceDef::CloneShim` and `InstanceDef::DropGlue` (where there is a type) do not perform substitutions. This avoids double substitutions and enables polymorphic `InstanceDef`s. r? @eddyb cc @nikomatsakis
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 20, 2020
Rollup of 9 pull requests Successful merges: - rust-lang#69618 (Clarify the relationship between `forget()` and `ManuallyDrop`.) - rust-lang#69768 (Compute the correct layout for variants of uninhabited enums) - rust-lang#69935 (codegen/mir: support polymorphic `InstanceDef`s) - rust-lang#70103 (Clean up E0437 explanation) - rust-lang#70131 (Add regression test for TAIT lifetime inference (issue rust-lang#55099)) - rust-lang#70133 (remove unused imports) - rust-lang#70145 (doc: Add quote to .init_array) - rust-lang#70146 (Clean up e0438 explanation) - rust-lang#70150 (triagebot.toml: accept cleanup-crew) Failed merges: r? @ghost
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.
cc #69925
This PR modifies the use of
subst_and_normalize_erasing_regionson parts of the MIR bodies returned frominstance_mir, so thatInstanceDef::CloneShimandInstanceDef::DropGlue(where there is a type) do not perform substitutions. This avoids double substitutions and enables polymorphicInstanceDefs.r? @eddyb
cc @nikomatsakis