8295457: Make the signatures of write barrier methods consistent

Reviewed-by: tschatzl, shade
This commit is contained in:
Zixian Cai 2022-10-18 15:32:20 +00:00 committed by Aleksey Shipilev
parent 7b2e83b395
commit 5dbd495115
7 changed files with 23 additions and 23 deletions

View file

@ -2094,15 +2094,15 @@ void MacroAssembler::null_check(Register reg, int offset) {
}
void MacroAssembler::access_store_at(BasicType type, DecoratorSet decorators,
Address dst, Register src,
Address dst, Register val,
Register tmp1, Register tmp2, Register tmp3) {
BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
decorators = AccessInternal::decorator_fixup(decorators);
bool as_raw = (decorators & AS_RAW) != 0;
if (as_raw) {
bs->BarrierSetAssembler::store_at(this, decorators, type, dst, src, tmp1, tmp2, tmp3);
bs->BarrierSetAssembler::store_at(this, decorators, type, dst, val, tmp1, tmp2, tmp3);
} else {
bs->store_at(this, decorators, type, dst, src, tmp1, tmp2, tmp3);
bs->store_at(this, decorators, type, dst, val, tmp1, tmp2, tmp3);
}
}
@ -2269,9 +2269,9 @@ void MacroAssembler::decode_heap_oop(Register d, Register s) {
verify_oop_msg(d, "broken oop in decode_heap_oop");
}
void MacroAssembler::store_heap_oop(Address dst, Register src, Register tmp1,
void MacroAssembler::store_heap_oop(Address dst, Register val, Register tmp1,
Register tmp2, Register tmp3, DecoratorSet decorators) {
access_store_at(T_OBJECT, IN_HEAP | decorators, dst, src, tmp1, tmp2, tmp3);
access_store_at(T_OBJECT, IN_HEAP | decorators, dst, val, tmp1, tmp2, tmp3);
}
void MacroAssembler::load_heap_oop(Register dst, Address src, Register tmp1,