From 26c08c0323ca8094d4841634c4bf04c14be23811 Mon Sep 17 00:00:00 2001 From: Tobias Burnus Date: Thu, 20 Dec 2012 00:05:49 +0100 Subject: [PATCH] re PR fortran/55733 (-fno-automatic: Fails for scalar allocatables) 2012-12-19 Tobias Burnus PR fortran/55733 * trans-decl.c (gfc_create_string_length): Avoid setting TREE_STATIC for automatic variables with -fno-automatic. From-SVN: r194621 --- gcc/fortran/ChangeLog | 6 ++++++ gcc/fortran/trans-decl.c | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 2da48f3d2ce..6a24ef7214c 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2012-12-19 Tobias Burnus + + PR fortran/55733 + * trans-decl.c (gfc_create_string_length): Avoid setting + TREE_STATIC for automatic variables with -fno-automatic. + 2012-12-19 Tobias Burnus Jakub Jelinek Janus Weil diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c index 3202840cb14..588f55a02df 100644 --- a/gcc/fortran/trans-decl.c +++ b/gcc/fortran/trans-decl.c @@ -1089,9 +1089,15 @@ gfc_create_string_length (gfc_symbol * sym) tree length; const char *name; + /* The string length variable shall be in static memory if it is either + explicitly SAVED, a module variable or with -fno-automatic. Only + relevant is "len=:" - otherwise, it is either a constant length or + it is an automatic variable. */ bool static_length = sym->attr.save || sym->ns->proc_name->attr.flavor == FL_MODULE - || gfc_option.flag_max_stack_var_size == 0; + || (gfc_option.flag_max_stack_var_size == 0 + && sym->ts.deferred && !sym->attr.dummy + && !sym->attr.result && !sym->attr.function); /* Also prefix the mangled name. We need to call GFC_PREFIX for static variables as some systems do not support the "." in the assembler name. -- 2.30.2