backport: re PR fortran/55907 (ICE with -fno-automatic -finit-local-zero)

2014-02-20  Janus Weil  <janus@gcc.gnu.org>

	Backport from mainline
	2014-02-17  Janus Weil  <janus@gcc.gnu.org>

	PR fortran/55907
	* resolve.c (build_default_init_expr): Don't initialize character
	variable if -fno-automatic is given.

2014-02-20  Janus Weil  <janus@gcc.gnu.org>

	Backport from mainline
	2014-02-17  Janus Weil  <janus@gcc.gnu.org>

	PR fortran/55907
	* gfortran.dg/init_flag_12.f90: New.

From-SVN: r207935

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 46bb56c3929dd8011fbcc3ce6f63f97b8536c2f1..9a39dccc12d2e1d77fe8720ab2d192966e224af7 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,12 @@
+2014-02-20  Janus Weil  <janus@gcc.gnu.org>
+
+       Backport from mainline
+       2014-02-17  Janus Weil  <janus@gcc.gnu.org>
+
+       PR fortran/55907
+       * resolve.c (build_default_init_expr): Don't initialize character
+       variable if -fno-automatic is given.
+
 2014-02-08  Mikael Morin  <mikael@gcc.gnu.org>
 
        PR fortran/57033

diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index 8e00739604d78995cc5025ddc4710aa0a9f220c1..7a15e9e42d88eaf3dac332ace47e95046ef5e9d1 100644 (file)
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -10167,7 +10167,7 @@ build_default_init_expr (gfc_symbol *sym)
          init_expr = NULL;
        }
       if (!init_expr && gfc_option.flag_init_character == GFC_INIT_CHARACTER_ON
-         && sym->ts.u.cl->length)
+         && sym->ts.u.cl->length && gfc_option.flag_max_stack_var_size != 0)
        {
          gfc_actual_arglist *arg;
          init_expr = gfc_get_expr ();

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9cca8d78779e15de5482939f721e256c00e99736..beaf10997bca2a50680d8566c6e2913ed881952a 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2014-02-20  Janus Weil  <janus@gcc.gnu.org>
+
+       Backport from mainline
+       2014-02-17  Janus Weil  <janus@gcc.gnu.org>
+
+       PR fortran/55907
+       * gfortran.dg/init_flag_12.f90: New.
+
 2014-02-18  Kai Tietz  <ktietz@redhat.com>
 
        PR target/60193

diff --git a/gcc/testsuite/gfortran.dg/init_flag_12.f90 b/gcc/testsuite/gfortran.dg/init_flag_12.f90
new file mode 100644 (file)
index 0000000..5844398
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/init_flag_12.f90
@@ -0,0 +1,13 @@
+! { dg-do compile }
+! { dg-options "-fno-automatic -finit-local-zero" }
+!
+! PR 55907: [4.7/4.8/4.9 Regression] ICE with -fno-automatic -finit-local-zero
+!
+! Contributed by J.R. Garcia <garcia.espinosa.jr@gmail.com>
+
+subroutine cchaine (i)
+  implicit none
+  integer :: i
+  character(len=i) :: chaine
+  write(*,*) chaine
+end subroutine