From a65d9e2ae830568993483d47b7780ddb39e6571b Mon Sep 17 00:00:00 2001
From: Robbin Ehn <rehn@rivosinc.com>
Date: Wed, 27 Nov 2024 08:45:20 +0100
Subject: [PATCH] Review comments

---
 src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp | 2 +-
 src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.hpp | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
index d4356579d0e87..2125f67cf9da4 100644
--- a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
+++ b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp
@@ -2003,7 +2003,7 @@ void C2_MacroAssembler::enc_cmpEqNe_imm0_branch(int cmpFlag, Register op1, Label
 }
 
 void C2_MacroAssembler::enc_cmove(int cmpFlag, Register op1, Register op2, Register dst, Register src) {
-  bool is_unsigned = (cmpFlag & unsigned_branch_mask) == unsigned_branch_mask ? true : false;
+  bool is_unsigned = (cmpFlag & unsigned_branch_mask) == unsigned_branch_mask;
   int op_select = cmpFlag & (~unsigned_branch_mask);
 
   switch (op_select) {
diff --git a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.hpp b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.hpp
index 2d14f98780dd6..a8eb0df419c64 100644
--- a/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.hpp
+++ b/src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.hpp
@@ -98,7 +98,6 @@
 
   // refer to conditional_branches and float_conditional_branches
   static const int bool_test_bits = 3;
-  static const int neg_cond_bits = 2;
   static const int unsigned_branch_mask = 1 << bool_test_bits;
   static const int double_branch_mask = 1 << bool_test_bits;