From 7a373de4cba764f52665c202f6718db0817fe533 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Thu, 20 Aug 2020 06:46:23 -0600
Subject: [PATCH] Chez Scheme: repair `ptr` <-> `void*` conversions for pb on
 32-bit

---
 racket/src/ChezScheme/c/alloc.c | 2 +-
 racket/src/ChezScheme/c/gc.c    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/racket/src/ChezScheme/c/alloc.c b/racket/src/ChezScheme/c/alloc.c
index d91421e7a6..832fa1712d 100644
--- a/racket/src/ChezScheme/c/alloc.c
+++ b/racket/src/ChezScheme/c/alloc.c
@@ -273,7 +273,7 @@ void S_reset_allocation_pointer(tc) ptr tc; {
 }
 
 void S_record_new_dirty_card(ptr *ppp, IGEN to_g) {
-  uptr card = (uptr)ppp >> card_offset_bits;
+  uptr card = (uptr)TO_PTR(ppp) >> card_offset_bits;
 
   dirtycardinfo *ndc = S_G.new_dirty_cards;
   if (ndc != NULL && ndc->card == card) {
diff --git a/racket/src/ChezScheme/c/gc.c b/racket/src/ChezScheme/c/gc.c
index e41050a1be..03e4f4242b 100644
--- a/racket/src/ChezScheme/c/gc.c
+++ b/racket/src/ChezScheme/c/gc.c
@@ -1441,7 +1441,7 @@ ptr GCENTRY(ptr tc, ptr count_roots_ls) {
     nlp = &S_G.next_loc[from_g][s];                     \
     if (*slp == 0) *slp = S_G.first_loc[from_g][s];     \
     pp = TO_VOIDP(*slp);                                \
-    while (pp != (nl = (ptr *)*nlp)) {                  \
+    while (pp != (nl = (ptr *)TO_VOIDP(*nlp))) {        \
       do {                                              \
         if ((p = *pp) == forward_marker)                \
           pp = TO_VOIDP(*(pp + 1));                     \