diff options
Diffstat (limited to 'gcc/java/class.c')
| -rw-r--r-- | gcc/java/class.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/gcc/java/class.c b/gcc/java/class.c index f121f0e..fff4247 100644 --- a/gcc/java/class.c +++ b/gcc/java/class.c @@ -1076,7 +1076,7 @@ make_field_value (tree fdecl) PUSH_FIELD_VALUE (finit, "info", - build (CONSTRUCTOR, field_info_union_node, NULL_TREE, + build_constructor (field_info_union_node, build_tree_list ((FIELD_STATIC (fdecl) ? TREE_CHAIN (TYPE_FIELDS (field_info_union_node)) @@ -1145,7 +1145,7 @@ make_method_value (tree mdecl) table = tree_cons (NULL_TREE, utf8, table); } type = build_prim_array_type (ptr_type_node, length); - table = build (CONSTRUCTOR, type, NULL_TREE, table); + table = build_constructor (type, table); /* Compute something unique enough. */ sprintf (buf, "_methods%d", method_name_count++); array = build_decl (VAR_DECL, get_identifier (buf), type); @@ -1267,9 +1267,8 @@ get_dispatch_table (tree type, tree this_class_addr) if (TARGET_VTABLE_USES_DESCRIPTORS) arraysize *= TARGET_VTABLE_USES_DESCRIPTORS; arraysize += 2; - return build (CONSTRUCTOR, - build_prim_array_type (nativecode_ptr_type_node, arraysize), - NULL_TREE, list); + return build_constructor (build_prim_array_type (nativecode_ptr_type_node, + arraysize), list); } static int @@ -1352,8 +1351,8 @@ make_class_data (tree type) field_array_type = build_prim_array_type (field_type_node, field_count); fields_decl = build_decl (VAR_DECL, mangled_classname ("_FL_", type), field_array_type); - DECL_INITIAL (fields_decl) = build (CONSTRUCTOR, field_array_type, - NULL_TREE, static_fields); + DECL_INITIAL (fields_decl) = build_constructor (field_array_type, + static_fields); TREE_STATIC (fields_decl) = 1; DECL_ARTIFICIAL (fields_decl) = 1; DECL_IGNORED_P (fields_decl) = 1; @@ -1378,8 +1377,8 @@ make_class_data (tree type) method_array_type = build_prim_array_type (method_type_node, method_count); methods_decl = build_decl (VAR_DECL, mangled_classname ("_MT_", type), method_array_type); - DECL_INITIAL (methods_decl) = build (CONSTRUCTOR, method_array_type, - NULL_TREE, nreverse (methods)); + DECL_INITIAL (methods_decl) = build_constructor (method_array_type, + nreverse (methods)); TREE_STATIC (methods_decl) = 1; DECL_ARTIFICIAL (methods_decl) = 1; DECL_IGNORED_P (methods_decl) = 1; @@ -1451,8 +1450,7 @@ make_class_data (tree type) } init = tree_cons (NULL_TREE, index, init); } - DECL_INITIAL (idecl) = build (CONSTRUCTOR, interface_array_type, - NULL_TREE, init); + DECL_INITIAL (idecl) = build_constructor (interface_array_type, init); TREE_STATIC (idecl) = 1; DECL_ARTIFICIAL (idecl) = 1; DECL_IGNORED_P (idecl) = 1; @@ -2099,7 +2097,7 @@ emit_offset_symbol_table (void) /* Put the list in the right order and make it a constructor. */ list = nreverse (list); - table = build (CONSTRUCTOR, method_symbols_array_type, NULL_TREE, list); + table = build_constructor (method_symbols_array_type, list); /* Make it the initial value for otable_syms and emit the decl. */ DECL_INITIAL (otable_syms_decl) = table; |