From 37f6d446fa8486351de66a116771a47e829a6858 Mon Sep 17 00:00:00 2001 From: bryce Date: Thu, 23 Jun 2005 15:00:50 +0000 Subject: [PATCH] PR java/20697 * parse.y (find_most_specific_methods_list): Remove special case for inner classes. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@101270 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/java/ChangeLog | 6 ++++++ gcc/java/parse.y | 8 ++----- libjava/ChangeLog | 4 ++++ libjava/testsuite/libjava.compile/PR20697.java | 29 ++++++++++++++++++++++++++ 4 files changed, 41 insertions(+), 6 deletions(-) create mode 100644 libjava/testsuite/libjava.compile/PR20697.java diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index b6f6e3a694d..4c967594797 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,9 @@ +2005-06-23 Bryce McKinlay + + PR java/20697 + * parse.y (find_most_specific_methods_list): Remove special case for + inner classes. + 2005-06-15 Tom Tromey PR libgcj/21906: diff --git a/gcc/java/parse.y b/gcc/java/parse.y index 11087192bec..0c35911ed45 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); } } diff --git a/libjava/ChangeLog b/libjava/ChangeLog index c8532c7badb..c81a79b0e89 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,7 @@ +2005-06-23 Bryce McKinlay + + * testsuite/libjava.compile/PR20697.java: New test-case. + 2005-06-22 Kelley Cook * Makefile.am (SUBDIRS): Use append for conditional. diff --git a/libjava/testsuite/libjava.compile/PR20697.java b/libjava/testsuite/libjava.compile/PR20697.java new file mode 100644 index 00000000000..56efb1d36b7 --- /dev/null +++ b/libjava/testsuite/libjava.compile/PR20697.java @@ -0,0 +1,29 @@ +public class PR20697 +{ + public interface I + { + public void m(); + } + + public static class A2 implements I + { + public void m() + { + return; + } + } + +} + +class Test extends PR20697.A2 +{ + public void m() + { + return; + } + + public void n() + { + m(); + } +} -- 2.11.0