archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8201362: Remove CollectedHeap::barrier_set()

Browse source 
Reviewed-by: shade, rkennke
This commit is contained in:
Per Lidén 2018-04-12 11:22:24 +02:00
parent 23c1371590
commit ec504ecf84
52 changed files with 92 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/hotspot/cpu/arm/interp_masm_arm.cpp
View file

@ -410,7 +410,7 @@ void InterpreterMacroAssembler::gen_subtype_check(Register Rsub_klass,
// 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 @@ void InterpreterMacroAssembler::set_card(Register card_table_base, Address card_
#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.