OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix generic param redefined bug 

When we name-resolve generic parameters their declaration gets inserted in
to the upper-most rib on the stack. Then when this is referenced we lookup
the relevant binding starting from the uppermost rib this lead to the 2nd
extern item adding the same binding into the same rib which caused this
clash. To fix this we need to have a seperate rib for each declaration
so as reusing the same names don't clash with each other.

Fixes #1131
This commit is contained in:
Philip Herron 2022-04-21 18:57:24 +01:00
parent fc22f12c9c
commit 0d4fc557c7
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gcc/rust/resolve/rust-ast-resolve-item.h
View File

@ -955,6 +955,15 @@ public:
void visit (AST::ExternalFunctionItem &function) override
{
NodeId scope_node_id = function.get_node_id ();
resolver->get_name_scope ().push (scope_node_id);
resolver->get_type_scope ().push (scope_node_id);
resolver->get_label_scope ().push (scope_node_id);
resolver->push_new_name_rib (resolver->get_name_scope ().peek ());
resolver->push_new_type_rib (resolver->get_type_scope ().peek ());
resolver->push_new_label_rib (resolver->get_type_scope ().peek ());
// resolve the generics
if (function.has_generics ())
{
for (auto &generic : function.get_generic_params ())
@ -971,6 +980,11 @@ public:
{
ResolveType::go (param.get_type ().get (), param.get_node_id ());
}
// done
resolver->get_name_scope ().pop ();
resolver->get_type_scope ().pop ();
resolver->get_label_scope ().pop ();
}
void visit (AST::ExternalStaticItem &item) override

4
gcc/testsuite/rust/compile/issue-1131.rs Normal file
View File

@ -0,0 +1,4 @@
extern "rust-intrinsic" {
fn size_of<T>() -> usize;
fn offset<T>(dst: *const T, offset: isize) -> *const T;
}