src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp

8199604_cardtablemodrefbs_rename

*** 117,127 ****
  
    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::CardTableModRef)) {
      jbyte* base = ci_card_table_address();
      assert(base != NULL, "unexpected byte_map_base");
      cardtable_start_address = base;
      cardtable_shift = CardTable::card_shift;
    } else {
--- 117,127 ----
  
    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;
    } else {
***************
*** 418,423 ****
  #undef ADD_BOOL_FLAG
  #undef ADD_INTX_FLAG
  #undef ADD_UINTX_FLAG
  #undef CHECK_FLAG
  }
- 
--- 418,422 ----