Mesa (staging/21.2): nir: fix shadowed variable in nir_lower_bit_size.c

[GitLab Mirror]

Module: Mesa
Branch: staging/21.2
Commit: 1b9a3aa5d78a9ca2337087ff7e6f1f15f6ae2c4c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1b9a3aa5d78a9ca2337087ff7e6f1f15f6ae2c4c

Author: Filip Gawin <filip.gawin at zoho.com>
Date:   Tue Aug 24 21:28:19 2021 +0200

nir: fix shadowed variable in nir_lower_bit_size.c

Fixes: 6d792989924 ("nir/lower_bit_size: fix lowering of {imul,umul}_high")

Reviewed-by: Timur Kristóf <timur.kristof at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12527>
(cherry picked from commit 9083e9a483696672514c18cec0a91ffd480f0591)

---

 .pick_status.json                     | 2 +-
 src/compiler/nir/nir_lower_bit_size.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 434cbb74585..39020ea6294 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -454,7 +454,7 @@
         "description": "nir: fix shadowed variable in nir_lower_bit_size.c",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "6d792989924ce79363f181462904fa46692a99b5"
     },
diff --git a/src/compiler/nir/nir_lower_bit_size.c b/src/compiler/nir/nir_lower_bit_size.c
index 5473ea7c0c5..a4c6527b437 100644
--- a/src/compiler/nir/nir_lower_bit_size.c
+++ b/src/compiler/nir/nir_lower_bit_size.c
@@ -74,7 +74,7 @@ lower_alu_instr(nir_builder *bld, nir_alu_instr *alu, unsigned bit_size)
    nir_ssa_def *lowered_dst = NULL;
    if (op == nir_op_imul_high || op == nir_op_umul_high) {
       assert(dst_bit_size * 2 <= bit_size);
-      nir_ssa_def *lowered_dst = nir_imul(bld, srcs[0], srcs[1]);
+      lowered_dst = nir_imul(bld, srcs[0], srcs[1]);
       if (nir_op_infos[op].output_type & nir_type_uint)
          lowered_dst = nir_ushr_imm(bld, lowered_dst, dst_bit_size);
       else