From 6dc181fad5f782a319a60b631272f7630e6fd180 Mon Sep 17 00:00:00 2001
From: Joel Dice <git@seibutsu.mailsnare.net>
Date: Thu, 27 Nov 2008 21:58:04 -0700
Subject: [PATCH] move allocation zone from makeCodeImage to writeBootImage so
 it stays in scope until after updateConstants is called

---
 src/bootimage.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/bootimage.cpp b/src/bootimage.cpp
index 99360d6dbe..5bb0fcead3 100644
--- a/src/bootimage.cpp
+++ b/src/bootimage.cpp
@@ -38,12 +38,11 @@ codeMapSize(unsigned codeSize)
 }
 
 object
-makeCodeImage(Thread* t, BootImage* image, uint8_t* code, unsigned capacity)
+makeCodeImage(Thread* t, Zone* zone, BootImage* image, uint8_t* code,
+              unsigned capacity)
 {
   unsigned size = 0;
   t->m->processor->compileThunks(t, image, code, &size, capacity);
-
-  Zone zone(t->m->system, t->m->heap, 64 * 1024);
   
   object constants = 0;
   PROTECT(t, constants);
@@ -66,7 +65,7 @@ makeCodeImage(Thread* t, BootImage* image, uint8_t* code, unsigned capacity)
           object method = arrayBody(t, classMethodTable(t, c), i);
           if (methodCode(t, method)) {
             t->m->processor->compileMethod
-              (t, &zone, code, &size, capacity, &constants, &calls, method);
+              (t, zone, code, &size, capacity, &constants, &calls, method);
           }
         }
       }
@@ -206,6 +205,7 @@ offset(object a, uintptr_t* b)
 void
 writeBootImage(Thread* t, FILE*)
 {
+  Zone zone(t->m->system, t->m->heap, 64 * 1024);
   BootImage image;
 
   const unsigned CodeCapacity = 32 * 1024 * 1024;
@@ -214,7 +214,7 @@ writeBootImage(Thread* t, FILE*)
     (t->m->heap->allocate(codeMapSize(CodeCapacity)));
   memset(codeMap, 0, codeMapSize(CodeCapacity));
 
-  object constants = makeCodeImage(t, &image, code, CodeCapacity);
+  object constants = makeCodeImage(t, &zone, &image, code, CodeCapacity);
 
   const unsigned HeapCapacity = 32 * 1024 * 1024;
   uintptr_t* heap = static_cast<uintptr_t*>