src/share/vm/classfile/javaClasses.cpp

*** 52,61 ****
--- 52,65 ----
  #include "runtime/safepoint.hpp"
  #include "runtime/thread.inline.hpp"
  #include "runtime/vframe.hpp"
  #include "utilities/preserveException.hpp"
  
+ #if INCLUDE_JVMCI
+ #include "jvmci/jvmciJavaClasses.hpp"
+ #endif
+ 
  PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
  
  #define INJECTED_FIELD_COMPUTE_OFFSET(klass, name, signature, may_be_java)    \
    klass::_##name##_offset = JavaClasses::compute_injected_offset(JavaClasses::klass##_##name##_enum);
  
*** 1578,1588 ****
    Thread *THREAD = Thread::current();
    Handle h_throwable(THREAD, throwable);
    while (h_throwable.not_null()) {
      objArrayHandle result (THREAD, objArrayOop(backtrace(h_throwable())));
      if (result.is_null()) {
!       st->print_cr("%s", no_stack_trace_message());
        return;
      }
  
      while (result.not_null()) {
  
--- 1582,1592 ----
    Thread *THREAD = Thread::current();
    Handle h_throwable(THREAD, throwable);
    while (h_throwable.not_null()) {
      objArrayHandle result (THREAD, objArrayOop(backtrace(h_throwable())));
      if (result.is_null()) {
!       st->print_raw_cr(no_stack_trace_message());
        return;
      }
  
      while (result.not_null()) {
  
*** 3653,3659 ****
--- 3657,3668 ----
  }
  
  void javaClasses_init() {
    JavaClasses::compute_offsets();
    JavaClasses::check_offsets();
+ #if INCLUDE_JVMCI
+   if (EnableJVMCI) {
+     JVMCIJavaClasses::compute_offsets();
+   }
+ #endif
    FilteredFieldsMap::initialize();  // must be done after computing offsets.
  }