Skip to content

Adjust for new rustc alloc ID handling and deallocate thread-local statics #1489

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

Merged
merged 8 commits into from
Jul 27, 2020

Conversation

RalfJung
Copy link
Member

Miri side of rust-lang/rust#74775.

Fixes #1369
Fixes #1488

bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 27, 2020
 Miri: replace canonical_alloc_id mechanism by extern_static_alloc_id

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 rust-lang#71194
r? @oli-obk
@RalfJung
Copy link
Member Author

@bors r=oli-obk

@bors
Copy link
Contributor

bors commented Jul 27, 2020

📌 Commit cae90b6 has been approved by oli-obk

@bors
Copy link
Contributor

bors commented Jul 27, 2020

⌛ Testing commit cae90b6 with merge 79cd5a8...

@bors
Copy link
Contributor

bors commented Jul 27, 2020

☀️ Test successful - checks-travis, status-appveyor
Approved by: oli-obk
Pushing 79cd5a8 to master...

@bors bors merged commit 79cd5a8 into rust-lang:master Jul 27, 2020
@RalfJung RalfJung deleted the tls-alloc-ids branch July 28, 2020 06:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-blocked-on-rust Status: Blocked on landing a Rust PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

When do thread-local dtors execute relative to thread blocked on "join"? Properly deallocate thread locals
3 participants