qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Brian Cain <bcain@quicinc.com>
To: <qemu-devel@nongnu.org>
Cc: <bcain@quicinc.com>, <armbru@redhat.com>,
	<richard.henderson@linaro.org>,  <philmd@linaro.org>,
	<peter.maydell@linaro.org>, <quic_mathbern@quicinc.com>,
	<stefanha@redhat.com>, <ale@rev.ng>, <anjo@rev.ng>,
	<quic_mliebel@quicinc.com>, <ltaylorsimpson@gmail.com>
Subject: [PULL 02/15] Hexagon (target/hexagon) Fix shadow variable when idef-parser is off
Date: Sun, 21 Jan 2024 22:34:48 -0800	[thread overview]
Message-ID: <20240122063501.782041-3-bcain@quicinc.com> (raw)
In-Reply-To: <20240122063501.782041-1-bcain@quicinc.com>

From: Taylor Simpson <ltaylorsimpson@gmail.com>

Adding -Werror=shadow=compatible-local causes Hexagon not to build
when idef-parser is off.  The "label" variable in CHECK_NOSHUF_PRED
shadows a variable in the surrounding code.

Signed-off-by: Taylor Simpson <ltaylorsimpson@gmail.com>
Reviewed-by: Brian Cain <bcain@quicinc.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20231130183955.54314-1-ltaylorsimpson@gmail.com>
Signed-off-by: Brian Cain <bcain@quicinc.com>
---
 target/hexagon/macros.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/target/hexagon/macros.h b/target/hexagon/macros.h
index 9a51b5709b..f99390e2a8 100644
--- a/target/hexagon/macros.h
+++ b/target/hexagon/macros.h
@@ -93,13 +93,13 @@
 
 #define CHECK_NOSHUF_PRED(GET_EA, SIZE, PRED) \
     do { \
-        TCGLabel *label = gen_new_label(); \
-        tcg_gen_brcondi_tl(TCG_COND_EQ, PRED, 0, label); \
+        TCGLabel *noshuf_label = gen_new_label(); \
+        tcg_gen_brcondi_tl(TCG_COND_EQ, PRED, 0, noshuf_label); \
         GET_EA; \
         if (insn->slot == 0 && ctx->pkt->pkt_has_store_s1) { \
             probe_noshuf_load(EA, SIZE, ctx->mem_idx); \
         } \
-        gen_set_label(label); \
+        gen_set_label(noshuf_label); \
         if (insn->slot == 0 && ctx->pkt->pkt_has_store_s1) { \
             process_store(ctx, 1); \
         } \
-- 
2.25.1


  parent reply	other threads:[~2024-01-22  6:36 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-22  6:34 [PULL 00/15] target-hexagon queue, hexagon docker Brian Cain
2024-01-22  6:34 ` [PULL 01/15] tests/docker: Hexagon toolchain update Brian Cain
2024-01-22  6:34 ` Brian Cain [this message]
2024-01-22  6:34 ` [PULL 03/15] Hexagon (target/hexagon) Clean up handling of modifier registers Brian Cain
2024-01-22  6:34 ` [PULL 04/15] Hexagon (target/hexagon) Make generators object oriented - gen_tcg_funcs Brian Cain
2024-01-22  6:34 ` [PULL 05/15] Hexagon (target/hexagon) Make generators object oriented - gen_helper_protos Brian Cain
2024-01-22  6:34 ` [PULL 06/15] Hexagon (target/hexagon) Make generators object oriented - gen_helper_funcs Brian Cain
2024-01-22  6:34 ` [PULL 07/15] Hexagon (target/hexagon) Make generators object oriented - gen_idef_parser_funcs Brian Cain
2024-01-22  6:34 ` [PULL 08/15] Hexagon (target/hexagon) Make generators object oriented - gen_op_regs Brian Cain
2024-01-22  6:34 ` [PULL 09/15] Hexagon (target/hexagon) Make generators object oriented - gen_analyze_funcs Brian Cain
2024-01-22  6:34 ` [PULL 10/15] Hexagon (target/hexagon) Remove unused WRITES_PRED_REG attribute Brian Cain
2024-01-22  6:34 ` [PULL 11/15] Hexagon (target/hexagon) Remove dead functions from hex_common.py Brian Cain
2024-01-22  6:34 ` [PULL 12/15] Hexagon (target/hexagon) Use QEMU decodetree (32-bit instructions) Brian Cain
2024-01-22  6:34 ` [PULL 13/15] Hexagon (target/hexagon) Use QEMU decodetree (16-bit instructions) Brian Cain
2024-01-22  6:35 ` [PULL 14/15] Hexagon (target/hexagon) Remove old dectree.py Brian Cain
2024-01-22  6:35 ` [PULL 15/15] target/hexagon: reduce scope of def_regnum, remove dead assignment Brian Cain
2024-01-23 16:37 ` [PULL 00/15] target-hexagon queue, hexagon docker Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240122063501.782041-3-bcain@quicinc.com \
    --to=bcain@quicinc.com \
    --cc=ale@rev.ng \
    --cc=anjo@rev.ng \
    --cc=armbru@redhat.com \
    --cc=ltaylorsimpson@gmail.com \
    --cc=peter.maydell@linaro.org \
    --cc=philmd@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=quic_mathbern@quicinc.com \
    --cc=quic_mliebel@quicinc.com \
    --cc=richard.henderson@linaro.org \
    --cc=stefanha@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).