From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by sourceware.org (Postfix) with ESMTPS id 391FD385B51C for ; Tue, 21 Feb 2023 12:03:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 391FD385B51C 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-x431.google.com with SMTP id j2so3982409wrh.9 for ; Tue, 21 Feb 2023 04:03:54 -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=88inREnYvEbMuVb0RenaQ3Q8ZlW4nBvnKzDWMJtXKHs=; b=N4jPaJ/aD4/FPoA+w0JLttZnE7Mc1iKw//BO9nAui48UlRaudm/ifGrXO44vd1YTF8 vtC4NSYYWHT4dV8zky9u6sKil1zvVKAuKQPK9jpgHa5bHJfuLNq4cdLfDjJLQ/P4wpTV RX83/oMDBgq6wpVAhmScUsi7BidsD17DZ7zJCZ/u3PrDsLGXGx30SNNGjQEQgZ2d0gkv 3F4VvprwzJmbNnvZULzdm/2xG9yB75cR9Fleu6LMx/L0BlH6mJc3nwLXYqAcM/E8hiqG r17wkTcbReVrfDUq15+yjD4FCyPnlyqekjs+bWPzRfM0qZN1MWYoQKLeccY+QE2umDh5 sIdQ== 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=88inREnYvEbMuVb0RenaQ3Q8ZlW4nBvnKzDWMJtXKHs=; b=Ef6+qk/RGUsqhekNg406XOdvAwB1NjMPm2WQAGZfcH6fBr4ruGhG4S4aHOFGoSFidT 2DJJGnzYWtZy5wwoKqcba89g3PGudCIEEZxc3UNee8fCdsBYUG8k3E7rcpNzKgQRsif7 5eovM1c7Q9rqphzNtKzMNMKxzX/1JGp1nzjWx3ToEUJQEnRflrkrz/HZ4mufXWS/YwPJ q0sRqnjdBL4eDuFjV+FHMqBViZcp4nH7pxL7neKLg6ggOrWVCj0o3olLKQkS0ta2+6q9 dJS0o4x03qAc6lThelqK8c+Lkhk12Nd37+8n6d+fYeQ0iEK9+L4SIFvL2Lm6jaaHdhDA bKBw== X-Gm-Message-State: AO0yUKUnSNvz26h/12lKSSQiAcm4BPakGEt/O+XiY+LXrUEpGEke50CP 78Z746QCg9lDhxqKFaB5HdI4 X-Google-Smtp-Source: AK7set9YTpqVrKCe32qO2CYs0HSnuiDSJd43neUrUp8pf47yDGtWL+m9bRrSs74RFevtgSSUSNs1Vw== X-Received: by 2002:a5d:5387:0:b0:2c5:455b:4cd2 with SMTP id d7-20020a5d5387000000b002c5455b4cd2mr5103370wrv.57.1676981033833; Tue, 21 Feb 2023 04:03:53 -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.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 04:03:53 -0800 (PST) From: arthur.cohen@embecosm.com To: gcc-patches@gcc.gnu.org Cc: gcc-rust@gcc.gnu.org, Philip Herron Subject: [committed 039/103] gccrs: Add check for recursive trait cycles Date: Tue, 21 Feb 2023 13:01:29 +0100 Message-Id: <20230221120230.596966-40-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.9 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 gcc/rust/ChangeLog: * typecheck/rust-hir-trait-resolve.cc (TraitResolver::resolve_trait): Check if a trait query is currently in progress. * typecheck/rust-hir-type-check.h (class TraitQueryGuard): Add helpers around checking for trait queries and inserting them. gcc/testsuite/ChangeLog: * rust/compile/issue-1589.rs: New test. --- gcc/rust/typecheck/rust-hir-trait-resolve.cc | 12 +++++++- gcc/rust/typecheck/rust-hir-type-check.h | 29 ++++++++++++++++++++ gcc/testsuite/rust/compile/issue-1589.rs | 5 ++++ 3 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/rust/compile/issue-1589.rs diff --git a/gcc/rust/typecheck/rust-hir-trait-resolve.cc b/gcc/rust/typecheck/rust-hir-trait-resolve.cc index 1b0bcaac79d..2ec9b2ef83e 100644 --- a/gcc/rust/typecheck/rust-hir-trait-resolve.cc +++ b/gcc/rust/typecheck/rust-hir-trait-resolve.cc @@ -141,6 +141,14 @@ TraitResolver::resolve_trait (HIR::Trait *trait_reference) return tref; } + DefId trait_id = trait_reference->get_mappings ().get_defid (); + if (context->trait_query_in_progress (trait_id)) + { + rust_error_at (trait_reference->get_locus (), "trait cycle detected"); + return &TraitReference::error_node (); + } + + TraitQueryGuard guard (trait_id); TyTy::BaseType *self = nullptr; std::vector substitutions; for (auto &generic_param : trait_reference->get_generic_params ()) @@ -201,8 +209,10 @@ TraitResolver::resolve_trait (HIR::Trait *trait_reference) HIR::TraitBound *b = static_cast (bound.get ()); - // FIXME this might be recursive we need a check for that auto predicate = get_predicate_from_bound (b->get_path ()); + if (predicate.is_error ()) + return &TraitReference::error_node (); + specified_bounds.push_back (predicate); super_traits.push_back (predicate.get ()); } diff --git a/gcc/rust/typecheck/rust-hir-type-check.h b/gcc/rust/typecheck/rust-hir-type-check.h index a1dd8052246..2b47c6738b5 100644 --- a/gcc/rust/typecheck/rust-hir-type-check.h +++ b/gcc/rust/typecheck/rust-hir-type-check.h @@ -381,6 +381,19 @@ public: return querys_in_progress.find (id) != querys_in_progress.end (); } + void insert_trait_query (DefId id) { trait_queries_in_progress.insert (id); } + + void trait_query_completed (DefId id) + { + trait_queries_in_progress.erase (id); + } + + bool trait_query_in_progress (DefId id) const + { + return trait_queries_in_progress.find (id) + != trait_queries_in_progress.end (); + } + private: TypeCheckContext (); @@ -418,6 +431,7 @@ private: // query context lookups std::set querys_in_progress; + std::set trait_queries_in_progress; }; class TypeResolution @@ -426,6 +440,21 @@ public: static void Resolve (HIR::Crate &crate); }; +class TraitQueryGuard +{ +public: + TraitQueryGuard (DefId id) : id (id), ctx (*TypeCheckContext::get ()) + { + ctx.insert_trait_query (id); + } + + ~TraitQueryGuard () { ctx.trait_query_completed (id); } + +private: + DefId id; + TypeCheckContext &ctx; +}; + } // namespace Resolver } // namespace Rust diff --git a/gcc/testsuite/rust/compile/issue-1589.rs b/gcc/testsuite/rust/compile/issue-1589.rs new file mode 100644 index 00000000000..79a5866e4af --- /dev/null +++ b/gcc/testsuite/rust/compile/issue-1589.rs @@ -0,0 +1,5 @@ +pub trait A: B {} +// { dg-error "trait cycle detected" "" { target *-*-* } .-1 } + +pub trait B: A {} +// { dg-error "trait cycle detected" "" { target *-*-* } .-1 } -- 2.39.1