From patchwork Sat Apr 5 10:40:26 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 337143 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id CE4B21400F0 for ; Sat, 5 Apr 2014 21:40:44 +1100 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:in-reply-to:references:date:message-id :mime-version:content-type; q=dns; s=default; b=a9ieIOQYu5cSspru 1YAtdGR4WrBWzbgOS/ftv/ItebomX33lnRNauPn88Z291wy/ZWyUcYtiQEkesFM1 /R84bCrkjIxsqGOR1UepUmIFM4LsYYICzZ2hhERWTxEFTDnbXWjUUEOpicpHPHeF xeh9M593r71DNMy6KVZb3VFzKlQ= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:in-reply-to:references:date:message-id :mime-version:content-type; s=default; bh=IB41esIy5NCfzrekILBuMe rzRFM=; b=yNCn/5fhs0JJA0ncEzmOHUc+hOtb/H+x7831g2GIPth72g7k3Qiufs 8wD+5s4DoBvWjU69WuUG7I66Zja4KcVFLWWG3dj0UhsAnDNOUO47Hy/10BqPz7TM CH8f9UIaXs5qhj6c9wS3ZYAL3Ee9lvA9rra4kg+ZCvpgMCROuJ+ek= Received: (qmail 15273 invoked by alias); 5 Apr 2014 10:40:37 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 15254 invoked by uid 89); 5 Apr 2014 10:40:36 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.0 required=5.0 tests=AWL, BAYES_00 autolearn=ham version=3.3.2 X-Spam-User: qpsmtpd, 2 recipients X-HELO: relay1.mentorg.com Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 05 Apr 2014 10:40:35 +0000 Received: from svr-orw-exc-10.mgc.mentorg.com ([147.34.98.58]) by relay1.mentorg.com with esmtp id 1WWO1X-0004xH-0W from Thomas_Schwinge@mentor.com ; Sat, 05 Apr 2014 03:40:31 -0700 Received: from SVR-IES-FEM-01.mgc.mentorg.com ([137.202.0.104]) by SVR-ORW-EXC-10.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.4675); Sat, 5 Apr 2014 03:40:31 -0700 Received: from feldtkeller.schwinge.homeip.net (137.202.0.76) by SVR-IES-FEM-01.mgc.mentorg.com (137.202.0.104) with Microsoft SMTP Server id 14.2.247.3; Sat, 5 Apr 2014 11:40:29 +0100 From: Thomas Schwinge To: Tobias Burnus CC: Evgeny Gavrin , GarbuzovViacheslav , , , Ilmir Usmanov Subject: Re: [PATCH 1/4] [GOMP4] [Fortran] OpenACC 1.0+ support in fortran front-end In-Reply-To: <5325FA44.5090800@net-b.de> References: <52E158EF.9050009@samsung.com> <877g9pqmt2.fsf@schwinge.name> <52E65B24.9070403@samsung.com> <87iot5pgqb.fsf@schwinge.name> <52EB8437.3060602@samsung.com> <52EB84C3.4010407@samsung.com> <52F7FFAA.9020702@net-b.de> <5304CEFC.4000602@samsung.com> <53054370.2030802@net-b.de> <5305BA82.5060804@samsung.com> <53158715.1090908@samsung.com> <5315873E.4010203@samsung.com> <53160B41.3060501@net-b.de> <5319A309.40004@samsung.com> <5319A335.2090202@samsung.com> <5320A5BB.9000604@net-b.de> <53217BBE.6070503@samsung.com> <87siqml462.fsf@schwinge.name> <5321A268.5040005@samsung.com> <5321BB71.4030704@samsung.com> <5325FA44.5090800@net-b.de> User-Agent: Notmuch/0.9-101-g81dad07 (http://notmuchmail.org) Emacs/23.4.1 (x86_64-pc-linux-gnu) Date: Sat, 5 Apr 2014 12:40:26 +0200 Message-ID: <87txa883fp.fsf@schwinge.name> MIME-Version: 1.0 Hi! On Sun, 16 Mar 2014 20:23:48 +0100, Tobias Burnus wrote: > Can you or Thomas apply the following patch after my patch* has > been committed to the trunk and the branch has been updated? Please > mention PR fortran/60283 in the ChangeLog. > > * http://gcc.gnu.org/ml/gcc-patches/2014-03/msg00782.html > --- a/gcc/fortran/parse.c > +++ b/gcc/fortran/parse.c > @@ -550,8 +550,7 @@ decode_oacc_directive (void) > return ST_NONE; > } > > - if (gfc_implicit_pure (NULL)) > - gfc_current_ns->proc_name->attr.implicit_pure = 0; > + gfc_unset_implicit_pure (NULL); > > old_locus = gfc_current_locus; After the trunk merge, committed in r209150: commit 83a3b119255d0913d088d652e6caa26026aacb32 Author: tschwinge Date: Sat Apr 5 10:36:58 2014 +0000 Use gfc_unset_implicit_pure. PR fortran/60283 gcc/fortran/ * parse.c (decode_oacc_directive): Use gfc_unset_implicit_pure. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gomp-4_0-branch@209150 138bc75d-0d04-0410-961f-82ee72b054a4 Grüße, Thomas diff --git gcc/fortran/ChangeLog.gomp gcc/fortran/ChangeLog.gomp index 1ee6a7c..aff672e 100644 --- gcc/fortran/ChangeLog.gomp +++ gcc/fortran/ChangeLog.gomp @@ -1,3 +1,8 @@ +2014-04-05 Tobias Burnus + + PR fortran/60283 + * parse.c (decode_oacc_directive): Use gfc_unset_implicit_pure. + 2014-03-18 Thomas Schwinge * f95-lang.c (DEF_FUNCTION_TYPE_10): Define. diff --git gcc/fortran/parse.c gcc/fortran/parse.c index a217c05..79bdc95 100644 --- gcc/fortran/parse.c +++ gcc/fortran/parse.c @@ -550,8 +550,7 @@ decode_oacc_directive (void) return ST_NONE; } - if (gfc_implicit_pure (NULL)) - gfc_current_ns->proc_name->attr.implicit_pure = 0; + gfc_unset_implicit_pure (NULL); old_locus = gfc_current_locus;