ensure both kinds of TLS are stored as static roots

Author: max-heller

src/concurrency/thread.rs

@@ -1073,6 +1073,10 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> {
         for ptr in
             this.machine.threads.thread_terminated(this.machine.data_race.as_mut(), current_span)
         {
+            if let Some(alloc) = ptr.provenance.get_alloc_id() {
+                trace!("Main thread thread-local static stored as static root: {:?}", alloc);
+                this.machine.static_roots.push(alloc);
+            }
             this.deallocate_ptr(ptr.into(), None, MiriMemoryKind::Tls.into())?;
         }
         Ok(())

src/shims/tls.rs

@@ -116,7 +116,11 @@ impl<'tcx> TlsData<'tcx> {
                         if let Some(alloc) = (new_data.to_pointer(cx).ok())
                             .and_then(|ptr| ptr.provenance.and_then(|prov| prov.get_alloc_id()))
                         {
-                            trace!("TLS key {} for main thread stored as static root", key);
+                            trace!(
+                                "TLS key {} for main thread stored as static root: {:?}",
+                                key,
+                                alloc,
+                            );
                             static_roots.push(alloc);
                         }
                     }