< prev index next >

src/hotspot/cpu/ppc/c1_Runtime1_ppc.cpp

G1BarrierSet_merge

*** 41,52 **** #include "runtime/vframeArray.hpp" #include "utilities/align.hpp" #include "utilities/macros.hpp" #include "vmreg_ppc.inline.hpp" #if INCLUDE_ALL_GCS #include "gc/g1/g1CardTable.hpp" - #include "gc/g1/g1SATBCardTableModRefBS.hpp" #endif // Implementation of StubAssembler int StubAssembler::call_RT(Register oop_result1, Register metadata_result, --- 41,52 ---- #include "runtime/vframeArray.hpp" #include "utilities/align.hpp" #include "utilities/macros.hpp" #include "vmreg_ppc.inline.hpp" #if INCLUDE_ALL_GCS + #include "gc/g1/g1BarrierSet.hpp" #include "gc/g1/g1CardTable.hpp" #endif // Implementation of StubAssembler int StubAssembler::call_RT(Register oop_result1, Register metadata_result, ***************
*** 709,719 **** #if INCLUDE_ALL_GCS case g1_pre_barrier_slow_id: { BarrierSet* bs = Universe::heap()->barrier_set(); ! if (bs->kind() != BarrierSet::G1SATBCTLogging) { goto unimplemented_entry; } __ set_info("g1_pre_barrier_slow_id", dont_gc_arguments); --- 709,719 ---- #if INCLUDE_ALL_GCS case g1_pre_barrier_slow_id: { BarrierSet* bs = Universe::heap()->barrier_set(); ! if (bs->kind() != BarrierSet::G1BarrierSet) { goto unimplemented_entry; } __ set_info("g1_pre_barrier_slow_id", dont_gc_arguments); ***************
*** 786,796 **** break; case g1_post_barrier_slow_id: { BarrierSet* bs = Universe::heap()->barrier_set(); ! if (bs->kind() != BarrierSet::G1SATBCTLogging) { goto unimplemented_entry; } __ set_info("g1_post_barrier_slow_id", dont_gc_arguments); --- 786,796 ---- break; case g1_post_barrier_slow_id: { BarrierSet* bs = Universe::heap()->barrier_set(); ! if (bs->kind() != BarrierSet::G1BarrierSet) { goto unimplemented_entry; } __ set_info("g1_post_barrier_slow_id", dont_gc_arguments);
< prev index next >