* optc-gen.awk (END): Make sure no variable is defined more

[pf3gnuchains/gcc-fork.git] / gcc / basic-block.h

diff --git a/gcc/basic-block.h b/gcc/basic-block.h
index 6f29513..baca9d7 100644 (file)
--- a/gcc/basic-block.h
+++ b/gcc/basic-block.h
@@ -736,6 +736,25 @@ ei_safe_edge (edge_iterator i)
   return !ei_end_p (i) ? ei_edge (i) : NULL;
 }
 
+/* Return 1 if we should continue to iterate.  Return 0 otherwise.
+   *Edge P is set to the next edge if we are to continue to iterate
+   and NULL otherwise.  */
+
+static inline bool
+ei_cond (edge_iterator ei, edge *p)
+{
+  if (!ei_end_p (ei))
+    {
+      *p = ei_edge (ei);
+      return 1;
+    }
+  else
+    {
+      *p = NULL;
+      return 0;
+    }
+}
+
 /* This macro serves as a convenient way to iterate each edge in a
    vector of predecessor or successor edges.  It must not be used when
    an element might be removed during the traversal, otherwise
@@ -751,9 +770,9 @@ ei_safe_edge (edge_iterator i)
      }
 */
 
-#define FOR_EACH_EDGE(EDGE,ITER,EDGE_VEC) \
-  for ((EDGE) = NULL, (ITER) = ei_start ((EDGE_VEC)); \
-       ((EDGE) = ei_safe_edge ((ITER))); \
+#define FOR_EACH_EDGE(EDGE,ITER,EDGE_VEC)      \
+  for ((ITER) = ei_start ((EDGE_VEC));         \
+       ei_cond ((ITER), &(EDGE));              \
        ei_next (&(ITER)))
 
 struct edge_list * create_edge_list (void);