src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp

*** 1580,11 ***
      casl(addr, newval, cmpval);
    }
  }
  
  
! void LIR_Assembler::cmove(LIR_Condition condition, LIR_Opr opr1, LIR_Opr opr2, LIR_Opr result, BasicType type) {
  
    Assembler::Condition acond, ncond;
    switch (condition) {
    case lir_cond_equal:        acond = Assembler::EQ; ncond = Assembler::NE; break;
    case lir_cond_notEqual:     acond = Assembler::NE; ncond = Assembler::EQ; break;
--- 1580,13 ---
      casl(addr, newval, cmpval);
    }
  }
  
  
! void LIR_Assembler::cmove(LIR_Condition condition, LIR_Opr opr1, LIR_Opr opr2, LIR_Opr result, BasicType type,
+                           LIR_Opr cmp_opr1, LIR_Opr cmp_opr2) {
+   assert(cmp_opr1 == LIR_OprFact::illegalOpr && cmp_opr2 == LIR_OprFact::illegalOpr, "unnecessary cmp oprs on aarch64");
  
    Assembler::Condition acond, ncond;
    switch (condition) {
    case lir_cond_equal:        acond = Assembler::EQ; ncond = Assembler::NE; break;
    case lir_cond_notEqual:     acond = Assembler::NE; ncond = Assembler::EQ; break;