2014-05-07 Richard Biener <rguenther@suse.de>

[pf3gnuchains/gcc-fork.git] / gcc / bb-reorder.c

diff --git a/gcc/bb-reorder.c b/gcc/bb-reorder.c
index 017c205..2ab2a91 100644 (file)
--- a/gcc/bb-reorder.c
+++ b/gcc/bb-reorder.c
@@ -1,6 +1,6 @@
 /* Basic block reordering routines for the GNU compiler.
-   Copyright (C) 2000, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010, 2011
-   Free Software Foundation, Inc.
+   Copyright (C) 2000, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010, 2011,
+   2012 Free Software Foundation, Inc.
 
    This file is part of GCC.
 
@@ -1478,9 +1478,8 @@ fix_up_fall_thru_edges (void)
          edge e;
          edge_iterator ei;
 
-         /* Find EDGE_CAN_FALLTHRU edge.  */
          FOR_EACH_EDGE (e, ei, cur_bb->succs)
-           if (e->flags & EDGE_CAN_FALLTHRU)
+           if (e->flags & EDGE_FALLTHRU)
              {
                fall_thru = e;
                break;
@@ -2254,6 +2253,9 @@ partition_hot_cold_basic_blocks (void)
 
   add_reg_crossing_jump_notes ();
 
+  /* Clear bb->aux fields that the above routines were using.  */
+  clear_aux_for_blocks ();
+
   VEC_free (edge, heap, crossing_edges);
 
   /* ??? FIXME: DF generates the bb info for a block immediately.