# HG changeset patch # User tbell # Date 1212471316 25200 # Node ID a1313ae226304b8ab5f469e422f611c6cf02dac2 # Parent f0fc08b71edb7708ce5d334754d74ca2e68bceeb# Parent 9b2f1fe5c183f620333c6f7d8d42b7b7d31ca15f Merge diff -r f0fc08b71edb -r a1313ae22630 langtools/src/share/classes/com/sun/tools/javac/code/Types.java --- a/langtools/src/share/classes/com/sun/tools/javac/code/Types.java Wed May 28 00:02:28 2008 -0700 +++ b/langtools/src/share/classes/com/sun/tools/javac/code/Types.java Mon Jun 02 22:35:16 2008 -0700 @@ -301,7 +301,11 @@ : isSubtypeUnchecked(elemtype(t), elemtype(s), warn); } else if (isSubtype(t, s)) { return true; - } else if (!s.isRaw()) { + } + else if (t.tag == TYPEVAR) { + return isSubtypeUnchecked(t.getUpperBound(), s, warn); + } + else if (!s.isRaw()) { Type t2 = asSuper(t, s.tsym); if (t2 != null && t2.isRaw()) { if (isReifiable(s)) diff -r f0fc08b71edb -r a1313ae22630 langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java --- a/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java Wed May 28 00:02:28 2008 -0700 +++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java Mon Jun 02 22:35:16 2008 -0700 @@ -454,6 +454,8 @@ void attribTypeVariables(List typarams, Env env) { for (JCTypeParameter tvar : typarams) { TypeVar a = (TypeVar)tvar.type; + a.tsym.flags_field |= UNATTRIBUTED; + a.bound = Type.noType; if (!tvar.bounds.isEmpty()) { List bounds = List.of(attribType(tvar.bounds.head, env)); for (JCExpression bound : tvar.bounds.tail) @@ -464,13 +466,14 @@ // java.lang.Object. types.setBounds(a, List.of(syms.objectType)); } + a.tsym.flags_field &= ~UNATTRIBUTED; } - } - - void attribBounds(List typarams, Env env) { for (JCTypeParameter tvar : typarams) chk.checkNonCyclic(tvar.pos(), (TypeVar)tvar.type); attribStats(typarams, env); + } + + void attribBounds(List typarams) { for (JCTypeParameter typaram : typarams) { Type bound = typaram.type.getUpperBound(); if (bound != null && bound.tsym instanceof ClassSymbol) { @@ -581,7 +584,7 @@ try { chk.checkDeprecatedAnnotation(tree.pos(), m); - attribBounds(tree.typarams, env); + attribBounds(tree.typarams); // If we override any other methods, check that we do so properly. // JLS ??? @@ -2689,7 +2692,7 @@ chk.validateAnnotations(tree.mods.annotations, c); // Validate type parameters, supertype and interfaces. - attribBounds(tree.typarams, env); + attribBounds(tree.typarams); chk.validateTypeParams(tree.typarams); chk.validate(tree.extending); chk.validate(tree.implementing); diff -r f0fc08b71edb -r a1313ae22630 langtools/src/share/classes/com/sun/tools/javac/comp/Check.java --- a/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java Wed May 28 00:02:28 2008 -0700 +++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java Mon Jun 02 22:35:16 2008 -0700 @@ -1486,6 +1486,8 @@ private void checkNonCyclic1(DiagnosticPosition pos, Type t, Set seen) { final TypeVar tv; + if (t.tag == TYPEVAR && (t.tsym.flags() & UNATTRIBUTED) != 0) + return; if (seen.contains(t)) { tv = (TypeVar)t; tv.bound = new ErrorType(); diff -r f0fc08b71edb -r a1313ae22630 langtools/src/share/classes/com/sun/tools/javac/comp/Resolve.java --- a/langtools/src/share/classes/com/sun/tools/javac/comp/Resolve.java Wed May 28 00:02:28 2008 -0700 +++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Resolve.java Mon Jun 02 22:35:16 2008 -0700 @@ -228,7 +228,7 @@ // another symbol which is a member of `site' // (because, if it is overridden, `sym' is not strictly // speaking a member of `site'.) - (sym.kind != MTH || sym.isConstructor() || + (sym.kind != MTH || sym.isConstructor() || sym.isStatic() || ((MethodSymbol)sym).implementation(site.tsym, types, true) == sym); default: // this case includes erroneous combinations as well return isAccessible(env, site); diff -r f0fc08b71edb -r a1313ae22630 langtools/test/tools/javac/generics/6677785/T6677785.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/langtools/test/tools/javac/generics/6677785/T6677785.java Mon Jun 02 22:35:16 2008 -0700 @@ -0,0 +1,35 @@ +/* + * 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 6677785 + * @summary REGRESSION: StackOverFlowError with Cyclic Class level Type Parameters when used in constructors + * @author Maurizio Cimadamore + * @compile/fail/ref=T6677785.out -XDstdout -XDrawDiagnostics T6677785.java + */ +public class T6677785 { + T6677785() {} + T6677785(E e) {} + T6677785(E e, T t) {} +} diff -r f0fc08b71edb -r a1313ae22630 langtools/test/tools/javac/generics/6677785/T6677785.out --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/langtools/test/tools/javac/generics/6677785/T6677785.out Mon Jun 02 22:35:16 2008 -0700 @@ -0,0 +1,2 @@ +T6677785.java:31:23: compiler.err.cyclic.inheritance: E +1 error diff -r f0fc08b71edb -r a1313ae22630 langtools/test/tools/javac/generics/T6507024.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/langtools/test/tools/javac/generics/T6507024.java Mon Jun 02 22:35:16 2008 -0700 @@ -0,0 +1,37 @@ +/* + * 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 6507024 + * @summary unchecked conversion between arrays fails after capture conversion + * @author Maurizio Cimadamore + * + * @compile T6507024.java + */ + +public class T6507024 { + void m(T6507024[] results) { + T6507024[] r = results.getClass().cast(null); + } +} diff -r f0fc08b71edb -r a1313ae22630 langtools/test/tools/javac/staticImport/6665223/T6665223.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/langtools/test/tools/javac/staticImport/6665223/T6665223.java Mon Jun 02 22:35:16 2008 -0700 @@ -0,0 +1,31 @@ +/* + * 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 6665223 + * @summary Static import of inherited protected method causes compiler exception + * @author Maurizio Cimadamore + * + * @compile pkg/A.java + */ diff -r f0fc08b71edb -r a1313ae22630 langtools/test/tools/javac/staticImport/6665223/pkg/A.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/langtools/test/tools/javac/staticImport/6665223/pkg/A.java Mon Jun 02 22:35:16 2008 -0700 @@ -0,0 +1,31 @@ +/* + * 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. + */ +package pkg; + +import static pkg.B.b; + +class A { + public static void main(String[] args) { + b(); + } +} diff -r f0fc08b71edb -r a1313ae22630 langtools/test/tools/javac/staticImport/6665223/pkg/B.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/langtools/test/tools/javac/staticImport/6665223/pkg/B.java Mon Jun 02 22:35:16 2008 -0700 @@ -0,0 +1,29 @@ +/* + * 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. + */ +package pkg; + +class B extends B2 {} + +abstract class B2 { + protected static void b() {} +}