From d3be5dab558ab91789800a03fc2c1dc3c529eaf5 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Thu, 7 Jul 2022 21:41:17 +0930 Subject: [PATCH] gas: arm -mwarn-syms duplicates arm gas is only supposed to warn once per symbol for -mwarn-syms, but doesn't because the str_hash_find added with commit 629310abec88 always returns NULL. That's so because the str_hash_insert inserts a NULL value for the key,value pair. Let str_hash_insert do the job instead. * config/tc-arm.c (arm_tc_equal_in_insn): Correct already_warned logic. * testsuite/gas/arm/pr18347.s: Modify to generate duplicate warning without this patch. --- gas/config/tc-arm.c | 7 ++----- gas/testsuite/gas/arm/pr18347.s | 1 + 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c index 2e6d175482e..68fd6896607 100644 --- a/gas/config/tc-arm.c +++ b/gas/config/tc-arm.c @@ -28120,11 +28120,8 @@ arm_tc_equal_in_insn (int c ATTRIBUTE_UNUSED, char * name) already_warned = str_htab_create (); /* Only warn about the symbol once. To keep the code simple we let str_hash_insert do the lookup for us. */ - if (str_hash_find (already_warned, nbuf) == NULL) - { - as_warn (_("[-mwarn-syms]: Assignment makes a symbol match an ARM instruction: %s"), name); - str_hash_insert (already_warned, nbuf, NULL, 0); - } + if (str_hash_insert (already_warned, nbuf, NULL, 0) == NULL) + as_warn (_("[-mwarn-syms]: Assignment makes a symbol match an ARM instruction: %s"), name); } else free (nbuf); diff --git a/gas/testsuite/gas/arm/pr18347.s b/gas/testsuite/gas/arm/pr18347.s index 591d69baa83..64a16cb7678 100644 --- a/gas/testsuite/gas/arm/pr18347.s +++ b/gas/testsuite/gas/arm/pr18347.s @@ -1,5 +1,6 @@ MOV r1, r0 LDR =garbage // no destination register + LDR =garbage // and it should only warn once MOV r2, r3 // The warning should only be triggered by a "foo = bar" -- 2.30.2