diff mbox series

[committed] Fortran: ICE in gfc_compare_array_spec [PR108528]

Message ID trinity-e58ca35d-9f14-4c23-a70e-c307739ee6ed-1674676416042@3c-app-gmx-bs46
State Repeat Merge
Headers
Series [committed] Fortran: ICE in gfc_compare_array_spec [PR108528] |

Checks

Context Check Description
snail/gcc-patch-check warning Git am fail log

Commit Message

Harald Anlauf Jan. 25, 2023, 7:53 p.m. UTC 
  Dear all,

I've committed the attached simple and obvious patch by
Steve after regtesting on x86_64-pc-linux-gnu.
Instead of generating an internal error when wrong types
are passed to a bounds comparison, simply return false.

Committed:
https://gcc.gnu.org/g:9fb9da3d38513d320bfea72050f7a59688595e0b

Thanks,
Harald
diff mbox series

Patch

From 9fb9da3d38513d320bfea72050f7a59688595e0b Mon Sep 17 00:00:00 2001
From: Steve Kargl <kargl@gcc.gnu.org>
Date: Wed, 25 Jan 2023 20:38:43 +0100
Subject: [PATCH] Fortran: ICE in gfc_compare_array_spec [PR108528]

gcc/fortran/ChangeLog:

	PR fortran/108528
	* array.cc (compare_bounds): Return false instead of generating an
	internal error on an invalid argument type.

gcc/testsuite/ChangeLog:

	PR fortran/108528
	* gfortran.dg/pr108528.f90: New test.
---
 gcc/fortran/array.cc                   | 4 ++--
 gcc/testsuite/gfortran.dg/pr108528.f90 | 9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 gcc/testsuite/gfortran.dg/pr108528.f90

diff --git a/gcc/fortran/array.cc b/gcc/fortran/array.cc
index e8a2c32a627..be5eb8b6a0f 100644
--- a/gcc/fortran/array.cc
+++ b/gcc/fortran/array.cc
@@ -967,7 +967,7 @@  gfc_copy_array_spec (gfc_array_spec *src)
 
 
 /* Returns nonzero if the two expressions are equal.
-   We should not need to support more than constant values, as that’s what is
+   We should not need to support more than constant values, as that's what is
    allowed in derived type component array spec.  However, we may create types
    with non-constant array spec for dummy variable class container types, for
    which the _data component holds the array spec of the variable declaration.
@@ -979,7 +979,7 @@  compare_bounds (gfc_expr *bound1, gfc_expr *bound2)
   if (bound1 == NULL || bound2 == NULL
       || bound1->ts.type != BT_INTEGER
       || bound2->ts.type != BT_INTEGER)
-    gfc_internal_error ("gfc_compare_array_spec(): Array spec clobbered");
+    return false;
 
   /* What qualifies as identical bounds?  We could probably just check that the
      expressions are exact clones.  We avoid rewriting a specific comparison
diff --git a/gcc/testsuite/gfortran.dg/pr108528.f90 b/gcc/testsuite/gfortran.dg/pr108528.f90
new file mode 100644
index 00000000000..7a353cb7eab
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr108528.f90
@@ -0,0 +1,9 @@ 
+! { dg-do compile }
+! PR fortran/108528 -
+! Contributed by G.Steinmetz
+
+function f()         ! { dg-error "mismatched array specifications" }
+  integer :: f((2.)) ! { dg-error "must be of INTEGER type" }
+  integer :: g((2))
+entry g()
+end
-- 
2.35.3