Mercurial > hg > shenandoah-preopenjdk-archive > openjdk8 > langtools
changeset 2220:d80c3d6f4f05
Merge
author | lana |
---|---|
date | Thu, 12 Dec 2013 19:19:07 -0800 |
parents | 847cc0cccfa1 (diff) afe63d41c699 (current diff) |
children | 8832b6048e65 |
files | |
diffstat | 8 files changed, 147 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java Thu Dec 12 05:21:38 2013 -0800 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java Thu Dec 12 19:19:07 2013 -0800 @@ -1363,7 +1363,7 @@ return new ContentBuilder(); } - String seetext = replaceDocRootDir(see.text()); + String seetext = replaceDocRootDir(Util.normalizeNewlines(see.text())); //Check if @see is an href or "string" if (seetext.startsWith("<") || seetext.startsWith("\"")) {
--- a/src/share/classes/com/sun/tools/javac/comp/Resolve.java Thu Dec 12 05:21:38 2013 -0800 +++ b/src/share/classes/com/sun/tools/javac/comp/Resolve.java Thu Dec 12 19:19:07 2013 -0800 @@ -1503,7 +1503,7 @@ return ambiguityError(m1, m2); case AMBIGUOUS: //check if m1 is more specific than all ambiguous methods in m2 - AmbiguityError e = (AmbiguityError)m2; + AmbiguityError e = (AmbiguityError)m2.baseSymbol(); for (Symbol s : e.ambiguousSyms) { if (mostSpecific(argtypes, m1, s, env, site, allowBoxing, useVarargs) != m1) { return e.addAmbiguousSymbol(m1); @@ -3055,7 +3055,7 @@ final Symbol lookup(Env<AttrContext> env, MethodResolutionPhase phase) { Symbol sym = doLookup(env, phase); if (sym.kind == AMBIGUOUS) { - AmbiguityError a_err = (AmbiguityError)sym; + AmbiguityError a_err = (AmbiguityError)sym.baseSymbol(); sym = a_err.mergeAbstracts(site); } return sym; @@ -3125,7 +3125,7 @@ Symbol access(Env<AttrContext> env, DiagnosticPosition pos, Symbol location, Symbol sym) { if (sym.kind == AMBIGUOUS) { - AmbiguityError a_err = (AmbiguityError)sym; + AmbiguityError a_err = (AmbiguityError)sym.baseSymbol(); sym = a_err.mergeAbstracts(site); } //skip error reporting @@ -3992,7 +3992,7 @@ private List<Symbol> flatten(Symbol sym) { if (sym.kind == AMBIGUOUS) { - return ((AmbiguityError)sym).ambiguousSyms; + return ((AmbiguityError)sym.baseSymbol()).ambiguousSyms; } else { return List.of(sym); }
--- a/src/share/classes/com/sun/tools/javac/comp/TransTypes.java Thu Dec 12 05:21:38 2013 -0800 +++ b/src/share/classes/com/sun/tools/javac/comp/TransTypes.java Thu Dec 12 19:19:07 2013 -0800 @@ -586,7 +586,7 @@ try { currentMethod = null; tree.params = translate(tree.params); - tree.body = translate(tree.body, null); + tree.body = translate(tree.body, tree.body.type==null? null : erasure(tree.body.type)); tree.type = erasure(tree.type); result = tree; }
--- a/test/com/sun/javadoc/testDocRootLink/TestDocRootLink.java Thu Dec 12 05:21:38 2013 -0800 +++ b/test/com/sun/javadoc/testDocRootLink/TestDocRootLink.java Thu Dec 12 19:19:07 2013 -0800 @@ -23,7 +23,7 @@ /* * @test - * @bug 6553182 8025416 + * @bug 6553182 8025416 8029504 * @summary This test verifies the -Xdocrootparent option. * @author Bhavesh Patel * @library ../lib/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/T8029569/VarargsAmbiguityCrashTest.java Thu Dec 12 19:19:07 2013 -0800 @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 8029569 + * @summary internal javac cast exception when resolving varargs ambiguity + * @compile/fail/ref=VarargsAmbiguityCrashTest.out -XDrawDiagnostics VarargsAmbiguityCrashTest.java + */ + +public class VarargsAmbiguityCrashTest { + void m1() { + m2(null, new Exception()); + } + + void m2(Long l) {} + + void m2(Exception... exception) {} + + void m2(Long l, Exception... exception) {} +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/T8029569/VarargsAmbiguityCrashTest.out Thu Dec 12 19:19:07 2013 -0800 @@ -0,0 +1,2 @@ +VarargsAmbiguityCrashTest.java:33:9: compiler.err.ref.ambiguous: m2, kindname.method, m2(java.lang.Exception...), VarargsAmbiguityCrashTest, kindname.method, m2(java.lang.Long,java.lang.Exception...), VarargsAmbiguityCrashTest +1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/LambdaParenGeneric.java Thu Dec 12 19:19:07 2013 -0800 @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 8029558 + * @summary VerifyError lambda body is parenthesized generic value + * @author Robert Field + * @run main LambdaParenGeneric + */ + +public class LambdaParenGeneric { + + @FunctionalInterface + public interface FI { + Integer apply(); + } + + public static class Val<A> { + A value; + Val(A v) { value = v; } + } + + public static void main(String[] args) { + FI inc = () -> (new Val<Integer>(77).value); + System.out.println(inc.apply()); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/LambdaParenGenericOrig.java Thu Dec 12 19:19:07 2013 -0800 @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 8029558 + * @summary VerifyError lambda body is parenthesized generic value (originally submitted test) + * @author Dmitrii Afanasyev + * @run main LambdaParenGenericOrig + */ + +public class LambdaParenGenericOrig { + + @FunctionalInterface + public static interface Function1<R, A> { + R apply(A input); + } + + @FunctionalInterface + public static interface Function2<R, A1, A2> { + R apply(A1 input1, A2 input2); + } + + public static void main(String[] args) { + final Function2<Integer, Integer, Integer> add = (x, y) -> x + y; + final Function1<Integer, Integer> inc = x -> (add.apply(x, 1)); + System.out.println(inc.apply(0)); + } +}