src/hotspot/share/prims/jvmtiEnvBase.hpp

*** 358,11 ***
    jint count_locked_objects(JavaThread *java_thread, Handle hobj);
    jvmtiError get_locked_objects_in_frame(JavaThread *calling_thread,
                                     JavaThread* java_thread,
                                     javaVFrame *jvf,
                                     GrowableArray<jvmtiMonitorStackDepthInfo*>* owned_monitors_list,
!                                    jint depth);
   public:
    static javaVFrame* jvf_for_thread_and_depth(JavaThread* java_thread, jint depth);
  
    // get a field descriptor for the specified class and field
    static bool get_field_descriptor(Klass* k, jfieldID field, fieldDescriptor* fd);
--- 358,11 ---
    jint count_locked_objects(JavaThread *java_thread, Handle hobj);
    jvmtiError get_locked_objects_in_frame(JavaThread *calling_thread,
                                     JavaThread* java_thread,
                                     javaVFrame *jvf,
                                     GrowableArray<jvmtiMonitorStackDepthInfo*>* owned_monitors_list,
!                                    jint depth, oop vthread = nullptr);
   public:
    static javaVFrame* jvf_for_thread_and_depth(JavaThread* java_thread, jint depth);
  
    // get a field descriptor for the specified class and field
    static bool get_field_descriptor(Klass* k, jfieldID field, fieldDescriptor* fd);

*** 422,12 ***
                               jvmtiFrameInfo* frame_buffer, jint* count_ptr);
    jvmtiError get_current_contended_monitor(JavaThread* calling_thread, JavaThread* java_thread,
                                             jobject* monitor_ptr, bool is_virtual);
    jvmtiError get_owned_monitors(JavaThread* calling_thread, JavaThread* java_thread,
                                  GrowableArray<jvmtiMonitorStackDepthInfo*> *owned_monitors_list);
!   jvmtiError get_owned_monitors(JavaThread* calling_thread, JavaThread* java_thread, javaVFrame* jvf,
!                                 GrowableArray<jvmtiMonitorStackDepthInfo*> *owned_monitors_list);
    static jvmtiError check_top_frame(Thread* current_thread, JavaThread* java_thread,
                                      jvalue value, TosState tos, Handle* ret_ob_h);
    jvmtiError force_early_return(jthread thread, jvalue value, TosState tos);
  };
  
--- 422,12 ---
                               jvmtiFrameInfo* frame_buffer, jint* count_ptr);
    jvmtiError get_current_contended_monitor(JavaThread* calling_thread, JavaThread* java_thread,
                                             jobject* monitor_ptr, bool is_virtual);
    jvmtiError get_owned_monitors(JavaThread* calling_thread, JavaThread* java_thread,
                                  GrowableArray<jvmtiMonitorStackDepthInfo*> *owned_monitors_list);
!   jvmtiError get_owned_monitors(JavaThread* calling_thread, JavaThread* carrier, javaVFrame* jvf,
!                                 GrowableArray<jvmtiMonitorStackDepthInfo*> *owned_monitors_list, oop vthread);
    static jvmtiError check_top_frame(Thread* current_thread, JavaThread* java_thread,
                                      jvalue value, TosState tos, Handle* ret_ob_h);
    jvmtiError force_early_return(jthread thread, jvalue value, TosState tos);
  };