OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR fortran/40875 (ICE with illegal type conversion) 

2009-08-04  Paul Thomas  <pault@gcc.gnu.org>

	PR fortran/40875
	* decl.c (add_init_expr_to_sym): Character symbols can only be
	initialized with character expressions.

2009-08-04  Paul Thomas  <pault@gcc.gnu.org>

	PR fortran/40875
	* gfortran.dg/initialization_23.f90 : New test.

From-SVN: r150454
This commit is contained in:
Paul Thomas 2009-08-04 12:41:08 +00:00
parent b96fe38e46
commit 51b128a0c0
4 changed files with 33 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 @@
2009-08-04 Paul Thomas <pault@gcc.gnu.org>
PR fortran/40875
* decl.c (add_init_expr_to_sym): Character symbols can only be
initialized with character expressions.
2009-08-02 Janus Weil <janus@gcc.gnu.org>
PR fortran/40881

6
gcc/fortran/decl.c
View File

@ -1253,9 +1253,13 @@ add_init_expr_to_sym (const char *name, gfc_expr **initp, locus *var_locus)
&& gfc_check_assign_symbol (sym, init) == FAILURE)
return FAILURE;
if (sym->ts.type == BT_CHARACTER && sym->ts.cl)
if (sym->ts.type == BT_CHARACTER && sym->ts.cl
&& init->ts.type == BT_CHARACTER)
{
/* Update symbol character length according initializer. */
if (gfc_check_assign_symbol (sym, init) == FAILURE)
return FAILURE;
if (sym->ts.cl->length == NULL)
{
int clen;

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2009-08-04 Paul Thomas <pault@gcc.gnu.org>
PR fortran/40875
* gfortran.dg/initialization_23.f90 : New test.
2009-08-04 Dodji Seketeli <dodji@redhat.com>
PR debug/39706

17
gcc/testsuite/gfortran.dg/initialization_23.f90 Normal file
View File

@ -0,0 +1,17 @@
! { dg-do compile }
!
! PR 40875: The error was missed and an ICE ensued.
!
! Contributed by Michael Richmond <michael.a.richmond@nasa.gov>
!
MODULE cdf_aux_mod
PUBLIC
TYPE :: one_parameter
CHARACTER :: name
END TYPE one_parameter
CHARACTER, PARAMETER :: the_alpha = one_parameter('c') ! { dg-error "Can't convert TYPE" }
CHARACTER, PARAMETER :: the_beta = (/one_parameter('c')/) ! { dg-error "Incompatible ranks" }
END MODULE cdf_aux_mod
! { dg-final { cleanup-modules "cdf_aux_mod" } }