From patchwork Thu Dec 10 17:05:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uros Bizjak X-Patchwork-Id: 555215 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 5C7EA140216 for ; Fri, 11 Dec 2015 04:06:11 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=r2PVHnQT; 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 :mime-version:date:message-id:subject:from:to:cc:content-type; q=dns; s=default; b=TLU+C1DyICmrbpbdlrf4WdGGlO6vJb6RYL6283Do1nj 1ix+HApN6gyRAsTmNdHT6iU+EHaEfrjxdaBWxmqSLPdJ4Z64FXRb7kOMQxOEWV11 Bx0/HddohoT0wDiKvdUNrcaOJC8WCygKO1lv4i0QZbaU6G+RF/XEsufzVgAIvgAo = 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 :mime-version:date:message-id:subject:from:to:cc:content-type; s=default; bh=V8q8wgjYpXIS7qwqQZZD0JmZhDQ=; b=r2PVHnQTxsTVdn5// b3Ym+bQkHJQmpf2CDD02OQkkJghpHj1wGIcd9g9XnLKzrlvJ17dvSMIDXmzV/S1i /qfXArtFcYuSBeok739Pe51R16S00xqYmTG83f7+ZJ9ijhZfbyCNaKZramHRtaw2 kpkvPySnUmP6VxPVY3DBiG6tq4= Received: (qmail 96477 invoked by alias); 10 Dec 2015 17:05:41 -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 96398 invoked by uid 89); 10 Dec 2015 17:05:40 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.2 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-oi0-f54.google.com Received: from mail-oi0-f54.google.com (HELO mail-oi0-f54.google.com) (209.85.218.54) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Thu, 10 Dec 2015 17:05:38 +0000 Received: by oigl9 with SMTP id l9so10165225oig.1 for ; Thu, 10 Dec 2015 09:05:35 -0800 (PST) MIME-Version: 1.0 X-Received: by 10.202.76.78 with SMTP id z75mr9144026oia.92.1449767135692; Thu, 10 Dec 2015 09:05:35 -0800 (PST) Received: by 10.60.138.70 with HTTP; Thu, 10 Dec 2015 09:05:35 -0800 (PST) Date: Thu, 10 Dec 2015 18:05:35 +0100 Message-ID: Subject: Re: [RFA] [PATCH] [PR tree-optimization/68619] Avoid direct cfg cleanups in tree-ssa-dom.c [4/3] v2 From: Uros Bizjak To: "gcc-patches@gcc.gnu.org" Cc: Jeff Law > Finally the mechanical changes necessary due to the API change in the walker. You forgot to change the graphite part, as in the attached patch. 2015-12-10 Uros Bizjak PR tree-optimization/68619 * graphite-scop-detection.c (gather_bbs::before_dom_children): Change return type to an edge. Always return NULL. OK for mainline after successful bootstrap and regtest? Uros. Index: graphite-scop-detection.c =================================================================== --- graphite-scop-detection.c (revision 231529) +++ graphite-scop-detection.c (working copy) @@ -1828,7 +1828,7 @@ class gather_bbs : public dom_walker public: gather_bbs (cdi_direction, scop_p); - virtual void before_dom_children (basic_block); + virtual edge before_dom_children (basic_block); virtual void after_dom_children (basic_block); private: @@ -1844,11 +1844,11 @@ gather_bbs::gather_bbs (cdi_direction direction, s /* Call-back for dom_walk executed before visiting the dominated blocks. */ -void +edge gather_bbs::before_dom_children (basic_block bb) { if (!bb_in_sese_p (bb, scop->scop_info->region)) - return; + return NULL; gcond *stmt = single_pred_cond_non_loop_exit (bb); @@ -1868,7 +1868,7 @@ gather_bbs::before_dom_children (basic_block bb) gimple_poly_bb_p gbb = try_generate_gimple_bb (scop, bb); if (!gbb) - return; + return NULL; GBB_CONDITIONS (gbb) = conditions.copy (); GBB_CONDITION_CASES (gbb) = cases.copy (); @@ -1880,6 +1880,7 @@ gather_bbs::before_dom_children (basic_block bb) data_reference_p dr; FOR_EACH_VEC_ELT (gbb->data_refs, i, dr) scop->drs.safe_push (dr_info (dr, pbb)); + return NULL; } /* Call-back for dom_walk executed after visiting the dominated