Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions src/hotspot/cpu/aarch64/c1_Runtime1_aarch64.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -870,10 +870,6 @@ OopMapSet* Runtime1::generate_code_for(StubId id, StubAssembler* sasm) {
f.load_argument(0, r1); // r1,: index
int call_offset = __ call_RT(r0, noreg, CAST_FROM_FN_PTR(address, load_flat_array), r0, r1);

// Ensure the stores that initialize the buffer are visible
// before any subsequent store that publishes this reference.
__ membar(Assembler::StoreStore);

oop_maps = new OopMapSet();
oop_maps->add_gc_map(call_offset, map);
restore_live_registers_except_r0(sasm);
Expand Down
1 change: 0 additions & 1 deletion src/hotspot/cpu/aarch64/interp_masm_aarch64.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,6 @@ void InterpreterMacroAssembler::get_method_counters(Register method,

void InterpreterMacroAssembler::read_flat_field(Register entry, Register obj) {
call_VM(obj, CAST_FROM_FN_PTR(address, InterpreterRuntime::read_flat_field), obj, entry);
membar(Assembler::StoreStore);
}

void InterpreterMacroAssembler::write_flat_field(Register entry, Register field_offset,
Expand Down
1 change: 0 additions & 1 deletion src/hotspot/cpu/ppc/interp_masm_ppc_64.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2432,7 +2432,6 @@ void InterpreterMacroAssembler::notify_method_exit(bool is_native_method, TosSta

void InterpreterMacroAssembler::read_flat_field(Register entry, Register obj) {
call_VM(obj, CAST_FROM_FN_PTR(address, InterpreterRuntime::read_flat_field), obj, entry);
membar(Assembler::StoreStore | Assembler::LoadLoad); // for allocation and volatile load
}

void InterpreterMacroAssembler::write_flat_field(Register entry, Register tmp1, Register tmp2,
Expand Down
3 changes: 2 additions & 1 deletion src/hotspot/cpu/ppc/templateTable_ppc_64.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3417,7 +3417,8 @@ void TemplateTable::fast_accessfield(TosState state) {
if (support_IRIW_for_not_multiple_copy_atomic_cpu) { __ fence(); }
__ read_flat_field(Rcache, R17_tos);
__ verify_oop(R17_tos);
// memory barrier in read_flat_field
Comment thread
jsikstro marked this conversation as resolved.
__ twi_0(R17_tos);
__ isync();
break;
}
case Bytecodes::_fast_agetfield:
Expand Down
4 changes: 0 additions & 4 deletions src/hotspot/cpu/riscv/c1_Runtime1_riscv.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -871,10 +871,6 @@ OopMapSet* Runtime1::generate_code_for(StubId id, StubAssembler* sasm) {
f.load_argument(0, x11); // x11,: index
int call_offset = __ call_RT(x10, noreg, CAST_FROM_FN_PTR(address, load_flat_array), x10, x11);

// Ensure the stores that initialize the buffer are visible
// before many subsequent store that publishes this reference.
__ membar(MacroAssembler::StoreStore);

oop_maps = new OopMapSet();
oop_maps->add_gc_map(call_offset, map);
restore_live_registers_except_r10(sasm);
Expand Down
1 change: 0 additions & 1 deletion src/hotspot/cpu/riscv/interp_masm_riscv.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1868,7 +1868,6 @@ void InterpreterMacroAssembler::get_method_counters(Register method,

void InterpreterMacroAssembler::read_flat_field(Register entry, Register obj) {
call_VM(obj, CAST_FROM_FN_PTR(address, InterpreterRuntime::read_flat_field), obj, entry);
membar(MacroAssembler::StoreStore);
}

void InterpreterMacroAssembler::write_flat_field(Register entry, Register field_offset,
Expand Down