< prev index next >

src/hotspot/cpu/s390/c1_Runtime1_s390.cpp

G1BarrierSet_merge
 #include "runtime/vframeArray.hpp"
 #include "utilities/macros.hpp"
 #include "vmreg_s390.inline.hpp"
 #include "registerSaver_s390.hpp"
 #if INCLUDE_ALL_GCS
+#include "gc/g1/g1BarrierSet.hpp"
 #include "gc/g1/g1CardTable.hpp"
-#include "gc/g1/g1SATBCardTableModRefBS.hpp"
 #endif
 
 // Implementation of StubAssembler
 
 int StubAssembler::call_RT(Register oop_result1, Register metadata_result, address entry_point, int number_of_arguments) {

@@ -766,11 +766,11 #if INCLUDE_ALL_GCS case g1_pre_barrier_slow_id: { // Z_R1_scratch: previous value of memory BarrierSet* bs = Universe::heap()->barrier_set(); - if (bs->kind() != BarrierSet::G1SATBCTLogging) { + if (bs->kind() != BarrierSet::G1BarrierSet) { __ should_not_reach_here(FILE_AND_LINE); break; } __ set_info("g1_pre_barrier_slow_id", dont_gc_arguments);
@@ -835,11 +835,11 break; case g1_post_barrier_slow_id: { // Z_R1_scratch: oop address, address of updated memory slot BarrierSet* bs = Universe::heap()->barrier_set(); - if (bs->kind() != BarrierSet::G1SATBCTLogging) { + if (bs->kind() != BarrierSet::G1BarrierSet) { __ should_not_reach_here(FILE_AND_LINE); break; } __ set_info("g1_post_barrier_slow_id", dont_gc_arguments);
< prev index next >