From patchwork Thu Dec 13 19:37:24 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 206207 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]) by ozlabs.org (Postfix) with SMTP id 11CF62C0095 for ; Fri, 14 Dec 2012 06:37:44 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1356032265; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Message-ID:Date:From:User-Agent:MIME-Version:To:Subject: Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:Sender:Delivered-To; bh=/zeu+hm fmDv4Eiymt4hJWPzQE14=; b=XUHSrmlzQEC3ZBYUCME9mF3y4ayqSM4e1tAoJAt Rlgde5eDvo51i34yXQylmB3NwINEwIdndv/rnEGdm50dzu7SWD2D5t3M/SnNUUft QfL8RDEkQGbQPurD/1YVzBcDLULD2V5CSQ0tPDwuzKnyIzShy9Q2oeLEbr2Eioi5 xST8= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Received:Message-ID:Date:From:User-Agent:MIME-Version:To:Subject:Content-Type:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=Et3nMGHwmgXknWZ1zlHmQra4J2lFsuk3Oyy6W2I9hDgZn19gA/Xhl+8BrqQNuk qGgUrJPJQg3udGB4wrJ8k9ukN+wWu4cdxvTCN+81aJfp+Ya5nN0QzJUl3R9BUly0 gB3MsCyoSqPbUuIfzZQkFRTtHHx1R7gqHa/BlcsnDwtCY=; Received: (qmail 15160 invoked by alias); 13 Dec 2012 19:37:42 -0000 Received: (qmail 15149 invoked by uid 22791); 13 Dec 2012 19:37:41 -0000 X-SWARE-Spam-Status: No, hits=-6.2 required=5.0 tests=AWL, BAYES_00, KHOP_RCVD_UNTRUST, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, SPF_HELO_PASS X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 13 Dec 2012 19:37:27 +0000 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qBDJbPvb025301 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 13 Dec 2012 14:37:25 -0500 Received: from anchor.twiddle.home (vpn-231-182.phx2.redhat.com [10.3.231.182]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qBDJbPRL012370 for ; Thu, 13 Dec 2012 14:37:25 -0500 Message-ID: <50CA2E74.2050908@redhat.com> Date: Thu, 13 Dec 2012 11:37:24 -0800 From: Richard Henderson User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/17.0 Thunderbird/17.0 MIME-Version: 1.0 To: GCC Patches Subject: [alpha] Fix dwarf2 call-arg-location ICE X-IsSubscribed: yes 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 Here's me wishing that NOTE_INSN_CALL_ARG_LOCATION was a reg note and not an insn note. Mainly because it's required to be adjacent to the call insn, modulo barriers apparently. This just started failing recently, though I didn't check to see what sort of other change might have precipitated this. Tested via cross to alphaev67-linux. r~ * config/alpha/alpha.c (alpha_pad_function_end): Consider barriers when looking for NOTE_INSN_CALL_ARG_LOCATION. diff --git a/gcc/config/alpha/alpha.c b/gcc/config/alpha/alpha.c index 82135ff..8411218 100644 --- a/gcc/config/alpha/alpha.c +++ b/gcc/config/alpha/alpha.c @@ -9253,23 +9253,26 @@ alpha_pad_function_end (void) for (insn = get_insns (); insn; insn = NEXT_INSN (insn)) { - if (! (CALL_P (insn) - && (SIBLING_CALL_P (insn) - || find_reg_note (insn, REG_NORETURN, NULL_RTX)))) + if (!CALL_P (insn) + || !(SIBLING_CALL_P (insn) + || find_reg_note (insn, REG_NORETURN, NULL_RTX))) continue; /* Make sure we do not split a call and its corresponding CALL_ARG_LOCATION note. */ - if (CALL_P (insn)) + next = NEXT_INSN (insn); + if (next == NULL) + continue; + if (BARRIER_P (next)) { - next = NEXT_INSN (insn); - if (next && NOTE_P (next) - && NOTE_KIND (next) == NOTE_INSN_CALL_ARG_LOCATION) - insn = next; + next = NEXT_INSN (next); + if (next == NULL) + continue; } + if (NOTE_P (next) && NOTE_KIND (next) == NOTE_INSN_CALL_ARG_LOCATION) + insn = next; next = next_active_insn (insn); - if (next) { rtx pat = PATTERN (next);