src/hotspot/share/prims/jvmtiEnvBase.cpp

*** 553,11 ***
    }
    return objArray;
  }
  
  jthreadGroup *
! JvmtiEnvBase::new_jthreadGroupArray(int length, objArrayHandle groups) {
    if (length == 0) {
      return nullptr;
    }
  
    jthreadGroup* objArray = (jthreadGroup *) jvmtiMalloc(sizeof(jthreadGroup) * length);
--- 553,11 ---
    }
    return objArray;
  }
  
  jthreadGroup *
! JvmtiEnvBase::new_jthreadGroupArray(int length, refArrayHandle groups) {
    if (length == 0) {
      return nullptr;
    }
  
    jthreadGroup* objArray = (jthreadGroup *) jvmtiMalloc(sizeof(jthreadGroup) * length);

*** 858,11 ***
    *count_ptr = count;
    return JVMTI_ERROR_NONE;
  }
  
  jvmtiError
! JvmtiEnvBase::get_subgroups(JavaThread* current_thread, Handle group_hdl, jint *count_ptr, objArrayHandle *group_objs_p) {
  
    // This call collects the strong and weak groups
    JavaThread* THREAD = current_thread;
    JvmtiJavaUpcallMark jjum(current_thread); // hide JVMTI events for Java upcall
    JavaValue result(T_OBJECT);
--- 858,11 ---
    *count_ptr = count;
    return JVMTI_ERROR_NONE;
  }
  
  jvmtiError
! JvmtiEnvBase::get_subgroups(JavaThread* current_thread, Handle group_hdl, jint *count_ptr, refArrayHandle *group_objs_p) {
  
    // This call collects the strong and weak groups
    JavaThread* THREAD = current_thread;
    JvmtiJavaUpcallMark jjum(current_thread); // hide JVMTI events for Java upcall
    JavaValue result(T_OBJECT);

*** 881,14 ***
        return JVMTI_ERROR_INTERNAL;
      }
    }
  
    assert(result.get_type() == T_OBJECT, "just checking");
!   objArrayOop groups = (objArrayOop)result.get_oop();
  
    *count_ptr = groups == nullptr ? 0 : groups->length();
!   *group_objs_p = objArrayHandle(current_thread, groups);
  
    return JVMTI_ERROR_NONE;
  }
  
  //
--- 881,14 ---
        return JVMTI_ERROR_INTERNAL;
      }
    }
  
    assert(result.get_type() == T_OBJECT, "just checking");
!   refArrayOop groups = (refArrayOop)result.get_oop();
  
    *count_ptr = groups == nullptr ? 0 : groups->length();
!   *group_objs_p = refArrayHandle(current_thread, groups);
  
    return JVMTI_ERROR_NONE;
  }
  
  //