public inbox for gcc-cvs@sourceware.org help / color / mirror / Atom feed
From: Harald Anlauf <anlauf@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org Subject: [gcc r11-10458] Fortran: incorrect array bounds when bound intrinsic used in decl [PR108131] Date: Sun, 8 Jan 2023 20:52:33 +0000 (GMT) [thread overview] Message-ID: <20230108205233.208993858D32@sourceware.org> (raw) https://gcc.gnu.org/g:04310741924e7e6ef1ec637a1a9c3e2972345926 commit r11-10458-g04310741924e7e6ef1ec637a1a9c3e2972345926 Author: Harald Anlauf <anlauf@gmx.de> Date: Sat Dec 17 22:04:32 2022 +0100 Fortran: incorrect array bounds when bound intrinsic used in decl [PR108131] gcc/fortran/ChangeLog: PR fortran/108131 * array.c (match_array_element_spec): Avoid too early simplification of matched array element specs that can lead to a misinterpretation when used as array bounds in array declarations. gcc/testsuite/ChangeLog: PR fortran/108131 * gfortran.dg/pr103505.f90: Adjust expected patterns. * gfortran.dg/pr108131.f90: New test. (cherry picked from commit 6a95f0e0a06d78d94138d4c3dd64d41591197281) Diff: --- gcc/fortran/array.c | 4 ---- gcc/testsuite/gfortran.dg/pr103505.f90 | 8 +++++--- gcc/testsuite/gfortran.dg/pr108131.f90 | 25 +++++++++++++++++++++++++ 3 files changed, 30 insertions(+), 7 deletions(-) diff --git a/gcc/fortran/array.c b/gcc/fortran/array.c index b406f6d1f6e..bb6f2bb9045 100644 --- a/gcc/fortran/array.c +++ b/gcc/fortran/array.c @@ -492,8 +492,6 @@ match_array_element_spec (gfc_array_spec *as) if (!gfc_expr_check_typed (*upper, gfc_current_ns, false)) return AS_UNKNOWN; - gfc_try_simplify_expr (*upper, 0); - if (((*upper)->expr_type == EXPR_CONSTANT && (*upper)->ts.type != BT_INTEGER) || ((*upper)->expr_type == EXPR_FUNCTION @@ -526,8 +524,6 @@ match_array_element_spec (gfc_array_spec *as) if (!gfc_expr_check_typed (*upper, gfc_current_ns, false)) return AS_UNKNOWN; - gfc_try_simplify_expr (*upper, 0); - if (((*upper)->expr_type == EXPR_CONSTANT && (*upper)->ts.type != BT_INTEGER) || ((*upper)->expr_type == EXPR_FUNCTION diff --git a/gcc/testsuite/gfortran.dg/pr103505.f90 b/gcc/testsuite/gfortran.dg/pr103505.f90 index 522e53efcb2..01308019b2c 100644 --- a/gcc/testsuite/gfortran.dg/pr103505.f90 +++ b/gcc/testsuite/gfortran.dg/pr103505.f90 @@ -3,7 +3,9 @@ ! Testcase by G.Steinmetz program p - integer, parameter :: a((2.)) = [4,8] ! { dg-error "scalar INTEGER" } - integer, parameter :: z(1:(2.)) = [4,8] ! { dg-error "scalar INTEGER" } - print *, a(1:1) ! { dg-error "Syntax error" } + integer, parameter :: a((2.)) = [4,8] ! { dg-error "INTEGER type" } + integer, parameter :: z(1:(2.)) = [4,8] ! { dg-error "INTEGER type" } + print *, a(1:1) end + +! { dg-prune-output "Parameter array" } diff --git a/gcc/testsuite/gfortran.dg/pr108131.f90 b/gcc/testsuite/gfortran.dg/pr108131.f90 new file mode 100644 index 00000000000..8bf36d361ba --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr108131.f90 @@ -0,0 +1,25 @@ +! { dg-do run } +! { dg-additional-options "-fdump-tree-original" } +! PR fortran/108131 +! +! Incorrect array bounds when bound intrinsic used in declaration + +program test + implicit none + integer, parameter :: mg(7:10) = 0 + integer, parameter :: u = ubound(mg, dim=1) + integer, parameter :: cx(-1:ubound(mg, dim=1)) = 1 + integer, parameter :: dx(lbound(mg, dim=1):ubound(cx, dim=1)) = 2 + + write(*,*) ubound(mg, dim=1) + write(*,*) ubound(cx, dim=1) + if (u /= 10) stop 1 + if (ubound(mg, dim=1) /= 10) stop 2 + if (ubound(cx, dim=1) /= 10) stop 3 + if (ubound(dx, dim=1) /= 10) stop 4 + if (lbound(mg, dim=1) /= 7) stop 5 + if (lbound(cx, dim=1) /= -1) stop 6 + if (lbound(dx, dim=1) /= 7) stop 7 +end program test + +! { dg-final { scan-tree-dump-not "_gfortran_stop_numeric" "original" } }
reply other threads:[~2023-01-08 20:52 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230108205233.208993858D32@sourceware.org \ --to=anlauf@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).