aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>2023-09-14 17:39:37 +0200
committerP-E-P <32375388+P-E-P@users.noreply.github.com>2024-03-26 17:35:02 +0000
commit6d4c2c9f5dd200f26d152ab8c170a930591d11ad (patch)
tree01c47506bc8688b4a9f210e0167942feca59f9ac
parenta62e1c60026ed8b7c3616c030e45377cac114609 (diff)
downloadgcc-6d4c2c9f5dd200f26d152ab8c170a930591d11ad.zip
gcc-6d4c2c9f5dd200f26d152ab8c170a930591d11ad.tar.gz
gcc-6d4c2c9f5dd200f26d152ab8c170a930591d11ad.tar.bz2
Fix duplicate detection
The resolver did report duplicate symbols when being run multiple times even if the node id was the same. This commit adds an additional condition, the error will only be reported if the existing node id is different from the current node id. gcc/rust/ChangeLog: * resolve/rust-toplevel-name-resolver-2.0.cc (TopLevel::insert_or_error_out): Add new constraint to duplicate errors. Signed-off-by: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>
-rw-r--r--gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc5
1 files changed, 1 insertions, 4 deletions
diff --git a/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc b/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc
index 446a1c6..407892b 100644
--- a/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc
+++ b/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc
@@ -47,11 +47,8 @@ TopLevel::insert_or_error_out (const Identifier &identifier,
auto result = ctx.insert (identifier, node_id, ns);
- if (!result)
+ if (!result && result.error ().existing != node_id)
{
- // can we do something like check if the node id is the same? if it is the
- // same, it's not an error, just the resolver running multiple times?
-
rich_location rich_loc (line_table, locus);
rich_loc.add_range (node_locations[result.error ().existing]);