diff options
| author | Vladimir Makarov <vmakarov@redhat.com> | 2012-10-24 15:35:12 +0000 |
|---|---|---|
| committer | Vladimir Makarov <vmakarov@gcc.gnu.org> | 2012-10-24 15:35:12 +0000 |
| commit | 911598e3628e754bcd76525980cf15bbdc5d4c7b (patch) | |
| tree | 943a5af4e02ac73b8beb93539c7928a312e4bce5 | |
| parent | 7780fd2a1329454aab5d3cfd4b1bd77294fa5ace (diff) | |
| download | gcc-911598e3628e754bcd76525980cf15bbdc5d4c7b.zip gcc-911598e3628e754bcd76525980cf15bbdc5d4c7b.tar.gz gcc-911598e3628e754bcd76525980cf15bbdc5d4c7b.tar.bz2 | |
re PR bootstrap/55048 (libjava bootstrap failure on trunk after LRA merge)
2012-10-24 Vladimir Makarov <vmakarov@redhat.com>
PR bootstrap/55048
* lra-constraints.c (update_ebb_live_info): Skip
non-NOTE_INSN_BASIC_BLOCK notes.
From-SVN: r192770
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/lra-constraints.c | 4 |
2 files changed, 10 insertions, 0 deletions
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 <vmakarov@redhat.com> + + PR bootstrap/55048 + * lra-constraints.c (update_ebb_live_info): Skip + non-NOTE_INSN_BASIC_BLOCK notes. + 2012-10-24 Jakub Jelinek <jakub@redhat.com> 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) { |