From 8dc386e1027f5620e6525bbd920f95ec25514387 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Sat, 14 Jan 2017 00:23:44 +0100
Subject: [PATCH] Always use same-type pointers when subtracting them

---
 src/gc/impl/conservative/gc.d | 16 ++++++++--------
 src/gc/pooltable.d            |  6 +++---
 src/rt/lifetime.d             |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/gc/impl/conservative/gc.d b/src/gc/impl/conservative/gc.d
index a1f894dbc1..d0b969106f 100644
--- a/src/gc/impl/conservative/gc.d
+++ b/src/gc/impl/conservative/gc.d
@@ -1974,7 +1974,7 @@ struct Gcx
         //printf("marking range: [%p..%p] (%#zx)\n", p1, p2, cast(size_t)p2 - cast(size_t)p1);
     Lnext: for (; p1 < p2; p1++)
         {
-            auto p = cast(byte *)(*p1);
+            auto p = *p1;
 
             //if (log) debug(PRINTF) printf("\tmark %p\n", p);
             if (p >= minAddr && p < maxAddr)
@@ -2124,7 +2124,7 @@ struct Gcx
             {
                 pool = list.pool;
                 assert(pool);
-                pool.freebits.set(cast(size_t)(cast(byte*)list - pool.baseAddr) / 16);
+                pool.freebits.set(cast(size_t)(cast(void*)list - pool.baseAddr) / 16);
             }
         }
 
@@ -2190,7 +2190,7 @@ struct Gcx
 
                     if (!pool.mark.test(biti))
                     {
-                        byte *p = pool.baseAddr + pn * PAGESIZE;
+                        void *p = pool.baseAddr + pn * PAGESIZE;
                         void* q = sentinel_add(p);
                         sentinel_Invariant(q);
 
@@ -2242,8 +2242,8 @@ struct Gcx
                     if (bin < B_PAGE)
                     {
                         immutable size = binsize[bin];
-                        byte *p = pool.baseAddr + pn * PAGESIZE;
-                        byte *ptop = p + PAGESIZE;
+                        void *p = pool.baseAddr + pn * PAGESIZE;
+                        void *ptop = p + PAGESIZE;
                         immutable base = pn * (PAGESIZE/16);
                         immutable bitstride = size / 16;
 
@@ -2318,7 +2318,7 @@ struct Gcx
                     size_t bitstride = size / 16;
                     size_t bitbase = pn * (PAGESIZE / 16);
                     size_t bittop = bitbase + (PAGESIZE / 16);
-                    byte*  p;
+                    void*  p;
 
                     biti = bitbase;
                     for (biti = bitbase; biti < bittop; biti += bitstride)
@@ -2599,8 +2599,8 @@ struct Gcx
 
 struct Pool
 {
-    byte* baseAddr;
-    byte* topAddr;
+    void* baseAddr;
+    void* topAddr;
     GCBits mark;        // entries already scanned, or should not be scanned
     GCBits freebits;    // entries that are on the free list
     GCBits finals;      // entries that need finalizer run on them
diff --git a/src/gc/pooltable.d b/src/gc/pooltable.d
index da2796dc98..75cf7a8fcd 100644
--- a/src/gc/pooltable.d
+++ b/src/gc/pooltable.d
@@ -155,13 +155,13 @@ nothrow:
         assert(_maxAddr == pools[npools - 1].topAddr);
     }
 
-    @property const(byte)* minAddr() pure const { return _minAddr; }
-    @property const(byte)* maxAddr() pure const { return _maxAddr; }
+    @property const(void)* minAddr() pure const { return _minAddr; }
+    @property const(void)* maxAddr() pure const { return _maxAddr; }
 
 package:
     Pool** pools;
     size_t npools;
-    byte* _minAddr, _maxAddr;
+    void* _minAddr, _maxAddr;
 }
 
 unittest
diff --git a/src/rt/lifetime.d b/src/rt/lifetime.d
index 87f0e8dab8..03df8d31a4 100644
--- a/src/rt/lifetime.d
+++ b/src/rt/lifetime.d
@@ -1908,7 +1908,7 @@ byte[] _d_arrayappendcTX(const TypeInfo ti, ref byte[] px, size_t n)
     size_t newcap = void; // for scratch space
 
     // calculate the extent of the array given the base.
-    size_t offset = px.ptr - __arrayStart(info);
+    size_t offset = cast(void*)px.ptr - __arrayStart(info);
     if(info.base && (info.attr & BlkAttr.APPENDABLE))
     {
         if(info.size >= PAGESIZE)