Mercurial > hg > openjdk > aarch64-port > langtools
changeset 2764:39c9e6e984d0
Merge
author | coffeys |
---|---|
date | Wed, 21 Jan 2015 17:08:51 +0000 |
parents | 7845808098ea (current diff) 79177246b3db (diff) |
children | 0ba07c272e33 |
files | .hgtags |
diffstat | 9 files changed, 131 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Wed Dec 17 14:46:40 2014 -0800 +++ b/.hgtags Wed Jan 21 17:08:51 2015 +0000 @@ -312,6 +312,8 @@ 9239118487dfb47ee850d2cc9b10a0a2e510da3c jdk8u20-b24 9239118487dfb47ee850d2cc9b10a0a2e510da3c jdk8u20-b25 5e6d409a72327a31b8a8f9aa0b32ef213c8b629c jdk8u20-b26 +7302299fa9c4fa48af02b6477ff3ccbb01f2d4ea jdk8u20-b31 +2f9120236904ce5bd8ebfde755c1b2edcc4dfdd6 jdk8u20-b32 f491f1581f196950c2cb858508dd06601968c417 jdk8u25-b00 5bc865e0a2e3c59c1c8bc41e731509e1737ddea1 jdk8u25-b01 4dec0c684a9ead80ea2bca6b042682367c1abf90 jdk8u25-b02 @@ -331,6 +333,21 @@ 7fa6fa7cc204de988e224c6f8f75e62128fa84cd jdk8u25-b16 53ca196be1ae098466976c017b166d4ce180c36f jdk8u25-b17 a4f0c6dd8f97d4dd89baf09463c748abea9b3ed7 jdk8u25-b18 +c4de614efd7affc001715aa5a7040620924ac44a jdk8u25-b31 +c4bd223559aad3d152968a09d56241175d82c561 jdk8u31-b00 +6b5e2c190f3023162a33b798e57a0d78e027c843 jdk8u31-b01 +8b4ea00b438d7f99ecd6a8345cb018d8a0379620 jdk8u31-b02 +6ce4f2acf83e17d084b9b9bce2ef98438e984064 jdk8u31-b03 +c271515197807db2f0496945241f0b09885af99b jdk8u31-b04 +2deb2110e81fc38f5b45842fd478aae168d2d27a jdk8u31-b05 +fe1980c653be1fa9fb50353c5a5305855dcd7bd4 jdk8u31-b06 +03b8ef4cf0c00aa040db27c7d8e68fa8b6133afd jdk8u31-b07 +05824e9d8171e3d50fd5d1a495169cb38b64cf08 jdk8u31-b08 +26c46688ce4a0909f65dc341df4315bf34a92202 jdk8u31-b09 +99c3209f228e1f9aa874b6bd0908fd5d9ebf7078 jdk8u31-b10 +e72be544fa9e247fba3c6bb61e291d80e127a461 jdk8u31-b11 +c956b12b30ee21a4fc5df1871fa3b01e84310ebe jdk8u31-b12 +7a34ec7bb1c831e82ac88da578a028572b676260 jdk8u31-b13 d231957fe3103e790465fcf058fb8cb33bbc4c4e jdk8u40-b00 bf89a471779d13a9407f7d1c86f7716258bc4aa6 jdk8u40-b01 0b6cc4ea670f5d17b56c088f202869bdbb80a5ce jdk8u40-b02 @@ -351,4 +368,6 @@ a12a9932f649dd3df174d3e340527433d3695c49 jdk8u40-b17 94f30e5fde53e3ddcd3c4e9842349318eae8fe10 jdk8u40-b18 0c514d1fd006fc79d35b670de10c370c8d559db7 jdk8u40-b19 +c3d6d1a5339952fbe4124e700407b7211446c99c jdk8u40-b20 +9113c7c8d902ec94b28ca0ef4a6466bdba65fcfc jdk8u40-b21 0c514d1fd006fc79d35b670de10c370c8d559db7 jdk8u60-b00
--- a/src/share/classes/com/sun/source/doctree/package-info.java Wed Dec 17 14:46:40 2014 -0800 +++ b/src/share/classes/com/sun/source/doctree/package-info.java Wed Jan 21 17:08:51 2015 +0000 @@ -29,7 +29,7 @@ * * @author Jonathan Gibbons * @since 1.8 - * @see <a href="http://download.oracle.com/javase/6/docs/technotes/tools/solaris/javadoc.html#javadoctags">http://download.oracle.com/javase/6/docs/technotes/tools/solaris/javadoc.html#javadoctags</a> + * @see <a href="https://docs.oracle.com/javase/6/docs/technotes/tools/solaris/javadoc.html#javadoctags">https://docs.oracle.com/javase/6/docs/technotes/tools/solaris/javadoc.html#javadoctags</a> */ @jdk.Exported package com.sun.source.doctree;
--- a/src/share/classes/com/sun/tools/classfile/BootstrapMethods_attribute.java Wed Dec 17 14:46:40 2014 -0800 +++ b/src/share/classes/com/sun/tools/classfile/BootstrapMethods_attribute.java Wed Jan 21 17:08:51 2015 +0000 @@ -29,7 +29,7 @@ /** * See JVMS 4.7.21 - * http://docs.oracle.com/javase/specs/jvms/se7/html/jvms-4.html#jvms-4.7.21 + * https://docs.oracle.com/javase/specs/jvms/se7/html/jvms-4.html#jvms-4.7.21 * * <p><b>This is NOT part of any supported API. * If you write code that depends on this, you do so at your own risk.
--- a/src/share/classes/com/sun/tools/javac/parser/DocCommentParser.java Wed Dec 17 14:46:40 2014 -0800 +++ b/src/share/classes/com/sun/tools/javac/parser/DocCommentParser.java Wed Jan 21 17:08:51 2015 +0000 @@ -1039,7 +1039,7 @@ } /** - * @see <a href="http://docs.oracle.com/javase/7/docs/technotes/tools/solaris/javadoc.html#javadoctags">Javadoc Tags</a> + * @see <a href="https://docs.oracle.com/javase/7/docs/technotes/tools/solaris/javadoc.html#javadoctags">Javadoc Tags</a> */ private void initTagParsers() { TagParser[] parsers = {
--- a/src/share/classes/com/sun/tools/javac/util/Convert.java Wed Dec 17 14:46:40 2014 -0800 +++ b/src/share/classes/com/sun/tools/javac/util/Convert.java Wed Jan 21 17:08:51 2015 +0000 @@ -36,9 +36,9 @@ * <p> * See also: * <ul> - * <li><a href="http://docs.oracle.com/javase/specs/jvms/se7/html/jvms-4.html#jvms-4.4.7"> + * <li><a href="https://docs.oracle.com/javase/specs/jvms/se7/html/jvms-4.html#jvms-4.4.7"> * JVMS 4.4.7 </a></li> - * <li><a href="http://docs.oracle.com/javase/7/docs/api/java/io/DataInput.html#modified-utf-8"> + * <li><a href="https://docs.oracle.com/javase/7/docs/api/java/io/DataInput.html#modified-utf-8"> java.io.DataInput: Modified UTF-8 </a></li> <li><a href="https://en.wikipedia.org/wiki/UTF-8#Modified_UTF-8"> Modified UTF-8 (wikipedia) </a></li>
--- a/src/share/classes/com/sun/tools/jdeps/PlatformClassPath.java Wed Dec 17 14:46:40 2014 -0800 +++ b/src/share/classes/com/sun/tools/jdeps/PlatformClassPath.java Wed Jan 21 17:08:51 2015 +0000 @@ -155,7 +155,7 @@ * Tests if a given package name is exported. */ public boolean isExportedPackage(String pn) { - if (Profile.getProfile(pn) != null) { + if (Profile.getProfile(pn) != null || "javax.jnlp".equals(pn)) { return true; } return exportedPackages.containsKey(pn) ? exportedPackages.get(pn) : false;
--- a/test/com/sun/javadoc/testDocRootLink/TestDocRootLink.java Wed Dec 17 14:46:40 2014 -0800 +++ b/test/com/sun/javadoc/testDocRootLink/TestDocRootLink.java Wed Jan 21 17:08:51 2015 +0000 @@ -60,21 +60,21 @@ }; private static final String[][] NEGATED_TEST1 = { {BUG_ID + FS + "pkg1" + FS + "C1.html", - "<a href=\"http://download.oracle.com/javase/7/docs/technotes/guides/index.html\">" + "<a href=\"https://docs.oracle.com/javase/7/docs/technotes/guides/index.html\">" }, {BUG_ID + FS + "pkg1" + FS + "C1.html", - "<a href=\"http://download.oracle.com/javase/7/docs/pkg2/C2.html\">" + "<a href=\"https://docs.oracle.com/javase/7/docs/pkg2/C2.html\">" }, {BUG_ID + FS + "pkg1" + FS + "package-summary.html", - "<a href=\"http://download.oracle.com/javase/7/docs/technotes/guides/index.html\">" + "<a href=\"https://docs.oracle.com/javase/7/docs/technotes/guides/index.html\">" }, {BUG_ID + FS + "pkg1" + FS + "package-summary.html", - "<a href=\"http://download.oracle.com/javase/7/docs/pkg2/C2.html\">" + "<a href=\"https://docs.oracle.com/javase/7/docs/pkg2/C2.html\">" } }; private static final String[][] TEST2 = { {BUG_ID + "-1" + FS + "pkg2" + FS + "C2.html", - "Refer <a href=\"http://download.oracle.com/javase/7/docs/technotes/guides/index.html\">Here</a>" + "Refer <a href=\"https://docs.oracle.com/javase/7/docs/technotes/guides/index.html\">Here</a>" }, {BUG_ID + "-1" + FS + "pkg2" + FS + "C2.html", "This <a href=\"../pkg1/C1.html\">Here</a> should not be replaced" + NL + @@ -85,7 +85,7 @@ " <a href=\"../pkg1/C1.html\">Link 2</a>." }, {BUG_ID + "-1" + FS + "pkg2" + FS + "package-summary.html", - "<a href=\"http://download.oracle.com/javase/7/docs/technotes/guides/index.html\">" + NL + + "<a href=\"https://docs.oracle.com/javase/7/docs/technotes/guides/index.html\">" + NL + " Test document 1</a>" }, {BUG_ID + "-1" + FS + "pkg2" + FS + "package-summary.html", @@ -100,13 +100,13 @@ "<a href=\"../../technotes/guides/index.html\">" }, {BUG_ID + "-1" + FS + "pkg2" + FS + "C2.html", - "<a href=\"http://download.oracle.com/javase/7/docs/pkg1/C1.html\">" + "<a href=\"https://docs.oracle.com/javase/7/docs/pkg1/C1.html\">" }, {BUG_ID + "-1" + FS + "pkg2" + FS + "package-summary.html", "<a href=\"../../technotes/guides/index.html\">" }, {BUG_ID + "-1" + FS + "pkg2" + FS + "package-summary.html", - "<a href=\"http://download.oracle.com/javase/7/docs/pkg1/C1.html\">" + "<a href=\"https://docs.oracle.com/javase/7/docs/pkg1/C1.html\">" } }; private static final String[] ARGS1 = @@ -115,7 +115,7 @@ }; private static final String[] ARGS2 = new String[]{ - "-d", BUG_ID + "-1", "-Xdocrootparent", "http://download.oracle.com/javase/7/docs", "-sourcepath", SRC_DIR, "pkg1", "pkg2" + "-d", BUG_ID + "-1", "-Xdocrootparent", "https://docs.oracle.com/javase/7/docs", "-sourcepath", SRC_DIR, "pkg1", "pkg2" }; /**
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/T8049305/WrongStackframeGenerationTest1.java Wed Jan 21 17:08:51 2015 +0000 @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2014, 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 8049305 + * @summary Verification error due to a bad stackmap frame generated by javac + */ + +public class WrongStackframeGenerationTest1 { + public static void main(String[] args) {} + + static void foo(){ + while (true) { + int i = 0; + break; + } + switch (1) { + case 1: + int j = 0; + case 2: + bar(); + } + } + + static void bar() {} +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/T8049305/WrongStackframeGenerationTest2.java Wed Jan 21 17:08:51 2015 +0000 @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2014, 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 8049305 + * @summary Verification error due to a bad stackmap frame generated by javac + */ + +public class WrongStackframeGenerationTest2 { + public static void main(String[] args) {} + + static void foo() { + int len; + for (;;) { + try { + len = 1; + break; + } catch (Exception e) { + } + } + + try { + if (len == -1) { + len = 0; + } + } finally { + } + } +}