From 911598e3628e754bcd76525980cf15bbdc5d4c7b Mon Sep 17 00:00:00 2001 From: Vladimir Makarov Date: Wed, 24 Oct 2012 15:35:12 +0000 Subject: [PATCH] re PR bootstrap/55048 (libjava bootstrap failure on trunk after LRA merge) 2012-10-24 Vladimir Makarov PR bootstrap/55048 * lra-constraints.c (update_ebb_live_info): Skip non-NOTE_INSN_BASIC_BLOCK notes. From-SVN: r192770 --- gcc/ChangeLog | 6 ++++++ gcc/lra-constraints.c | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 2ce2c3e..7211353 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2012-10-24 Vladimir Makarov + + PR bootstrap/55048 + * lra-constraints.c (update_ebb_live_info): Skip + non-NOTE_INSN_BASIC_BLOCK notes. + 2012-10-24 Jakub Jelinek PR rtl-optimization/55010 diff --git a/gcc/lra-constraints.c b/gcc/lra-constraints.c index 32ecfee..1b56a0b 100644 --- a/gcc/lra-constraints.c +++ b/gcc/lra-constraints.c @@ -4300,6 +4300,10 @@ update_ebb_live_info (rtx head, rtx tail) curr_insn = prev_insn) { prev_insn = PREV_INSN (curr_insn); + /* We need to process empty blocks too. They contain + NOTE_INSN_BASIC_BLOCK referring for the basic block. */ + if (NOTE_P (curr_insn) && NOTE_KIND (curr_insn) != NOTE_INSN_BASIC_BLOCK) + continue; curr_bb = BLOCK_FOR_INSN (curr_insn); if (curr_bb != prev_bb) { -- 2.7.4