OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fortran: fix pointless warning for static variables 

gcc/fortran/ChangeLog:

	PR fortran/98411
	* trans-decl.c (gfc_finish_var_decl): Adjust check to handle
	implicit SAVE as well as variables in the main program.  Improve
	warning message text.

gcc/testsuite/ChangeLog:

	PR fortran/98411
	* gfortran.dg/pr98411.f90: Adjust testcase options to restrict to
	F2008, and verify case of implicit SAVE.
This commit is contained in:
Harald Anlauf 2021-08-24 21:07:50 +02:00
parent 50cb8300d3
commit f95946afd1
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gcc/fortran/trans-decl.c
View File

@ -743,8 +743,10 @@ gfc_finish_var_decl (tree decl, gfc_symbol * sym)
/* Keep variables larger than max-stack-var-size off stack. */ /* Keep variables larger than max-stack-var-size off stack. */
if (!(sym->ns->proc_name && sym->ns->proc_name->attr.recursive) 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.automatic
&& sym->attr.save != SAVE_EXPLICIT && sym->attr.save != SAVE_EXPLICIT
&& sym->attr.save != SAVE_IMPLICIT
&& INTEGER_CST_P (DECL_SIZE_UNIT (decl)) && INTEGER_CST_P (DECL_SIZE_UNIT (decl))
&& !gfc_can_put_var_on_stack (DECL_SIZE_UNIT (decl)) && !gfc_can_put_var_on_stack (DECL_SIZE_UNIT (decl))
/* Put variable length auto array pointers always into stack. */ /* Put variable length auto array pointers always into stack. */
@ -757,13 +759,17 @@ gfc_finish_var_decl (tree decl, gfc_symbol * sym)
{ {
if (flag_max_stack_var_size > 0) if (flag_max_stack_var_size > 0)
gfc_warning (OPT_Wsurprising, gfc_warning (OPT_Wsurprising,
"Array %qs at %L is larger than limit set by" "Array %qs at %L is larger than limit set by "
" %<-fmax-stack-var-size=%>, moved from stack to static" "%<-fmax-stack-var-size=%>, moved from stack to static "
" storage. This makes the procedure unsafe when called" "storage. This makes the procedure unsafe when called "
" recursively, or concurrently from multiple threads." "recursively, or concurrently from multiple threads. "
" Consider using %<-frecursive%>, or increase the" "Consider increasing the %<-fmax-stack-var-size=%> "
" %<-fmax-stack-var-size=%> limit, or change the code to" "limit (or use %<-frecursive%>, which implies "
" use an ALLOCATABLE array.", "unlimited %<-fmax-stack-var-size%>) - or change the "
"code to use an ALLOCATABLE array. If the variable is "
"never accessed concurrently, this warning can be "
"ignored, and the variable could also be declared with "
"the SAVE attribute.",
sym->name, &sym->declared_at); sym->name, &sym->declared_at);
TREE_STATIC (decl) = 1; TREE_STATIC (decl) = 1;

4
gcc/testsuite/gfortran.dg/pr98411.f90
View File

@ -1,5 +1,5 @@
! { dg-do compile } ! { dg-do compile }
! { dg-options "-Wall -fautomatic -fmax-stack-var-size=100" } ! { dg-options "-std=f2008 -Wall -fautomatic -fmax-stack-var-size=100" }
! PR fortran/98411 - Pointless warning for static variables ! PR fortran/98411 - Pointless warning for static variables
module try module try
@ -9,8 +9,10 @@ contains
subroutine initmodule subroutine initmodule
real, save :: b(1000) real, save :: b(1000)
logical :: c(1000) ! { dg-warning "moved from stack to static storage" } logical :: c(1000) ! { dg-warning "moved from stack to static storage" }
integer :: e(1000) = 1
a(1) = 42 a(1) = 42
b(2) = 3.14 b(2) = 3.14
c(3) = .true. c(3) = .true.
e(5) = -1
end subroutine initmodule end subroutine initmodule
end module try end module try