From patchwork Fri Aug 5 21:35:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Makarov X-Patchwork-Id: 656302 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 3s5g8G0GGmz9s5M for ; Sat, 6 Aug 2016 07:35:25 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=Q7rz6V9V; 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=QJWjc0++mw56B8ef0aceZRwPo8jQddYr9QN6G/mQyTV9nB+xmH Panheu5HysMhdwWjNBXJBxwDt0HmwbcTpiUDyH16wnzzmNbxX5MNT5SMp8igWI00 FJwMEqCRAtIFChVGiaNITOqZK4L4N01ixf1xmz4eAGjRquTkWGHSfHCxg= 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=mSCqaEQW+fAgMomSG2s3qetyo3g=; b=Q7rz6V9VOcSFfTvQJOYd 2R9WwpSIkABQukKJaZ0rUET3b2pKiRGCWml/c7mv825ycepjB+4J8IRCPgHYwNgZ pLYtrrR8Zeqbk9BNLKy+okNawLv5hWQIP+kv/hLWSNNgHmhn8FcHQijc2vjB2lOO Bo2dBlZRJrEhbtkYq3yYeIc= Received: (qmail 117821 invoked by alias); 5 Aug 2016 21:35:18 -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 117808 invoked by uid 89); 5 Aug 2016 21:35:18 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.3 required=5.0 tests=BAYES_00, KAM_ASCII_DIVIDERS, KAM_LAZY_DOMAIN_SECURITY, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=no version=3.3.2 spammy=U*dmalcolm, sk:dmalcol, dmalcolm@redhat.com, dmalcolmredhatcom X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Fri, 05 Aug 2016 21:35:08 +0000 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 00AE43293 for ; Fri, 5 Aug 2016 21:35:07 +0000 (UTC) Received: from brix.home (unused [10.10.52.9] (may be forged)) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u75LZ5V9032349 for ; Fri, 5 Aug 2016 17:35:06 -0400 To: gcc-patches@gcc.gnu.org From: Vladimir N Makarov Subject: one more patch for PR69847 Message-ID: <57A50688.4070505@redhat.com> Date: Fri, 5 Aug 2016 17:35:04 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.1.0 MIME-Version: 1.0 X-IsSubscribed: yes This is a patch to fix some testsuite failures reported for arm: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69847 The patch was bootstrapped and tested on x86-64 and ppc64. Committed as rev. 239180. Index: ChangeLog =================================================================== --- ChangeLog (revision 239179) +++ ChangeLog (working copy) @@ -1,3 +1,10 @@ +2016-08-05 Vladimir Makarov + + PR rtl-optimization/69847 + * lra-constraints.c (process_invariant_for_inheritance): Save + pattern instead of src. + (remove_inheritance_pseudos): Use the pattern. Add assert. + 2016-08-05 David Malcolm * input.c (string_concat::string_concat): New constructor. Index: lra-constraints.c =================================================================== --- lra-constraints.c (revision 238991) +++ lra-constraints.c (working copy) @@ -5475,7 +5475,7 @@ process_invariant_for_inheritance (rtx d cl, "invariant inheritance"); bitmap_set_bit (&lra_inheritance_pseudos, REGNO (new_reg)); bitmap_set_bit (&check_only_regs, REGNO (new_reg)); - lra_reg_info[REGNO (new_reg)].restore_rtx = invariant_rtx; + lra_reg_info[REGNO (new_reg)].restore_rtx = PATTERN (insn); start_sequence (); lra_emit_move (new_reg, dst_reg); new_insns = get_insns (); @@ -6343,9 +6343,11 @@ remove_inheritance_pseudos (bitmap remov start_sequence (); /* We can not just change the source. It might be an insn different from the move. */ - lra_emit_move (SET_DEST (set), lra_reg_info[sregno].restore_rtx); + emit_insn (lra_reg_info[sregno].restore_rtx); rtx_insn *new_insns = get_insns (); end_sequence (); + lra_assert (single_set (new_insns) != NULL + && SET_DEST (set) == SET_DEST (single_set (new_insns))); lra_process_new_insns (curr_insn, NULL, new_insns, "Changing reload<-invariant inheritance"); delete_move_and_clobber (curr_insn, dregno);