Re: [gfortran] Fix nr 8 from PR 16404 and PR 16400

[Tobias Schlüter <tobias dot schlueter at physik dot uni-muenchen dot de>]

I updated the patch to incorporate a few more recent fixes. This included a
fix for PR 16400: assumed size arrays may not be transferred as a whole.
Additionally, we now give an error when someone tries to transfer a derived
type object with private components.

Built and tested on i686-pc-linux. OK?

- Tobi

2004-08-31  Tobias Schlueter  <tobias.schlueter@physik.uni-muenchen.de>

 	(port from g95)
 	* resolve.c (resolve_transfer): New function.
 	(resolve_code): Call resolve_transfer in case of EXEC_TRANSFER.

Index: resolve.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/fortran/resolve.c,v
retrieving revision 1.16
diff -u -p -r1.16 resolve.c
--- resolve.c   27 Aug 2004 14:49:34 -0000      1.16
+++ resolve.c   1 Sep 2004 19:50:31 -0000
@@ -2962,6 +2962,61 @@ resolve_select (gfc_code * code)
 }


+/* Resolve a transfer statement. This is making sure that:
+   -- a derived type being transferred has only non-pointer components
+   -- a derived type being transferred doesn't have private components
+   -- we're not trying to transfer a whole assumed size array.  */
+
+static void
+resolve_transfer (gfc_code * code)
+{
+  gfc_typespec *ts;
+  gfc_symbol *sym;
+  gfc_ref *ref;
+  gfc_expr *exp;
+
+  exp = code->expr;
+
+  if (exp->expr_type != EXPR_VARIABLE)
+    return;
+
+  sym = exp->symtree->n.sym;
+  ts = &sym->ts;
+
+  /* Go to actual component transferred.  */
+  for (ref = code->expr->ref; ref; ref = ref->next)
+    if (ref->type == REF_COMPONENT)
+      ts = &ref->u.c.component->ts;
+
+  if (ts->type == BT_DERIVED)
+    {
+      /* Check that transferred derived type doesn't contain POINTER
+        components.  */
+      if (derived_pointer (ts->derived))
+       {
+         gfc_error ("Data transfer element at %L cannot have "
+                    "POINTER components", &code->loc);
+         return;
+       }
+
+      if (ts->derived->component_access == ACCESS_PRIVATE)
+       {
+         gfc_error ("Data transfer element at %L cannot have "
+                    "PRIVATE components",&code->loc);
+         return;
+       }
+    }
+
+  if (sym->as != NULL && sym->as->type == AS_ASSUMED_SIZE
+      && exp->ref->type == REF_ARRAY && exp->ref->u.ar.type == AR_FULL)
+    {
+      gfc_error ("Data transfer element at %L cannot be a full reference to "
+                "an assumed-size array", &code->loc);
+      return;
+    }
+}
+
+
 /*********** Toplevel code resolution subroutines ***********/

 /* Given a branch to a label and a namespace, if the branch is conforming.
@@ -3568,7 +3623,6 @@ resolve_code (gfc_code * code, gfc_names
        case EXEC_EXIT:
        case EXEC_CONTINUE:
        case EXEC_DT_END:
-       case EXEC_TRANSFER:
        case EXEC_ENTRY:
          break;

@@ -3754,6 +3808,10 @@ resolve_code (gfc_code * code, gfc_names
          resolve_branch (code->ext.dt->eor, code);
          break;

+       case EXEC_TRANSFER:
+         resolve_transfer (code);
+         break;
+
        case EXEC_FORALL:
          resolve_forall_iterators (code->ext.forall_iterator);