diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 10 | ||||
| -rw-r--r-- | gcc/fortran/trans-decl.c | 18 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/module_variable_1.f90 | 15 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/module_variable_2.f90 | 6 |
5 files changed, 49 insertions, 6 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 283521a..35c884c 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,13 @@ +2013-07-14 Thomas Koenig <tkoenig@gcc.gnu.org> + Tobias Burnus <burnus@gcc.gnu.org> + + PR fortran/52669 + * trans-decl.c (gfc_finish_var_decl): Move setting of + PRIVATE for a module variable if the module has a private + default or -fmodule-private is given to... + (gfc_create_module_variable): here. Optionally + warn about private module variable which is not used. + 2013-07-08 Tobias Burnus <burnus@net-b.de> PR fortran/57834 diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c index 6a8d98c..2224830 100644 --- a/gcc/fortran/trans-decl.c +++ b/gcc/fortran/trans-decl.c @@ -559,12 +559,6 @@ gfc_finish_var_decl (tree decl, gfc_symbol * sym) { /* TODO: Don't set sym->module for result or dummy variables. */ gcc_assert (current_function_decl == NULL_TREE || sym->result == sym); - /* This is the declaration of a module variable. */ - if (sym->attr.access == ACCESS_UNKNOWN - && (sym->ns->default_access == ACCESS_PRIVATE - || (sym->ns->default_access == ACCESS_UNKNOWN - && gfc_option.flag_module_private))) - sym->attr.access = ACCESS_PRIVATE; if (sym->attr.access != ACCESS_PRIVATE || sym->attr.public_used) TREE_PUBLIC (decl) = 1; @@ -4212,6 +4206,18 @@ gfc_create_module_variable (gfc_symbol * sym) internal_error ("backend decl for module variable %s already exists", sym->name); + if (sym->module && !sym->attr.result && !sym->attr.dummy + && (sym->attr.access == ACCESS_UNKNOWN + && (sym->ns->default_access == ACCESS_PRIVATE + || (sym->ns->default_access == ACCESS_UNKNOWN + && gfc_option.flag_module_private)))) + sym->attr.access = ACCESS_PRIVATE; + + if (warn_unused_variable && !sym->attr.referenced + && sym->attr.access == ACCESS_PRIVATE) + gfc_warning ("Unused PRIVATE module variable '%s' declared at %L", + sym->name, &sym->declared_at); + /* We always want module variables to be created. */ sym->attr.referenced = 1; /* Create the decl. */ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 8f2d5a9..2e609ed 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2013-07-14 Thomas Koenig <tkoenig@gcc.gnu.org> + + PR fortran/52669 + * fortran.dg/module_variable_1.f90: New test. + * fortran.dg/module_variable_2.f90: New test. + 2013-07-14 Marc Glisse <marc.glisse@inria.fr> * g++.dg/ext/vector19.C: Adapt. diff --git a/gcc/testsuite/gfortran.dg/module_variable_1.f90 b/gcc/testsuite/gfortran.dg/module_variable_1.f90 new file mode 100644 index 0000000..fcf6df8 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/module_variable_1.f90 @@ -0,0 +1,15 @@ +! { dg-do compile } +! { dg-options "-Wall" } +module foo + integer, private :: i ! { dg-warning "Unused PRIVATE" } + integer, private :: j = 0 +contains + subroutine bar + j = j + 1 + end subroutine bar +end module foo + +module bar + private + integer :: i ! { dg-warning "Unused PRIVATE" } +end module bar diff --git a/gcc/testsuite/gfortran.dg/module_variable_2.f90 b/gcc/testsuite/gfortran.dg/module_variable_2.f90 new file mode 100644 index 0000000..ed5b903 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/module_variable_2.f90 @@ -0,0 +1,6 @@ +! { dg-do compile } +! { dg-options "-Wall -fmodule-private" } + +module bar + integer :: i ! { dg-warning "Unused PRIVATE" } +end module bar |