From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7905) id 5AC6B385703A; Tue, 31 Jan 2023 13:15:48 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5AC6B385703A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1675170948; bh=W0LiCP6mg+xzx/fkIki9De0sfZg1BaxOjtoTdlLzGfA=; h=From:To:Subject:Date:From; b=Rg26NyiOUoZWRK7H/ijr2y+GRFu5CFlLp3WtaCPXOVnvj8ldb29Q38+Ckgxd9pFoV lms3x6MDu/MHpggqm7wlYKpeNeNDRspwcrE5M2vDGSY5ng/SHTYpELXj+T8leee2r7 fD7YL5XeLRlclYqCVIimIlub58j+K5ahS94/TLtw= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Arthur Cohen To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-5552] gccrs: Add new check for contains_associated_types X-Act-Checkin: gcc X-Git-Author: Philip Herron X-Git-Refname: refs/heads/master X-Git-Oldrev: 43cb42a3d82d1c29592a5232811fc608ef6cea49 X-Git-Newrev: e641158a5f5cd80ee2ce32fded1179ce1b3e1193 Message-Id: <20230131131548.5AC6B385703A@sourceware.org> Date: Tue, 31 Jan 2023 13:15:48 +0000 (GMT) List-Id: https://gcc.gnu.org/g:e641158a5f5cd80ee2ce32fded1179ce1b3e1193 commit r13-5552-ge641158a5f5cd80ee2ce32fded1179ce1b3e1193 Author: Philip Herron Date: Wed Aug 31 17:07:51 2022 +0100 gccrs: Add new check for contains_associated_types We don't need to setup associated types when a trait does not contain any associated types. gcc/rust/ChangeLog: * typecheck/rust-tyty-bounds.cc (TypeBoundPredicate::contains_associated_types): Check if a type bound predicate contains assocated types. * typecheck/rust-tyty.h: Declare the above mentioned function. * typecheck/rust-hir-trait-resolve.cc: Use `contains_associated_types` function. 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 c14a6c3a9be..22398b1fa8a 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 8dfd692f345..69376aaa373 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 14868f2bb81..24efc7aa54c 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;