* basic-block.h: Remove the prototype for

	commit_edge_insertions_watch_calls.
 	* cfgrtl.c (commit_edge_insertion): Drop the last argument.
	Simplify.
	(commit_edge_insertions_watch_calls): Remove.
	(commit_edge_insertions): Adjust the call to
	commit_one_edge_insertion.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@120157 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5314fc9..1c10a14 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2006-12-22  Kazu Hirata  <kazu@codesourcery.com>
+
+       * basic-block.h: Remove the prototype for
+       commit_edge_insertions_watch_calls.
+       * cfgrtl.c (commit_edge_insertion): Drop the last argument.
+       Simplify.
+       (commit_edge_insertions_watch_calls): Remove.
+       (commit_edge_insertions): Adjust the call to
+       commit_one_edge_insertion.
+
 2006-12-22  Zdenek Dvorak <dvorakz@suse.cz>
 
        * tree-ssa-loop-niter.c (zero_p, nonzero_p): Removed.

diff --git a/gcc/basic-block.h b/gcc/basic-block.h
index dd5d1f3..1621230 100644 (file)
--- a/gcc/basic-block.h
+++ b/gcc/basic-block.h
@@ -489,7 +489,6 @@ extern void insert_insn_on_edge (rtx, edge);
 basic_block split_edge_and_insert (edge, rtx);
 
 extern void commit_edge_insertions (void);
-extern void commit_edge_insertions_watch_calls (void);
 
 extern void remove_fake_edges (void);
 extern void remove_fake_exit_edges (void);

diff --git a/gcc/cfgrtl.c b/gcc/cfgrtl.c
index 4ff3058..bb70bdf 100644 (file)
--- a/gcc/cfgrtl.c
+++ b/gcc/cfgrtl.c
@@ -63,7 +63,7 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
 
 static int can_delete_note_p (rtx);
 static int can_delete_label_p (rtx);
-static void commit_one_edge_insertion (edge, int);
+static void commit_one_edge_insertion (edge);
 static basic_block rtl_split_edge (edge);
 static bool rtl_move_block_after (basic_block, basic_block);
 static int rtl_verify_flow_info (void);
@@ -1337,7 +1337,7 @@ insert_insn_on_edge (rtx pattern, edge e)
 /* Update the CFG for the instructions queued on edge E.  */
 
 static void
-commit_one_edge_insertion (edge e, int watch_calls)
+commit_one_edge_insertion (edge e)
 {
   rtx before = NULL_RTX, after = NULL_RTX, insns, tmp, last;
   basic_block bb = NULL;
@@ -1346,25 +1346,6 @@ commit_one_edge_insertion (edge e, int watch_calls)
   insns = e->insns.r;
   e->insns.r = NULL_RTX;
 
-  /* Special case -- avoid inserting code between call and storing
-     its return value.  */
-  if (watch_calls && (e->flags & EDGE_FALLTHRU)
-      && single_pred_p (e->dest)
-      && e->src != ENTRY_BLOCK_PTR
-      && CALL_P (BB_END (e->src)))
-    {
-      rtx next = next_nonnote_insn (BB_END (e->src));
-
-      after = BB_HEAD (e->dest);
-      /* The first insn after the call may be a stack pop, skip it.  */
-      while (next
-            && keep_with_call_p (next))
-       {
-         after = next;
-         next = next_nonnote_insn (next);
-       }
-      bb = e->dest;
-    }
   if (!before && !after)
     {
       /* Figure out where to put these things.  If the destination has
@@ -1503,7 +1484,7 @@ commit_edge_insertions (void)
        if (e->insns.r)
          {
            changed = true;
-           commit_one_edge_insertion (e, false);
+           commit_one_edge_insertion (e);
          }
     }
 
@@ -1532,51 +1513,6 @@ commit_edge_insertions (void)
   sbitmap_free (blocks);
 }
 \f
-/* Update the CFG for all queued instructions, taking special care of inserting
-   code on edges between call and storing its return value.  */
-
-void
-commit_edge_insertions_watch_calls (void)
-{
-  basic_block bb;
-  sbitmap blocks;
-  bool changed = false;
-
-#ifdef ENABLE_CHECKING
-  verify_flow_info ();
-#endif
-
-  FOR_BB_BETWEEN (bb, ENTRY_BLOCK_PTR, EXIT_BLOCK_PTR, next_bb)
-    {
-      edge e;
-      edge_iterator ei;
-
-      FOR_EACH_EDGE (e, ei, bb->succs)
-       if (e->insns.r)
-         {
-           changed = true;
-           commit_one_edge_insertion (e, true);
-         }
-    }
-
-  if (!changed)
-    return;
-
-  blocks = sbitmap_alloc (last_basic_block);
-  sbitmap_zero (blocks);
-  FOR_EACH_BB (bb)
-    if (bb->aux)
-      {
-       SET_BIT (blocks, bb->index);
-       /* Check for forgotten bb->aux values before commit_edge_insertions
-          call.  */
-       gcc_assert (bb->aux == &bb->aux);
-       bb->aux = NULL;
-      }
-  find_many_sub_basic_blocks (blocks);
-  sbitmap_free (blocks);
-}
-\f
 /* Print out RTL-specific basic block information (live information
    at start and end).  */