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

re PR fortran/91716 (ICE in output_constant, at varasm.c:5026)

Browse source 
2019-09-13  Bernd Edlinger  <bernd.edlinger@hotmail.de>

        PR fortran/91716
        * trans-array.c (gfc_conv_array_initializer): Always assign the
        array type of the field to the string constant.

testsuite:
2019-09-13  Bernd Edlinger  <bernd.edlinger@hotmail.de>

        PR fortran/91716
        * gfortran.dg/pr91716.f90: New test.

From-SVN: r275698
This commit is contained in:
Bernd Edlinger 2019-09-13 11:33:18 +00:00 • committed by Bernd Edlinger
parent 0d1cfeed7f
commit 22cd031212
4 changed files with 26 additions and 4 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 @@
2019-09-13 Bernd Edlinger <bernd.edlinger@hotmail.de>
PR fortran/91716
* trans-array.c (gfc_conv_array_initializer): Always assign the
array type of the field to the string constant.
2019-09-13 Paul Thomas <pault@gcc.gnu.org>
PR fortran/91717

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

@ -6108,17 +6108,20 @@ gfc_conv_array_initializer (tree type, gfc_expr * expr)
tree atype = type;
while (TREE_CODE (TREE_TYPE (atype)) == ARRAY_TYPE)
atype = TREE_TYPE (atype);
if (TREE_CODE (TREE_TYPE (atype)) == INTEGER_TYPE
&& tree_to_uhwi (TYPE_SIZE_UNIT (TREE_TYPE (se.expr)))
> tree_to_uhwi (TYPE_SIZE_UNIT (atype)))
gcc_checking_assert (TREE_CODE (TREE_TYPE (atype))
== INTEGER_TYPE);
gcc_checking_assert (TREE_TYPE (TREE_TYPE (se.expr))
== TREE_TYPE (atype));
if (tree_to_uhwi (TYPE_SIZE_UNIT (TREE_TYPE (se.expr)))
> tree_to_uhwi (TYPE_SIZE_UNIT (atype)))
{
unsigned HOST_WIDE_INT size
= tree_to_uhwi (TYPE_SIZE_UNIT (atype));
const char *p = TREE_STRING_POINTER (se.expr);
se.expr = build_string (size, p);
TREE_TYPE (se.expr) = atype;
}
TREE_TYPE (se.expr) = atype;
}
break;

5
gcc/testsuite/ChangeLog
View file

@ -1,3 +1,8 @@
2019-09-13 Bernd Edlinger <bernd.edlinger@hotmail.de>
PR fortran/91716
* gfortran.dg/pr91716.f90: New test.
2019-09-13 Paul Thomas <pault@gcc.gnu.org>
PR fortran/91717

8
gcc/testsuite/gfortran.dg/pr91716.f90 Normal file
View file

@ -0,0 +1,8 @@
! { dg-do compile }
! PR fortran/91716
! Code contributed by Gerhard Steinmetz
module m
type t
character :: c(2) = [character(-1) :: 'a', 'b']
end type
end