public inbox for gcc-patches@gcc.gnu.org
 help / color / mirror / Atom feed
From: Paul Richard Thomas <paul.richard.thomas@gmail.com>
To: "fortran@gcc.gnu.org" <fortran@gcc.gnu.org>,
	gcc-patches <gcc-patches@gcc.gnu.org>
Subject: [Patc, fortran] PR85603 - ICE with character array substring assignment
Date: Sat, 22 Sep 2018 13:23:00 -0000	[thread overview]
Message-ID: <CAGkQGi+iPx9zqfrv8_2kt7UEj7yeb8bAH7wePKFa6qT8XO0J8Q@mail.gmail.com> (raw)

[-- Attachment #1: Type: text/plain, Size: 437 bytes --]

Yet another 'obvious' deferred character fix. Committed to trunk as
r264502. Will backport in about ten days time.

Paul

2018-09-22  Paul Thomas  <pault@gcc.gnu.org>

    PR fortran/85603
    * trans-array.c (gfc_alloc_allocatable_for_assignment): Test
    the charlen backend_decl before using the VAR_P macro.

2018-09-22  Paul Thomas  <pault@gcc.gnu.org>

    PR fortran/85603
    * gfortran.dg/deferred_character_23.f90 : New test.

[-- Attachment #2: submit.diff --]
[-- Type: text/x-patch, Size: 1589 bytes --]

Index: gcc/fortran/trans-array.c
===================================================================
*** gcc/fortran/trans-array.c	(revision 264486)
--- gcc/fortran/trans-array.c	(working copy)
*************** gfc_alloc_allocatable_for_assignment (gf
*** 9950,9956 ****
      {
        if (expr2->ts.deferred)
  	{
! 	  if (VAR_P (expr2->ts.u.cl->backend_decl))
  	    tmp = expr2->ts.u.cl->backend_decl;
  	  else
  	    tmp = rss->info->string_length;
--- 9950,9957 ----
      {
        if (expr2->ts.deferred)
  	{
! 	  if (expr2->ts.u.cl->backend_decl
! 	      && VAR_P (expr2->ts.u.cl->backend_decl))
  	    tmp = expr2->ts.u.cl->backend_decl;
  	  else
  	    tmp = rss->info->string_length;
Index: gcc/testsuite/gfortran.dg/deferred_character_23.f90
===================================================================
*** gcc/testsuite/gfortran.dg/deferred_character_23.f90	(nonexistent)
--- gcc/testsuite/gfortran.dg/deferred_character_23.f90	(working copy)
***************
*** 0 ****
--- 1,22 ----
+ ! { dg-do run }
+ !
+ ! Tests the fix for PR85603.
+ !
+ ! Contributed by Walt Spector  <w6ws@earthlink.net>
+ !
+ program strlen_bug
+   implicit none
+ 
+   character(:), allocatable :: strings(:)
+   integer :: maxlen
+ 
+   strings = [ character(32) ::  &
+       'short',  &
+       'somewhat longer' ]
+   maxlen = maxval (len_trim (strings))
+   if (maxlen .ne. 15) stop 1
+   strings = strings(:)(:maxlen) ! Used to ICE
+   if (any (strings .ne. ['short          ','somewhat longer'])) stop 2
+ 
+   deallocate (strings)          ! To check for memory leaks
+ end program

             reply	other threads:[~2018-09-22 10:23 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-09-22 13:23 Paul Richard Thomas [this message]
2018-10-18 17:05 ` Paul Richard Thomas
2018-10-19 21:52 Dominique d'Humières
2018-10-19 23:36 ` Dominique d'Humières
2018-10-20 15:47   ` Paul Richard Thomas
2018-10-20 16:53     ` Paul Richard Thomas
2018-10-21 16:07       ` Thomas Koenig

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=CAGkQGi+iPx9zqfrv8_2kt7UEj7yeb8bAH7wePKFa6qT8XO0J8Q@mail.gmail.com \
    --to=paul.richard.thomas@gmail.com \
    --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).