public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r10-10346] Fortran: dimensions of an array have to be non-negative
@ 2021-12-17 21:48 Harald Anlauf
0 siblings, 0 replies; only message in thread
From: Harald Anlauf @ 2021-12-17 21:48 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:a28d6903677629c23bac53ff061eb80f22d51006
commit r10-10346-ga28d6903677629c23bac53ff061eb80f22d51006
Author: Harald Anlauf <anlauf@gmx.de>
Date: Tue Dec 7 23:06:41 2021 +0100
Fortran: dimensions of an array have to be non-negative
gcc/fortran/ChangeLog:
PR fortran/103610
* array.c (spec_dimen_size): Fix simplification of SHAPE:
dimensions must be non-negative.
gcc/testsuite/ChangeLog:
PR fortran/103610
* gfortran.dg/shape_11.f90: New test.
(cherry picked from commit 5f7cdea34e118776d0ccd2ff3dda0f5acab18a94)
Diff:
---
gcc/fortran/array.c | 6 ++++--
gcc/testsuite/gfortran.dg/shape_11.f90 | 16 ++++++++++++++++
2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/gcc/fortran/array.c b/gcc/fortran/array.c
index b304efdad50..8e4782ac1ae 100644
--- a/gcc/fortran/array.c
+++ b/gcc/fortran/array.c
@@ -2292,8 +2292,7 @@ gfc_copy_iterator (gfc_iterator *src)
/********* Subroutines for determining the size of an array *********/
/* These are needed just to accommodate RESHAPE(). There are no
- diagnostics here, we just return a negative number if something
- goes wrong. */
+ diagnostics here, we just return false if something goes wrong. */
/* Get the size of single dimension of an array specification. The
@@ -2326,6 +2325,9 @@ spec_dimen_size (gfc_array_spec *as, int dimen, mpz_t *result)
mpz_add_ui (*result, *result, 1);
+ if (mpz_cmp_si (*result, 0) < 0)
+ mpz_set_si (*result, 0);
+
return true;
}
diff --git a/gcc/testsuite/gfortran.dg/shape_11.f90 b/gcc/testsuite/gfortran.dg/shape_11.f90
new file mode 100644
index 00000000000..127d221e710
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/shape_11.f90
@@ -0,0 +1,16 @@
+! { dg-do compile }
+! { dg-options "-fdump-tree-original" }
+! PR fortran/103610 - ICE while simplifying SHAPE
+! Contributed by G.Steinmetz
+
+program p
+ integer, parameter :: a(-1) = 1
+ integer, parameter :: b(1) = maskl(shape(a))
+ integer, parameter :: c(1) = shape(a)
+ integer, parameter :: d(1) = maskr(shape(a))
+ if (b(1) /= 0) stop 1
+ if (c(1) /= 0) stop 2
+ if (d(1) /= 0) stop 3
+end
+
+! { dg-final { scan-tree-dump-not "_gfortran_stop_numeric" "original" } }
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-12-17 21:48 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-17 21:48 [gcc r10-10346] Fortran: dimensions of an array have to be non-negative 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).