re PR fortran/51913 ([OOP] bug when submitting a class pointer to a subroutine)

2012-01-21  Tobias Burnus  <burnus@net-b.de>

        PR fortran/51913
        * interface.c (compare_parameter): Fix CLASS comparison.

2012-01-21  Tobias Burnus  <burnus@net-b.de>

        PR fortran/51913
        * gfortran.dg/class_47.f90: New.

From-SVN: r183369

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index ac998ee9c573f1426d8c4f832e440f4ab0e9329c..952b289aae920218a91f4b5b2dbfa15067e35370 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-21  Tobias Burnus  <burnus@net-b.de>
+
+       PR fortran/51913
+       * interface.c (compare_parameter): Fix CLASS comparison.
+
 2012-01-19  Tobias Burnus  <burnus@net-b.de>
 
        PR fortran/51904

diff --git a/gcc/fortran/interface.c b/gcc/fortran/interface.c
index eece7f45d82e0d4342a4ee33277ab8ccc3f2b31b..cc7eef75d9f049135bd785496c177864aa445300 100644 (file)
--- a/gcc/fortran/interface.c
+++ b/gcc/fortran/interface.c
@@ -1535,7 +1535,7 @@ compare_parameter (gfc_symbol *formal, gfc_expr *actual,
       return 0;
     }
     
-  /* F2003, 12.5.2.5.  */
+  /* F2008, 12.5.2.5.  */
   if (formal->ts.type == BT_CLASS
       && (CLASS_DATA (formal)->attr.class_pointer
           || CLASS_DATA (formal)->attr.allocatable))
@@ -1547,8 +1547,8 @@ compare_parameter (gfc_symbol *formal, gfc_expr *actual,
                        formal->name, &actual->where);
          return 0;
        }
-      if (CLASS_DATA (actual)->ts.u.derived
-         != CLASS_DATA (formal)->ts.u.derived)
+      if (!gfc_compare_derived_types (CLASS_DATA (actual)->ts.u.derived,
+                                     CLASS_DATA (formal)->ts.u.derived))
        {
          if (where)
            gfc_error ("Actual argument to '%s' at %L must have the same "

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7964bf4a925ac75a0cf093434dbe5bc5f39fb264..3e29ef59bb5cd371438cbd8d2e2acd9f8d564b5b 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-21  Tobias Burnus  <burnus@net-b.de>
+
+       PR fortran/51913
+       * gfortran.dg/class_47.f90: New.
+
 2012-01-21  Eric Botcazou  <ebotcazou@adacore.com>
 
        * gnat.dg/renaming5.ad[sb]: New test.

diff --git a/gcc/testsuite/gfortran.dg/class_47.f90 b/gcc/testsuite/gfortran.dg/class_47.f90
new file mode 100644 (file)
index 0000000..90a7560
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/class_47.f90
@@ -0,0 +1,40 @@
+! { dg-do compile }
+!
+! PR fortran/51913
+!
+! Contributed by Alexander Tismer
+!
+MODULE m_sparseMatrix
+
+  implicit none
+  
+  type :: sparseMatrix_t
+
+  end type sparseMatrix_t
+END MODULE m_sparseMatrix
+
+!===============================================================================
+module m_subroutine
+!  USE m_sparseMatrix !< when uncommenting this line program works fine
+
+  implicit none
+
+  contains
+  subroutine test(matrix)
+    use m_sparseMatrix
+    class(sparseMatrix_t), pointer :: matrix
+  end subroutine
+end module
+
+!===============================================================================
+PROGRAM main
+  use m_subroutine
+  USE m_sparseMatrix
+  implicit none
+
+  CLASS(sparseMatrix_t), pointer :: sparseMatrix
+  
+  call test(sparseMatrix)
+END PROGRAM
+
+! { dg-final { cleanup-modules "m_sparsematrix m_subroutine" } }