]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
Fix ICE in recompute_tree_invariant_for_addr_expr, at tree.c:4535 [PR84244]
authorAndre Vehreschild <vehre@gcc.gnu.org>
Thu, 11 Jul 2024 13:44:56 +0000 (15:44 +0200)
committerAndre Vehreschild <vehre@gcc.gnu.org>
Mon, 19 Aug 2024 06:46:43 +0000 (08:46 +0200)
Declaring an unused function with a derived type having a pointer
component and using that derived type as a coarray, lead the compiler to
ICE because the caf_token for the pointer was not linked into the
component correctly.

PR fortran/84244

gcc/fortran/ChangeLog:

* trans-types.cc (gfc_get_derived_type): When a caf_sub_token is
generated for a component, link it to the component it is
generated for (the previous one).

gcc/testsuite/ChangeLog:

* gfortran.dg/coarray/ptr_comp_5.f08: New test.

gcc/fortran/trans-types.cc
gcc/testsuite/gfortran.dg/coarray/ptr_comp_5.f08 [new file with mode: 0644]

index e6da8e1a58b7f111a5831b4ebe290cf6412e4db0..bc582085f57fbc50ca9261f67ec9fcdaa720b989 100644 (file)
@@ -2661,7 +2661,7 @@ gfc_get_derived_type (gfc_symbol * derived, int codimen)
   tree *chain = NULL;
   bool got_canonical = false;
   bool unlimited_entity = false;
-  gfc_component *c;
+  gfc_component *c, *last_c = nullptr;
   gfc_namespace *ns;
   tree tmp;
   bool coarray_flag, class_coarray_flag;
@@ -2961,10 +2961,14 @@ gfc_get_derived_type (gfc_symbol * derived, int codimen)
         types.  */
       if (class_coarray_flag || !c->backend_decl)
        c->backend_decl = field;
+      if (c->attr.caf_token && last_c)
+       last_c->caf_token = field;
 
       if (c->attr.pointer && (c->attr.dimension || c->attr.codimension)
          && !(c->ts.type == BT_DERIVED && strcmp (c->name, "_data") == 0))
        GFC_DECL_PTR_ARRAY_P (c->backend_decl) = 1;
+
+      last_c = c;
     }
 
   /* Now lay out the derived type, including the fields.  */
diff --git a/gcc/testsuite/gfortran.dg/coarray/ptr_comp_5.f08 b/gcc/testsuite/gfortran.dg/coarray/ptr_comp_5.f08
new file mode 100644 (file)
index 0000000..ed3a8db
--- /dev/null
@@ -0,0 +1,19 @@
+! { dg-do compile }
+
+! Check PR84244 does not ICE anymore.
+
+program ptr_comp_5
+  integer, target :: dest = 42
+  type t
+    integer, pointer :: p
+  end type
+  type(t) :: o[*]
+
+  o%p => dest
+contains
+  ! This unused routine is crucial for the ICE.
+  function f(x)
+    type(t), intent(in) ::x
+  end function
+end program
+