Skip to content

gccrs: fix ICE in TyVar constructor #4204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

gccrs: fix ICE in TyVar constructor #4204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions gcc/rust/typecheck/rust-tyty-util.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,10 @@ TyVar::TyVar (HirId ref) : ref (ref)
auto context = Resolver::TypeCheckContext::get ();
BaseType *lookup = nullptr;
bool ok = context->lookup_type (ref, &lookup);
rust_assert (ok);
if (!ok || lookup == nullptr || lookup->get_kind () == TypeKind::ERROR)
{
return;
}
}

BaseType *
Expand All @@ -39,7 +42,10 @@ TyVar::get_tyty () const
auto context = Resolver::TypeCheckContext::get ();
BaseType *lookup = nullptr;
bool ok = context->lookup_type (ref, &lookup);
rust_assert (ok);
if (!ok || lookup == nullptr)
{
return nullptr;
}
return lookup;
}

Expand Down Expand Up @@ -95,7 +101,12 @@ TyVar::subst_covariant_var (TyTy::BaseType *orig, TyTy::BaseType *subst)
TyVar
TyVar::clone () const
{
TyTy::BaseType *c = get_tyty ()->clone ();
TyTy::BaseType *base = get_tyty ();
if (base == nullptr || base->get_kind () == TypeKind::ERROR)
{
return TyVar::get_implicit_infer_var (UnKNOWN_LOCATION);
}
TyTy::BaseType *c = base->clone ();
return TyVar (c->get_ref ());
}

Expand All @@ -105,6 +116,11 @@ TyVar::monomorphized_clone () const
auto &mappings = Analysis::Mappings::get ();
auto context = Resolver::TypeCheckContext::get ();

TyTy::Base *base = get_tyty ();
if (base == nullptr || base->get_kind () == TypeKind::ERROR)
{
return TyVar::get_implicit_infer_var (UnKNOWN_LOCATION);
}
// this needs a new hirid
TyTy::BaseType *c = get_tyty ()->monomorphized_clone ();
c->set_ref (mappings.get_next_hir_id ());
Expand Down
4 changes: 4 additions & 0 deletions gcc/testsuite/rust/compile/issue-3556.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
fn main() {
let ref mut a @ (ref mut b,);
// { dg-error "expected T\\?, found tuple" "" { target *-*-* } .-1 }
}
Loading