From patchwork Mon Nov 16 21:33:28 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: 545172 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 EF4CD1414A2 for ; Tue, 17 Nov 2015 08:34:23 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=kXr1Oamh; 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 :from:subject:message-id:date:mime-version:content-type; q=dns; s=default; b=AVh+iuHZ1QF7gSkIztwbWrTAPkBWanBM235grAwOVzfEPGJatl AtUQmFxHLfFEKcEMb8eOI44PN7VS+MQsiTdySWujzbRn9S/y3LDNGiTwXaNLBh71 G+wfRQEtF4IhwziaLMl63jEo71T6qFKLkheSs0mrw0VrkeLFCzRHtWbig= 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 :from:subject:message-id:date:mime-version:content-type; s= default; bh=kx1EgX7GQui9RR5H5wPgn4C7m6A=; b=kXr1Oamh7qMmoa3zKylF zd/EliZurJsd40iay5CEGq6rn2rVkEzvEbl/UuT+3LAsancYjGu+GH4BS/ukY5/w J/70bLcG5P9/oDFzLYwd98kp72DMGMdMDUzt9nvSn7rGRaExbPHwHqAIYZGysbvl GZ8cn5t7GUgI88Qy9rEeJgw= Received: (qmail 106241 invoked by alias); 16 Nov 2015 21:34:16 -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 106229 invoked by uid 89); 16 Nov 2015 21:34:15 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.4 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_PASS 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; Mon, 16 Nov 2015 21:34:14 +0000 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59827) by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1ZyRPg-00034E-5W for gcc-patches@gnu.org; Mon, 16 Nov 2015 16:34:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZyRPa-00075I-L2 for gcc-patches@gnu.org; Mon, 16 Nov 2015 16:34:11 -0500 Received: from relay1.mentorg.com ([192.94.38.131]:48947) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZyRPa-000743-FV for gcc-patches@gnu.org; Mon, 16 Nov 2015 16:34:06 -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 1ZyRPY-0006TX-RE from Tom_deVries@mentor.com for gcc-patches@gnu.org; Mon, 16 Nov 2015 13:34:05 -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; Mon, 16 Nov 2015 21:34:03 +0000 To: "gcc-patches@gnu.org" From: Tom de Vries Subject: [PATCH] Clear LOOP_CLOSED_SSA after pass_ccp Message-ID: <564A4BA8.6000309@mentor.com> Date: Mon, 16 Nov 2015 22:33:28 +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, while playing around with inserting pass_ccp here and there in the pass list, I put it after a pass where the loops state contained LOOP_CLOSED_SSA. And apparently pass_ccp does not preserve loop-closed ssa. As a consequence, during executing the pass_ccp todos, verify_loop_closed_ssa fails. This patch fixes that by noting in pass_ccp that it does not preserve loop-closed ssa. OK for trunk if bootstrap and reg-test succeeds? Thanks, - Tom Clear LOOP_CLOSED_SSA after pass_ccp 2015-11-16 Tom de Vries * tree-ssa-ccp.c (do_ssa_ccp): Clear LOOP_CLOSED_SSA in loops state if something changed. --- gcc/tree-ssa-ccp.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gcc/tree-ssa-ccp.c b/gcc/tree-ssa-ccp.c index 7b6b451..7e8bc52 100644 --- a/gcc/tree-ssa-ccp.c +++ b/gcc/tree-ssa-ccp.c @@ -139,6 +139,7 @@ along with GCC; see the file COPYING3. If not see #include "params.h" #include "builtins.h" #include "tree-chkp.h" +#include "cfgloop.h" /* Possible lattice values. */ @@ -2402,10 +2403,17 @@ do_ssa_ccp (bool nonzero_p) { unsigned int todo = 0; calculate_dominance_info (CDI_DOMINATORS); + ccp_initialize (); ssa_propagate (ccp_visit_stmt, ccp_visit_phi_node); if (ccp_finalize (nonzero_p)) - todo = (TODO_cleanup_cfg | TODO_update_ssa); + { + todo = (TODO_cleanup_cfg | TODO_update_ssa); + + /* ccp_finalize does not preserve loop-closed ssa. */ + loops_state_clear (LOOP_CLOSED_SSA); + } + free_dominance_info (CDI_DOMINATORS); return todo; }