mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-25 20:11:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Tom de Vries 2013-02-25 11:50:25 +00:00 committed by Tom de Vries
parent 3fdb53c1ea
commit 5e5df392f8
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/ChangeLog
View File

@ -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> 2013-02-25 Tobias Burnus <burnus@net-b.de>
* doc/invoke.texi (-fsanitize=): Move from optimization * doc/invoke.texi (-fsanitize=): Move from optimization

10
gcc/cfgrtl.c
View File

@ -135,7 +135,7 @@ delete_insn (rtx insn)
if (! can_delete_label_p (insn)) if (! can_delete_label_p (insn))
{ {
const char *name = LABEL_NAME (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); rtx bb_note = NEXT_INSN (insn);
really_delete = false; really_delete = false;
@ -144,15 +144,13 @@ delete_insn (rtx insn)
NOTE_DELETED_LABEL_NAME (insn) = name; NOTE_DELETED_LABEL_NAME (insn) = name;
/* If the note following the label starts a basic block, and the /* If the note following the label starts a basic block, and the
label is a member of the same basic block, interchange the two. 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. */
if (bb_note != NULL_RTX if (bb_note != NULL_RTX
&& NOTE_INSN_BASIC_BLOCK_P (bb_note) && NOTE_INSN_BASIC_BLOCK_P (bb_note)
&& (label_bb == NOTE_BASIC_BLOCK (bb_note) && bb != NULL
|| label_bb == NULL)) && bb == BLOCK_FOR_INSN (bb_note))
{ {
reorder_insns_nobb (insn, insn, bb_note); reorder_insns_nobb (insn, insn, bb_note);
bb = NOTE_BASIC_BLOCK (bb_note);
BB_HEAD (bb) = bb_note; BB_HEAD (bb) = bb_note;
if (BB_END (bb) == bb_note) if (BB_END (bb) == bb_note)
BB_END (bb) = insn; BB_END (bb) = insn;

4
gcc/insn-notes.def
View File

@ -70,7 +70,9 @@ INSN_NOTE (CALL_ARG_LOCATION)
/* Record the struct for the following basic block. Uses /* Record the struct for the following basic block. Uses
NOTE_BASIC_BLOCK. FIXME: Redundant with the basic block pointer 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) INSN_NOTE (BASIC_BLOCK)
/* Mark the inflection point in the instruction stream where we switch /* Mark the inflection point in the instruction stream where we switch