From: Pierre-Emmanuel Patry <pierre-emmanuel.pa...@embecosm.com>

We shall search in the right namespace. The correct namespace for struct
is type namespace.

gcc/rust/ChangeLog:

        * typecheck/rust-hir-type-check-item.cc (TypeCheckItem::visit): Change
        search location for struct types.

Signed-off-by: Pierre-Emmanuel Patry <pierre-emmanuel.pa...@embecosm.com>
---
 gcc/rust/typecheck/rust-hir-type-check-item.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gcc/rust/typecheck/rust-hir-type-check-item.cc 
b/gcc/rust/typecheck/rust-hir-type-check-item.cc
index 4ab946e1c2a..3e504e5df32 100644
--- a/gcc/rust/typecheck/rust-hir-type-check-item.cc
+++ b/gcc/rust/typecheck/rust-hir-type-check-item.cc
@@ -279,9 +279,11 @@ TypeCheckItem::visit (HIR::StructStruct &struct_decl)
     {
       auto nr_ctx
        = Resolver2_0::ImmutableNameResolutionContext::get ().resolver ();
-      auto canonical_path = nr_ctx.values.to_canonical_path (
+      auto canonical_path = nr_ctx.types.to_canonical_path (
        struct_decl.get_mappings ().get_nodeid ());
 
+      if (!canonical_path.has_value ())
+       rust_unreachable ();
       path = canonical_path.value ();
     }
   else
-- 
2.45.2

Reply via email to