[gcc r14-7666] gccrs: introduce new types_compatable
Arthur Cohen
cohenarthur@gcc.gnu.org
Tue Jan 16 17:51:59 GMT 2024
https://gcc.gnu.org/g:a77f3c3b3655a2c7a0029887f9ef47b4df7b91f0
commit r14-7666-ga77f3c3b3655a2c7a0029887f9ef47b4df7b91f0
Author: Philip Herron <herron.philip@googlemail.com>
Date: Sat Jun 10 21:07:27 2023 +0100
gccrs: introduce new types_compatable
This is an initiative to begin getting rid of the can_eq interface.
Addresses #2019
gcc/rust/ChangeLog:
* typecheck/rust-hir-type-check-implitem.cc (TypeCheckImplItemWithTrait::visit):
use new interface
* typecheck/rust-type-util.cc (types_compatable): implementation of new interface
* typecheck/rust-type-util.h (types_compatable): prototype
* typecheck/rust-unify.cc (UnifyRules::expect_placeholder):
It is allow for unification against placeholders
gcc/testsuite/ChangeLog:
* rust/compile/traits2.rs: update error message
* rust/compile/traits3.rs: update error message
Signed-off-by: Philip Herron <herron.philip@googlemail.com>
Diff:
---
gcc/rust/typecheck/rust-hir-type-check-implitem.cc | 12 +++++++++---
gcc/rust/typecheck/rust-type-util.cc | 10 ++++++++++
gcc/rust/typecheck/rust-type-util.h | 4 ++++
gcc/rust/typecheck/rust-unify.cc | 17 ++++++-----------
gcc/testsuite/rust/compile/traits2.rs | 2 +-
gcc/testsuite/rust/compile/traits3.rs | 4 ++--
6 files changed, 32 insertions(+), 17 deletions(-)
diff --git a/gcc/rust/typecheck/rust-hir-type-check-implitem.cc b/gcc/rust/typecheck/rust-hir-type-check-implitem.cc
index b42b034d7df..130f4a51cbd 100644
--- a/gcc/rust/typecheck/rust-hir-type-check-implitem.cc
+++ b/gcc/rust/typecheck/rust-hir-type-check-implitem.cc
@@ -411,7 +411,9 @@ TypeCheckImplItemWithTrait::visit (HIR::ConstantItem &constant)
// check the types are compatible
auto trait_item_type = resolved_trait_item.get_tyty_for_receiver (self);
- if (!trait_item_type->can_eq (lookup, true))
+ if (!types_compatable (TyTy::TyWithLocation (trait_item_type),
+ TyTy::TyWithLocation (lookup), constant.get_locus (),
+ true /*emit_errors*/))
{
RichLocation r (constant.get_locus ());
r.add_range (resolved_trait_item.get_locus ());
@@ -460,7 +462,9 @@ TypeCheckImplItemWithTrait::visit (HIR::TypeAlias &type)
// check the types are compatible
auto trait_item_type = resolved_trait_item.get_tyty_for_receiver (self);
- if (!trait_item_type->can_eq (lookup, true))
+ if (!types_compatable (TyTy::TyWithLocation (trait_item_type),
+ TyTy::TyWithLocation (lookup), type.get_locus (),
+ true /*emit_errors*/))
{
RichLocation r (type.get_locus ());
r.add_range (resolved_trait_item.get_locus ());
@@ -519,7 +523,9 @@ TypeCheckImplItemWithTrait::visit (HIR::Function &function)
// check the types are compatible
auto trait_item_type = resolved_trait_item.get_tyty_for_receiver (self);
- if (!trait_item_type->can_eq (lookup, true))
+ if (!types_compatable (TyTy::TyWithLocation (trait_item_type),
+ TyTy::TyWithLocation (lookup), function.get_locus (),
+ true /*emit_errors*/))
{
RichLocation r (function.get_locus ());
r.add_range (resolved_trait_item.get_locus ());
diff --git a/gcc/rust/typecheck/rust-type-util.cc b/gcc/rust/typecheck/rust-type-util.cc
index eea97ed4fef..8e8871cab4d 100644
--- a/gcc/rust/typecheck/rust-type-util.cc
+++ b/gcc/rust/typecheck/rust-type-util.cc
@@ -123,6 +123,16 @@ query_type (HirId reference, TyTy::BaseType **result)
return false;
}
+bool
+types_compatable (TyTy::TyWithLocation lhs, TyTy::TyWithLocation rhs,
+ Location unify_locus, bool emit_errors)
+{
+ TyTy::BaseType *result
+ = unify_site_and (UNKNOWN_HIRID, lhs, rhs, unify_locus, emit_errors,
+ false /*commit*/, true /*infer*/, true /*cleanup*/);
+ return result->get_kind () != TyTy::TypeKind::ERROR;
+}
+
TyTy::BaseType *
unify_site (HirId id, TyTy::TyWithLocation lhs, TyTy::TyWithLocation rhs,
Location unify_locus)
diff --git a/gcc/rust/typecheck/rust-type-util.h b/gcc/rust/typecheck/rust-type-util.h
index 85906d7d185..938f410296a 100644
--- a/gcc/rust/typecheck/rust-type-util.h
+++ b/gcc/rust/typecheck/rust-type-util.h
@@ -28,6 +28,10 @@ namespace Resolver {
bool
query_type (HirId reference, TyTy::BaseType **result);
+bool
+types_compatable (TyTy::TyWithLocation lhs, TyTy::TyWithLocation rhs,
+ Location unify_locus, bool emit_errors);
+
TyTy::BaseType *
unify_site (HirId id, TyTy::TyWithLocation lhs, TyTy::TyWithLocation rhs,
Location unify_locus);
diff --git a/gcc/rust/typecheck/rust-unify.cc b/gcc/rust/typecheck/rust-unify.cc
index dc809e0090f..42e10950917 100644
--- a/gcc/rust/typecheck/rust-unify.cc
+++ b/gcc/rust/typecheck/rust-unify.cc
@@ -1576,17 +1576,8 @@ UnifyRules::expect_placeholder (TyTy::PlaceholderType *ltype,
}
break;
- case TyTy::PLACEHOLDER: {
- TyTy::PlaceholderType &type
- = *static_cast<TyTy::PlaceholderType *> (rtype);
- bool symbol_match
- = ltype->get_symbol ().compare (type.get_symbol ()) == 0;
- if (symbol_match)
- {
- return type.clone ();
- }
- }
- break;
+ case TyTy::PLACEHOLDER:
+ return ltype->clone ();
case TyTy::PROJECTION:
case TyTy::DYNAMIC:
@@ -1609,6 +1600,10 @@ UnifyRules::expect_placeholder (TyTy::PlaceholderType *ltype,
case TyTy::USIZE:
case TyTy::ISIZE:
case TyTy::NEVER:
+ if (infer_flag)
+ return rtype->clone ();
+ gcc_fallthrough ();
+
case TyTy::ERROR:
return new TyTy::ErrorType (0);
}
diff --git a/gcc/testsuite/rust/compile/traits2.rs b/gcc/testsuite/rust/compile/traits2.rs
index 7357c22f7d6..376b3c9cc7f 100644
--- a/gcc/testsuite/rust/compile/traits2.rs
+++ b/gcc/testsuite/rust/compile/traits2.rs
@@ -7,7 +7,7 @@ struct Baz;
impl Foo for Baz {
fn Bar() {}
- // { dg-error "expected .i32. got .()." "" { target *-*-* } .-1 }
+ // { dg-error "expected" "" { target *-*-* } .-1 }
// { dg-error "method .Bar. has an incompatible type for trait .Foo." "" { target *-*-* } .-2 }
}
diff --git a/gcc/testsuite/rust/compile/traits3.rs b/gcc/testsuite/rust/compile/traits3.rs
index fd3fa457cc8..d6d081487b9 100644
--- a/gcc/testsuite/rust/compile/traits3.rs
+++ b/gcc/testsuite/rust/compile/traits3.rs
@@ -10,9 +10,9 @@ impl<T> Foo for Bar<T> {
type A = i32;
fn baz(a: f32) -> f32 {
- // { dg-error "method .baz. has an incompatible type for trait .Foo." "" { target *-*-* } .-1 }
+ // { dg-error "expected" "" { target *-*-* } .-1 }
+ // { dg-error "method .baz. has an incompatible type for trait .Foo." "" { target *-*-* } .-2 }
a
- // { dg-error "expected .i32. got .f32." "" { target *-*-* } .-1 }
}
}
More information about the Gcc-cvs
mailing list