From 37e47ee96393168103a35a792e40b3c808ebc192 Mon Sep 17 00:00:00 2001 From: Paul Thomas Date: Tue, 28 Mar 2006 10:13:50 +0000 Subject: [PATCH] re PR fortran/26779 (Internal module procedure may not have private type dummy arguments) 2006-03-28 Paul Thomas PR fortran/26779 *resolve.c (resolve_fl_procedure): Do not check the access of derived types for internal procedures. 2006-03-28 Paul Thomas PR fortran/26779 * gfortran.dg/private_type_5.f90: New test. From-SVN: r112442 --- gcc/fortran/ChangeLog | 6 +++++ gcc/fortran/resolve.c | 10 +++++--- gcc/testsuite/ChangeLog | 5 ++++ gcc/testsuite/gfortran.dg/private_type_5.f90 | 24 ++++++++++++++++++++ 4 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/gfortran.dg/private_type_5.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 6d19805ee66..d2a1e4fc66d 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2006-03-28 Paul Thomas + + PR fortran/26779 + *resolve.c (resolve_fl_procedure): Do not check the access of + derived types for internal procedures. + 2006-03-27 Jakub Jelinek * io.c (check_io_constraints): Don't look at diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 548b67ef7c5..562338fdb64 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -4834,9 +4834,13 @@ resolve_fl_procedure (gfc_symbol *sym, int mp_flag) } } - /* Ensure that derived type formal arguments of a public procedure - are not of a private type. */ - if (gfc_check_access(sym->attr.access, sym->ns->default_access)) + /* Ensure that derived type for are not of a private type. Internal + module procedures are excluded by 2.2.3.3 - ie. they are not + externally accessible and can access all the objects accesible in + the host. */ + if (!(sym->ns->parent + && sym->ns->parent->proc_name->attr.flavor == FL_MODULE) + && gfc_check_access(sym->attr.access, sym->ns->default_access)) { for (arg = sym->formal; arg; arg = arg->next) { diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 539c2a821ca..c2383d247b5 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2006-03-28 Paul Thomas + + PR fortran/26779 + * gfortran.dg/private_type_5.f90: New test. + 2006-03-27 David Edelsohn * objc.dg/objc-nofilename-1.m: Limit to Darwin. diff --git a/gcc/testsuite/gfortran.dg/private_type_5.f90 b/gcc/testsuite/gfortran.dg/private_type_5.f90 new file mode 100644 index 00000000000..e62fe6e21c4 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/private_type_5.f90 @@ -0,0 +1,24 @@ +! { dg-do compile } +! Tests the fix for PR26779, where an error would occur because +! init was detected to be public with a private type dummy argument. +! +! Contributed by Paul Thomas +! +module test + public sub + type, private :: t + integer :: i + end type t +contains + subroutine sub (arg) + integer arg + type(t) :: root + call init(root, arg) + contains + subroutine init(ir, i) + integer i + type(t) :: ir + ir%i = i + end subroutine init + end subroutine sub +end module test \ No newline at end of file -- 2.30.2