src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp

*** 1410,11 ***
    // FIXME: is full membar really needed instead of just membar_acquire?
    __ membar(MacroAssembler::Membar_mask_bits(MacroAssembler::StoreLoad | MacroAssembler::StoreStore), Rtemp);
  }
  
  
! void LIR_Assembler::cmove(LIR_Condition condition, LIR_Opr opr1, LIR_Opr opr2, LIR_Opr result, BasicType type) {
    AsmCondition acond = al;
    AsmCondition ncond = nv;
    if (opr1 != opr2) {
      switch (condition) {
        case lir_cond_equal:        acond = eq; ncond = ne; break;
--- 1410,14 ---
    // FIXME: is full membar really needed instead of just membar_acquire?
    __ membar(MacroAssembler::Membar_mask_bits(MacroAssembler::StoreLoad | MacroAssembler::StoreStore), Rtemp);
  }
  
  
! 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 arm");
+ 
    AsmCondition acond = al;
    AsmCondition ncond = nv;
    if (opr1 != opr2) {
      switch (condition) {
        case lir_cond_equal:        acond = eq; ncond = ne; break;