I am going to get the brown bag for today... This is now the right
corrected patch.
Sorry for all the noise!
Harald
Am 26.07.23 um 21:17 schrieb Harald Anlauf via Gcc-patches:
Dear all,
the original submission missed the adjustments of the expected
patterns of 2 tests. This is corrected in the new attachments.
Am 26.07.23 um 21:10 schrieb Harald Anlauf via Gcc-patches:
Dear all,
the attached patch fixes an ICE-on-invalid after use of strings of
non-constant length in DATA statements.
Regtested on x86_64-pc-linux-gnu. OK for mainline?
Thanks,
Harald
Thanks,
Harald
From d872b8ffc121fd57d47aa7d3d12d9ba86389f092 Mon Sep 17 00:00:00 2001
From: Harald Anlauf
Date: Wed, 26 Jul 2023 21:12:45 +0200
Subject: [PATCH] Fortran: diagnose strings of non-constant length in DATA
statements [PR68569]
gcc/fortran/ChangeLog:
PR fortran/68569
* resolve.cc (check_data_variable): Do not accept strings with
deferred length or non-constant length in a DATA statement.
Reject also substrings of string variables of non-constant length.
gcc/testsuite/ChangeLog:
PR fortran/68569
* gfortran.dg/data_char_4.f90: Adjust expected diagnostic.
* gfortran.dg/data_char_5.f90: Likewise.
* gfortran.dg/data_char_6.f90: New test.
---
gcc/fortran/resolve.cc| 22 ++-
gcc/testsuite/gfortran.dg/data_char_4.f90 | 2 +-
gcc/testsuite/gfortran.dg/data_char_5.f90 | 8 +++
gcc/testsuite/gfortran.dg/data_char_6.f90 | 26 +++
4 files changed, 52 insertions(+), 6 deletions(-)
create mode 100644 gcc/testsuite/gfortran.dg/data_char_6.f90
diff --git a/gcc/fortran/resolve.cc b/gcc/fortran/resolve.cc
index f7cfdfc133f..3cd470ddcca 100644
--- a/gcc/fortran/resolve.cc
+++ b/gcc/fortran/resolve.cc
@@ -16771,7 +16771,6 @@ check_data_variable (gfc_data_variable *var, locus *where)
return false;
ar = NULL;
- mpz_init_set_si (offset, 0);
e = var->expr;
if (e->expr_type == EXPR_FUNCTION && e->value.function.isym
@@ -16838,8 +16837,24 @@ check_data_variable (gfc_data_variable *var, locus *where)
"attribute", ref->u.c.component->name, >where);
return false;
}
+
+ /* Reject substrings of strings of non-constant length. */
+ if (ref->type == REF_SUBSTRING
+ && ref->u.ss.length
+ && ref->u.ss.length->length
+ && !gfc_is_constant_expr (ref->u.ss.length->length))
+ goto bad_charlen;
}
+ /* Reject strings with deferred length or non-constant length. */
+ if (e->ts.type == BT_CHARACTER
+ && (e->ts.deferred
+ || (e->ts.u.cl->length
+ && !gfc_is_constant_expr (e->ts.u.cl->length
+goto bad_charlen;
+
+ mpz_init_set_si (offset, 0);
+
if (e->rank == 0 || has_pointer)
{
mpz_init_set_ui (size, 1);
@@ -16967,6 +16982,11 @@ check_data_variable (gfc_data_variable *var, locus *where)
mpz_clear (offset);
return t;
+
+bad_charlen:
+ gfc_error ("Non-constant character length at %L in DATA statement",
+ >where);
+ return false;
}
diff --git a/gcc/testsuite/gfortran.dg/data_char_4.f90 b/gcc/testsuite/gfortran.dg/data_char_4.f90
index ed0782ce8a0..fa5e0a0134a 100644
--- a/gcc/testsuite/gfortran.dg/data_char_4.f90
+++ b/gcc/testsuite/gfortran.dg/data_char_4.f90
@@ -4,7 +4,7 @@
program p
character(l) :: c(2) ! { dg-error "must have constant character length" }
- data c /'a', 'b'/
+ data c /'a', 'b'/! { dg-error "Non-constant character length" }
common c
end
diff --git a/gcc/testsuite/gfortran.dg/data_char_5.f90 b/gcc/testsuite/gfortran.dg/data_char_5.f90
index ea26687e3d5..7556e63c01b 100644
--- a/gcc/testsuite/gfortran.dg/data_char_5.f90
+++ b/gcc/testsuite/gfortran.dg/data_char_5.f90
@@ -4,12 +4,12 @@
subroutine sub ()
integer :: ll = 4
block
-character(ll) :: c(2) ! { dg-error "non-constant" }
-data c /'a', 'b'/
+character(ll) :: c(2)
+data c /'a', 'b'/ ! { dg-error "Non-constant character length" }
end block
contains
subroutine sub1 ()
-character(ll) :: d(2) ! { dg-error "non-constant" }
-data d /'a', 'b'/
+character(ll) :: d(2)
+data d /'a', 'b'/ ! { dg-error "Non-constant character length" }
end subroutine sub1
end subroutine sub
diff --git a/gcc/testsuite/gfortran.dg/data_char_6.f90 b/gcc/testsuite/gfortran.dg/data_char_6.f90
new file mode 100644
index 000..4e32c647d4d
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/data_char_6.f90
@@ -0,0 +1,26 @@
+! { dg-do compile }
+! PR fortran/68569 - ICE with automatic character object and DATA
+! Contributed by G. Steinmetz
+
+subroutine s1 (n)
+ implicit none
+ integer, intent(in) :: n
+ character(n) :: x
+ data x /'a'/ ! { dg-error "Non-constant character length" }
+end
+
+subroutine s2 (n)
+ implicit none
+ integer, intent(in) :: n
+ character(n) :: x
+ data x(1:1) /'a'/! { dg-error "Non-constant character length" }
+end
+
+subroutine s3 ()
+ implicit none
+ type t
+ character(:) :: c ! { dg-error "must be a POINTER or
