Skip to content

Commit d47b755

Browse files
authored
Rollup merge of rust-lang#103017 - fortanix:raoul/sgx_tls_fix, r=ChrisDenton
Avoid dropping TLS Key on sgx rust-lang#102655 reenabled dropping thread local `Key` on every platform ([library/std/src/sys_common/thread_local_key.rs](rust-lang-ci@fa0ca78#diff-5cb9acf9e243f35c975fa9fbac4885519dc104626bc03610dfa7a20bc79641ceL237-R215)). That's causing problems at least for sgx. cc: `@jethrogb` `@ChrisDenton`
2 parents fbb0c31 + c46185b commit d47b755

File tree

1 file changed

+1
-0
lines changed
  • library/std/src/sys/sgx/abi/tls

1 file changed

+1
-0
lines changed

library/std/src/sys/sgx/abi/tls/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ impl Tls {
111111
rtabort!("TLS limit exceeded")
112112
};
113113
TLS_DESTRUCTOR[index].store(dtor.map_or(0, |f| f as usize), Ordering::Relaxed);
114+
unsafe { Self::current() }.data[index].set(ptr::null_mut());
114115
Key::from_index(index)
115116
}
116117

0 commit comments

Comments
 (0)