]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
Fortran - (large) arrays in the main shall be static
authorHarald Anlauf <anlauf@gmx.de>
Fri, 17 Sep 2021 19:45:33 +0000 (21:45 +0200)
committerHarald Anlauf <anlauf@gmx.de>
Tue, 21 Sep 2021 18:39:38 +0000 (20:39 +0200)
gcc/fortran/ChangeLog:

PR fortran/102366
* trans-decl.c (gfc_finish_var_decl): Disable the warning message
for variables moved from stack to static storange if they are
declared in the main, but allow the move to happen.

gcc/testsuite/ChangeLog:

PR fortran/102366
* gfortran.dg/pr102366.f90: New test.

(cherry picked from commit 51166eb2c534692c3c7779def24f83c8c3811b98)

gcc/fortran/trans-decl.c
gcc/testsuite/gfortran.dg/pr102366.f90 [new file with mode: 0644]

index ef307af595e237bcfdb9f40e89c4c50c9a921686..beea2e4d80bb383eee062d18085fe9be198caee7 100644 (file)
@@ -738,7 +738,6 @@ gfc_finish_var_decl (tree decl, gfc_symbol * sym)
 
   /* Keep variables larger than max-stack-var-size off stack.  */
   if (!(sym->ns->proc_name && sym->ns->proc_name->attr.recursive)
-      && !(sym->ns->proc_name && sym->ns->proc_name->attr.is_main_program)
       && !sym->attr.automatic
       && sym->attr.save != SAVE_EXPLICIT
       && sym->attr.save != SAVE_IMPLICIT
@@ -752,7 +751,9 @@ gfc_finish_var_decl (tree decl, gfc_symbol * sym)
          || sym->attr.allocatable)
       && !DECL_ARTIFICIAL (decl))
     {
-      if (flag_max_stack_var_size > 0)
+      if (flag_max_stack_var_size > 0
+         && !(sym->ns->proc_name
+              && sym->ns->proc_name->attr.is_main_program))
        gfc_warning (OPT_Wsurprising,
                     "Array %qs at %L is larger than limit set by "
                     "%<-fmax-stack-var-size=%>, moved from stack to static "
diff --git a/gcc/testsuite/gfortran.dg/pr102366.f90 b/gcc/testsuite/gfortran.dg/pr102366.f90
new file mode 100644 (file)
index 0000000..d002f64
--- /dev/null
@@ -0,0 +1,9 @@
+! { dg-do compile }
+! { dg-options "-fdump-tree-original -Wall" }
+! { dg-final { scan-tree-dump-times "static real" 1 "original" } }
+! PR fortran/102366 - large arrays no longer become static
+
+program p
+  real(kind=4) :: a(16776325)
+  a=1.0
+end