src/hotspot/share/jvmci/vmStructs_jvmci.cpp

*** 42,51 ****
--- 42,52 ----
  
  #if INCLUDE_ALL_GCS
  #include "gc/g1/g1BarrierSet.hpp"
  #include "gc/g1/g1CardTable.hpp"
  #include "gc/g1/heapRegion.hpp"
+ #include "gc/g1/g1ThreadLocalData.hpp"
  #endif
  
  #define VM_STRUCTS(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field) \
    static_field(CompilerToVM::Data,             Klass_vtable_start_offset,              int)                                          \
    static_field(CompilerToVM::Data,             Klass_vtable_length_offset,             int)                                          \
*** 170,181 ****
    nonstatic_field(JavaThread,                  _vm_result,                                    oop)                                   \
    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*)                             \
-   ALL_GCS_ONLY(nonstatic_field(JavaThread,     _satb_mark_queue,                              SATBMarkQueue))                        \
-   ALL_GCS_ONLY(nonstatic_field(JavaThread,     _dirty_card_queue,                             DirtyCardQueue))                       \
    nonstatic_field(JavaThread,                  _pending_deoptimization,                       int)                                   \
    nonstatic_field(JavaThread,                  _pending_failed_speculation,                   oop)                                   \
    nonstatic_field(JavaThread,                  _pending_transfer_to_interpreter,              bool)                                  \
    nonstatic_field(JavaThread,                  _jvmci_counters,                               jlong*)                                \
    nonstatic_field(JavaThread,                  _reserved_stack_activation,                    address)                               \
--- 171,180 ----
*** 513,525 ****
    declare_constant(Deoptimization::Reason_not_compiled_exception_handler) \
    declare_constant(Deoptimization::Reason_unresolved)                     \
    declare_constant(Deoptimization::Reason_jsr_mismatch)                   \
    declare_constant(Deoptimization::Reason_LIMIT)                          \
                                                                            \
-   ALL_GCS_ONLY(declare_constant_with_value("dirtyCardQueueBufferOffset", in_bytes(DirtyCardQueue::byte_offset_of_buf()))) \
-   ALL_GCS_ONLY(declare_constant_with_value("dirtyCardQueueIndexOffset", in_bytes(DirtyCardQueue::byte_offset_of_index()))) \
-                                                                           \
    declare_constant(FieldInfo::access_flags_offset)                        \
    declare_constant(FieldInfo::name_index_offset)                          \
    declare_constant(FieldInfo::signature_index_offset)                     \
    declare_constant(FieldInfo::initval_index_offset)                       \
    declare_constant(FieldInfo::low_packed_offset)                          \
--- 512,521 ----
*** 571,584 ****
    declare_constant(ReceiverTypeData::nonprofiled_count_off_set)           \
    declare_constant(ReceiverTypeData::receiver_type_row_cell_count)        \
    declare_constant(ReceiverTypeData::receiver0_offset)                    \
    declare_constant(ReceiverTypeData::count0_offset)                       \
                                                                            \
-   ALL_GCS_ONLY(declare_constant_with_value("satbMarkQueueBufferOffset", in_bytes(SATBMarkQueue::byte_offset_of_buf()))) \
-   ALL_GCS_ONLY(declare_constant_with_value("satbMarkQueueIndexOffset", in_bytes(SATBMarkQueue::byte_offset_of_index()))) \
-   ALL_GCS_ONLY(declare_constant_with_value("satbMarkQueueActiveOffset", in_bytes(SATBMarkQueue::byte_offset_of_active()))) \
-                                                                           \
    declare_constant(vmIntrinsics::_invokeBasic)                            \
    declare_constant(vmIntrinsics::_linkToVirtual)                          \
    declare_constant(vmIntrinsics::_linkToStatic)                           \
    declare_constant(vmIntrinsics::_linkToSpecial)                          \
    declare_constant(vmIntrinsics::_linkToInterface)                        \
--- 567,576 ----
*** 652,662 ****
  
  #define VM_STRUCTS_JVMCI_G1GC(nonstatic_field, static_field) \
    static_field(HeapRegion, LogOfHRGrainBytes, int)
  
  #define VM_INT_CONSTANTS_JVMCI_G1GC(declare_constant, declare_constant_with_value, declare_preprocessor_constant) \
!   declare_constant_with_value("G1CardTable::g1_young_gen", G1CardTable::g1_young_card_val())
  
  #endif // INCLUDE_ALL_GCS
  
  
  #ifdef LINUX
--- 644,659 ----
  
  #define VM_STRUCTS_JVMCI_G1GC(nonstatic_field, static_field) \
    static_field(HeapRegion, LogOfHRGrainBytes, int)
  
  #define VM_INT_CONSTANTS_JVMCI_G1GC(declare_constant, declare_constant_with_value, declare_preprocessor_constant) \
!   declare_constant_with_value("G1CardTable::g1_young_gen", G1CardTable::g1_young_card_val()) \
!   declare_constant_with_value("G1ThreadLocalData::satb_mark_queue_active_offset", in_bytes(G1ThreadLocalData::satb_mark_queue_active_offset())) \
!   declare_constant_with_value("G1ThreadLocalData::satb_mark_queue_index_offset", in_bytes(G1ThreadLocalData::satb_mark_queue_index_offset())) \
!   declare_constant_with_value("G1ThreadLocalData::satb_mark_queue_buffer_offset", in_bytes(G1ThreadLocalData::satb_mark_queue_buffer_offset())) \
!   declare_constant_with_value("G1ThreadLocalData::dirty_card_queue_index_offset", in_bytes(G1ThreadLocalData::dirty_card_queue_index_offset())) \
!   declare_constant_with_value("G1ThreadLocalData::dirty_card_queue_buffer_offset", in_bytes(G1ThreadLocalData::dirty_card_queue_buffer_offset()))
  
  #endif // INCLUDE_ALL_GCS
  
  
  #ifdef LINUX