Bugfix: keep TLS data in sync

raoulstrackx · Yiming Lei · commit a8b4228bc04d · 2022-10-21T14:06:33.000-07:00
diff --git 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)
     }
 

Original file line number	Diff line number	Diff line change
`@@ -111,6 +111,7 @@ impl Tls {`
`111`	`111`	`rtabort!("TLS limit exceeded")`
`112`	`112`	`};`
`113`	`113`	`TLS_DESTRUCTOR[index].store(dtor.map_or(0, \|f\| f as usize), Ordering::Relaxed);`
	`114`	`+ unsafe { Self::current() }.data[index].set(ptr::null_mut());`
`114`	`115`	`Key::from_index(index)`
`115`	`116`	`}`
`116`	`117`