std: Don't assume thread::current() works on panic #24478
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
r? @pcwalton (rust_highfive has picked a reviewer for you, use r? to override) |
|
r? @aturon |
| @@ -18,7 +18,6 @@ use cell::UnsafeCell; | |||
|
|
|||
| // Sure wish we had macro hygiene, no? | |||
| #[doc(hidden)] | |||
| #[unstable(feature = "thread_local_internals")] | |||
There was a problem hiding this comment.
Were these accidentally stripped?
There was a problem hiding this comment.
The module at the top-level has an #[unstable] attribute which everything inside inherits from by default. (it was intentional)
|
I've opened #24479 about panicking destructors in TLS aborting the process, which I believe is a separable issue. |
|
@bors: r+ |
|
📌 Commit 3d04a33 has been approved by |
|
⌛ Testing commit 3d04a33 with merge 240ff7b... |
|
💔 Test failed - auto-win-32-nopt-t |
Don't need so much manual #[doc(hidden)] and #[unstable] as much of it is inherited!
alexcrichton
force-pushed
the
issue-24313
branch
from
3d04a33 to
ac7ba99
Compare
Inspecting the current thread's info may not always work due to the TLS value having been destroyed (or is actively being destroyed). The code for printing a panic message assumed, however, that it could acquire the thread's name through this method. Instead this commit propagates the `Option` outwards to allow the `std::panicking` module to handle the case where the current thread isn't present. While it solves the immediate issue of rust-lang#24313, there is still another underlying issue of panicking destructors in thread locals will abort the process. Closes rust-lang#24313
alexcrichton
force-pushed
the
issue-24313
branch
from
ac7ba99 to
d98ab4f
Compare
|
⌛ Testing commit d98ab4f with merge 2b8c9b1... |
bors
added a commit
that referenced
this pull request
Apr 28, 2015
Inspecting the current thread's info may not always work due to the TLS value having been destroyed (or is actively being destroyed). The code for printing a panic message assumed, however, that it could acquire the thread's name through this method. Instead this commit propagates the `Option` outwards to allow the `std::panicking` module to handle the case where the current thread isn't present. While it solves the immediate issue of #24313, there is still another underlying issue of panicking destructors in thread locals will abort the process. Closes #24313
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Inspecting the current thread's info may not always work due to the TLS value
having been destroyed (or is actively being destroyed). The code for printing
a panic message assumed, however, that it could acquire the thread's name
through this method.
Instead this commit propagates the
Optionoutwards to allow thestd::panickingmodule to handle the case where the current thread isn'tpresent.
While it solves the immediate issue of #24313, there is still another underlying
issue of panicking destructors in thread locals will abort the process.
Closes #24313