public inbox for gcc-cvs@sourceware.org help / color / mirror / Atom feed
From: Thomas Schwinge <tschwinge@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/rust/master] Fix duplicate detection Date: Tue, 7 May 2024 16:25:48 +0000 (GMT) [thread overview] Message-ID: <20240507162548.32E893870865@sourceware.org> (raw) https://gcc.gnu.org/g:6d4c2c9f5dd200f26d152ab8c170a930591d11ad commit 6d4c2c9f5dd200f26d152ab8c170a930591d11ad Author: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com> Date: Thu Sep 14 17:39:37 2023 +0200 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> Diff: --- gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc | 5 +---- 1 file changed, 1 insertion(+), 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 446a1c6a41b1..407892bb7bbd 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]);
reply other threads:[~2024-05-07 16:25 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20240507162548.32E893870865@sourceware.org \ --to=tschwinge@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ /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: linkBe 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 read-only IMAP folder(s) and NNTP newsgroup(s).