From: Paul Floyd <pjfloyd@wanadoo.fr>
Date: Sun, 4 May 2025 06:55:45 +0000 (+0200)
Subject: Bug 503677 - duplicated-cond compiler warning in dis_RV64M
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=09c161e6e0ee8ee057d81cfb71c0d98b16f36a19;p=thirdparty%2Fvalgrind.git

Bug 503677 - duplicated-cond compiler warning in dis_RV64M
---

diff --git a/NEWS b/NEWS
index 71c389c53..b69dc84f8 100644
--- a/NEWS
+++ b/NEWS
@@ -24,6 +24,7 @@ than mailing the developers (or mailing lists) directly -- bugs that
 are not entered into bugzilla tend to get forgotten about or ignored.
 
 503641  close_range syscalls started failing with 3.25.0
+503677  duplicated-cond compiler warning in dis_RV64M
 
 To see details of a given bug, visit
   https://bugs.kde.org/show_bug.cgi?id=XXXXXX
diff --git a/VEX/priv/guest_riscv64_toIR.c b/VEX/priv/guest_riscv64_toIR.c
index 5d9b903c9..393a7ca7d 100644
--- a/VEX/priv/guest_riscv64_toIR.c
+++ b/VEX/priv/guest_riscv64_toIR.c
@@ -1754,8 +1754,6 @@ static Bool dis_RV64M(/*MB_OUT*/ DisResult* dres,
       UInt rs1    = INSN(19, 15);
       UInt rs2    = INSN(24, 20);
       if (funct3 == 0b010) {
-         /* Invalid {MUL,DIV,REM}<x>, fall through. */
-      } else if (funct3 == 0b010) {
          /* MULHSU, not currently handled, fall through. */
       } else {
          if (rd != 0) {