From patchwork Mon Jun 16 15:05:52 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ramana Radhakrishnan X-Patchwork-Id: 360160 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 3365E140080 for ; Tue, 17 Jun 2014 01:06:04 +1000 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :message-id:date:from:mime-version:to:cc:subject:content-type; q=dns; s=default; b=QLo2E1XPD6poS0azP7XvDL49wBZC9zqECnkxzen1Z82 qGog1fWGDcy8Yf9Vv4n3xqshDLa4RvwC+ngTGpnVT4EsiiACXfTlKpMac7PNiYde HSjm33L7294y+37jt8I/A8k+yoe5mYBtMF7oLwOo8KGpGQuVU+PqmmmrmeZ95Xro = 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 :message-id:date:from:mime-version:to:cc:subject:content-type; s=default; bh=3u6+mFqOTdD1hdUZ4B5P1sbWAPc=; b=ZW97HhVapmDcbo0A+ Rqbf59LgsFXtPMYXJNBjSB87Zn1PC7DnQLsNgKpvccWxNwSnN2Myr/F2XFrPicVP B5LzMkp8XLKJNLLqp/PAWmyQ/e4f4pmcS+fdYXknhz2Dd5ORlHw/qaeBdnAUm3MP 1C0GtDZsQFsyJdkAlLRxDaHIdg= Received: (qmail 28894 invoked by alias); 16 Jun 2014 15:05:57 -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 28881 invoked by uid 89); 16 Jun 2014 15:05:56 -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: collaborate-mta1.arm.com Received: from fw-tnat.austin.arm.com (HELO collaborate-mta1.arm.com) (217.140.110.23) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 16 Jun 2014 15:05:55 +0000 Received: from [10.1.209.147] (e104577-lin.cambridge.arm.com [10.1.209.147]) by collaborate-mta1.arm.com (Postfix) with ESMTPS id 9E9BC13F7F3; Mon, 16 Jun 2014 10:05:53 -0500 (CDT) Message-ID: <539F07D0.3040609@arm.com> Date: Mon, 16 Jun 2014 16:05:52 +0100 From: Ramana Radhakrishnan User-Agent: Mozilla/5.0 (X11; Linux i686 on x86_64; rv:14.0) Gecko/20120713 Thunderbird/14.0 MIME-Version: 1.0 To: "gcc-patches@gcc.gnu.org ;" CC: Jakub Jelinek , Richard Biener Subject: [Patch LRA] PR 61522 - Handle NULL targetm.spill_class X-IsSubscribed: yes Hi, This handles NULL targetm.spill_class in assign_by_spills. This showed up as a segfault during a build for arm-none-linux-gnueabi(hf). Fix pre-approved by richi on IRC , verified that bootstrap continues from where things broke further on a tree (that reverts 211600 which is the next breakage causing commit on arm-none-linux-gnueabihf) I'll apply this in about 45 minutes when I get back to my desk if no one objects. regards Ramana 2014-06-16 Ramana Radhakrishnan PR rtl-optimization/61522 * lra-assigns.c (assign_by_spills): Handle NULL targetm.spill_class. diff --git a/gcc/lra-assigns.c b/gcc/lra-assigns.c index cea4c33..5de18e1 100644 --- a/gcc/lra-assigns.c +++ b/gcc/lra-assigns.c @@ -1420,7 +1420,7 @@ assign_by_spills (void) alternatives of insns containing the pseudo. */ bitmap_set_bit (&changed_pseudo_bitmap, regno); } - else + else if (targetm.spill_class) { enum reg_class rclass = lra_get_allocno_class (regno); enum reg_class spill_class; @@ -1438,12 +1438,12 @@ assign_by_spills (void) if (hard_regno < 0) regno_allocno_class_array[regno] = rclass; else - { - setup_reg_classes - (regno, spill_class, spill_class, spill_class); - assign_hard_regno (hard_regno, regno); - bitmap_set_bit (&changed_pseudo_bitmap, regno); - } + { + setup_reg_classes + (regno, spill_class, spill_class, spill_class); + assign_hard_regno (hard_regno, regno); + bitmap_set_bit (&changed_pseudo_bitmap, regno); + } } } }