From 7ca5bcb0f12380a399c6f88f82fa01b530eb85e5 Mon Sep 17 00:00:00 2001 From: Harald Anlauf Date: Thu, 9 Sep 2021 21:34:01 +0200 Subject: [PATCH] Fortran - out of bounds in array constructor with implied do loop gcc/fortran/ChangeLog: PR fortran/98490 * trans-expr.c (gfc_conv_substring): Do not generate substring bounds check for implied do loop index variable before it actually becomes defined. gcc/testsuite/ChangeLog: PR fortran/98490 * gfortran.dg/bounds_check_23.f90: New test. (cherry picked from commit 5fe0865ab788bdc387b284a3ad57e5a95a767b18) --- gcc/fortran/trans-expr.c | 4 +++- gcc/testsuite/gfortran.dg/bounds_check_23.f90 | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gfortran.dg/bounds_check_23.f90 diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c index 3d00b64e5373..90c509b65254 100644 --- a/gcc/fortran/trans-expr.c +++ b/gcc/fortran/trans-expr.c @@ -2589,7 +2589,9 @@ gfc_conv_substring (gfc_se * se, gfc_ref * ref, int kind, if (!CONSTANT_CLASS_P (tmp) && !DECL_P (tmp)) end.expr = gfc_evaluate_now (end.expr, &se->pre); - if (gfc_option.rtcheck & GFC_RTCHECK_BOUNDS) + if ((gfc_option.rtcheck & GFC_RTCHECK_BOUNDS) + && (ref->u.ss.start->symtree + && !ref->u.ss.start->symtree->n.sym->attr.implied_index)) { tree nonempty = fold_build2_loc (input_location, LE_EXPR, logical_type_node, start.expr, diff --git a/gcc/testsuite/gfortran.dg/bounds_check_23.f90 b/gcc/testsuite/gfortran.dg/bounds_check_23.f90 new file mode 100644 index 000000000000..8de90c77c010 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/bounds_check_23.f90 @@ -0,0 +1,18 @@ +! { dg-do run } +! { dg-options "-fcheck=bounds -fdump-tree-original" } +! PR fortran/98490 - out of bounds in array constructor with implied do loop + +program test + implicit none + call sub('Lorem ipsum') +contains + subroutine sub( text ) + character(len=*), intent(in) :: text + character(len=1), allocatable :: c(:) + integer :: i + c = [ ( text(i:i), i = 1, len(text) ) ] + if (c(1) /= 'L') stop 1 + end subroutine sub +end program test + +! { dg-final { scan-tree-dump-times "Substring out of bounds:" 2 "original" } } -- 2.47.2