From 86288ff05fb23823f76c64f2c1f310283c74f822 Mon Sep 17 00:00:00 2001
From: Tobias Burnus <burnus@net-b.de>
Date: Sun, 13 Jan 2008 22:28:30 +0100
Subject: [PATCH] re PR fortran/34759 (Assumed size array reference not allowed
in SHAPE intrinsic, even though last subscript specified)
2008-01-13 Tobias Burnus <burnus@net-b.de>
PR fortran/34759
* check.c (gfc_check_shape): Accept array ranges of
assumed-size arrays.
2008-01-13 Tobias Burnus <burnus@net-b.de>
PR fortran/34759
* gfortran.dg/assumed_size_refs_4.f90: New.
From-SVN: r131511
---
gcc/fortran/ChangeLog | 6 ++++++
gcc/fortran/check.c | 2 +-
gcc/testsuite/ChangeLog | 5 +++++
gcc/testsuite/gfortran.dg/assumed_size_refs_4.f90 | 15 +++++++++++++++
4 files changed, 27 insertions(+), 1 deletion(-)
create mode 100644 gcc/testsuite/gfortran.dg/assumed_size_refs_4.f90
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 4ed9a6756af3..5f94e76b0462 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-13 Tobias Burnus <burnus@net-b.de>
+
+ PR fortran/34759
+ * check.c (gfc_check_shape): Accept array ranges of
+ assumed-size arrays.
+
2008-01-12 Jerry DeLisle <jvdelisle@gcc.gnu.org>
PR fortran/34432
diff --git a/gcc/fortran/check.c b/gcc/fortran/check.c
index ba7bcf295bd9..8727862022a5 100644
--- a/gcc/fortran/check.c
+++ b/gcc/fortran/check.c
@@ -2394,7 +2394,7 @@ gfc_check_shape (gfc_expr *source)
ar = gfc_find_array_ref (source);
- if (ar->as && ar->as->type == AS_ASSUMED_SIZE)
+ if (ar->as && ar->as->type == AS_ASSUMED_SIZE && ar->type == AR_FULL)
{
gfc_error ("'source' argument of 'shape' intrinsic at %L must not be "
"an assumed size array", &source->where);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index eec7ddc0e44f..98557e6043f0 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-13 Tobias Burnus <burnus@net-b.de>
+
+ PR fortran/34759
+ * gfortran.dg/assumed_size_refs_4.f90: New.
+
2008-01-13 Eric Botcazou <ebotcazou@adacore.com>
* gnat.dg/unchecked_convert1.adb.
diff --git a/gcc/testsuite/gfortran.dg/assumed_size_refs_4.f90 b/gcc/testsuite/gfortran.dg/assumed_size_refs_4.f90
new file mode 100644
index 000000000000..830ff0849bcc
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/assumed_size_refs_4.f90
@@ -0,0 +1,15 @@
+! { dg-do compile }
+!
+! PR fortran/34759
+! gfortran was before rejecting passing an assumed-size array
+! where the last dimension was specified.
+!
+! Test case provided by Dick Hendickson.
+!
+ subroutine j_assumed_size(A,N)
+ dimension A(10,11,12,*), k(3), l(3), m(4)
+ m = shape(A(:,:,:,:N)) ! OK
+ l = shape(A(:,:,:,3)) ! OK
+ m = shape(A(:,:,:,:)) ! { dg-error "upper bound of assumed size array" }
+ m = shape(A) ! { dg-error "must not be an assumed size array" }
+ end
--
GitLab