This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[Patch, fortran] PR32315 - DATA with implied-do: Bounds checks missing [regression vs. g77]
- From: "Paul Richard Thomas" <paul dot richard dot thomas at gmail dot com>
- To: "fortran at gcc dot gnu dot org" <fortran at gcc dot gnu dot org>, gcc-patches <gcc-patches at gcc dot gnu dot org>
- Date: Tue, 5 Feb 2008 10:26:12 +0100
- Subject: [Patch, fortran] PR32315 - DATA with implied-do: Bounds checks missing [regression vs. g77]
:ADDPATCH fortran:
Here is what is getting to be a very rare beast - a regression with
respect to g77. Adding the requisite bounds checking was very
straightforward, as will be seen from the patch. Note that the
arrayspec from the gfc_ref is used, rather than the symbol's
array_spec - I got caught with this. To see why, take a look at
gfortran.fortran-torture/compile/data.f90.
Regtested on Cygwin_NT/amd64 - OK for trunk after a spin on x86_ia64/FC8?
Cheers
Paul
2008-02-05 Paul Thomas <pault@gcc.gnu.org>
PR fortran/32315
* data.c (gfc_assign_data_value): Add bounds check for array
references.
2008-02-05 Paul Thomas <pault@gcc.gnu.org>
PR fortran/32315
* gfortran.dg/data_bounds_1.f90: New test.
Index: gcc/fortran/data.c
===================================================================
*** gcc/fortran/data.c (revision 132077)
--- gcc/fortran/data.c (working copy)
*************** gfc_assign_data_value (gfc_expr *lvalue,
*** 311,316 ****
--- 311,337 ----
else
mpz_set (offset, index);
+ /* Check the bounds. */
+ if (mpz_cmp_si (offset, 0) < 0)
+ {
+ gfc_error ("Data element below array lower bound at %L",
+ &lvalue->where);
+ return FAILURE;
+ }
+ else
+ {
+ mpz_t size;
+ if (spec_size (ref->u.ar.as, &size) == SUCCESS
+ && mpz_cmp (offset, size) >= 0)
+ {
+ mpz_clear (size);
+ gfc_error ("Data element above array upper bound at %L",
+ &lvalue->where);
+ return FAILURE;
+ }
+ mpz_clear (size);
+ }
+
/* Splay tree containing offset and gfc_constructor. */
spt = expr->con_by_offset;
Index: gcc/testsuite/gfortran.dg/data_bounds_1.f90
===================================================================
*** gcc/testsuite/gfortran.dg/data_bounds_1.f90 (revision 0)
--- gcc/testsuite/gfortran.dg/data_bounds_1.f90 (revision 0)
***************
*** 0 ****
--- 1,17 ----
+ ! { dg-do compile }
+ ! Checks the fix for PR32315, in which the bounds checks below were not being done.
+ !
+ ! Contributed by Tobias Burnus <burnus@gcc.gnu.org>
+ !
+ program chkdata
+ character(len=20), dimension(4) :: string
+ character(len=20), dimension(0:1,3:4) :: string2
+
+ data (string(i) ,i = 4, 5) /'D', 'E'/ ! { dg-error "above array upper bound" }
+ data (string(i) ,i = 0, 1) /'A', 'B'/ ! { dg-error "below array lower bound" }
+ data (string(i) ,i = 1, 4) /'A', 'B', 'C', 'D'/
+
+ data ((string2(i, j) ,i = 1, 2), j = 3, 4) /'A', 'B', 'C', 'D'/ ! { dg-error "above array upper bound" }
+ data ((string2(i, j) ,i = 0, 1), j = 2, 3) /'A', 'B', 'C', 'D'/ ! { dg-error "below array lower bound" }
+ data ((string2(i, j) ,i = 0, 1), j = 3, 4) /'A', 'B', 'C', 'D'/
+ end program chkdata