diff options
| author | Nathan Froyd <froydnj@codesourcery.com> | 2010-05-26 13:55:30 +0000 |
|---|---|---|
| committer | Nathan Froyd <froydnj@gcc.gnu.org> | 2010-05-26 13:55:30 +0000 |
| commit | cf484e9170ac7734b57a294d40dad8a51233ae32 (patch) | |
| tree | d7090aa8ea8d699205d27a0d02e5b8fbb2502533 /gcc/java/resource.c | |
| parent | 5f0f4a3bc5e8f25e586b6983d6c8138a89aa030e (diff) | |
| download | gcc-cf484e9170ac7734b57a294d40dad8a51233ae32.zip gcc-cf484e9170ac7734b57a294d40dad8a51233ae32.tar.gz gcc-cf484e9170ac7734b57a294d40dad8a51233ae32.tar.bz2 | |
class.c (utf8_decl_list): Delete.
* class.c (utf8_decl_list): Delete.
(build_utf8_ref): Remove references to it.
* java-tree.h (all_class_list): Delete.
(predef_filenames): Delete.
(enum java_tree_index) [JTI ALL_CLASS_LIST,JTI_PREDEF_FILENAMES]:
Delete.
* jcf-parse.c (parse_roots): Decrease size to 2.
(current_file_list): Convert to a VEC.
(all_class_list): Declare.
(jcf_parse): Adjust for new type of all_class_list.
(java_layout_seen_class_methods): Likewise.
(predefined_filenames): Declare.
(add_predefined_file): Use it.
(predefined_filename_p): Likewise.
(java_parse_file): Adjust for new type of current_file_list. *
From-SVN: r159870
Diffstat (limited to 'gcc/java/resource.c')
| -rw-r--r-- | gcc/java/resource.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gcc/java/resource.c b/gcc/java/resource.c index 96fc087..56a0a1b 100644 --- a/gcc/java/resource.c +++ b/gcc/java/resource.c @@ -43,7 +43,7 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #endif /* A list of all the resources files. */ -static GTY(()) tree resources = NULL; +static GTY(()) VEC(tree,gc) *resources; void compile_resource_data (const char *name, const char *buffer, int length) @@ -86,13 +86,14 @@ compile_resource_data (const char *name, const char *buffer, int length) rest_of_decl_compilation (decl, global_bindings_p (), 0); varpool_finalize_decl (decl); - resources = tree_cons (NULL_TREE, decl, resources); + VEC_safe_push (tree, gc, resources, decl); } void write_resource_constructor (tree *list_p) { - tree iter, t, register_resource_fn; + tree decl, t, register_resource_fn; + unsigned ix; if (resources == NULL) return; @@ -105,9 +106,9 @@ write_resource_constructor (tree *list_p) register_resource_fn = t; /* Write out entries in the same order in which they were defined. */ - for (iter = nreverse (resources); iter ; iter = TREE_CHAIN (iter)) + for (ix = 0; VEC_iterate (tree, resources, ix, decl); ix++) { - t = build_fold_addr_expr (TREE_VALUE (iter)); + t = build_fold_addr_expr (decl); t = build_call_expr (register_resource_fn, 1, t); append_to_statement_list (t, list_p); } |