From 0d0413d1d1aff9ef950614691237534862a1734f Mon Sep 17 00:00:00 2001 From: sasa630 Date: Wed, 5 Mar 2025 05:35:30 +0200 Subject: [PATCH 1/2] Refactored to use implicit insert (#3395) --- gcc/rust/typecheck/rust-substitution-mapper.cc | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/gcc/rust/typecheck/rust-substitution-mapper.cc b/gcc/rust/typecheck/rust-substitution-mapper.cc index 20fe8f04adc..83980d5907f 100644 --- a/gcc/rust/typecheck/rust-substitution-mapper.cc +++ b/gcc/rust/typecheck/rust-substitution-mapper.cc @@ -152,18 +152,13 @@ SubstMapperInternal::Resolve (TyTy::BaseType *base, = context->lookup_type (mapper.resolved->get_ty_ref (), &unused); if (!is_ty_available) { - context->insert_type ( - Analysis::NodeMapping (0, 0, mapper.resolved->get_ty_ref (), 0), - mapper.resolved); + context->insert_implicit_type(mapper.resolved->get_ty_ref () , mapper.resolved); } bool is_ref_available = context->lookup_type (mapper.resolved->get_ref (), &unused); if (!is_ref_available) { - context->insert_type (Analysis::NodeMapping (0, 0, - mapper.resolved->get_ref (), - 0), - mapper.resolved); + context->insert_implicit_type(mapper.resolved->get_ref () , mapper.resolved) } return mapper.resolved; From d27396334b44d2bd5ea6f6d49de97ce445558842 Mon Sep 17 00:00:00 2001 From: sasa630 Date: Wed, 5 Mar 2025 06:05:41 +0200 Subject: [PATCH 2/2] Fix missing semicolon and formatting --- gcc/rust/typecheck/rust-substitution-mapper.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gcc/rust/typecheck/rust-substitution-mapper.cc b/gcc/rust/typecheck/rust-substitution-mapper.cc index 83980d5907f..d4a2cfb5141 100644 --- a/gcc/rust/typecheck/rust-substitution-mapper.cc +++ b/gcc/rust/typecheck/rust-substitution-mapper.cc @@ -152,13 +152,15 @@ SubstMapperInternal::Resolve (TyTy::BaseType *base, = context->lookup_type (mapper.resolved->get_ty_ref (), &unused); if (!is_ty_available) { - context->insert_implicit_type(mapper.resolved->get_ty_ref () , mapper.resolved); + context->insert_implicit_type(mapper.resolved->get_ty_ref (), + mapper.resolved); } bool is_ref_available = context->lookup_type (mapper.resolved->get_ref (), &unused); if (!is_ref_available) { - context->insert_implicit_type(mapper.resolved->get_ref () , mapper.resolved) + context->insert_implicit_type(mapper.resolved->get_ref (), + mapper.resolved); } return mapper.resolved;