aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/sched-ebb.c9
2 files changed, 13 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1e5936e..a09a42f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2011-11-30 Jakub Jelinek <jakub@redhat.com>
+
+ PR rtl-optimization/48721
+ * sched-ebb.c (begin_move_insn): Insert empty unreachable
+ block after BARRIER if insn is followed by it.
+
2011-11-30 Richard Henderson <rth@redhat.com>
* config/sparc/sparc-opts.h (enum sparc_memory_model_type): New.
diff --git a/gcc/sched-ebb.c b/gcc/sched-ebb.c
index 9a28e2b..cae9f70 100644
--- a/gcc/sched-ebb.c
+++ b/gcc/sched-ebb.c
@@ -191,8 +191,13 @@ begin_move_insn (rtx insn, rtx last)
gcc_assert (NOTE_INSN_BASIC_BLOCK_P (BB_END (bb)));
}
else
- /* Create an empty unreachable block after the INSN. */
- bb = create_basic_block (NEXT_INSN (insn), NULL_RTX, last_bb);
+ {
+ /* Create an empty unreachable block after the INSN. */
+ rtx next = NEXT_INSN (insn);
+ if (next && BARRIER_P (next))
+ next = NEXT_INSN (next);
+ bb = create_basic_block (next, NULL_RTX, last_bb);
+ }
/* split_edge () creates BB before E->DEST. Keep in mind, that
this operation extends scheduling region till the end of BB.