public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r13-1650] Fortran: error recovery simplifying PACK with invalid arguments [PR106049]
@ 2022-07-12 18:20 Harald Anlauf
0 siblings, 0 replies; only message in thread
From: Harald Anlauf @ 2022-07-12 18:20 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:6e9d5dfc2911e3acc6039ebfe3837e7ba4be197f
commit r13-1650-g6e9d5dfc2911e3acc6039ebfe3837e7ba4be197f
Author: Harald Anlauf <anlauf@gmx.de>
Date: Tue Jul 5 22:20:05 2022 +0200
Fortran: error recovery simplifying PACK with invalid arguments [PR106049]
gcc/fortran/ChangeLog:
PR fortran/106049
* simplify.cc (is_constant_array_expr): A non-zero-sized constant
array shall have a non-empty constructor. When the constructor is
empty or missing, treat as non-constant.
gcc/testsuite/ChangeLog:
PR fortran/106049
* gfortran.dg/pack_simplify_1.f90: New test.
Diff:
---
gcc/fortran/simplify.cc | 12 ++++++++++++
gcc/testsuite/gfortran.dg/pack_simplify_1.f90 | 15 +++++++++++++++
2 files changed, 27 insertions(+)
diff --git a/gcc/fortran/simplify.cc b/gcc/fortran/simplify.cc
index ab59fbca622..fb725994653 100644
--- a/gcc/fortran/simplify.cc
+++ b/gcc/fortran/simplify.cc
@@ -233,6 +233,18 @@ is_constant_array_expr (gfc_expr *e)
if (e->expr_type != EXPR_ARRAY || !gfc_is_constant_expr (e))
return false;
+ /* A non-zero-sized constant array shall have a non-empty constructor. */
+ if (e->rank > 0 && e->shape != NULL && e->value.constructor == NULL)
+ {
+ mpz_init_set_ui (size, 1);
+ for (int j = 0; j < e->rank; j++)
+ mpz_mul (size, size, e->shape[j]);
+ bool not_size0 = (mpz_cmp_si (size, 0) != 0);
+ mpz_clear (size);
+ if (not_size0)
+ return false;
+ }
+
for (c = gfc_constructor_first (e->value.constructor);
c; c = gfc_constructor_next (c))
if (c->expr->expr_type != EXPR_CONSTANT
diff --git a/gcc/testsuite/gfortran.dg/pack_simplify_1.f90 b/gcc/testsuite/gfortran.dg/pack_simplify_1.f90
new file mode 100644
index 00000000000..06bc55a14f3
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pack_simplify_1.f90
@@ -0,0 +1,15 @@
+! { dg-do compile }
+! PR fortran/106049 - ICE in gfc_simplify_pack
+! Contributed by G.Steinmetz
+
+program p
+ type t
+ end type
+ logical, parameter :: m(0) = [ logical :: ]
+ type(t), parameter :: a(0) = [ t :: ]
+ type(t), parameter :: b(1) = [ t() ]
+ type(t), parameter :: c(1) = [ t :: ] ! { dg-error "Different shape" }
+ type(t), parameter :: d(0) = pack(a, m)
+ type(t), parameter :: e(1) = pack(b, [.true.])
+ type(t), parameter :: f(1) = pack(c, [.true.])
+end
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-07-12 18:20 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-12 18:20 [gcc r13-1650] Fortran: error recovery simplifying PACK with invalid arguments [PR106049] 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).