changeset 176:5e5567c2db56 jdk7-b42

Merge
author xdono
date Mon, 15 Dec 2008 17:13:21 -0800
parents fdfed22db054 4674298aaf3b
children b044af4939c9
files
diffstat 5 files changed, 50 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Dec 15 16:55:33 2008 -0800
+++ b/.hgtags	Mon Dec 15 17:13:21 2008 -0800
@@ -15,3 +15,4 @@
 3fd42dfa6f27f2767a241fb82bc01a613f0c2096 jdk7-b38
 3fb51e47622bb771571680bc6a7b64c6172b482d jdk7-b39
 32e30988324601d08b87989f0821d99aa8534511 jdk7-b40
+ded6b40f558e8d19b3c17715b3d67ee001606645 jdk7-b41
--- a/make/Makefile	Mon Dec 15 16:55:33 2008 -0800
+++ b/make/Makefile	Mon Dec 15 17:13:21 2008 -0800
@@ -82,7 +82,11 @@
 endif 
 
 ifdef MILESTONE
+ifneq ($(MILESTONE),fcs)
   ANT_OPTIONS += -Dmilestone=$(MILESTONE)
+else
+  ANT_OPTIONS += -Drelease=$(JDK_VERSION)
+endif
 endif
 
 ifdef BUILD_NUMBER
--- a/src/share/classes/com/sun/tools/javac/comp/Resolve.java	Mon Dec 15 16:55:33 2008 -0800
+++ b/src/share/classes/com/sun/tools/javac/comp/Resolve.java	Mon Dec 15 17:13:21 2008 -0800
@@ -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,
--- a/test/tools/javac/generics/6711619/T6711619a.out	Mon Dec 15 16:55:33 2008 -0800
+++ b/test/tools/javac/generics/6711619/T6711619a.out	Mon Dec 15 17:13:21 2008 -0800
@@ -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
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/tools/javac/overload/T6776289.java	Mon Dec 15 17:13:21 2008 -0800
@@ -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, "");
+        }
+    }
+}