diff options
Diffstat (limited to 'gcc/java')
| -rw-r--r-- | gcc/java/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/java/class.c | 17 | ||||
| -rw-r--r-- | gcc/java/decl.c | 6 |
3 files changed, 22 insertions, 10 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 2a96eb5..3d1f6e4c 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,12 @@ +2001-03-19 Mark Mitchell <mark@codesourcery.com> + + * class.c (build_class_ref): Use SET_DECL_ASSEMBLER_NAME. + (layout_class): Likewise. + (layout_class_method): Likewise. + (emit_register_classes): Likewise. + * decl.c (builtin_function): Likewise. + (give_name_to_locals): Likewise. + 2001-03-19 Per Bothner <per@bothner.com> * jcf-parse.c (load_inner_classes): Check CLASS_LOADED_P diff --git a/gcc/java/class.c b/gcc/java/class.c index 4114271..6deb46e 100644 --- a/gcc/java/class.c +++ b/gcc/java/class.c @@ -899,8 +899,9 @@ build_class_ref (type) TREE_PUBLIC (decl) = 1; DECL_IGNORED_P (decl) = 1; DECL_ARTIFICIAL (decl) = 1; - DECL_ASSEMBLER_NAME (decl) = - java_mangle_class_field (&temporary_obstack, type); + SET_DECL_ASSEMBLER_NAME (decl, + java_mangle_class_field + (&temporary_obstack, type)); make_decl_rtl (decl, NULL); pushdecl_top_level (decl); if (is_compiled == 1) @@ -1701,8 +1702,9 @@ layout_class (this_class) if (FIELD_STATIC (field)) { /* Set DECL_ASSEMBLER_NAME to something suitably mangled. */ - DECL_ASSEMBLER_NAME (field) = - java_mangle_decl (&temporary_obstack, field); + SET_DECL_ASSEMBLER_NAME (field, + java_mangle_decl + (&temporary_obstack, field)); } } @@ -1797,8 +1799,9 @@ layout_class_method (this_class, super_class, method_decl, dtable_count) TREE_PUBLIC (method_decl) = 1; /* This is a good occasion to mangle the method's name */ - DECL_ASSEMBLER_NAME (method_decl) = - java_mangle_decl (&temporary_obstack, method_decl); + SET_DECL_ASSEMBLER_NAME (method_decl, + java_mangle_decl (&temporary_obstack, + method_decl)); /* We don't generate a RTL for the method if it's abstract, or if it's an interface method that isn't clinit. */ if (! METHOD_ABSTRACT (method_decl) @@ -1878,7 +1881,7 @@ emit_register_classes () tree t; init_decl = build_decl (FUNCTION_DECL, init_name, init_type); - DECL_ASSEMBLER_NAME (init_decl) = init_name; + SET_DECL_ASSEMBLER_NAME (init_decl, init_name); TREE_STATIC (init_decl) = 1; current_function_decl = init_decl; DECL_RESULT (init_decl) = build_decl(RESULT_DECL, NULL_TREE, void_type_node); diff --git a/gcc/java/decl.c b/gcc/java/decl.c index 8c688ce..1a68a04 100644 --- a/gcc/java/decl.c +++ b/gcc/java/decl.c @@ -377,7 +377,7 @@ builtin_function (name, type, function_code, class, library_name) DECL_EXTERNAL (decl) = 1; TREE_PUBLIC (decl) = 1; if (library_name) - DECL_ASSEMBLER_NAME (decl) = get_identifier (library_name); + SET_DECL_ASSEMBLER_NAME (decl, get_identifier (library_name)); make_decl_rtl (decl, NULL_PTR); pushdecl (decl); DECL_BUILT_IN_CLASS (decl) = class; @@ -1569,7 +1569,7 @@ give_name_to_locals (jcf) { tree decl = TREE_VEC_ELT (decl_map, slot); DECL_NAME (decl) = name; - DECL_ASSEMBLER_NAME (decl) = name; + SET_DECL_ASSEMBLER_NAME (decl, name); if (TREE_CODE (decl) != PARM_DECL || TREE_TYPE (decl) != type) warning ("bad type in parameter debug info"); } @@ -1636,7 +1636,7 @@ give_name_to_locals (jcf) sprintf (buffer, "ARG_%d", arg_i); DECL_NAME (parm) = get_identifier (buffer); } - DECL_ASSEMBLER_NAME (parm) = DECL_NAME (parm); + SET_DECL_ASSEMBLER_NAME (parm, DECL_NAME (parm)); } } } |