From patchwork Wed Sep 30 10:04:52 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 524323 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 AFD8F140157 for ; Wed, 30 Sep 2015 20:05:08 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=dkuRMVfa; dkim-atps=neutral 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=ULgKeMfVE0RzfQAA YHlA+jq5xxDrGMpFKzHR31JDmY5uzp/yvqFjjSz20sOd4nuIiaQcjgUiaXPlOcfn SzD4QNFTCdDgnpbNZyikhXIQYqfP7BnGE66TwbZa7WKOGGiDIph2sOC43R9MxAZG aEW4CXF671zY16UFi9oK9g3eZnE= 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=x3ZFzNuHG4nicUHp7J9uuI FDZNk=; b=dkuRMVfapaNBPywrRg7dogZFcK36FVLmZlLU2fdMHPIS/FhTG1lc1V rsQ1/yJvudA2YOHiuNKZVf6OaKB5si1HT8Fc77AedYpKrR+X+gGOq4hRVB/uVbbr 6tzKCbLQCPDUTr7kArg5mlO0ivb3DtK/NvX52l+CPio23QxTII9dg= Received: (qmail 79714 invoked by alias); 30 Sep 2015 10:05:02 -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 79700 invoked by uid 89); 30 Sep 2015 10:05:01 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.3 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 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; Wed, 30 Sep 2015 10:04:59 +0000 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=SVR-IES-FEM-01.mgc.mentorg.com) by relay1.mentorg.com with esmtp id 1ZhEFr-0001rs-TH from Thomas_Schwinge@mentor.com ; Wed, 30 Sep 2015 03:04:56 -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.3.224.2; Wed, 30 Sep 2015 11:04:54 +0100 From: Thomas Schwinge To: Tom de Vries CC: GCC Patches , Jakub Jelinek , Richard Biener Subject: Re: [gomp4,committed] Remove release_dangling_ssa_names In-Reply-To: <560BAF90.5020807@mentor.com> References: <546743BC.5070804@mentor.com> <54678B3D.8020009@mentor.com> <54730EE7.40000@mentor.com> <5474665A.4070101@mentor.com> <87iocp1d8o.fsf@kepler.schwinge.homeip.net> <557076A5.7050207@mentor.com> <55C1BA11.70008@mentor.com> <55C1CDAF.8050402@mentor.com> <55C1EA05.5070904@mentor.com> <55CA44B3.2000409@mentor.com> <87twqkwd1u.fsf@kepler.schwinge.homeip.net> <560399EB.3010208@mentor.com> <87fv24fav1.fsf@schwinge.name> <560B7E60.2040806@mentor.com> <87612stg1u.fsf@kepler.schwinge.homeip.net> <560BAF90.5020807@mentor.com> User-Agent: Notmuch/0.9-101-g81dad07 (http://notmuchmail.org) Emacs/24.4.1 (x86_64-pc-linux-gnu) Date: Wed, 30 Sep 2015 12:04:52 +0200 Message-ID: <87r3lgdxyz.fsf@schwinge.name> MIME-Version: 1.0 Hi Tom! On Wed, 30 Sep 2015 11:46:56 +0200, Tom de Vries wrote: > On 30/09/15 11:25, Thomas Schwinge wrote: > > Don't we also want to commit the following change, which was part of your > > trunk r227103 (883f001d2c3672e0674bec71f36a2052734a72cf) commit (and now > > shows up as a delta between trunk and gomp-4_0-branch)? > > > > --- gcc/tree-cfg.c > > +++ gcc/tree-cfg.c > > @@ -6424,9 +6424,6 @@ replace_ssa_name (tree name, hash_map *vars_map, > > replace_by_duplicate_decl (&decl, vars_map, to_context); > > new_name = make_ssa_name_fn (DECL_STRUCT_FUNCTION (to_context), > > decl, SSA_NAME_DEF_STMT (name)); > > - if (SSA_NAME_IS_DEFAULT_DEF (name)) > > - set_ssa_default_def (DECL_STRUCT_FUNCTION (to_context), > > - decl, new_name); > > } > > else > > new_name = copy_ssa_name_fn (DECL_STRUCT_FUNCTION (to_context), > > Indeed, that bit is part of the patch "Don't create superfluous parm in > expand_omp_taskreg", but was dropped in the merge (probably because it > conflicted with the "Fix release_dangling_ssa_names" patch that I just > reverted). Aha, so my fault after all. ;-) > So we need to apply it. Committed to gomp-4_0-branch in r228285: commit 4d7d168dc9aab3fa1ebf55bb3cb94d7b0477d639 Author: tschwinge Date: Wed Sep 30 10:03:37 2015 +0000 More gcc/tree-cfg.c:replace_ssa_name cleanup gcc/ * tree-cfg.c (replace_ssa_name): Revert obsolete changes. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gomp-4_0-branch@228285 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog.gomp | 4 ++++ gcc/tree-cfg.c | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) Grüße, Thomas diff --git gcc/ChangeLog.gomp gcc/ChangeLog.gomp index 06440bf..c4033e0 100644 --- gcc/ChangeLog.gomp +++ gcc/ChangeLog.gomp @@ -1,3 +1,7 @@ +2015-09-30 Thomas Schwinge + + * tree-cfg.c (replace_ssa_name): Revert obsolete changes. + 2015-09-30 Tom de Vries * omp-low.c (release_dangling_ssa_names): Remove. diff --git gcc/tree-cfg.c gcc/tree-cfg.c index a3c3b20..500fc43 100644 --- gcc/tree-cfg.c +++ gcc/tree-cfg.c @@ -6424,9 +6424,6 @@ replace_ssa_name (tree name, hash_map *vars_map, replace_by_duplicate_decl (&decl, vars_map, to_context); new_name = make_ssa_name_fn (DECL_STRUCT_FUNCTION (to_context), decl, SSA_NAME_DEF_STMT (name)); - if (SSA_NAME_IS_DEFAULT_DEF (name)) - set_ssa_default_def (DECL_STRUCT_FUNCTION (to_context), - decl, new_name); } else new_name = copy_ssa_name_fn (DECL_STRUCT_FUNCTION (to_context),