--- a/ChangeLog	Thu Sep 17 13:18:45 2009 +0200
+++ b/ChangeLog	Fri Sep 25 05:35:49 2009 -0400
@@ -1,3 +1,8 @@
+2009-09-25  Gary Benson  <gbenson@redhat.com>
+
+	* ports/hotspot/src/share/vm/shark/sharkRuntime.cpp:
+	Replaced references to deoptimizer frame with fake stub frame.
+
 2009-09-17  Xerxes Rånby  <xerxes@zafena.se>
 
 	* ports/hotspot/src/share/vm/shark/sharkBuilder.cpp

--- a/ports/hotspot/src/share/vm/shark/sharkRuntime.cpp	Thu Sep 17 13:18:45 2009 +0200
+++ b/ports/hotspot/src/share/vm/shark/sharkRuntime.cpp	Fri Sep 25 05:35:49 2009 -0400
@@ -203,7 +203,7 @@
   // being deopted one frame down on the stack.  Create a dummy frame
   // to mirror this.
   ZeroStack *stack = thread->zero_stack();
-  thread->push_zero_frame(DeoptimizerFrame::build(stack));
+  thread->push_zero_frame(FakeStubFrame::build(stack));
 
   // Initiate the trap
   thread->set_last_Java_frame();
@@ -223,7 +223,7 @@
   }
 
   // Push another dummy frame
-  thread->push_zero_frame(DeoptimizerFrame::build(stack));
+  thread->push_zero_frame(FakeStubFrame::build(stack));
   
   // Fill in the skeleton frames
   thread->set_last_Java_frame();
@@ -241,7 +241,7 @@
 #endif // CC_INTERP
 }
 
-DeoptimizerFrame* DeoptimizerFrame::build(ZeroStack* stack)
+FakeStubFrame* FakeStubFrame::build(ZeroStack* stack)
 {
   if (header_words > stack->available_words()) {
     Unimplemented();
@@ -251,8 +251,8 @@
   intptr_t *fp = stack->sp();
   assert(fp - stack->sp() == next_frame_off, "should be");
 
-  stack->push(DEOPTIMIZER_FRAME);
+  stack->push(FAKE_STUB_FRAME);
   assert(fp - stack->sp() == frame_type_off, "should be");
 
-  return (DeoptimizerFrame *) fp;
+  return (FakeStubFrame *) fp;
 }