gc: fix LOGGING

rainers · rainers · commit 05ee0b0faea3 · 2019-01-01T16:33:34.000+01:00
diff --git a/src/gc/impl/conservative/gc.d b/src/gc/impl/conservative/gc.d
@@ -156,7 +156,7 @@ debug (LOGGING)
 
         void print() nothrow
         {
-            printf("    p = %p, size = %zd, parent = %p ", p, size, parent);
+            printf("    p = %p, size = %lld, parent = %p ", p, cast(ulong)size, parent);
             if (file)
             {
                 printf("%s(%u)", file, line);
@@ -232,7 +232,8 @@ debug (LOGGING)
 
         void copy(LogArray *from) nothrow @nogc
         {
-            reserve(from.dim - dim);
+            if (allocdim < from.dim)
+                reserve(from.dim - dim);
             assert(from.dim <= allocdim);
             memcpy(data, from.data, from.dim * Log.sizeof);
             dim = from.dim;

Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ debug (LOGGING)`
`156`	`156`
`157`	`157`	`void print() nothrow`
`158`	`158`	`{`
`159`		`- printf(" p = %p, size = %zd, parent = %p ", p, size, parent);`
	`159`	`+ printf(" p = %p, size = %lld, parent = %p ", p, cast(ulong)size, parent);`
`160`	`160`	`if (file)`
`161`	`161`	`{`
`162`	`162`	`printf("%s(%u)", file, line);`
`@@ -232,7 +232,8 @@ debug (LOGGING)`
`232`	`232`
`233`	`233`	`void copy(LogArray *from) nothrow @nogc`
`234`	`234`	`{`
`235`		`- reserve(from.dim - dim);`
	`235`	`+ if (allocdim < from.dim)`
	`236`	`+ reserve(from.dim - dim);`
`236`	`237`	`assert(from.dim <= allocdim);`
`237`	`238`	`memcpy(data, from.data, from.dim * Log.sizeof);`
`238`	`239`	`dim = from.dim;`