Merge pull request #947 from klickverbot/run-tls-dtors

Issue 13414 - Static destructors not called correctly with dynamic loading
dlang · Oct 15, 2014 · 73510fd · 73510fd
1 parent aa6667a
commit 73510fd
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/rt/sections_linux.d b/src/rt/sections_linux.d
@@ -520,8 +520,8 @@ void runModuleConstructors(DSO* pdso, bool runTlsCtors)
 
 void runModuleDestructors(DSO* pdso, bool runTlsDtors)
 {
-    pdso._moduleGroup.runTlsDtors();
-    if (runTlsDtors) pdso._moduleGroup.runDtors();
+    if (runTlsDtors) pdso._moduleGroup.runTlsDtors();
+    pdso._moduleGroup.runDtors();
 }
 
 void registerGCRanges(DSO* pdso)