From: Philip Herron <herron.philip@googlemail.com>
Date: Thu, 20 Apr 2023 11:44:31 +0000 (+0100)
Subject: gccrs: Fix ICE during method resolution
X-Git-Tag: basepoints/gcc-15~2620
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b237dcd81a3e84653b2599aae2826fe6221d81a6;p=thirdparty%2Fgcc.git

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 --git a/gcc/rust/typecheck/rust-hir-dot-operator.cc b/gcc/rust/typecheck/rust-hir-dot-operator.cc
index d782da8960a6..251cf8a02e58 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 000000000000..780ed58d5cc6
--- /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 }
+}