From: Harald Anlauf <anlauf@gmx.de>
To: fortran <fortran@gcc.gnu.org>, gcc-patches <gcc-patches@gcc.gnu.org>
Subject: [PATCH] PR fortran/103411 - ICE in gfc_conv_array_initializer, at fortran/trans-array.c:6377
Date: Wed, 24 Nov 2021 22:32:57 +0100 [thread overview]
Message-ID: <trinity-4c07fd5c-8afc-4a43-ba7a-bdd5893eebf6-1637789577911@3c-app-gmx-bs39> (raw)
[-- Attachment #1: Type: text/plain, Size: 355 bytes --]
Dear all,
when checking the SOURCE and SHAPE arguments to the RESHAPE
intrinsic, for absent PAD argument we failed to handle the case
when SHAPE was a parameter.
Fortunately, the proper check was already there, and the code
just needs some tweaking, as well as one of the testcases.
Regtested on x86_64-pc-linux-gnu. OK for mainline?
Thanks,
Harald
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Fortran-improve-check-of-arguments-to-the-RESHAPE-in.patch --]
[-- Type: text/x-patch, Size: 4439 bytes --]
From d6af2a33bad852bcea39b8c5b2e7c27976bde2a1 Mon Sep 17 00:00:00 2001
From: Harald Anlauf <anlauf@gmx.de>
Date: Wed, 24 Nov 2021 22:22:24 +0100
Subject: [PATCH] Fortran: improve check of arguments to the RESHAPE intrinsic
gcc/fortran/ChangeLog:
PR fortran/103411
* check.c (gfc_check_reshape): Improve check of size of source
array for the RESHAPE intrinsic against the given shape when pad
is not given, and shape is a parameter.
gcc/testsuite/ChangeLog:
PR fortran/103411
* gfortran.dg/reshape_7.f90: Adjust test to improved check.
* gfortran.dg/reshape_9.f90: New test.
---
gcc/fortran/check.c | 17 +++++++++++++----
gcc/testsuite/gfortran.dg/reshape_7.f90 | 2 +-
gcc/testsuite/gfortran.dg/reshape_9.f90 | 14 ++++++++++++++
3 files changed, 28 insertions(+), 5 deletions(-)
create mode 100644 gcc/testsuite/gfortran.dg/reshape_9.f90
diff --git a/gcc/fortran/check.c b/gcc/fortran/check.c
index 5a5aca10ebe..837eb0912c0 100644
--- a/gcc/fortran/check.c
+++ b/gcc/fortran/check.c
@@ -4699,6 +4699,7 @@ gfc_check_reshape (gfc_expr *source, gfc_expr *shape,
mpz_t size;
mpz_t nelems;
int shape_size;
+ bool shape_is_const = false;
if (!array_check (source, 0))
return false;
@@ -4736,6 +4737,7 @@ gfc_check_reshape (gfc_expr *source, gfc_expr *shape,
{
gfc_expr *e;
int i, extent;
+ shape_is_const = true;
for (i = 0; i < shape_size; ++i)
{
e = gfc_constructor_lookup_expr (shape->value.constructor, i);
@@ -4748,7 +4750,7 @@ gfc_check_reshape (gfc_expr *source, gfc_expr *shape,
gfc_error ("%qs argument of %qs intrinsic at %L has "
"negative element (%d)",
gfc_current_intrinsic_arg[1]->name,
- gfc_current_intrinsic, &e->where, extent);
+ gfc_current_intrinsic, &shape->where, extent);
return false;
}
}
@@ -4766,6 +4768,7 @@ gfc_check_reshape (gfc_expr *source, gfc_expr *shape,
int i, extent;
gfc_expr *e, *v;
+ shape_is_const = true;
v = shape->symtree->n.sym->value;
for (i = 0; i < shape_size; i++)
@@ -4856,8 +4859,7 @@ gfc_check_reshape (gfc_expr *source, gfc_expr *shape,
}
}
- if (pad == NULL && shape->expr_type == EXPR_ARRAY
- && gfc_is_constant_expr (shape)
+ if (pad == NULL && shape_is_const
&& !(source->expr_type == EXPR_VARIABLE && source->symtree->n.sym->as
&& source->symtree->n.sym->as->type == AS_ASSUMED_SIZE))
{
@@ -4866,10 +4868,17 @@ gfc_check_reshape (gfc_expr *source, gfc_expr *shape,
{
gfc_constructor *c;
bool test;
+ gfc_constructor_base b;
+ if (shape->expr_type == EXPR_ARRAY)
+ b = shape->value.constructor;
+ else if (shape->expr_type == EXPR_VARIABLE)
+ b = shape->symtree->n.sym->value->value.constructor;
+ else
+ gcc_unreachable ();
mpz_init_set_ui (size, 1);
- for (c = gfc_constructor_first (shape->value.constructor);
+ for (c = gfc_constructor_first (b);
c; c = gfc_constructor_next (c))
mpz_mul (size, size, c->expr->value.integer);
diff --git a/gcc/testsuite/gfortran.dg/reshape_7.f90 b/gcc/testsuite/gfortran.dg/reshape_7.f90
index d752650aa4e..4216cb60cbb 100644
--- a/gcc/testsuite/gfortran.dg/reshape_7.f90
+++ b/gcc/testsuite/gfortran.dg/reshape_7.f90
@@ -4,7 +4,7 @@
subroutine p0
integer, parameter :: sh(2) = [2, 3]
integer, parameter :: &
- & a(2,2) = reshape([1, 2, 3, 4], sh) ! { dg-error "Different shape" }
+ & a(2,2) = reshape([1, 2, 3, 4], sh) ! { dg-error "not enough elements" }
if (a(1,1) /= 0) STOP 1
end subroutine p0
diff --git a/gcc/testsuite/gfortran.dg/reshape_9.f90 b/gcc/testsuite/gfortran.dg/reshape_9.f90
new file mode 100644
index 00000000000..c46e211b47e
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/reshape_9.f90
@@ -0,0 +1,14 @@
+! { dg-do compile }
+! PR fortran/103411 - ICE in gfc_conv_array_initializer
+
+program p
+ integer, parameter :: a(2) = [2,2]
+ integer, parameter :: d(2,2) = reshape([1,2,3,4,5], a)
+ integer, parameter :: c(2,2) = reshape([1,2,3,4], a)
+ integer, parameter :: b(2,2) = &
+ reshape([1,2,3], a) ! { dg-error "not enough elements" }
+ print *, reshape([1,2,3], a) ! { dg-error "not enough elements" }
+ print *, reshape([1,2,3,4], a)
+ print *, reshape([1,2,3,4,5], a)
+ print *, b, c, d
+end
--
2.26.2
next reply other threads:[~2021-11-24 21:32 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-24 21:32 Harald Anlauf [this message]
2021-11-25 16:46 ` Mikael Morin
2021-11-25 20:03 ` Harald Anlauf
2021-11-25 20:03 ` Harald Anlauf
2021-11-25 21:02 ` Mikael Morin
2021-11-25 21:52 ` [PATCH, v2] " Harald Anlauf
2021-11-26 14:45 ` Mikael Morin
2021-11-26 20:07 ` [PATCH, v3] " Harald Anlauf
2021-11-26 21:45 ` Mikael Morin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=trinity-4c07fd5c-8afc-4a43-ba7a-bdd5893eebf6-1637789577911@3c-app-gmx-bs39 \
--to=anlauf@gmx.de \
--cc=fortran@gcc.gnu.org \
--cc=gcc-patches@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).