Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adapt AddRetag for shallow retagging #63306

Merged
merged 3 commits into from Aug 15, 2019

Conversation

@RalfJung
Copy link
Member

commented Aug 5, 2019

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.

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

commented Aug 5, 2019

r? @varkor

(rust_highfive has picked a reviewer for you, use r? to override)

@varkor

This comment has been minimized.

Copy link
Member

commented Aug 11, 2019

@bors r+

@bors

This comment has been minimized.

Copy link
Contributor

commented Aug 11, 2019

📌 Commit 3df672f has been approved by varkor

Centril added a commit to Centril/rust that referenced this pull request Aug 12, 2019

Rollup merge of rust-lang#63306 - RalfJung:retag, r=varkor
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

Auto merge of #63482 - Centril:rollup-iyakgmg, r=Centril
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
@Centril

This comment has been minimized.

Copy link
Member

commented Aug 12, 2019

Failed in #63482 (comment), @bors r-

@RalfJung

This comment has been minimized.

Copy link
Member Author

commented Aug 12, 2019

That is odd, I ran these locally before pushing... probably a merge conflict.

@Centril

This comment has been minimized.

Copy link
Member

commented Aug 12, 2019

Seems likely yeah; might interact with the change in MIR building?

@RalfJung

This comment has been minimized.

Copy link
Member Author

commented Aug 12, 2019

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 RalfJung force-pushed the RalfJung:retag branch 2 times, most recently from 49fb2a7 to b122be4 Aug 12, 2019

@RalfJung

This comment has been minimized.

Copy link
Member Author

commented Aug 12, 2019

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...?

@Centril

This comment has been minimized.

Copy link
Member

commented Aug 12, 2019

SGTM.

@RalfJung

This comment has been minimized.

Copy link
Member Author

commented Aug 12, 2019

Branch CI is green. I also tested stage 2 locally, green as well.

@bors r=varkor

@bors

This comment has been minimized.

Copy link
Contributor

commented Aug 12, 2019

📌 Commit b122be4 has been approved by varkor

@RalfJung

This comment has been minimized.

Copy link
Member Author

commented Aug 12, 2019

@bors p=-1 rollup=never

but let's wait till after beta cutoff

@RalfJung

This comment has been minimized.

Copy link
Member Author

commented Aug 14, 2019

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

Rollup merge of rust-lang#63306 - RalfJung:retag, r=varkor
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

Auto merge of #63583 - Centril:rollup-5s17x9k, r=Centril
Rollup of 8 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)
 - #63470 (Utilize -Zbinary-dep-depinfo in rustbuild)
 - #63491 (Update RLS)
 - #63559 (rustc_codegen_utils: account for 1-indexed anonymous lifetimes in v0 mangling.)
 - #63572 (remove unused Level::PhaseFatal)
 - #63577 (Test HRTB issue accepted by compiler)

Failed merges:

r? @ghost
@Centril

This comment has been minimized.

Copy link
Member

commented Aug 15, 2019

Failed in #63583 (comment), @bors r-

@RalfJung

This comment has been minimized.

Copy link
Member Author

commented Aug 15, 2019

Hm, that "actual" MIR contains no unwinding. Might this be a platform that doesn't support unwinding, which would change MIR generation?

@Centril

This comment has been minimized.

Copy link
Member

commented Aug 15, 2019

cc @matthewjasper ^---

@RalfJung RalfJung force-pushed the RalfJung:retag branch from b122be4 to 2122fe4 Aug 15, 2019

@RalfJung

This comment has been minimized.

Copy link
Member Author

commented Aug 15, 2019

Ah, I found another test with a comment like

// ignore-wasm32-bare compiled with panic=abort by default

I added that here, too. I hope that does it.

@bors r=varkor

@bors

This comment has been minimized.

Copy link
Contributor

commented Aug 15, 2019

📌 Commit 2122fe4 has been approved by varkor

Centril added a commit to Centril/rust that referenced this pull request Aug 15, 2019

Rollup merge of rust-lang#63306 - RalfJung:retag, r=varkor
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

Auto merge of #63592 - Centril:rollup-7c6dg3e, r=Centril
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

@bors bors merged commit 2122fe4 into rust-lang:master Aug 15, 2019

4 checks passed

pr Build #20190815.24 succeeded
Details
pr (Linux mingw-check) Linux mingw-check succeeded
Details
pr (Linux x86_64-gnu-llvm-6.0) Linux x86_64-gnu-llvm-6.0 succeeded
Details
pr (LinuxTools) LinuxTools succeeded
Details

@RalfJung RalfJung deleted the RalfJung:retag branch Aug 15, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants
You can’t perform that action at this time.