src/hotspot/cpu/x86/templateTable_x86.cpp

@@ -2475,11 +2475,11 @@
   // assume branch is more often taken than not (loops use backward branches)
   Label taken, not_taken;
   __ pop_ptr(rdx);
 
   const int is_value_mask = markOopDesc::always_locked_pattern;
-  if (EnableValhalla && UsePointerPerturbation) {
+  if (EnableValhalla && ACmpOnValues == 1) {
     Label is_null;
     __ testptr(rdx, rdx);
     __ jcc(Assembler::zero, is_null);
     __ movptr(rbx, Address(rdx, oopDesc::mark_offset_in_bytes()));
     __ andptr(rbx, is_value_mask);

@@ -2490,11 +2490,11 @@
     __ bind(is_null);
   }
 
   __ cmpoop(rdx, rax);
 
-  if (EnableValhalla && !UsePointerPerturbation) {
+  if (EnableValhalla && ACmpOnValues != 1) {
     __ jcc(Assembler::notEqual, (cc == not_equal) ? taken : not_taken);
     __ testptr(rdx, rdx);
     __ jcc(Assembler::zero, (cc == equal) ? taken : not_taken);
     __ movptr(rbx, Address(rdx, oopDesc::mark_offset_in_bytes()));
     __ andptr(rbx, is_value_mask);