re PR fortran/34438 (gfortran not compliant w.r.t default initialization of derived...

2007-12-14  Tobias Burnus  <burnus@net-b.de>

        PR fortran/34438
        * resolve.c (resolve_symbol): Do not emit public-variable-
        of-private-derived-type error for non-module variables.

2007-12-14  Tobias Burnus  <burnus@net-b.de>

        PR fortran/34438
        * gfortran.dg/private_type_10.f90: New.

From-SVN: r130933

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 40bbc53385ddf7e285f63a24002125484a4144bb..200f38cbe790d122cacc74242a8a8cd50aaebc21 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-14  Tobias Burnus  <burnus@net-b.de>
+
+       PR fortran/34438
+       * resolve.c (resolve_symbol): Do not emit public-variable-
+       of-private-derived-type error for non-module variables.
+
 2007-12-14  Tobias Burnus  <burnus@net-b.de>
 
        PR fortran/34398

diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index bee74e53c426ffbf4b16bd7ebb99c7be1aa9da47..16543bcfb9f136c2974b96a88517dc35b7d99d4c 100644 (file)
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -7848,10 +7848,11 @@ resolve_symbol (gfc_symbol *sym)
      See 4.4.1 (F95) and 4.5.1.1 (F2003); and related interpretation
      161 in 95-006r3.  */
   if (sym->ts.type == BT_DERIVED
+      && sym->ns->proc_name && sym->ns->proc_name->attr.flavor == FL_MODULE
+      && !sym->ts.derived->attr.use_assoc
       && gfc_check_access (sym->attr.access, sym->ns->default_access)
       && !gfc_check_access (sym->ts.derived->attr.access,
                            sym->ts.derived->ns->default_access)
-      && !sym->ts.derived->attr.use_assoc
       && gfc_notify_std (GFC_STD_F2003, "Fortran 2003: PUBLIC %s '%s' at %L "
                         "of PRIVATE derived type '%s'",
                         (sym->attr.flavor == FL_PARAMETER) ? "parameter"

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d021240e5570d71ed2d073a791ec9b215fc0f82c..faf00e1c51ad70fd143abb151e001edf6ac28367 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-14  Tobias Burnus  <burnus@net-b.de>
+
+       PR fortran/34438
+       * gfortran.dg/private_type_10.f90: New.
+
 2007-12-14  Tobias Burnus  <burnus@net-b.de>
 
        PR fortran/34398

diff --git a/gcc/testsuite/gfortran.dg/private_type_10.f90 b/gcc/testsuite/gfortran.dg/private_type_10.f90
new file mode 100644 (file)
index 0000000..561cfb7
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/private_type_10.f90
@@ -0,0 +1,34 @@
+! { dg-do compile }
+! { dg-options "-std=f95" }
+!
+! PR fortran/34438
+!
+! Check that error is not issued for local, non-module
+! variables.
+!
+! Contributed by Sven Buijssen
+!
+module demo
+  implicit none
+  private
+  type myint
+    integer :: bar = 42
+  end type myint
+  public :: func
+contains
+  subroutine func()
+    type(myint) :: foo
+  end subroutine func
+end module demo
+
+module demo2
+  implicit none
+  private
+  type myint
+    integer :: bar = 42
+  end type myint
+  type(myint), save :: foo2 ! { dg-error "of PRIVATE derived type" }
+  public :: foo2
+end module demo2
+
+! { dg-final { cleanup-modules "demo" } }