From patchwork Fri Jun 4 16:05:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Vehreschild X-Patchwork-Id: 1487864 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+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=lzWIeh/a; 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 4FxSLG6H7Jz9sRf for ; Sat, 5 Jun 2021 02:06:13 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 2CB26399BC3E for ; Fri, 4 Jun 2021 16:06:11 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2CB26399BC3E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1622822771; bh=Cv8yumKXxns1HpFAQqM0+o29gZ6f4CAjrnQi9ih1Rc8=; h=Date:To:Subject:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=lzWIeh/aEeMBEhg2tbLDiMa5mPNAwQHyEgHLn5zLTgHEAce7ip1/0cBCnIq005Hu1 HxlXjsFAkbJ69zz4rfHBECEACgQi0o4Ny25vkpgXCR3FCbMecIR2e1E4XSqTxIDZRx Gi3yZs9Zy4EvFx+dmY9WvPbZc1PRR7fTeMSSHxKo= 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.15.19]) by sourceware.org (Postfix) with ESMTPS id DE7A1385E001; Fri, 4 Jun 2021 16:05:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org DE7A1385E001 X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from vepi2 ([79.194.169.29]) by mail.gmx.net (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MTzay-1lxPX32pF4-00Qzz1; Fri, 04 Jun 2021 18:05:19 +0200 Date: Fri, 4 Jun 2021 18:05:18 +0200 To: GCC-Patches-ML , GCC-Fortran-ML Subject: [Ping, Patch, Fortran] PR100337 Should be able to pass non-present optional arguments to CO_BROADCAST Message-ID: <20210604180518.5daa870d@vepi2> In-Reply-To: <20210521153311.2760b4b3@vepi2> References: <20210521153311.2760b4b3@vepi2> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; x86_64-redhat-linux-gnu) MIME-Version: 1.0 X-Provags-ID: V03:K1:PjcGBsfjrtosDL4X3shEW7fy3vgZ9a+3g0OJeW6LYmwr7jQ/J6S bLPn5jKy8H6BvVSQQPpc6EhH/fjhj7u09FLyDTskTzoV1Huj4/e2gtW9ywIXLfH4hWEK99C C9cQF9uKRzSRJQYwTloFGV3riGaMK3OTByOz5zyNIy3/sAvIllbmfVDR3w1VAWE1GssaKRN wMVzBWdj1XcTrvATtAQig== X-UI-Out-Filterresults: notjunk:1;V03:K0:+93N5uocVrA=:d/F3kQU/uwallZFP68yREu bfrZCVesymDUn6NZ6K/Tm6xqTIyjUF7ExnGBvuKyzK9UuTMZt1w837RcJ6EPzSviiJztZx4Ky d3i9mkqF3R1nu1W0MNJNcqUxIEndceKnoj61o226volF3y2Y6uNXxLX5bLr+xOW3eSz3tKoJn +CQuqjH5Cu/BX9iaUaFDFzOZqnycz5D5Ql24KI7JSQXXZGD9UDlbPK0ha9sMXDlxwVZh75sFo 4DczMrTMlQ6hXgyA0Ic09g80HIo+jT54Lct1PVI4xcj3aGU/7e0xRal56ZSYAXh3LBwVTcmaJ xRXRsXAqPDoIWMgZOr+oY4igiqEOEci0Ek5MmYhzA8AAuxagbt/V6ke4WpjhuGa+eiCyD7n6A +WMJ/4FBjUg8w91jcrD2PUwlJkDO0pUwFl9pO8kSD7JvJAo7kQADlYO/qBQxyzDyLWSM4VPbw UM0/D/o397WVUzWwEhq0cUwyPaaEKicI/R0hy0BdUNiT7YoM0ebkNKydCLeGhY3GSDGSx/wg5 qmmPP9x6btqDg8LIhCELA14PdlKgA+x3AkMLLeYkLDQ0blDsGeVGPw/q2Lu3echPEe02s9Qtz WMHmF5Dp29Gik8ISsPH2N3t1PBFa0pzPZTAjBCu3OS+UinlXXUo5zSIS9nmgQ3rNDvHU60Xpm B3KsgFRkIZCHtRPmlvvd/Z9j19aqSqCeRFvwShgJGyTl29aKD8jR70Yi8HJqe32lrRbEIX597 1gzjvjF4SFACj1Z/ResZcVAAQ9ZudMUUYkb0otu5NEeG9KSDw2tu1rsAk+4J3X2BBPbAD9HRp LJbQYR6utzs12V6LjdVM0j3zqrFOd+SWs2RVxEUv+c8UebU++Y7bxl11r3RtJftz0je9tS660 ejsIYD8oXUeN4iEYACC01ngfR0mzxvnyP7LwuPURJu99huXT9SSXwNF4WZDyLKOr6Dak/DKx+ G65EfSRQUHCbihEKVISpsA8ivt9ewjHKTG54V2zySnpfjGyRKf0Cp2oZjxJ1L3un3Wszgp+rQ nBMTQ3I/Zl+DR2AQUv5Mo+hOviafhANxaDHGxcJ7hXXcJTIgiN+kKD92V1ooIG7kRanJ6LFPZ HliC9JtwQlqAaGL5UjQf3DivANYoiAu4t4x X-Spam-Status: No, score=-10.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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: , X-Patchwork-Original-From: Andre Vehreschild via Gcc-patches From: Andre Vehreschild Reply-To: Andre Vehreschild Cc: Brad Richardson , Damian Rouson Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" Ping! On Fri, 21 May 2021 15:33:11 +0200 Andre Vehreschild wrote: > Hi, > > the attached patch fixes an issue when calling CO_BROADCAST in > -fcoarray=single mode, where the optional but non-present (in the calling > scope) stat variable was assigned to before checking for it being not present. > > Regtests fine on x86-64-linux/f33. Ok for trunk? > > Regards, > Andre --- Andre Vehreschild * Email: vehre ad gmx dot de diff --git a/gcc/fortran/trans-intrinsic.c b/gcc/fortran/trans-intrinsic.c index 4d7451479d3..03a38090051 100644 --- a/gcc/fortran/trans-intrinsic.c +++ b/gcc/fortran/trans-intrinsic.c @@ -11232,8 +11232,28 @@ conv_co_collective (gfc_code *code) if (flag_coarray == GFC_FCOARRAY_SINGLE) { if (stat != NULL_TREE) - gfc_add_modify (&block, stat, - fold_convert (TREE_TYPE (stat), integer_zero_node)); + { + /* For optional stats, check the pointer is valid before zero'ing. */ + if (gfc_expr_attr (stat_expr).optional) + { + tree tmp; + stmtblock_t ass_block; + gfc_start_block (&ass_block); + gfc_add_modify (&ass_block, stat, + fold_convert (TREE_TYPE (stat), + integer_zero_node)); + tmp = fold_build2 (NE_EXPR, logical_type_node, + gfc_build_addr_expr (NULL_TREE, stat), + null_pointer_node); + tmp = fold_build3 (COND_EXPR, void_type_node, tmp, + gfc_finish_block (&ass_block), + build_empty_stmt (input_location)); + gfc_add_expr_to_block (&block, tmp); + } + else + gfc_add_modify (&block, stat, + fold_convert (TREE_TYPE (stat), integer_zero_node)); + } return gfc_finish_block (&block); } diff --git a/gcc/testsuite/gfortran.dg/coarray_collectives_17.f90 b/gcc/testsuite/gfortran.dg/coarray_collectives_17.f90 new file mode 100644 index 00000000000..84a6645865e --- /dev/null +++ b/gcc/testsuite/gfortran.dg/coarray_collectives_17.f90 @@ -0,0 +1,42 @@ +! { dg-do run } +! { dg-options "-fcoarray=single" } +! +! PR 100337 +! Test case inspired by code submitted by Brad Richardson + +program main + implicit none + + integer, parameter :: MESSAGE = 42 + integer :: result + + call myco_broadcast(MESSAGE, result, 1) + + if (result /= MESSAGE) error stop 1 +contains + subroutine myco_broadcast(m, r, source_image, stat, errmsg) + integer, intent(in) :: m + integer, intent(out) :: r + integer, intent(in) :: source_image + integer, intent(out), optional :: stat + character(len=*), intent(inout), optional :: errmsg + + integer :: data_length + + data_length = 1 + + call co_broadcast(data_length, source_image, stat, errmsg) + + if (present(stat)) then + if (stat /= 0) return + end if + + if (this_image() == source_image) then + r = m + end if + + call co_broadcast(r, source_image, stat, errmsg) + end subroutine + +end program +