From: Richard Henderson <richard.henderson@linaro.org>
Date: Tue, 9 Nov 2021 22:17:59 +0000 (+0100)
Subject: tcg/optimize: Add an extra cast to fold_extract2
X-Git-Tag: nvme-fixes-for-6.2-pull-request~16^2~3
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=225bec0c0e42b5b0be3007fd01de6e082a8ee9bf;p=qemu-nvme.git

tcg/optimize: Add an extra cast to fold_extract2

There is no bug, but silence a warning about computation
in int32_t being assigned to a uint64_t.

Reported-by: Coverity CID 1465220
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---

diff --git a/tcg/optimize.c b/tcg/optimize.c
index dbb2d46e88..2397f2cf93 100644
--- a/tcg/optimize.c
+++ b/tcg/optimize.c
@@ -1365,7 +1365,7 @@ static bool fold_extract2(OptContext *ctx, TCGOp *op)
             v2 <<= 64 - shr;
         } else {
             v1 = (uint32_t)v1 >> shr;
-            v2 = (int32_t)v2 << (32 - shr);
+            v2 = (uint64_t)((int32_t)v2 << (32 - shr));
         }
         return tcg_opt_gen_movi(ctx, op, op->args[0], v1 | v2);
     }