src/hotspot/share/jvmci/vmStructs_jvmci.cpp

G1BarrierSet_merge

*** 39,49 ****
  #include "runtime/sharedRuntime.hpp"
  #include "runtime/thread.hpp"
  #include "runtime/vm_version.hpp"
  
  #if INCLUDE_ALL_GCS
! #include "gc/g1/g1SATBCardTableModRefBS.hpp"
  #include "gc/g1/heapRegion.hpp"
  #endif
  
  #define VM_STRUCTS(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field) \
    static_field(CompilerToVM::Data,             Klass_vtable_start_offset,              int)                                          \
--- 39,50 ----
  #include "runtime/sharedRuntime.hpp"
  #include "runtime/thread.hpp"
  #include "runtime/vm_version.hpp"
  
  #if INCLUDE_ALL_GCS
! #include "gc/g1/g1BarrierSet.hpp"
! #include "gc/g1/g1CardTable.hpp"
  #include "gc/g1/heapRegion.hpp"
  #endif
  
  #define VM_STRUCTS(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field) \
    static_field(CompilerToVM::Data,             Klass_vtable_start_offset,              int)                                          \