diff options
| author | bors <bors@rust-lang.org> | 2022-10-14 22:56:53 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-10-14 22:56:53 +0000 |
| commit | 8147e6e427a1b3c4aedcd9fd85bd457888f80972 (patch) | |
| tree | a52cac2a5c92bedd81aff8169141a4ef382bdabd /library/std/src/sys | |
| parent | bf15a9e5263fcea065a7ae9c179b2d24c2deb670 (diff) | |
| parent | a96f1a8a1eef38f024d6fcff932f55a2a760a395 (diff) | |
| download | rust-8147e6e427a1b3c4aedcd9fd85bd457888f80972.tar.gz rust-8147e6e427a1b3c4aedcd9fd85bd457888f80972.zip | |
Auto merge of #103069 - matthiaskrgr:rollup-xxsx6sk, r=matthiaskrgr
Rollup of 9 pull requests
Successful merges:
- #102092 (refactor: use grep -E/-F instead of fgrep/egrep)
- #102781 (Improved documentation for `std::io::Error`)
- #103017 (Avoid dropping TLS Key on sgx)
- #103039 (checktools: fix comments)
- #103045 (Remove leading newlines from integer primitive doc examples)
- #103047 (Update browser-ui-test version to fix some flaky tests)
- #103054 (Clean up rust-logo rustdoc GUI test)
- #103059 (Fix `Duration::{try_,}from_secs_f{32,64}(-0.0)`)
- #103067 (More alphabetical sorting)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src/sys')
| -rw-r--r-- | library/std/src/sys/sgx/abi/tls/mod.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/library/std/src/sys/sgx/abi/tls/mod.rs b/library/std/src/sys/sgx/abi/tls/mod.rs index 13d96e9a633..09c4ab3d3e9 100644 --- a/library/std/src/sys/sgx/abi/tls/mod.rs +++ b/library/std/src/sys/sgx/abi/tls/mod.rs @@ -111,6 +111,7 @@ impl Tls { rtabort!("TLS limit exceeded") }; TLS_DESTRUCTOR[index].store(dtor.map_or(0, |f| f as usize), Ordering::Relaxed); + unsafe { Self::current() }.data[index].set(ptr::null_mut()); Key::from_index(index) } |
