Fixed a couple of places where ti.next was still being used.

Also fixed a minor issue with an import.
dlang · Dec 12, 2014 · f8e9bfb · f8e9bfb
1 parent c424346
commit f8e9bfb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/src/core/memory.d b/src/core/memory.d
@@ -762,8 +762,4 @@ struct GC
     }
 }
 
-void callStructDtorsDuringGC(bool callThem)
-{
-	static import rt.lifetime;
-	rt.lifetime.callStructDtorsDuringGC = callThem;
-}
+__gshared bool callStructDtorsDuringGC = true;
diff --git a/src/rt/lifetime.d b/src/rt/lifetime.d
@@ -1093,7 +1093,7 @@ extern (C) void* _d_newitemT(TypeInfo ti)
             memset(ptr, 0, size);
 
         if (needsTypeInfo)
-            *cast(TypeInfo*)(ptr + GC.sizeOf(ptr) - size_t.sizeof) = ti.next;
+            *cast(TypeInfo*)(ptr + GC.sizeOf(ptr) - size_t.sizeof) = ti;
 
         return ptr;
     //}
@@ -1136,7 +1136,7 @@ extern (C) void* _d_newitemiT(TypeInfo ti)
             memcpy(ptr, q, isize);
 
         if (needsTypeInfo)
-            *cast(TypeInfo*)(ptr + GC.sizeOf(ptr) - size_t.sizeof) = ti.next;
+            *cast(TypeInfo*)(ptr + GC.sizeOf(ptr) - size_t.sizeof) = ti;
         return ptr;
     //}
 }
@@ -1279,8 +1279,6 @@ extern (C) int rt_hasFinalizerInSegment(void* p, in void[] segment) nothrow
     return false;
 }
 
-__gshared bool callStructDtorsDuringGC = true;
-
 extern (C) int rt_hasStructFinalizerInSegment(void* p, in void[] segment) nothrow
 {
     if(!p)