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/constants.c | |
| parent | bc8ddfe63536d01d70f9dac63b8e47241cccdea5 (diff) | |
| download | gcc-c4e64f39d9f8ce4af60222415b522a4b07f8b86c.zip gcc-c4e64f39d9f8ce4af60222415b522a4b07f8b86c.tar.gz gcc-c4e64f39d9f8ce4af60222415b522a4b07f8b86c.tar.bz2 | |
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/constants.c')
| -rw-r--r-- | gcc/java/constants.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gcc/java/constants.c b/gcc/java/constants.c index 541e78d..ca5eb77 100644 --- a/gcc/java/constants.c +++ b/gcc/java/constants.c @@ -500,6 +500,7 @@ build_constants_constructor (void) tree cons; tree tags_list = NULL_TREE; tree data_list = NULL_TREE; + VEC(constructor_elt,gc) *v = NULL; int i; for (i = outgoing_cpool->count; --i > 0; ) @@ -596,12 +597,12 @@ build_constants_constructor (void) data_value = null_pointer_node; tags_value = null_pointer_node; } - START_RECORD_CONSTRUCTOR (cons, constants_type_node); - PUSH_FIELD_VALUE (cons, "size", + START_RECORD_CONSTRUCTOR (v, constants_type_node); + PUSH_FIELD_VALUE (v, "size", build_int_cst (NULL_TREE, outgoing_cpool->count)); - PUSH_FIELD_VALUE (cons, "tags", tags_value); - PUSH_FIELD_VALUE (cons, "data", data_value); - FINISH_RECORD_CONSTRUCTOR (cons); + PUSH_FIELD_VALUE (v, "tags", tags_value); + PUSH_FIELD_VALUE (v, "data", data_value); + FINISH_RECORD_CONSTRUCTOR (cons, v, constants_type_node); return cons; } |