gcc/fortran/

2009-12-28 Janus Weil  <janus@gcc.gnu.org>

	PR fortran/42353
	* symbol.c (gfc_find_derived_vtab): Make vtabs and vtypes private.

gcc/testsuite/
2009-12-28  Janus Weil  <janus@gcc.gnu.org>

	PR fortran/42353
	* gfortran.dg/class_13.f03: New test.

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

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 0f2ecc7..55fc753 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-28 Janus Weil  <janus@gcc.gnu.org>
+
+       PR fortran/42353
+       * symbol.c (gfc_find_derived_vtab): Make vtabs and vtypes private.
+
 2009-12-27  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
            Daniel Kraft  <d@domob.eu>
 

diff --git a/gcc/fortran/symbol.c b/gcc/fortran/symbol.c
index 1b40d9a..8ba5adb 100644 (file)
--- a/gcc/fortran/symbol.c
+++ b/gcc/fortran/symbol.c
@@ -4748,6 +4748,7 @@ gfc_find_derived_vtab (gfc_symbol *derived)
          vtab->attr.target = 1;
          vtab->attr.save = SAVE_EXPLICIT;
          vtab->attr.vtab = 1;
+         vtab->attr.access = ACCESS_PRIVATE;
          vtab->refs++;
          gfc_set_sym_referenced (vtab);
          sprintf (name, "vtype$%s", derived->name);
@@ -4764,6 +4765,7 @@ gfc_find_derived_vtab (gfc_symbol *derived)
                return NULL;
              vtype->refs++;
              gfc_set_sym_referenced (vtype);
+             vtype->attr.access = ACCESS_PRIVATE;
 
              /* Add component '$hash'.  */
              if (gfc_add_component (vtype, "$hash", &c) == FAILURE)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b92799f..aef38ad 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-28  Janus Weil  <janus@gcc.gnu.org>
+
+       PR fortran/42353
+       * gfortran.dg/class_13.f03: New test.
+
 2009-12-28  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR middle-end/41344

diff --git a/gcc/testsuite/gfortran.dg/class_13.f03 b/gcc/testsuite/gfortran.dg/class_13.f03
new file mode 100644 (file)
index 0000000..84073bf
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/class_13.f03
@@ -0,0 +1,37 @@
+! { dg-do compile }
+!
+! PR 42353: [OOP] Bogus Error: Name 'vtype$...' at (1) is an ambiguous reference ...
+!
+! Original test case by Harald Anlauf <anlauf@gmx.de>
+! Modified by Janus Weil <janus@gcc.gnu.org>
+
+module concrete_vector
+  type :: trivial_vector_type
+  end type
+  class(trivial_vector_type), pointer :: this
+end module concrete_vector
+
+module concrete_gradient
+contains
+  subroutine my_to_vector (v)
+    use concrete_vector
+    class(trivial_vector_type) :: v
+    select type (v)
+    class is (trivial_vector_type)
+    end select
+  end subroutine
+end module concrete_gradient
+
+module concrete_inner_product
+  use concrete_vector
+  use concrete_gradient
+contains
+  real function my_dot_v_v (a)
+    class(trivial_vector_type) :: a
+    select type (a)
+    class is (trivial_vector_type)
+    end select
+  end function
+end module concrete_inner_product
+ 
+! { dg-final { cleanup-modules "concrete_vector concrete_gradient concrete_inner_product" } }