< prev index next >

src/hotspot/cpu/s390/macroAssembler_s390.cpp

G1BarrierSet_merge

*** 49,61 **** #include "runtime/sharedRuntime.hpp" #include "runtime/stubRoutines.hpp" #include "utilities/events.hpp" #include "utilities/macros.hpp" #if INCLUDE_ALL_GCS #include "gc/g1/g1CardTable.hpp" #include "gc/g1/g1CollectedHeap.inline.hpp" - #include "gc/g1/g1SATBCardTableModRefBS.hpp" #include "gc/g1/heapRegion.hpp" #endif #include <ucontext.h> --- 49,61 ---- #include "runtime/sharedRuntime.hpp" #include "runtime/stubRoutines.hpp" #include "utilities/events.hpp" #include "utilities/macros.hpp" #if INCLUDE_ALL_GCS + #include "gc/g1/g1BarrierSet.hpp" #include "gc/g1/g1CardTable.hpp" #include "gc/g1/g1CollectedHeap.inline.hpp" #include "gc/g1/heapRegion.hpp" #endif #include <ucontext.h> ***************
*** 3707,3719 **** Register Rtmp3) { Label callRuntime, filtered; assert_different_registers(Rstore_addr, Rnew_val, Rtmp1, Rtmp2); // Most probably, Rnew_val == Rtmp3. ! G1SATBCardTableModRefBS* bs = (G1SATBCardTableModRefBS*) Universe::heap()->barrier_set(); CardTable* ct = bs->card_table(); ! assert(bs->kind() == BarrierSet::G1SATBCTLogging, "wrong barrier"); BLOCK_COMMENT("g1_write_barrier_post {"); // Does store cross heap regions? // It does if the two addresses specify different grain addresses. --- 3707,3719 ---- Register Rtmp3) { Label callRuntime, filtered; assert_different_registers(Rstore_addr, Rnew_val, Rtmp1, Rtmp2); // Most probably, Rnew_val == Rtmp3. ! G1BarrierSet* bs = barrier_set_cast<G1BarrierSet>(Universe::heap()->barrier_set()); CardTable* ct = bs->card_table(); ! assert(bs->kind() == BarrierSet::G1BarrierSet, "wrong barrier"); BLOCK_COMMENT("g1_write_barrier_post {"); // Does store cross heap regions? // It does if the two addresses specify different grain addresses.
< prev index next >