From: Andre Vehreschild <vehre@gcc.gnu.org>
Date: Tue, 11 Jun 2024 13:24:55 +0000 (+0200)
Subject: Fix ICE when compiling with -fcoarray=single, when derefing a non-array.
X-Git-Tag: basepoints/gcc-16~8184
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db75a6657e9de6ee7effe46cd2626d9bb946f2e6;p=thirdparty%2Fgcc.git

Fix ICE when compiling with -fcoarray=single, when derefing a non-array.

	    PR fortran/96418
	    PR fortran/103112

gcc/fortran/ChangeLog:

	* trans.cc (gfc_deallocate_with_status): Check that object to deref
	is an array, before applying array deref.

gcc/testsuite/ChangeLog:

	* gfortran.dg/coarray_alloc_comp_3.f08: Moved to...
	* gfortran.dg/coarray/alloc_comp_8.f90: ...here.
	Should be tested for both -fcoarray=single and lib, resp.
	* gfortran.dg/coarray_alloc_comp_4.f08: Fix program name.
---

diff --git a/gcc/fortran/trans.cc b/gcc/fortran/trans.cc
index a208afe90ab0..1335b8cc48bb 100644
--- a/gcc/fortran/trans.cc
+++ b/gcc/fortran/trans.cc
@@ -1838,7 +1838,8 @@ gfc_deallocate_with_status (tree pointer, tree status, tree errmsg,
 	  else
 	    caf_dereg_type = (enum gfc_coarray_deregtype) coarray_dealloc_mode;
 	}
-      else if (flag_coarray == GFC_FCOARRAY_SINGLE)
+      else if (flag_coarray == GFC_FCOARRAY_SINGLE
+	       && GFC_DESCRIPTOR_TYPE_P (TREE_TYPE (pointer)))
 	pointer = gfc_conv_descriptor_data_get (pointer);
     }
   else if (GFC_DESCRIPTOR_TYPE_P (TREE_TYPE (pointer)))
diff --git a/gcc/testsuite/gfortran.dg/coarray_alloc_comp_3.f08 b/gcc/testsuite/gfortran.dg/coarray/alloc_comp_8.f90
similarity index 95%
rename from gcc/testsuite/gfortran.dg/coarray_alloc_comp_3.f08
rename to gcc/testsuite/gfortran.dg/coarray/alloc_comp_8.f90
index e2037aa58093..8b1539251298 100644
--- a/gcc/testsuite/gfortran.dg/coarray_alloc_comp_3.f08
+++ b/gcc/testsuite/gfortran.dg/coarray/alloc_comp_8.f90
@@ -1,12 +1,11 @@
 ! { dg-do run }
-! { dg-options "-fcoarray=lib -lcaf_single" }
 ! { dg-additional-options "-latomic" { target libatomic_available } }
 !
 ! Contributed by Andre Vehreschild
 ! Check that manually freeing components does not lead to a runtime crash,
 ! when the auto-deallocation is taking care.
 
-program coarray_alloc_comp_3
+program alloc_comp_6
   implicit none
 
   type dt
diff --git a/gcc/testsuite/gfortran.dg/coarray_alloc_comp_4.f08 b/gcc/testsuite/gfortran.dg/coarray_alloc_comp_4.f08
index 6586ec651ddf..4c71a90af8fa 100644
--- a/gcc/testsuite/gfortran.dg/coarray_alloc_comp_4.f08
+++ b/gcc/testsuite/gfortran.dg/coarray_alloc_comp_4.f08
@@ -5,7 +5,7 @@
 ! Contributed by Andre Vehreschild
 ! Check that sub-components are caf_deregistered and not freed.
 
-program coarray_alloc_comp_3
+program coarray_alloc_comp_4
   implicit none
 
   type dt