< prev index next >

src/hotspot/share/code/nmethod.hpp

Print this page
@@ -234,19 +234,18 @@
    // whether to restart collecting RTM locking abort statistic again.
    RTMState _rtm_state;
  #endif
  
    // These are used for compiled synchronized native methods to
-   // locate the owner and stack slot for the BasicLock. They are
+   // locate the owner for the lock. They are
    // needed because there is no debug information for compiled native
    // wrappers and the oop maps are insufficient to allow
    // frame::retrieve_receiver() to work. Currently they are expected
    // to be byte offsets from the Java stack pointer for maximum code
    // sharing between platforms. JVMTI's GetLocalInstance() uses these
    // offsets to find the receiver for non-static native wrapper frames.
    ByteSize _native_receiver_sp_offset;
-   ByteSize _native_basic_lock_sp_offset;
  
    CompLevel _comp_level;               // compilation level
  
    // Local state used to keep track of whether unloading is happening or not
    volatile uint8_t _is_unloading_state;

@@ -267,11 +266,10 @@
            int compile_id,
            CodeOffsets* offsets,
            CodeBuffer *code_buffer,
            int frame_size,
            ByteSize basic_lock_owner_sp_offset, /* synchronized natives only */
-           ByteSize basic_lock_sp_offset,       /* synchronized natives only */
            OopMapSet* oop_maps);
  
    // Creation support
    nmethod(Method* method,
            CompilerType type,

@@ -347,22 +345,20 @@
  
    // Only used for unit tests.
    nmethod()
      : CompiledMethod(),
        _native_receiver_sp_offset(in_ByteSize(-1)),
-       _native_basic_lock_sp_offset(in_ByteSize(-1)),
        _is_unloading_state(0) {}
  
  
    static nmethod* new_native_nmethod(const methodHandle& method,
                                       int compile_id,
                                       CodeBuffer *code_buffer,
                                       int vep_offset,
                                       int frame_complete,
                                       int frame_size,
                                       ByteSize receiver_sp_offset,
-                                      ByteSize basic_lock_sp_offset,
                                       OopMapSet* oop_maps,
                                       int exception_handler = -1);
  
    // type info
    bool is_nmethod() const                         { return true; }

@@ -685,13 +681,10 @@
  
    // JVMTI's GetLocalInstance() support
    ByteSize native_receiver_sp_offset() {
      return _native_receiver_sp_offset;
    }
-   ByteSize native_basic_lock_sp_offset() {
-     return _native_basic_lock_sp_offset;
-   }
  
    // support for code generation
    static int verified_entry_point_offset()        { return offset_of(nmethod, _verified_entry_point); }
    static int osr_entry_point_offset()             { return offset_of(nmethod, _osr_entry_point); }
    static int state_offset()                       { return offset_of(nmethod, _state); }
< prev index next >