From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 675 invoked by alias); 13 Jan 2017 10:23:43 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 647 invoked by uid 89); 13 Jan 2017 10:23:42 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.8 required=5.0 tests=AWL,BAYES_00,FREEMAIL_FROM,KAM_ASCII_DIVIDERS,RCVD_IN_DNSWL_LOW,SPF_PASS autolearn=no version=3.3.2 spammy=nicht, Jerry, D*charter.net, delisle X-Spam-User: qpsmtpd, 2 recipients X-HELO: mout.gmx.net Received: from mout.gmx.net (HELO mout.gmx.net) (212.227.17.22) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 13 Jan 2017 10:23:32 +0000 Received: from vepi2 ([92.76.205.227]) by mail.gmx.com (mrgmx101 [212.227.17.168]) with ESMTPSA (Nemesis) id 0LeALI-1cmiqO1lXA-00psUP; Fri, 13 Jan 2017 11:23:24 +0100 Date: Fri, 13 Jan 2017 10:23:00 -0000 From: Andre Vehreschild To: Jerry DeLisle Cc: GCC-Patches-ML , GCC-Fortran-ML Subject: Re: [PATCH, Fortran, pr70696, v1] [Coarray] ICE on EVENT POST of host-associated EVENT_TYPE coarray Message-ID: <20170113112323.7aa27b42@vepi2> In-Reply-To: <1605333b-0420-0527-d766-b37e3355e860@charter.net> References: <20170112124558.6f8de516@vepi2> <1605333b-0420-0527-d766-b37e3355e860@charter.net> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/3/duvN8HQTUG=m5S1.tY3KI" X-UI-Out-Filterresults: notjunk:1;V01:K0:MRFKVH1UtSw=:X0dgzpT2HiFJerRBlywb/k v2roxegtnzL5V0gwxlsftvwps2dXZqO9Z65992OYEeQzjsoRsG/OKzRwvz1yp5oPTcOtCnch6 a5Ch0Wb//ZMedB5y7wInb1dSOFYOc1nAuQgvksjlRCbz/wcXVovT67qNHBtWjIoaePzh/xyGV LrKoaz1n+hRrB7WNkjMFRT5/WrIxX8shpPkL2V8MJ4BEJ+OpHYTOoW3nsdg2v0dAc1b0oRwCU m752d4Z/6SiIAmuDgWxNFRRO2bpQ2Ym+nWmD4e+YSZgUcrQoXJhEGRHediRvg+hkmzbkAhIhT /Fho8rYSTEvmlQ5MR0nx8b8LZ52hd2cOVKYWfs3N0C1rcXoiVa4e0Mceku5kcQA5MdHgFs83x YcS1L2lLqyP67pPSzV7JaWC3TSlndk9b7fn8PRYdqdpxtK43hsCszYVP5ba0OYIqtb0hgEPQY 9F4lmrvH5sEHa4ztdtQh3hPnWhFTtB49RtBpoYyMG/eNx0mZ+DWdS5roBcbEbHdpoSGhUzd97 zVEurRYX/fEjc/kDWqLxp56KjMoKGaOyI2QjAlc60d7i9GVI8eNdE0rZ2x7rbm7H9oMo7K94U pxo4Ver+mVOjNfuyL2uttTclHTCvapoVQRsT2LPR7jVbLKngdTmJafnL0AjaiZYJaoD/YuBBq R2je5FH0oe0Cn8z/lR7AkZjkqQBZQGrE9EC7oC+Gc/vzkbufCQHyYFAUO94QIFJmoTjgT4vtc FKf4GmKueH0s14tm7Xe2a2UQm+akHWaJN2UzIe/qkitx801O+y8Dl4qPAgWruJQCbiI0garsc t1QVyIdstK8gfe6e6pYhB24YU1E1YFidhLJOfAM5ObY5sdhgQeqYGOr+K56iWTy/h1FAPtyA1 0ID7xEBPSIDHzlR7y3JKcLl6LNcFVPHB1HRcd7Iamh86hlYgKjIU8FjiDnQPtNtJOKh2zdDw1 mBfmCYxnvY6LFajmg6A+U+M9Byrwy8H+sJQ6yOQdZDpUd/7wMKwTcxEAGHClH9dko3VdS2ThR ZQ== X-SW-Source: 2017-01/txt/msg00912.txt.bz2 --MP_/3/duvN8HQTUG=m5S1.tY3KI Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline Content-length: 806 Hi Jerry, thanks for the review. Committed as r244407. Will backport to gcc-6 in a week or so. Regards, Andre On Thu, 12 Jan 2017 10:11:37 -0800 Jerry DeLisle wrote: > On 01/12/2017 03:45 AM, Andre Vehreschild wrote: > > Hi all, > > > > attached patch fixes the ICE when using an event in a subroutine. The reason > > for the ICE was that the backend_decl of the symbol to event on was not set > > when accessed. The patch ensures this. Furthermore did I fix a invalid > > memory access in the caf_single lib, where to less memory was allocated in > > the registration of the event. > > > > Bootstraps and regtests ok on x86_64-linux/F25. Ok for trunk? > > > > Regards, > > Andre > > > > OK and thanks. > > Jerry -- Andre Vehreschild * Email: vehre ad gmx dot de --MP_/3/duvN8HQTUG=m5S1.tY3KI Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=submit.diff Content-length: 3476 Index: gcc/fortran/ChangeLog =================================================================== --- gcc/fortran/ChangeLog (Revision 244394) +++ gcc/fortran/ChangeLog (Arbeitskopie) @@ -1,3 +1,9 @@ +2017-01-13 Andre Vehreschild + + PR fortran/70696 + * trans-expr.c (gfc_get_tree_for_caf_expr): Ensure the backend_decl + is valid before accessing it. + 2017-01-09 Jakub Jelinek PR translation/79019 Index: gcc/fortran/trans-expr.c =================================================================== --- gcc/fortran/trans-expr.c (Revision 244394) +++ gcc/fortran/trans-expr.c (Arbeitskopie) @@ -1838,6 +1838,10 @@ "component at %L is not supported", &expr->where); } + /* Make sure the backend_decl is present before accessing it. */ + if (expr->symtree->n.sym->backend_decl == NULL_TREE) + expr->symtree->n.sym->backend_decl + = gfc_get_symbol_decl (expr->symtree->n.sym); caf_decl = expr->symtree->n.sym->backend_decl; gcc_assert (caf_decl); if (expr->symtree->n.sym->ts.type == BT_CLASS) Index: gcc/testsuite/ChangeLog =================================================================== --- gcc/testsuite/ChangeLog (Revision 244394) +++ gcc/testsuite/ChangeLog (Arbeitskopie) @@ -1,3 +1,8 @@ +2017-01-13 Andre Vehreschild + + PR fortran/70696 + * gfortran.dg/coarray/event_3.f08: New test. + 2017-01-13 Richard Biener PR tree-optimization/77283 Index: gcc/testsuite/gfortran.dg/coarray/event_3.f08 =================================================================== --- gcc/testsuite/gfortran.dg/coarray/event_3.f08 (nicht existent) +++ gcc/testsuite/gfortran.dg/coarray/event_3.f08 (Arbeitskopie) @@ -0,0 +1,20 @@ +! { dg-do run } +! +! Check PR fortran/70696 is fixed. + +program global_event + use iso_fortran_env , only : event_type + implicit none + type(event_type) :: x[*] + + call exchange + contains + subroutine exchange + integer :: cnt + event post(x[1]) + event post(x[1]) + call event_query(x, cnt) + if (cnt /= 2) error stop 1 + event wait(x, until_count=2) + end subroutine +end Index: libgfortran/ChangeLog =================================================================== --- libgfortran/ChangeLog (Revision 244394) +++ libgfortran/ChangeLog (Arbeitskopie) @@ -1,3 +1,9 @@ +2017-01-13 Andre Vehreschild + + PR fortran/70696 + * caf/single.c (_gfortran_caf_register): Allocate enough memory for + the event counter. + 2017-01-07 Andre Vehreschild PR fortran/78781 Index: libgfortran/caf/single.c =================================================================== --- libgfortran/caf/single.c (Revision 244394) +++ libgfortran/caf/single.c (Arbeitskopie) @@ -141,9 +141,12 @@ caf_single_token_t single_token; if (type == CAF_REGTYPE_LOCK_STATIC || type == CAF_REGTYPE_LOCK_ALLOC - || type == CAF_REGTYPE_CRITICAL || type == CAF_REGTYPE_EVENT_STATIC - || type == CAF_REGTYPE_EVENT_ALLOC) + || type == CAF_REGTYPE_CRITICAL) local = calloc (size, sizeof (bool)); + else if (type == CAF_REGTYPE_EVENT_STATIC || type == CAF_REGTYPE_EVENT_ALLOC) + /* In the event_(wait|post) function the counter for events is a uint32, + so better allocate enough memory here. */ + local = calloc (size, sizeof (uint32_t)); else if (type == CAF_REGTYPE_COARRAY_ALLOC_REGISTER_ONLY) local = NULL; else --MP_/3/duvN8HQTUG=m5S1.tY3KI--