Use GC.qalloc rather than GC.malloc + GC.sizeOf.

Also fixed the BlkInfo calculations to account for the sentinal bytes.
dlang · Jan 13, 2015 · 17b9522 · 17b9522
1 parent 381419e
commit 17b9522
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/src/gc/gc.d b/src/gc/gc.d
@@ -1557,7 +1557,7 @@ struct Gcx
                     if (pool.structFinals.nbits && pool.structFinals.test(biti))
                     {
                         if (pool.appendable.nbits && pool.appendable.test(biti) && rt_hasArrayFinalizerInSegment(sentinel_add(p), segment))
-                            rt_finalize_array2(sentinel_add(p), BlkInfo(p, pool.bPageOffsets[pn] * PAGESIZE), true, true);
+                            rt_finalize_array2(sentinel_add(p), BlkInfo(sentinel_add(p), (pool.bPageOffsets[pn] * PAGESIZE) - SENTINEL_EXTRA), true, true);
                         else if (rt_hasStructFinalizerInSegment(sentinel_add(p), segment))
                             rt_finalize_struct(sentinel_add(p), false, true);
                         else
@@ -1617,7 +1617,7 @@ struct Gcx
                         if (pool.structFinals.nbits && pool.structFinals.test(biti))
                         {
                             if (pool.appendable.nbits && pool.appendable.test(biti) && rt_hasArrayFinalizerInSegment(sentinel_add(p), segment))
-                                rt_finalize_array2(sentinel_add(p), BlkInfo(p, size), true, true);
+                                rt_finalize_array2(sentinel_add(p), BlkInfo(sentinel_add(p), size - SENTINEL_EXTRA), true, true);
                             else if (rt_hasStructFinalizerInSegment(sentinel_add(p), segment))
                                 rt_finalize_struct(sentinel_add(p), false, true);
                             else
@@ -2668,7 +2668,7 @@ struct Gcx
                         if (pool.structFinals.nbits && pool.structFinals.testClear(biti))
                         {
                             if (pool.appendable.nbits && pool.appendable.test(biti))
-                                rt_finalize_array2(sentinel_add(p), BlkInfo(p, pool.bPageOffsets[pn] * PAGESIZE), true, true);
+                                rt_finalize_array2(sentinel_add(p), BlkInfo(sentinel_add(p), (pool.bPageOffsets[pn] * PAGESIZE) - SENTINEL_EXTRA), true, true);
                             else
                                 rt_finalize_struct(sentinel_add(p), false, true);
                         }
@@ -2747,7 +2747,7 @@ struct Gcx
                                 if (pool.structFinals.nbits && pool.structFinals.test(biti))
                                 {
                                     if (pool.appendable.nbits && pool.appendable.test(biti))
-                                        rt_finalize_array2(sentinel_add(p), BlkInfo(p, size), true, true);
+                                        rt_finalize_array2(sentinel_add(p), BlkInfo(sentinel_add(p), size - SENTINEL_EXTRA), true, true);
                                     else
                                         rt_finalize_struct(sentinel_add(p), false, true);
                                 }

diff --git a/src/rt/lifetime.d b/src/rt/lifetime.d
@@ -1081,7 +1081,8 @@ extern (C) void* _d_newitemT(TypeInfo ti)
     else
     {*/
         // allocate a block to hold this item
-        auto ptr = GC.malloc(size, baseFlags, ti);
+        auto blkInf = GC.qalloc(size, baseFlags, ti);
+        auto ptr = blkInf.base;
         debug(PRINTF) printf(" p = %p\n", ptr);
         if(size == ubyte.sizeof)
             *cast(ubyte*)ptr = 0;
@@ -1093,7 +1094,7 @@ extern (C) void* _d_newitemT(TypeInfo ti)
             memset(ptr, 0, size);
 
         if (needsTypeInfo)
-            *cast(TypeInfo*)(ptr + GC.sizeOf(ptr) - size_t.sizeof) = ti;
+            *cast(TypeInfo*)(ptr + blkInf.size - size_t.sizeof) = ti;
 
         return ptr;
     //}
@@ -1124,7 +1125,8 @@ extern (C) void* _d_newitemiT(TypeInfo ti)
         auto isize = initializer.length;
         auto q = initializer.ptr;
 
-        auto ptr = GC.malloc(size, baseFlags, ti);
+        auto blkInf = GC.qalloc(size, baseFlags, ti);
+        auto ptr = blkInf.base;
         debug(PRINTF) printf(" p = %p\n", ptr);
         if (isize == 1)
             *cast(ubyte*)ptr =  *cast(ubyte*)q;
@@ -1136,7 +1138,7 @@ extern (C) void* _d_newitemiT(TypeInfo ti)
             memcpy(ptr, q, isize);
 
         if (needsTypeInfo)
-            *cast(TypeInfo*)(ptr + GC.sizeOf(ptr) - size_t.sizeof) = ti;
+            *cast(TypeInfo*)(ptr + blkInf.size - size_t.sizeof) = ti;
         return ptr;
     //}
 }