stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Xiomara Jayasena 2008-12-15 17:13:21 -08:00
commit b905401ddc
5 changed files with 50 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
langtools/.hgtags
View File

@ -15,3 +15,4 @@ eaf608c64fecf70f955dc9f29f94c055b183aeec jdk7-b30
3fd42dfa6f27f2767a241fb82bc01a613f0c2096 jdk7-b38 3fd42dfa6f27f2767a241fb82bc01a613f0c2096 jdk7-b38
3fb51e47622bb771571680bc6a7b64c6172b482d jdk7-b39 3fb51e47622bb771571680bc6a7b64c6172b482d jdk7-b39
32e30988324601d08b87989f0821d99aa8534511 jdk7-b40 32e30988324601d08b87989f0821d99aa8534511 jdk7-b40
ded6b40f558e8d19b3c17715b3d67ee001606645 jdk7-b41

4
langtools/make/Makefile
View File

@ -82,7 +82,11 @@ ifdef FULL_VERSION
endif endif
ifdef MILESTONE ifdef MILESTONE
ifneq ($(MILESTONE),fcs)
ANT_OPTIONS += -Dmilestone=$(MILESTONE) ANT_OPTIONS += -Dmilestone=$(MILESTONE)
else
ANT_OPTIONS += -Drelease=$(JDK_VERSION)
endif
endif endif
ifdef BUILD_NUMBER ifdef BUILD_NUMBER

1
langtools/src/share/classes/com/sun/tools/javac/comp/Resolve.java
View File

@ -559,6 +559,7 @@ public class Resolve {
boolean useVarargs, boolean useVarargs,
boolean operator) { boolean operator) {
if (sym.kind == ERR) return bestSoFar; if (sym.kind == ERR) return bestSoFar;
if (!sym.isInheritedIn(site.tsym, types)) return bestSoFar;
assert sym.kind < AMBIGUOUS; assert sym.kind < AMBIGUOUS;
try { try {
if (rawInstantiate(env, site, sym, argtypes, typeargtypes, if (rawInstantiate(env, site, sym, argtypes, typeargtypes,

4
langtools/test/tools/javac/generics/6711619/T6711619a.out
View File

@ -1,5 +1,5 @@
T6711619a.java:63:14: compiler.err.report.access: a(), private, T6711619a.A T6711619a.java:63:14: compiler.err.cant.resolve.args: kindname.method, a, ,
T6711619a.java:64:14: compiler.err.report.access: b(), private, T6711619a.B 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:69:19: compiler.err.report.access: a, private, T6711619a.A
T6711619a.java:70:19: compiler.err.report.access: b, private, T6711619a.B T6711619a.java:70:19: compiler.err.report.access: b, private, T6711619a.B
T6711619a.java:71:19: compiler.err.report.access: a, private, T6711619a.A T6711619a.java:71:19: compiler.err.report.access: a, private, T6711619a.A

42
langtools/test/tools/javac/overload/T6776289.java Normal file
View File

@ -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, "");
}
}
}