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.

Sign up for GitHub

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

Jump to bottom

Add Retagging statements #55316

Merged
merged 9 commits into from
Nov 2, 2018
Merged

Add Retagging statements #55316

merged 9 commits into from
Nov 2, 2018

Conversation

RalfJung
Copy link
Member

@RalfJung RalfJung commented Oct 24, 2018 •
edited
Loading

This adds a Retag statement kind to MIR, used to perform the retagging operation from Stacked Borrows. It also kills the old Validate statements that I added last year.

NOTE: This includes #55270. Only these commits are new.

@rust-highfive
Copy link
Collaborator

r? @pnkfelix

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 24, 2018
@RalfJung
Copy link
Member Author

r? @oli-obk

@rust-highfive rust-highfive assigned oli-obk and unassigned pnkfelix Oct 24, 2018
@rust-highfive

This comment has been minimized.

Sign in to view
oli-obk
oli-obk reviewed Oct 24, 2018
View reviewed changes
src/bootstrap/bin/rustc.rs Show resolved Hide resolved
src/librustc/mir/mod.rs Outdated Show resolved Hide resolved
src/librustc_mir/transform/add_retag.rs Outdated Show resolved Hide resolved
src/librustc_mir/transform/add_retag.rs Show resolved Hide resolved
src/librustc_mir/transform/add_retag.rs Show resolved Hide resolved
src/librustc_mir/transform/add_retag.rs Outdated Show resolved Hide resolved
src/librustc_mir/transform/add_retag.rs Show resolved Hide resolved
src/librustc_mir/transform/inline.rs Show resolved Hide resolved
@RalfJung
Copy link
Member Author

Fixed all your comments.

@oli-obk
Copy link
Contributor

oli-obk commented Oct 25, 2018

r=me once the other PR is merged

@bors
Copy link
Contributor

bors commented Oct 25, 2018

☔ The latest upstream changes (presumably #55347) made this pull request unmergeable. Please resolve the merge conflicts.

@RalfJung
Copy link
Member Author

@oli-obk I pushed a small API change to make create_ref easier to use outside of step.rs.

As for the conflicts, I will have to rebase the PR this is based on first.

@bors
Copy link
Contributor

bors commented Oct 26, 2018

☔ The latest upstream changes (presumably #53821) made this pull request unmergeable. Please resolve the merge conflicts.

@RalfJung
Copy link
Member Author

@oli-obk Rebased. The last commit (3545dae) has been added after your r=me so I am going to wait for an r+ from you.

@oli-obk
Copy link
Contributor

oli-obk commented Oct 29, 2018

@bors r+

@bors
Copy link
Contributor

bors commented Oct 29, 2018

📌 Commit 3545dae has been approved by oli-obk

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 29, 2018
@RalfJung
Copy link
Member Author

I added 2a5eae3, another small API change I'd like to sneak into this if I may.

@oli-obk
Copy link
Contributor

oli-obk commented Oct 29, 2018

@bors r+

@bors
Copy link
Contributor

bors commented Oct 29, 2018

📌 Commit 2a5eae3 has been approved by oli-obk

@RalfJung
Copy link
Member Author

Forgot about changing the third memory-access hook method. Sorry for the noise :(

@oli-obk
Copy link
Contributor

oli-obk commented Oct 29, 2018

@bors r+

@bors
Copy link
Contributor

bors commented Oct 29, 2018

📌 Commit d10304e has been approved by oli-obk

This was referenced Oct 31, 2018
Merged
Closed
Merged
@bors
Copy link
Contributor

bors commented Nov 2, 2018

⌛ Testing commit d10304e with merge 87a3c1e...

bors added a commit that referenced this pull request Nov 2, 2018
@bors
Auto merge of #55316 - RalfJung:retagging, r=oli-obk
87a3c1e 
Add Retagging statements

This adds a `Retag` statement kind to MIR, used to perform the retagging operation from [Stacked Borrows](https://www.ralfj.de/blog/2018/08/07/stacked-borrows.html). It also kills the old `Validate` statements that I added last year.

NOTE: This includes #55270. Only [these commits are new](RalfJung/rust@stacked-borrows-ng...RalfJung:retagging).
@bors
Copy link
Contributor

bors commented Nov 2, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: oli-obk
Pushing 87a3c1e to master...

@bors bors merged commit d10304e into rust-lang:master Nov 2, 2018
This was referenced Nov 2, 2018
Merged
Closed
Merged
Closed
bors added a commit that referenced this pull request Nov 2, 2018
@bors
Auto merge of #55549 - RalfJung:miri-visitor, r=<try>
5f8bd0a 
Value visitors for miri

Generalize the traversal part of validation to a `ValueVisitor`.

~~This includes #55316, [click here](RalfJung/rust@retagging...RalfJung:miri-visitor) for just the new commits.~~

This PR does not change the interface to miri, so I use the opportunity to update miri.
bors added a commit that referenced this pull request Nov 7, 2018
@bors
Auto merge of #55549 - RalfJung:miri-visitor, r=oli-obk
8315b11 
Value visitors for miri

Generalize the traversal part of validation to a `ValueVisitor`.

~~This includes #55316, [click here](RalfJung/rust@retagging...RalfJung:miri-visitor) for just the new commits.~~
@RalfJung RalfJung deleted the retagging branch November 9, 2018 15:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@oli-obk oli-obk oli-obk left review comments

Assignees

@oli-obk oli-obk

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@RalfJung @rust-highfive @oli-obk @bors @pnkfelix