< prev index next >

src/hotspot/cpu/aarch64/c1_Runtime1_aarch64.cpp

G1BarrierSet_merge

*** 42,53 **** #include "runtime/signature.hpp" #include "runtime/vframe.hpp" #include "runtime/vframeArray.hpp" #include "vmreg_aarch64.inline.hpp" #if INCLUDE_ALL_GCS #include "gc/g1/g1CardTable.hpp" - #include "gc/g1/g1SATBCardTableModRefBS.hpp" #endif // Implementation of StubAssembler --- 42,53 ---- #include "runtime/signature.hpp" #include "runtime/vframe.hpp" #include "runtime/vframeArray.hpp" #include "vmreg_aarch64.inline.hpp" #if INCLUDE_ALL_GCS + #include "gc/g1/g1BarrierSet.hpp" #include "gc/g1/g1CardTable.hpp" #endif // Implementation of StubAssembler ***************
*** 1105,1115 **** { StubFrame f(sasm, "g1_pre_barrier", dont_gc_arguments); // arg0 : previous value of memory BarrierSet* bs = Universe::heap()->barrier_set(); ! if (bs->kind() != BarrierSet::G1SATBCTLogging) { __ mov(r0, (int)id); __ call_RT(noreg, noreg, CAST_FROM_FN_PTR(address, unimplemented_entry), r0); __ should_not_reach_here(); break; } --- 1105,1115 ---- { StubFrame f(sasm, "g1_pre_barrier", dont_gc_arguments); // arg0 : previous value of memory BarrierSet* bs = Universe::heap()->barrier_set(); ! if (bs->kind() != BarrierSet::G1BarrierSet) { __ mov(r0, (int)id); __ call_RT(noreg, noreg, CAST_FROM_FN_PTR(address, unimplemented_entry), r0); __ should_not_reach_here(); break; }
< prev index next >