re PR tree-optimization/31526 (ICE in alloc_aux_for_block())

	PR tree-optimization/31526
	* tree-inline.c (copy_cfg_body): Use last_basic_block instead of
	n_basic_blocks to find newly added blocks.

From-SVN: r123699

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9d679409892c8d572d529c43304c031a4113e955..5eeadc0482f712de72c37da6b244c1d8de2ca87a 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2007-04-10  Zdenek Dvorak  <dvorakz@suse.cz>
+
+       PR tree-optimization/31526
+       * tree-inline.c (copy_cfg_body): Use last_basic_block instead of
+       n_basic_blocks to find newly added blocks.
+
 2007-04-10  Uros Bizjak  <ubizjak@gmail.com>
 
        * config/i386/i386.md (fix_trunc<mode>di_sse): Remove "x" from "xm"

diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c
index 25844a6701bb11fb57ceda1d3749723308e2de00..b75094f8f7b8e06ad7968bef4504af09ea3832f3 100644 (file)
--- a/gcc/tree-inline.c
+++ b/gcc/tree-inline.c
@@ -1205,7 +1205,7 @@ copy_cfg_body (copy_body_data * id, gcov_type count, int frequency,
       new->aux = bb;
     }
 
-  last = n_basic_blocks;
+  last = last_basic_block;
   /* Now that we've duplicated the blocks, duplicate their edges.  */
   FOR_ALL_BB_FN (bb, cfun_to_copy)
     copy_edges_for_bb (bb, count_scale);
@@ -1219,7 +1219,7 @@ copy_cfg_body (copy_body_data * id, gcov_type count, int frequency,
     }
   /* Zero out AUX fields of newly created block during EH edge
      insertion. */
-  for (; last < n_basic_blocks; last++)
+  for (; last < last_basic_block; last++)
     BASIC_BLOCK (last)->aux = NULL;
   entry_block_map->aux = NULL;
   exit_block_map->aux = NULL;