From patchwork Thu Nov 14 15:15:21 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Suchanek X-Patchwork-Id: 291260 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)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 793FF2C009A for ; Fri, 15 Nov 2013 02:16:52 +1100 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:subject:date:message-id:content-type :content-transfer-encoding:mime-version; q=dns; s=default; b=q1f rB5OFkima/Wk7b87fz87iN0IMMuTl693qHYg230YcEWhZ7+Heq7EKScCSei39Nww ULmv1z7j9WwD84krMXYa4GMjNVi6t9MnYRpEgs8cXfr9gW4D9tPEp//N1NsmD2Ow ImcyKAzW288pc/E35POdeSi9WLtep4U3No6X1D0w= 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:from :to:subject:date:message-id:content-type :content-transfer-encoding:mime-version; s=default; bh=4WOz02Lq4 WDxnd3nRWBe4zakw3A=; b=gYw3QPbQGX6Nq8+8O/9DO5PSEKdsjl0sJCQbJ1UEU AeDLShV1nvRH/QJVfcF0xXvwtv1Dc+HXOHBqcHgEG1xtpgPTgfk1eSIkD8DacE3/ PLme2dxPgMbfbK2yarZX8Ga/Vf+9xR3YeWuRiLaE6F27ecZmpst9Hd6ZBvjie/iI pM= Received: (qmail 23731 invoked by alias); 14 Nov 2013 15:16: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 23719 invoked by uid 89); 14 Nov 2013 15:16:40 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=1.4 required=5.0 tests=AWL, BAYES_50, RDNS_NONE, URIBL_BLOCKED autolearn=no version=3.3.2 X-HELO: multi.imgtec.com Received: from Unknown (HELO multi.imgtec.com) (194.200.65.239) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Thu, 14 Nov 2013 15:16:39 +0000 From: Robert Suchanek To: "gcc-patches@gcc.gnu.org" Subject: [PATCH] LRA: check_rtl modifies RTL instruction stream Date: Thu, 14 Nov 2013 15:15:21 +0000 Message-ID: MIME-Version: 1.0 X-SEF-Processed: 7_3_0_01192__2013_11_14_15_16_30 Hi, This patch follows up the problem outlined here: http://gcc.gnu.org/ml/gcc/2013-11/msg00152.html The patch attached prevents adding clobbers when LRA is running in insn_invalid_p function and lra_in_progress variable is being set just before check_rtl call. This should stop modification of insns stream in cases where there is a insn match after adding clobbers. The patch was bootstrapped and regtested on x86_64-unknown-linux-gnu (revision 204787). Regards, Robert 2013-11-13 Robert Suchanek * lra.c (lra): Set lra_in_progress before check_rtl call. * recog.c (insn_invalid_p): Add !lra_in_progress to prevent adding clobber regs when LRA is running diff --git a/gcc/lra.c b/gcc/lra.c index 1aea599..83d45b6 100644 --- a/gcc/lra.c +++ b/gcc/lra.c @@ -2238,6 +2238,10 @@ lra (FILE *f) init_insn_recog_data (); + /* We can not set up reload_in_progress because it prevents new + pseudo creation. */ + lra_in_progress = 1; + #ifdef ENABLE_CHECKING check_rtl (false); #endif @@ -2248,10 +2252,6 @@ lra (FILE *f) setup_reg_spill_flag (); - /* We can not set up reload_in_progress because it prevents new - pseudo creation. */ - lra_in_progress = 1; - /* Function remove_scratches can creates new pseudos for clobbers -- so set up lra_constraint_new_regno_start before its call to permit changing reg classes for pseudos created by this diff --git a/gcc/recog.c b/gcc/recog.c index c8594bb..5c0ec16 100644 --- a/gcc/recog.c +++ b/gcc/recog.c @@ -314,7 +314,9 @@ insn_invalid_p (rtx insn, bool in_group) clobbers. */ int icode = recog (pat, insn, (GET_CODE (pat) == SET - && ! reload_completed && ! reload_in_progress) + && ! reload_completed + && ! reload_in_progress + && ! lra_in_progress) ? &num_clobbers : 0); int is_asm = icode < 0 && asm_noperands (PATTERN (insn)) >= 0;