replace global per-GC instance pointers

dlang · Jun 27, 2016 · e342ac4 · e342ac4
1 parent c8cba0f
commit e342ac4
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 14 deletions.
diff --git a/src/gc/impl/conservative/gc.d b/src/gc/impl/conservative/gc.d
@@ -249,8 +249,6 @@ debug (LOGGING)
 
 /* ============================ GC =============================== */
 
-__gshared ConservativeGC instance;
-
 class ConservativeGC : GC
 {
     // For passing to debug code (not thread safe)
@@ -286,7 +284,7 @@ class ConservativeGC : GC
 
         auto init = typeid(ConservativeGC).initializer();
         assert(init.length == __traits(classInstanceSize, ConservativeGC));
-        instance = cast(ConservativeGC) memcpy(p, init.ptr, init.length);
+        auto instance = cast(ConservativeGC) memcpy(p, init.ptr, init.length);
         instance.__ctor();
 
         gc = instance;

diff --git a/src/gc/impl/manual/gc.d b/src/gc/impl/manual/gc.d
@@ -35,8 +35,6 @@ import cstdlib = core.stdc.stdlib : calloc, free, malloc, realloc;
 
 extern (C) void onOutOfMemoryError(void* pretend_sideffect = null) @trusted pure nothrow @nogc; /* dmd @@@BUG11461@@@ */
 
-__gshared ManualGC instance;
-
 class ManualGC : GC
 {
     __gshared Array!Root roots;
@@ -55,19 +53,20 @@ class ManualGC : GC
 
         auto init = typeid(ManualGC).initializer();
         assert(init.length == __traits(classInstanceSize, ManualGC));
-        instance = cast(ManualGC) memcpy(p, init.ptr, init.length);
+        auto instance = cast(ManualGC) memcpy(p, init.ptr, init.length);
         instance.__ctor();
 
         gc = instance;
     }
 
-    static void finalize()
+    static void finalize(ref GC gc)
     {
-        if (instance !is null)
-        {
-            instance.Dtor();
-            cstdlib.free(cast(void*) instance);
-        }
+        if (config.gc != "manual")
+            return;
+
+        auto instance = cast(ManualGC) gc;
+        instance.Dtor();
+        cstdlib.free(cast(void*) instance);
     }
 
     this()

diff --git a/src/gc/proxy.d b/src/gc/proxy.d
@@ -67,8 +67,8 @@ extern (C)
 
         thread_term();
 
-        ManualGC.finalize();
-        ConservativeGC.finalize();
+        ManualGC.finalize(initialGC);
+        ConservativeGC.finalize(initialGC);
     }
 
     void gc_enable()