From patchwork Wed Jun 29 19:54:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harald Anlauf X-Patchwork-Id: 55541 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 C40813841458 for ; Wed, 29 Jun 2022 19:54:54 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C40813841458 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1656532494; bh=wwt8zj9h3aVEJoELWjOcQ+nF0f0nv46sI8pfzg0Rc54=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=qy/+iVUxLZdUo4UZNfUpSw4BeI6u7DBxuBHet+UKJUpzYUmMhNL2aC9Dk2b7OkftF cI9wvSAnzEIirR2pdE/o9oyWJ3yHE+pCQazBw39WEdCseMUxHIkPadXGLiZGc804RN JM0/qm4eIhg5c3trWLAJmf18WgUEeJPBJuErogqg= 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.22]) by sourceware.org (Postfix) with ESMTPS id 6AD44386F0F5; Wed, 29 Jun 2022 19:54:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 6AD44386F0F5 X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from [79.251.11.108] ([79.251.11.108]) by web-mail.gmx.net (3c-app-gmx-bs60.server.lan [172.19.170.144]) (via HTTP); Wed, 29 Jun 2022 21:54:06 +0200 MIME-Version: 1.0 Message-ID: To: fortran , gcc-patches Subject: [PATCH] Fortran: error recovery on invalid CLASS(), PARAMETER declarations [PR105243] Date: Wed, 29 Jun 2022 21:54:06 +0200 Importance: normal Sensitivity: Normal X-Priority: 3 X-Provags-ID: V03:K1:vFzLWRuGYciregOJNWwo7FknliEx7ahxLy3qxDy0WAiVqbFRlQ9nKzDP+uuPCBYMM1A// 1+jrUkZts32BFO0lY3liGPFt/ArxITAFljXSDPgyl3iyVOrqz5WhIuRYaUCibM9sH+dDAeCs7T7T NquWWJaQ1kKtCIjSxjHaLMVYnCpL2XYikj5pmD/SuHC16QVFdP71tynbwhDZUe8KAwCZzT0l3TDy OPAmEvQugazV2kIFXp5cnyxAk5jJeXWZ8Cg705Zz+ABU45jjYuSDG8eXsYYUTFow8Lvk+0Ejm3An 3Q= X-UI-Out-Filterresults: notjunk:1;V03:K0:DEh2Uqnpe8c=:IsQwmJ8UlO51VdUGWlVUoc 0p52fDlVYs6corsCBK7ghdXEikbxuNETVShss+VqP3V+aRarTvsQYgg9Yzvad7JIDszWyR1Ba 6xOU1NK2HHH6S3VSYt4mbmUtXQcnrmX9r38U42i+iHwn77j/QFZMnZ6/qNUngyahMtVcgbLQe 4vUEyHT5qw4gzC7nKt1AOI1GGdBpRA+DACylIT5qaVb8yhrrwUAGFJuFGpqeNudaRak5/z3yM GHH99w+Yrz298fqa1PeMvVnDXlEyZqDxb8IroxIOK3UWzSTHHsTFp42CB4kDagwEc7Jmu+bx/ LHBHTwW6ShIlDpsmkR6tN/W1fplRFLLlyv4hfiXsU0/yyz+SZfXxUEsII6P/68zNSzeGRx8Dm /RvyJ0j6HHEbr2q3E76LnmFQ3zdJWmBkh4+gjNcCQgDAOPdXc/lUMNY5xr+kZ8EGl4XirWsZe 6RZq8Mn3O2vLcTbwIraNgYH+LOGUxfE5EPb5wpIlrRxasNzLlr7mpkkKNTLnPtlKaEE1uPVQC fH4906ekLm2nCJbSYAOUqwOhN805Uo6OI56wmlcyQlBtsziMcBmeFflVVsSynNadXpTvFfLqL 9P+U+g8BIRZHdXILJRKdafqFcnWHJFaWXwlWFbu1tBoTTk8LvDDmG2iDImB+Sq9JKieYz4eST W2iupwRmOPK0XdbEz+ZKBmCxvsqwTOnbp7p1APksTzpb/JeR07RfAGQD0JaApFoQj1sAHnSVv 43k1hMaXB4adxP1/vxWtwfNLb+P88Ta2Wr7zrsLV+daZ0CZmo4AOMRm/vM0c8zW/P1mTKrCj9 R5zVlCw X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, 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, a CLASS entity cannot have the PARAMETER attribute. This is detected in some situations, but in others we ICE because we never reach the existing check. Adding a similar check when handling the declaration improves error recovery. The initial patch is by Steve. I adjusted and moved it slightly so that it also handles CLASS(*) (unlimited polymorphic) at the same time. Regtested on x86_64-pc-linux-gnu. OK for mainline? This patch actually addresses multiple PRs, some of which are marked as regressions. As I consider the patch safe, I would like to backport to open branches as far as it seems appropriate. Thanks, Harald From e0d5aeadd218f21e450db6601956691293210156 Mon Sep 17 00:00:00 2001 From: Harald Anlauf Date: Wed, 29 Jun 2022 21:36:17 +0200 Subject: [PATCH] Fortran: error recovery on invalid CLASS(), PARAMETER declarations [PR105243] gcc/fortran/ChangeLog: PR fortran/103137 PR fortran/103138 PR fortran/103693 PR fortran/105243 * decl.cc (gfc_match_data_decl): Reject CLASS entity declaration when it is given the PARAMETER attribute. gcc/testsuite/ChangeLog: PR fortran/103137 PR fortran/103138 PR fortran/103693 PR fortran/105243 * gfortran.dg/class_58.f90: Fix test. * gfortran.dg/class_73.f90: New test. --- gcc/fortran/decl.cc | 8 ++++++++ gcc/testsuite/gfortran.dg/class_58.f90 | 2 +- gcc/testsuite/gfortran.dg/class_73.f90 | 17 +++++++++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gfortran.dg/class_73.f90 diff --git a/gcc/fortran/decl.cc b/gcc/fortran/decl.cc index 26ff54d4684..339f8b15035 100644 --- a/gcc/fortran/decl.cc +++ b/gcc/fortran/decl.cc @@ -6262,6 +6262,14 @@ gfc_match_data_decl (void) goto cleanup; } + /* F2018:C708. */ + if (current_ts.type == BT_CLASS && current_attr.flavor == FL_PARAMETER) + { + gfc_error ("CLASS entity at %C cannot have the PARAMETER attribute"); + m = MATCH_ERROR; + goto cleanup; + } + if (current_ts.type == BT_CLASS && current_ts.u.derived->attr.unlimited_polymorphic) goto ok; diff --git a/gcc/testsuite/gfortran.dg/class_58.f90 b/gcc/testsuite/gfortran.dg/class_58.f90 index 20b601a2f51..fceb575432d 100644 --- a/gcc/testsuite/gfortran.dg/class_58.f90 +++ b/gcc/testsuite/gfortran.dg/class_58.f90 @@ -9,5 +9,5 @@ subroutine s end type class(t), parameter :: x = t() ! { dg-error "cannot have the PARAMETER attribute" } class(t), parameter :: y = x ! { dg-error "cannot have the PARAMETER attribute" } - class(t) :: z = x ! { dg-error "must be dummy, allocatable or pointer" } + class(t) :: z = t() ! { dg-error "must be dummy, allocatable or pointer" } end diff --git a/gcc/testsuite/gfortran.dg/class_73.f90 b/gcc/testsuite/gfortran.dg/class_73.f90 new file mode 100644 index 00000000000..c11ee38c086 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/class_73.f90 @@ -0,0 +1,17 @@ +! { dg-do compile } +! Error recovery on invalid CLASS(), PARAMETER declarations +! PR fortran/103137 +! PR fortran/103138 +! PR fortran/103693 +! PR fortran/105243 +! Contributed by G.Steinmetz + +program p + type t + character(3) :: c = '(a)' + end type + class(t), parameter :: x = 1. ! { dg-error "PARAMETER attribute" } + class(*), parameter :: y = t() ! { dg-error "PARAMETER attribute" } + class(*), parameter :: z = 1 ! { dg-error "PARAMETER attribute" } + print x%c ! { dg-error "Syntax error" } +end -- 2.35.3