aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/rust/typecheck/rust-hir-type-check-item.cc12
-rw-r--r--gcc/testsuite/rust/compile/issue-2037.rs13
2 files changed, 24 insertions, 1 deletions
diff --git a/gcc/rust/typecheck/rust-hir-type-check-item.cc b/gcc/rust/typecheck/rust-hir-type-check-item.cc
index ab7292f..c826536 100644
--- a/gcc/rust/typecheck/rust-hir-type-check-item.cc
+++ b/gcc/rust/typecheck/rust-hir-type-check-item.cc
@@ -456,7 +456,17 @@ TypeCheckItem::visit (HIR::Module &module)
void
TypeCheckItem::visit (HIR::Trait &trait)
{
- TraitResolver::Resolve (trait);
+ TraitReference *trait_ref = TraitResolver::Resolve (trait);
+ if (trait_ref->is_error ())
+ {
+ infered = new TyTy::ErrorType (trait.get_mappings ().get_hirid ());
+ return;
+ }
+
+ RustIdent ident{CanonicalPath::create_empty (), trait.get_locus ()};
+ infered = new TyTy::DynamicObjectType (
+ trait.get_mappings ().get_hirid (), ident,
+ {TyTy::TypeBoundPredicate (*trait_ref, trait.get_locus ())});
}
void
diff --git a/gcc/testsuite/rust/compile/issue-2037.rs b/gcc/testsuite/rust/compile/issue-2037.rs
new file mode 100644
index 0000000..ec27a0d
--- /dev/null
+++ b/gcc/testsuite/rust/compile/issue-2037.rs
@@ -0,0 +1,13 @@
+trait Foo {
+ fn bar(&mut self, other: &mut Foo);
+}
+
+struct Baz;
+
+impl Foo for Baz {
+ fn bar(&mut self, other: &Foo) {}
+ // { dg-error "expected" "" { target *-*-* } .-1 }
+ // { dg-error "method .bar. has an incompatible type for trait .Foo." "" { target *-*-* } .-2 }
+}
+
+fn main() {}