src/hotspot/share/compiler/disassembler.cpp

8199604_cardtablemodrefbs_rename

*** 26,36 ****
  #include "ci/ciUtilities.hpp"
  #include "classfile/javaClasses.hpp"
  #include "code/codeCache.hpp"
  #include "compiler/disassembler.hpp"
  #include "gc/shared/cardTable.hpp"
! #include "gc/shared/cardTableModRefBS.hpp"
  #include "gc/shared/collectedHeap.hpp"
  #include "memory/resourceArea.hpp"
  #include "oops/oop.inline.hpp"
  #include "runtime/handles.inline.hpp"
  #include "runtime/os.hpp"
--- 26,36 ----
  #include "ci/ciUtilities.hpp"
  #include "classfile/javaClasses.hpp"
  #include "code/codeCache.hpp"
  #include "compiler/disassembler.hpp"
  #include "gc/shared/cardTable.hpp"
! #include "gc/shared/cardTableBarrierSet.hpp"
  #include "gc/shared/collectedHeap.hpp"
  #include "memory/resourceArea.hpp"
  #include "oops/oop.inline.hpp"
  #include "runtime/handles.inline.hpp"
  #include "runtime/os.hpp"
***************
*** 317,327 ****
        st->print("Stub::<unknown> " PTR_FORMAT, p2i(adr));
        return;
      }
  
      BarrierSet* bs = Universe::heap()->barrier_set();
!     if (bs->is_a(BarrierSet::CardTableModRef) &&
          adr == ci_card_table_address_as<address>()) {
        st->print("word_map_base");
        if (WizardMode) st->print(" " INTPTR_FORMAT, p2i(adr));
        return;
      }
--- 317,327 ----
        st->print("Stub::<unknown> " PTR_FORMAT, p2i(adr));
        return;
      }
  
      BarrierSet* bs = Universe::heap()->barrier_set();
!     if (bs->is_a(BarrierSet::CardTableBarrierSet) &&
          adr == ci_card_table_address_as<address>()) {
        st->print("word_map_base");
        if (WizardMode) st->print(" " INTPTR_FORMAT, p2i(adr));
        return;
      }