From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id 334F1385355C; Thu, 1 Sep 2022 06:46:38 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 334F1385355C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1662014798; bh=iN6KXDyLLOMlM9brc8xuNRZo6eeLO3L6Lwl7QFX/YPM=; h=From:To:Subject:Date:From; b=KSWE88Z7UbLqHtv/sipkQfnn0SURT1ew/AXec8l4pVGeZMHr6l539LAgfanl4ePU6 Fm8hG8GCDiFlj/043aPYaE/9vn1jo5z4go8AsL70icdef4IlhcVC53rgVcsxAY3TRn MpV1epgTJyCoUSHGWzLWMOZbYHZuBDWOQY6e1zow= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Thomas Schwinge To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/rust/master] Add new check for contains_associated_types X-Act-Checkin: gcc X-Git-Author: Philip Herron X-Git-Refname: refs/heads/devel/rust/master X-Git-Oldrev: 721c7a472c4cf5dc74337c997ff627187b577d60 X-Git-Newrev: 126c7c9d7a2f9023115d6c692dbcf9e981ba2b4a Message-Id: <20220901064638.334F1385355C@sourceware.org> Date: Thu, 1 Sep 2022 06:46:38 +0000 (GMT) List-Id: https://gcc.gnu.org/g:126c7c9d7a2f9023115d6c692dbcf9e981ba2b4a commit 126c7c9d7a2f9023115d6c692dbcf9e981ba2b4a Author: Philip Herron Date: Wed Aug 31 17:07:51 2022 +0100 Add new check for contains_associated_types We don't need to setup associated types when a trait does not contain any associated types. Diff: --- gcc/rust/typecheck/rust-hir-trait-resolve.cc | 3 +++ gcc/rust/typecheck/rust-tyty-bounds.cc | 15 +++++++++++++++ gcc/rust/typecheck/rust-tyty.h | 2 ++ 3 files changed, 20 insertions(+) diff --git a/gcc/rust/typecheck/rust-hir-trait-resolve.cc b/gcc/rust/typecheck/rust-hir-trait-resolve.cc index 73575859def..146fe26a762 100644 --- a/gcc/rust/typecheck/rust-hir-trait-resolve.cc +++ b/gcc/rust/typecheck/rust-hir-trait-resolve.cc @@ -368,6 +368,9 @@ void AssociatedImplTrait::setup_associated_types ( const TyTy::BaseType *self, const TyTy::TypeBoundPredicate &bound) { + if (!bound.contains_associated_types ()) + return; + // compute the constrained impl block generic arguments based on self and the // higher ranked trait bound TyTy::BaseType *receiver = self->clone (); diff --git a/gcc/rust/typecheck/rust-tyty-bounds.cc b/gcc/rust/typecheck/rust-tyty-bounds.cc index 7a1562ab544..811d64bd740 100644 --- a/gcc/rust/typecheck/rust-tyty-bounds.cc +++ b/gcc/rust/typecheck/rust-tyty-bounds.cc @@ -374,6 +374,21 @@ TypeBoundPredicate::requires_generic_args () const return substitutions.size () > 1; } +bool +TypeBoundPredicate::contains_associated_types () const +{ + auto trait_ref = get (); + for (const auto &trait_item : trait_ref->get_trait_items ()) + { + bool is_associated_type + = trait_item.get_trait_item_type () + == Resolver::TraitItemReference::TraitItemType::TYPE; + if (is_associated_type) + return true; + } + return false; +} + // trait item reference const Resolver::TraitItemReference * diff --git a/gcc/rust/typecheck/rust-tyty.h b/gcc/rust/typecheck/rust-tyty.h index a351932e432..649f133edb1 100644 --- a/gcc/rust/typecheck/rust-tyty.h +++ b/gcc/rust/typecheck/rust-tyty.h @@ -1057,6 +1057,8 @@ public: bool requires_generic_args () const; + bool contains_associated_types () const; + private: DefId reference; Location locus;