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

Miri: let machine canonicalize AllocIDs #69408

Merged
merged 3 commits into from
Mar 2, 2020
Merged

Miri: let machine canonicalize AllocIDs #69408

merged 3 commits into from
Mar 2, 2020

Conversation

RalfJung
Copy link
Member

@RalfJung RalfJung commented Feb 23, 2020 •
edited
Loading

This implements the rustc side of the plan I laid out here.

Miri PR: rust-lang/miri#1190

@rust-highfive
Copy link
Collaborator

r? @ecstatic-morse

(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 Feb 23, 2020
@RalfJung RalfJung mentioned this pull request Feb 23, 2020
Merged
@RalfJung
Copy link
Member Author

r? @oli-obk

@RalfJung RalfJung changed the title Canonical AllocID Miri: let machine canonicalize AllocIDs Feb 23, 2020
@RalfJung RalfJung mentioned this pull request Feb 24, 2020
Closed
@oli-obk
Copy link
Contributor

oli-obk commented Feb 26, 2020

@bors r+

oh the potential. This may make my mmap stuff really feasible

@bors
Copy link
Contributor

bors commented Feb 26, 2020

📌 Commit 9b62d60 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 Feb 26, 2020
@RalfJung
Copy link
Member Author

This may make my mmap stuff really feasible

You are making me regret having written this. ;)

Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Feb 28, 2020
@Dylan-DPC
Rollup merge of rust-lang#69408 - RalfJung:canonical-alloc-id, r=oli-obk
04f5aae 
Miri: let machine canonicalize AllocIDs

This implements the rustc side of the plan I laid out [here](rust-lang/miri#1147 (comment)).

Miri PR: rust-lang/miri#1190
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Feb 28, 2020
Closed
@bors
Copy link
Contributor

bors commented Mar 1, 2020

⌛ Testing commit 9b62d60 with merge 1cf090e...

@bors
Copy link
Contributor

bors commented Mar 2, 2020

☀️ Test successful - checks-azure
Approved by: oli-obk
Pushing 1cf090e to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 2, 2020
@bors bors merged commit 1cf090e into rust-lang:master Mar 2, 2020
@bors bors mentioned this pull request Mar 2, 2020
Closed
@RalfJung RalfJung deleted the canonical-alloc-id branch March 2, 2020 07:54
bors added a commit to rust-lang/miri that referenced this pull request Mar 2, 2020
@bors
Auto merge of #1190 - RalfJung:canonical-alloc-id, r=RalfJung
64bfe81 
Canonical AllocID

This is the Miri side of rust-lang/rust#69408.
This just ports the existing extern statics to the new system; no new shims are added.

Cc @christianpoveda
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@oli-obk oli-obk

Labels
merged-by-bors This PR was explicitly merged by bors. 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 @ecstatic-morse