Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/.hgtags	Mon Dec 15 16:55:33 2008 -0800
     1.2 +++ b/.hgtags	Mon Dec 15 17:13:21 2008 -0800
     1.3 @@ -15,3 +15,4 @@
     1.4  3fd42dfa6f27f2767a241fb82bc01a613f0c2096 jdk7-b38
     1.5  3fb51e47622bb771571680bc6a7b64c6172b482d jdk7-b39
     1.6  32e30988324601d08b87989f0821d99aa8534511 jdk7-b40
     1.7 +ded6b40f558e8d19b3c17715b3d67ee001606645 jdk7-b41

     2.1 --- a/make/Makefile	Mon Dec 15 16:55:33 2008 -0800
     2.2 +++ b/make/Makefile	Mon Dec 15 17:13:21 2008 -0800
     2.3 @@ -82,7 +82,11 @@
     2.4  endif 
     2.5  
     2.6  ifdef MILESTONE
     2.7 +ifneq ($(MILESTONE),fcs)
     2.8    ANT_OPTIONS += -Dmilestone=$(MILESTONE)
     2.9 +else
    2.10 +  ANT_OPTIONS += -Drelease=$(JDK_VERSION)
    2.11 +endif
    2.12  endif
    2.13  
    2.14  ifdef BUILD_NUMBER

     3.1 --- a/src/share/classes/com/sun/tools/javac/comp/Resolve.java	Mon Dec 15 16:55:33 2008 -0800
     3.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Resolve.java	Mon Dec 15 17:13:21 2008 -0800
     3.3 @@ -559,6 +559,7 @@
     3.4                        boolean useVarargs,
     3.5                        boolean operator) {
     3.6          if (sym.kind == ERR) return bestSoFar;
     3.7 +        if (!sym.isInheritedIn(site.tsym, types)) return bestSoFar;
     3.8          assert sym.kind < AMBIGUOUS;
     3.9          try {
    3.10              if (rawInstantiate(env, site, sym, argtypes, typeargtypes,

     4.1 --- a/test/tools/javac/generics/6711619/T6711619a.out	Mon Dec 15 16:55:33 2008 -0800
     4.2 +++ b/test/tools/javac/generics/6711619/T6711619a.out	Mon Dec 15 17:13:21 2008 -0800
     4.3 @@ -1,5 +1,5 @@
     4.4 -T6711619a.java:63:14: compiler.err.report.access: a(), private, T6711619a.A
     4.5 -T6711619a.java:64:14: compiler.err.report.access: b(), private, T6711619a.B
     4.6 +T6711619a.java:63:14: compiler.err.cant.resolve.args: kindname.method, a, , 
     4.7 +T6711619a.java:64:14: compiler.err.cant.resolve.args: kindname.method, b, , 
     4.8  T6711619a.java:69:19: compiler.err.report.access: a, private, T6711619a.A
     4.9  T6711619a.java:70:19: compiler.err.report.access: b, private, T6711619a.B
    4.10  T6711619a.java:71:19: compiler.err.report.access: a, private, T6711619a.A

     5.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.2 +++ b/test/tools/javac/overload/T6776289.java	Mon Dec 15 17:13:21 2008 -0800
     5.3 @@ -0,0 +1,42 @@
     5.4 +/*
     5.5 + * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
     5.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     5.7 + *
     5.8 + * This code is free software; you can redistribute it and/or modify it
     5.9 + * under the terms of the GNU General Public License version 2 only, as
    5.10 + * published by the Free Software Foundation.
    5.11 + *
    5.12 + * This code is distributed in the hope that it will be useful, but WITHOUT
    5.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    5.14 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    5.15 + * version 2 for more details (a copy is included in the LICENSE file that
    5.16 + * accompanied this code).
    5.17 + *
    5.18 + * You should have received a copy of the GNU General Public License version
    5.19 + * 2 along with this work; if not, write to the Free Software Foundation,
    5.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    5.21 + *
    5.22 + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    5.23 + * CA 95054 USA or visit www.sun.com if you need additional information or
    5.24 + * have any questions.
    5.25 + */
    5.26 +
    5.27 +/*
    5.28 + * @test
    5.29 + * @bug 6776289
    5.30 + * @summary Regression: javac7 doesnt resolve method calls properly
    5.31 + * @compile T6776289.java
    5.32 + */
    5.33 +
    5.34 +class A {
    5.35 +    private void m(int a, int b) { }
    5.36 +}
    5.37 +
    5.38 +class T6776289 {
    5.39 +    static void m(int a, String s) { }
    5.40 +    class B extends A {
    5.41 +        public void test() {
    5.42 +            m(1, "");
    5.43 +        }
    5.44 +    }
    5.45 +}