# HG changeset patch
# User mcimadamore
# Date 1227697627 0
# Node ID 9ec015f3661e6d11f096240a02e77eda78dc60f4
# Parent  3cb2a607c347934f8e7e86f840a094c28b08d9ea
6776289: Regression: javac7 doesnt resolve method calls properly
Summary: Superclass' private methods shouldn't be considered during method resolution
Reviewed-by: jjg

diff -r 3cb2a607c347 -r 9ec015f3661e langtools/src/share/classes/com/sun/tools/javac/comp/Resolve.java
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Resolve.java	Wed Jul 05 16:44:09 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Resolve.java	Wed Nov 26 11:07:07 2008 +0000
@@ -559,6 +559,7 @@
                       boolean useVarargs,
                       boolean operator) {
         if (sym.kind == ERR) return bestSoFar;
+        if (!sym.isInheritedIn(site.tsym, types)) return bestSoFar;
         assert sym.kind < AMBIGUOUS;
         try {
             if (rawInstantiate(env, site, sym, argtypes, typeargtypes,
diff -r 3cb2a607c347 -r 9ec015f3661e langtools/test/tools/javac/generics/6711619/T6711619a.out
--- a/langtools/test/tools/javac/generics/6711619/T6711619a.out	Wed Jul 05 16:44:09 2017 +0200
+++ b/langtools/test/tools/javac/generics/6711619/T6711619a.out	Wed Nov 26 11:07:07 2008 +0000
@@ -1,5 +1,5 @@
-T6711619a.java:63:14: compiler.err.report.access: a(), private, T6711619a.A
-T6711619a.java:64:14: compiler.err.report.access: b(), private, T6711619a.B
+T6711619a.java:63:14: compiler.err.cant.resolve.args: kindname.method, a, , 
+T6711619a.java:64:14: compiler.err.cant.resolve.args: kindname.method, b, , 
 T6711619a.java:69:19: compiler.err.report.access: a, private, T6711619a.A
 T6711619a.java:70:19: compiler.err.report.access: b, private, T6711619a.B
 T6711619a.java:71:19: compiler.err.report.access: a, private, T6711619a.A
diff -r 3cb2a607c347 -r 9ec015f3661e langtools/test/tools/javac/overload/T6776289.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/overload/T6776289.java	Wed Nov 26 11:07:07 2008 +0000
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6776289
+ * @summary Regression: javac7 doesnt resolve method calls properly
+ * @compile T6776289.java
+ */
+
+class A {
+    private void m(int a, int b) { }
+}
+
+class T6776289 {
+    static void m(int a, String s) { }
+    class B extends A {
+        public void test() {
+            m(1, "");
+        }
+    }
+}