Re: [PATCH] PR fortran/103392 - [9/10/11/12 Regression] ICE in simplify_bound, at fortran/simplify.c:4273

2021-11-23 Thread Mikael Morin

Le 23/11/2021 à 21:46, Harald Anlauf via Fortran a écrit :

Dear all,

in simplify_bound we did hit an assert when trying to simplify
LBOUND/UBOUND for arrays with allocatable or pointer attribute.

We cannot do that.  Terminate simplification in that situation.

Regtested on x86_64-pc-linux-gnu.  OK for mainline/affected branches?


OK. Thanks.


[PATCH] PR fortran/103392 - [9/10/11/12 Regression] ICE in simplify_bound, at fortran/simplify.c:4273

2021-11-23 Thread Harald Anlauf via Gcc-patches
Dear all,

in simplify_bound we did hit an assert when trying to simplify
LBOUND/UBOUND for arrays with allocatable or pointer attribute.

We cannot do that.  Terminate simplification in that situation.

Regtested on x86_64-pc-linux-gnu.  OK for mainline/affected branches?

Thanks,
Harald

From 82c5d7ab299ad4bce98b53cc9bba223c29b34e66 Mon Sep 17 00:00:00 2001
From: Harald Anlauf 
Date: Tue, 23 Nov 2021 21:39:36 +0100
Subject: [PATCH] Fortran: do not attempt simplification of [LU]BOUND for
 pointer/allocatable

gcc/fortran/ChangeLog:

	PR fortran/103392
	* simplify.c (simplify_bound): Do not try to simplify
	LBOUND/UBOUND for arrays with POINTER or ALLOCATABLE attribute.

gcc/testsuite/ChangeLog:

	PR fortran/103392
	* gfortran.dg/bound_simplification_7.f90: New test.
---
 gcc/fortran/simplify.c |  6 ++
 .../gfortran.dg/bound_simplification_7.f90 | 18 ++
 2 files changed, 24 insertions(+)
 create mode 100644 gcc/testsuite/gfortran.dg/bound_simplification_7.f90

diff --git a/gcc/fortran/simplify.c b/gcc/fortran/simplify.c
index 6a6b3fbd037..c9e13b59da9 100644
--- a/gcc/fortran/simplify.c
+++ b/gcc/fortran/simplify.c
@@ -4266,6 +4266,12 @@ simplify_bound (gfc_expr *array, gfc_expr *dim, gfc_expr *kind, int upper)
 	 || (as->type == AS_ASSUMED_SHAPE && upper)))
 return NULL;

+  /* 'array' shall not be an unallocated allocatable variable or a pointer that
+ is not associated.  */
+  if (array->expr_type == EXPR_VARIABLE
+  && (gfc_expr_attr (array).allocatable || gfc_expr_attr (array).pointer))
+return NULL;
+
   gcc_assert (!as
 	  || (as->type != AS_DEFERRED
 		  && array->expr_type == EXPR_VARIABLE
diff --git a/gcc/testsuite/gfortran.dg/bound_simplification_7.f90 b/gcc/testsuite/gfortran.dg/bound_simplification_7.f90
new file mode 100644
index 000..3efecdff769
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/bound_simplification_7.f90
@@ -0,0 +1,18 @@
+! { dg-do compile }
+! PR fortran/103392 - ICE in simplify_bound
+
+program p
+  integer, allocatable :: a(1:1) ! { dg-error "deferred shape or assumed rank" }
+  integer :: b(1) = lbound(a)! { dg-error "does not reduce" }
+  integer :: c(1) = ubound(a)! { dg-error "does not reduce" }
+end
+
+subroutine s(x, y)
+  type t
+ integer :: i(3)
+  end type t
+  type(t), pointer :: x(:)
+  type(t), allocatable :: y(:)
+  integer, parameter   :: m(1) = ubound (x(1)% i)
+  integer  :: n(1) = ubound (y(1)% i)
+end subroutine s
--
2.26.2