From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) by sourceware.org (Postfix) with ESMTPS id 59474387722C; Sun, 11 Dec 2022 22:33:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 59474387722C Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmx.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.de; s=s31663417; t=1670798023; bh=StSsAEQMvn5ERV1huQQlKf7da1Un4rDhhrJ4a3Q+/i8=; h=X-UI-Sender-Class:From:To:Subject:Date; b=NS5MhkUwtMfz6sb6RUDhGPq+uoEF115Nsv6O8uvXERcC2kDF6thE0kGii187pDiTH 1gS+GfCpXXQzf6dUWSiHG1doEaSuKM0t9Q9S/5APUWiO+xpDO2HqjCO9wty0G+kGqw X6G4tKkDDwFk32FjL9MKxaQtBKCHm/CD1Aq4IA1GR3ep8nwd0gErgaUBFl9i4cjGdj qKDEEVCGqWBb1og2ASQbrCslFFXGdEsbQff5OI0Ic9nG2ocwTXBA292odnyzCbwZjZ 5q20kFQDd8bHSvnnSMmsnudn+21oLyfpkOXpFCiJpbBI8glsxqLdv+RXNttL+oQuKR 7wnqa+t4rRbew== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from [93.207.87.138] ([93.207.87.138]) by web-mail.gmx.net (3c-app-gmx-bap41.server.lan [172.19.172.111]) (via HTTP); Sun, 11 Dec 2022 23:33:43 +0100 MIME-Version: 1.0 Message-ID: From: Harald Anlauf To: fortran , gcc-patches Subject: [PATCH] Fortran: improve checking of assumed size array spec [PR102180] Content-Type: multipart/mixed; boundary=abmob-ce77eff0-b569-443c-bd2d-b0bdc3c23425 Date: Sun, 11 Dec 2022 23:33:43 +0100 Importance: normal Sensitivity: Normal X-Priority: 3 X-Provags-ID: V03:K1:wbS+HE88ZtEd7VF42Lp0CYd7BS6d+LM7y5QXrx3ktH10/vv/L8Rn1myxDozzP0IQIsYPH 3uCHqCG3UC0+fC8T0d2lrKJEk8EYpJEv6+XoGfs8JSps1YlQorNLGY7DTYddjXVVQ0GR3sPs5VVU eKT6m6BYcxLerYsUUgLd5/7HYAeReQ/j9GVheQqEJT99VVm1tHhhN5uDk5kmkOztPTrXyDGnWKc8 IYCGQ5n8ZS8dvl0wcqeWxkP6VSoRF4qssZI9Kim/U6zilxnEMHCB8Zb5e7u88+j5VRWiLqHwixpZ RU= UI-OutboundReport: notjunk:1;M01:P0:U2KjXGw8hkU=;N6uddllD0IYx5DRfq9pzVo2khst B55q0onACxq9bVVlwA4pzVl543yxK5xRm/majZEl5+R3j+gohJrZt/cV2FbKHHZjar4JjwNdX o+4NXQVWFXVIYM0eoUt3DMMjufbgCIorGcqZ4QLoA0jL2RjivKyRkWjO77x8WdqGGSbhLmeO4 6NFwoXuKONg4lDB1WXHxOGGO1BncXH6FujFJrWBtVlPOp5mUEvcNSJ1VRgaqU3OVFvMNYwE/y ZeD5TLxzkAZ1dUgfqNmAhsyYR5xwo1Bjlcm9KfkoD8dYQ6ps2DJKT+nwK15u1gNmAMCRQIEwY olnS4GrEbNmSSw4pPpcIJ3gCzVlRn4xOO2hnSgZd+d+BRwQ5eLV9+jC4K2WkvX+6P0ZakwZZd W3LDt3mNVfompTLtXv9BXAmhnUXdRMLDeu0zDM1yNnq/HHIz1+B1ctEuq3Xl3T095vJKK+KVw bnBNxqA7lyJxZWbLmiI/3iI2qCSnYHCssL3vHk416szbyfOmmeoQPU+9bNR2YhC82nTHJjqN0 vllYw5aD1/pGa0Z8zz2hBcbADTr9X26y/79viAFhsDhvagsL80MyLNsZ3EOpZjLMycyAJXLZw n+dd3ztdclNGFnH70zBqNp1KoiKp2ULwM/OkMjp85VWwEbpwWLtykO/qMc7ZqYsMnewXyaLXK tBsJ6N3D/mPNrpAin9Zo8/9dHC8PHAUgdvE5gijS+vEJRD+rx6BZaH0id8hZRJfGwO7vZ/y1x egbcpj/CNe0eSvaMvZsWpRMZDj6yKvON5lbLCDlcLwM0HJ0/3CsUsQ88czyjEaWg1IGgmTudC qGnktuNbCApHbmAg5YFtYl6A== X-Spam-Status: No, score=-13.5 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: --abmob-ce77eff0-b569-443c-bd2d-b0bdc3c23425 Content-Type: text/plain; charset=UTF-8 Dear all, the attached patch improves checking of array specs in two ways: - bad assumed size array spec - a bad first array element spec may already trigger an error, leading to a more consistent behavior Regtested on x86_64-pc-linux-gnu. OK for mainline? Thanks, Harald --abmob-ce77eff0-b569-443c-bd2d-b0bdc3c23425 Content-Type: text/x-patch Content-Disposition: attachment; filename=pr102180.diff Content-Transfer-Encoding: quoted-printable =46rom 06c1d0a96544640c7b1485fe977337ef1572ac91 Mon Sep 17 00:00:00 2001 From: Harald Anlauf Date: Sun, 11 Dec 2022 23:24:03 +0100 Subject: [PATCH] Fortran: improve checking of assumed size array spec [PR102180] gcc/fortran/ChangeLog: PR fortran/102180 * array.cc (match_array_element_spec): Add check for bad assumed-implied-spec. (gfc_match_array_spec): Reorder logic so that a first bad array element spec may trigger an error. gcc/testsuite/ChangeLog: PR fortran/102180 * gfortran.dg/pr102180.f90: New test. =2D-- gcc/fortran/array.cc | 12 ++++++++++-- gcc/testsuite/gfortran.dg/pr102180.f90 | 19 +++++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gfortran.dg/pr102180.f90 diff --git a/gcc/fortran/array.cc b/gcc/fortran/array.cc index bbdb5b392fc..9c1d55fa8cc 100644 =2D-- a/gcc/fortran/array.cc +++ b/gcc/fortran/array.cc @@ -488,6 +488,14 @@ match_array_element_spec (gfc_array_spec *as) return AS_ASSUMED_SIZE; } + /* F2018:R821: "assumed-implied-spec is [ lower-bound : ] *". */ + if (gfc_match (" : * ") =3D=3D MATCH_YES) + { + gfc_error ("A lower bound must precede colon in " + "assumed size array specification at %C"); + return AS_UNKNOWN; + } + if (gfc_match_char (':') =3D=3D MATCH_YES) return AS_DEFERRED; @@ -591,6 +599,8 @@ gfc_match_array_spec (gfc_array_spec **asp, bool match= _dim, bool match_codim) { as->rank++; current_type =3D match_array_element_spec (as); + if (current_type =3D=3D AS_UNKNOWN) + goto cleanup; /* Note that current_type =3D=3D AS_ASSUMED_SIZE for both assumed-s= ize and implied-shape specifications. If the rank is at least 2, we can @@ -600,8 +610,6 @@ gfc_match_array_spec (gfc_array_spec **asp, bool match= _dim, bool match_codim) if (as->rank =3D=3D 1) { - if (current_type =3D=3D AS_UNKNOWN) - goto cleanup; as->type =3D current_type; } else diff --git a/gcc/testsuite/gfortran.dg/pr102180.f90 b/gcc/testsuite/gfortr= an.dg/pr102180.f90 new file mode 100644 index 00000000000..cbf3e7299e7 =2D-- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr102180.f90 @@ -0,0 +1,19 @@ +! { dg-do compile } +! { dg-options "-fcoarray=3Dlib" } +! PR fortran/102180 - Improve checking of assumed size array spec + +subroutine s(x,y) + real :: x(0:*) ! legal + real :: y[0:*] ! legal +end + +subroutine t(x,y) + real :: x(:*) ! { dg-error "A lower bound must precede colon" } + real :: y[:*] ! { dg-error "A lower bound must precede colon" } +end + +subroutine u(x,y,z) + real :: x(2,*) + real :: y(2,2:*) + real :: z(2,:*) ! { dg-error "A lower bound must precede colon" } +end =2D- 2.35.3 --abmob-ce77eff0-b569-443c-bd2d-b0bdc3c23425--