src/hotspot/cpu/aarch64/c1_LIRGenerator_aarch64.cpp

@@ -312,15 +312,11 @@
  
    set_no_result(x);
  
    // "lock" stores the address of the monitor stack slot, so this is not an oop
    LIR_Opr lock = new_register(T_INT);
-   // Need a scratch register for biased locking
-   LIR_Opr scratch = LIR_OprFact::illegalOpr;
-   if (UseBiasedLocking) {
-     scratch = new_register(T_INT);
-   }
+   LIR_Opr scratch = new_register(T_INT);
  
    CodeEmitInfo* info_for_exception = NULL;
    if (x->needs_null_check()) {
      info_for_exception = state_for(x);
    }

@@ -338,12 +334,13 @@
    LIRItem obj(x->obj(), this);
    obj.dont_load_item();
  
    LIR_Opr lock = new_register(T_INT);
    LIR_Opr obj_temp = new_register(T_INT);
+   LIR_Opr scratch = new_register(T_INT);
    set_no_result(x);
-   monitor_exit(obj_temp, lock, syncTempOpr(), LIR_OprFact::illegalOpr, x->monitor_no());
+   monitor_exit(obj_temp, lock, syncTempOpr(), scratch, x->monitor_no());
  }
  
  
  void LIRGenerator::do_NegateOp(NegateOp* x) {