aboutsummaryrefslogtreecommitdiff
path: root/gcc/rust/backend/rust-compile-resolve-path.cc
diff options
context:
space:
mode:
authorPhilip Herron <herron.philip@googlemail.com>2023-04-04 15:40:26 +0100
committerPhilip Herron <philip.herron@embecosm.com>2023-04-05 09:24:55 +0000
commit92b137048583c2c22c585097119dba6a5fe06228 (patch)
treeaacc605e53a28780e6d4dd08ab9165c5890c3476 /gcc/rust/backend/rust-compile-resolve-path.cc
parent4d663acdb6e685c07818aa4229c7b1f2224d678b (diff)
downloadgcc-92b137048583c2c22c585097119dba6a5fe06228.zip
gcc-92b137048583c2c22c585097119dba6a5fe06228.tar.gz
gcc-92b137048583c2c22c585097119dba6a5fe06228.tar.bz2
gccrs: Support fully qualified calls to trait items from CallExpr's
Fixes #2070 gcc/rust/ChangeLog: * backend/rust-compile-resolve-path.cc (HIRCompileBase::query_compile): reuse resolve_method_address to monomorphize the call if required * typecheck/rust-hir-type-check-path.cc (TypeCheckExpr::resolve_segments): allow matching against unimplemented trait item bounds gcc/testsuite/ChangeLog: * rust/compile/issue-2070.rs: New test. Signed-off-by: Philip Herron <herron.philip@googlemail.com>
Diffstat (limited to 'gcc/rust/backend/rust-compile-resolve-path.cc')
-rw-r--r--gcc/rust/backend/rust-compile-resolve-path.cc16
1 files changed, 16 insertions, 0 deletions
diff --git a/gcc/rust/backend/rust-compile-resolve-path.cc b/gcc/rust/backend/rust-compile-resolve-path.cc
index b7f1069..4814141 100644
--- a/gcc/rust/backend/rust-compile-resolve-path.cc
+++ b/gcc/rust/backend/rust-compile-resolve-path.cc
@@ -186,6 +186,7 @@ HIRCompileBase::query_compile (HirId ref, TyTy::BaseType *lookup,
= ctx->get_mappings ()->lookup_hir_extern_item (ref, &parent_block);
bool is_hir_item = resolved_item != nullptr;
bool is_hir_extern_item = resolved_extern_item != nullptr;
+ bool is_fn = lookup->get_kind () == TyTy::TypeKind::FNDEF;
if (is_hir_item)
{
if (!lookup->has_subsititions_defined ())
@@ -206,6 +207,21 @@ HIRCompileBase::query_compile (HirId ref, TyTy::BaseType *lookup,
}
else
{
+ if (is_fn)
+ {
+ TyTy::FnType *fn = static_cast<TyTy::FnType *> (lookup);
+ TyTy::BaseType *receiver = nullptr;
+
+ if (fn->is_method ())
+ {
+ receiver = fn->get_self_type ();
+ receiver = receiver->destructure ();
+
+ return resolve_method_address (fn, ref, receiver, final_segment,
+ mappings, expr_locus);
+ }
+ }
+
HirId parent_impl_id = UNKNOWN_HIRID;
HIR::ImplItem *resolved_item
= ctx->get_mappings ()->lookup_hir_implitem (ref, &parent_impl_id);