Adapt AddRetag for shallow retagging #63306
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
|
r? @varkor (rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
|
@bors r+ |
|
📌 Commit 3df672f has been approved by |
bors
added
S-waiting-on-bors
Centril
added a commit
to Centril/rust
that referenced
this pull request
Aug 12, 2019
Adapt AddRetag for shallow retagging With rust-lang/miri#872, Miri only retags "bare" references, not those nested in compound types. This adjust `Retag` statement generation to don't emit retags if they are definitely not a bare reference. I also expanded the mir-opt test to cover the `Retag` in the drop shim, which had previously not been tested.
bors
added a commit
that referenced
this pull request
Aug 12, 2019
Rollup of 10 pull requests Successful merges: - #62108 (Use sharded maps for queries) - #63297 (Improve pointer offset method docs) - #63306 (Adapt AddRetag for shallow retagging) - #63406 (Suggest using a qualified path in patterns with inconsistent bindings) - #63431 (Revert "Simplify MIR generation for logical ops") - #63449 (resolve: Remove remaining special cases from built-in macros) - #63461 (docs: add stdlib env::var(_os) panic) - #63473 (Regression test for #56870) - #63474 (Add tests for issue #53598 and #57700) - #63480 (Fixes #63477) Failed merges: r? @ghost
|
Failed in #63482 (comment), @bors r- |
bors
added
S-waiting-on-author
|
That is odd, I ran these locally before pushing... probably a merge conflict. |
|
Seems likely yeah; might interact with the change in MIR building? |
|
I rebased and it still passed locally, so my guess is the conflict is with another PR that got rolled up together. @bors rollup- I guess I'll just wait until the MIR building change lands? This one here has very low priority. |
RalfJung
force-pushed
the
retag
branch
2 times, most recently
from
49fb2a7
to
b122be4
Compare
|
I cannot reproduce a failure locally even after rebasing. Let's see what CI on this branch says. If it is green as well my gut feeling is to let bors try again...? |
|
SGTM. |
|
Branch CI is green. I also tested stage 2 locally, green as well. @bors r=varkor |
|
📌 Commit b122be4 has been approved by |
bors
added
S-waiting-on-bors
|
@bors p=-1 rollup=never but let's wait till after beta cutoff |
|
Beta has branched, let's raise priority to normal again. @bors p=0 |
Centril
added a commit
to Centril/rust
that referenced
this pull request
Aug 15, 2019
Adapt AddRetag for shallow retagging With rust-lang/miri#872, Miri only retags "bare" references, not those nested in compound types. This adjust `Retag` statement generation to don't emit retags if they are definitely not a bare reference. I also expanded the mir-opt test to cover the `Retag` in the drop shim, which had previously not been tested.
|
Failed in #63583 (comment), @bors r- |
bors
added
S-waiting-on-author
|
Hm, that "actual" MIR contains no unwinding. Might this be a platform that doesn't support unwinding, which would change MIR generation? |
|
cc @matthewjasper ^--- |
|
Ah, I found another test with a comment like I added that here, too. I hope that does it. @bors r=varkor |
|
📌 Commit 2122fe4 has been approved by |
bors
added
S-waiting-on-bors
Centril
added a commit
to Centril/rust
that referenced
this pull request
Aug 15, 2019
Adapt AddRetag for shallow retagging With rust-lang/miri#872, Miri only retags "bare" references, not those nested in compound types. This adjust `Retag` statement generation to don't emit retags if they are definitely not a bare reference. I also expanded the mir-opt test to cover the `Retag` in the drop shim, which had previously not been tested.
bors
added a commit
that referenced
this pull request
Aug 15, 2019
Rollup of 9 pull requests Successful merges: - #63155 (Add UWP MSVC targets) - #63165 (Add builtin targets for mips64(el)-unknown-linux-muslabi64) - #63306 (Adapt AddRetag for shallow retagging) - #63467 (Add Catalyst (iOS apps running on macOS) target) - #63546 (Remove uses of `mem::uninitialized()` from cloudabi) - #63572 (remove unused Level::PhaseFatal) - #63577 (Test HRTB issue accepted by compiler) - #63582 (Fix ICE #63226) - #63586 (cleanup: Remove `Spanned` where possible) 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.
With rust-lang/miri#872, Miri only retags "bare" references, not those nested in compound types. This adjust
Retagstatement generation to don't emit retags if they are definitely not a bare reference.I also expanded the mir-opt test to cover the
Retagin the drop shim, which had previously not been tested.