From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id 12DE93895FE2; Wed, 8 Jun 2022 12:45:30 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 12DE93895FE2 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Thomas Schwinge To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/rust/master] Assigning members to structures is a coercion site X-Act-Checkin: gcc X-Git-Author: Philip Herron X-Git-Refname: refs/heads/devel/rust/master X-Git-Oldrev: 140f6a698b4d7157e6a33cd7b41c27b39ecbf76e X-Git-Newrev: d1a2508778aafeaf19ae7e6c3e50cf9aed384854 Message-Id: <20220608124530.12DE93895FE2@sourceware.org> Date: Wed, 8 Jun 2022 12:45:30 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Jun 2022 12:45:30 -0000 https://gcc.gnu.org/g:d1a2508778aafeaf19ae7e6c3e50cf9aed384854 commit d1a2508778aafeaf19ae7e6c3e50cf9aed384854 Author: Philip Herron Date: Tue May 10 01:45:04 2022 +0100 Assigning members to structures is a coercion site Fix missing coercion site call which allows the coecion of a reference to a pointer type. Fixes #1235 Diff: --- gcc/rust/typecheck/rust-hir-type-check-struct.cc | 8 ++++---- gcc/testsuite/rust/compile/issue-1235.rs | 21 +++++++++++++++++++++ 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/gcc/rust/typecheck/rust-hir-type-check-struct.cc b/gcc/rust/typecheck/rust-hir-type-check-struct.cc index dbd1c2612f9..a1cd35977ab 100644 --- a/gcc/rust/typecheck/rust-hir-type-check-struct.cc +++ b/gcc/rust/typecheck/rust-hir-type-check-struct.cc @@ -44,7 +44,7 @@ TypeCheckStructExpr::visit (HIR::StructExprStructFields &struct_expr) = TypeCheckExpr::Resolve (struct_expr.struct_base->base_struct.get (), false); struct_def - = (TyTy::ADTType *) struct_path_resolved->unify (base_resolved); + = (TyTy::ADTType *) struct_path_resolved->coerce (base_resolved); if (struct_def == nullptr) { rust_fatal_error (struct_expr.struct_base->base_struct->get_locus (), @@ -222,7 +222,7 @@ TypeCheckStructExpr::visit (HIR::StructExprFieldIdentifierValue &field) } TyTy::BaseType *value = TypeCheckExpr::Resolve (field.get_value (), false); - resolved_field_value_expr = field_type->get_field_type ()->unify (value); + resolved_field_value_expr = field_type->get_field_type ()->coerce (value); if (resolved_field_value_expr != nullptr) { fields_assigned.insert (field.field_name); @@ -251,7 +251,7 @@ TypeCheckStructExpr::visit (HIR::StructExprFieldIndexValue &field) } TyTy::BaseType *value = TypeCheckExpr::Resolve (field.get_value (), false); - resolved_field_value_expr = field_type->get_field_type ()->unify (value); + resolved_field_value_expr = field_type->get_field_type ()->coerce (value); if (resolved_field_value_expr != nullptr) { fields_assigned.insert (field_name); @@ -285,7 +285,7 @@ TypeCheckStructExpr::visit (HIR::StructExprFieldIdentifier &field) field.get_locus ()); TyTy::BaseType *value = TypeCheckExpr::Resolve (&expr, false); - resolved_field_value_expr = field_type->get_field_type ()->unify (value); + resolved_field_value_expr = field_type->get_field_type ()->coerce (value); if (resolved_field_value_expr != nullptr) { diff --git a/gcc/testsuite/rust/compile/issue-1235.rs b/gcc/testsuite/rust/compile/issue-1235.rs new file mode 100644 index 00000000000..098b337455f --- /dev/null +++ b/gcc/testsuite/rust/compile/issue-1235.rs @@ -0,0 +1,21 @@ +// { dg-additional-options "-w" } +struct FatPtr { + data: *const T, + len: usize, +} + +pub union Repr { + rust: *const [T], + rust_mut: *mut [T], + raw: FatPtr, +} + +impl [T] { + pub const fn is_empty(&self) -> bool { + self.len() == 0 + } + + pub const fn len(&self) -> usize { + unsafe { Repr { rust: self }.raw.len } + } +}