diff options
Diffstat (limited to 'gcc/java')
| -rw-r--r-- | gcc/java/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/java/parse.y | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index b6f6e3a..4c96759 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,9 @@ +2005-06-23 Bryce McKinlay <mckinlay@redhat.com> + + PR java/20697 + * parse.y (find_most_specific_methods_list): Remove special case for + inner classes. + 2005-06-15 Tom Tromey <tromey@redhat.com> PR libgcj/21906: diff --git a/gcc/java/parse.y b/gcc/java/parse.y index 1108719..0c35911 100644 --- a/gcc/java/parse.y +++ b/gcc/java/parse.y @@ -11416,13 +11416,9 @@ find_most_specific_methods_list (tree list) if (argument_types_convertible (method_v, current_v)) { if (valid_method_invocation_conversion_p - (DECL_CONTEXT (method_v), DECL_CONTEXT (current_v)) - || (INNER_CLASS_TYPE_P (DECL_CONTEXT (current_v)) - && enclosing_context_p (DECL_CONTEXT (method_v), - DECL_CONTEXT (current_v)))) + (DECL_CONTEXT (method_v), DECL_CONTEXT (current_v))) { - int v = (DECL_SPECIFIC_COUNT (current_v) += - (INNER_CLASS_TYPE_P (DECL_CONTEXT (current_v)) ? 2 : 1)); + int v = (DECL_SPECIFIC_COUNT (current_v) += 1); max = (v > max ? v : max); } } |