Skip to content

Commit fc546d6

Browse files
committed
8273378: Shenandoah: Remove the remaining uses of os::is_MP
Reviewed-by: aph, zgu
1 parent 7bd4f49 commit fc546d6

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp

+6-3
Original file line numberDiff line numberDiff line change
@@ -682,13 +682,14 @@ void ShenandoahBarrierSetAssembler::cmpxchg_oop(MacroAssembler* masm,
682682
//
683683
// Try to CAS with given arguments. If successful, then we are done.
684684

685-
if (os::is_MP()) __ lock();
686685
#ifdef _LP64
687686
if (UseCompressedOops) {
687+
__ lock();
688688
__ cmpxchgl(newval, addr);
689689
} else
690690
#endif
691691
{
692+
__ lock();
692693
__ cmpxchgptr(newval, addr);
693694
}
694695
__ jcc(Assembler::equal, L_success);
@@ -765,13 +766,14 @@ void ShenandoahBarrierSetAssembler::cmpxchg_oop(MacroAssembler* masm,
765766
}
766767
#endif
767768

768-
if (os::is_MP()) __ lock();
769769
#ifdef _LP64
770770
if (UseCompressedOops) {
771+
__ lock();
771772
__ cmpxchgl(tmp2, addr);
772773
} else
773774
#endif
774775
{
776+
__ lock();
775777
__ cmpxchgptr(tmp2, addr);
776778
}
777779

@@ -791,13 +793,14 @@ void ShenandoahBarrierSetAssembler::cmpxchg_oop(MacroAssembler* masm,
791793
__ movptr(oldval, tmp2);
792794
}
793795

794-
if (os::is_MP()) __ lock();
795796
#ifdef _LP64
796797
if (UseCompressedOops) {
798+
__ lock();
797799
__ cmpxchgl(newval, addr);
798800
} else
799801
#endif
800802
{
803+
__ lock();
801804
__ cmpxchgptr(newval, addr);
802805
}
803806
if (!exchange) {

0 commit comments

Comments
 (0)