From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by sourceware.org (Postfix) with ESMTPS id BF675385B510 for ; Tue, 21 Feb 2023 12:03:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org BF675385B510 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=embecosm.com Received: by mail-wr1-x432.google.com with SMTP id c5so4847205wrr.5 for ; Tue, 21 Feb 2023 04:03:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=WvIXClx801McHQjUiEmAWWq+hA6OrhKovqL7/pMpQ6Y=; b=XaZwtBKbN20sOTvkTwLz1cXjGXhvgF4IrGVE8gJT7KoxQ5PNJ+Jz22B6xuIKIPcJjs og7R/19CzZv6fN/qsJpE/5mClW7sBxfg4MyyS3bMmgVhjDB/QbGWs/mwr6dnzzxO2smO FmUxm+8em6HvVufm9WgOuKhs8m8GmnBMPbV+oghIl2mGKlmiRbm8+bSEOeZyLkDyUdrH pYIbxVcBIDQZav8swSKMdEE5cnxwZaD5GUZZpZ80o/Wv3Dz6/tQShNuz947V64nWo7Ov XdTEcQtcfWLo39I9g5FuucUIBJ8fd79NLAx8Gwr2f8JUj8w4sNdrnneM8w6TKYjOMcfX SLhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=WvIXClx801McHQjUiEmAWWq+hA6OrhKovqL7/pMpQ6Y=; b=t5zUapb9djTE6haDkHXG6rZkMDQPPRNLmprCVsWt/G8iR5QWwKrUqLOpgT00oHpdmT 40amNF3jMsbjKRziEY4ixw5SizyJJ8X2Z881KB2MPuv8Fx5x5fDyPNEwbrTQKmY8m7QN GOrRYxkJvWyEM3P1QBjS+6x5AO28F40SrYGKWM4JfRzQ3h50mBxEbz/C4mZc/0akBYPz 9OPje5R5BSWbGWa1mzxa+e+Ilz+BjlNr37nkUj8AOFRv3zctUVpwUQbLycCtQJWfhAFE xLlapKe4vd4DjD/YOk+Ge9NZueT2qAUeFv7u9+RkXkaWb6R5bEPvd5YLIGNQBbFMq0Fs 3CAg== X-Gm-Message-State: AO0yUKXVjey08eZ7+6d9ZvNdc/xvuCWzCJnCI+D+i2YoZr6aXOFGiVKl nQKnJgpMzESOp9GXeexm4FXqUK5Hd4+YdSm0Cw== X-Google-Smtp-Source: AK7set8yK7cuFQ2jnOOsyZJ+LR8OutmzcSDNVsjPTTHtW63l2FP2eoG/AAgXeWcqBTVuSC3EksFC5g== X-Received: by 2002:adf:fd07:0:b0:2bf:e39d:c8a7 with SMTP id e7-20020adffd07000000b002bfe39dc8a7mr5437063wrr.44.1676980993438; Tue, 21 Feb 2023 04:03:13 -0800 (PST) Received: from platypus.localdomain ([62.23.166.218]) by smtp.gmail.com with ESMTPSA id c15-20020adffb4f000000b002c55b0e6ef1sm5013811wrs.4.2023.02.21.04.03.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 04:03:13 -0800 (PST) From: arthur.cohen@embecosm.com To: gcc-patches@gcc.gnu.org Cc: gcc-rust@gcc.gnu.org, Philip Herron Subject: [committed 001/103] gccrs: Fix missing dead code analysis ICE on local enum definition Date: Tue, 21 Feb 2023 13:00:50 +0100 Message-Id: <20230221120230.596966-2-arthur.cohen@embecosm.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230221120230.596966-1-arthur.cohen@embecosm.com> References: <20230221120230.596966-1-arthur.cohen@embecosm.com> Reply-To: arthur.cohen@embecosm.com MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-14.6 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: From: Philip Herron When resolving local enum's within a Block the name resolution info is not at the top of the stack so this patch introduces a new mappings class for miscellaneous name resolutions which can be used during path analaysis. Fixes #1272 gcc/rust/ChangeLog: * resolve/rust-name-resolver.h: Add miscellenaous item mappings. * resolve/rust-name-resolver.cc (Resolver::insert_resolved_misc): Use new mappings. (Resolver::lookup_resolved_misc): Likewise. * typecheck/rust-hir-type-check-path.cc (TypeCheckExpr::resolve_segments): Adapt function to insert into miscelleanous mappings. * checks/lints/rust-lint-marklive.cc (MarkLive::find_ref_node_id): Allow lookup in miscelleanous mappings in mark-live phase. gcc/testsuite/ChangeLog: * rust/compile/issue-1272.rs: New test. --- gcc/rust/checks/lints/rust-lint-marklive.cc | 7 +++++-- gcc/rust/resolve/rust-name-resolver.cc | 20 +++++++++++++++++++ gcc/rust/resolve/rust-name-resolver.h | 6 ++++++ .../typecheck/rust-hir-type-check-path.cc | 5 +++++ gcc/testsuite/rust/compile/issue-1272.rs | 8 ++++++++ 5 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/rust/compile/issue-1272.rs diff --git a/gcc/rust/checks/lints/rust-lint-marklive.cc b/gcc/rust/checks/lints/rust-lint-marklive.cc index 14115c86f26..c914b549257 100644 --- a/gcc/rust/checks/lints/rust-lint-marklive.cc +++ b/gcc/rust/checks/lints/rust-lint-marklive.cc @@ -273,8 +273,11 @@ MarkLive::find_ref_node_id (NodeId ast_node_id, NodeId &ref_node_id) { if (!resolver->lookup_resolved_name (ast_node_id, &ref_node_id)) { - bool ok = resolver->lookup_resolved_type (ast_node_id, &ref_node_id); - rust_assert (ok); + if (!resolver->lookup_resolved_type (ast_node_id, &ref_node_id)) + { + bool ok = resolver->lookup_resolved_misc (ast_node_id, &ref_node_id); + rust_assert (ok); + } } } diff --git a/gcc/rust/resolve/rust-name-resolver.cc b/gcc/rust/resolve/rust-name-resolver.cc index 77d98d5f364..b94713d3c30 100644 --- a/gcc/rust/resolve/rust-name-resolver.cc +++ b/gcc/rust/resolve/rust-name-resolver.cc @@ -499,5 +499,25 @@ Resolver::lookup_resolved_macro (NodeId refId, NodeId *defId) return true; } +void +Resolver::insert_resolved_misc (NodeId refId, NodeId defId) +{ + auto it = misc_resolved_items.find (refId); + rust_assert (it == misc_resolved_items.end ()); + + misc_resolved_items[refId] = defId; +} + +bool +Resolver::lookup_resolved_misc (NodeId refId, NodeId *defId) +{ + auto it = misc_resolved_items.find (refId); + if (it == misc_resolved_items.end ()) + return false; + + *defId = it->second; + return true; +} + } // namespace Resolver } // namespace Rust diff --git a/gcc/rust/resolve/rust-name-resolver.h b/gcc/rust/resolve/rust-name-resolver.h index 6f4dda06a5c..302b0de15cc 100644 --- a/gcc/rust/resolve/rust-name-resolver.h +++ b/gcc/rust/resolve/rust-name-resolver.h @@ -126,6 +126,9 @@ public: void insert_resolved_macro (NodeId refId, NodeId defId); bool lookup_resolved_macro (NodeId refId, NodeId *defId); + void insert_resolved_misc (NodeId refId, NodeId defId); + bool lookup_resolved_misc (NodeId refId, NodeId *defId); + // proxy for scoping Scope &get_name_scope () { return name_scope; } Scope &get_type_scope () { return type_scope; } @@ -202,6 +205,9 @@ private: std::map resolved_labels; std::map resolved_macros; + // misc + std::map misc_resolved_items; + // keep track of the current module scope ids std::vector current_module_stack; }; diff --git a/gcc/rust/typecheck/rust-hir-type-check-path.cc b/gcc/rust/typecheck/rust-hir-type-check-path.cc index f404ea64bcc..305d73f76f9 100644 --- a/gcc/rust/typecheck/rust-hir-type-check-path.cc +++ b/gcc/rust/typecheck/rust-hir-type-check-path.cc @@ -462,6 +462,11 @@ TypeCheckExpr::resolve_segments (NodeId root_resolved_node_id, resolver->insert_resolved_type (expr_mappings.get_nodeid (), resolved_node_id); } + else + { + resolver->insert_resolved_misc (expr_mappings.get_nodeid (), + resolved_node_id); + } infered = tyseg; } diff --git a/gcc/testsuite/rust/compile/issue-1272.rs b/gcc/testsuite/rust/compile/issue-1272.rs new file mode 100644 index 00000000000..08adaaf944b --- /dev/null +++ b/gcc/testsuite/rust/compile/issue-1272.rs @@ -0,0 +1,8 @@ +fn main() -> i32 { + enum E { + X(u8), + } + let _v = E::X(4); + + 0 +} -- 2.39.1