--- a/hotspot/src/share/vm/runtime/frame.hpp	Fri Apr 11 09:56:35 2008 -0400
+++ b/hotspot/src/share/vm/runtime/frame.hpp	Sun Apr 13 17:43:42 2008 -0400
@@ -250,7 +250,7 @@
   oop interpreter_callee_receiver(symbolHandle signature)     { return *interpreter_callee_receiver_addr(signature); }
 
 
-  oop *interpreter_callee_receiver_addr(symbolHandle signature);
+  oop* interpreter_callee_receiver_addr(symbolHandle signature);
 
 
   // expression stack (may go up or down, direction == 1 or -1)
@@ -402,19 +402,25 @@
 # ifdef ENABLE_ZAP_DEAD_LOCALS
  private:
   class CheckValueClosure: public OopClosure {
-  public: void do_oop(oop* p);
+   public:
+    void do_oop(oop* p);
+    void do_oop(narrowOop* p) { ShouldNotReachHere(); }
   };
   static CheckValueClosure _check_value;
 
   class CheckOopClosure: public OopClosure {
-  public: void do_oop(oop* p);
+   public:
+    void do_oop(oop* p);
+    void do_oop(narrowOop* p) { ShouldNotReachHere(); }
   };
   static CheckOopClosure _check_oop;
 
   static void check_derived_oop(oop* base, oop* derived);
 
   class ZapDeadClosure: public OopClosure {
-  public: void do_oop(oop* p);
+   public:
+    void do_oop(oop* p);
+    void do_oop(narrowOop* p) { ShouldNotReachHere(); }
   };
   static ZapDeadClosure _zap_dead;