public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Harald Anlauf <anlauf@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc r10-10268] Fortran: fix simplification of array-valued parameter expressions
Date: Sat, 13 Nov 2021 20:15:05 +0000 (GMT)	[thread overview]
Message-ID: <20211113201505.97ACC3857C75@sourceware.org> (raw)

https://gcc.gnu.org/g:4b99f0c90f272c5cd94af20f15b95ba702fa0aa6

commit r10-10268-g4b99f0c90f272c5cd94af20f15b95ba702fa0aa6
Author: Harald Anlauf <anlauf@gmx.de>
Date:   Fri Nov 5 23:48:20 2021 +0100

    Fortran: fix simplification of array-valued parameter expressions
    
    gcc/fortran/ChangeLog:
    
            PR fortran/102817
            * expr.c (simplify_parameter_variable): Copy shape of referenced
            subobject when simplifying.
    
    gcc/testsuite/ChangeLog:
    
            PR fortran/102817
            * gfortran.dg/pr102817.f90: New test.
    
    (cherry picked from commit bcf3728abe8488882922005166d3065fc5fdfea1)

Diff:
---
 gcc/fortran/expr.c                     |  2 ++
 gcc/testsuite/gfortran.dg/pr102817.f90 | 17 +++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c
index 3fb93d4ed18..9c091fe74e1 100644
--- a/gcc/fortran/expr.c
+++ b/gcc/fortran/expr.c
@@ -2126,6 +2126,8 @@ simplify_parameter_variable (gfc_expr *p, int type)
       if (e == NULL)
 	return false;
 
+      gfc_free_shape (&e->shape, e->rank);
+      e->shape = gfc_copy_shape (p->shape, p->rank);
       e->rank = p->rank;
 
       if (e->ts.type == BT_CHARACTER && p->ts.u.cl)
diff --git a/gcc/testsuite/gfortran.dg/pr102817.f90 b/gcc/testsuite/gfortran.dg/pr102817.f90
new file mode 100644
index 00000000000..c081a69f0ea
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr102817.f90
@@ -0,0 +1,17 @@
+! { dg-do compile }
+! PR fortran/102817 - ICE in gfc_clear_shape
+
+program test
+  type t
+     integer :: a(1,2) = 3
+  end type t
+  type(t), parameter :: u    = t(4)
+  type(t), parameter :: x(1) = t(4)
+  integer, parameter :: p(1,2) = (x(1)%a)
+  integer            :: z(1,2) = (x(1)%a) 
+  integer            :: y(1,2), v(1,2), w(1,2)
+  v = (u   %a)
+  w =  x(1)%a
+  y = (x(1)%a)
+  print *, v, w, y, z, p
+end


                 reply	other threads:[~2021-11-13 20:15 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20211113201505.97ACC3857C75@sourceware.org \
    --to=anlauf@gcc.gnu.org \
    --cc=gcc-cvs@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).