*** old/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp	Fri May 31 08:53:28 2019
--- new/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp	Fri May 31 08:53:27 2019

*** 1111,1121 ****
--- 1111,1129 ----
      JVMCIENV->copy_longs_from(temp_array, array, 0, JVMCICounterSize);
    }
    return (jlongArray) JVMCIENV->get_jobject(array);
  C2V_END
  
! C2V_VMENTRY_0(int, allocateCompileId, (JNIEnv* env, jobject, jobject jvmci_method, int entry_bci))
! C2V_VMENTRY_0(jint, getCountersSize, (JNIEnv* env, jobject))
+   return (jint) JVMCICounterSize;
+ C2V_END
+ 
+ C2V_VMENTRY_0(jboolean, setCountersSize, (JNIEnv* env, jobject, jint new_size))
+   return JavaThread::resize_all_jvmci_counters(new_size);
+ C2V_END
+ 
+ C2V_VMENTRY_0(jint, allocateCompileId, (JNIEnv* env, jobject, jobject jvmci_method, int entry_bci))
    HandleMark hm;
    if (jvmci_method == NULL) {
      JVMCI_THROW_0(NullPointerException);
    }
    Method* method = JVMCIENV->asMethod(jvmci_method);

*** 1613,1623 ****
--- 1621,1631 ----
  
  C2V_VMENTRY(void, flushDebugOutput, (JNIEnv* env, jobject))
    tty->flush();
  C2V_END
  
! C2V_VMENTRY_0(jint, methodDataProfileDataSize, (JNIEnv* env, jobject, jlong metaspace_method_data, jint position))
    MethodData* mdo = JVMCIENV->asMethodData(metaspace_method_data);
    ProfileData* profile_data = mdo->data_at(position);
    if (mdo->is_valid(profile_data)) {
      return profile_data->size_in_bytes();
    }

*** 1719,1729 ****
--- 1727,1737 ----
      InstanceKlass* k = InstanceKlass::cast(klass);
      k->initialize(CHECK);
    }
  C2V_END
  
! C2V_VMENTRY_0(jint, interpreterFrameSize, (JNIEnv* env, jobject, jobject bytecode_frame_handle))
    if (bytecode_frame_handle == NULL) {
      JVMCI_THROW_0(NullPointerException);
    }
  
    JVMCIObject top_bytecode_frame = JVMCIENV->wrap(bytecode_frame_handle);

*** 1767,1777 ****
--- 1775,1785 ----
      JVMCI_THROW_MSG(IllegalArgumentException,
                      err_msg("Unexpected type: %s", lambda_form->klass()->external_name()))
    }
  C2V_END
  
! C2V_VMENTRY_0(jint, getIdentityHashCode, (JNIEnv* env, jobject, jobject object))
    Handle obj = JVMCIENV->asConstant(JVMCIENV->wrap(object), JVMCI_CHECK_0);
    return obj->identity_hash();
  C2V_END
  
  C2V_VMENTRY_0(jboolean, isInternedString, (JNIEnv* env, jobject, jobject object))

*** 2549,2559 ****
--- 2557,2567 ----
  
  C2V_VMENTRY(void, releaseFailedSpeculations, (JNIEnv* env, jobject, jlong failed_speculations_address))
    FailedSpeculation::free_failed_speculations((FailedSpeculation**)(address) failed_speculations_address);
  }
  
! C2V_VMENTRY_0(jboolean, addFailedSpeculation, (JNIEnv* env, jobject, jlong failed_speculations_address, jbyteArray speculation_obj))
    JVMCIPrimitiveArray speculation_handle = JVMCIENV->wrap(speculation_obj);
    int speculation_len = JVMCIENV->get_length(speculation_handle);
    char* speculation = NEW_RESOURCE_ARRAY(char, speculation_len);
    JVMCIENV->copy_bytes_to(speculation_handle, (jbyte*) speculation, 0, speculation_len);
    return FailedSpeculation::add_failed_speculation(NULL, (FailedSpeculation**)(address) failed_speculations_address, (address) speculation, speculation_len);

*** 2642,2651 ****
--- 2650,2661 ----
    {CC "getLocalVariableTableLength",                  CC "(" HS_RESOLVED_METHOD ")I",                                                       FN_PTR(getLocalVariableTableLength)},
    {CC "reprofile",                                    CC "(" HS_RESOLVED_METHOD ")V",                                                       FN_PTR(reprofile)},
    {CC "invalidateHotSpotNmethod",                     CC "(" HS_NMETHOD ")V",                                                               FN_PTR(invalidateHotSpotNmethod)},
    {CC "readUncompressedOop",                          CC "(J)" OBJECTCONSTANT,                                                              FN_PTR(readUncompressedOop)},
    {CC "collectCounters",                              CC "()[J",                                                                            FN_PTR(collectCounters)},
+   {CC "getCountersSize",                              CC "()I",                                                                             FN_PTR(getCountersSize)},
+   {CC "setCountersSize",                              CC "(I)Z",                                                                            FN_PTR(setCountersSize)},
    {CC "allocateCompileId",                            CC "(" HS_RESOLVED_METHOD "I)I",                                                      FN_PTR(allocateCompileId)},
    {CC "isMature",                                     CC "(" METASPACE_METHOD_DATA ")Z",                                                    FN_PTR(isMature)},
    {CC "hasCompiledCodeForOSR",                        CC "(" HS_RESOLVED_METHOD "II)Z",                                                     FN_PTR(hasCompiledCodeForOSR)},
    {CC "getSymbol",                                    CC "(J)" STRING,                                                                      FN_PTR(getSymbol)},
    {CC "iterateFrames",                                CC "([" RESOLVED_METHOD "[" RESOLVED_METHOD "I" INSPECTED_FRAME_VISITOR ")" OBJECT,   FN_PTR(iterateFrames)},