FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR fortran/85603 (ICE with character array substring assignment)

Browse source 
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.

From-SVN: r264502
This commit is contained in:
Paul Thomas 2018-09-22 10:21:25 +00:00
parent 0e569a3c7e
commit 204d463084
4 changed files with 35 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gcc/fortran/ChangeLog
View file

@ -1,3 +1,9 @@
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-21 Paul Thomas <pault@gcc.gnu.org>
PR fortran/77325

3
gcc/fortran/trans-array.c
View file

@ -9950,7 +9950,8 @@ gfc_alloc_allocatable_for_assignment (gfc_loopinfo *loop,
{
if (expr2->ts.deferred)
{
if (VAR_P (expr2->ts.u.cl->backend_decl))
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;

5
gcc/testsuite/ChangeLog
View file

@ -1,3 +1,8 @@
2018-09-22 Paul Thomas <pault@gcc.gnu.org>
PR fortran/85603
* gfortran.dg/deferred_character_23.f90 : New test.
2018-09-21 Jeff Law <law@redhat.com>
* gcc.dg/tree-ssa/vrp113.c: Disable EVRP.

22
gcc/testsuite/gfortran.dg/deferred_character_23.f90 Normal file
View file

@ -0,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