Daily bump.

[pf3gnuchains/gcc-fork.git] / gcc / cfgloopanal.c

diff --git a/gcc/cfgloopanal.c b/gcc/cfgloopanal.c
index f40a48f..ca788af 100644 (file)
--- a/gcc/cfgloopanal.c
+++ b/gcc/cfgloopanal.c
@@ -1,5 +1,5 @@
 /* Natural loop analysis code for GNU compiler.
-   Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -419,7 +419,7 @@ expected_loop_iterations (const struct loop *loop)
   edge e;
   edge_iterator ei;
 
-  if (loop->header->count)
+  if (loop->latch->count || loop->header->count)
     {
       gcov_type count_in, count_latch, expected;
 
@@ -580,13 +580,10 @@ mark_loop_exit_edges (struct loops *loops)
     {
       edge_iterator ei;
 
-      /* Do not mark exits from the fake outermost loop.  */
-      if (!bb->loop_father->outer)
-       continue;
-
       FOR_EACH_EDGE (e, ei, bb->succs)
        {
-         if (loop_exit_edge_p (bb->loop_father, e))
+         if (bb->loop_father->outer
+             && loop_exit_edge_p (bb->loop_father, e))
            e->flags |= EDGE_LOOP_EXIT;
          else
            e->flags &= ~EDGE_LOOP_EXIT;