From: Janus Weil Date: Thu, 20 Feb 2014 08:00:48 +0000 (+0100) Subject: backport: re PR fortran/55907 (ICE with -fno-automatic -finit-local-zero) X-Git-Tag: releases/gcc-4.7.4~236 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae8b9713a562c320d74947c93d4f7c37027c1a6d;p=thirdparty%2Fgcc.git backport: re PR fortran/55907 (ICE with -fno-automatic -finit-local-zero) 2014-02-20 Janus Weil Backport from mainline 2014-02-17 Janus Weil PR fortran/55907 * resolve.c (build_default_init_expr): Don't initialize character variable if -fno-automatic is given. 2014-02-20 Janus Weil Backport from mainline 2014-02-17 Janus Weil PR fortran/55907 * gfortran.dg/init_flag_12.f90: New. From-SVN: r207935 --- diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 46bb56c3929d..9a39dccc12d2 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,12 @@ +2014-02-20 Janus Weil + + Backport from mainline + 2014-02-17 Janus Weil + + PR fortran/55907 + * resolve.c (build_default_init_expr): Don't initialize character + variable if -fno-automatic is given. + 2014-02-08 Mikael Morin PR fortran/57033 diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 8e00739604d7..7a15e9e42d88 100644 --- 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 9cca8d78779e..beaf10997bca 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2014-02-20 Janus Weil + + Backport from mainline + 2014-02-17 Janus Weil + + PR fortran/55907 + * gfortran.dg/init_flag_12.f90: New. + 2014-02-18 Kai Tietz 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 index 000000000000..5844398d5342 --- /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 + +subroutine cchaine (i) + implicit none + integer :: i + character(len=i) :: chaine + write(*,*) chaine +end subroutine