src/share/vm/runtime/thread.hpp

rev 1081 : imported patch indy-cleanup-6893081.patch

*** 758,767 ****
--- 758,768 ----
    // code)
    volatile oop     _exception_oop;               // Exception thrown in compiled code
    volatile address _exception_pc;                // PC where exception happened
    volatile address _exception_handler_pc;        // PC for handler of exception
    volatile int     _exception_stack_size;        // Size of frame where exception happened
+   volatile int     _is_method_handle_exception;  // True if the current exception PC is at a MethodHandle call.
  
    // support for compilation
    bool    _is_compiling;                         // is true if a compilation is active inthis thread (one compilation per thread possible)
  
    // support for JNI critical regions
*** 1093,1107 ****
--- 1094,1110 ----
    // Exception handling for compiled methods
    oop      exception_oop() const                 { return _exception_oop; }
    int      exception_stack_size() const          { return _exception_stack_size; }
    address  exception_pc() const                  { return _exception_pc; }
    address  exception_handler_pc() const          { return _exception_handler_pc; }
+   int      is_method_handle_exception() const    { return _is_method_handle_exception; }
  
    void set_exception_oop(oop o)                  { _exception_oop = o; }
    void set_exception_pc(address a)               { _exception_pc = a; }
    void set_exception_handler_pc(address a)       { _exception_handler_pc = a; }
    void set_exception_stack_size(int size)        { _exception_stack_size = size; }
+   void set_is_method_handle_exception(int value) { _is_method_handle_exception = value; }
  
    // Stack overflow support
    inline size_t stack_available(address cur_sp);
    address stack_yellow_zone_base()
      { return (address)(stack_base() - (stack_size() - (stack_red_zone_size() + stack_yellow_zone_size()))); }
*** 1171,1180 ****
--- 1174,1184 ----
    static ByteSize osthread_offset()              { return byte_offset_of(JavaThread, _osthread            ); }
    static ByteSize exception_oop_offset()         { return byte_offset_of(JavaThread, _exception_oop       ); }
    static ByteSize exception_pc_offset()          { return byte_offset_of(JavaThread, _exception_pc        ); }
    static ByteSize exception_handler_pc_offset()  { return byte_offset_of(JavaThread, _exception_handler_pc); }
    static ByteSize exception_stack_size_offset()  { return byte_offset_of(JavaThread, _exception_stack_size); }
+   static ByteSize is_method_handle_exception_offset() { return byte_offset_of(JavaThread, _is_method_handle_exception); }
    static ByteSize stack_guard_state_offset()     { return byte_offset_of(JavaThread, _stack_guard_state   ); }
    static ByteSize suspend_flags_offset()         { return byte_offset_of(JavaThread, _suspend_flags       ); }
  
    static ByteSize do_not_unlock_if_synchronized_offset() { return byte_offset_of(JavaThread, _do_not_unlock_if_synchronized); }