[COMMITTED 20/35] gccrs: Fix ICE when doing method resolution on trait predicates

[arthur . cohen]

From: Philip Herron <herron.phi...@googlemail.com>

We need to ensure we are adding methods to the possible candidates.

Fixes Rust-GCC#3554

gcc/rust/ChangeLog:

        * typecheck/rust-hir-dot-operator.cc:

gcc/testsuite/ChangeLog:

        * rust/compile/issue-3554-1.rs: New test.
        * rust/compile/issue-3554-2.rs: New test.

Signed-off-by: Philip Herron <herron.phi...@googlemail.com>
---
 gcc/rust/typecheck/rust-hir-dot-operator.cc |  7 +++++--
 gcc/testsuite/rust/compile/issue-3554-1.rs  |  8 ++++++++
 gcc/testsuite/rust/compile/issue-3554-2.rs  | 18 ++++++++++++++++++
 3 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 gcc/testsuite/rust/compile/issue-3554-1.rs
 create mode 100644 gcc/testsuite/rust/compile/issue-3554-2.rs

diff --git a/gcc/rust/typecheck/rust-hir-dot-operator.cc 
b/gcc/rust/typecheck/rust-hir-dot-operator.cc
index 38bd5b75fb7..c1165e9e5b1 100644
--- a/gcc/rust/typecheck/rust-hir-dot-operator.cc
+++ b/gcc/rust/typecheck/rust-hir-dot-operator.cc
@@ -472,8 +472,11 @@ MethodResolver::get_predicate_items (
       if (ty->get_kind () == TyTy::TypeKind::FNDEF)
        {
          TyTy::FnType *fnty = static_cast<TyTy::FnType *> (ty);
-         predicate_candidate candidate{lookup, fnty};
-         predicate_items.push_back (candidate);
+         if (fnty->is_method ())
+           {
+             predicate_candidate candidate{lookup, fnty};
+             predicate_items.push_back (candidate);
+           }
        }
     }
 
diff --git a/gcc/testsuite/rust/compile/issue-3554-1.rs 
b/gcc/testsuite/rust/compile/issue-3554-1.rs
new file mode 100644
index 00000000000..a66be35d363
--- /dev/null
+++ b/gcc/testsuite/rust/compile/issue-3554-1.rs
@@ -0,0 +1,8 @@
+trait Tr {
+    fn foo();
+
+    fn bar(&self) {
+        self.foo()
+        // { dg-error "no method named .foo. found in the current scope 
.E0599." "" { target *-*-* } .-1 }
+    }
+}
diff --git a/gcc/testsuite/rust/compile/issue-3554-2.rs 
b/gcc/testsuite/rust/compile/issue-3554-2.rs
new file mode 100644
index 00000000000..e455a8b2cec
--- /dev/null
+++ b/gcc/testsuite/rust/compile/issue-3554-2.rs
@@ -0,0 +1,18 @@
+#[lang = "sized"]
+pub trait Sized {}
+
+#[lang = "fn_once"]
+pub trait FnOnce<Args> {
+    #[lang = "fn_once_output"]
+    type Output;
+
+    extern "rust-call" fn call_once(self, args: Args) -> Self::Output;
+}
+trait Tr {
+    fn foo();
+
+    fn bar(&self) {
+        (|| self.foo())()
+        // { dg-error "no method named .foo. found in the current scope 
.E0599." "" { target *-*-* } .-1 }
+    }
+}
-- 
2.49.0