From patchwork Tue Aug 13 13:15:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Vehreschild X-Patchwork-Id: 1971969 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=gmx.de header.i=vehre@gmx.de header.a=rsa-sha256 header.s=s31663417 header.b=CBrHP+4E; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WjsMp4Psyz1yZl for ; Tue, 13 Aug 2024 23:16:05 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 9F4283858404 for ; Tue, 13 Aug 2024 13:16:03 +0000 (GMT) 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 144703858D20; Tue, 13 Aug 2024 13:15:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 144703858D20 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=gmx.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmx.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 144703858D20 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=212.227.17.20 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1723554941; cv=none; b=hV8GzpFA0pa7X96uTLOL9AXvb9SzKmt1ivXfXp1w0papi3yEISqgJc+LIrVPvYK7r68uu+sy6lP15JCGjMQCvOAoh5jt8zp650q3VttO/UuCZNJr/qdkls/ACtWDBYtXJTJhXoF+SudRwfhu/xrniw5Uee6+IgRbuj3oC9WBvo4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1723554941; c=relaxed/simple; bh=6qRALMYqfJPuZOm1SEEeTpYk8iZWOUPCqmdM6eHRrp4=; h=DKIM-Signature:Date:From:To:Subject:Message-ID:MIME-Version; b=PhrYofZ6B9gAxo/S/Sv3HXEPWiCBSHSTKaU4up2cL5SkuzDi9qD3x6lmLCKcF46Igg0kxZPRipeHFEt8zvPmlFPIhB/f0O2DrJmEn7bcRXGz7nXC0DLfyIf4lScrv2Z1Bf4/HM5z57y3vC0KJKOq4GQ6KCXGYZIiApW6jhvMeKg= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmx.de; s=s31663417; t=1723554927; x=1724159727; i=vehre@gmx.de; bh=pCH8vYw750eWAgfOUkXm0Z3QvLx/veuLFYUsiXafOqE=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:Message-ID: MIME-Version:Content-Type:cc:content-transfer-encoding: content-type:date:from:message-id:mime-version:reply-to:subject: to; b=CBrHP+4EwDyrlIvcUfcJGtxBIkWK2oFKwm9tg9MRO3VrvhMsIATy4rGMcfFncnCX /HC/vWdEUshV7msPmtv3PiXCNfHRS79vP1x2shVvUNnaUMJA69A/V1ft2OKFryVkY l+qqgA5LmYFOQ2XoSSv7SzorVsvQ4YMIZuHwZWsmbA3hK7xvjMlyOlm720Mx0davP FBbwEw7XQBHdauHyK+jf8YhWRaPnPqZln/990p0wjuU8/CxgMbkOwBfS2Hpw6fUs1 IWSieWRoddKiP8vmNoiqQE7F0QlC3pEz+31Er+zAuKFs1PocmDIp/xAeScfQ7xPJn 2Bg2I9I4nXzgqfWuTw== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from vepi2 ([79.194.172.234]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1Mlf4c-1rvUGD0hOc-00jmJQ; Tue, 13 Aug 2024 15:15:27 +0200 Date: Tue, 13 Aug 2024 15:15:22 +0200 From: Andre Vehreschild To: GCC-Patches-ML , GCC-Fortran-ML Cc: Harald Anlauf , Anlauf Subject: [Fortran, Patch, PR102973, v1] Reset flag for parsing proc_ptrs in associate in error case Message-ID: <20240813151522.482751b8@vepi2> X-Mailer: Claws Mail 4.3.0 (GTK 3.24.43; x86_64-redhat-linux-gnu) MIME-Version: 1.0 X-Provags-ID: V03:K1:i0uIr/mbenQE3/SFReSN72KpeDkkQhDYbAhFWR92wVGKuhC8o2q 8wn+sRcyzhxQHMo2PUmL4dya9riwLWK7LvS+GnhMJo9zBKvdBFpLoJ5EXNYdxJ0yH+I9+dy cranuXvhqCqV0kY7rCsfqkhPRl/N+KVqOhwBthcPlOfeelflnM+DfexMOLp4Shhel4k5Xgk nqsB1ukekUQXld+5StQgg== UI-OutboundReport: notjunk:1;M01:P0:6NzFpwwr5io=;pwMnZLn+bWSI1bPE+e9ikg5C8Cu 2EnYuvVreId4bBRUpcikgXHvD2Fka098k6dLE3KB4XfSGYctAgAp+IQZbK8ghJP0egkHH/Wcx L93v6oGomD6egIYY5UpVY1xh4p0yNDDZs6FFckI+7bwoXkAL7Pz9QYvKDeCAQ699v6VveTJsr 9VMwURQwE9GeveMwIEzGJGaMKMxLsRHDMst/FvEvB1SSBQvz6Vc4QN6DGScPFrwJ3+u02ienm 6cF6O9kmjD/lvj6u0br/0rZCo+goO4roY1P6geMr2Xfa+zsWN9SkMzdx8oOyRyf/nGLGSzmtm mRwl52itsLuJl10VQsza0CSI/RFsUcLRQ3MOjDk8peppVZ+A+9jQMs7y/rKta5EZcrHRGSy6I ZQpAf16ied5IF0nQADrbkQUqdZ9FRIpsM1VuVLQx3EAokt0T+QNyXYwHcmflH0zEo8yUTinzp F8HXCRgbL2uIS41+dDl58aO0ylaeRJY2n6cofiw29TVbGgs0STG8FjV8jh8lMZ59LS+/HfkLn SgAbDhnohuKPdD3ACA/JeMdNQ51t/zULd9hEGGd4SaoPpSX9TVSrGHeaZd7myAXvH8nfi6Bwx sm3JL0y34NxInIiaEfDKvoOIlq9gNf+qCDeR7L7v7yaH2MgKMWkcpHRtiKqRi/lXFugiKktcv aLqoUYRKkt6axev4r+9Vi4guIvA334U7vkpiY82C1npwB8Tkf+fK06kfY4nzHK4GEX2jVGQ8x y34ODTEjjgLcYdDYumY7klpLHHvLI9qkgNftAwBsjYjlLXiwEFmAQNVw2/qrBKdpWgg1hV47d VxACv2G51GUhg53vIMXDwEeg== X-Spam-Status: No, score=-11.7 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_H3, 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.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org Hi all, attached patch is the last one the meta-bug 87477 ASSOCIATE depends on. The resolution was already given in the PR, so I just beautified it and made patch for it. I tried to come up with a testcase as well as Harald has, but had no luck with it. I see less harm in reseting the flag in the error case than not to do it. Regtests ok on x86_64-pc-linux-gnu / Fedora 39. Ok for mainline? Regards, Andre --- Andre Vehreschild * Email: vehre ad gmx dot de From 02e96672b2c9891ade40497298e2c69652e3d321 Mon Sep 17 00:00:00 2001 From: Andre Vehreschild Date: Tue, 13 Aug 2024 15:06:56 +0200 Subject: [PATCH] [Fortran] Prevent future proc_ptr parsing issues in associate [PR102973] A global variable is set when proc_ptr parsing in an associate is expected. In the case of an error, that flag was not reset, which is fixed now. gcc/fortran/ChangeLog: PR fortran/102973 * match.cc (gfc_match_associate): Reset proc_ptr parsing flag on error. --- gcc/fortran/match.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/gcc/fortran/match.cc b/gcc/fortran/match.cc index 4acdb146439..d30a98f48fa 100644 --- a/gcc/fortran/match.cc +++ b/gcc/fortran/match.cc @@ -1932,6 +1932,7 @@ gfc_match_associate (void) gfc_matching_procptr_assignment = 1; if (gfc_match (" %e", &newAssoc->target) != MATCH_YES) { + gfc_matching_procptr_assignment = 0; gfc_error ("Invalid association target at %C"); goto assocListError; } -- 2.46.0