Auto merge of #116123 - joboet:rewrite_native_tls, r=m-ou-se
Rewrite native thread-local storage (part of #110897) The current native thread-local storage implementation has become quite messy, uses indescriptive names and unnecessarily adds code to the macro expansion. This PR tries to fix that by using a new implementation that also allows more layout optimizations and potentially increases performance by eliminating unnecessary TLS accesses. This does not change the recursive initialization behaviour I described in [this comment](https://github.com/rust-lang/rust/issues/110897#issuecomment-1525705682), so it should be a library-only change. Changing that behaviour should be quite easy now, however. r? `@m-ou-se` `@rustbot` label +T-libs
This commit is contained in:
commit
9c8a58fdb8
10 changed files with 331 additions and 332 deletions
|
|
@ -1,30 +0,0 @@
|
|||
//@ needs-threads
|
||||
//@ dont-check-compiler-stderr
|
||||
#![feature(cfg_target_thread_local, thread_local_internals)]
|
||||
|
||||
// On platforms *without* `#[thread_local]`, use
|
||||
// a custom non-`Sync` type to fake the same error.
|
||||
#[cfg(not(target_thread_local))]
|
||||
struct Key<T> {
|
||||
_data: std::cell::UnsafeCell<Option<T>>,
|
||||
_flag: std::cell::Cell<()>,
|
||||
}
|
||||
|
||||
#[cfg(not(target_thread_local))]
|
||||
impl<T> Key<T> {
|
||||
const fn new() -> Self {
|
||||
Key {
|
||||
_data: std::cell::UnsafeCell::new(None),
|
||||
_flag: std::cell::Cell::new(()),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(target_thread_local)]
|
||||
use std::thread::local_impl::Key;
|
||||
|
||||
static __KEY: Key<()> = Key::new();
|
||||
//~^ ERROR `UnsafeCell<Option<()>>` cannot be shared between threads
|
||||
//~| ERROR cannot be shared between threads safely [E0277]
|
||||
|
||||
fn main() {}
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
//@ needs-threads
|
||||
#![feature(thread_local)]
|
||||
#![feature(cfg_target_thread_local, thread_local_internals)]
|
||||
|
||||
use std::cell::RefCell;
|
||||
|
||||
type Foo = std::cell::RefCell<String>;
|
||||
|
||||
#[cfg(target_thread_local)]
|
||||
#[thread_local]
|
||||
static __KEY: std::thread::local_impl::Key<Foo> = std::thread::local_impl::Key::new();
|
||||
|
||||
#[cfg(not(target_thread_local))]
|
||||
static __KEY: std::thread::local_impl::Key<Foo> = std::thread::local_impl::Key::new();
|
||||
|
||||
fn __getit(_: Option<&mut Option<RefCell<String>>>) -> std::option::Option<&'static Foo> {
|
||||
__KEY.get(Default::default)
|
||||
//~^ ERROR call to unsafe function `Key::<T>::get` is unsafe
|
||||
}
|
||||
|
||||
static FOO: std::thread::LocalKey<Foo> = std::thread::LocalKey::new(__getit);
|
||||
//~^ ERROR call to unsafe function `LocalKey::<T>::new` is unsafe
|
||||
|
||||
fn main() {
|
||||
FOO.with(|foo| println!("{}", foo.borrow()));
|
||||
std::thread::spawn(|| {
|
||||
FOO.with(|foo| *foo.borrow_mut() += "foo");
|
||||
})
|
||||
.join()
|
||||
.unwrap();
|
||||
FOO.with(|foo| println!("{}", foo.borrow()));
|
||||
}
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
error[E0133]: call to unsafe function `Key::<T>::get` is unsafe and requires unsafe function or block
|
||||
--> $DIR/issue-43733.rs:17:5
|
||||
|
|
||||
LL | __KEY.get(Default::default)
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^ call to unsafe function
|
||||
|
|
||||
= note: consult the function's documentation for information on how to avoid undefined behavior
|
||||
|
||||
error[E0133]: call to unsafe function `LocalKey::<T>::new` is unsafe and requires unsafe function or block
|
||||
--> $DIR/issue-43733.rs:21:42
|
||||
|
|
||||
LL | static FOO: std::thread::LocalKey<Foo> = std::thread::LocalKey::new(__getit);
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ call to unsafe function
|
||||
|
|
||||
= note: consult the function's documentation for information on how to avoid undefined behavior
|
||||
|
||||
error: aborting due to 2 previous errors
|
||||
|
||||
For more information about this error, try `rustc --explain E0133`.
|
||||
Loading…
Add table
Add a link
Reference in a new issue