From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 5242 invoked by alias); 29 Jan 2017 15:15:03 -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 5183 invoked by uid 89); 29 Jan 2017 15:15:01 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=3.7 required=5.0 tests=AWL,BAYES_50,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW,RCVD_IN_SORBS_WEB,SPF_PASS autolearn=no version=3.3.2 spammy=D*gmx.de, vehregmxde, vehre@gmx.de, gmx X-Spam-User: qpsmtpd, 2 recipients X-HELO: mout.gmx.net Received: from mout.gmx.net (HELO mout.gmx.net) (212.227.15.18) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 29 Jan 2017 15:14:51 +0000 Received: from vepi2 ([84.63.213.96]) by mail.gmx.com (mrgmx003 [212.227.17.190]) with ESMTPSA (Nemesis) id 0MEWkb-1cjBz71PBp-00FgcA; Sun, 29 Jan 2017 16:14:48 +0100 Date: Sun, 29 Jan 2017 15:57:00 -0000 From: Andre Vehreschild To: GCC-Fortran-ML Cc: GCC-Patches-ML Subject: Re: [PATCH, Fortran, pr70696/68887, gcc-6, v1] Forgot to commit runtime part Message-ID: <20170129161447.359feae0@vepi2> In-Reply-To: <20170129145103.469e5a11@vepi2> References: <20170112124558.6f8de516@vepi2> <1605333b-0420-0527-d766-b37e3355e860@charter.net> <20170113112323.7aa27b42@vepi2> <20170118132639.70979112@vepi2> <4116785a-a0b1-fbaa-937a-229e241fe3c3@charter.net> <20170118193559.3058a85d@vepi2> <20170119130750.5a36dd5a@vepi2> <20170119145119.GA79750@troutmask.apl.washington.edu> <20170119165314.7e25de11@vepi2> <20170129145103.469e5a11@vepi2> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/S+S1mkpqcf/oYLMomiqmcfe" X-UI-Out-Filterresults: notjunk:1;V01:K0:vMLm6+C3xYo=:D0jljZt1KoOMKDCTXKPPE3 a3vpgy/iNKfnZ2ZLgGoqqHfZQLs6oD4A6yvPfLROV2QBGAzjTbiMaGts7xHPCciyL72Qeh9mA K2JSAkuWsxBVU1LK1j4gURT3fYOukzdeX2KzG2+5k1/Xzk1adQ2S3IsCd5lgHDbukJNabNhwE 7NV2Fgx7YaAZ8c79lFIhlALWkrTOvUSQNaWW+PFMxVs3/g3IkUmhUtFGXiTUHqAP8D296Zj0P 0XCfvUVzMlbO2yKZL7vmwqbiP9eHzg1YklLDAMIa7d1M726fcMtiqlyuVJ+5qhK73Le6hEGL1 Q/4jDH+la73BBeLrROXEm4qabSFQurXMi9kOcSCaeGJfg5CgrX7oVX7lT2qL0mYY+SySRBxlH EInKuKV9a7UXdBl7+3MBtRb8QSVYAwgTD/j7kq53PSjUS2TnJ4FsvWnMEdVeSmhgdCS1Z9AGp AyV3E2wcRrVvBv4qpVRyBrT9mm/v1YVv8M+ApphR7ijiuRcrsnVxgeFXh4pH/bzHvN8hUHt9k i7EUGfJqh50/6ygHJh58C3O+o36HP4q66/kwDP/FRQmpf4oiC+mU5Fo2inOALZ96pQOoTGkOE 6tZY5htz2TL3EuNEb11wNDWXDVteHBDmQDziK1rqgs9JmNm/vDgo49z0nc7InvOzkN5XcI+r4 uMZoSg/EWM+dApUizKLl1YDq71/V1w9hGAXqVQSQifgmLJxwPeB/xjDFmQqXmjl/r7oEpk2Nb bnn2Ab84fjG+IVvztmn0reAqSH+8YCFaWp+B6yB5eTGvhcWngSonF/MuftA= X-SW-Source: 2017-01/txt/msg02247.txt.bz2 --MP_/S+S1mkpqcf/oYLMomiqmcfe Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline Content-length: 1205 Hi all, during the backport of pr70696 I forgot to backport the runtime part in libgfortran/caf/single.c. This is fixed by commit r245016. Sorry for the noise, regards, Andre On Sun, 29 Jan 2017 14:51:03 +0100 Andre Vehreschild wrote: > Hi all, > > just applied the backport to gcc-6 as promised as r245014. > > Regards, > Andre > > On Thu, 19 Jan 2017 16:53:14 +0100 > Andre Vehreschild wrote: > > > Hi Steve, > > > > thanks for the review. Committed as r244637. > > > > Regards, > > Andre > > > > On Thu, 19 Jan 2017 06:51:19 -0800 > > Steve Kargl wrote: > > > > > On Thu, Jan 19, 2017 at 01:07:50PM +0100, Andre Vehreschild wrote: > > > > Hi all, > > > > > > > > unfortunately triggered this patch a regression in the opencoarray's > > > > testsuite, which also occurs outside of opencoarray, when a caf-function > > > > is used in a block in the main-program. This patch fixes the error and > > > > adds a testcase. > > > > > > > > Bootstrapped and regtested ok on x86_64-linux/f25. Ok for trunk? > > > > > > > > > > Yes. > > > > > > > > > -- Andre Vehreschild * Email: vehre ad gmx dot de --MP_/S+S1mkpqcf/oYLMomiqmcfe Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=submit_gcc6.diff Content-length: 887 Index: libgfortran/caf/single.c =================================================================== --- libgfortran/caf/single.c (Revision 245015) +++ libgfortran/caf/single.c (Arbeitskopie) @@ -101,9 +101,12 @@ void *local; 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) - local = calloc (size, sizeof (bool)); + || 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 local = malloc (size); *token = malloc (sizeof (single_token_t)); --MP_/S+S1mkpqcf/oYLMomiqmcfe--