From patchwork Thu Jun 1 19:05:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harald Anlauf X-Patchwork-Id: 70471 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 374F63856600 for ; Thu, 1 Jun 2023 19:05:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 374F63856600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1685646351; bh=JPBx8Y7a/4E6jkcSlUap1REQCt1oQEkcm5Ur+p2Gyec=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=sp/R40SSG4h0DaSlwMziRxRaP3qd9XmcVF4UGvP/Y1+8SQ+eOT5iZku6x3/KFdsD1 452Q0QJ6I5U+7JMKjpbaCwO2OhTd7H/e6lD+NGzJVK6yuHa2ZR/cnO/oUwrLQsBP4F hgdhLfhfeVn3SFjes34NzYzsOA7p4Zsbf1eB4QGc= 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 BDD2D3857031; Thu, 1 Jun 2023 19:05:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org BDD2D3857031 X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from [79.251.3.90] ([79.251.3.90]) by web-mail.gmx.net (3c-app-gmx-bap24.server.lan [172.19.172.94]) (via HTTP); Thu, 1 Jun 2023 21:05:10 +0200 MIME-Version: 1.0 Message-ID: To: fortran , gcc-patches Subject: [PATCH] Fortran: force error on bad KIND specifier [PR88552] Date: Thu, 1 Jun 2023 21:05:10 +0200 Importance: normal Sensitivity: Normal X-Priority: 3 X-Provags-ID: V03:K1:yWbl3+0jyPegu6tYOkuq4OEgyBbgvVgLhdMO6RsvTLun0SeMCyw613oL/1Gzxvy+R71uQ bvKQuYg3k+RAbqgbqfG9FymDNsgrDP7dS+U2Gj+WTw3Z2YjtaH4uEMEjdqoDg6/CmkjwS3I3ggRp Lr++V6ddINelKeWF0vOgJ2mhnIhSSa7gkMkyqAeva3S+FKwykO+pT32xBZuBKuXyJT+3BC+jI3uE hcDC92KCkbxmlrzUxabO/L7hDa6dIhpfNzAgQ8Yx1L9rWlH9zebMDOU+jBM4soDQulEgZKonhDGw lA= UI-OutboundReport: notjunk:1;M01:P0:Vj3z5Vz3EwM=;9yX27toha8Rk1ni1feaqDPtFUxV Aq1ZDyLIWlSxjOjphJLzzQH6ChNHf6/2zZ66+ki09v6rLnU85vLngNWtSxHlYyNF4LzThCA/F RoOZTc2l4QQpsuYikqKp2upoeLsgNBeCN/mQTnt98hvf3gKRTme5selPOfPlQ7Qo0JaqVuW3F GGKlTWaVkAcp3NeE9uRXDphHMrygnd/ZrW5w0cZVK01u/nz1jJTw27LuVV3qrx1TMbykTwHZE /XemFNVg7xYSF4CtgnKoTYLo04OiwJu2h++BefNPawME65Ir8fWt4pqITWz5CDSIjvLCqAsdv IhCA2V4VoLbaRDrkU2jPV7694A2dEmb5p4xvJSV9l0LTD+l26iY6u7LvQYQK++4ybKX9TD6P6 dHnJKbp54IjOhw/dD7gJ9sdJjyA3/IgRpJqNIfRV0671KU0d7okVoETb5/H3EuXQb5J/0Jlxm 30z3UIHgLrZRKjVM6xMbSSv81+E9+EXzfide+yu4Q4w5XZSBFvKmp+a2VZi54rtp544WfcQW9 EoBxXNTGneR4qJdlOGlIrrYeLAnCE4g7g9d0BsXNf1/eWku5kEp3z/e1SO6W5GJUfu9tuRhQe 5Us0Mg0rlicTxAyA41V5ap7cJGidcKHOq3K2CSn2+2Y7vdppLDWe+4CVtdzhyJuU7IQb53my6 3ZSDR32lZH7qpjaXWiwSJazj69IocboJock6FhQkkDruZHYUOsP+b+MCpMjlvAymkObo5l18u b4lPjORMJX0W7JAlRir6XGtShg+CwziwnXwvb+c4aYi2SfwdF7hxO0edF6lJV9hn7RjYYlKto lAHusHQl1UNt+iQZO5QT0TjHNShA8nK1BFZ7O5Z2EeM2A= X-Spam-Status: No, score=-12.8 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_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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, we sometimes silently accept wrong declarations with unbalanced parentheses, as the PR and testcases therein show. It appears that the fix is obvious: use the existing error paths in gfc_match_kind_spec and error return from gfc_match_decl_type_spec. I'm still posting it here in case I have missed something not so obvious. The patch regtests cleanly on x86_64-pc-linux-gnu. OK for mainline? Thanks, Harald From a30ff5af130c4d33c086fd136978d5f49cb8bde4 Mon Sep 17 00:00:00 2001 From: Harald Anlauf Date: Thu, 1 Jun 2023 20:56:11 +0200 Subject: [PATCH] Fortran: force error on bad KIND specifier [PR88552] gcc/fortran/ChangeLog: PR fortran/88552 * decl.cc (gfc_match_kind_spec): Use error path on missing right parenthesis. (gfc_match_decl_type_spec): Use error return when an error occurred during matching a KIND specifier. gcc/testsuite/ChangeLog: PR fortran/88552 * gfortran.dg/pr88552.f90: New test. --- gcc/fortran/decl.cc | 4 ++++ gcc/testsuite/gfortran.dg/pr88552.f90 | 6 ++++++ 2 files changed, 10 insertions(+) create mode 100644 gcc/testsuite/gfortran.dg/pr88552.f90 diff --git a/gcc/fortran/decl.cc b/gcc/fortran/decl.cc index 1de2b231242..deb20647fb9 100644 --- a/gcc/fortran/decl.cc +++ b/gcc/fortran/decl.cc @@ -3366,6 +3366,7 @@ close_brackets: else gfc_error ("Missing right parenthesis at %C"); m = MATCH_ERROR; + goto no_match; } else /* All tests passed. */ @@ -4716,6 +4717,9 @@ get_kind: return MATCH_ERROR; } + if (m == MATCH_ERROR) + return MATCH_ERROR; + /* Defer association of the KIND expression of function results until after USE and IMPORT statements. */ if ((gfc_current_state () == COMP_NONE && gfc_error_flag_test ()) diff --git a/gcc/testsuite/gfortran.dg/pr88552.f90 b/gcc/testsuite/gfortran.dg/pr88552.f90 new file mode 100644 index 00000000000..15e1b372f8f --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr88552.f90 @@ -0,0 +1,6 @@ +! { dg-do compile } +! PR fortran/88552 +! Contributed by G.Steinmetz + +integer(len((c)) :: n ! { dg-error "must be CHARACTER" } +end -- 2.35.3