src/hotspot/share/jvmci/jvmciCompilerToVM.cpp

*** 2115,11 ***
  C2V_VMENTRY_0(jint, arrayBaseOffset, (JNIEnv* env, jobject, jobject kind))
    if (kind == NULL) {
      JVMCI_THROW_0(NullPointerException);
    }
    BasicType type = JVMCIENV->kindToBasicType(JVMCIENV->wrap(kind), JVMCI_CHECK_0);
!   return arrayOopDesc::header_size(type) * HeapWordSize;
  C2V_END
  
  C2V_VMENTRY_0(jint, arrayIndexScale, (JNIEnv* env, jobject, jobject kind))
    if (kind == NULL) {
      JVMCI_THROW_0(NullPointerException);
--- 2115,11 ---
  C2V_VMENTRY_0(jint, arrayBaseOffset, (JNIEnv* env, jobject, jobject kind))
    if (kind == NULL) {
      JVMCI_THROW_0(NullPointerException);
    }
    BasicType type = JVMCIENV->kindToBasicType(JVMCIENV->wrap(kind), JVMCI_CHECK_0);
!   return arrayOopDesc::base_offset_in_bytes(type);
  C2V_END
  
  C2V_VMENTRY_0(jint, arrayIndexScale, (JNIEnv* env, jobject, jobject kind))
    if (kind == NULL) {
      JVMCI_THROW_0(NullPointerException);