re PR fortran/52751 (private module variable are not exported as local)

2012-04-08  Tobias Burnus  <burnus@net-b.de>

        PR fortran/52751
        * trans-decl.c (gfc_finish_var_decl): Don't set TREE_PUBLIC
        for PRIVATE module variables without C-binding label.

        PR fortran/40973
        * trans-decl.c (build_function_decl): Ditto for procedures.

2012-04-08  Tobias Burnus  <burnus@net-b.de>

        PR fortran/40973
        PR fortran/52751
        * gfortran.dg/public_private_module_2.f90: New.

From-SVN: r186223
This commit is contained in:
Tobias Burnus 2012-04-08 09:15:01 +02:00 committed by Tobias Burnus
parent aeb9270a98
commit 5af6fa0b38
4 changed files with 90 additions and 3 deletions

View File

@ -1,3 +1,12 @@
2012-04-08 Tobias Burnus <burnus@net-b.de>
PR fortran/52751
* trans-decl.c (gfc_finish_var_decl): Don't set TREE_PUBLIC
for PRIVATE module variables without C-binding label.
PR fortran/40973
* trans-decl.c (build_function_decl): Ditto for procedures.
2012-04-07 Thomas Koenig <tkoenig@gcc.gnu.org>
PR fortran/52893

View File

@ -539,7 +539,7 @@ gfc_finish_var_decl (tree decl, gfc_symbol * sym)
if (sym->attr.cray_pointee)
return;
if(sym->attr.is_bind_c == 1)
if(sym->attr.is_bind_c == 1 && sym->binding_label)
{
/* We need to put variables that are bind(c) into the common
segment of the object file, because this is what C would do.
@ -565,7 +565,8 @@ 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. */
TREE_PUBLIC (decl) = 1;
if (sym->attr.access != ACCESS_PRIVATE)
TREE_PUBLIC (decl) = 1;
TREE_STATIC (decl) = 1;
}
@ -1842,7 +1843,8 @@ build_function_decl (gfc_symbol * sym, bool global)
DECL_EXTERNAL (fndecl) = 0;
if (!current_function_decl
&& !sym->attr.entry_master && !sym->attr.is_main_program)
&& !sym->attr.entry_master && !sym->attr.is_main_program
&& (sym->attr.access != ACCESS_PRIVATE || sym->binding_label))
TREE_PUBLIC (fndecl) = 1;
attributes = add_attributes_to_decl (attr, NULL_TREE);

View File

@ -1,3 +1,9 @@
2012-04-08 Tobias Burnus <burnus@net-b.de>
PR fortran/40973
PR fortran/52751
* gfortran.dg/public_private_module_2.f90: New.
2012-04-08 Manuel López-Ibáñez <manu@gcc.gnu.org>
* g++.dg/warn/Wstrict-aliasing-float-ref-int-obj.C: Add labels to

View File

@ -0,0 +1,70 @@
! { dg-do compile }
! { dg-options "-O2" }
!
! PR fortran/52751 (top, "module mod")
! PR fortran/40973 (bottom, "module m"
!
! Ensure that (only) those module variables and procedures which are PRIVATE
! and have no C-binding label are optimized away.
!
module mod
integer :: aa
integer, private :: iii
integer, private, bind(C) :: jj ! { dg-warning "PRIVATE but has been given the binding label" }
integer, private, bind(C,name='lll') :: kk ! { dg-warning "PRIVATE but has been given the binding label" }
integer, private, bind(C,name='') :: mmmm
integer, bind(C) :: nnn
integer, bind(C,name='oo') :: pp
integer, bind(C,name='') :: qq
end module mod
! { dg-final { scan-assembler "__mod_MOD_aa" } }
! { dg-final { scan-assembler-not "iii" } }
! { dg-final { scan-assembler "jj" } }
! { dg-final { scan-assembler "lll" } }
! { dg-final { scan-assembler-not "kk" } }
! { dg-final { scan-assembler-not "mmmm" } }
! { dg-final { scan-assembler "nnn" } }
! { dg-final { scan-assembler "oo" } }
! { dg-final { scan-assembler "__mod_MOD_qq" } }
MODULE M
PRIVATE :: two, three, four, six
PUBLIC :: one, seven, eight, ten
CONTAINS
SUBROUTINE one(a)
integer :: a
a = two()
END SUBROUTINE one
integer FUNCTION two()
two = 42
END FUNCTION two
integer FUNCTION three() bind(C) ! { dg-warning "PRIVATE but has been given the binding label" }
three = 43
END FUNCTION three
integer FUNCTION four() bind(C, name='five') ! { dg-warning "PRIVATE but has been given the binding label" }
four = 44
END FUNCTION four
integer FUNCTION six() bind(C, name='')
six = 46
END FUNCTION six
integer FUNCTION seven() bind(C)
seven = 46
END FUNCTION seven
integer FUNCTION eight() bind(C, name='nine')
eight = 48
END FUNCTION eight
integer FUNCTION ten() bind(C, name='')
ten = 48
END FUNCTION ten
END MODULE
! { dg-final { scan-assembler "__m_MOD_one" } }
! { dg-final { scan-assembler-not "two" } }
! { dg-final { scan-assembler "three" } }
! { dg-final { scan-assembler-not "four" } }
! { dg-final { scan-assembler "five" } }
! { dg-final { scan-assembler-not "six" } }
! { dg-final { scan-assembler "seven" } }
! { dg-final { scan-assembler "nine" } }
! { dg-final { scan-assembler "__m_MOD_ten" } }