--- a/src/hotspot/cpu/aarch64/aarch64.ad Thu Apr 12 11:05:42 2018 +0200
+++ b/src/hotspot/cpu/aarch64/aarch64.ad Thu Apr 12 11:22:24 2018 +0200
@@ -5847,8 +5847,8 @@
operand immByteMapBase()
%{
// Get base of card map
- predicate(Universe::heap()->barrier_set()->is_a(BarrierSet::CardTableBarrierSet) &&
- (jbyte*)n->get_ptr() == ((CardTableBarrierSet*)(Universe::heap()->barrier_set()))->card_table()->byte_map_base());
+ predicate(BarrierSet::barrier_set()->is_a(BarrierSet::CardTableBarrierSet) &&
+ (jbyte*)n->get_ptr() == ((CardTableBarrierSet*)(BarrierSet::barrier_set()))->card_table()->byte_map_base());
match(ConP);
op_cost(0);
--- a/src/hotspot/cpu/aarch64/c1_Runtime1_aarch64.cpp Thu Apr 12 11:05:42 2018 +0200
+++ b/src/hotspot/cpu/aarch64/c1_Runtime1_aarch64.cpp Thu Apr 12 11:22:24 2018 +0200
@@ -1107,7 +1107,7 @@
StubFrame f(sasm, "g1_pre_barrier", dont_gc_arguments);
// arg0 : previous value of memory
- BarrierSet* bs = Universe::heap()->barrier_set();
+ BarrierSet* bs = BarrierSet::barrier_set();
if (bs->kind() != BarrierSet::G1BarrierSet) {
__ mov(r0, (int)id);
__ call_RT(noreg, noreg, CAST_FROM_FN_PTR(address, unimplemented_entry), r0);
@@ -1159,7 +1159,7 @@
{
StubFrame f(sasm, "g1_post_barrier", dont_gc_arguments);
- BarrierSet* bs = Universe::heap()->barrier_set();
+ BarrierSet* bs = BarrierSet::barrier_set();
if (bs->kind() != BarrierSet::G1BarrierSet) {
__ mov(r0, (int)id);
__ call_RT(noreg, noreg, CAST_FROM_FN_PTR(address, unimplemented_entry), r0);
--- a/src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.cpp Thu Apr 12 11:05:42 2018 +0200
+++ b/src/hotspot/cpu/aarch64/gc/g1/g1BarrierSetAssembler_aarch64.cpp Thu Apr 12 11:22:24 2018 +0200
@@ -25,11 +25,10 @@
#include "precompiled.hpp"
#include "asm/macroAssembler.inline.hpp"
#include "gc/g1/g1BarrierSet.hpp"
+#include "gc/g1/g1BarrierSetAssembler.hpp"
#include "gc/g1/g1CardTable.hpp"
-#include "gc/g1/g1BarrierSetAssembler.hpp"
#include "gc/g1/g1ThreadLocalData.hpp"
#include "gc/g1/heapRegion.hpp"
-#include "gc/shared/collectedHeap.hpp"
#include "interpreter/interp_masm.hpp"
#include "runtime/sharedRuntime.hpp"
@@ -182,7 +181,7 @@
Address queue_index(thread, in_bytes(G1ThreadLocalData::dirty_card_queue_index_offset()));
Address buffer(thread, in_bytes(G1ThreadLocalData::dirty_card_queue_buffer_offset()));
- BarrierSet* bs = Universe::heap()->barrier_set();
+ BarrierSet* bs = BarrierSet::barrier_set();
CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(bs);
CardTable* ct = ctbs->card_table();
assert(sizeof(*ct->byte_map_base()) == sizeof(jbyte), "adjust this code");
--- a/src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.cpp Thu Apr 12 11:05:42 2018 +0200
+++ b/src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.cpp Thu Apr 12 11:22:24 2018 +0200
@@ -28,7 +28,6 @@
#include "gc/shared/cardTable.hpp"
#include "gc/shared/cardTableBarrierSet.hpp"
#include "gc/shared/cardTableBarrierSetAssembler.hpp"
-#include "gc/shared/collectedHeap.hpp"
#include "interpreter/interp_masm.hpp"
#define __ masm->
@@ -36,7 +35,7 @@
void CardTableBarrierSetAssembler::store_check(MacroAssembler* masm, Register obj, Address dst) {
- BarrierSet* bs = Universe::heap()->barrier_set();
+ BarrierSet* bs = BarrierSet::barrier_set();
assert(bs->kind() == BarrierSet::CardTableBarrierSet, "Wrong barrier set kind");
CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(bs);
@@ -66,7 +65,7 @@
void CardTableBarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators,
Register start, Register end, Register scratch, RegSet saved_regs) {
- BarrierSet* bs = Universe::heap()->barrier_set();
+ BarrierSet* bs = BarrierSet::barrier_set();
CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(bs);
CardTable* ct = ctbs->card_table();
assert(sizeof(*ct->byte_map_base()) == sizeof(jbyte), "adjust this code");
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp Thu Apr 12 11:05:42 2018 +0200
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp Thu Apr 12 11:22:24 2018 +0200
@@ -29,6 +29,7 @@
#include "jvm.h"
#include "asm/assembler.hpp"
#include "asm/assembler.inline.hpp"
+#include "gc/shared/barrierSet.hpp"
#include "gc/shared/cardTable.hpp"
#include "gc/shared/barrierSetAssembler.hpp"
#include "gc/shared/cardTableBarrierSet.hpp"
@@ -2092,7 +2093,7 @@
#endif
void MacroAssembler::resolve_jobject(Register value, Register thread, Register tmp) {
- BarrierSetAssembler *bs = Universe::heap()->barrier_set()->barrier_set_assembler();
+ BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
Label done, not_weak;
cbz(value, done); // Use NULL as-is.
@@ -4316,7 +4317,7 @@
void MacroAssembler::load_byte_map_base(Register reg) {
jbyte *byte_map_base =
- ((CardTableBarrierSet*)(Universe::heap()->barrier_set()))->card_table()->byte_map_base();
+ ((CardTableBarrierSet*)(BarrierSet::barrier_set()))->card_table()->byte_map_base();
if (is_valid_AArch64_address((address)byte_map_base)) {
// Strictly speaking the byte_map_base isn't an address at all,
--- a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp Thu Apr 12 11:05:42 2018 +0200
+++ b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp Thu Apr 12 11:22:24 2018 +0200
@@ -1359,7 +1359,7 @@
decorators |= ARRAYCOPY_ALIGNED;
}
- BarrierSetAssembler *bs = Universe::heap()->barrier_set()->barrier_set_assembler();
+ BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
bs->arraycopy_prologue(_masm, decorators, is_oop, d, count, saved_reg);
if (is_oop) {
@@ -1433,7 +1433,7 @@
decorators |= ARRAYCOPY_ALIGNED;
}
- BarrierSetAssembler *bs = Universe::heap()->barrier_set()->barrier_set_assembler();
+ BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
bs->arraycopy_prologue(_masm, decorators, is_oop, d, count, saved_regs);
if (is_oop) {
@@ -1795,7 +1795,7 @@
decorators |= AS_DEST_NOT_INITIALIZED;
}
- BarrierSetAssembler *bs = Universe::heap()->barrier_set()->barrier_set_assembler();
+ BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
bs->arraycopy_prologue(_masm, decorators, is_oop, to, count, wb_pre_saved_regs);
// save the original count
--- a/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp Thu Apr 12 11:05:42 2018 +0200
+++ b/src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp Thu Apr 12 11:22:24 2018 +0200
@@ -934,7 +934,7 @@
// Load the value of the referent field.
const Address field_address(local_0, referent_offset);
- BarrierSetAssembler *bs = Universe::heap()->barrier_set()->barrier_set_assembler();
+ BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
bs->load_at(_masm, IN_HEAP | ON_WEAK_OOP_REF, T_OBJECT, local_0, field_address, /*tmp1*/ rscratch2, /*tmp2*/ rscratch1);
// areturn
--- a/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp Thu Apr 12 11:05:42 2018 +0200
+++ b/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp Thu Apr 12 11:22:24 2018 +0200
@@ -147,7 +147,7 @@
Register val,
DecoratorSet decorators) {
assert(val == noreg || val == r0, "parameter is just for looks");
- BarrierSetAssembler *bs = Universe::heap()->barrier_set()->barrier_set_assembler();
+ BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
bs->store_at(_masm, decorators, T_OBJECT, dst, val, /*tmp1*/ r10, /*tmp2*/ r1);
}
@@ -155,7 +155,7 @@
Address src,
Register dst,
DecoratorSet decorators) {
- BarrierSetAssembler *bs = Universe::heap()->barrier_set()->barrier_set_assembler();
+ BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
bs->load_at(_masm, decorators, T_OBJECT, dst, src, /*tmp1*/ r10, /*tmp_thread*/ r1);
}
--- a/src/hotspot/cpu/arm/c1_Runtime1_arm.cpp Thu Apr 12 11:05:42 2018 +0200
+++ b/src/hotspot/cpu/arm/c1_Runtime1_arm.cpp Thu Apr 12 11:22:24 2018 +0200
@@ -541,7 +541,7 @@
__ set_info("g1_pre_barrier_slow_id", dont_gc_arguments);
- BarrierSet* bs = Universe::heap()->barrier_set();
+ BarrierSet* bs = BarrierSet::barrier_set();
if (bs->kind() != BarrierSet::G1BarrierSet) {
__ mov(R0, (int)id);
__ call_RT(noreg, noreg, CAST_FROM_FN_PTR(address, unimplemented_entry), R0);
@@ -618,7 +618,7 @@
__ set_info("g1_post_barrier_slow_id", dont_gc_arguments);
- BarrierSet* bs = Universe::heap()->barrier_set();
+ BarrierSet* bs = BarrierSet::barrier_set();
if (bs->kind() != BarrierSet::G1BarrierSet) {
__ mov(R0, (int)id);
__ call_RT(noreg, noreg, CAST_FROM_FN_PTR(address, unimplemented_entry), R0);
--- a/src/hotspot/cpu/arm/gc/g1/g1BarrierSetAssembler_arm.cpp Thu Apr 12 11:05:42 2018 +0200
+++ b/src/hotspot/cpu/arm/gc/g1/g1BarrierSetAssembler_arm.cpp Thu Apr 12 11:22:24 2018 +0200
@@ -28,7 +28,6 @@
#include "gc/g1/g1BarrierSetAssembler.hpp"
#include "gc/g1/g1CardTable.hpp"
#include "gc/g1/heapRegion.hpp"
-#include "gc/shared/collectedHeap.hpp"
#include "interpreter/interp_masm.hpp"
#include "runtime/sharedRuntime.hpp"
#include "runtime/thread.hpp"
--- a/src/hotspot/cpu/arm/gc/shared/cardTableBarrierSetAssembler_arm.cpp Thu Apr 12 11:05:42 2018 +0200
+++ b/src/hotspot/cpu/arm/gc/shared/cardTableBarrierSetAssembler_arm.cpp Thu Apr 12 11:22:24 2018 +0200
@@ -44,7 +44,7 @@
void CardTableBarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators,
Register addr, Register count, Register tmp) {
BLOCK_COMMENT("CardTablePostBarrier");
- BarrierSet* bs = Universe::heap()->barrier_set();
+ BarrierSet* bs = BarrierSet::barrier_set();
CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(bs);
CardTable* ct = ctbs->card_table();
assert(sizeof(*ct->byte_map_base()) == sizeof(jbyte), "adjust this code");
--- a/src/hotspot/cpu/arm/interp_masm_arm.cpp Thu Apr 12 11:05:42 2018 +0200
+++ b/src/hotspot/cpu/arm/interp_masm_arm.cpp Thu Apr 12 11:22:24 2018 +0200
@@ -410,7 +410,7 @@
// Sets card_table_base register.
void InterpreterMacroAssembler::store_check_part1(Register card_table_base) {
// Check barrier set type (should be card table) and element size
- BarrierSet* bs = Universe::heap()->barrier_set();
+ BarrierSet* bs = BarrierSet::barrier_set();
assert(bs->kind() == BarrierSet::CardTableBarrierSet,
"Wrong barrier set kind");
@@ -477,7 +477,7 @@
#ifdef AARCH64
strb(ZR, card_table_addr);
#else
- CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(Universe::heap()->barrier_set());
+ CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(BarrierSet::barrier_set());
CardTable* ct = ctbs->card_table();
if ((((uintptr_t)ct->byte_map_base() & 0xff) == 0)) {
// Card table is aligned so the lowest byte of the table address base is zero.
--- a/src/hotspot/cpu/arm/macroAssembler_arm.cpp Thu Apr 12 11:05:42 2018 +0200
+++ b/src/hotspot/cpu/arm/macroAssembler_arm.cpp Thu Apr 12 11:22:24 2018 +0200
@@ -29,6 +29,7 @@
#include "ci/ciEnv.hpp"
#include "code/nativeInst.hpp"
#include "compiler/disassembler.hpp"
+#include "gc/shared/barrierSet.hpp"
#include "gc/shared/cardTable.hpp"
#include "gc/shared/cardTableBarrierSet.hpp"
#include "gc/shared/collectedHeap.inline.hpp"
@@ -2261,7 +2262,7 @@
Address queue_index(Rthread, in_bytes(G1ThreadLocalData::dirty_card_queue_index_offset()));
Address buffer(Rthread, in_bytes(G1ThreadLocalData::dirty_card_queue_buffer_offset()));
- BarrierSet* bs = Universe::heap()->barrier_set();
+ BarrierSet* bs = BarrierSet::barrier_set();
CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(bs);
CardTable* ct = ctbs->card_table();
Label done;
--- a/src/hotspot/cpu/ppc/c1_Runtime1_ppc.cpp Thu Apr 12 11:05:42 2018 +0200
+++ b/src/hotspot/cpu/ppc/c1_Runtime1_ppc.cpp Thu Apr 12 11:22:24 2018 +0200
@@ -711,7 +711,7 @@
#if INCLUDE_ALL_GCS
case g1_pre_barrier_slow_id:
{
- BarrierSet* bs = Universe::heap()->barrier_set();
+ BarrierSet* bs = BarrierSet::barrier_set();
if (bs->kind() != BarrierSet::G1BarrierSet) {
goto unimplemented_entry;
}
@@ -782,7 +782,7 @@
case g1_post_barrier_slow_id:
{
- BarrierSet* bs = Universe::heap()->barrier_set();
+ BarrierSet* bs = BarrierSet::barrier_set();
if (bs->kind() != BarrierSet::G1BarrierSet) {
goto unimplemented_entry;
}
--- a/src/hotspot/cpu/ppc/gc/g1/g1BarrierSetAssembler_ppc.cpp Thu Apr 12 11:05:42 2018 +0200
+++ b/src/hotspot/cpu/ppc/gc/g1/g1BarrierSetAssembler_ppc.cpp Thu Apr 12 11:22:24 2018 +0200
@@ -30,7 +30,6 @@
#include "gc/g1/g1BarrierSetAssembler.hpp"
#include "gc/g1/g1ThreadLocalData.hpp"
#include "gc/g1/heapRegion.hpp"
-#include "gc/shared/collectedHeap.hpp"
#include "interpreter/interp_masm.hpp"
#include "runtime/sharedRuntime.hpp"
@@ -205,7 +204,7 @@
Label runtime, filtered;
assert_different_registers(store_addr, new_val, tmp1, tmp2);
- CardTableBarrierSet* ct = barrier_set_cast<CardTableBarrierSet>(Universe::heap()->barrier_set());
+ CardTableBarrierSet* ct = barrier_set_cast<CardTableBarrierSet>(BarrierSet::barrier_set());
assert(sizeof(*ct->card_table()->byte_map_base()) == sizeof(jbyte), "adjust this code");
// Does store cross heap regions?
--- a/src/hotspot/cpu/ppc/gc/shared/cardTableBarrierSetAssembler_ppc.cpp Thu Apr 12 11:05:42 2018 +0200
+++ b/src/hotspot/cpu/ppc/gc/shared/cardTableBarrierSetAssembler_ppc.cpp Thu Apr 12 11:22:24 2018 +0200
@@ -29,7 +29,6 @@
#include "gc/shared/cardTable.hpp"
#include "gc/shared/cardTableBarrierSet.hpp"
#include "gc/shared/cardTableBarrierSetAssembler.hpp"
-#include "gc/shared/collectedHeap.hpp"
#include "interpreter/interp_masm.hpp"
#define __ masm->
@@ -44,7 +43,7 @@
void CardTableBarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators, Register addr,
Register count, Register preserve) {
- CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(Universe::heap()->barrier_set());
+ CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(BarrierSet::barrier_set());
CardTable* ct = ctbs->card_table();
assert(sizeof(*ct->byte_map_base()) == sizeof(jbyte), "adjust this code");
assert_different_registers(addr, count, R0);
@@ -85,7 +84,7 @@
}
void CardTableBarrierSetAssembler::card_write_barrier_post(MacroAssembler* masm, Register store_addr, Register tmp) {
- CardTableBarrierSet* bs = barrier_set_cast<CardTableBarrierSet>(Universe::heap()->barrier_set());
+ CardTableBarrierSet* bs = barrier_set_cast<CardTableBarrierSet>(BarrierSet::barrier_set());
card_table_write(masm, bs->card_table()->byte_map_base(), tmp, store_addr);
}
--- a/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp Thu Apr 12 11:05:42 2018 +0200
+++ b/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp Thu Apr 12 11:22:24 2018 +0200
@@ -3035,7 +3035,7 @@
}
void MacroAssembler::resolve_jobject(Register value, Register tmp1, Register tmp2, bool needs_frame) {
- BarrierSetAssembler* bs = Universe::heap()->barrier_set()->barrier_set_assembler();
+ BarrierSetAssembler* bs = BarrierSet::barrier_set()->barrier_set_assembler();
bs->resolve_jobject(this, value, tmp1, tmp2, needs_frame);
}
--- a/src/hotspot/cpu/ppc/stubGenerator_ppc.cpp Thu Apr 12 11:05:42 2018 +0200
+++ b/src/hotspot/cpu/ppc/stubGenerator_ppc.cpp Thu Apr 12 11:22:24 2018 +0200
@@ -2032,7 +2032,7 @@
decorators |= ARRAYCOPY_ALIGNED;
}
- BarrierSetAssembler *bs = Universe::heap()->barrier_set()->barrier_set_assembler();
+ BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
bs->arraycopy_prologue(_masm, decorators, T_OBJECT, R3_ARG1, R4_ARG2, R5_ARG3, noreg, noreg);
if (UseCompressedOops) {
@@ -2071,7 +2071,7 @@
decorators |= ARRAYCOPY_ALIGNED;
}
- BarrierSetAssembler *bs = Universe::heap()->barrier_set()->barrier_set_assembler();
+ BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
bs->arraycopy_prologue(_masm, decorators, T_OBJECT, R3_ARG1, R4_ARG2, R5_ARG3, noreg, noreg);
if (UseCompressedOops) {
@@ -2164,7 +2164,7 @@
decorators |= AS_DEST_NOT_INITIALIZED;
}
- BarrierSetAssembler *bs = Universe::heap()->barrier_set()->barrier_set_assembler();
+ BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
bs->arraycopy_prologue(_masm, decorators, T_OBJECT, R3_from, R4_to, R5_count, /* preserve: */ R6_ckoff, R7_ckval);
//inc_counter_np(SharedRuntime::_checkcast_array_copy_ctr, R12_tmp, R3_RET);
--- a/src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp Thu Apr 12 11:05:42 2018 +0200
+++ b/src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp Thu Apr 12 11:22:24 2018 +0200
@@ -525,7 +525,7 @@
__ beq(CCR0, slow_path);
// Load the value of the referent field.
- BarrierSetAssembler *bs = Universe::heap()->barrier_set()->barrier_set_assembler();
+ BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
bs->load_at(_masm, IN_HEAP | ON_WEAK_OOP_REF, T_OBJECT,
R3_RET, referent_offset, R3_RET,
/* non-volatile temp */ R31, R11_scratch1, true);
--- a/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp Thu Apr 12 11:05:42 2018 +0200
+++ b/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp Thu Apr 12 11:22:24 2018 +0200
@@ -62,7 +62,7 @@
Register tmp3,
DecoratorSet decorators) {
assert_different_registers(tmp1, tmp2, tmp3, val, base);
- BarrierSetAssembler *bs = Universe::heap()->barrier_set()->barrier_set_assembler();
+ BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
bs->store_at(_masm, decorators, T_OBJECT, base, offset, val, tmp1, tmp2, tmp3, false);
}
@@ -75,7 +75,7 @@
DecoratorSet decorators) {
assert_different_registers(base, tmp1, tmp2);
assert_different_registers(dst, tmp1, tmp2);
- BarrierSetAssembler *bs = Universe::heap()->barrier_set()->barrier_set_assembler();
+ BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
bs->load_at(_masm, decorators, T_OBJECT, base, offset, dst, tmp1, tmp2, false);
}
--- a/src/hotspot/cpu/s390/c1_Runtime1_s390.cpp Thu Apr 12 11:05:42 2018 +0200
+++ b/src/hotspot/cpu/s390/c1_Runtime1_s390.cpp Thu Apr 12 11:22:24 2018 +0200
@@ -768,7 +768,7 @@
case g1_pre_barrier_slow_id:
{ // Z_R1_scratch: previous value of memory
- BarrierSet* bs = Universe::heap()->barrier_set();
+ BarrierSet* bs = BarrierSet::barrier_set();
if (bs->kind() != BarrierSet::G1BarrierSet) {
__ should_not_reach_here(FILE_AND_LINE);
break;
@@ -831,7 +831,7 @@
case g1_post_barrier_slow_id:
{ // Z_R1_scratch: oop address, address of updated memory slot
- BarrierSet* bs = Universe::heap()->barrier_set();
+ BarrierSet* bs = BarrierSet::barrier_set();
if (bs->kind() != BarrierSet::G1BarrierSet) {
__ should_not_reach_here(FILE_AND_LINE);
break;
--- a/src/hotspot/cpu/s390/gc/g1/g1BarrierSetAssembler_s390.cpp Thu Apr 12 11:05:42 2018 +0200
+++ b/src/hotspot/cpu/s390/gc/g1/g1BarrierSetAssembler_s390.cpp Thu Apr 12 11:22:24 2018 +0200
@@ -31,7 +31,6 @@
#include "gc/g1/g1BarrierSetAssembler.hpp"
#include "gc/g1/g1ThreadLocalData.hpp"
#include "gc/g1/heapRegion.hpp"
-#include "gc/shared/collectedHeap.hpp"
#include "interpreter/interp_masm.hpp"
#include "runtime/sharedRuntime.hpp"
@@ -261,7 +260,7 @@
Label callRuntime, filtered;
- CardTableBarrierSet* ct = barrier_set_cast<CardTableBarrierSet>(Universe::heap()->barrier_set());
+ CardTableBarrierSet* ct = barrier_set_cast<CardTableBarrierSet>(BarrierSet::barrier_set());
assert(sizeof(*ct->card_table()->byte_map_base()) == sizeof(jbyte), "adjust this code");
BLOCK_COMMENT("g1_write_barrier_post {");
--- a/src/hotspot/cpu/s390/gc/shared/cardTableBarrierSetAssembler_s390.cpp Thu Apr 12 11:05:42 2018 +0200
+++ b/src/hotspot/cpu/s390/gc/shared/cardTableBarrierSetAssembler_s390.cpp Thu Apr 12 11:22:24 2018 +0200
@@ -29,7 +29,6 @@
#include "gc/shared/cardTable.hpp"
#include "gc/shared/cardTableBarrierSet.hpp"
#include "gc/shared/cardTableBarrierSetAssembler.hpp"
-#include "gc/shared/collectedHeap.hpp"
#include "interpreter/interp_masm.hpp"
#define __ masm->
@@ -46,7 +45,7 @@
void CardTableBarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators, Register addr, Register count,
bool do_return) {
- CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(Universe::heap()->barrier_set());
+ CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(BarrierSet::barrier_set());
CardTable* ct = ctbs->card_table();
assert(sizeof(*ct->byte_map_base()) == sizeof(jbyte), "adjust this code");
@@ -143,7 +142,7 @@
void CardTableBarrierSetAssembler::store_check(MacroAssembler* masm, Register store_addr, Register tmp) {
// Does a store check for the oop in register obj. The content of
// register obj is destroyed afterwards.
- CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(Universe::heap()->barrier_set());
+ CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(BarrierSet::barrier_set());
CardTable* ct = ctbs->card_table();
assert(sizeof(*ct->byte_map_base()) == sizeof(jbyte), "adjust this code");
--- a/src/hotspot/cpu/s390/macroAssembler_s390.cpp Thu Apr 12 11:05:42 2018 +0200
+++ b/src/hotspot/cpu/s390/macroAssembler_s390.cpp Thu Apr 12 11:22:24 2018 +0200
@@ -3499,7 +3499,7 @@
}
void MacroAssembler::resolve_jobject(Register value, Register tmp1, Register tmp2) {
- BarrierSetAssembler* bs = Universe::heap()->barrier_set()->barrier_set_assembler();
+ BarrierSetAssembler* bs = BarrierSet::barrier_set()->barrier_set_assembler();
bs->resolve_jobject(this, value, tmp1, tmp2);
}
--- a/src/hotspot/cpu/s390/stubGenerator_s390.cpp Thu Apr 12 11:05:42 2018 +0200
+++ b/src/hotspot/cpu/s390/stubGenerator_s390.cpp Thu Apr 12 11:22:24 2018 +0200
@@ -1308,7 +1308,7 @@
decorators |= ARRAYCOPY_ALIGNED;
}
- BarrierSetAssembler *bs = Universe::heap()->barrier_set()->barrier_set_assembler();
+ BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
bs->arraycopy_prologue(_masm, decorators, T_OBJECT, Z_ARG1, Z_ARG2, Z_ARG3);
generate_disjoint_copy(aligned, size, true, true);
@@ -1400,7 +1400,7 @@
decorators |= ARRAYCOPY_ALIGNED;
}
- BarrierSetAssembler *bs = Universe::heap()->barrier_set()->barrier_set_assembler();
+ BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
bs->arraycopy_prologue(_masm, decorators, T_OBJECT, Z_ARG1, Z_ARG2, Z_ARG3);
generate_conjoint_copy(aligned, size, true); // Must preserve ARG2, ARG3.
--- a/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp Thu Apr 12 11:05:42 2018 +0200
+++ b/src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp Thu Apr 12 11:22:24 2018 +0200
@@ -512,7 +512,7 @@
__ z_bre(slow_path);
// Load the value of the referent field.
- BarrierSetAssembler *bs = Universe::heap()->barrier_set()->barrier_set_assembler();
+ BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
bs->load_at(_masm, IN_HEAP | ON_WEAK_OOP_REF, T_OBJECT,
Address(pre_val, referent_offset), pre_val, scratch1, scratch2);
--- a/src/hotspot/cpu/s390/templateTable_s390.cpp Thu Apr 12 11:05:42 2018 +0200
+++ b/src/hotspot/cpu/s390/templateTable_s390.cpp Thu Apr 12 11:22:24 2018 +0200
@@ -200,7 +200,7 @@
Register tmp3,
DecoratorSet decorators) {
assert_different_registers(tmp1, tmp2, tmp3, val, addr.base());
- BarrierSetAssembler *bs = Universe::heap()->barrier_set()->barrier_set_assembler();
+ BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
bs->store_at(_masm, decorators, T_OBJECT, addr, val, tmp1, tmp2, tmp3);
}
@@ -212,7 +212,7 @@
DecoratorSet decorators) {
assert_different_registers(addr.base(), tmp1, tmp2);
assert_different_registers(dst, tmp1, tmp2);
- BarrierSetAssembler *bs = Universe::heap()->barrier_set()->barrier_set_assembler();
+ BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
bs->load_at(_masm, decorators, T_OBJECT, addr, dst, tmp1, tmp2);
}
--- a/src/hotspot/cpu/sparc/c1_Runtime1_sparc.cpp Thu Apr 12 11:05:42 2018 +0200
+++ b/src/hotspot/cpu/sparc/c1_Runtime1_sparc.cpp Thu Apr 12 11:22:24 2018 +0200
@@ -762,7 +762,7 @@
#if INCLUDE_ALL_GCS
case g1_pre_barrier_slow_id:
{ // G4: previous value of memory
- BarrierSet* bs = Universe::heap()->barrier_set();
+ BarrierSet* bs = BarrierSet::barrier_set();
if (bs->kind() != BarrierSet::G1BarrierSet) {
__ save_frame(0);
__ set((int)id, O1);
@@ -827,7 +827,7 @@
case g1_post_barrier_slow_id:
{
- BarrierSet* bs = Universe::heap()->barrier_set();
+ BarrierSet* bs = BarrierSet::barrier_set();
if (bs->kind() != BarrierSet::G1BarrierSet) {
__ save_frame(0);
__ set((int)id, O1);
--- a/src/hotspot/cpu/sparc/gc/g1/g1BarrierSetAssembler_sparc.cpp Thu Apr 12 11:05:42 2018 +0200
+++ b/src/hotspot/cpu/sparc/gc/g1/g1BarrierSetAssembler_sparc.cpp Thu Apr 12 11:22:24 2018 +0200
@@ -29,7 +29,6 @@
#include "gc/g1/g1BarrierSetAssembler.hpp"
#include "gc/g1/g1ThreadLocalData.hpp"
#include "gc/g1/heapRegion.hpp"
-#include "gc/shared/collectedHeap.hpp"
#include "interpreter/interp_masm.hpp"
#include "runtime/sharedRuntime.hpp"
#include "utilities/macros.hpp"
@@ -362,7 +361,7 @@
if (new_val == G0) return;
- G1BarrierSet* bs = barrier_set_cast<G1BarrierSet>(Universe::heap()->barrier_set());
+ G1BarrierSet* bs = barrier_set_cast<G1BarrierSet>(BarrierSet::barrier_set());
if (G1RSBarrierRegionFilter) {
__ xor3(store_addr, new_val, tmp);
--- a/src/hotspot/cpu/sparc/gc/shared/cardTableBarrierSetAssembler_sparc.cpp Thu Apr 12 11:05:42 2018 +0200
+++ b/src/hotspot/cpu/sparc/gc/shared/cardTableBarrierSetAssembler_sparc.cpp Thu Apr 12 11:22:24 2018 +0200
@@ -29,7 +29,6 @@
#include "gc/shared/cardTable.hpp"
#include "gc/shared/cardTableBarrierSet.hpp"
#include "gc/shared/cardTableBarrierSetAssembler.hpp"
-#include "gc/shared/collectedHeap.hpp"
#include "interpreter/interp_masm.hpp"
#define __ masm->
@@ -44,7 +43,7 @@
void CardTableBarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators,
Register addr, Register count, Register tmp) {
- CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(Universe::heap()->barrier_set());
+ CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(BarrierSet::barrier_set());
CardTable* ct = ctbs->card_table();
assert(sizeof(*ct->byte_map_base()) == sizeof(jbyte), "adjust this code");
assert_different_registers(addr, count, tmp);
@@ -83,7 +82,7 @@
void CardTableBarrierSetAssembler::card_write_barrier_post(MacroAssembler* masm, Register store_addr, Register new_val, Register tmp) {
// If we're writing constant NULL, we can skip the write barrier.
if (new_val == G0) return;
- CardTableBarrierSet* bs = barrier_set_cast<CardTableBarrierSet>(Universe::heap()->barrier_set());
+ CardTableBarrierSet* bs = barrier_set_cast<CardTableBarrierSet>(BarrierSet::barrier_set());
card_table_write(masm, bs->card_table()->byte_map_base(), tmp, store_addr);
}
--- a/src/hotspot/cpu/sparc/stubGenerator_sparc.cpp Thu Apr 12 11:05:42 2018 +0200
+++ b/src/hotspot/cpu/sparc/stubGenerator_sparc.cpp Thu Apr 12 11:22:24 2018 +0200
@@ -2277,7 +2277,7 @@
decorators |= ARRAYCOPY_ALIGNED;
}
- BarrierSetAssembler *bs = Universe::heap()->barrier_set()->barrier_set_assembler();
+ BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
bs->arraycopy_prologue(_masm, decorators, T_OBJECT, from, to, count);
assert_clean_int(count, O3); // Make sure 'count' is clean int.
@@ -2334,7 +2334,7 @@
decorators |= ARRAYCOPY_ALIGNED;
}
- BarrierSetAssembler *bs = Universe::heap()->barrier_set()->barrier_set_assembler();
+ BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
bs->arraycopy_prologue(_masm, decorators, T_OBJECT, from, to, count);
if (UseCompressedOops) {
@@ -2451,7 +2451,7 @@
decorators |= AS_DEST_NOT_INITIALIZED;
}
- BarrierSetAssembler *bs = Universe::heap()->barrier_set()->barrier_set_assembler();
+ BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
bs->arraycopy_prologue(_masm, decorators, T_OBJECT, O0_from, O1_to, O2_count);
Label load_element, store_element, do_epilogue, fail, done;
--- a/src/hotspot/cpu/x86/c1_Runtime1_x86.cpp Thu Apr 12 11:05:42 2018 +0200
+++ b/src/hotspot/cpu/x86/c1_Runtime1_x86.cpp Thu Apr 12 11:22:24 2018 +0200
@@ -1563,7 +1563,7 @@
StubFrame f(sasm, "g1_pre_barrier", dont_gc_arguments);
// arg0 : previous value of memory
- BarrierSet* bs = Universe::heap()->barrier_set();
+ BarrierSet* bs = BarrierSet::barrier_set();
if (bs->kind() != BarrierSet::G1BarrierSet) {
__ movptr(rax, (int)id);
__ call_RT(noreg, noreg, CAST_FROM_FN_PTR(address, unimplemented_entry), rax);
@@ -1630,7 +1630,7 @@
{
StubFrame f(sasm, "g1_post_barrier", dont_gc_arguments);
- BarrierSet* bs = Universe::heap()->barrier_set();
+ BarrierSet* bs = BarrierSet::barrier_set();
if (bs->kind() != BarrierSet::G1BarrierSet) {
__ movptr(rax, (int)id);
__ call_RT(noreg, noreg, CAST_FROM_FN_PTR(address, unimplemented_entry), rax);
--- a/src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.cpp Thu Apr 12 11:05:42 2018 +0200
+++ b/src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.cpp Thu Apr 12 11:22:24 2018 +0200
@@ -29,7 +29,6 @@
#include "gc/g1/g1CardTable.hpp"
#include "gc/g1/g1ThreadLocalData.hpp"
#include "gc/g1/heapRegion.hpp"
-#include "gc/shared/collectedHeap.hpp"
#include "interpreter/interp_masm.hpp"
#include "runtime/sharedRuntime.hpp"
#include "utilities/macros.hpp"
@@ -267,7 +266,7 @@
Address buffer(thread, in_bytes(G1ThreadLocalData::dirty_card_queue_buffer_offset()));
CardTableBarrierSet* ct =
- barrier_set_cast<CardTableBarrierSet>(Universe::heap()->barrier_set());
+ barrier_set_cast<CardTableBarrierSet>(BarrierSet::barrier_set());
assert(sizeof(*ct->card_table()->byte_map_base()) == sizeof(jbyte), "adjust this code");
Label done;
--- a/src/hotspot/cpu/x86/gc/shared/cardTableBarrierSetAssembler_x86.cpp Thu Apr 12 11:05:42 2018 +0200
+++ b/src/hotspot/cpu/x86/gc/shared/cardTableBarrierSetAssembler_x86.cpp Thu Apr 12 11:22:24 2018 +0200
@@ -28,7 +28,6 @@
#include "gc/shared/cardTable.hpp"
#include "gc/shared/cardTableBarrierSet.hpp"
#include "gc/shared/cardTableBarrierSetAssembler.hpp"
-#include "gc/shared/collectedHeap.hpp"
#define __ masm->
@@ -44,7 +43,7 @@
void CardTableBarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators,
Register addr, Register count, Register tmp) {
- BarrierSet *bs = Universe::heap()->barrier_set();
+ BarrierSet *bs = BarrierSet::barrier_set();
CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(bs);
CardTable* ct = ctbs->card_table();
assert(sizeof(*ct->byte_map_base()) == sizeof(jbyte), "adjust this code");
@@ -89,7 +88,7 @@
void CardTableBarrierSetAssembler::store_check(MacroAssembler* masm, Register obj, Address dst) {
// Does a store check for the oop in register obj. The content of
// register obj is destroyed afterwards.
- BarrierSet* bs = Universe::heap()->barrier_set();
+ BarrierSet* bs = BarrierSet::barrier_set();
CardTableBarrierSet* ct = barrier_set_cast<CardTableBarrierSet>(bs);
assert(sizeof(*ct->card_table()->byte_map_base()) == sizeof(jbyte), "adjust this code");
--- a/src/hotspot/cpu/x86/stubGenerator_x86_32.cpp Thu Apr 12 11:05:42 2018 +0200
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_32.cpp Thu Apr 12 11:22:24 2018 +0200
@@ -845,7 +845,7 @@
decorators |= ARRAYCOPY_ALIGNED;
}
- BarrierSetAssembler *bs = Universe::heap()->barrier_set()->barrier_set_assembler();
+ BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
bs->arraycopy_prologue(_masm, decorators, t, from, to, count);
__ subptr(to, from); // to --> to_from
@@ -1034,7 +1034,7 @@
decorators |= ARRAYCOPY_ALIGNED;
}
- BarrierSetAssembler *bs = Universe::heap()->barrier_set()->barrier_set_assembler();
+ BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
bs->arraycopy_prologue(_masm, decorators, t, from, to, count);
// copy from high to low
@@ -1389,7 +1389,7 @@
}
BasicType type = T_OBJECT;
- BarrierSetAssembler *bs = Universe::heap()->barrier_set()->barrier_set_assembler();
+ BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
bs->arraycopy_prologue(_masm, decorators, type, from, to, count);
// Copy from low to high addresses, indexed from the end of each array.
--- a/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp Thu Apr 12 11:05:42 2018 +0200
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp Thu Apr 12 11:22:24 2018 +0200
@@ -1829,7 +1829,7 @@
}
BasicType type = is_oop ? T_OBJECT : T_INT;
- BarrierSetAssembler *bs = Universe::heap()->barrier_set()->barrier_set_assembler();
+ BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
bs->arraycopy_prologue(_masm, decorators, type, from, to, count);
// 'from', 'to' and 'count' are now valid
@@ -1923,7 +1923,7 @@
}
BasicType type = is_oop ? T_OBJECT : T_INT;
- BarrierSetAssembler *bs = Universe::heap()->barrier_set()->barrier_set_assembler();
+ BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
// no registers are destroyed by this call
bs->arraycopy_prologue(_masm, decorators, type, from, to, count);
@@ -2027,7 +2027,7 @@
}
BasicType type = is_oop ? T_OBJECT : T_LONG;
- BarrierSetAssembler *bs = Universe::heap()->barrier_set()->barrier_set_assembler();
+ BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
bs->arraycopy_prologue(_masm, decorators, type, from, to, qword_count);
// Copy from low to high addresses. Use 'to' as scratch.
@@ -2120,7 +2120,7 @@
}
BasicType type = is_oop ? T_OBJECT : T_LONG;
- BarrierSetAssembler *bs = Universe::heap()->barrier_set()->barrier_set_assembler();
+ BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
bs->arraycopy_prologue(_masm, decorators, type, from, to, qword_count);
__ jmp(L_copy_bytes);
@@ -2300,7 +2300,7 @@
}
BasicType type = T_OBJECT;
- BarrierSetAssembler *bs = Universe::heap()->barrier_set()->barrier_set_assembler();
+ BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
bs->arraycopy_prologue(_masm, decorators, type, from, to, count);
// Copy from low to high addresses, indexed from the end of each array.
--- a/src/hotspot/os_cpu/linux_arm/thread_linux_arm.cpp Thu Apr 12 11:05:42 2018 +0200
+++ b/src/hotspot/os_cpu/linux_arm/thread_linux_arm.cpp Thu Apr 12 11:22:24 2018 +0200
@@ -46,7 +46,7 @@
}
void JavaThread::cache_global_variables() {
- BarrierSet* bs = Universe::heap()->barrier_set();
+ BarrierSet* bs = BarrierSet::barrier_set();
const bool allow_shared_alloc =
Universe::heap()->supports_inline_contig_alloc();
--- a/src/hotspot/share/c1/c1_LIRAssembler.cpp Thu Apr 12 11:05:42 2018 +0200
+++ b/src/hotspot/share/c1/c1_LIRAssembler.cpp Thu Apr 12 11:22:24 2018 +0200
@@ -30,7 +30,7 @@
#include "c1/c1_MacroAssembler.hpp"
#include "c1/c1_ValueStack.hpp"
#include "ci/ciInstance.hpp"
-#include "gc/shared/collectedHeap.hpp"
+#include "gc/shared/barrierSet.hpp"
#include "runtime/os.hpp"
void LIR_Assembler::patching_epilog(PatchingStub* patch, LIR_PatchCode patch_code, Register obj, CodeEmitInfo* info) {
@@ -100,7 +100,7 @@
LIR_Assembler::LIR_Assembler(Compilation* c):
_compilation(c)
, _masm(c->masm())
- , _bs(Universe::heap()->barrier_set())
+ , _bs(BarrierSet::barrier_set())
, _frame_map(c->frame_map())
, _current_block(NULL)
, _pending_non_safepoint(NULL)
--- a/src/hotspot/share/c1/c1_LIRGenerator.cpp Thu Apr 12 11:05:42 2018 +0200
+++ b/src/hotspot/share/c1/c1_LIRGenerator.cpp Thu Apr 12 11:22:24 2018 +0200
@@ -314,7 +314,7 @@
void LIRGenerator::init() {
- _bs = Universe::heap()->barrier_set();
+ _bs = BarrierSet::barrier_set();
}
--- a/src/hotspot/share/ci/ciUtilities.cpp Thu Apr 12 11:05:42 2018 +0200
+++ b/src/hotspot/share/ci/ciUtilities.cpp Thu Apr 12 11:22:24 2018 +0200
@@ -51,7 +51,7 @@
// ------------------------------------------------------------------
// card_table_base
jbyte *ci_card_table_address() {
- BarrierSet* bs = Universe::heap()->barrier_set();
+ BarrierSet* bs = BarrierSet::barrier_set();
CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(bs);
CardTable* ct = ctbs->card_table();
assert(sizeof(*ct->byte_map_base()) == sizeof(jbyte), "adjust users of this code");
--- a/src/hotspot/share/code/relocInfo_ext.cpp Thu Apr 12 11:05:42 2018 +0200
+++ b/src/hotspot/share/code/relocInfo_ext.cpp Thu Apr 12 11:22:24 2018 +0200
@@ -59,7 +59,7 @@
return (address)Universe::heap()->end_addr();
}
case symbolic_Relocation::card_table_reference: {
- BarrierSet* bs = Universe::heap()->barrier_set();
+ BarrierSet* bs = BarrierSet::barrier_set();
CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(bs);
CardTable* ct = ctbs->card_table();
return (address)ct->byte_map_base();
--- a/src/hotspot/share/compiler/disassembler.cpp Thu Apr 12 11:05:42 2018 +0200
+++ b/src/hotspot/share/compiler/disassembler.cpp Thu Apr 12 11:22:24 2018 +0200
@@ -318,7 +318,7 @@
return;
}
- BarrierSet* bs = Universe::heap()->barrier_set();
+ BarrierSet* bs = BarrierSet::barrier_set();
if (bs->is_a(BarrierSet::CardTableBarrierSet) &&
adr == ci_card_table_address_as<address>()) {
st->print("word_map_base");
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp Thu Apr 12 11:05:42 2018 +0200
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp Thu Apr 12 11:22:24 2018 +0200
@@ -1542,7 +1542,7 @@
G1BarrierSet* bs = new G1BarrierSet(ct);
bs->initialize();
assert(bs->is_a(BarrierSet::G1BarrierSet), "sanity");
- set_barrier_set(bs);
+ BarrierSet::set_barrier_set(bs);
_card_table = ct;
// Create the hot card cache.
--- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp Thu Apr 12 11:05:42 2018 +0200
+++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp Thu Apr 12 11:22:24 2018 +0200
@@ -73,7 +73,7 @@
card_table->initialize();
CardTableBarrierSet* const barrier_set = new CardTableBarrierSet(card_table);
barrier_set->initialize();
- set_barrier_set(barrier_set);
+ BarrierSet::set_barrier_set(barrier_set);
// Make up the generations
// Calculate the maximum size that a generation can grow. This
@@ -627,7 +627,7 @@
}
CardTableBarrierSet* ParallelScavengeHeap::barrier_set() {
- return barrier_set_cast<CardTableBarrierSet>(CollectedHeap::barrier_set());
+ return barrier_set_cast<CardTableBarrierSet>(BarrierSet::barrier_set());
}
PSCardTable* ParallelScavengeHeap::card_table() {
--- a/src/hotspot/share/gc/shared/collectedHeap.cpp Thu Apr 12 11:05:42 2018 +0200
+++ b/src/hotspot/share/gc/shared/collectedHeap.cpp Thu Apr 12 11:22:24 2018 +0200
@@ -137,7 +137,7 @@
print_extended_on(st);
st->cr();
- _barrier_set->print_on(st);
+ BarrierSet::barrier_set()->print_on(st);
}
void CollectedHeap::trace_heap(GCWhen::Type when, const GCTracer* gc_tracer) {
@@ -176,7 +176,6 @@
CollectedHeap::CollectedHeap() :
- _barrier_set(NULL),
_is_gc_active(false),
_total_collections(0),
_total_full_collections(0),
@@ -311,11 +310,6 @@
} while (true); // Until a GC is done
}
-void CollectedHeap::set_barrier_set(BarrierSet* barrier_set) {
- _barrier_set = barrier_set;
- BarrierSet::set_barrier_set(barrier_set);
-}
-
#ifndef PRODUCT
void CollectedHeap::check_for_bad_heap_word_value(HeapWord* addr, size_t size) {
if (CheckMemoryInitialization && ZapUnusedHeapArea) {
@@ -522,7 +516,7 @@
assert(!use_tlab || jtiwh.length() > 0,
"Attempt to fill tlabs before main thread has been added"
" to threads list is doomed to failure!");
- BarrierSet *bs = barrier_set();
+ BarrierSet *bs = BarrierSet::barrier_set();
for (; JavaThread *thread = jtiwh.next(); ) {
if (use_tlab) thread->tlab().make_parsable(retire_tlabs);
bs->make_parsable(thread);
--- a/src/hotspot/share/gc/shared/collectedHeap.hpp Thu Apr 12 11:05:42 2018 +0200
+++ b/src/hotspot/share/gc/shared/collectedHeap.hpp Thu Apr 12 11:22:24 2018 +0200
@@ -105,7 +105,6 @@
MemRegion _reserved;
protected:
- BarrierSet* _barrier_set;
bool _is_gc_active;
// Used for filler objects (static, but initialized in ctor).
@@ -417,10 +416,6 @@
size_t size,
Metaspace::MetadataType mdtype);
- // Returns the barrier set for this heap
- BarrierSet* barrier_set() { return _barrier_set; }
- void set_barrier_set(BarrierSet* barrier_set);
-
// Returns "true" iff there is a stop-world GC in progress. (I assume
// that it should answer "false" for the concurrent part of a concurrent
// collector -- dld).
--- a/src/hotspot/share/gc/shared/genCollectedHeap.cpp Thu Apr 12 11:05:42 2018 +0200
+++ b/src/hotspot/share/gc/shared/genCollectedHeap.cpp Thu Apr 12 11:22:24 2018 +0200
@@ -114,7 +114,7 @@
_rem_set->initialize();
CardTableBarrierSet *bs = new CardTableBarrierSet(_rem_set);
bs->initialize();
- set_barrier_set(bs);
+ BarrierSet::set_barrier_set(bs);
ReservedSpace young_rs = heap_rs.first_part(_young_gen_spec->max_size(), false, false);
_young_gen = _young_gen_spec->init(young_rs, rem_set());
--- a/src/hotspot/share/gc/shared/vmStructs_gc.hpp Thu Apr 12 11:05:42 2018 +0200
+++ b/src/hotspot/share/gc/shared/vmStructs_gc.hpp Thu Apr 12 11:22:24 2018 +0200
@@ -103,7 +103,6 @@
nonstatic_field(CardTableBarrierSet, _card_table, CardTable*) \
\
nonstatic_field(CollectedHeap, _reserved, MemRegion) \
- nonstatic_field(CollectedHeap, _barrier_set, BarrierSet*) \
nonstatic_field(CollectedHeap, _is_gc_active, bool) \
nonstatic_field(CollectedHeap, _total_collections, unsigned int) \
\
--- a/src/hotspot/share/interpreter/templateTable.cpp Thu Apr 12 11:05:42 2018 +0200
+++ b/src/hotspot/share/interpreter/templateTable.cpp Thu Apr 12 11:22:24 2018 +0200
@@ -23,7 +23,7 @@
*/
#include "precompiled.hpp"
-#include "gc/shared/collectedHeap.hpp"
+#include "gc/shared/barrierSet.hpp"
#include "interpreter/interp_masm.hpp"
#include "interpreter/templateTable.hpp"
#include "runtime/timerTrace.hpp"
@@ -247,7 +247,7 @@
// Initialize table
TraceTime timer("TemplateTable initialization", TRACETIME_LOG(Info, startuptime));
- _bs = Universe::heap()->barrier_set();
+ _bs = BarrierSet::barrier_set();
// For better readability
const char _ = ' ';
--- a/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp Thu Apr 12 11:05:42 2018 +0200
+++ b/src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp Thu Apr 12 11:22:24 2018 +0200
@@ -23,6 +23,7 @@
// no precompiled headers
#include "ci/ciUtilities.hpp"
+#include "gc/shared/barrierSet.hpp"
#include "memory/oopFactory.hpp"
#include "oops/objArrayOop.inline.hpp"
#include "jvmci/jvmciRuntime.hpp"
@@ -120,7 +121,7 @@
symbol_init = (address) vmSymbols::object_initializer_name();
symbol_clinit = (address) vmSymbols::class_initializer_name();
- BarrierSet* bs = Universe::heap()->barrier_set();
+ BarrierSet* bs = BarrierSet::barrier_set();
if (bs->is_a(BarrierSet::CardTableBarrierSet)) {
jbyte* base = ci_card_table_address();
assert(base != NULL, "unexpected byte_map_base");
--- a/src/hotspot/share/opto/graphKit.cpp Thu Apr 12 11:05:42 2018 +0200
+++ b/src/hotspot/share/opto/graphKit.cpp Thu Apr 12 11:22:24 2018 +0200
@@ -1562,7 +1562,7 @@
Node* pre_val,
BasicType bt) {
- BarrierSet* bs = Universe::heap()->barrier_set();
+ BarrierSet* bs = BarrierSet::barrier_set();
set_control(ctl);
switch (bs->kind()) {
case BarrierSet::G1BarrierSet:
@@ -1579,7 +1579,7 @@
}
bool GraphKit::can_move_pre_barrier() const {
- BarrierSet* bs = Universe::heap()->barrier_set();
+ BarrierSet* bs = BarrierSet::barrier_set();
switch (bs->kind()) {
case BarrierSet::G1BarrierSet:
return true; // Can move it if no safepoint
@@ -1601,7 +1601,7 @@
Node* val,
BasicType bt,
bool use_precise) {
- BarrierSet* bs = Universe::heap()->barrier_set();
+ BarrierSet* bs = BarrierSet::barrier_set();
set_control(ctl);
switch (bs->kind()) {
case BarrierSet::G1BarrierSet:
@@ -3814,7 +3814,7 @@
#define __ ideal.
bool GraphKit::use_ReduceInitialCardMarks() {
- BarrierSet *bs = Universe::heap()->barrier_set();
+ BarrierSet *bs = BarrierSet::barrier_set();
return bs->is_a(BarrierSet::CardTableBarrierSet)
&& barrier_set_cast<CardTableBarrierSet>(bs)->can_elide_tlab_store_barriers()
&& ReduceInitialCardMarks;
@@ -3885,7 +3885,7 @@
Node* cast = __ CastPX(__ ctrl(), adr);
// Divide by card size
- assert(Universe::heap()->barrier_set()->is_a(BarrierSet::CardTableBarrierSet),
+ assert(BarrierSet::barrier_set()->is_a(BarrierSet::CardTableBarrierSet),
"Only one we handle so far.");
Node* card_offset = __ URShiftX( cast, __ ConI(CardTable::card_shift) );
--- a/src/hotspot/share/runtime/sharedRuntime.cpp Thu Apr 12 11:05:42 2018 +0200
+++ b/src/hotspot/share/runtime/sharedRuntime.cpp Thu Apr 12 11:22:24 2018 +0200
@@ -36,6 +36,7 @@
#include "compiler/abstractCompiler.hpp"
#include "compiler/compileBroker.hpp"
#include "compiler/disassembler.hpp"
+#include "gc/shared/barrierSet.hpp"
#include "gc/shared/gcLocker.inline.hpp"
#include "interpreter/interpreter.hpp"
#include "interpreter/interpreterRuntime.hpp"
@@ -3149,6 +3150,6 @@
oop new_obj = thread->vm_result();
if (new_obj == NULL) return;
- BarrierSet *bs = Universe::heap()->barrier_set();
+ BarrierSet *bs = BarrierSet::barrier_set();
bs->on_slowpath_allocation_exit(thread, new_obj);
}