From patchwork Tue Dec 7 20:43:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harald Anlauf X-Patchwork-Id: 48609 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id BF5BD3858435 for ; Tue, 7 Dec 2021 20:45:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BF5BD3858435 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1638909904; bh=QuXNd6QizL7WAWK7k3SlkpFLMBFcKd5TFBdRfjAoHp8=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=Ntfyq++H/K2B8yiAPXK6VcPVceWzQ3b0LfDGQe1eT+xfYqeKDaxw7MW/VlJTCLDiE sVKn8Vh/jBZstC+Ucwd+pRcm2yYVXI9mskC2Xy63zZRhPinzrVIWuehEC6JUMbF8FN o3s+t3L0aSizSf2TN3kVKdyim51XV7i0Fuo143e4= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) by sourceware.org (Postfix) with ESMTPS id 6EAF03858401; Tue, 7 Dec 2021 20:43:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 6EAF03858401 X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from [79.251.7.61] ([79.251.7.61]) by web-mail.gmx.net (3c-app-gmx-bap03.server.lan [172.19.172.73]) (via HTTP); Tue, 7 Dec 2021 21:43:44 +0100 MIME-Version: 1.0 Message-ID: To: fortran , gcc-patches Subject: [PATCH] PR fortran/103607 - [9/10/11/12 Regression] ICE in do_subscript, at fortran/frontend-passes.c:2927 Date: Tue, 7 Dec 2021 21:43:44 +0100 Importance: normal Sensitivity: Normal X-Priority: 3 X-Provags-ID: V03:K1:Q8WCBQ17QiTtsmq0adsTRdhJLmgPCnGVVGyNky4jCaTAYq5mZrYQlZyBwd9Erq1PvbpzU zd4C69HKMrZqeCovx7YJ4qd98Lcn67O3PAxpNrv9SJCZ38aGWvFVW4eNNVzoBRt6UfGMJBzT2/7g LWBMjolp73hy1XT1kzth3VR4EUfic2mksajgGYjvX9uNjNCoIi+uCjv2QWnocU529xTOLIY/LO4U /Mvd+ZnU0Ld33X15pNmdQSzGNFS6jwdmkdrX3Pc/o7KFM33LybFpJAczUfLW9ElpQ0eOqyjnI1CO rg= X-UI-Out-Filterresults: notjunk:1;V03:K0:A2Qy9XXFnZw=:SjKg2z4o1/v+vBL/MzYjfp dYGrrAT+G2uHBf9EcdR3evIv7yNSdDvn007dWeLD1eYQ2L5SFXL95UBxrXpmmrWVW6v0tdxC/ 9bMu2Sr0/hsQ6kRCoDErNyCJgb+98lhMahqhrht7ac6bKY/fRa1dyR3kdm6hZ8cnPSgWfh8BM RmeEBTyHOYGJnNxKkRbSK26CdHcQBtYnA4TGLxR6aGpnIu3Q4KP3HYcwhyOqJ1ZQrmxabSAlW gpiWa3g2ouhUQkFTUUrXcTicQ69m0/ivGaTB6a0r2S3/BsRuS1ZoVtZmUf8i+apQtnMZ9dNDd feg10ae4yZgstW+PwpNOUnt6kDqolhjUtz9pgScAV/qjG7vI1YbtvRVG92LB3mt2yk2eOHvmt u8G04I0TqLfiCedikdiTh6ivmJmqVFGKx/o0fLlL+1FatQTntYSIXlei081GQC6o/5esmqKIX HZMB6PAOEly66QkBhZwhbNM+dRCzy8NLuvqKyVMwRZAb1+kDGxM38VCW3Xr4DtKkM6ZNu6lYx CrZvVBH0YayvuLe1OxyM3001Cb2snSwCFq5W9S2bDagYK6U8qFCqV9x50gOJpCddqQpOV2TkJ vNn20WSMAVwt+gtWpIGcaNv4IveV6Oe3yQhZZs0uSNIEGvuJT86usTSRiwZ6mleMya05oIBO+ esoDkDQbI2DB52RYe/Tg01klN9iwVrS+kbLdiH+sDvoXyE0FRizNYpnZqCSYZYDvsQi9Dw/9v ZpBU/5iyRIyur7vMlw2mxk+lD//HTksfKYergU/mw3h1TnYrfDAFwjvRCH9aEq61i3SoXG31d ErA1bDe X-Spam-Status: No, score=-11.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, GIT_PATCH_0, KAM_NUMSUBJECT, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Harald Anlauf via Gcc-patches From: Harald Anlauf Reply-To: Harald Anlauf Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Dear all, frontend-passes.c(do_subscript) does a check on array subscripts which failed for the testcase in the PR where the array spec was foul: the upper bound finally resolves to a REAL instead of an INTEGER. (There is another related testcase by Gerhard). I haven't figured out yet how to kill or fix the array decl in that case. Nevertheless it makes sense to catch situations in do_subscript where we end up with illegal types of the bounds. This is trivially done by the attached patch. Regtested on x86_64-pc-linux-gnu. OK for mainline/backports? Thanks, Harald From 4ee6ec6681b76372d10d4e9e82ea037628b8b21b Mon Sep 17 00:00:00 2001 From: Harald Anlauf Date: Tue, 7 Dec 2021 21:34:31 +0100 Subject: [PATCH] Fortran: perform array subscript checks only for valid INTEGER bounds gcc/fortran/ChangeLog: PR fortran/103607 * frontend-passes.c (do_subscript): Ensure that array bounds are of type INTEGER before performing checks on array subscripts. gcc/testsuite/ChangeLog: PR fortran/103607 * gfortran.dg/pr103607.f90: New test. --- gcc/fortran/frontend-passes.c | 4 ++++ gcc/testsuite/gfortran.dg/pr103607.f90 | 12 ++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 gcc/testsuite/gfortran.dg/pr103607.f90 diff --git a/gcc/fortran/frontend-passes.c b/gcc/fortran/frontend-passes.c index 4764c834f4f..57b24a11cbe 100644 --- a/gcc/fortran/frontend-passes.c +++ b/gcc/fortran/frontend-passes.c @@ -2914,6 +2914,7 @@ do_subscript (gfc_expr **e) { if (ar->as->lower[i] && ar->as->lower[i]->expr_type == EXPR_CONSTANT + && ar->as->lower[i]->ts.type == BT_INTEGER && mpz_cmp (val, ar->as->lower[i]->value.integer) < 0) gfc_warning (warn, "Array reference at %L out of bounds " "(%ld < %ld) in loop beginning at %L", @@ -2923,6 +2924,7 @@ do_subscript (gfc_expr **e) if (ar->as->upper[i] && ar->as->upper[i]->expr_type == EXPR_CONSTANT + && ar->as->upper[i]->ts.type == BT_INTEGER && mpz_cmp (val, ar->as->upper[i]->value.integer) > 0) gfc_warning (warn, "Array reference at %L out of bounds " "(%ld > %ld) in loop beginning at %L", @@ -2938,6 +2940,7 @@ do_subscript (gfc_expr **e) { if (ar->as->lower[i] && ar->as->lower[i]->expr_type == EXPR_CONSTANT + && ar->as->lower[i]->ts.type == BT_INTEGER && mpz_cmp (val, ar->as->lower[i]->value.integer) < 0) gfc_warning (warn, "Array reference at %L out of bounds " "(%ld < %ld) in loop beginning at %L", @@ -2947,6 +2950,7 @@ do_subscript (gfc_expr **e) if (ar->as->upper[i] && ar->as->upper[i]->expr_type == EXPR_CONSTANT + && ar->as->upper[i]->ts.type == BT_INTEGER && mpz_cmp (val, ar->as->upper[i]->value.integer) > 0) gfc_warning (warn, "Array reference at %L out of bounds " "(%ld > %ld) in loop beginning at %L", diff --git a/gcc/testsuite/gfortran.dg/pr103607.f90 b/gcc/testsuite/gfortran.dg/pr103607.f90 new file mode 100644 index 00000000000..a6a2c4fdfd0 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr103607.f90 @@ -0,0 +1,12 @@ +! { dg-do compile } +! PR fortran/103607 - ICE in do_subscript, at fortran/frontend-passes.c:2927 +! Contributed by G.Steinmetz + +program p + integer :: i, x(abs(2.)) ! { dg-error "must be of INTEGER type" } + do i = 1, 2 + x(i) = 0 + end do +end + +! { dg-prune-output "must have constant shape" } -- 2.26.2