aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran
diff options
context:
space:
mode:
authorHarald Anlauf <anlauf@gmx.de>2024-06-03 22:02:06 +0200
committerHarald Anlauf <anlauf@gmx.de>2024-06-04 19:15:38 +0200
commit7f21aee0d4ef95eee7d9f7f42e9a056715836648 (patch)
treef3b9e15c14f6baa2e4e9e890d5ddd29e4819cb96 /gcc/fortran
parent54e5cbcd82e36f5aa8205b56880821eea25701ae (diff)
downloadgcc-7f21aee0d4ef95eee7d9f7f42e9a056715836648.zip
gcc-7f21aee0d4ef95eee7d9f7f42e9a056715836648.tar.gz
gcc-7f21aee0d4ef95eee7d9f7f42e9a056715836648.tar.bz2
Fortran: fix ALLOCATE with SOURCE=, zero-length character [PR83865]
gcc/fortran/ChangeLog: PR fortran/83865 * trans-stmt.cc (gfc_trans_allocate): Restrict special case for source-expression with zero-length character to rank 0, so that the array shape is not discarded. gcc/testsuite/ChangeLog: PR fortran/83865 * gfortran.dg/allocate_with_source_32.f90: New test.
Diffstat (limited to 'gcc/fortran')
-rw-r--r--gcc/fortran/trans-stmt.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/gcc/fortran/trans-stmt.cc b/gcc/fortran/trans-stmt.cc
index 9b497d6..93b633e 100644
--- a/gcc/fortran/trans-stmt.cc
+++ b/gcc/fortran/trans-stmt.cc
@@ -6449,8 +6449,9 @@ gfc_trans_allocate (gfc_code * code, gfc_omp_namelist *omp_allocate)
else
gfc_add_block_to_block (&post, &se.post);
- /* Special case when string in expr3 is zero. */
+ /* Special case when string in expr3 is scalar and has length zero. */
if (code->expr3->ts.type == BT_CHARACTER
+ && code->expr3->rank == 0
&& integer_zerop (se.string_length))
{
gfc_init_se (&se, NULL);