From patchwork Tue Mar 1 09:37:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 590434 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 1167E1402D8 for ; Tue, 1 Mar 2016 20:38:19 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=R6nJvrHs; 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=ng5fGT/BFMWPeASZsxPYGCKVmw8WIFc3tQCp/qVPJn5fCmKPOU L6MsyNPO6xL7PC9let56+nDiNK5CV3kWSUQMmPilYwMu8OwOvEo+wQiGo0Gnx8yy b9HkNXPbkcb3d6+7Rn3eErWzfEAnHqtk9gVk5iCpbWpvY1uqiZ/p+TeiM= 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=FkiPdpRXTm2qVJJoJTm4tOzzReQ=; b=R6nJvrHs1mlQJaUFR4pD wUqHQLA9UYgijccKuAmDBf05wm73f95qXUka5j/v0J82P1hPirxoWW0oDvkeP2e7 Fo1EYRGSUA0g2UXLFqayYqcCJgZOSDjtMjPScMpKwb73I4UWEl+HF4wt1AN636N7 IE5cPgFgxiCGM8q7QH1XbZg= Received: (qmail 1174 invoked by alias); 1 Mar 2016 09:38:09 -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 1157 invoked by uid 89); 1 Mar 2016 09:38:08 -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, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=H*r:Tue, Hx-languages-length:1497, ADDR_EXPR, addr_expr 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; Tue, 01 Mar 2016 09:38:07 +0000 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=SVR-IES-FEM-02.mgc.mentorg.com) by relay1.mentorg.com with esmtp id 1aagkj-00068A-3D from Tom_deVries@mentor.com ; Tue, 01 Mar 2016 01:38:01 -0800 Received: from [127.0.0.1] (137.202.0.76) by SVR-IES-FEM-02.mgc.mentorg.com (137.202.0.106) with Microsoft SMTP Server id 14.3.224.2; Tue, 1 Mar 2016 09:38:00 +0000 To: Sebastian Pop CC: GCC Patches , Richard Biener From: Tom de Vries Subject: [PATCH, PR68659] Handle addr_expr and component_ref in graphite-ast-to-ast Message-ID: <56D562F5.2090608@mentor.com> Date: Tue, 1 Mar 2016 10:37:57 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.5.1 MIME-Version: 1.0 Hi, this patch fixes graphite PR68659, which is a 6 regression. The patch fixes two things: - by handling new_expr == NULL_TREE in collect_all_ssa_names, it handles a COMPONENT_REF where operand 2 is NULL_TREE. - it handles an ADDR_EXPR in get_new_name. Together, they allow the currently failing test-case gcc.dg/graphite/id-pr45230-1.c to pass. Bootstrapped and reg-tested on x86_64. OK for stage4 trunk? Thanks, - Tom Handle addr_expr and component_ref in graphite-ast-to-ast 2016-03-01 Tom de Vries PR tree-optimization/68659 * graphite-isl-ast-to-gimple.c (collect_all_ssa_names): Handle new_expr == NULL_TREE. (get_new_name): Handle ADDR_EXPR. --- gcc/graphite-isl-ast-to-gimple.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gcc/graphite-isl-ast-to-gimple.c b/gcc/graphite-isl-ast-to-gimple.c index d3614e4..102306b 100644 --- a/gcc/graphite-isl-ast-to-gimple.c +++ b/gcc/graphite-isl-ast-to-gimple.c @@ -1403,6 +1403,8 @@ gsi_insert_earliest (gimple_seq seq) void translate_isl_ast_to_gimple:: collect_all_ssa_names (tree new_expr, vec *vec_ssa) { + if (new_expr == NULL_TREE) + return; /* Rename all uses in new_expr. */ if (TREE_CODE (new_expr) == SSA_NAME) @@ -1804,6 +1806,9 @@ get_new_name (basic_block new_bb, tree op, if (is_constant (op)) return op; + if (TREE_CODE (op) == ADDR_EXPR) + return op; + return get_rename (new_bb, op, old_bb, phi_kind); }