From 4b2d74f656f455a4014bca637443b7cfbc7442c3 Mon Sep 17 00:00:00 2001
From: Joel Dice <git@seibutsu.mailsnare.net>
Date: Sat, 14 Feb 2009 14:23:23 -0700
Subject: [PATCH] fix merge conflict bug preventing the bootimage code from
 seeing, marking, and fixing jsr addresses

---
 src/compile.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/compile.cpp b/src/compile.cpp
index b18c5acdf8..85da676149 100644
--- a/src/compile.cpp
+++ b/src/compile.cpp
@@ -3111,7 +3111,7 @@ compile(MyThread* t, Frame* initialFrame, unsigned ip,
         frame->storedObject(index);
       }
 
-      frame->pushAddress(frame->machineIp(ip));
+      frame->pushAddress(frame->addressOperand(c->machineIp(ip)));
 
       c->jmp(frame->machineIp(newIp));