From: Asher Langton <langton2@llnl.gov>
Date: Thu, 8 Jun 2006 21:00:26 +0000 (+0000)
Subject: re PR fortran/27786 ([4.1 only] Bad interaction between Cray pointer, assumed-size... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f6cf0340b9a28d1cdf632d1f4d1becc470d34ba9;p=gcc.git

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
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 26fcf19b4f8..e2a4aafa243 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 26d5febaa4a..e3719a889fa 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 1d5b76aec01..a5455d99d9a 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 7c958d57b0a..42cdf9b0b48 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)