< prev index next >

src/hotspot/cpu/x86/c1_Runtime1_x86.cpp

G1BarrierSet_merge

*** 40,51 **** #include "runtime/signature.hpp" #include "runtime/vframeArray.hpp" #include "utilities/macros.hpp" #include "vmreg_x86.inline.hpp" #if INCLUDE_ALL_GCS #include "gc/g1/g1CardTable.hpp" - #include "gc/g1/g1SATBCardTableModRefBS.hpp" #endif // Implementation of StubAssembler --- 40,51 ---- #include "runtime/signature.hpp" #include "runtime/vframeArray.hpp" #include "utilities/macros.hpp" #include "vmreg_x86.inline.hpp" #if INCLUDE_ALL_GCS + #include "gc/g1/g1BarrierSet.hpp" #include "gc/g1/g1CardTable.hpp" #endif // Implementation of StubAssembler ***************
*** 1561,1571 **** { 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) { __ movptr(rax, (int)id); __ call_RT(noreg, noreg, CAST_FROM_FN_PTR(address, unimplemented_entry), rax); __ should_not_reach_here(); break; } --- 1561,1571 ---- { 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) { __ movptr(rax, (int)id); __ call_RT(noreg, noreg, CAST_FROM_FN_PTR(address, unimplemented_entry), rax); __ should_not_reach_here(); break; }
< prev index next >