diff options
| author | Nathan Froyd <froydnj@codesourcery.com> | 2010-05-14 20:47:39 +0000 |
|---|---|---|
| committer | Nathan Froyd <froydnj@gcc.gnu.org> | 2010-05-14 20:47:39 +0000 |
| commit | c4e64f39d9f8ce4af60222415b522a4b07f8b86c (patch) | |
| tree | 7d7e5aff53f6511668480301f6544e42fe904baa /gcc/java/resource.c | |
| parent | bc8ddfe63536d01d70f9dac63b8e47241cccdea5 (diff) | |
| download | gcc-c4e64f39d9f8ce4af60222415b522a4b07f8b86c.tar.gz | |
re PR middle-end/44103 (New Java test failures)
PR 44103
* java-tree.h (START_RECORD_CONSTRUCTOR): Change first argument to a
vector. Move call to build_constructor...
(FINISH_RECORD_CONSTRUCTOR): ...here. Add necessary arguments. Clear
TREE_CONSTANT on the constructor.
(PUSH_SUPER_VALUE): Change first argument to a vector.
(PUSH_FIELD_VALUE): Likewise.
* resource.c (compile_resource_data): Update calls to above macros.
* constants.c (build_constants_constructor): Likewise.
* class.c (build_utf8_ref): Likewise.
(make_field_value): Likewise.
(make_method_value): Likewise.
(add_table_and_syms): New function.
(make_class_data): Call it. Update calls to above macros.
(build_symbol_table_entry): New function.
(build_symbol_entry): Call it. Update calls to above macros.
(emit_symbol_table): Likewise.
(make_catch_class_record): Update calls to above macros.
(build_assertion_table_entry): New function.
(add_assertion_table_entry): Call it.
(emit_assertion_table): Likewise.
From-SVN: r159414
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 550e1d505d8..401e6342f0b 100644 --- a/gcc/java/resource.c +++ b/gcc/java/resource.c @@ -55,6 +55,7 @@ void compile_resource_data (const char *name, const char *buffer, int length) { tree rtype, field = NULL_TREE, data_type, rinit, data, decl; + VEC(constructor_elt,gc) *v = NULL; data_type = build_prim_array_type (unsigned_byte_type_node, strlen (name) + length); @@ -65,15 +66,15 @@ compile_resource_data (const char *name, const char *buffer, int length) rtype, field, "resource_length", unsigned_int_type_node); PUSH_FIELD (input_location, rtype, field, "data", data_type); FINISH_RECORD (rtype); - START_RECORD_CONSTRUCTOR (rinit, rtype); - PUSH_FIELD_VALUE (rinit, "name_length", + START_RECORD_CONSTRUCTOR (v, rtype); + PUSH_FIELD_VALUE (v, "name_length", build_int_cst (NULL_TREE, strlen (name))); - PUSH_FIELD_VALUE (rinit, "resource_length", + PUSH_FIELD_VALUE (v, "resource_length", build_int_cst (NULL_TREE, length)); data = build_string (strlen(name) + length, buffer); TREE_TYPE (data) = data_type; - PUSH_FIELD_VALUE (rinit, "data", data); - FINISH_RECORD_CONSTRUCTOR (rinit); + PUSH_FIELD_VALUE (v, "data", data); + FINISH_RECORD_CONSTRUCTOR (rinit, v, rtype); TREE_CONSTANT (rinit) = 1; decl = build_decl (input_location, |