src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp

*** 21,30 ****
--- 21,31 ----
   * questions.
   */
  
  // no precompiled headers
  #include "ci/ciUtilities.hpp"
+ #include "gc/shared/barrierSet.hpp"
  #include "memory/oopFactory.hpp"
  #include "oops/objArrayOop.inline.hpp"
  #include "jvmci/jvmciRuntime.hpp"
  #include "jvmci/jvmciCompilerToVM.hpp"
  #include "jvmci/vmStructs_jvmci.hpp"
*** 118,128 ****
    assert(!OopMapValue::legal_vm_reg_name(VMRegImpl::stack2reg(max_oop_map_stack_index + 1)), "should be invalid");
  
    symbol_init = (address) vmSymbols::object_initializer_name();
    symbol_clinit = (address) vmSymbols::class_initializer_name();
  
!   BarrierSet* bs = Universe::heap()->barrier_set();
    if (bs->is_a(BarrierSet::CardTableBarrierSet)) {
      jbyte* base = ci_card_table_address();
      assert(base != NULL, "unexpected byte_map_base");
      cardtable_start_address = base;
      cardtable_shift = CardTable::card_shift;
--- 119,129 ----
    assert(!OopMapValue::legal_vm_reg_name(VMRegImpl::stack2reg(max_oop_map_stack_index + 1)), "should be invalid");
  
    symbol_init = (address) vmSymbols::object_initializer_name();
    symbol_clinit = (address) vmSymbols::class_initializer_name();
  
!   BarrierSet* bs = BarrierSet::barrier_set();
    if (bs->is_a(BarrierSet::CardTableBarrierSet)) {
      jbyte* base = ci_card_table_address();
      assert(base != NULL, "unexpected byte_map_base");
      cardtable_start_address = base;
      cardtable_shift = CardTable::card_shift;