diff mbox series

[Fortran] PR92277 - Fix assumed-rank array with bind(C)

Message ID ce6ee9cb-5f27-4020-dec8-252edc01826d@codesourcery.com
State New
Headers show
Series [Fortran] PR92277 - Fix assumed-rank array with bind(C) | expand

Commit Message

Tobias Burnus Oct. 30, 2019, 3:40 p.m. UTC 
The attached test case (w/o optional and with "this") gave an ICE as 
"*this" was passed to DECL_ARTIFICIAL and only "this" but not the 
INDIRECT_REF is a declaration. [I added optional as those often act 
slightly different, but it doesn't seem to make a difference here.]

Solution: If it is an INDIRECT_REF, check the the arg0 of it.

Note: The INDIRECT_REF not only comes about via the 
build_fold_indirect_ref_loc call in the line above "is_artificial" but 
can be produced earlier. An example is this test case.

(This is GCC 10 regression, only.)
OK for the trunk?

Tobias

PS: Review is also still pending for 
https://gcc.gnu.org/ml/fortran/2019-10/msg00237.html

Comments

Paul Richard Thomas Oct. 31, 2019, 9:41 a.m. UTC | #1 
Hi Tobias,

OK for trunk and for 9-branch. For the latter, you will have to get
release manager approval of course.

Thanks for picking up my doo-doos.

Cheers

Paul

On Wed, 30 Oct 2019 at 15:40, Tobias Burnus <tobias@codesourcery.com> wrote:
>
> The attached test case (w/o optional and with "this") gave an ICE as
> "*this" was passed to DECL_ARTIFICIAL and only "this" but not the
> INDIRECT_REF is a declaration. [I added optional as those often act
> slightly different, but it doesn't seem to make a difference here.]
>
> Solution: If it is an INDIRECT_REF, check the the arg0 of it.
>
> Note: The INDIRECT_REF not only comes about via the
> build_fold_indirect_ref_loc call in the line above "is_artificial" but
> can be produced earlier. An example is this test case.
>
> (This is GCC 10 regression, only.)
> OK for the trunk?
>
> Tobias
>
> PS: Review is also still pending for
> https://gcc.gnu.org/ml/fortran/2019-10/msg00237.html
>
diff mbox series

Patch

	gcc/fortran/
	* trans-expr.c (gfc_conv_gfc_desc_to_cfi_desc): Fix DECL_ARTIFICIAL
	checking.

	gcc/testsuite/
	* fortran.dg/pr92277.f90: New.

diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c
index 7eba1bbd082..381e314a9b5 100644
--- a/gcc/fortran/trans-expr.c
+++ b/gcc/fortran/trans-expr.c
@@ -5239,6 +5239,9 @@  gfc_conv_gfc_desc_to_cfi_desc (gfc_se *parmse, gfc_expr *e, gfc_symbol *fsym)
       if (POINTER_TYPE_P (TREE_TYPE (parmse->expr)))
 	parmse->expr = build_fold_indirect_ref_loc (input_location,
 						    parmse->expr);
+      bool is_artificial = (INDIRECT_REF_P (parmse->expr)
+			    ? DECL_ARTIFICIAL (TREE_OPERAND (parmse->expr, 0))
+			    : DECL_ARTIFICIAL (parmse->expr));
 
       /* Unallocated allocatable arrays and unassociated pointer arrays
 	 need their dtype setting if they are argument associated with
@@ -5258,7 +5261,7 @@  gfc_conv_gfc_desc_to_cfi_desc (gfc_se *parmse, gfc_expr *e, gfc_symbol *fsym)
       type = e->ts.type != BT_ASSUMED ? gfc_typenode_for_spec (&e->ts) :
 					NULL_TREE;
 
-      if (type && DECL_ARTIFICIAL (parmse->expr)
+      if (type && is_artificial
 	  && type != gfc_get_element_type (TREE_TYPE (parmse->expr)))
 	{
 	  /* Obtain the offset to the data.  */
@@ -5271,7 +5274,7 @@  gfc_conv_gfc_desc_to_cfi_desc (gfc_se *parmse, gfc_expr *e, gfc_symbol *fsym)
 			  gfc_get_dtype_rank_type (e->rank, type));
 	}
       else if (type == NULL_TREE
-	       || (!is_subref_array (e) && !DECL_ARTIFICIAL (parmse->expr)))
+	       || (!is_subref_array (e) && !is_artificial))
 	{
 	  /* Make sure that the span is set for expressions where it
 	     might not have been done already.  */
diff --git a/gcc/testsuite/gfortran.dg/pr92277.f90 b/gcc/testsuite/gfortran.dg/pr92277.f90
new file mode 100644
index 00000000000..5121063f5f3
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr92277.f90
@@ -0,0 +1,32 @@ 
+! { dg-do compile }
+!
+! PR fortran/92277
+!
+! Contributed by José Rui Faustino de Sousa
+!
+module arr_m
+  implicit none
+contains
+  subroutine arr_set(this, that)
+    integer, intent(out) :: this(..)
+    integer, optional, intent(out) :: that(..)
+
+    interface
+      subroutine arr_set_c(this) bind(c)
+        use, intrinsic :: iso_c_binding, only: c_int
+        implicit none
+        integer(kind=c_int), intent(out) :: this(..)
+      end subroutine arr_set_c
+      subroutine arr_set_c_opt(this) bind(c)
+        use, intrinsic :: iso_c_binding, only: c_int
+        implicit none
+        integer(kind=c_int), optional, intent(out) :: this(..)
+      end subroutine arr_set_c_opt
+    end interface
+
+    call arr_set_c(this)
+    call arr_set_c(that)
+    call arr_set_c_opt(this)
+    call arr_set_c_opt(that)
+  end subroutine arr_set
+end module arr_m