aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAsher Langton <langton2@llnl.gov>2006-06-08 21:00:26 +0000
committerAsher Langton <langton@gcc.gnu.org>2006-06-08 21:00:26 +0000
commitf6cf0340b9a28d1cdf632d1f4d1becc470d34ba9 (patch)
treefa0fe8318a70d74bfac6ce741d7f90f04bc1c401
parent118ed72a74d69564dae5b8113379910357c916e8 (diff)
downloadgcc-f6cf0340b9a28d1cdf632d1f4d1becc470d34ba9.zip
gcc-f6cf0340b9a28d1cdf632d1f4d1becc470d34ba9.tar.gz
gcc-f6cf0340b9a28d1cdf632d1f4d1becc470d34ba9.tar.bz2
re PR fortran/27786 ([4.1 only] Bad interaction between Cray pointer, assumed-size array and bounds checking)
* cray_pointers_2.f90: Add -fbounds-check compile flag. PR fortran/27786 * trans-array.c (gfc_conv_array_ref): Eliminate bounds checking for assumed-size Cray pointees. From-SVN: r114495
-rw-r--r--gcc/fortran/ChangeLog6
-rw-r--r--gcc/fortran/trans-array.c3
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gfortran.dg/cray_pointers_2.f902
4 files changed, 14 insertions, 2 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 26fcf19..e2a4aaf 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-08 Asher Langton <langton2@llnl.gov>
+
+ PR fortran/27786
+ * trans-array.c (gfc_conv_array_ref): Eliminate bounds checking
+ for assumed-size Cray pointees.
+
2006-06-08 Steven G. Kargl <kargls@comcat.net>
* intrinsic.c (add_subroutine): Make make_noreturn() conditional on
diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c
index 26d5feb..e3719a8 100644
--- a/gcc/fortran/trans-array.c
+++ b/gcc/fortran/trans-array.c
@@ -1964,7 +1964,8 @@ gfc_conv_array_ref (gfc_se * se, gfc_array_ref * ar, gfc_symbol * sym,
gfc_add_block_to_block (&se->pre, &indexse.pre);
if (flag_bounds_check &&
- (ar->as->type != AS_ASSUMED_SIZE || n < ar->dimen - 1))
+ ((ar->as->type != AS_ASSUMED_SIZE && !ar->as->cp_was_assumed)
+ || n < ar->dimen - 1))
{
/* Check array bounds. */
tree cond;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1d5b76a..a5455d9 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-08 Asher Langton <langton2@llnl.gov>
+
+ PR fortran/27786
+ * cray_pointers_2.f90: Add -fbounds-check compile flag.
+
2006-06-08 Volker Reichelt <reichelt@igpm.rwth-aachen.de>
PR target/27421
diff --git a/gcc/testsuite/gfortran.dg/cray_pointers_2.f90 b/gcc/testsuite/gfortran.dg/cray_pointers_2.f90
index 7c958d5..42cdf9b 100644
--- a/gcc/testsuite/gfortran.dg/cray_pointers_2.f90
+++ b/gcc/testsuite/gfortran.dg/cray_pointers_2.f90
@@ -1,5 +1,5 @@
! { dg-do run }
-! { dg-options "-fcray-pointer" }
+! { dg-options "-fcray-pointer -fbounds-check" }
! Series of routines for testing a Cray pointer implementation
program craytest
common /errors/errors(400)