*** old/src/share/vm/runtime/frame.hpp	Thu Jul 17 13:48:46 2014
--- new/src/share/vm/runtime/frame.hpp	Thu Jul 17 13:48:44 2014

*** 239,276 ****
--- 239,266 ----
  
    // Interpreter frames:
  
   private:
    intptr_t** interpreter_frame_locals_addr() const;
!   intptr_t*  interpreter_frame_bcx_addr() const;
!   intptr_t*  interpreter_frame_mdx_addr() const;
!   intptr_t*  interpreter_frame_bcp_addr() const;
!   intptr_t*  interpreter_frame_mdp_addr() const;
  
   public:
    // Locals
  
    // The _at version returns a pointer because the address is used for GC.
    intptr_t* interpreter_frame_local_at(int index) const;
  
    void interpreter_frame_set_locals(intptr_t* locs);
  
    // byte code index/pointer (use these functions for unchecked frame access only!)
    intptr_t interpreter_frame_bcx() const                  { return *interpreter_frame_bcx_addr(); }
    void interpreter_frame_set_bcx(intptr_t bcx);
  
    // byte code index
    jint interpreter_frame_bci() const;
    void interpreter_frame_set_bci(jint bci);
  
    // byte code pointer
    address interpreter_frame_bcp() const;
    void    interpreter_frame_set_bcp(address bcp);
  
    // Unchecked access to the method data index/pointer.
    // Only use this if you know what you are doing.
    intptr_t interpreter_frame_mdx() const                  { return *interpreter_frame_mdx_addr(); }
    void interpreter_frame_set_mdx(intptr_t mdx);
  
    // method data pointer
    address interpreter_frame_mdp() const;
    void    interpreter_frame_set_mdp(address dp);
  
    // Find receiver out of caller's (compiled) argument list

*** 435,448 ****
--- 425,434 ----
    void nmethods_do(CodeBlobClosure* cf);
  
    // RedefineClasses support for finding live interpreted methods on the stack
    void metadata_do(void f(Metadata*));
  
    void gc_prologue();
    void gc_epilogue();
    void pd_gc_epilog();
  
  # ifdef ENABLE_ZAP_DEAD_LOCALS
   private:
    class CheckValueClosure: public OopClosure {
     public:
      void do_oop(oop* p);

*** 475,485 ****
--- 461,470 ----
    void zap_dead_deoptimized_locals(JavaThread* thread, const RegisterMap* map);
  # endif
    // Verification
    void verify(const RegisterMap* map);
    static bool verify_return_pc(address x);
    static bool is_bci(intptr_t bcx);
    // Usage:
    // assert(frame::verify_return_pc(return_address), "must be a return pc");
  
    int pd_oop_map_offset_adjustment() const;