Skip to content

Commit 1f5134e

Browse files
committed
moving function below try_resolve_jobject_in_native
1 parent 5791d1f commit 1f5134e

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

src/hotspot/cpu/s390/gc/shared/barrierSetAssembler_s390.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,11 @@ void BarrierSetAssembler::try_resolve_jobject_in_native(MacroAssembler* masm, Re
169169
__ z_lg(obj, 0, obj); // Resolve (untagged) jobject.
170170
}
171171

172+
void BarrierSetAssembler::try_resolve_weak_handle(MacroAssembler* masm, Register obj, Register tmp, Label& slow_path) {
173+
// Load the oop from the weak handle.
174+
__ z_lg(obj, Address(obj));
175+
}
176+
172177
void BarrierSetAssembler::nmethod_entry_barrier(MacroAssembler* masm) {
173178
BarrierSetNMethod* bs_nm = BarrierSet::barrier_set()->barrier_set_nmethod();
174179
__ align(4, __ offset() + OFFSET_TO_PATCHABLE_DATA); // must align the following block which requires atomic updates
@@ -191,11 +196,6 @@ void BarrierSetAssembler::nmethod_entry_barrier(MacroAssembler* masm) {
191196
__ block_comment("} nmethod_entry_barrier (nmethod_entry_barrier)");
192197
}
193198

194-
void BarrierSetAssembler::try_resolve_weak_handle(MacroAssembler* masm, Register obj, Register tmp, Label& slow_path) {
195-
// Load the oop from the weak handle.
196-
__ z_lg(obj, Address(obj));
197-
}
198-
199199
#ifdef COMPILER2
200200

201201
OptoReg::Name BarrierSetAssembler::refine_register(const Node* node, OptoReg::Name opto_reg) const {

0 commit comments

Comments
 (0)