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: refactor new allocation tagging #59986

Merged
merged 1 commit into from
Apr 17, 2019
Merged

Conversation

RalfJung
Copy link
Member

Tagging and initializing AllocExtra now go hand-in-hand so one cannot forget to do one when doing the other. In particular, memory.allocate is now much easier to use correctly (because it will already return a tagged pointer).

r? @oli-obk

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 15, 2019
Copy link
Contributor

@oli-obk oli-obk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r=me with nit fixed

src/librustc/mir/interpret/allocation.rs Show resolved Hide resolved
@RalfJung
Copy link
Member Author

(I am still working on the Miri side of this, which is taking longer than expected. That's why I did not r=oli-obk yet.)

@RalfJung
Copy link
Member Author

@bors r=oli-obk

@bors
Copy link
Contributor

bors commented Apr 17, 2019

📌 Commit 19485cc 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 Apr 17, 2019
Centril added a commit to Centril/rust that referenced this pull request Apr 17, 2019
Miri: refactor new allocation tagging

Tagging and initializing `AllocExtra` now go hand-in-hand so one cannot forget to do one when doing the other. In particular, `memory.allocate` is now much easier to use correctly (because it will already return a tagged pointer).

r? @oli-obk
bors added a commit that referenced this pull request Apr 17, 2019
Rollup of 5 pull requests

Successful merges:

 - #59128 (Emit ansi color codes in the `rendered` field of json diagnostics)
 - #59646 (const fn: Improve wording)
 - #59986 (Miri: refactor new allocation tagging)
 - #60003 (LLD is not supported on Darwin)
 - #60018 (Miri now supports entropy, but is still slow)

Failed merges:

r? @ghost
@bors bors merged commit 19485cc into rust-lang:master Apr 17, 2019
@RalfJung RalfJung deleted the miri-new-alloc branch April 18, 2019 09:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants