PR fortran/50420

	* trans-intrinsic.c (walk_coarray): Allow subreferences after a
	coarray object reference.

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

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index b1b0407..819369c 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,6 +1,12 @@
 2011-10-18  Mikael Morin  <mikael@gcc.gnu.org>
 
        PR fortran/50420
 2011-10-18  Mikael Morin  <mikael@gcc.gnu.org>
 
        PR fortran/50420

+       * trans-intrinsic.c (walk_coarray): Allow subreferences after a
+       coarray object reference.
+
+2011-10-18  Mikael Morin  <mikael@gcc.gnu.org>
+
+       PR fortran/50420

        * trans-array.c (gfc_walk_array_ref): Allow zero rank arrays
        if they are coarrays.
 
        * trans-array.c (gfc_walk_array_ref): Allow zero rank arrays
        if they are coarrays.
 

diff --git a/gcc/fortran/trans-intrinsic.c b/gcc/fortran/trans-intrinsic.c
index ed18bfa..82bbb69 100644 (file)
--- a/gcc/fortran/trans-intrinsic.c
+++ b/gcc/fortran/trans-intrinsic.c
@@ -943,10 +943,16 @@ walk_coarray (gfc_expr *e)
       ss = gfc_get_array_ss (gfc_ss_terminator, e, 0, GFC_SS_SECTION);
 
       ref = e->ref;
       ss = gfc_get_array_ss (gfc_ss_terminator, e, 0, GFC_SS_SECTION);
 
       ref = e->ref;

-      while (ref->next)
-       ref = ref->next;
+      while (ref)
+       {
+         if (ref->type == REF_ARRAY
+             && ref->u.ar.codimen > 0)
+           break;
+
+         ref = ref->next;
+       }

 
 

-      gcc_assert (ref->type == REF_ARRAY && ref->u.ar.codimen > 0);
+      gcc_assert (ref != NULL);

       ref->u.ar.type = AR_FULL;
       ss->data.info.ref = ref;
     }
       ref->u.ar.type = AR_FULL;
       ss->data.info.ref = ref;
     }