diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/java/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/java/class.c | 26 | ||||
| -rw-r--r-- | gcc/java/expr.c | 12 | ||||
| -rw-r--r-- | gcc/java/java-tree.h | 1 |
4 files changed, 34 insertions, 13 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index b63afb3..3af84d0 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,11 @@ +2004-04-12 Bryce McKinlay <mckinlay@redhat.com> + + * class.c (get_interface_method_index): New function. Return dispatch + index for interface method. + (make_method_value): For interface methods, set index field to + iface dispatch index, not DECL_VINDEX. + * expr.c (build_invokeinterface): Use get_interface_method_index. + 2004-03-31 Richard Kenner <kenner@vlsi1.ultra.nyu.edu> * jcf-write.c (generate_bytecode_insns): Use TYPE_UNSIGNED. diff --git a/gcc/java/class.c b/gcc/java/class.c index 66bdeb9..3ba60bd 100644 --- a/gcc/java/class.c +++ b/gcc/java/class.c @@ -1246,10 +1246,15 @@ make_method_value (tree mdecl) tree minit; tree index; tree code; + tree class_decl; #define ACC_TRANSLATED 0x4000 int accflags = get_access_flags_from_decl (mdecl) | ACC_TRANSLATED; - - if (!flag_indirect_dispatch && DECL_VINDEX (mdecl) != NULL_TREE) + + class_decl = DECL_CONTEXT (mdecl); + /* For interfaces, the index field contains the dispatch index. */ + if (CLASS_INTERFACE (TYPE_NAME (class_decl))) + index = build_int_2 (get_interface_method_index (mdecl, class_decl), 0); + else if (!flag_indirect_dispatch && DECL_VINDEX (mdecl) != NULL_TREE) index = DECL_VINDEX (mdecl); else index = integer_minus_one_node; @@ -2133,6 +2138,23 @@ layout_class_methods (tree this_class) TYPE_NVIRTUALS (this_class) = dtable_count; } +/* Return the index of METHOD in INTERFACE. This index begins at 1 and is used as an + argument for _Jv_LookupInterfaceMethodIdx(). */ +int +get_interface_method_index (tree method, tree interface) +{ + tree meth; + int i = 1; + + for (meth = TYPE_METHODS (interface); ; meth = TREE_CHAIN (meth), i++) + { + if (meth == method) + return i; + if (meth == NULL_TREE) + abort (); + } +} + /* Lay METHOD_DECL out, returning a possibly new value of DTABLE_COUNT. Also mangle the method's name. */ diff --git a/gcc/java/expr.c b/gcc/java/expr.c index 95c3b69..79a3f4d 100644 --- a/gcc/java/expr.c +++ b/gcc/java/expr.c @@ -1974,17 +1974,7 @@ build_invokeinterface (tree dtable, tree method) } else { - i = 1; - for (meth = TYPE_METHODS (interface); ; meth = TREE_CHAIN (meth), i++) - { - if (meth == method) - { - idx = build_int_2 (i, 0); - break; - } - if (meth == NULL_TREE) - abort (); - } + idx = build_int_2 (get_interface_method_index (method, interface), 0); } lookup_arg = tree_cons (NULL_TREE, dtable, diff --git a/gcc/java/java-tree.h b/gcc/java/java-tree.h index 169f0ad..8a9f9a9 100644 --- a/gcc/java/java-tree.h +++ b/gcc/java/java-tree.h @@ -1149,6 +1149,7 @@ extern tree unmangle_classname (const char *name, int name_length); extern tree parse_signature_string (const unsigned char *, int); extern tree get_type_from_signature (tree); extern void layout_class (tree); +extern int get_interface_method_index (tree, tree); extern tree layout_class_method (tree, tree, tree, tree); extern void layout_class_methods (tree); extern tree build_class_ref (tree); |