From 525110ae4951fcc1ca3e858d6afa23823b79b8f0 Mon Sep 17 00:00:00 2001 From: bl7awy Date: Tue, 28 Feb 2023 20:53:01 +0300 Subject: gccrs: typecheck: Fix casting error behind generics gcc/rust/ChangeLog: * typecheck/rust-casts.cc (TypeCastRules::cast_rules): Perform destructure on `from` type. gcc/testsuite/ChangeLog: * rust/compile/cast_generics.rs: New test. Signed-off-by: Mahmoud Mohamed --- gcc/rust/typecheck/rust-casts.cc | 11 ++++++----- gcc/testsuite/rust/compile/cast_generics.rs | 8 ++++++++ 2 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 gcc/testsuite/rust/compile/cast_generics.rs (limited to 'gcc') diff --git a/gcc/rust/typecheck/rust-casts.cc b/gcc/rust/typecheck/rust-casts.cc index 269d344..bbcd846 100644 --- a/gcc/rust/typecheck/rust-casts.cc +++ b/gcc/rust/typecheck/rust-casts.cc @@ -60,15 +60,16 @@ TypeCastRules::cast_rules () // https://github.com/rust-lang/rust/blob/7eac88abb2e57e752f3302f02be5f3ce3d7adfb4/compiler/rustc_typeck/src/check/cast.rs#L596 // https://github.com/rust-lang/rust/blob/7eac88abb2e57e752f3302f02be5f3ce3d7adfb4/compiler/rustc_typeck/src/check/cast.rs#L654 - rust_debug ("cast_rules from={%s} to={%s}", - from.get_ty ()->debug_str ().c_str (), + TyTy::BaseType *from_type = from.get_ty ()->destructure (); + + rust_debug ("cast_rules from={%s} to={%s}", from_type->debug_str ().c_str (), to.get_ty ()->debug_str ().c_str ()); - switch (from.get_ty ()->get_kind ()) + switch (from_type->get_kind ()) { case TyTy::TypeKind::INFER: { TyTy::InferType *from_infer - = static_cast (from.get_ty ()); + = static_cast (from_type); switch (from_infer->get_infer_kind ()) { case TyTy::InferType::InferTypeKind::GENERAL: @@ -290,4 +291,4 @@ TypeCastRules::emit_cast_error () const } } // namespace Resolver -} // namespace Rust +} // namespace Rust \ No newline at end of file diff --git a/gcc/testsuite/rust/compile/cast_generics.rs b/gcc/testsuite/rust/compile/cast_generics.rs new file mode 100644 index 0000000..7d18596 --- /dev/null +++ b/gcc/testsuite/rust/compile/cast_generics.rs @@ -0,0 +1,8 @@ +fn test(a: T) -> T { + a +} + +fn main() { + let t: i32 = test(123 as i32) as i32; + // { dg-warning "unused name" "" { target *-*-* } .-1 } +} -- cgit v1.1