From 41d0e2fa96183425eb23d8c5669e3a216d0cea66 Mon Sep 17 00:00:00 2001 From: Philip Herron Date: Thu, 4 Nov 2021 13:34:45 +0000 Subject: Add missing bound to impl-type Self --- gcc/rust/typecheck/rust-hir-type-check-item.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gcc/rust') diff --git a/gcc/rust/typecheck/rust-hir-type-check-item.h b/gcc/rust/typecheck/rust-hir-type-check-item.h index fe70035..706f649 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 (); -- cgit v1.1