jump.c (cleanup_barriers): Use delete_insn instead of delete_barrier.

	* jump.c (cleanup_barriers): Use delete_insn instead of
	delete_barrier.
	(delete_barrier): Remove.
	* rtl.h: Remove the corresponding prototype.

From-SVN: r90090

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fba5fde88c347d5a16ded79d33e5c84f294be234..23d340156899c7374bbb646609f8eea2e9173f64 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2004-11-04  Kazu Hirata  <kazu@cs.umass.edu>
+
+       * jump.c (cleanup_barriers): Use delete_insn instead of
+       delete_barrier.
+       (delete_barrier): Remove.
+       * rtl.h: Remove the corresponding prototype.
+
 2004-11-04  Kazu Hirata  <kazu@cs.umass.edu>
 
        * expr.c (mostly_zero_p): Make it static.

diff --git a/gcc/jump.c b/gcc/jump.c
index b84841c1754daa767795b03e029ac8ee91076455..ed6ef1e5871c186de777ce9fe8e448b55f82121b 100644 (file)
--- a/gcc/jump.c
+++ b/gcc/jump.c
@@ -114,7 +114,7 @@ cleanup_barriers (void)
        {
          prev = prev_nonnote_insn (insn);
          if (BARRIER_P (prev))
-           delete_barrier (insn);
+           delete_insn (insn);
          else if (prev != PREV_INSN (insn))
            reorder_insns (insn, insn, prev);
        }
@@ -1167,17 +1167,6 @@ delete_jump (rtx insn)
     delete_computation (insn);
 }
 
-/* Verify INSN is a BARRIER and delete it.  */
-
-void
-delete_barrier (rtx insn)
-{
-  if (!BARRIER_P (insn))
-    abort ();
-
-  delete_insn (insn);
-}
-
 /* Recursively delete prior insns that compute the value (used only by INSN
    which the caller is deleting) stored in the register mentioned by NOTE
    which is a REG_DEAD note associated with INSN.  */

diff --git a/gcc/rtl.h b/gcc/rtl.h
index 67eea8b04b9dbd235334d943b1dddecf255257db..766cebebd608186ec575ba9bfc2a280499612840 100644 (file)
--- a/gcc/rtl.h
+++ b/gcc/rtl.h
@@ -1528,7 +1528,6 @@ extern void cleanup_barriers (void);
 extern bool squeeze_notes (rtx *, rtx *);
 extern rtx delete_related_insns (rtx);
 extern void delete_jump (rtx);
-extern void delete_barrier (rtx);
 extern rtx get_label_before (rtx);
 extern rtx get_label_after (rtx);
 extern rtx follow_jumps (rtx);