From 64fe5271963de7f68994ce99bda3a380f20b5dbe Mon Sep 17 00:00:00 2001 From: Kazu Hirata Date: Tue, 3 May 2005 16:44:24 +0000 Subject: [PATCH] tree-mudflap.c (deferred_static_decls, [...]): Use VEC instead of VARRAY. * tree-mudflap.c (deferred_static_decls, mudflap_enqueue_decl, mudflap_finish_file, mudflap_finish_file): Use VEC instead of VARRAY. From-SVN: r99164 --- gcc/ChangeLog | 4 ++++ gcc/tree-mudflap.c | 14 +++++--------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 761c1a1..defdebb 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -6,6 +6,10 @@ insn_locators_initialize, insn_scope): Use VEC instead of VARRAY. + * tree-mudflap.c (deferred_static_decls, mudflap_enqueue_decl, + mudflap_finish_file, mudflap_finish_file): Use VEC instead of + VARRAY. + 2005-05-03 Eric Botcazou * config/sparc/predicates.md (const_compl_high_operand): New. diff --git a/gcc/tree-mudflap.c b/gcc/tree-mudflap.c index b28a427..04282a8 100644 --- a/gcc/tree-mudflap.c +++ b/gcc/tree-mudflap.c @@ -1148,7 +1148,7 @@ mf_marked_p (tree t) delayed until program finish time. If they're still incomplete by then, warnings are emitted. */ -static GTY (()) varray_type deferred_static_decls; +static GTY (()) VEC(tree,gc) *deferred_static_decls; /* A list of statements for calling __mf_register() at startup time. */ static GTY (()) tree enqueued_call_stmt_chain; @@ -1189,10 +1189,7 @@ mudflap_enqueue_decl (tree obj) if (DECL_P (obj) && DECL_EXTERNAL (obj) && DECL_ARTIFICIAL (obj)) return; - if (! deferred_static_decls) - VARRAY_TREE_INIT (deferred_static_decls, 10, "deferred static list"); - - VARRAY_PUSH_TREE (deferred_static_decls, obj); + VEC_safe_push (tree, gc, deferred_static_decls, obj); } @@ -1243,10 +1240,9 @@ mudflap_finish_file (void) if (deferred_static_decls) { size_t i; - for (i = 0; i < VARRAY_ACTIVE_SIZE (deferred_static_decls); i++) + tree obj; + for (i = 0; VEC_iterate (tree, deferred_static_decls, i, obj); i++) { - tree obj = VARRAY_TREE (deferred_static_decls, i); - gcc_assert (DECL_P (obj)); if (mf_marked_p (obj)) @@ -1271,7 +1267,7 @@ mudflap_finish_file (void) mf_varname_tree (obj)); } - VARRAY_CLEAR (deferred_static_decls); + VEC_truncate (tree, deferred_static_decls, 0); } /* Append all the enqueued registration calls. */ -- 2.7.4