diff options
| author | Philip Herron <herron.philip@googlemail.com> | 2023-04-20 12:44:31 +0100 |
|---|---|---|
| committer | Arthur Cohen <arthur.cohen@embecosm.com> | 2024-01-16 18:34:13 +0100 |
| commit | b237dcd81a3e84653b2599aae2826fe6221d81a6 (patch) | |
| tree | fc945c9e0c906e137b277df14b4f67180cfe5d3d /gcc/rust | |
| parent | b39ecbfec93867596dac5914d332b3e3c790a0fd (diff) | |
| download | gcc-b237dcd81a3e84653b2599aae2826fe6221d81a6.zip gcc-b237dcd81a3e84653b2599aae2826fe6221d81a6.tar.gz gcc-b237dcd81a3e84653b2599aae2826fe6221d81a6.tar.bz2 | |
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 <herron.philip@googlemail.com>
Diffstat (limited to 'gcc/rust')
| -rw-r--r-- | gcc/rust/typecheck/rust-hir-dot-operator.cc | 6 |
1 files changed, 5 insertions, 1 deletions
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<HIR::TraitItemFunc *> (item); + if (!func->get_decl ().is_method ()) + return true; TyTy::BaseType *ty = item_ref->get_tyty (); rust_assert (ty->get_kind () == TyTy::TypeKind::FNDEF); |