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: replace canonical_alloc_id mechanism by extern_static_alloc_id #74775

Merged
merged 5 commits into from
Jul 27, 2020

Conversation

RalfJung
Copy link
Member

@RalfJung RalfJung commented Jul 26, 2020

We only have to call extern_static_alloc_id when a Pointer is "imported" from the tcx to the machine, not on each access. Also drop the old hook for TLS handling, it is not needed any more.

The Miri side of this is at rust-lang/miri#1489.

Fixes #71194
r? @oli-obk

@oli-obk
Copy link
Contributor

oli-obk commented Jul 26, 2020

This side lgtm. I think the miri side should work before r+ing this side though, so we don't produce a broken miri that needs a rustc fix to work.

@RalfJung
Copy link
Member Author

The Miri side is up at rust-lang/miri#1489. No further rustc changes were required, but I decided to also perform a rename that I had suggested in #71194. @oli-obk does that rename seem sensible?

@oli-obk
Copy link
Contributor

oli-obk commented Jul 27, 2020

Jup, both sides and the rename are good with me

@bors r+

@bors
Copy link
Contributor

bors commented Jul 27, 2020

📌 Commit b8fd0f6 has been approved by oli-obk

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jul 27, 2020
@bors
Copy link
Contributor

bors commented Jul 27, 2020

⌛ Testing commit b8fd0f6 with merge 4a90e36...

@bors
Copy link
Contributor

bors commented Jul 27, 2020

☀️ Test successful - checks-actions, checks-azure
Approved by: oli-obk
Pushing 4a90e36 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 27, 2020
@bors bors merged commit 4a90e36 into rust-lang:master Jul 27, 2020
bors added a commit to rust-lang/miri that referenced this pull request Jul 27, 2020
Adjust for new rustc alloc ID handling and deallocate thread-local statics

Miri side of rust-lang/rust#74775.

Fixes #1369
Fixes #1488
@RalfJung RalfJung deleted the miri-alloc-ids branch July 28, 2020 06:59
@cuviper cuviper added this to the 1.47.0 milestone May 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.

Miri: refactor handling of "uncanonical" AllocIds
4 participants