From aa6590cfbe40c8caf8d2482bb8d77ed3e151770e Mon Sep 17 00:00:00 2001
From: Janus Weil <janus@gcc.gnu.org>
Date: Sun, 16 Sep 2012 22:49:20 +0200
Subject: [PATCH] re PR fortran/54594 ([OOP] Type-bound ASSIGNMENTs (elemental
+ array version) rejected as ambiguous)
2012-09-16 Janus Weil <janus@gcc.gnu.org>
PR fortran/54594
* interface.c (compare_type_rank): Handle CLASS arrays.
2012-09-16 Janus Weil <janus@gcc.gnu.org>
PR fortran/54594
* gfortran.dg/typebound_generic_14.f03: New.
From-SVN: r191365
---
gcc/fortran/ChangeLog | 5 ++++
gcc/fortran/interface.c | 12 ++++++---
gcc/testsuite/ChangeLog | 5 ++++
.../gfortran.dg/typebound_generic_14.f03 | 27 +++++++++++++++++++
4 files changed, 45 insertions(+), 4 deletions(-)
create mode 100644 gcc/testsuite/gfortran.dg/typebound_generic_14.f03
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index bf9f0b93ae64..e01ae683f4f8 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2012-09-16 Janus Weil <janus@gcc.gnu.org>
+
+ PR fortran/54594
+ * interface.c (compare_type_rank): Handle CLASS arrays.
+
2012-09-16 Janus Weil <janus@gcc.gnu.org>
PR fortran/54387
diff --git a/gcc/fortran/interface.c b/gcc/fortran/interface.c
index 482c294ecbac..b34885632ebe 100644
--- a/gcc/fortran/interface.c
+++ b/gcc/fortran/interface.c
@@ -507,14 +507,18 @@ gfc_compare_types (gfc_typespec *ts1, gfc_typespec *ts2)
static int
compare_type_rank (gfc_symbol *s1, gfc_symbol *s2)
{
+ gfc_array_spec *as1, *as2;
int r1, r2;
- r1 = (s1->as != NULL) ? s1->as->rank : 0;
- r2 = (s2->as != NULL) ? s2->as->rank : 0;
+ as1 = (s1->ts.type == BT_CLASS) ? CLASS_DATA (s1)->as : s1->as;
+ as2 = (s2->ts.type == BT_CLASS) ? CLASS_DATA (s2)->as : s2->as;
+
+ r1 = as1 ? as1->rank : 0;
+ r2 = as2 ? as2->rank : 0;
if (r1 != r2
- && (!s1->as || s1->as->type != AS_ASSUMED_RANK)
- && (!s2->as || s2->as->type != AS_ASSUMED_RANK))
+ && (!as1 || as1->type != AS_ASSUMED_RANK)
+ && (!as2 || as2->type != AS_ASSUMED_RANK))
return 0; /* Ranks differ. */
return gfc_compare_types (&s1->ts, &s2->ts)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 978e3dfc7fe1..4b68ef8d9e97 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-09-16 Janus Weil <janus@gcc.gnu.org>
+
+ PR fortran/54594
+ * gfortran.dg/typebound_generic_14.f03: New.
+
2012-09-16 Janus Weil <janus@gcc.gnu.org>
PR fortran/54387
diff --git a/gcc/testsuite/gfortran.dg/typebound_generic_14.f03 b/gcc/testsuite/gfortran.dg/typebound_generic_14.f03
new file mode 100644
index 000000000000..8515cf4378f4
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/typebound_generic_14.f03
@@ -0,0 +1,27 @@
+! { dg-do compile }
+!
+! PR 54594: [OOP] Type-bound ASSIGNMENTs (elemental + array version) rejected as ambiguous
+!
+! Contributed by James van Buskirk
+
+module a_mod
+
+ type :: a
+ contains
+ procedure, NOPASS :: a_ass, a_ass_sv
+ generic :: ass => a_ass, a_ass_sv
+ end type
+
+contains
+
+ impure elemental subroutine a_ass (out)
+ class(a), intent(out) :: out
+ end subroutine
+
+ subroutine a_ass_sv (out)
+ class(a), intent(out) :: out(:)
+ end subroutine
+
+end module
+
+! { dg-final { cleanup-modules "a_mod" } }
--
GitLab