diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2022-05-10 09:48:38 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-10 09:48:38 +0000 |
| commit | ba3f9811192cbbfe7b9a8256ca76f160f64063b7 (patch) | |
| tree | de0498cc21dc34afecf0f96e367915f33cf663fd | |
| parent | 8d828e4b301a52e43246176848ae8869dd26255c (diff) | |
| parent | d1a2508778aafeaf19ae7e6c3e50cf9aed384854 (diff) | |
| download | gcc-ba3f9811192cbbfe7b9a8256ca76f160f64063b7.zip gcc-ba3f9811192cbbfe7b9a8256ca76f160f64063b7.tar.gz gcc-ba3f9811192cbbfe7b9a8256ca76f160f64063b7.tar.bz2 | |
Merge #1238
1238: Assigning members to structures is a coercion site r=philberty a=philberty
Fix missing coercion site call which allows the coecion of a reference to
a pointer type.
Fixes #1235
Co-authored-by: Philip Herron <philip.herron@embecosm.com>
| -rw-r--r-- | gcc/rust/typecheck/rust-hir-type-check-struct.cc | 8 | ||||
| -rw-r--r-- | 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 dbd1c26..a1cd359 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 0000000..098b337 --- /dev/null +++ b/gcc/testsuite/rust/compile/issue-1235.rs @@ -0,0 +1,21 @@ +// { dg-additional-options "-w" } +struct FatPtr<T> { + data: *const T, + len: usize, +} + +pub union Repr<T> { + rust: *const [T], + rust_mut: *mut [T], + raw: FatPtr<T>, +} + +impl<T> [T] { + pub const fn is_empty(&self) -> bool { + self.len() == 0 + } + + pub const fn len(&self) -> usize { + unsafe { Repr { rust: self }.raw.len } + } +} |