From patchwork Tue Sep 15 20:35:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harald Anlauf X-Patchwork-Id: 1364649 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=J3te0xhF; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BrZkF5h5xz9sTR for ; Wed, 16 Sep 2020 06:35:48 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 91276398305C; Tue, 15 Sep 2020 20:35:45 +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 155DC397202D; Tue, 15 Sep 2020 20:35:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 155DC397202D Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=anlauf@gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1600202141; bh=DWYjrQMkvwCz45nEszhjHUzZ+4+cn3qvxPGGr638WW8=; h=X-UI-Sender-Class:From:To:Subject:Date; b=J3te0xhFbfOK4eERJMIVraayOD8Acvl/gEt5LWwODi9VD/Vr6Q1aeYRefZZ5rufd5 qJ37sEUvYg2NfzwAo56lRzYQbEb+8rsEv30p0jvJbCWQ1wXwdhgm52Qd/YyCk8psSJ 3JC9Nj8kra31WSUTyZ0fRtP+Z6Em05fMrtm4VeZM= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from [93.207.82.145] ([93.207.82.145]) by web-mail.gmx.net (3c-app-gmx-bap13.server.lan [172.19.172.83]) (via HTTP); Tue, 15 Sep 2020 22:35:41 +0200 MIME-Version: 1.0 Message-ID: From: Harald Anlauf To: fortran , gcc-patches Subject: [PATCH] PR fortran/97036 - [F2018] Allow ELEMENTAL RECURSIVE procedure prefix Date: Tue, 15 Sep 2020 22:35:41 +0200 Importance: normal Sensitivity: Normal X-Priority: 3 X-Provags-ID: V03:K1:Gi0olY/sUh1i05LVNbyaI78+Qu0y12ov5tl4vMA4DKR+odRo52voeU+XIW4Xf2g46cE5A AInGStid65A95vxlKQgwoPyzB3mD9cc76pNHRrIQR2AYnADtDDI17UZvE/UiOq97GDB9Mgo0yh1A 0vRAUP3O5JCJmLkrFVMcyEXd4XGfaAV8m0e9udvEXQbiYFo1gt07VYV1JJLyP9S9LRv0tv1/bPJN EeSVvYc3mYfUUeQf4Xzr1yqqr6TAAUubtyq3QPg+Ca4I3OwSlgpzKk33Pd7zNiUAfBJKsllyR4bI YY= X-UI-Out-Filterresults: notjunk:1;V03:K0:AJnkkqUsBK8=:6uS+j0yeP5c7jeFuNNVr0S C6wx4AxqFVI+uZ7X2STvbdooHsIjWvkLANTC2c0X3G+uVsIXUNSJJzKxYHQ1JI2xKlBBIEQJP 6rW3vfgSQyMhRV8cT3Fo4de3sScARvo0MMc6EIDLnfEHXAz35zRCJnQ041IVqFlyx8T6sgQIv N5f9rzSGfIbiJvH57WGUFCr8j+BLwILKE9/HD85kZZdc7lX8zDBc3DLi1iRNZVANaglhuctG5 rujoVFvNECqbP95Db9GvfSpCpQksAmax4WX9Gc9jnYMbOBTaIasmtPfqyoEC4NqRKj6XJKOFl VCxhI96aLSOlugTDIrATN5LdOESWa9m7Lh3XJrXmelk8RPUVDo0W4BdA2/XZjwN8N6wABQGLR giI0FvkIOl+beHPUiYrSwwhZ+4eh377qAq0vf/GrFjsc1D7mgUsEw9yffzd31aRznhH78wk8k qVDIJhXn2S32X1FUHoiaRU/kBPkFigsK03s83ozTvWpSdoswL2vbYdtVRKV4w8r7A1hIPQ0ZB uSkc7YaiaPeP5djDktyvX5+uLwSn2MuW8gM0Qzo1f5t08F5Qj7W9Diw5PNOZBjZK0a1X6p4m2 5ak9io4FCVHUFCbHfVdHHp6RNSLrKabBo+9dXkd99/1HHzyhSnRl+on53irdrKoWzptCyewNq /gGDwqNwHQbCwoGt2NvuGPqgdM6clux5/0MxDUS2MoQXu7A== X-Spam-Status: No, score=-10.4 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 autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: , Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" As stated in the PR, the Fortran 2018 standard removed the restriction prohibiting ELEMENTAL RECURSIVE procedures. Adjust the relevant check. Regtested on x86_64-pc-linux-gnu. OK for master? Thanks, Harald PR fortran/97036 - [F2018] Allow ELEMENTAL RECURSIVE procedure prefix gcc/fortran/ChangeLog: * symbol.c (gfc_check_conflict): Allow ELEMENTAL RECURSIVE procedure prefix for -std=f2018. gcc/testsuite/ChangeLog: * gfortran.dg/pr97036.f90: New test. diff --git a/gcc/fortran/symbol.c b/gcc/fortran/symbol.c index abd3b5ccfd0..df1e8965daa 100644 --- a/gcc/fortran/symbol.c +++ b/gcc/fortran/symbol.c @@ -569,7 +569,7 @@ gfc_check_conflict (symbol_attribute *attr, const char *name, locus *where) conf_std (allocatable, dummy, GFC_STD_F2003); conf_std (allocatable, function, GFC_STD_F2003); conf_std (allocatable, result, GFC_STD_F2003); - conf (elemental, recursive); + conf_std (elemental, recursive, GFC_STD_F2018); conf (in_common, dummy); conf (in_common, allocatable); diff --git a/gcc/testsuite/gfortran.dg/pr97036.f90 b/gcc/testsuite/gfortran.dg/pr97036.f90 new file mode 100644 index 00000000000..cfe51debce1 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr97036.f90 @@ -0,0 +1,27 @@ +! { dg-do compile } +! { dg-options "-std=f2018" } +! PR fortran/97036 - [F2018] Allow ELEMENTAL RECURSIVE procedure prefix + +module m97036 + implicit none +contains + impure elemental recursive subroutine foo (n) + integer, intent(in) :: n + integer :: k(n), f(n), i + k = [ (i-1, i=1,n) ] + f = fac (k) + print *, f + end subroutine foo + elemental recursive subroutine bla () + end subroutine bla + elemental recursive function fac (k) result (f) + integer, intent(in) :: k + integer :: f + f = 1 + if (k > 1) f = k*fac (k-1) + end function fac +end module + use m97036 + implicit none + call foo ([4,5]) +end