From d9e18ada39b52518c70df7801be564e58f4e8a66 Mon Sep 17 00:00:00 2001
From: Vytautas Astrauskas <astrauv@amazon.com>
Date: Sun, 26 Apr 2020 20:50:58 -0700
Subject: [PATCH] Make sure to remove thread local data only if we have
 destructor.

---
 src/shims/tls.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/shims/tls.rs b/src/shims/tls.rs
index 54850de82c8..7d4aae36708 100644
--- a/src/shims/tls.rs
+++ b/src/shims/tls.rs
@@ -181,8 +181,8 @@ impl<'tcx> TlsData<'tcx> {
         {
             match data.entry(thread_id) {
                 Entry::Occupied(entry) => {
-                    let data_scalar = entry.remove();
                     if let Some(dtor) = dtor {
+                        let data_scalar = entry.remove();
                         let ret = Some((*dtor, data_scalar, key));
                         return ret;
                     }