diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2ce2c3ef9e3..7211353de84 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 32ecfee7659..1b56a0b4e54 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)
 	{