Skip to content

Add escape-to-raw MIR statement - #55716

Merged
bors merged 6 commits into
rust-lang:masterfrom
RalfJung:escape-to-raw
Nov 15, 2018
Merged

Add escape-to-raw MIR statement#55716
bors merged 6 commits into
rust-lang:masterfrom
RalfJung:escape-to-raw

Conversation

@RalfJung

@RalfJungRalfJung commented Nov 6, 2018•
edited
Loading

Copy link
Copy Markdown
Member

Add a new MIR "ghost state statement": Escaping a ptr to permit raw accesses.

This includes #55549, click here for just the new commits.

@rust-highfive

rust-highfive commented Nov 6, 2018

Copy link
Copy Markdown
Contributor

r? @nikomatsakis

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

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 6, 2018
@RalfJung

RalfJung commented Nov 6, 2018

Copy link
Copy Markdown
MemberAuthor

r? @oli-obk

I can also add that to the previous PR, but I felt I shouldn't grow that any further.

oli-obk
oli-obk reviewed Nov 6, 2018
View reviewed changes
Comment threadsrc/librustc_mir/transform/add_retag.rs Outdated
@RalfJung

RalfJung commented Nov 6, 2018

Copy link
Copy Markdown
MemberAuthor

I declared array index accesses stable places, and added a test.

@RalfJung

RalfJung commented Nov 6, 2018

Copy link
Copy Markdown
MemberAuthor

Ah, I need to change a bit how I emit EscapeToRaw so that we operate on the original reference before it gets casted, not on the raw ptr after it got casted.

oli-obk
oli-obk requested changes Nov 7, 2018
View reviewed changes
Comment threadsrc/librustc_mir/shim.rs Outdated
Comment threadsrc/librustc_mir/interpret/validity.rs Outdated
@RalfJung

RalfJung commented Nov 7, 2018•
edited
Loading

Copy link
Copy Markdown
MemberAuthor

The base PR landed. I rebased. I take @oli-obk's green checkmark as an "r=me".

@bors r=oli-obk

@bors

bors commented Nov 7, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit b891a81 has been approved by oli-obk

@borsbors 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 Nov 7, 2018
@bors

bors commented Nov 7, 2018

Copy link
Copy Markdown
Collaborator

💡 This pull request was already approved, no need to approve it again.

@bors

bors commented Nov 7, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit b891a81 has been approved by oli-obk

This was referenced Nov 13, 2018
Merged
Merged
@RalfJung

RalfJung commented Nov 14, 2018

Copy link
Copy Markdown
MemberAuthor

@bors p=1

This effectively blocks progress on stacked borrows / miri.

@bors

bors commented Nov 15, 2018

Copy link
Copy Markdown
Collaborator

⌛ Testing commit b891a81 with merge 4ec0ba9...

bors added a commit that referenced this pull request Nov 15, 2018
@bors
Auto merge of#55716- RalfJung:escape-to-raw, r=oli-obk
4ec0ba9
Add escape-to-raw MIR statement
Add a new MIR "ghost state statement": Escaping a ptr to permit raw accesses.
~~This includes #55549, [click here](RalfJung/rust@miri-visitor...RalfJung:escape-to-raw) for just the new commits.~~
@bors

bors commented Nov 15, 2018

Copy link
Copy Markdown
Collaborator

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

@bors
bors merged commit b891a81 into rust-lang:masterNov 15, 2018
@RalfJungRalfJung mentioned this pull request Nov 15, 2018
Merged
emilyalbini added a commit to emilyalbini/rust that referenced this pull request Nov 16, 2018
@emilyalbini
Rollup merge ofrust-lang#55916- RalfJung:mut-visitor, r=oli-obk
eef9507
Make miri value visitor usfeful for mutation
This is based on top of rust-lang#55716, [click here](RalfJung/rust@escape-to-raw...RalfJung:mut-visitor) for just the new commits.
r? @oli-obk
kennytm added a commit to kennytm/rust that referenced this pull request Nov 17, 2018
@kennytm
Rollup merge ofrust-lang#55916- RalfJung:mut-visitor, r=oli-obk
cf221de
Make miri value visitor usfeful for mutation
~~This is based on top of rust-lang#55716, [click here](RalfJung/rust@escape-to-raw...RalfJung:mut-visitor) for just the new commits.~~
r? @oli-obk
emilyalbini added a commit to emilyalbini/rust that referenced this pull request Nov 18, 2018
@emilyalbini
Rollup merge ofrust-lang#55916- RalfJung:mut-visitor, r=oli-obk
c87c31b
Make miri value visitor usfeful for mutation
~~This is based on top of rust-lang#55716, [click here](RalfJung/rust@escape-to-raw...RalfJung:mut-visitor) for just the new commits.~~
r? @oli-obk
@SimonSapinSimonSapin mentioned this pull request Nov 19, 2018
Merged
@RalfJung
RalfJung deleted the escape-to-raw branch November 30, 2018 08:28
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@oli-obkoli-obkoli-obk approved these changes

Assignees

@oli-obkoli-obk

Labels

S-waiting-on-borsStatus: 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@bors@oli-obk@nikomatsakis