diff options
| author | Michael Matz <matz@suse.de> | 2009-07-02 15:31:28 +0000 |
|---|---|---|
| committer | Michael Matz <matz@gcc.gnu.org> | 2009-07-02 15:31:28 +0000 |
| commit | a3788c444c649c2890963afcaf2395d69703077c (patch) | |
| tree | 4bb86a511c5a70d31c9df4654ee819bcb1e2d8e9 /gcc | |
| parent | 3c1832c328ea48a8acb567200cf511b82b020835 (diff) | |
| download | gcc-a3788c444c649c2890963afcaf2395d69703077c.zip gcc-a3788c444c649c2890963afcaf2395d69703077c.tar.gz gcc-a3788c444c649c2890963afcaf2395d69703077c.tar.bz2 | |
re PR fortran/32131 (knowing that stride==1 when using allocated arrays and escaping allocatable arrays)
fortran/
PR fortran/32131
* trans-array.c (gfc_conv_descriptor_stride_get): Return
constant one for strides in the first dimension of ALLOCATABLE
arrays.
testsuite/
PR fortran/32131
* gfortran.dg/pr32921.f: Adjust.
From-SVN: r149178
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/fortran/trans-array.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/pr32921.f | 2 |
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" } } |