From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 11369 invoked by alias); 14 Jul 2011 23:09:48 -0000 Received: (qmail 11333 invoked by uid 22791); 14 Jul 2011 23:09:46 -0000 X-SWARE-Spam-Status: No, hits=-2.2 required=5.0 tests=AWL,BAYES_00,DKIM_SIGNED,DKIM_VALID,FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW,T_TO_NO_BRKTS_FREEMAIL X-Spam-Check-By: sourceware.org Received: from mail-vx0-f175.google.com (HELO mail-vx0-f175.google.com) (209.85.220.175) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 14 Jul 2011 23:09:12 +0000 Received: by vxh2 with SMTP id 2so42455vxh.20 for ; Thu, 14 Jul 2011 16:09:11 -0700 (PDT) Received: by 10.52.38.230 with SMTP id j6mr3054141vdk.390.1310684951901; Thu, 14 Jul 2011 16:09:11 -0700 (PDT) Received: from localhost.localdomain (c-71-227-161-214.hsd1.wa.comcast.net [71.227.161.214]) by mx.google.com with ESMTPS id a14sm173386vcp.47.2011.07.14.16.09.10 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 14 Jul 2011 16:09:11 -0700 (PDT) From: Richard Henderson To: bernds@codesourcery.com Cc: gcc-patches@gcc.gnu.org Subject: [PATCH 2/9] dwarf2cfi: Rename cfi_insn to add_cfi_insn. Date: Thu, 14 Jul 2011 23:10:00 -0000 Message-Id: <1310684876-6244-3-git-send-email-rth@redhat.com> In-Reply-To: <1310684876-6244-1-git-send-email-rth@redhat.com> References: <1310684876-6244-1-git-send-email-rth@redhat.com> X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org X-SW-Source: 2011-07/txt/msg01208.txt.bz2 Make it consistent with add_cfi_vec. --- gcc/dwarf2cfi.c | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/gcc/dwarf2cfi.c b/gcc/dwarf2cfi.c index 1c1b74f..eb59f28 100644 --- a/gcc/dwarf2cfi.c +++ b/gcc/dwarf2cfi.c @@ -86,7 +86,7 @@ static GTY(()) dw_cfi_row_ref cie_cfi_row; static GTY(()) unsigned long dwarf2out_cfi_label_num; /* The insn after which a new CFI note should be emitted. */ -static rtx cfi_insn; +static rtx add_cfi_insn; /* When non-null, add_cfi will add the CFI to this vector. */ static cfi_vec *add_cfi_vec; @@ -274,11 +274,13 @@ add_cfi (dw_cfi_ref cfi) } any_cfis_emitted = true; - if (cfi_insn != NULL) + + if (add_cfi_insn != NULL) { - cfi_insn = emit_note_after (NOTE_INSN_CFI, cfi_insn); - NOTE_CFI (cfi_insn) = cfi; + add_cfi_insn = emit_note_after (NOTE_INSN_CFI, add_cfi_insn); + NOTE_CFI (add_cfi_insn) = cfi; } + if (add_cfi_vec != NULL) VEC_safe_push (dw_cfi_ref, gc, *add_cfi_vec, cfi); } @@ -2319,7 +2321,7 @@ create_cfi_notes (void) { rtx pat; - cfi_insn = PREV_INSN (insn); + add_cfi_insn = PREV_INSN (insn); if (BARRIER_P (insn)) { @@ -2342,7 +2344,7 @@ create_cfi_notes (void) break; case NOTE_INSN_CFA_RESTORE_STATE: - cfi_insn = insn; + add_cfi_insn = insn; dwarf2out_frame_debug_restore_state (); break; } @@ -2372,13 +2374,13 @@ create_cfi_notes (void) /* Do not separate tablejump insns from their ADDR_DIFF_VEC. Putting the note after the VEC should be ok. */ - if (!tablejump_p (insn, NULL, &cfi_insn)) - cfi_insn = insn; + if (!tablejump_p (insn, NULL, &add_cfi_insn)) + add_cfi_insn = insn; dwarf2out_frame_debug (insn, true); } - cfi_insn = NULL; + add_cfi_insn = NULL; } /* Determine if we need to save and restore CFI information around this -- 1.7.6