From: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>
Date: Mon, 13 Jan 2025 17:26:37 +0000 (+0100)
Subject: gccrs: Compile unit struct with constructor
X-Git-Tag: basepoints/gcc-16~796
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4f6d40d323807417a4b0424d73d9a75191e6225d;p=thirdparty%2Fgcc.git

gccrs: Compile unit struct with constructor

gcc/rust/ChangeLog:

	* backend/rust-compile-resolve-path.cc (ResolvePathRef::resolve): Do
	not use query system for unit struct but compile it's constructor
	instead.

Signed-off-by: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>
---

diff --git a/gcc/rust/backend/rust-compile-resolve-path.cc b/gcc/rust/backend/rust-compile-resolve-path.cc
index a40f5542a68..103f0cb6fe8 100644
--- a/gcc/rust/backend/rust-compile-resolve-path.cc
+++ b/gcc/rust/backend/rust-compile-resolve-path.cc
@@ -180,6 +180,11 @@ ResolvePathRef::resolve_with_node_id (
 	}
     }
 
+  // Handle unit struct
+  if (lookup->get_kind () == TyTy::TypeKind::ADT)
+    return attempt_constructor_expression_lookup (lookup, ctx, mappings,
+						  expr_locus);
+
   // let the query system figure it out
   tree resolved_item = query_compile (ref, lookup, final_segment, mappings,
 				      expr_locus, is_qualified_path);