From: Philip Herron <philip.herron@embecosm.com>
Date: Wed, 31 Aug 2022 16:16:13 +0000 (+0100)
Subject: gccrs: Unit structs are not concrete when they need substitutions
X-Git-Tag: basepoints/gcc-14~1654
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0fffc0e772d612d5c6ad72a632ac80b43eca1950;p=thirdparty%2Fgcc.git

gccrs: Unit structs are not concrete when they need substitutions

Fixes #1518

gcc/rust/ChangeLog:

	* typecheck/rust-tyty.h: Fix `is_concrete` for unit types with
	substitutions.
---

diff --git a/gcc/rust/typecheck/rust-tyty.h b/gcc/rust/typecheck/rust-tyty.h
index 24efc7aa54c3..43460d2dd2f3 100644
--- a/gcc/rust/typecheck/rust-tyty.h
+++ b/gcc/rust/typecheck/rust-tyty.h
@@ -1362,6 +1362,11 @@ public:
 
   bool is_concrete () const override final
   {
+    if (is_unit ())
+      {
+	return !needs_substitution ();
+      }
+
     for (auto &variant : variants)
       {
 	for (auto &field : variant->get_fields ())