public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r12-4973] Fortran: error recovery on rank mismatch of array and its initializer
@ 2021-11-06 18:44 Harald Anlauf
0 siblings, 0 replies; only message in thread
From: Harald Anlauf @ 2021-11-06 18:44 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:df2135e88a8f78c853b35246ad426b01b6d08378
commit r12-4973-gdf2135e88a8f78c853b35246ad426b01b6d08378
Author: Harald Anlauf <anlauf@gmx.de>
Date: Sat Nov 6 19:42:01 2021 +0100
Fortran: error recovery on rank mismatch of array and its initializer
gcc/fortran/ChangeLog:
PR fortran/102715
* decl.c (add_init_expr_to_sym): Reject rank mismatch between
array and its initializer.
gcc/testsuite/ChangeLog:
PR fortran/102715
* gfortran.dg/pr68019.f90: Adjust error message.
* gfortran.dg/pr102715.f90: New test.
Diff:
---
gcc/fortran/decl.c | 8 ++++++++
gcc/testsuite/gfortran.dg/pr102715.f90 | 13 +++++++++++++
gcc/testsuite/gfortran.dg/pr68019.f90 | 2 +-
3 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c
index ab88ab5e9c1..c0fec90e3e0 100644
--- a/gcc/fortran/decl.c
+++ b/gcc/fortran/decl.c
@@ -2105,6 +2105,14 @@ add_init_expr_to_sym (const char *name, gfc_expr **initp, locus *var_locus)
}
}
+ if (sym->attr.flavor == FL_PARAMETER && sym->attr.dimension && sym->as
+ && sym->as->rank && init->rank && init->rank != sym->as->rank)
+ {
+ gfc_error ("Rank mismatch of array at %L and its initializer "
+ "(%d/%d)", &sym->declared_at, sym->as->rank, init->rank);
+ return false;
+ }
+
/* If sym is implied-shape, set its upper bounds from init. */
if (sym->attr.flavor == FL_PARAMETER && sym->attr.dimension
&& sym->as->type == AS_IMPLIED_SHAPE)
diff --git a/gcc/testsuite/gfortran.dg/pr102715.f90 b/gcc/testsuite/gfortran.dg/pr102715.f90
new file mode 100644
index 00000000000..7b29a1c05a6
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr102715.f90
@@ -0,0 +1,13 @@
+! { dg-do compile }
+! PR fortran/102715 - ICE in gfc_simplify_transpose
+
+program p
+ type t
+ end type
+ type(t), parameter :: a(4) = t()
+ type(t), parameter :: b(2,2) = reshape(a, [2]) ! { dg-error "Rank mismatch" }
+ type(t), parameter :: c(2,2) = transpose(b) ! { dg-error "must be of rank 2" }
+ type(t), parameter :: s2(*) = b(2,:) ! { dg-error "Syntax error" }
+ type(t), parameter :: x(*,*) = reshape(a, [2]) ! { dg-error "Rank mismatch" }
+ type(t), parameter :: s3(*) = x(2,:) ! { dg-error "Syntax error" }
+end
diff --git a/gcc/testsuite/gfortran.dg/pr68019.f90 b/gcc/testsuite/gfortran.dg/pr68019.f90
index 2e304c3a260..77fd55bd331 100644
--- a/gcc/testsuite/gfortran.dg/pr68019.f90
+++ b/gcc/testsuite/gfortran.dg/pr68019.f90
@@ -9,5 +9,5 @@ program p
integer :: n
end type
type(t), parameter :: vec(*) = [(t(i), i = 1, 4)]
- type(t), parameter :: arr(*) = reshape(vec, [2, 2]) ! { dg-error "ranks 1 and 2 in assignment" }
+ type(t), parameter :: arr(*) = reshape(vec, [2, 2]) ! { dg-error "Rank mismatch" }
end
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-11-06 18:44 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-06 18:44 [gcc r12-4973] Fortran: error recovery on rank mismatch of array and its initializer Harald Anlauf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).