aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/fortran/ChangeLog7
-rw-r--r--gcc/fortran/trans-array.c6
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gfortran.dg/pr32921.f2
4 files changed, 19 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 16d3eb8..59ae427 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,10 @@
+2009-07-02 Michael Matz <matz@suse.de>
+
+ PR fortran/32131
+ * trans-array.c (gfc_conv_descriptor_stride_get): Return
+ constant one for strides in the first dimension of ALLOCATABLE
+ arrays.
+
2009-06-30 Janus Weil <janus@gcc.gnu.org>
PR fortran/40594
diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c
index ce9114f..4b832cf 100644
--- a/gcc/fortran/trans-array.c
+++ b/gcc/fortran/trans-array.c
@@ -284,6 +284,12 @@ gfc_conv_descriptor_stride (tree desc, tree dim)
tree
gfc_conv_descriptor_stride_get (tree desc, tree dim)
{
+ tree type = TREE_TYPE (desc);
+ gcc_assert (GFC_DESCRIPTOR_TYPE_P (type));
+ if (integer_zerop (dim)
+ && GFC_TYPE_ARRAY_AKIND (type) == GFC_ARRAY_ALLOCATABLE)
+ return gfc_index_one_node;
+
return gfc_conv_descriptor_stride (desc, dim);
}
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index acd53b0..558fbbc 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-02 Michael Matz <matz@suse.de>
+
+ PR fortran/32131
+ * gfortran.dg/pr32921.f: Adjust.
+
2009-07-02 Jan Hubicka <jh@suse.cz>
* gcc.dg/tree-ssa/local-pure-const.c: New testcase.
diff --git a/gcc/testsuite/gfortran.dg/pr32921.f b/gcc/testsuite/gfortran.dg/pr32921.f
index d110301..c166dd7 100644
--- a/gcc/testsuite/gfortran.dg/pr32921.f
+++ b/gcc/testsuite/gfortran.dg/pr32921.f
@@ -45,5 +45,5 @@
RETURN
END
-! { dg-final { scan-tree-dump-times "stride" 6 "lim" } }
+! { dg-final { scan-tree-dump-times "stride" 4 "lim" } }
! { dg-final { cleanup-tree-dump "lim" } }