src/hotspot/share/jvmci/jvmciCompilerToVM.hpp

*** 158,172 ****
    inline void do_array(int begin, int end)  { if (!is_return_type()) _jca->push_oop(next_arg(T_OBJECT)); }
    inline void do_void()                     { }
  };
  
  class JNIHandleMark : public StackObj {
    public:
!     JNIHandleMark() { push_jni_handle_block(); }
!     ~JNIHandleMark() { pop_jni_handle_block(); }
  
    private:
!     static void push_jni_handle_block();
!     static void pop_jni_handle_block();
  };
  
  #endif // SHARE_JVMCI_JVMCICOMPILERTOVM_HPP
--- 158,173 ----
    inline void do_array(int begin, int end)  { if (!is_return_type()) _jca->push_oop(next_arg(T_OBJECT)); }
    inline void do_void()                     { }
  };
  
  class JNIHandleMark : public StackObj {
+   JavaThread* _thread;
    public:
!     JNIHandleMark(JavaThread* thread) : _thread(thread) { push_jni_handle_block(thread); }
!     ~JNIHandleMark() { pop_jni_handle_block(_thread); }
  
    private:
!     static void push_jni_handle_block(JavaThread* thread);
!     static void pop_jni_handle_block(JavaThread* thread);
  };
  
  #endif // SHARE_JVMCI_JVMCICOMPILERTOVM_HPP