re PR rtl-optimization/56131 (gcc.dg/pr56035.c ICEs gcc on sparc-linux)

2013-02-25  Tom de Vries  <tom@codesourcery.com>

	PR rtl-optimization/56131
	* insn-notes.def (INSN_NOTE_BASIC_BLOCK): Update comment.
	* cfgrtl.c (delete_insn): Don't reorder NOTE_INSN_DELETED_LABEL and
	NOTE_INSN_BASIC_BLOCK if BLOCK_FOR_INSN == NULL.

From-SVN: r196255

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7b495e783affcfdab846372c6de02e60aea902ee..2d81aa5ceaf4a12b1f5aeac546f45a5266f0b825 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2013-02-25  Tom de Vries  <tom@codesourcery.com>
+
+       PR rtl-optimization/56131
+       * insn-notes.def (INSN_NOTE_BASIC_BLOCK): Update comment.
+       * cfgrtl.c (delete_insn): Don't reorder NOTE_INSN_DELETED_LABEL and
+       NOTE_INSN_BASIC_BLOCK if BLOCK_FOR_INSN == NULL.
+
 2013-02-25  Tobias Burnus  <burnus@net-b.de>
 
        * doc/invoke.texi (-fsanitize=): Move from optimization

diff --git a/gcc/cfgrtl.c b/gcc/cfgrtl.c
index c6ed44f8a7e7041bd8c3100f9095c42b394c121f..ec1ba9ad71c86af49e814a12d7958d3c2bbc75ef 100644 (file)
--- a/gcc/cfgrtl.c
+++ b/gcc/cfgrtl.c
@@ -135,7 +135,7 @@ delete_insn (rtx insn)
       if (! can_delete_label_p (insn))
        {
          const char *name = LABEL_NAME (insn);
-         basic_block bb, label_bb = BLOCK_FOR_INSN (insn);
+         basic_block bb = BLOCK_FOR_INSN (insn);
          rtx bb_note = NEXT_INSN (insn);
 
          really_delete = false;
@@ -144,15 +144,13 @@ delete_insn (rtx insn)
          NOTE_DELETED_LABEL_NAME (insn) = name;
 
          /* If the note following the label starts a basic block, and the
-            label is a member of the same basic block, interchange the two.
-            If the label is not marked with a bb, assume it's the same bb.  */
+            label is a member of the same basic block, interchange the two.  */
          if (bb_note != NULL_RTX
              && NOTE_INSN_BASIC_BLOCK_P (bb_note)
-             && (label_bb == NOTE_BASIC_BLOCK (bb_note)
-                 || label_bb == NULL))
+             && bb != NULL
+             && bb == BLOCK_FOR_INSN (bb_note))
            {
              reorder_insns_nobb (insn, insn, bb_note);
-             bb = NOTE_BASIC_BLOCK (bb_note);
              BB_HEAD (bb) = bb_note;
              if (BB_END (bb) == bb_note)
                BB_END (bb) = insn;

diff --git a/gcc/insn-notes.def b/gcc/insn-notes.def
index 9c1523edb3e5d8b6cbaa9f835109119813dc2c3e..1a9883cefe035e89390175333aa8960f6774864c 100644 (file)
--- a/gcc/insn-notes.def
+++ b/gcc/insn-notes.def
@@ -70,7 +70,9 @@ INSN_NOTE (CALL_ARG_LOCATION)
 
 /* Record the struct for the following basic block.  Uses
    NOTE_BASIC_BLOCK.  FIXME: Redundant with the basic block pointer
-   now included in every insn.  */
+   now included in every insn.  NOTE: If there's no CFG anymore, in other words,
+   if BLOCK_FOR_INSN () == NULL, NOTE_BASIC_BLOCK cannot be considered reliable
+   anymore.  */
 INSN_NOTE (BASIC_BLOCK)
 
 /* Mark the inflection point in the instruction stream where we switch