Skip to content
Open
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: 2 additions & 2 deletions src/hotspot/cpu/s390/gc/shared/barrierSetAssembler_s390.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -116,15 +116,15 @@ void BarrierSetAssembler::resolve_jobject(MacroAssembler* masm, Register value,
__ z_bre(done); // Use null result as-is.

__ z_tmll(value, JNIHandles::tag_mask);
__ z_btrue(tagged); // not zero
__ branch_optimized(Assembler::bcondNotAllZero, tagged); // not zero

// Resolve Local handle
__ access_load_at(T_OBJECT, IN_NATIVE | AS_RAW, Address(value, 0), value, tmp1, tmp2);
__ z_bru(verify);

__ bind(tagged);
__ testbit(value, exact_log2(JNIHandles::TypeTag::weak_global)); // test for weak tag
__ z_btrue(weak_tag);
__ branch_optimized(Assembler::bcondNotAllZero, weak_tag);

// resolve global handle
__ access_load_at(T_OBJECT, IN_NATIVE, Address(value, -JNIHandles::TypeTag::global), value, tmp1, tmp2);
Expand Down