Merge pull request #1857 from Calrama/fixmemleak

Fix leaking main thread held memory merged-on-behalf-of: Sebastian Wilzbach <[email protected]>
dlang · Sep 17, 2017 · 95fd6e1 · 95fd6e1
2 parents c39db9d + c4f0d0d
commit 95fd6e1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/core/thread.d b/src/core/thread.d
@@ -2087,6 +2087,9 @@ extern (C) void thread_init()
  */
 extern (C) void thread_term()
 {
+    destroy(Thread.sm_main);
+    Thread.sm_main = null;
+
     assert(Thread.sm_tbeg && Thread.sm_tlen == 1);
     assert(!Thread.nAboutToStart);
     if (Thread.pAboutToStart) // in case realloc(p, 0) doesn't return null

diff --git a/src/rt/sections_elf_shared.d b/src/rt/sections_elf_shared.d
@@ -460,8 +460,6 @@ extern(C) void _d_dso_registry(CompilerDSOData* data)
         else
         {
             // static DSOs are unloaded in reverse order
-            assert(pdso._tlsSize == _tlsRanges.back.length);
-            _tlsRanges.popBack();
             assert(pdso == _loadedDSOs.back);
             _loadedDSOs.popBack();
         }