From patchwork Tue Nov 22 21:53:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harald Anlauf X-Patchwork-Id: 60990 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 29F883858284 for ; Tue, 22 Nov 2022 21:53:47 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 29F883858284 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1669154027; bh=47+HVGAl9SNs9UmKqKrtAxC8mH9GzLd+EfxBBZ3MY7s=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=k4dAP4Nlssn1+4GcpTcXL9zlnX6QyNgEeih8wvBEvaxMcHfKHqHWcdGV2xJdM8gtj ggpGjPrxMi64ixg5snZ0DOgEVWEBrm2Syuu+vCFiVA4jq9I6yCbv9CRmLHZ2sXB7eT 7XzobEQuCm6o6gdkJ46LLx0A63VqrrpsUvYjeRXA= 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.21]) by sourceware.org (Postfix) with ESMTPS id 407DE3858D35; Tue, 22 Nov 2022 21:53:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 407DE3858D35 X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from [93.207.84.96] ([93.207.84.96]) by web-mail.gmx.net (3c-app-gmx-bap12.server.lan [172.19.172.82]) (via HTTP); Tue, 22 Nov 2022 22:53:16 +0100 MIME-Version: 1.0 Message-ID: To: fortran , gcc-patches , kargl@gcc.gnu.org Subject: [PATCH] Fortran: error recovery on associate with bad selector [PR107577] Date: Tue, 22 Nov 2022 22:53:16 +0100 Importance: normal Sensitivity: Normal X-Priority: 3 X-Provags-ID: V03:K1:YgHW0JYHltAR61+cYnAHHUgnA1K+qX5maTTK6OqtPpACzYlCTx+qPUZncXxm5r1KCaTbB Xvfm279REAMPoUNGewWItBzrAHU/prbPYzGf1FQ0cKeq6TqQ3DGJfv+gRniUqPmeS9EgDGlfJ572 zFhQCHz7GU2SJOfNZU51WKpryLOdT6PkjRePMmFCue1GSBN61nfg/NrA7XNaB5Ei9oAcs8B3GiHE +aTD8GZoRiVK9raImpkCQaZ68pNf9+W0OO3H0tiKFgyZGvHks/vzi+Y6b8kVtHH3Le35x1Fa8eUx Fc= UI-OutboundReport: notjunk:1;M01:P0:q4wevWZfj7Y=;yuedQScLKb9khtpNsmr+Q+2oB97 vSlN/C4H64nmgojMXzx+zp0ix2Nv/jLhebrOzcPk/N5/knim8NBAv5/auvAY9D+S+C5yfvxBA j+R4g5NIC85hqq5+X998aU4IdQUnwDlBkBRjvESxZW5Mcu+7CpHH0XI35oMBIdQ8MGOrspBuO lr8onU7fTiX3bPFVeEUJ+GuUwJGbHwqzPdAN2tSB/+llKOOSug9wTAK1/EIfPnf1FeaOKaBum UzYJ4CKk5v30k6/Rd0g9sRpa8zsNXhjrdBEjTde6iQv6l4xY7YkduF2UA9RIdM8yKZ+UM9Pl3 yrwmRnXFFa6s6uPwwHQuhXejFJvzgqo9dw7Vc7QhJpjCq5lO+vwTvj1fV4mz17Us/sbnPJlIC AABEiBeonuQW2XvNnTSVrI0nNp0lJf5H2RPj8eAtcZJpOv4K4+8IVspL+r+QCfvGw8aQL8uEH CuAs92VlZvOaU0jF54OhOlCqgUXTsHAkeGfMB8z6OC+UikNA1ky1Arm0tCUJExw3K5EFHn4PR doHddsmlKheX7xtIsZ1soCGUW4o3ynD/13BLTjQDBkcifItGyWY5YRzcatiTWkFVQpYUrOVg3 hhUVLL1oHXvMFmTNAgKj8Lp49BhMMRYrW+UU5A43QBomwHEgFqTs46JqrR7Lp78AaEMD5H0CC D6io4IrQhfTQeNVvKIyxvdktLeMYFbyf3nCP2c3JhgSsx7Hmc+OW4aVZW4g4j8q+xMlJ2SNIX jgTPihudBkWofEKXtfHZLAWzwrOnHrXCvA5hS1Gi7wdlzouAruF/UOw3u+vqXucJOaMv3hi/C ObYdZERfve9p7Tg7bqnlb1azsoZLhyApdebjbkv7aIVi4= X-Spam-Status: No, score=-12.4 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 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, please find attached an obvious patch by Steve for a technical regression that resulted from improvements in error recovery of bad uses of associate. Regtested on x86_64-pc-linux-gnu. Will commit soon unless there are comments. As a sidenote: the testcase shows that we resolve the associate names quite often, likely more often than necessary, resulting in many error messages produced for the same line of code. In the present case, each use of the bad name produces two errors, one where it is used, and one at the associate statement. That is probably not helpful for the user. Thanks, Harald From 9ff8d2ec56d139b54e2f66f747142687a38d2106 Mon Sep 17 00:00:00 2001 From: Steve Kargl Date: Tue, 22 Nov 2022 22:31:51 +0100 Subject: [PATCH] Fortran: error recovery on associate with bad selector [PR107577] gcc/fortran/ChangeLog: PR fortran/107577 * resolve.cc (find_array_spec): Choose appropriate locus either of bad array reference or of non-array entity in error message. gcc/testsuite/ChangeLog: PR fortran/107577 * gfortran.dg/pr107577.f90: New test. --- gcc/fortran/resolve.cc | 3 ++- gcc/testsuite/gfortran.dg/pr107577.f90 | 13 +++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gfortran.dg/pr107577.f90 diff --git a/gcc/fortran/resolve.cc b/gcc/fortran/resolve.cc index 24e5aa03556..3396c6ce4a7 100644 --- a/gcc/fortran/resolve.cc +++ b/gcc/fortran/resolve.cc @@ -5005,8 +5005,9 @@ find_array_spec (gfc_expr *e) case REF_ARRAY: if (as == NULL) { + locus loc = ref->u.ar.where.lb ? ref->u.ar.where : e->where; gfc_error ("Invalid array reference of a non-array entity at %L", - &ref->u.ar.where); + &loc); return false; } diff --git a/gcc/testsuite/gfortran.dg/pr107577.f90 b/gcc/testsuite/gfortran.dg/pr107577.f90 new file mode 100644 index 00000000000..94e6620a0ee --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr107577.f90 @@ -0,0 +1,13 @@ +! { dg-do compile } +! PR fortran/107577 - ICE in find_array_spec +! Contributed by G.Steinmetz + +program p + implicit none + associate (y => f(4)) ! { dg-error "has no IMPLICIT type" } + if (lbound (y, 1) /= 1) stop 1 ! { dg-error "Invalid array reference" } + if (y(1) /= 1) stop 2 ! { dg-error "Invalid array reference" } + end associate +end + +! { dg-error "has no type" " " { target *-*-* } 7 } -- 2.35.3