From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id 167243985472; Wed, 8 Jun 2022 11:47:46 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 167243985472 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 missing bound to impl-type Self X-Act-Checkin: gcc X-Git-Author: Philip Herron X-Git-Refname: refs/heads/devel/rust/master X-Git-Oldrev: b3e884c3e9d02b182469abff0fa7531ec8325a5e X-Git-Newrev: 41d0e2fa96183425eb23d8c5669e3a216d0cea66 Message-Id: <20220608114746.167243985472@sourceware.org> Date: Wed, 8 Jun 2022 11:47:46 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Jun 2022 11:47:46 -0000 https://gcc.gnu.org/g:41d0e2fa96183425eb23d8c5669e3a216d0cea66 commit 41d0e2fa96183425eb23d8c5669e3a216d0cea66 Author: Philip Herron Date: Thu Nov 4 13:34:45 2021 +0000 Add missing bound to impl-type Self Diff: --- gcc/rust/typecheck/rust-hir-type-check-item.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gcc/rust/typecheck/rust-hir-type-check-item.h b/gcc/rust/typecheck/rust-hir-type-check-item.h index fe70035df06..706f649340f 100644 --- a/gcc/rust/typecheck/rust-hir-type-check-item.h +++ b/gcc/rust/typecheck/rust-hir-type-check-item.h @@ -70,12 +70,34 @@ public: } } + std::vector specified_bounds; TraitReference *trait_reference = &TraitReference::error_node (); if (impl_block.has_trait_ref ()) { std::unique_ptr &ref = impl_block.get_trait_ref (); trait_reference = TraitResolver::Resolve (*ref.get ()); rust_assert (!trait_reference->is_error ()); + + // setup the bound + TyTy::TypeBoundPredicate predicate ( + trait_reference->get_mappings ().get_defid (), ref->get_locus ()); + auto &final_seg = ref->get_final_segment (); + if (final_seg->is_generic_segment ()) + { + auto final_generic_seg + = static_cast (final_seg.get ()); + if (final_generic_seg->has_generic_args ()) + { + HIR::GenericArgs &generic_args + = final_generic_seg->get_generic_args (); + + // this is applying generic arguments to a trait + // reference + predicate.apply_generic_arguments (&generic_args); + } + } + + specified_bounds.push_back (std::move (predicate)); } TyTy::BaseType *self = nullptr; @@ -86,6 +108,8 @@ public: "failed to resolve Self for ImplBlock"); return; } + // inherit the bounds + self->inherit_bounds (specified_bounds); bool is_trait_impl_block = !trait_reference->is_error ();