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

Unify generic substitutions on unit-structs 

When we have generic unit-structs there are no fields to unify the generic.
This adds a case to ensure we iterate and check these. We might end up
making it always do this for all structs always.

Addresses #1447
This commit is contained in:
Philip Herron 2022-08-08 17:07:42 +01:00
parent e0a14f4839
commit b9840366b6
2 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gcc/rust/typecheck/rust-tyty-coercion.h
View File

@ -1130,6 +1130,28 @@ public:
}
}
// generic args for the unit-struct case
if (type.is_unit () && base->is_unit ())
{
rust_assert (type.get_num_substitutions ()
== base->get_num_substitutions ());
for (size_t i = 0; i < type.get_num_substitutions (); i++)
{
auto &a = base->get_substs ().at (i);
auto &b = type.get_substs ().at (i);
auto pa = a.get_param_ty ();
auto pb = b.get_param_ty ();
auto res = pa->unify (pb);
if (res->get_kind () == TyTy::TypeKind::ERROR)
{
return;
}
}
}
resolved = type.clone ();
}

22
gcc/rust/typecheck/rust-tyty-rules.h
View File

@ -1128,6 +1128,28 @@ public:
}
}
// generic args for the unit-struct case
if (type.is_unit () && base->is_unit ())
{
rust_assert (type.get_num_substitutions ()
== base->get_num_substitutions ());
for (size_t i = 0; i < type.get_num_substitutions (); i++)
{
auto &a = base->get_substs ().at (i);
auto &b = type.get_substs ().at (i);
auto pa = a.get_param_ty ();
auto pb = b.get_param_ty ();
auto res = pa->unify (pb);
if (res->get_kind () == TyTy::TypeKind::ERROR)
{
return;
}
}
}
resolved = type.clone ();
}