From: Taylor Simpson Date: Thu, 30 Nov 2023 18:39:55 +0000 (-0700) Subject: Hexagon (target/hexagon) Fix shadow variable when idef-parser is off X-Git-Tag: v9.0.0-rc0~98^2~13 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ccdae09a8054731fbf49d5f223ff1903408a5ac3;p=thirdparty%2Fqemu.git Hexagon (target/hexagon) Fix shadow variable when idef-parser is off 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 Reviewed-by: Brian Cain Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20231130183955.54314-1-ltaylorsimpson@gmail.com> Signed-off-by: Brian Cain --- diff --git a/target/hexagon/macros.h b/target/hexagon/macros.h index 9a51b5709be..f99390e2a85 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); \ } \