diff options
| author | Liam Naddell <liamnprg@gmail.com> | 2024-12-17 11:48:03 -0500 |
|---|---|---|
| committer | CohenArthur <arthur.cohen@embecosm.com> | 2025-01-02 09:34:36 +0000 |
| commit | 198d3ee34fbeec1749c184e30cc13b3d323f90dc (patch) | |
| tree | 4ab9f1ca24ddbd490b63dfa4a004622e42e9199d /gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc | |
| parent | 62058776ed9efe98b1c3677383bc82db04aa4608 (diff) | |
| download | gcc-198d3ee34fbeec1749c184e30cc13b3d323f90dc.zip gcc-198d3ee34fbeec1749c184e30cc13b3d323f90dc.tar.gz gcc-198d3ee34fbeec1749c184e30cc13b3d323f90dc.tar.bz2 | |
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.naddell@mail.utoronto.ca>
Diffstat (limited to 'gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc')
| -rw-r--r-- | gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc | 9 |
1 files changed, 9 insertions, 0 deletions
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 01c5d26..8fa4809 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); |