diff options
| author | Tom Tromey <tromey@redhat.com> | 2006-03-29 16:31:53 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2006-03-29 16:31:53 +0000 |
| commit | 531e214a01d19e889065032689d727cb754861ce (patch) | |
| tree | 6f42da3be8a72fabc602b81ed7dd9cfe5515daca /gcc | |
| parent | bd4ca424997fd4f8f7eaa32b933fc9e19eb38986 (diff) | |
| download | gcc-531e214a01d19e889065032689d727cb754861ce.zip gcc-531e214a01d19e889065032689d727cb754861ce.tar.gz gcc-531e214a01d19e889065032689d727cb754861ce.tar.bz2 | |
re PR java/26390 (Problem dispatching method call when method does not exist in superclass)
gcc/java
PR java/26390:
* parse.y (find_most_specific_methods_list): Added 'class'
argument.
(lookup_method_invoke): Updated.
libjava
PR java/26390:
* testsuite/libjava.lang/pr26390.out: New file.
* testsuite/libjava.lang/pr26390.java: New file.
* sources.am, Makefile.in: Rebuilt.
* scripts/makemake.tcl: Compile gnu/java/awt/peer/swing.
From-SVN: r112499
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/java/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/java/parse.y | 23 |
2 files changed, 26 insertions, 4 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 5f84075..826d608 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,10 @@ +2006-03-28 Tom Tromey <tromey@redhat.com> + + PR java/26390: + * parse.y (find_most_specific_methods_list): Added 'class' + argument. + (lookup_method_invoke): Updated. + 2006-03-15 Tom Tromey <tromey@redhat.com> * jcf-write.c (generate_bytecode_insns): Use qualifying type for diff --git a/gcc/java/parse.y b/gcc/java/parse.y index 48a56d8..6b0bf76 100644 --- a/gcc/java/parse.y +++ b/gcc/java/parse.y @@ -134,7 +134,7 @@ static tree resolve_no_layout (tree, tree); static int invocation_mode (tree, int); static tree find_applicable_accessible_methods_list (int, tree, tree, tree); static void search_applicable_methods_list (int, tree, tree, tree, tree *, tree *); -static tree find_most_specific_methods_list (tree); +static tree find_most_specific_methods_list (tree, tree); static int argument_types_convertible (tree, tree); static tree patch_invoke (tree, tree, tree); static int maybe_use_access_method (int, tree *, tree *); @@ -11249,7 +11249,7 @@ lookup_method_invoke (int lc, tree cl, tree class, tree name, tree arg_list) /* Find all candidates and then refine the list, searching for the most specific method. */ list = find_applicable_accessible_methods_list (lc, class, name, atl); - list = find_most_specific_methods_list (list); + list = find_most_specific_methods_list (list, class); if (list && !TREE_CHAIN (list)) return TREE_VALUE (list); @@ -11441,7 +11441,7 @@ search_applicable_methods_list (int lc, tree method, tree name, tree arglist, /* 15.11.2.2 Choose the Most Specific Method */ static tree -find_most_specific_methods_list (tree list) +find_most_specific_methods_list (tree list, tree class) { int max = 0; int abstract, candidates; @@ -11464,8 +11464,23 @@ find_most_specific_methods_list (tree list) /* Compare arguments and location where methods where declared */ if (argument_types_convertible (method_v, current_v)) { + /* We have a rather odd special case here. The front + end doesn't properly implement inheritance, so we + work around it here. The idea is, if we are + comparing a method declared in a class to one + declared in an interface, and the invocation's + qualifying class is a class (and not an interface), + then we consider the method's class to be the + qualifying class of the invocation. This lets us + fake the result of ordinary inheritance. */ + tree context_v = DECL_CONTEXT (current_v); + if (TYPE_INTERFACE_P (DECL_CONTEXT (method_v)) + && ! TYPE_INTERFACE_P (context_v) + && ! TYPE_INTERFACE_P (class)) + context_v = class; + if (valid_method_invocation_conversion_p - (DECL_CONTEXT (method_v), DECL_CONTEXT (current_v))) + (DECL_CONTEXT (method_v), context_v)) { int v = (DECL_SPECIFIC_COUNT (current_v) += 1); max = (v > max ? v : max); |