From patchwork Fri May 21 13:33:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Vehreschild X-Patchwork-Id: 1482238 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; 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=qTZotn+W; 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 4FmncN5Qzvz9s1l for ; Fri, 21 May 2021 23:33:23 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 99E5B3847822; Fri, 21 May 2021 13:33:17 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 99E5B3847822 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1621603997; bh=TBjck/zthBQPtak0/YLC7JpbilQN3T3Ddtmi2uG9rh0=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=qTZotn+WM4xbbCnSAbE/0EfwXENqtitsEAi7HYSV/NGjgkUkHnZ/m+ir4xGWQoPpM fxad4LnRyyU8b+fZoW6GFud7Lg7bCcvHtadyDrTGljOrv7aQ0ahtTBgwFJv35y5DCV q/iw/9wxc07kXhTrsmgq1u+mXxyAwRr7AUAJ8sA4= 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 888ED385783A; Fri, 21 May 2021 13:33:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 888ED385783A X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from vepi2 ([79.194.169.29]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MplXp-1l77xd19Ar-00q9yv; Fri, 21 May 2021 15:33:12 +0200 Date: Fri, 21 May 2021 15:33:11 +0200 To: GCC-Patches-ML , GCC-Fortran-ML Subject: [Patch, Fortran] PR100337 Should be able to pass non-present optional arguments to CO_BROADCAST Message-ID: <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:soLo/SlJEx4Y9/zq9MlRdubDNa+eF0wBFJ/2oP4wd2wrhIEtCvo PJfEMyapFnRkMaa0zXmjTlXvkpa+XObR4LaBmkbSfznZFMAmExkckoMjuS31q9SBWbR7oU4 /Ylh5d9FRt9GKdFRKdvnvRYKGiLj3bM8qPG3JVFJFhjPDa/uogRZ9rSN+82NZraE+3z7mrN gwYoK+4NO9BF4r2O2NMvg== X-UI-Out-Filterresults: notjunk:1;V03:K0:BB1uwmZEcxo=:vgG4egYfHTfpWzVgzNHx9f Td4G0sT+FkmxO0MFw0SXl+CG8NC/9njfNXKm8Il7P1KAAdYarMMF2Qw2AHDW9kY65BUrgMml7 O3ZiJhhEmc6YTooEQ7KcXvnFHxqqosaSskBNwzsmrf03XmqLzDSVXei8/SHIqyKwR3/Oi7EKe ccnkNcEzCXL3pkEjDhJJjXJFypAyAYmGs537QHkcEHdUFqEitLgWQqwhwIeO14TEIxAZksYLp 488/lTR1ZvxcS7p+aAv/LA76wW/Wvw4pv+SRSMI6Nf2POpnEBoDrUenahyRUuNu+blt4CYpXM Igxg7SG0uhfdYiH3uau/CH/LN4qTk+19kdOxvTl6ZnRZVGCeR5C5MNqg+ZW8fBbtrCzq5Igwh GcwLXLMGWDnxZZ1zxvVox1pvXbqcaXgaaKTCKmVMIJfGi+49BbhblZqm3zPliBXsWwoC5SIkN RjHRLp5Py+BaXjJ4TvAl0h7mRxcC5hu1vYOADMz3JpnqrtPwC9SDhW3Pf3+tI3UNvErLmbB64 q9YzpPLcbtABdkoUDGTUdKUhiuDavwcOjQN04XuWAFGeGDOQSLsTz7SZBOXijTSQkSNdnxtbf RtOPngHIaP0D26LBFHCzNHCDt/cuhGkhUKhacvK2QQd9PTJuzzi5KV4gsQugCixsf8rK6bwhF Us5eU2eoyhBvdhtLZBw/xF9Nt3uLMhnxxPOTdDxF0h+GvIAMipfaP5aULmZcPRIX7kr6f5PSf LUSWYR3fMWy/qIlS0xJTzCBuWMZCB+RwxPA94C2HiDMS2TseA0dxRpThRjNkSd/poR1unNocU BF93Id2TDXzpRbY2kSNNmocCy+im/04fzQSKomyNly3u56S4+ZhNhBUvK0jhYAkljhun3tANY 9oJthHcFWGUxbJwBnUGuzqoqAuq7RrBtyPQqIo9F4UpN2txF72nFpiRlXBuOnjgPg9YLiAERM nysey+r7Cz62ngphSx0iiaMy3GMgaTSbBLPmr8/rz28VGKFYfulzYK9aJo6oKr6qHOJSs7p7x NWQeuVRAnmpfwsekZbPXRuv2YLE4EEOZmYTZgJ7LX6LYOKam9juRiYxULpBxhONiQ2Jhz7mTx vu4gKavqspLbtgnbFi6l4x/FJye738H1hs8 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: , 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@gcc.gnu.org Sender: "Gcc-patches" 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 +