Re: [Patch, Fortran] PR41629: [OOP] gimplification error on valid code

[Paul Richard Thomas <paul dot richard dot thomas at gmail dot com>]

Hi Janus,

What is wrong with the patch below?  It seems a lot simpler to me and
it compiles your testcase correctly.

In addition, I prefer to see the container created as early as
possible so that all the natural checks for derived types are
preserved.

Cheers

Paul

+++ gcc/fortran/decl.c	(working copy)
@@ -5685,14 +5685,29 @@
 	}
     }

-  /* Update symbol table.  DIMENSION attribute is set
-     in gfc_set_array_spec().  */
-  if (current_attr.dimension == 0
-      && gfc_copy_attr (&sym->attr, &current_attr, &var_locus) == FAILURE)
+  /* Update symbol table.  DIMENSION attribute is set in
+     gfc_set_array_spec().  For CLASS variables, this must be applied
+     to the first component, or '$data' field.  */
+  if (sym->ts.type == BT_CLASS && sym->ts.u.derived)
     {
-      m = MATCH_ERROR;
-      goto cleanup;
+      gfc_component *comp;
+      comp = gfc_find_component (sym->ts.u.derived, "$data", true, true);
+      if (comp == NULL || gfc_copy_attr (&comp->attr, &current_attr,
+					 &var_locus) == FAILURE)
+	{
+	  m = MATCH_ERROR;
+	  goto cleanup;
+	}
     }
+  else
+    {
+      if (current_attr.dimension == 0
+	    && gfc_copy_attr (&sym->attr, &current_attr, &var_locus) == FAILURE)
+	{
+	  m = MATCH_ERROR;
+	  goto cleanup;
+	}
+    }

   if (gfc_set_array_spec (sym, as, &var_locus) == FAILURE)
     {