From 2b82965051134f44cabe7e58424eca9e964ea0b9 Mon Sep 17 00:00:00 2001 From: pbrook Date: Wed, 22 Jun 2005 15:34:02 +0000 Subject: [PATCH] 2005-06-22 Paul Brook PR fortran/21034 * symbol.c (gfc_is_var_automatic): New function. (save_symbol): Use it. testsuite/ * gfortran.dg/auto_save_1.f90: New test. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@101250 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/fortran/ChangeLog | 6 ++++++ gcc/fortran/symbol.c | 23 ++++++++++++++++++++++- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gfortran.dg/auto_save_1.f90 | 18 ++++++++++++++++++ 4 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gfortran.dg/auto_save_1.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 4ebd01d8e44..4badf66df53 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2005-06-22 Paul Brook + + PR fortran/21034 + * symbol.c (gfc_is_var_automatic): New function. + (save_symbol): Use it. + 2005-06-21 Tobias Schlueter Paul Thomas diff --git a/gcc/fortran/symbol.c b/gcc/fortran/symbol.c index 5fb9f53db87..f91b72de1aa 100644 --- a/gcc/fortran/symbol.c +++ b/gcc/fortran/symbol.c @@ -2331,6 +2331,25 @@ gfc_traverse_ns (gfc_namespace * ns, void (*func) (gfc_symbol *)) } +/* Return TRUE if the symbol is an automatic variable. */ +static bool +gfc_is_var_automatic (gfc_symbol * sym) +{ + /* Pointer and allocatable variables are never automatic. */ + if (sym->attr.pointer || sym->attr.allocatable) + return false; + /* Check for arrays with non-constant size. */ + if (sym->attr.dimension && sym->as + && !gfc_is_compile_time_shape (sym->as)) + return true; + /* Check for non-constant length character vairables. */ + if (sym->ts.type == BT_CHARACTER + && sym->ts.cl + && gfc_is_constant_expr (sym->ts.cl->length)) + return true; + return false; +} + /* Given a symbol, mark it as SAVEd if it is allowed. */ static void @@ -2344,7 +2363,9 @@ save_symbol (gfc_symbol * sym) || sym->attr.dummy || sym->attr.flavor != FL_VARIABLE) return; - + /* Automatic objects are not saved. */ + if (gfc_is_var_automatic (sym)) + return; gfc_add_save (&sym->attr, sym->name, &sym->declared_at); } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 606d4049d3f..1e0c949acdf 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2005-06-22 Paul Brook + + PR fortran/21034 + * gfortran.dg/auto_save_1.f90: New test. + 2005-06-22 Michael Matz * gcc.target/x86-64/abi: New directory. diff --git a/gcc/testsuite/gfortran.dg/auto_save_1.f90 b/gcc/testsuite/gfortran.dg/auto_save_1.f90 new file mode 100644 index 00000000000..b4571d2ba84 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/auto_save_1.f90 @@ -0,0 +1,18 @@ +! { dg-do run } +! Check that automatic objects work properly in the presence of a save +! statement. +! PR21034 +subroutine test(n) + implicit none + integer n + real dte(n) + character(len=n) :: s + save + dte = 0 + s = "" +end + +program prog + call test(4) + call test(10) +end program -- 2.11.4.GIT