* varasm.c (assemble_variable): Fix format specifier thinko.

[pf3gnuchains/gcc-fork.git] / gcc / tree-ssanames.c

diff --git a/gcc/tree-ssanames.c b/gcc/tree-ssanames.c
index 0f0381f..bf5ffef 100644 (file)
--- a/gcc/tree-ssanames.c
+++ b/gcc/tree-ssanames.c
@@ -15,8 +15,8 @@ GNU General Public License for more details.
                                                                                
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #include "config.h"
 #include "system.h"
@@ -59,7 +59,7 @@ Boston, MA 02111-1307, USA.  */
    this is the place to try it.  */
    
 /* Array of all SSA_NAMEs used in the function.  */
-varray_type ssa_names;
+VEC(tree,gc) *ssa_names;
 
 /* Free list of SSA_NAMEs.  This list is wiped at the end of each function
    after we leave SSA form.  */
@@ -79,13 +79,16 @@ unsigned int ssa_name_nodes_created;
 void
 init_ssanames (void)
 {
-  VARRAY_TREE_INIT (ssa_names, 50, "ssa_names table");
+  ssa_names = VEC_alloc (tree, gc, 50);
 
   /* Version 0 is special, so reserve the first slot in the table.  Though
      currently unused, we may use version 0 in alias analysis as part of
      the heuristics used to group aliases when the alias sets are too
-     large.  */
-  VARRAY_PUSH_TREE (ssa_names, NULL_TREE);
+     large.
+
+     We use VEC_quick_push here because we know that SSA_NAMES has at
+     least 50 elements reserved in it.  */
+  VEC_quick_push (tree, ssa_names, NULL_TREE);
   free_ssanames = NULL;
 }
 
@@ -94,8 +97,7 @@ init_ssanames (void)
 void
 fini_ssanames (void)
 {
-  ggc_free (ssa_names);
-  ssa_names = NULL;
+  VEC_free (tree, gc, ssa_names);
   free_ssanames = NULL;
 }
 
@@ -119,7 +121,7 @@ tree
 make_ssa_name (tree var, tree stmt)
 {
   tree t;
-  ssa_imm_use_t *imm;
+  use_operand_p imm;
 
   gcc_assert (DECL_P (var)
              || TREE_CODE (var) == INDIRECT_REF);
@@ -138,13 +140,13 @@ make_ssa_name (tree var, tree stmt)
       /* The node was cleared out when we put it on the free list, so
         there is no need to do so again here.  */
       gcc_assert (ssa_name (SSA_NAME_VERSION (t)) == NULL);
-      VARRAY_TREE (ssa_names, SSA_NAME_VERSION (t)) = t;
+      VEC_replace (tree, ssa_names, SSA_NAME_VERSION (t), t);
     }
   else
     {
       t = make_node (SSA_NAME);
       SSA_NAME_VERSION (t) = num_ssa_names;
-      VARRAY_PUSH_TREE (ssa_names, t);
+      VEC_safe_push (tree, gc, ssa_names, t);
 #ifdef GATHER_STATISTICS
       ssa_name_nodes_created++;
 #endif
@@ -203,7 +205,7 @@ release_ssa_name (tree var)
     {
       tree saved_ssa_name_var = SSA_NAME_VAR (var);
       int saved_ssa_name_version = SSA_NAME_VERSION (var);
-      ssa_imm_use_t *imm = &(SSA_NAME_IMM_USE_NODE (var));
+      use_operand_p imm = &(SSA_NAME_IMM_USE_NODE (var));
 
 #ifdef ENABLE_CHECKING
       verify_imm_links (stderr, var);
@@ -211,7 +213,7 @@ release_ssa_name (tree var)
       while (imm->next != imm)
        delink_imm_use (imm->next);
 
-      VARRAY_TREE (ssa_names, SSA_NAME_VERSION (var)) = NULL;
+      VEC_replace (tree, ssa_names, SSA_NAME_VERSION (var), NULL_TREE);
       memset (var, 0, tree_size (var));
 
       imm->prev = imm;