diff options
Diffstat (limited to 'gcc/java')
| -rw-r--r-- | gcc/java/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/java/class.c | 6 | ||||
| -rw-r--r-- | gcc/java/decl.c | 4 |
3 files changed, 13 insertions, 5 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 8b40d94..e0fd390 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,11 @@ +2001-03-14 Mark Mitchell <mark@codesourcery.com> + + * class.c (build_static_field_ref): Likewise. + (make_method_value): Likewise. + (get_dispatch_table): Likewise. + + * decl.c (push_jvm_slot): Use COPY_DECL_RTL, DECL_RTL_SET_P, etc. + 2001-03-07 Tom Tromey <tromey@redhat.com> * config-lang.in (lang_requires): Define. diff --git a/gcc/java/class.c b/gcc/java/class.c index 698ca04..4de1330 100644 --- a/gcc/java/class.c +++ b/gcc/java/class.c @@ -983,7 +983,7 @@ build_static_field_ref (fdecl) int is_compiled = is_compiled_class (fclass); if (is_compiled) { - if (DECL_RTL (fdecl) == 0) + if (!DECL_RTL_SET_P (fdecl)) { make_decl_rtl (fdecl, NULL); if (is_compiled == 1) @@ -1146,7 +1146,7 @@ make_method_value (mdecl) #define ACC_TRANSLATED 0x4000 int accflags = get_access_flags_from_decl (mdecl) | ACC_TRANSLATED; code = null_pointer_node; - if (DECL_RTL (mdecl)) + if (DECL_RTL_SET_P (mdecl)) code = build1 (ADDR_EXPR, nativecode_ptr_type_node, mdecl); START_RECORD_CONSTRUCTOR (minit, method_type_node); PUSH_FIELD_VALUE (minit, "name", @@ -1220,7 +1220,7 @@ get_dispatch_table (type, this_class_addr) } else { - if (DECL_RTL (method) == 0) + if (!DECL_RTL_SET_P (method)) make_decl_rtl (method, NULL); method = build1 (ADDR_EXPR, nativecode_ptr_type_node, method); } diff --git a/gcc/java/decl.c b/gcc/java/decl.c index 32e6976..d9bc2ee 100644 --- a/gcc/java/decl.c +++ b/gcc/java/decl.c @@ -110,13 +110,13 @@ push_jvm_slot (index, decl) while (tmp != NULL_TREE) { if (TYPE_MODE (type) == TYPE_MODE (TREE_TYPE (tmp))) - rtl = DECL_RTL (tmp); + rtl = DECL_RTL_IF_SET (tmp); if (rtl != NULL) break; tmp = DECL_LOCAL_SLOT_CHAIN (tmp); } if (rtl != NULL) - DECL_RTL (decl) = rtl; + SET_DECL_RTL (decl, rtl); else { if (index >= DECL_MAX_LOCALS (current_function_decl)) |