cfglayout.c (block_locators_blocks, [...]): Use VEC instead of VARRAY.

	* cfglayout.c (block_locators_blocks,
	insn_locators_initialize, insn_scope): Use VEC instead of
	VARRAY.

From-SVN: r99162

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 022ae87d2ae83272708de2618bff9870ccec99d4..761c1a1148b42ffcb71bb3e144947f76ac88899c 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -2,6 +2,10 @@
 
        * tree-cfg.c (tree_forwarder_block_p): Fix a typo.
 
+       * cfglayout.c (block_locators_blocks,
+       insn_locators_initialize, insn_scope): Use VEC instead of
+       VARRAY.
+
 2005-05-03  Eric Botcazou  <ebotcazou@libertysurf.fr>
 
        * config/sparc/predicates.md (const_compl_high_operand): New.

diff --git a/gcc/cfglayout.c b/gcc/cfglayout.c
index d71f0114a0ffe3a0acc3e26ea40ae40137da759a..3a701001b8c8a3880e9dc606b5c6d6a3ecb95e43 100644 (file)
--- a/gcc/cfglayout.c
+++ b/gcc/cfglayout.c
@@ -230,7 +230,7 @@ record_effective_endpoints (void)
    locator greater than corresponding block_locators_locs value and smaller
    than the following one.  Similarly for the other properties.  */
 static GTY(()) varray_type block_locators_locs;
-static GTY(()) varray_type block_locators_blocks;
+static GTY(()) VEC(tree,gc) *block_locators_blocks;
 static GTY(()) varray_type line_locators_locs;
 static GTY(()) varray_type line_locators_lines;
 static GTY(()) varray_type file_locators_locs;
@@ -255,7 +255,7 @@ insn_locators_initialize (void)
   prologue_locator = epilogue_locator = 0;
 
   VARRAY_INT_INIT (block_locators_locs, 32, "block_locators_locs");
-  VARRAY_TREE_INIT (block_locators_blocks, 32, "block_locators_blocks");
+  block_locators_blocks = VEC_alloc (tree, gc, 32);
   VARRAY_INT_INIT (line_locators_locs, 32, "line_locators_locs");
   VARRAY_INT_INIT (line_locators_lines, 32, "line_locators_lines");
   VARRAY_INT_INIT (file_locators_locs, 32, "file_locators_locs");
@@ -294,7 +294,7 @@ insn_locators_initialize (void)
            {
              loc++;
              VARRAY_PUSH_INT (block_locators_locs, loc);
-             VARRAY_PUSH_TREE (block_locators_blocks, block);
+             VEC_safe_push (tree, gc, block_locators_blocks, block);
              last_block = block;
            }
          if (last_line_number != line_number)
@@ -435,7 +435,7 @@ insn_scope (rtx insn)
          break;
        }
     }
-   return VARRAY_TREE (block_locators_blocks, min);
+  return VEC_index (tree, block_locators_blocks, min);
 }
 
 /* Return line number of the statement specified by the locator.  */