From b237dcd81a3e84653b2599aae2826fe6221d81a6 Mon Sep 17 00:00:00 2001 From: Philip Herron Date: Thu, 20 Apr 2023 12:44:31 +0100 Subject: gccrs: Fix ICE during method resolution We were missing a check for trait item selection to ensure they are actually methods and remove assertion to check if the trait item is a function this is a valid error check not an assertion. Fixes #2139 gcc/rust/ChangeLog: * typecheck/rust-hir-dot-operator.cc (MethodResolver::select): verify it is a method gcc/testsuite/ChangeLog: * rust/compile/issue-2139.rs: New test. Signed-off-by: Philip Herron --- gcc/rust/typecheck/rust-hir-dot-operator.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gcc/rust') diff --git a/gcc/rust/typecheck/rust-hir-dot-operator.cc b/gcc/rust/typecheck/rust-hir-dot-operator.cc index d782da8..251cf8a 100644 --- a/gcc/rust/typecheck/rust-hir-dot-operator.cc +++ b/gcc/rust/typecheck/rust-hir-dot-operator.cc @@ -240,8 +240,12 @@ MethodResolver::select (TyTy::BaseType &receiver) const HIR::Trait *trait = trait_ref->get_hir_trait_ref (); HIR::TraitItem *item = item_ref->get_hir_trait_item (); - rust_assert (item->get_item_kind () == HIR::TraitItem::TraitItemKind::FUNC); + if (item->get_item_kind () != HIR::TraitItem::TraitItemKind::FUNC) + return true; + HIR::TraitItemFunc *func = static_cast (item); + if (!func->get_decl ().is_method ()) + return true; TyTy::BaseType *ty = item_ref->get_tyty (); rust_assert (ty->get_kind () == TyTy::TypeKind::FNDEF); -- cgit v1.1