From patchwork Thu Dec 8 21:59:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harald Anlauf X-Patchwork-Id: 61711 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 BC95938533E0 for ; Thu, 8 Dec 2022 22:00:16 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BC95938533E0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1670536816; bh=e2zuSEJWvRPfc/JXpVZf0naJ62/uORTXtEDO0GodJzo=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=fcJ8mnO10XK1u4mC2Cgzjr1VSWw9FxywzbOlB4Az9MBX/7yW8oRVa960JlT4lfuIN JdvIEqBf3vEbjQ8D2DnmCeG16F4JvdWKN7M88d+OGCbI7CS/BvkFzs8ADo8ZRMI0US 7jbkwR4NRWA32MYJWvWAkuotMVvKAuIbwSNWJOFs= 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 7E3B43A097F2; Thu, 8 Dec 2022 21:59:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 7E3B43A097F2 X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from [93.207.90.194] ([93.207.90.194]) by web-mail.gmx.net (3c-app-gmx-bap18.server.lan [172.19.172.88]) (via HTTP); Thu, 8 Dec 2022 22:59:42 +0100 MIME-Version: 1.0 Message-ID: To: fortran , gcc-patches Subject: [PATCH] Fortran: diagnose and reject duplicate CONTIGUOUS attribute [PR108025] Date: Thu, 8 Dec 2022 22:59:42 +0100 Importance: normal Sensitivity: Normal X-Priority: 3 X-Provags-ID: V03:K1:QocFlgYT2u4Lu6u/bgv3uv87Os0lKrUMKpWx6AngVGStR1Yu1+ARE9ksjxtRhpjNoO4Sv WY0T+gRMz2DpKP28Wj2zdxzkpr69razIYnMQSRz9R2FRecVsiLsoCBmUyy4M5JQYesdWl310xY1j xdG1loauqtPJ1SIG2UemaqOtl3kHKxjyqvO6XL3RvnaZ7oGGXuXTmRTxsS9LWNmpbwW/6gpNGwlG nR+erZUi4xN46IWevVm8DmTIMpsJa/+PiKpVIxjWm5jNu5YakvRNnP41DG+jeP5yFCAF+4p05Qm+ Xk= UI-OutboundReport: notjunk:1;M01:P0:LEZH9ZagwcM=;bpg/KkRFyFShWUQmaeST9ZSRRXN DTyO5b5L9WL4m8xQFex2GW63ahx1zKbjj+c15//xn6mUo1KG/xH9Bq8m1up5921NRR75h5RQr +rdydC35skhzGyFSIlNL4Jfgz62T0Knngc3kjnHYYKX/ePRbhhQqAfTA6IhBDFMMklT9gxBQ1 oXu5v4vaGk+DZDLebH/fPqQJ8X1g8y/isnlwWpA5paoQmU2Krn0Ra6L/aXq8/Xd76J1hg4QIN sWat3CICNESga+k8cSH5VrpuY6JTkH7pIdNpAAoPwhW05RVBUvJ5W1hZTw9zMoD2B4V2tLYw0 Ta00+ZxLSCKhyOM+THLmRDoIU3Jt9suCP/WsnpB4YZoEumPrJvtOy+nm5JneOP4BdCSEuqlQg gcJcZHlLpUZHoonQGlD4a6oT176+UxtIPb3ZVg57cMCPPURykTrx1Eare9wrhZ2ED7qjFQDsG 9b1IwmIa9ldwwUI0VYRj9tUNng0SokAj/uirTrCe1p+bvnjzBb2kEtzGiVZARi9gcnFzqy309 ZYBepW2aT6WnXXnTQrBrcsZSBNuRFR1ope2Ou1jO8gEU5ZgKXwqJ1cGnnZIxR9keNmy6swmzI u5Lc9NYhaHOuf27b0TEt2Al3aQ6bmzVPa8SOyjGK+RxPmR8vdrZaXZRFlK6dB6OksJoGi6xDg lqe1fqi6S3VgnkR/dDMQhyTYPQvKpCACLfH+ocsvlupfAjuVACpeCdm+T4kbJ933gxR7CHwe+ U7LHQURWcedNLcdjZwzotLr0Mciyvub4uuGlK0nmqXYslTPEvjwvDBAvm6lFoAevRwBXEkKFz OAD84x/nDPlx32bRLKfytfDWqGQGTQJwYfLyh4HV1blvM= 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, a fairly obvious, or rather trivial fix that appeared while analyzing another pr and that can be treated independently: reject duplicate CONTIGUOUS attributes. (Intel and NAG reject this, Cray warns that this is non-standard.) Regtested on x86_64-pc-linux-gnu. OK for mainline? Thanks, Harald From 3a9f6d5a8ee490adf9a18f93feaf86542642be7d Mon Sep 17 00:00:00 2001 From: Harald Anlauf Date: Thu, 8 Dec 2022 22:50:45 +0100 Subject: [PATCH] Fortran: diagnose and reject duplicate CONTIGUOUS attribute [PR108025] gcc/fortran/ChangeLog: PR fortran/108025 * symbol.cc (gfc_add_contiguous): Diagnose and reject duplicate CONTIGUOUS attribute. gcc/testsuite/ChangeLog: PR fortran/108025 * gfortran.dg/contiguous_12.f90: New test. --- gcc/fortran/symbol.cc | 6 ++++++ gcc/testsuite/gfortran.dg/contiguous_12.f90 | 7 +++++++ 2 files changed, 13 insertions(+) create mode 100644 gcc/testsuite/gfortran.dg/contiguous_12.f90 diff --git a/gcc/fortran/symbol.cc b/gcc/fortran/symbol.cc index 49fb37864bd..e704e7ac2bd 100644 --- a/gcc/fortran/symbol.cc +++ b/gcc/fortran/symbol.cc @@ -1108,6 +1108,12 @@ gfc_add_contiguous (symbol_attribute *attr, const char *name, locus *where) if (check_used (attr, name, where)) return false; + if (attr->contiguous) + { + duplicate_attr ("CONTIGUOUS", where); + return false; + } + attr->contiguous = 1; return gfc_check_conflict (attr, name, where); } diff --git a/gcc/testsuite/gfortran.dg/contiguous_12.f90 b/gcc/testsuite/gfortran.dg/contiguous_12.f90 new file mode 100644 index 00000000000..9c477a7a06a --- /dev/null +++ b/gcc/testsuite/gfortran.dg/contiguous_12.f90 @@ -0,0 +1,7 @@ +! { dg-do compile } +! PR fortran/108025 + +subroutine foo (x) + real, contiguous :: x(:) + contiguous :: x ! { dg-error "Duplicate CONTIGUOUS attribute" } +end -- 2.35.3