src/hotspot/cpu/s390/gc/g1/g1BarrierSetAssembler_s390.cpp

*** 29,39 ****
  #include "gc/g1/g1CardTable.hpp"
  #include "gc/g1/g1BarrierSet.hpp"
  #include "gc/g1/g1BarrierSetAssembler.hpp"
  #include "gc/g1/g1ThreadLocalData.hpp"
  #include "gc/g1/heapRegion.hpp"
- #include "gc/shared/collectedHeap.hpp"
  #include "interpreter/interp_masm.hpp"
  
  #define __ masm->
  
  #define BLOCK_COMMENT(str) if (PrintAssembly) __ block_comment(str)
--- 29,38 ----
*** 258,268 ****
  
    assert_different_registers(Rstore_addr, Rnew_val, Rtmp1, Rtmp2); // Most probably, Rnew_val == Rtmp3.
  
    Label callRuntime, filtered;
  
!   CardTableBarrierSet* ct = barrier_set_cast<CardTableBarrierSet>(Universe::heap()->barrier_set());
    assert(sizeof(*ct->card_table()->byte_map_base()) == sizeof(jbyte), "adjust this code");
  
    BLOCK_COMMENT("g1_write_barrier_post {");
  
    // Does store cross heap regions?
--- 257,267 ----
  
    assert_different_registers(Rstore_addr, Rnew_val, Rtmp1, Rtmp2); // Most probably, Rnew_val == Rtmp3.
  
    Label callRuntime, filtered;
  
!   CardTableBarrierSet* ct = barrier_set_cast<CardTableBarrierSet>(BarrierSet::barrier_set());
    assert(sizeof(*ct->card_table()->byte_map_base()) == sizeof(jbyte), "adjust this code");
  
    BLOCK_COMMENT("g1_write_barrier_post {");
  
    // Does store cross heap regions?