stmt.c (any_pending_cleanups): Lose argument THIS_CONTOUR, it was always passed in the value '1'.

        * stmt.c (any_pending_cleanups): Lose argument THIS_CONTOUR, it
        was always passed in the value '1'.  Simplify body appropriately.
        * tree.h (any_pending_cleanups): Corresponding changes.
        * calls.c: (expand_call): Corresponding changes.

From-SVN: r68754

4 files changed, 16 insertions, 10 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a17e655..1204d54 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2003-06-30  Jeff Law  <law@redhat.com>
+
+	* stmt.c (any_pending_cleanups): Lose argument THIS_CONTOUR, it
+	was always passed in the value '1'.  Simplify body appropriately.
+	* tree.h (any_pending_cleanups): Corresponding changes.
+	* calls.c: (expand_call): Corresponding changes.
+
 2003-06-30  Kazu Hirata  <kazu@cs.umass.edu>
 
 	* combine.c (distribute_notes): Don't bother REG_WAS_0.
diff --git a/gcc/calls.c b/gcc/calls.c
index c15cb55..0415744 100644
--- a/gcc/calls.c
+++ b/gcc/calls.c
@@ -2353,7 +2353,7 @@ expand_call (tree exp, rtx target, int ignore)
   if (currently_expanding_call++ != 0
       || !flag_optimize_sibling_calls
       || !rtx_equal_function_value_matters
-      || any_pending_cleanups (1)
+      || any_pending_cleanups ()
       || args_size.var)
     try_tail_call = try_tail_recursion = 0;
 
@@ -2445,7 +2445,7 @@ expand_call (tree exp, rtx target, int ignore)
         addr = fix_unsafe_tree (addr);
       /* Expanding one of those dangerous arguments could have added
 	 cleanups, but otherwise give it a whirl.  */
-      if (any_pending_cleanups (1))
+      if (any_pending_cleanups ())
 	try_tail_call = try_tail_recursion = 0;
     }
 
@@ -2477,7 +2477,7 @@ expand_call (tree exp, rtx target, int ignore)
       expand_start_target_temps ();
       if (optimize_tail_recursion (actparms, get_last_insn ()))
 	{
-	  if (any_pending_cleanups (1))
+	  if (any_pending_cleanups ())
 	    try_tail_call = try_tail_recursion = 0;
 	  else
 	    tail_recursion_insns = get_insns ();
@@ -3083,7 +3083,7 @@ expand_call (tree exp, rtx target, int ignore)
 
       /* If there are cleanups to be called, don't use a hard reg as target.
 	 We need to double check this and see if it matters anymore.  */
-      if (any_pending_cleanups (1))
+      if (any_pending_cleanups ())
 	{
 	  if (target && REG_P (target)
 	      && REGNO (target) < FIRST_PSEUDO_REGISTER)
diff --git a/gcc/stmt.c b/gcc/stmt.c
index 2aaa63f..e216642 100644
--- a/gcc/stmt.c
+++ b/gcc/stmt.c
@@ -4378,19 +4378,18 @@ last_cleanup_this_contour ()
 }
 
 /* Return 1 if there are any pending cleanups at this point.
-   If THIS_CONTOUR is nonzero, check the current contour as well.
-   Otherwise, look only at the contours that enclose this one.  */
+   Check the current contour as well as contours that enclose
+   the current contour.  */
 
 int
-any_pending_cleanups (this_contour)
-     int this_contour;
+any_pending_cleanups ()
 {
   struct nesting *block;
 
   if (cfun == NULL || cfun->stmt == NULL || block_stack == 0)
     return 0;
 
-  if (this_contour && block_stack->data.block.cleanups != NULL)
+  if (block_stack->data.block.cleanups != NULL)
     return 1;
   if (block_stack->data.block.cleanups == 0
       && block_stack->data.block.outer_cleanups == 0)
diff --git a/gcc/tree.h b/gcc/tree.h
index e43466b..21c9612 100644
--- a/gcc/tree.h
+++ b/gcc/tree.h
@@ -2919,7 +2919,7 @@ extern bool parse_output_constraint     PARAMS ((const char **,
 extern void expand_asm_operands		PARAMS ((tree, tree, tree, tree, int,
 						 const char *, int));
 extern tree resolve_asm_operand_names (tree, tree, tree);
-extern int any_pending_cleanups		PARAMS ((int));
+extern int any_pending_cleanups		PARAMS ((void));
 extern void init_stmt_for_function	PARAMS ((void));
 extern void expand_start_target_temps	PARAMS ((void));
 extern void expand_end_target_temps	PARAMS ((void));