ggc.h (ggc_test_and_set_mark): New macro.

	* ggc.h (ggc_test_and_set_mark): New macro.
	(ggc_mark_rtx): Use ggc_test_and_set_mark.
	(ggc_mark_tree): Likewise.
	(ggc_mark_rtvec): Likewise.
	* ggc-common.c (ggc_mark_rtx_children): Reduce recursion.

From-SVN: r30734

gcc/ChangeLog

+1999-11-30  Alex Samuel  <samuel@codesourcery.com>
+
+	* ggc.h (ggc_test_and_set_mark): New macro.
+	(ggc_mark_rtx): Use ggc_test_and_set_mark.
+	(ggc_mark_tree): Likewise.
+	(ggc_mark_rtvec): Likewise.
+	* ggc-common.c (ggc_mark_rtx_children): Reduce recursion. 
+
 1999-11-30  Jason Merrill  <jason@casey.cygnus.com>
 
 	* dwarf2out.c (scope_die_for): Only handle types.  Only search for

gcc/ggc-common.c

@@ -234,7 +234,13 @@ ggc_mark_rtx_children (r)
 {
   const char *fmt;
   int i;
+  rtx next_rtx;
+
+  do 
+    {
       enum rtx_code code = GET_CODE (r);
+      /* This gets set to a child rtx to eliminate tail recursion.  */
+      next_rtx = NULL;
 
       /* Collect statistics, if appropriate.  */
       if (ggc_stats)
@@ -243,8 +249,8 @@ ggc_mark_rtx_children (r)
 	  ggc_stats->size_rtxs[(int) code] += ggc_get_size (r);
 	}
 
-  /* ??? If (some of) these are really pass-dependant info, do we have
-     any right poking our noses in?  */
+      /* ??? If (some of) these are really pass-dependant info, do we
+	 have any right poking our noses in?  */
       switch (code)
 	{
 	case JUMP_INSN:
@@ -291,10 +297,18 @@ ggc_mark_rtx_children (r)
 
       for (fmt = GET_RTX_FORMAT (GET_CODE (r)), i = 0; *fmt ; ++fmt, ++i)
 	{
+	  rtx exp;
 	  switch (*fmt)
 	    {
 	    case 'e': case 'u':
-	  ggc_mark_rtx (XEXP (r, i));
+	      exp = XEXP (r, i);
+	      if (ggc_test_and_set_mark (exp))
+		{ 
+		  if (next_rtx == NULL) 
+		    next_rtx = exp; 
+		  else 
+		    ggc_mark_rtx_children (exp);
+		} 
 	      break;
 	    case 'V': case 'E':
 	      ggc_mark_rtvec (XVEC (r, i));
@@ -304,6 +318,8 @@ ggc_mark_rtx_children (r)
 	      break;
 	    }
 	}
+    }
+  while ((r = next_rtx) != NULL);
 }
 
 /* V had not been previously marked, but has now been marked via

gcc/ggc.h

@@ -64,24 +64,29 @@ extern void ggc_mark_rtx_children PROTO ((struct rtx_def *));
 extern void ggc_mark_rtvec_children PROTO ((struct rtvec_def *));
 extern void ggc_mark_tree_children PROTO ((union tree_node *));
 
+/* If EXPR is not NULL and previously unmarked, mark it and evaluate
+   to true.  Otherwise evaluate to false.  */
+#define ggc_test_and_set_mark(EXPR) \
+  ((EXPR) != NULL && ! ggc_set_mark (EXPR))
+
 #define ggc_mark_rtx(EXPR)                      \
   do {                                          \
     rtx r__ = (EXPR);                           \
-    if (r__ != NULL && ! ggc_set_mark (r__))	\
+    if (ggc_test_and_set_mark (r__))            \
       ggc_mark_rtx_children (r__);              \
   } while (0)
 
 #define ggc_mark_tree(EXPR)                     \
   do {                                          \
     tree t__ = (EXPR);                          \
-    if (t__ != NULL && ! ggc_set_mark (t__))	\
+    if (ggc_test_and_set_mark (t__))            \
       ggc_mark_tree_children (t__);             \
   } while (0)
 
 #define ggc_mark_rtvec(EXPR)                    \
   do {                                          \
     rtvec v__ = (EXPR);                         \
-    if (v__ != NULL && ! ggc_set_mark (v__))	\
+    if (ggc_test_and_set_mark (v__))            \
       ggc_mark_rtvec_children (v__);            \
   } while (0)