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

Miri: let machine canonicalize AllocIDs #69408

Merged
merged 3 commits into from Mar 2, 2020
Merged

Conversation

@RalfJung
Copy link
Member

RalfJung commented Feb 23, 2020

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

Miri PR: rust-lang/miri#1190

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

rust-highfive commented Feb 23, 2020

r? @ecstatic-morse

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

@RalfJung

This comment has been minimized.

Copy link
Member Author

RalfJung commented Feb 23, 2020

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

This comment has been minimized.

Copy link
Contributor

oli-obk commented Feb 26, 2020

@bors r+

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

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Feb 26, 2020

📌 Commit 9b62d60 has been approved by oli-obk

@RalfJung

This comment has been minimized.

Copy link
Member Author

RalfJung commented Feb 26, 2020

This may make my mmap stuff really feasible

You are making me regret having written this. ;)

Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Feb 28, 2020
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
bors added a commit that referenced this pull request Feb 28, 2020
Rollup of 7 pull requests

Successful merges:

 - #68989 (Update RELEASES.md for 1.42.0)
 - #69148 (Account for bounds and asociated items when denying `_`)
 - #69255 (Add more context to E0599 errors)
 - #69263 (Blacklist powerpc-unknown-linux-{gnu,musl} as having non-ignored GNU C ZSTs.)
 - #69408 (Miri: let machine canonicalize AllocIDs)
 - #69538 (Stabilize `boxed_slice_try_from`)
 - #69539 (late resolve, visit_fn: bail early if there's no body.)

Failed merges:

 - #69260 (Create E0747 error code for unterminated raw strings)

r? @ghost
@bors

This comment has been minimized.

Copy link
Contributor

bors commented Mar 1, 2020

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

@bors

This comment has been minimized.

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 label Mar 2, 2020
@bors bors merged commit 1cf090e into rust-lang:master Mar 2, 2020
5 checks passed
5 checks passed
homu Test successful
Details
pr Build #20200223.48 succeeded
Details
pr (Linux mingw-check) Linux mingw-check succeeded
Details
pr (Linux x86_64-gnu-llvm-7) Linux x86_64-gnu-llvm-7 succeeded
Details
pr (Linux x86_64-gnu-tools) Linux x86_64-gnu-tools succeeded
Details
@bors bors mentioned this pull request Mar 2, 2020
@RalfJung RalfJung deleted the RalfJung:canonical-alloc-id branch Mar 2, 2020
bors added a commit to rust-lang/miri that referenced this pull request Mar 2, 2020
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
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
You can’t perform that action at this time.