diff options
| author | Andre Vehreschild <vehre@gcc.gnu.org> | 2025-03-04 17:06:31 +0100 |
|---|---|---|
| committer | Andre Vehreschild <vehre@gcc.gnu.org> | 2025-03-05 09:35:49 +0100 |
| commit | 705ae582d519f1230de3ec0d75a75e72341a674e (patch) | |
| tree | 6aec78fc7cb53b12408fa1ac8c08df00f2afc10e | |
| parent | b3d078220d202094a2b4eaef9b4a5ad1b84d30e6 (diff) | |
| download | gcc-705ae582d519f1230de3ec0d75a75e72341a674e.zip gcc-705ae582d519f1230de3ec0d75a75e72341a674e.tar.gz gcc-705ae582d519f1230de3ec0d75a75e72341a674e.tar.bz2 | |
Fortran: Add view convert to pointer assign when only pointer/alloc attr differs [PR104684]
PR fortran/104684
gcc/fortran/ChangeLog:
* trans-array.cc (gfc_conv_expr_descriptor): Look at the
lang-specific akind and do a view convert when only the akind
attribute differs between pointer and allocatable array.
gcc/testsuite/ChangeLog:
* gfortran.dg/coarray/ptr_comp_6.f08: New test.
| -rw-r--r-- | gcc/fortran/trans-array.cc | 10 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/coarray/ptr_comp_6.f08 | 25 |
2 files changed, 34 insertions, 1 deletions
diff --git a/gcc/fortran/trans-array.cc b/gcc/fortran/trans-array.cc index 6a00d26..9250304 100644 --- a/gcc/fortran/trans-array.cc +++ b/gcc/fortran/trans-array.cc @@ -8186,8 +8186,16 @@ gfc_conv_expr_descriptor (gfc_se *se, gfc_expr *expr) { if (se->direct_byref && !se->byref_noassign) { + struct lang_type *lhs_ls + = TYPE_LANG_SPECIFIC (TREE_TYPE (se->expr)), + *rhs_ls = TYPE_LANG_SPECIFIC (TREE_TYPE (desc)); + /* When only the array_kind differs, do a view_convert. */ + tmp = lhs_ls && rhs_ls && lhs_ls->rank == rhs_ls->rank + && lhs_ls->akind != rhs_ls->akind + ? build1 (VIEW_CONVERT_EXPR, TREE_TYPE (se->expr), desc) + : desc; /* Copy the descriptor for pointer assignments. */ - gfc_add_modify (&se->pre, se->expr, desc); + gfc_add_modify (&se->pre, se->expr, tmp); /* Add any offsets from subreferences. */ gfc_get_dataptr_offset (&se->pre, se->expr, desc, NULL_TREE, diff --git a/gcc/testsuite/gfortran.dg/coarray/ptr_comp_6.f08 b/gcc/testsuite/gfortran.dg/coarray/ptr_comp_6.f08 new file mode 100644 index 0000000..397a09bc --- /dev/null +++ b/gcc/testsuite/gfortran.dg/coarray/ptr_comp_6.f08 @@ -0,0 +1,25 @@ +!{ dg-do run } +! +! Contributed by Arseny Solokha <asolokha@gmx.com> + +program pr104684 + type :: index_map + integer, allocatable :: send_index(:) + end type + type(index_map) :: imap + + imap%send_index = [5,4,3] + call sub(imap) +contains + subroutine sub(this) + type(index_map), intent(inout), target :: this + type :: box + integer, pointer :: array(:) + end type + type(box), allocatable :: buffer[:] + allocate(buffer[*]) + buffer%array => this%send_index + if (any(buffer%array /= [5,4,3])) stop 1 + end subroutine +end program + |