From patchwork Fri Nov 6 15:06:04 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 541005 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 6D5F11402B4 for ; Sat, 7 Nov 2015 02:06:51 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=P6xRC2vT; 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:to:cc :from:subject:message-id:date:mime-version:content-type; q=dns; s=default; b=WuGD9xgcgqngizPSTqGL4kEFXIlCcZsMfHvgRoG7Gjxe/rFTxN 7+KscSxrC06rCqOvTQ/eO414V7S2PzW83MkhJIZPiwd6+pKcn5We/hQjnQyEmRbC +DMmQ8F+pEKDUHF7Fj6TeMHmr8PX/xdLghC5F2wPDp3qdZgghMFBNmWu8= 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:to:cc :from:subject:message-id:date:mime-version:content-type; s= default; bh=K85hm0DhyH3hKnlySAvcI8pNd3Y=; b=P6xRC2vTxDwukOUsulwI jaXYBlB6A8by5Ucx2YIDx2URTjSTsUsyV/XERn3fnTwdP4X5t+NkY+TmdiDrOvx9 2AZqGlzzLzfSNuZk62Ajg77Sc3NomsbFObVM/QIGxB2gufnKoD1PmPLPWo1kPrLH E8y4wqsCEVT6YipcNmzXlt4= Received: (qmail 88653 invoked by alias); 6 Nov 2015 15:06:44 -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 88642 invoked by uid 89); 6 Nov 2015 15:06:43 -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, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: fencepost.gnu.org Received: from fencepost.gnu.org (HELO fencepost.gnu.org) (208.118.235.10) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Fri, 06 Nov 2015 15:06:42 +0000 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46067) by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1ZuibA-0007f1-Bi for gcc-patches@gnu.org; Fri, 06 Nov 2015 10:06:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zuib5-0000qu-6f for gcc-patches@gnu.org; Fri, 06 Nov 2015 10:06:40 -0500 Received: from relay1.mentorg.com ([192.94.38.131]:58949) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zuib5-0000oQ-0v for gcc-patches@gnu.org; Fri, 06 Nov 2015 10:06:35 -0500 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 1Zuiat-0003I8-WB from Tom_deVries@mentor.com ; Fri, 06 Nov 2015 07:06:24 -0800 Received: from [127.0.0.1] (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; Fri, 6 Nov 2015 15:06:22 +0000 To: "gcc-patches@gnu.org" CC: Jakub Jelinek From: Tom de Vries Subject: [gomp4, committed] Revert "Add dom_walker::walk_until" Message-ID: <563CC1DC.7080901@mentor.com> Date: Fri, 6 Nov 2015 16:06:04 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Windows NT kernel [generic] [fuzzy] X-Received-From: 192.94.38.131 Hi, this patch reverts the "Add dom_walker::walk_until" patch. The dom_walker::walk_until functionality is no longer required now that we've reverted pass_dominator::sese_mode_p. Committed to gomp-4_0-branch. Thanks, - Tom Revert "Add dom_walker::walk_until" 2015-11-06 Tom de Vries revert: 2015-10-12 Tom de Vries * domwalk.c (dom_walker::walk): Rename to ... (dom_walker::walk_until): ... this. Add and handle until and until_inclusive parameters. (dom_walker::walk): Reimplement using dom_walker::walk_until. * domwalk.h (dom_walker::walk_until): Declare. --- gcc/domwalk.c | 32 +++++--------------------------- gcc/domwalk.h | 2 -- 2 files changed, 5 insertions(+), 29 deletions(-) diff --git a/gcc/domwalk.c b/gcc/domwalk.c index 6a205f0..167fc38 100644 --- a/gcc/domwalk.c +++ b/gcc/domwalk.c @@ -143,18 +143,11 @@ cmp_bb_postorder (const void *a, const void *b) } /* Recursively walk the dominator tree. - BB is the basic block we are currently visiting. UNTIL is a basic_block that - is the root of a subtree that we won't visit. If UNTIL_INCLUSIVE, we visit - UNTIL, but not it's children. Otherwise don't visit UNTIL and its - children. */ + BB is the basic block we are currently visiting. */ void -dom_walker::walk_until (basic_block bb, basic_block until, bool until_inclusive) +dom_walker::walk (basic_block bb) { - bool skip_self = (bb == until && !until_inclusive); - if (skip_self) - return; - basic_block dest; basic_block *worklist = XNEWVEC (basic_block, n_basic_blocks_for_fn (cfun) * 2); @@ -188,15 +181,9 @@ dom_walker::walk_until (basic_block bb, basic_block until, bool until_inclusive) worklist[sp++] = NULL; int saved_sp = sp; - bool skip_children = bb == until && until_inclusive; - if (!skip_children) - for (dest = first_dom_son (m_dom_direction, bb); - dest; dest = next_dom_son (m_dom_direction, dest)) - { - bool skip_child = (dest == until && !until_inclusive); - if (!skip_child) - worklist[sp++] = dest; - } + for (dest = first_dom_son (m_dom_direction, bb); + dest; dest = next_dom_son (m_dom_direction, dest)) + worklist[sp++] = dest; if (m_dom_direction == CDI_DOMINATORS) switch (sp - saved_sp) { @@ -230,12 +217,3 @@ dom_walker::walk_until (basic_block bb, basic_block until, bool until_inclusive) } free (worklist); } - -/* Recursively walk the dominator tree. - BB is the basic block we are currently visiting. */ - -void -dom_walker::walk (basic_block bb) -{ - walk_until (bb, NULL, true); -} diff --git a/gcc/domwalk.h b/gcc/domwalk.h index 71e6075..71a7c47 100644 --- a/gcc/domwalk.h +++ b/gcc/domwalk.h @@ -34,8 +34,6 @@ public: /* Walk the dominator tree. */ void walk (basic_block); - /* Walk a part of the dominator tree. */ - void walk_until (basic_block, basic_block, bool); /* Function to call before the recursive walk of the dominator children. */ virtual void before_dom_children (basic_block) {} -- 1.9.1