From 38041e300a511dd98c929e2098ce45e6842bb62a Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Tue, 1 Aug 2006 04:32:09 +0000
Subject: [PATCH] revert allocation fast paths, to check whether it affects
 builds on various machines

svn: r3914
---
 src/mzscheme/gc2/newgc.c | 7 ++++---
 src/mzscheme/src/jit.c   | 2 +-
 src/mzscheme/src/list.c  | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/mzscheme/gc2/newgc.c b/src/mzscheme/gc2/newgc.c
index b79d9000f7..d93252fa3b 100644
--- a/src/mzscheme/gc2/newgc.c
+++ b/src/mzscheme/gc2/newgc.c
@@ -493,6 +493,8 @@ void *GC_malloc_one_small_tagged(size_t sizeb)
 {
   unsigned long newsize;
 
+  return GC_malloc_one_tagged(sizeb);
+
   sizeb += WORD_SIZE;
   sizeb = ALIGN_BYTES_SIZE(sizeb);
   newsize = gen0_alloc_page->size + sizeb;
@@ -537,9 +539,8 @@ void *GC_malloc_pair(void *car, void *cdr)
     retval = PTR(NUM(gen0_alloc_page) + gen0_alloc_page->size);
     info = (struct objhead *)retval;
 
-    ((void **)retval)[0] = 0;
-    ((void **)retval)[1] = 0;
-    bzero(retval, sizeb); /* <-- */
+    ((void **)retval)[0] = NULL; /* objhead */
+    ((void **)retval)[1] = 0;    /* tag word */
 
     /* info->type = type; */ /* We know that the type field is already 0 */
     info->size = (sizeb >> gcLOG_WORD_SIZE);
diff --git a/src/mzscheme/src/jit.c b/src/mzscheme/src/jit.c
index 80f289692a..b973fd4c0a 100644
--- a/src/mzscheme/src/jit.c
+++ b/src/mzscheme/src/jit.c
@@ -2900,7 +2900,7 @@ static int generate_inlined_binary(mz_jit_state *jitter, Scheme_App3_Rec *app, i
       mz_prepare(2);
       jit_pusharg_p(JIT_R1);
       jit_pusharg_p(JIT_R0);
-#ifdef MZ_PRECISE_GC
+#ifdef __MZ_PRECISE_GC
       (void)mz_finish(GC_malloc_pair);
 #else
       (void)mz_finish(scheme_make_pair);
diff --git a/src/mzscheme/src/list.c b/src/mzscheme/src/list.c
index 1c5a9f3dd7..c484b123b2 100644
--- a/src/mzscheme/src/list.c
+++ b/src/mzscheme/src/list.c
@@ -528,7 +528,7 @@ scheme_init_list (Scheme_Env *env)
 
 Scheme_Object *scheme_make_pair(Scheme_Object *car, Scheme_Object *cdr)
 {
-#ifndef MZ_PRECISE_GC
+#ifndef __MZ_PRECISE_GC
   Scheme_Object *cons;
 #endif
 
@@ -541,7 +541,7 @@ Scheme_Object *scheme_make_pair(Scheme_Object *car, Scheme_Object *cdr)
     *(long *)0x0 = 1;
 #endif
 
-#ifdef MZ_PRECISE_GC
+#ifdef __MZ_PRECISE_GC
   return GC_malloc_pair(car, cdr);
 #else
   cons = scheme_alloc_object();