*** old/src/hotspot/share/jvmci/vmStructs_jvmci.cpp	Thu Mar 28 11:22:58 2019
--- new/src/hotspot/share/jvmci/vmStructs_jvmci.cpp	Thu Mar 28 11:22:58 2019

*** 178,202 ****
--- 178,196 ----
    volatile_nonstatic_field(JavaThread,         _exception_oop,                                oop)                                   \
    volatile_nonstatic_field(JavaThread,         _exception_pc,                                 address)                               \
    volatile_nonstatic_field(JavaThread,         _is_method_handle_return,                      int)                                   \
    nonstatic_field(JavaThread,                  _osthread,                                     OSThread*)                             \
    nonstatic_field(JavaThread,                  _pending_deoptimization,                       int)                                   \
!   nonstatic_field(JavaThread,                  _pending_failed_speculation,                   long)                                  \
!   nonstatic_field(JavaThread,                  _pending_failed_speculation,                   jlong)                                 \
    nonstatic_field(JavaThread,                  _pending_transfer_to_interpreter,              bool)                                  \
    nonstatic_field(JavaThread,                  _jvmci_counters,                               jlong*)                                \
    nonstatic_field(JavaThread,                  _should_post_on_exceptions_flag,               int)                                   \
    nonstatic_field(JavaThread,                  _reserved_stack_activation,                    address)                               \
                                                                                                                                       \
    static_field(java_lang_Class,                _klass_offset,                                 int)                                   \
    static_field(java_lang_Class,                _array_klass_offset,                           int)                                   \
                                                                                                                                       \
    nonstatic_field(JVMCIEnv,                    _task,                                         CompileTask*)                          \
    nonstatic_field(JVMCIEnv,                    _jvmti_can_hotswap_or_post_breakpoint,         jbyte)                                 \
    nonstatic_field(JVMCIEnv,                    _jvmti_can_access_local_variables,             jbyte)                                 \
    nonstatic_field(JVMCIEnv,                    _jvmti_can_post_on_exceptions,                 jbyte)                                 \
    nonstatic_field(JVMCIEnv,                    _jvmti_can_pop_frame,                          jbyte)                                 \
                                                                                                                                       \
    nonstatic_field(InvocationCounter,           _counter,                                      unsigned int)                          \
                                                                                                                                       \
    nonstatic_field(Klass,                       _secondary_super_cache,                        Klass*)                                \
    nonstatic_field(Klass,                       _secondary_supers,                             Array<Klass*>*)                        \
    nonstatic_field(Klass,                       _super,                                        Klass*)                                \

*** 207,216 ****
--- 201,211 ----
    nonstatic_field(Klass,                       _prototype_header,                             markOop)                               \
    nonstatic_field(Klass,                       _next_sibling,                                 Klass*)                                \
    nonstatic_field(Klass,                       _java_mirror,                                  OopHandle)                             \
    nonstatic_field(Klass,                       _modifier_flags,                               jint)                                  \
    nonstatic_field(Klass,                       _access_flags,                                 AccessFlags)                           \
+   nonstatic_field(Klass,                       _class_loader_data,                            ClassLoaderData*)                      \
                                                                                                                                       \
    nonstatic_field(LocalVariableTableElement,   start_bci,                                     u2)                                    \
    nonstatic_field(LocalVariableTableElement,   length,                                        u2)                                    \
    nonstatic_field(LocalVariableTableElement,   name_cp_index,                                 u2)                                    \
    nonstatic_field(LocalVariableTableElement,   descriptor_cp_index,                           u2)                                    \

*** 357,366 ****
--- 352,362 ----
    declare_toplevel_type(CompilerToVM)                                     \
    declare_toplevel_type(ExceptionTableElement)                            \
    declare_toplevel_type(JVMFlag)                                          \
    declare_toplevel_type(JVMFlag*)                                         \
    declare_toplevel_type(InvocationCounter)                                \
+   declare_toplevel_type(JVMCICompileState)                                \
    declare_toplevel_type(JVMCIEnv)                                         \
    declare_toplevel_type(LocalVariableTableElement)                        \
    declare_toplevel_type(narrowKlass)                                      \
    declare_toplevel_type(Symbol*)                                          \
    declare_toplevel_type(vtableEntry)                                      \

*** 399,408 ****
--- 395,405 ----
    declare_preprocessor_constant("JVM_ACC_VARARGS", JVM_ACC_VARARGS)       \
    declare_preprocessor_constant("JVM_ACC_BRIDGE", JVM_ACC_BRIDGE)         \
    declare_preprocessor_constant("JVM_ACC_ANNOTATION", JVM_ACC_ANNOTATION) \
    declare_preprocessor_constant("JVM_ACC_ENUM", JVM_ACC_ENUM)             \
    declare_preprocessor_constant("JVM_ACC_SYNTHETIC", JVM_ACC_SYNTHETIC)   \
+   declare_preprocessor_constant("JVM_ACC_INTERFACE", JVM_ACC_INTERFACE)   \
                                                                            \
    declare_constant(JVM_CONSTANT_Utf8)                                     \
    declare_constant(JVM_CONSTANT_Unicode)                                  \
    declare_constant(JVM_CONSTANT_Integer)                                  \
    declare_constant(JVM_CONSTANT_Float)                                    \

*** 540,554 ****
--- 537,551 ----
    declare_constant(InstanceKlass::_misc_is_unsafe_anonymous)              \
                                                                            \
    declare_constant(JumpData::taken_off_set)                               \
    declare_constant(JumpData::displacement_off_set)                        \
                                                                            \
!   declare_constant(JVMCIEnv::ok)                                          \
!   declare_constant(JVMCIEnv::dependencies_failed)                         \
!   declare_constant(JVMCIEnv::dependencies_invalid)                        \
!   declare_constant(JVMCIEnv::cache_full)                                  \
!   declare_constant(JVMCIEnv::code_too_large)                              \
!   declare_preprocessor_constant("JVMCIEnv::ok",                   JVMCI::ok)                      \
!   declare_preprocessor_constant("JVMCIEnv::dependencies_failed",  JVMCI::dependencies_failed)     \
!   declare_preprocessor_constant("JVMCIEnv::dependencies_invalid", JVMCI::dependencies_invalid)    \
!   declare_preprocessor_constant("JVMCIEnv::cache_full",           JVMCI::cache_full)              \
!   declare_preprocessor_constant("JVMCIEnv::code_too_large",       JVMCI::code_too_large)          \
    declare_constant(JVMCIRuntime::none)                                    \
    declare_constant(JVMCIRuntime::by_holder)                               \
    declare_constant(JVMCIRuntime::by_full_signature)                       \
                                                                            \
    declare_constant(Klass::_lh_neutral_value)                              \