fortran/

2005-01-08  Erik Edelmann  <eedelman@gcc.gnu.org>

        PR fortran/25093
        * resolve.c (resolve_fntype): Check that PUBLIC functions
         aren't of PRIVATE type.

testsuite/
2005-01-08  Erik Edelmann  <eedelman@gcc.gnu.org>

        PR fortran/25093
        * gfortran.dg/private_type_4.f90: New.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@109474 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 4737276..5cb9a7b 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2005-01-08  Erik Edelmann  <eedelman@gcc.gnu.org>
+
+       PR fortran/25093
+       * resolve.c (resolve_fntype): Check that PUBLIC functions
+       aren't of PRIVATE type.
+
 2005-01-07  Tobias Schl"uter  <tobias.schlueter@physik.uni-muenchen.de>
 
        * decl.c (gfc_match_function_decl): Correctly error out in case of

diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index 5e64bf7..1169842 100644 (file)
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -5626,6 +5626,15 @@ resolve_fntype (gfc_namespace * ns)
       sym->attr.untyped = 1;
     }
 
+  if (sym->ts.type == BT_DERIVED && !sym->ts.derived->attr.use_assoc
+      && !gfc_check_access (sym->ts.derived->attr.access,
+                            sym->ts.derived->ns->default_access)
+      && gfc_check_access (sym->attr.access, sym->ns->default_access))
+    {
+      gfc_error ("PUBLIC function '%s' at %L cannot be of PRIVATE type '%s'",
+                 sym->name, &sym->declared_at, sym->ts.derived->name);
+    }
+
   if (ns->entries)
     for (el = ns->entries->next; el; el = el->next)
       {

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3d2579e..2d143ce 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-08  Erik Edelmann  <eedelman@gcc.gnu.org>
+
+       PR fortran/25093
+       * gfortran.dg/private_type_4.f90: New.
+
 2005-01-07  Richard Guenther  <rguenther@suse.de>
 
        * gcc.dg/tree-ssa/loop-15.c: Use optimized dump.

diff --git a/gcc/testsuite/gfortran.dg/private_type_4.f90 b/gcc/testsuite/gfortran.dg/private_type_4.f90
new file mode 100644 (file)
index 0000000..a5b5578
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/private_type_4.f90
@@ -0,0 +1,17 @@
+! { dg-do compile }
+! PR 25093: Check that a PUBLIC function can't be of PRIVATE type
+module m1
+
+    type :: t1
+        integer :: i
+    end type t1
+
+    private :: t1
+    public :: f1     ! { dg-error "cannot be of PRIVATE type" }
+
+contains
+
+    type(t1) function f1()
+    end function
+
+end module