public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r14-7519] gccrs: Fix ICE during method resolution
@ 2024-01-16 17:40 Arthur Cohen
0 siblings, 0 replies; only message in thread
From: Arthur Cohen @ 2024-01-16 17:40 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:b237dcd81a3e84653b2599aae2826fe6221d81a6
commit r14-7519-gb237dcd81a3e84653b2599aae2826fe6221d81a6
Author: Philip Herron <herron.philip@googlemail.com>
Date: Thu Apr 20 12:44:31 2023 +0100
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>
Diff:
---
gcc/rust/typecheck/rust-hir-dot-operator.cc | 6 +++++-
gcc/testsuite/rust/compile/issue-2139.rs | 16 ++++++++++++++++
2 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/gcc/rust/typecheck/rust-hir-dot-operator.cc b/gcc/rust/typecheck/rust-hir-dot-operator.cc
index d782da8960a..251cf8a02e5 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);
diff --git a/gcc/testsuite/rust/compile/issue-2139.rs b/gcc/testsuite/rust/compile/issue-2139.rs
new file mode 100644
index 00000000000..780ed58d5cc
--- /dev/null
+++ b/gcc/testsuite/rust/compile/issue-2139.rs
@@ -0,0 +1,16 @@
+pub trait Foo {
+ fn foo();
+}
+
+impl Foo for u16 {
+ fn foo() {
+ <u16 as Foo>::foo()
+ }
+}
+
+fn main() {
+ let a: u16 = 123;
+ a.foo();
+ // { dg-error "failed to resolve method for .foo." "" { target *-*-* } .-1 }
+ // { dg-error "failed to type resolve expression" "" { target *-*-* } .-2 }
+}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2024-01-16 17:40 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-01-16 17:40 [gcc r14-7519] gccrs: Fix ICE during method resolution Arthur Cohen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).