From 87e9bf8717a584048037479f251611ec8924903d Mon Sep 17 00:00:00 2001 From: kenner Date: Fri, 21 Apr 2000 19:32:10 +0000 Subject: * rtl.c: Use NOTE_INSN_REPEATED_LINE_NUMBER and NOTE_INSN_RANGE_BEG. * rtl.h: Likewise. * rtl.def: Update comment. * function.c (expand_function): Use NOTE_INSN_REPEATED_LINE_NUMBER. * integrate.c (expand_inline_function): Likewise. * profile.c (branch_prob): Likewise. * ggc-common.c (ggc_mark_rtx_children): Use NOTE_INSN_RANGE_BEG. * print-rtl.c (print_rtx): Likewise. * haifa-sched.c (sched_analyze, unlink_other_notes): Likewise. (reemit_notes): Likewise; also use enum insn_note. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@33314 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/haifa-sched.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gcc/haifa-sched.c') diff --git a/gcc/haifa-sched.c b/gcc/haifa-sched.c index 4e6da394f45..3feecdd4631 100644 --- a/gcc/haifa-sched.c +++ b/gcc/haifa-sched.c @@ -3939,7 +3939,7 @@ sched_analyze (deps, head, tail) ??? Actually, the reemit_notes just say what is done, not why. */ else if (GET_CODE (insn) == NOTE - && (NOTE_LINE_NUMBER (insn) == NOTE_INSN_RANGE_START + && (NOTE_LINE_NUMBER (insn) == NOTE_INSN_RANGE_BEG || NOTE_LINE_NUMBER (insn) == NOTE_INSN_RANGE_END)) { loop_notes = alloc_EXPR_LIST (REG_SAVE_NOTE, NOTE_RANGE_INFO (insn), @@ -4277,7 +4277,7 @@ unlink_other_notes (insn, tail) if (NOTE_LINE_NUMBER (insn) != NOTE_INSN_SETJMP && NOTE_LINE_NUMBER (insn) != NOTE_INSN_LOOP_BEG && NOTE_LINE_NUMBER (insn) != NOTE_INSN_LOOP_END - && NOTE_LINE_NUMBER (insn) != NOTE_INSN_RANGE_START + && NOTE_LINE_NUMBER (insn) != NOTE_INSN_RANGE_BEG && NOTE_LINE_NUMBER (insn) != NOTE_INSN_RANGE_END && NOTE_LINE_NUMBER (insn) != NOTE_INSN_EH_REGION_BEG && NOTE_LINE_NUMBER (insn) != NOTE_INSN_EH_REGION_END) @@ -5632,7 +5632,8 @@ reemit_notes (insn, last) { if (REG_NOTE_KIND (note) == REG_SAVE_NOTE) { - int note_type = INTVAL (XEXP (note, 0)); + enum insn_note note_type = INTVAL (XEXP (note, 0)); + if (note_type == NOTE_INSN_SETJMP) { retval = emit_note_after (NOTE_INSN_SETJMP, insn); @@ -5640,7 +5641,7 @@ reemit_notes (insn, last) remove_note (insn, note); note = XEXP (note, 1); } - else if (note_type == NOTE_INSN_RANGE_START + else if (note_type == NOTE_INSN_RANGE_BEG || note_type == NOTE_INSN_RANGE_END) { last = emit_note_before (note_type, last); -- cgit v1.2.1