From patchwork Thu Dec 22 21:13:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harald Anlauf X-Patchwork-Id: 62293 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 D2D2F3854178 for ; Thu, 22 Dec 2022 21:13:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D2D2F3854178 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1671743613; bh=Gi6Qvz64eMVQLwoiylX5EkAcX/eJl+5OqWq26KwHAy4=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=hYmAbpsZJxqjShB+YyLlAYo7jih2cyOx8qfeCcrQAVmMtwUf/bHlmA5qcRq8E3EF4 Lu/5ZNgnPvS15k1+r6Hd72H+Zt/23eAcFydvFc3tNC3QfRoGLmHq71wU9HmnjHINzW rD6pLgZcSH/qtvjKNYJpmR4jrbC93UF1BdBIPOuo= 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 08ECD3858D1E; Thu, 22 Dec 2022 21:13:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 08ECD3858D1E X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from [93.207.82.36] ([93.207.82.36]) by web-mail.gmx.net (3c-app-gmx-bap55.server.lan [172.19.172.125]) (via HTTP); Thu, 22 Dec 2022 22:13:04 +0100 MIME-Version: 1.0 Message-ID: To: fortran , gcc-patches Subject: [PATCH] Fortran: check for invalid uses of statement functions arguments [PR69604] Date: Thu, 22 Dec 2022 22:13:04 +0100 Importance: normal Sensitivity: Normal X-Priority: 3 X-Provags-ID: V03:K1:T2zrMgZInQ2DDbJNfOR7YxKcfdEszGU6T6WBgFhDb4vwDg8M2QNkUF4jbDC3REemv1su2 cKFCbBdo1M2rWX2BH3I4UFnuZBzujImMr3kqWZXifloO+x/1CmBFDLmzjNmAn0lfqxCMOZaRAQV+ C/lSINQxu/mzPHOI/xQW+3//66/6h7DMgvtfO7MzXPbuGZ7cPBxf8iepGOszvITYsSxT5qTUTyGY WIVJ3yjOCafR+gcLQwC+uTs6otbo6vHTX8fWVNw2CP7voyh++pCbpOVFwBxcQc7YcVSu/hEHfUcy vw= UI-OutboundReport: notjunk:1;M01:P0:PBM7lzR6y8s=;yKnrT1mTdVUVGlTc6cjOBWrC5gp /lp1wQNJ31Hdr5Epa7dHwrleORLfn/ICaAVd/Fat/T6lKq+7Oi1aqHAafJ3ulp1lzE/omatt2 2m4QRbWYqehtkUMU6TV8RYd1/DRwvw+ypup7JnkU2qiHXDjcMrNjl8EAQxU/GkSGPmhdKr7kM FIrWqyL1adBrgoVAZ35O8UT+sBJzYB0n7+8w/Ctsh7Tv/1cfSK/KVo39L54DQwnt/9BRX797E rg7YTTx05I4c6y/PTlNUUrrYLmhF0QsLb1V+ERV+VK96cIXiKnjrWXhV3UP7tNcUNXtL2CpY4 2dtJmWdDvdLuMTHKXAfdodQFT9Ttz5W3xRHD37BVttBeGMaxICENoP/R0FzKv2rOQKl1p06Bz PJ0HLbcMyKAeS01bTz75cy+Jd2WM19fwtFWBl1T5hzOXlLh5M89yb4L3KjWKZGjFsZu/FLsc2 ijKMY+8Riq/c9mGd8GafUR7LVW7f+9y2xCcoAgXHPbPxFc01vQVAU4+in/Ovfpjv4dcreXZd8 yjAcqdi7vvTVJRwzW3QvI1sg6gmSRzgYi+p2rL8jKk3Z2RFkk3A2EoywZFBEVPFSU0MX2njuZ g9W2tp3bI+QCw8Wa37LfRGMJH+3ttLjK6IXRgGFnROLrrSo2rKCMItL11ODtNxh79vYQoBl74 aZjNyanc+gYIn3cKnHs0Z+EDBYFhgG8xLXBmc29fQcRHh6cVy3N/TfxwFbOiM4470er9DjpZc ItZAX6ky1kAxTtTg2BAmgqMAfFlRAYEkNzcN2iDyxq+GnwPHptqfmYbwOm9h2HXT02oR60U5+ fIy5ed9rYxdmHifTfaAG7cNg== X-Spam-Status: No, score=-13.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, the attached patch adds a check for statement function bodies for invalid uses of dummy arguments. This fixes an ICE-on invalid. Regtested on x86_64-pc-linux-gnu. OK for mainline? Thanks, Harald From 794af0d00b7086c9f0493f3a1aaac644e1fd50f6 Mon Sep 17 00:00:00 2001 From: Harald Anlauf Date: Thu, 22 Dec 2022 22:03:31 +0100 Subject: [PATCH] Fortran: check for invalid uses of statement functions arguments [PR69604] gcc/fortran/ChangeLog: PR fortran/69604 * match.cc (chk_stmt_fcn_body): New function. Check for invalid uses of statement functions arguments. (gfc_match_st_function): Use above. gcc/testsuite/ChangeLog: PR fortran/69604 * gfortran.dg/statement_function_4.f90: New test. --- gcc/fortran/match.cc | 27 +++++++++++++++++++ .../gfortran.dg/statement_function_4.f90 | 10 +++++++ 2 files changed, 37 insertions(+) create mode 100644 gcc/testsuite/gfortran.dg/statement_function_4.f90 diff --git a/gcc/fortran/match.cc b/gcc/fortran/match.cc index 89fb115c0f6..3d346788416 100644 --- a/gcc/fortran/match.cc +++ b/gcc/fortran/match.cc @@ -5915,6 +5915,30 @@ recursive_stmt_fcn (gfc_expr *e, gfc_symbol *sym) } +/* Check for invalid uses of statement function dummy arguments in body. */ + +static bool +chk_stmt_fcn_body (gfc_expr *e, gfc_symbol *sym, int *f ATTRIBUTE_UNUSED) +{ + gfc_formal_arglist *formal; + + if (e == NULL || e->symtree == NULL || e->expr_type != EXPR_FUNCTION) + return false; + + for (formal = sym->formal; formal; formal = formal->next) + { + if (formal->sym == e->symtree->n.sym) + { + gfc_error ("Invalid use of statement function argument at %L", + &e->where); + return true; + } + } + + return false; +} + + /* Match a statement function declaration. It is so easy to match non-statement function statements with a MATCH_ERROR as opposed to MATCH_NO that we suppress error message in most cases. */ @@ -5983,6 +6007,9 @@ gfc_match_st_function (void) return MATCH_ERROR; } + if (gfc_traverse_expr (expr, sym, chk_stmt_fcn_body, 0)) + return MATCH_ERROR; + sym->value = expr; if ((gfc_current_state () == COMP_FUNCTION diff --git a/gcc/testsuite/gfortran.dg/statement_function_4.f90 b/gcc/testsuite/gfortran.dg/statement_function_4.f90 new file mode 100644 index 00000000000..6ce5951b53a --- /dev/null +++ b/gcc/testsuite/gfortran.dg/statement_function_4.f90 @@ -0,0 +1,10 @@ +! { dg-do compile } +! PR fortran/69604 +! Contributed by G.Steinmetz + +program p + x(n) = 1 + n(2.0) ! { dg-error "Invalid use of statement function argument" } + y(k) = k() ! { dg-error "Invalid use of statement function argument" } + z(m) = m ! { dg-warning "Statement function" } + print *, x(n) +end -- 2.35.3