[gcc r15-8585] gccrs: Fix NR2.0 compiler ICE caused by Generics in Enums

[Arthur Cohen via Gcc-cvs]

https://gcc.gnu.org/g:c4271707ce700bc87c2772fffa9aa1bc8432c6aa

commit r15-8585-gc4271707ce700bc87c2772fffa9aa1bc8432c6aa
Author: Liam Naddell <liamn...@gmail.com>
Date:   Tue Dec 17 11:48:03 2024 -0500

    gccrs: Fix NR2.0 compiler ICE caused by Generics in Enums
    
    gcc/rust/ChangeLog:
            * resolve/rust-late-name-resolver-2.0.cc:
            Change the late name resolver to enter proper lexical scope during 
typechecking
            * resolve/rust-late-name-resolver-2.0.h:
            Add needed prototype to header
            * resolve/rust-toplevel-name-resolver-2.0.cc:
            Add generic parameters to enum's scoped RIB to allow for proper 
name resolution on types.
    
    gcc/testsuite/ChangeLog:
            * rust/compile/issue-3304.rs:
            Add small test for generics+enums combination for NR2.0
    
    Signed-off-by: Liam Naddell <liam.nadd...@mail.utoronto.ca>

Diff:
---
 gcc/rust/resolve/rust-late-name-resolver-2.0.cc     |  7 +++++++
 gcc/rust/resolve/rust-late-name-resolver-2.0.h      |  1 +
 gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc |  9 +++++++++
 gcc/testsuite/rust/compile/issue-3304.rs            | 10 ++++++++++
 4 files changed, 27 insertions(+)

diff --git a/gcc/rust/resolve/rust-late-name-resolver-2.0.cc 
b/gcc/rust/resolve/rust-late-name-resolver-2.0.cc
index 40f067319b57..38515cdc0fde 100644
--- a/gcc/rust/resolve/rust-late-name-resolver-2.0.cc
+++ b/gcc/rust/resolve/rust-late-name-resolver-2.0.cc
@@ -295,6 +295,13 @@ Late::visit (AST::StructStruct &s)
   ctx.scoped (Rib::Kind::Item, s.get_node_id (), s_vis);
 }
 
+void
+Late::visit (AST::Enum &s)
+{
+  auto s_vis = [this, &s] () { AST::DefaultASTVisitor::visit (s); };
+  ctx.scoped (Rib::Kind::Item, s.get_node_id (), s_vis);
+}
+
 void
 Late::visit (AST::StructExprStruct &s)
 {
diff --git a/gcc/rust/resolve/rust-late-name-resolver-2.0.h 
b/gcc/rust/resolve/rust-late-name-resolver-2.0.h
index 6f1191662cc2..1dbca3648da9 100644
--- a/gcc/rust/resolve/rust-late-name-resolver-2.0.h
+++ b/gcc/rust/resolve/rust-late-name-resolver-2.0.h
@@ -52,6 +52,7 @@ public:
   void visit (AST::StructExprStructBase &) override;
   void visit (AST::StructExprStructFields &) override;
   void visit (AST::StructStruct &) override;
+  void visit (AST::Enum &) override;
   void visit (AST::GenericArgs &) override;
   void visit (AST::GenericArg &);
 
diff --git a/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc 
b/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc
index a2f695e54f68..a76c098f2df3 100644
--- a/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc
+++ b/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc
@@ -332,6 +332,15 @@ TopLevel::visit (AST::EnumItemDiscriminant &variant)
 void
 TopLevel::visit (AST::Enum &enum_item)
 {
+  auto generic_vis = [this, &enum_item] () {
+    for (auto &g : enum_item.get_generic_params ())
+      {
+       g->accept_vis (*this);
+      }
+  };
+
+  ctx.scoped (Rib::Kind::Item, enum_item.get_node_id (), generic_vis);
+
   insert_or_error_out (enum_item.get_identifier (), enum_item,
                       Namespace::Types);
 
diff --git a/gcc/testsuite/rust/compile/issue-3304.rs 
b/gcc/testsuite/rust/compile/issue-3304.rs
new file mode 100644
index 000000000000..6ab614fa2d5d
--- /dev/null
+++ b/gcc/testsuite/rust/compile/issue-3304.rs
@@ -0,0 +1,10 @@
+// { dg-additional-options "-frust-name-resolution-2.0" }
+#[lang = "sized"]
+trait Sized {}
+
+pub enum ROption<T> {
+    RSome(T),
+    RNone,
+}
+
+fn main() {}