From andrew at icedtea.classpath.org Tue Aug 1 13:02:04 2017 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 01 Aug 2017 13:02:04 +0000 Subject: /hg/release/icedtea7-2.6: 2 new changesets Message-ID: changeset 2019ab2d8dc7 in /hg/release/icedtea7-2.6 details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=2019ab2d8dc7 author: Andrew John Hughes date: Tue Aug 01 13:36:11 2017 +0100 Bump to 2.6.11pre01. Upstream changes: - S7177216, PR3398, RH1446700: native2ascii changes file permissions of input file - S8179084, PR3410, RH1455694: HotSpot VM fails to start when AggressiveHeap is set - S8181419, PR3414, RH1463144: Race in jdwp invoker handling may lead to crashes or invalid results ChangeLog: 2017-08-01 Andrew John Hughes Bump to 2.6.11pre01. * Makefile.am, (CORBA_CHANGESET): Update to icedtea-2.6.11pre01. (JAXP_CHANGESET): Likewise. (JAXWS_CHANGESET): Likewise. (JDK_CHANGESET): Likewise. (LANGTOOLS_CHANGESET): Likewise. (OPENJDK_CHANGESET): Likewise. (CORBA_SHA256SUM): Likewise. (JAXP_SHA256SUM): Likewise. (JAXWS_SHA256SUM): Likewise. (JDK_SHA256SUM): Likewise. (LANGTOOLS_SHA256SUM): Likewise. (OPENJDK_SHA256SUM): Likewise. * NEWS: Updated. * configure.ac: Bump to 2.6.11pre01. * hotspot.map.in: Update to icedtea-2.6.11pre01. changeset c14782803cc7 in /hg/release/icedtea7-2.6 details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=c14782803cc7 author: Andrew John Hughes date: Tue Aug 01 14:13:09 2017 +0100 Added tag icedtea-2.6.11pre01 for changeset 2019ab2d8dc7 diffstat: .hgtags | 1 + ChangeLog | 20 ++++++++++++++++++++ Makefile.am | 26 +++++++++++++------------- NEWS | 5 +++++ configure.ac | 2 +- hotspot.map.in | 2 +- 6 files changed, 41 insertions(+), 15 deletions(-) diffs (102 lines): diff -r 6d8f43800f38 -r c14782803cc7 .hgtags --- a/.hgtags Tue Jun 06 03:53:49 2017 +0100 +++ b/.hgtags Tue Aug 01 14:13:09 2017 +0100 @@ -75,3 +75,4 @@ 2e5d3ac9831958c65df8df48534d1c3159118c88 icedtea-2.6.9 522b039fb608f817d500e0df3b5488808bc97a6e icedtea-2.6.10pre01 ed3a064f86655b3742334bbd592b2f1624f44cf6 icedtea-2.6.10 +2019ab2d8dc7f3472d45d2a87172d2258b18e9bc icedtea-2.6.11pre01 diff -r 6d8f43800f38 -r c14782803cc7 ChangeLog --- a/ChangeLog Tue Jun 06 03:53:49 2017 +0100 +++ b/ChangeLog Tue Aug 01 14:13:09 2017 +0100 @@ -1,3 +1,23 @@ +2017-08-01 Andrew John Hughes + + Bump to 2.6.11pre01. + * Makefile.am, + (CORBA_CHANGESET): Update to icedtea-2.6.11pre01. + (JAXP_CHANGESET): Likewise. + (JAXWS_CHANGESET): Likewise. + (JDK_CHANGESET): Likewise. + (LANGTOOLS_CHANGESET): Likewise. + (OPENJDK_CHANGESET): Likewise. + (CORBA_SHA256SUM): Likewise. + (JAXP_SHA256SUM): Likewise. + (JAXWS_SHA256SUM): Likewise. + (JDK_SHA256SUM): Likewise. + (LANGTOOLS_SHA256SUM): Likewise. + (OPENJDK_SHA256SUM): Likewise. + * NEWS: Updated. + * configure.ac: Bump to 2.6.11pre01. + * hotspot.map.in: Update to icedtea-2.6.11pre01. + 2017-06-05 Andrew John Hughes * NEWS: Add section for 2.6.11. diff -r 6d8f43800f38 -r c14782803cc7 Makefile.am --- a/Makefile.am Tue Jun 06 03:53:49 2017 +0100 +++ b/Makefile.am Tue Aug 01 14:13:09 2017 +0100 @@ -4,19 +4,19 @@ BUILD_VERSION = b02 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION) -CORBA_CHANGESET = 4d807b58849e -JAXP_CHANGESET = 4099d8cf255f -JAXWS_CHANGESET = bc4f48c1ccba -JDK_CHANGESET = 11e15e507828 -LANGTOOLS_CHANGESET = 6e30439005f6 -OPENJDK_CHANGESET = b3f98f0d4549 - -CORBA_SHA256SUM = 2d173e14e89520106bec26696a520b643ae1eee4f615a05a0f44c40ca7f174ed -JAXP_SHA256SUM = 451df1bed6179be1cfb655623bb67ed0dfd551fdeeeec029ef8db74d8ca51f69 -JAXWS_SHA256SUM = 765cb50d5afeaae0eb717b297e79472d1353d822e56cfc7e9e6845b49731cd57 -JDK_SHA256SUM = 50d0af5fd5008b6f4b07811c77c570d065584f8c1c70bafe016a6d10b6a36481 -LANGTOOLS_SHA256SUM = 02d38317e85b7c10f0cc072c192467a504cf37a2a0d94cddc4347f5c56677653 -OPENJDK_SHA256SUM = b0a9dd2e3c0b3a29d791e49c6e5ea63057380a8eb7574355d4c551986ed7740a +CORBA_CHANGESET = ff69bc83070b +JAXP_CHANGESET = f16026b79deb +JAXWS_CHANGESET = f8bd60e99896 +JDK_CHANGESET = 5f11354f6257 +LANGTOOLS_CHANGESET = a4814b6ff893 +OPENJDK_CHANGESET = 54009dd18b70 + +CORBA_SHA256SUM = 6d69d2fdcc01e3687b297f224fb93113a8c61ea44384695e597d1572b502cb91 +JAXP_SHA256SUM = c34909de8b989b67dec34b06231d42f1d209b81887f22ceef3fb2b8d2ef436aa +JAXWS_SHA256SUM = dd19633f86c870b6b729bb2249fcc6266764827819ef6198c2fd7d286b11a551 +JDK_SHA256SUM = a7d4679fa6f098dca5a61d88e42fbe02d0f6e6c4fba77d6a7fbb65f8b2a86360 +LANGTOOLS_SHA256SUM = b7ed8702b9eed001732d60bf8359cb90130aefa61e4ac23e44576c513116f8dd +OPENJDK_SHA256SUM = cb12df6ddb68e811bb932de6f059d0ab1708d784f46fd3eddf311a924929b468 DROP_URL = http://icedtea.classpath.org/download/drops diff -r 6d8f43800f38 -r c14782803cc7 NEWS --- a/NEWS Tue Jun 06 03:53:49 2017 +0100 +++ b/NEWS Tue Aug 01 14:13:09 2017 +0100 @@ -14,6 +14,11 @@ New in release 2.6.11 (2017-07-XX): +* Backports + - S7177216, PR3398, RH1446700: native2ascii changes file permissions of input file + - S8179084, PR3410, RH1455694: HotSpot VM fails to start when AggressiveHeap is set + - S8181419, PR3414, RH1463144: Race in jdwp invoker handling may lead to crashes or invalid results + New in release 2.6.10 (2017-05-16): * Security fixes diff -r 6d8f43800f38 -r c14782803cc7 configure.ac --- a/configure.ac Tue Jun 06 03:53:49 2017 +0100 +++ b/configure.ac Tue Aug 01 14:13:09 2017 +0100 @@ -1,4 +1,4 @@ -AC_INIT([icedtea], [2.6.11pre00], [distro-pkg-dev at openjdk.java.net]) +AC_INIT([icedtea], [2.6.11pre01], [distro-pkg-dev at openjdk.java.net]) AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) AM_MAINTAINER_MODE([enable]) AC_CONFIG_FILES([Makefile]) diff -r 6d8f43800f38 -r c14782803cc7 hotspot.map.in --- a/hotspot.map.in Tue Jun 06 03:53:49 2017 +0100 +++ b/hotspot.map.in Tue Aug 01 14:13:09 2017 +0100 @@ -1,2 +1,2 @@ # version type(drop/hg) url changeset sha256sum -default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 8edec8d2933a ab2b144695d0dfcf342b569b3f4e8450b61c073a3b7c60870fc88cb6d66bd560 +default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ a8044a7634d0 c1f2132ccb1e89cef9a440ea394108ee5203de7834974842a539526676cebd1c From bugzilla-daemon at icedtea.classpath.org Tue Aug 1 13:02:14 2017 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 01 Aug 2017 13:02:14 +0000 Subject: [Bug 3410] [IcedTea7] Backport "8179084: HotSpot VM fails to start when AggressiveHeap is set" In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3410 --- Comment #2 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea7-2.6?cmd=changeset;node=2019ab2d8dc7 author: Andrew John Hughes date: Tue Aug 01 13:36:11 2017 +0100 Bump to 2.6.11pre01. Upstream changes: - S7177216, PR3398, RH1446700: native2ascii changes file permissions of input file - S8179084, PR3410, RH1455694: HotSpot VM fails to start when AggressiveHeap is set - S8181419, PR3414, RH1463144: Race in jdwp invoker handling may lead to crashes or invalid results ChangeLog: 2017-08-01 Andrew John Hughes Bump to 2.6.11pre01. * Makefile.am, (CORBA_CHANGESET): Update to icedtea-2.6.11pre01. (JAXP_CHANGESET): Likewise. (JAXWS_CHANGESET): Likewise. (JDK_CHANGESET): Likewise. (LANGTOOLS_CHANGESET): Likewise. (OPENJDK_CHANGESET): Likewise. (CORBA_SHA256SUM): Likewise. (JAXP_SHA256SUM): Likewise. (JAXWS_SHA256SUM): Likewise. (JDK_SHA256SUM): Likewise. (LANGTOOLS_SHA256SUM): Likewise. (OPENJDK_SHA256SUM): Likewise. * NEWS: Updated. * configure.ac: Bump to 2.6.11pre01. * hotspot.map.in: Update to icedtea-2.6.11pre01. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Tue Aug 1 13:02:19 2017 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 01 Aug 2017 13:02:19 +0000 Subject: [Bug 3414] [IcedTea7] Backport "8181419: Race in jdwp invoker handling may lead to crashes or invalid results" In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3414 --- Comment #2 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea7-2.6?cmd=changeset;node=2019ab2d8dc7 author: Andrew John Hughes date: Tue Aug 01 13:36:11 2017 +0100 Bump to 2.6.11pre01. Upstream changes: - S7177216, PR3398, RH1446700: native2ascii changes file permissions of input file - S8179084, PR3410, RH1455694: HotSpot VM fails to start when AggressiveHeap is set - S8181419, PR3414, RH1463144: Race in jdwp invoker handling may lead to crashes or invalid results ChangeLog: 2017-08-01 Andrew John Hughes Bump to 2.6.11pre01. * Makefile.am, (CORBA_CHANGESET): Update to icedtea-2.6.11pre01. (JAXP_CHANGESET): Likewise. (JAXWS_CHANGESET): Likewise. (JDK_CHANGESET): Likewise. (LANGTOOLS_CHANGESET): Likewise. (OPENJDK_CHANGESET): Likewise. (CORBA_SHA256SUM): Likewise. (JAXP_SHA256SUM): Likewise. (JAXWS_SHA256SUM): Likewise. (JDK_SHA256SUM): Likewise. (LANGTOOLS_SHA256SUM): Likewise. (OPENJDK_SHA256SUM): Likewise. * NEWS: Updated. * configure.ac: Bump to 2.6.11pre01. * hotspot.map.in: Update to icedtea-2.6.11pre01. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Tue Aug 1 13:02:21 2017 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 01 Aug 2017 13:02:21 +0000 Subject: [Bug 3398] [IcedTea7] native2ascii changes file permissions of input file In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3398 --- Comment #3 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea7-2.6?cmd=changeset;node=2019ab2d8dc7 author: Andrew John Hughes date: Tue Aug 01 13:36:11 2017 +0100 Bump to 2.6.11pre01. Upstream changes: - S7177216, PR3398, RH1446700: native2ascii changes file permissions of input file - S8179084, PR3410, RH1455694: HotSpot VM fails to start when AggressiveHeap is set - S8181419, PR3414, RH1463144: Race in jdwp invoker handling may lead to crashes or invalid results ChangeLog: 2017-08-01 Andrew John Hughes Bump to 2.6.11pre01. * Makefile.am, (CORBA_CHANGESET): Update to icedtea-2.6.11pre01. (JAXP_CHANGESET): Likewise. (JAXWS_CHANGESET): Likewise. (JDK_CHANGESET): Likewise. (LANGTOOLS_CHANGESET): Likewise. (OPENJDK_CHANGESET): Likewise. (CORBA_SHA256SUM): Likewise. (JAXP_SHA256SUM): Likewise. (JAXWS_SHA256SUM): Likewise. (JDK_SHA256SUM): Likewise. (LANGTOOLS_SHA256SUM): Likewise. (OPENJDK_SHA256SUM): Likewise. * NEWS: Updated. * configure.ac: Bump to 2.6.11pre01. * hotspot.map.in: Update to icedtea-2.6.11pre01. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Wed Aug 2 07:12:47 2017 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 02 Aug 2017 07:12:47 +0000 Subject: [Bug 3431] New: [IcedTea8] Backport "8183551, CVE-2017-10074: AArch64: Image conversion improvements" Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3431 Bug ID: 3431 Summary: [IcedTea8] Backport "8183551, CVE-2017-10074: AArch64: Image conversion improvements" Product: IcedTea Version: 7-hg Hardware: aarch64 OS: All Status: NEW Severity: critical Priority: P5 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: gnu.andrew at redhat.com CC: unassigned at icedtea.classpath.org AArch64-specific code for 8173770 needs to be backported to the AArch64 port in IcedTea 2.x. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Wed Aug 2 07:13:11 2017 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 02 Aug 2017 07:13:11 +0000 Subject: [Bug 3431] [IcedTea8] Backport "8183551, CVE-2017-10074: AArch64: Image conversion improvements" In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3431 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Target Milestone|--- |2.6.11 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Wed Aug 2 07:26:47 2017 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 02 Aug 2017 07:26:47 +0000 Subject: [Bug 3431] [IcedTea7] Backport "8183551, CVE-2017-10074: AArch64: Image conversion improvements" In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3431 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Summary|[IcedTea8] Backport |[IcedTea7] Backport |"8183551, CVE-2017-10074: |"8183551, CVE-2017-10074: |AArch64: Image conversion |AArch64: Image conversion |improvements" |improvements" -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From andrew at icedtea.classpath.org Wed Aug 2 07:50:52 2017 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 02 Aug 2017 07:50:52 +0000 Subject: /hg/release/icedtea7-forest-2.6/hotspot: 8179084, PR3410, RH1455... Message-ID: changeset a8044a7634d0 in /hg/release/icedtea7-forest-2.6/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=a8044a7634d0 author: dholmes date: Mon Jul 31 06:02:56 2017 +0100 8179084, PR3410, RH1455694: HotSpot VM fails to start when AggressiveHeap is set Reviewed-by: kbarrett, stefank diffstat: src/share/vm/runtime/arguments.cpp | 2 - test/gc/arguments/TestAggressiveHeap.java | 91 +++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+), 2 deletions(-) diffs (107 lines): diff -r a70a6f7d586c -r a8044a7634d0 src/share/vm/runtime/arguments.cpp --- a/src/share/vm/runtime/arguments.cpp Wed May 17 17:02:01 2017 +0100 +++ b/src/share/vm/runtime/arguments.cpp Mon Jul 31 06:02:56 2017 +0100 @@ -2813,8 +2813,6 @@ // Enable parallel GC and adaptive generation sizing FLAG_SET_CMDLINE(bool, UseParallelGC, true); - FLAG_SET_DEFAULT(ParallelGCThreads, - Abstract_VM_Version::parallel_worker_threads()); // Encourage steady state memory management FLAG_SET_CMDLINE(uintx, ThresholdTolerance, 100); diff -r a70a6f7d586c -r a8044a7634d0 test/gc/arguments/TestAggressiveHeap.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/gc/arguments/TestAggressiveHeap.java Mon Jul 31 06:02:56 2017 +0100 @@ -0,0 +1,91 @@ +/* + * Copyright (c) 2017, 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 TestAggressiveHeap + * @key gc + * @bug 8179084 + * @summary Test argument processing for -XX:+AggressiveHeap. + * @library /testlibrary + * @run driver TestAggressiveHeap + */ + +import java.lang.management.ManagementFactory; +import javax.management.MBeanServer; +import javax.management.ObjectName; + +import com.oracle.java.testlibrary.OutputAnalyzer; +import com.oracle.java.testlibrary.ProcessTools; + +public class TestAggressiveHeap { + + public static void main(String args[]) throws Exception { + if (canUseAggressiveHeapOption()) { + testFlag(); + } + } + + // Note: Not a normal boolean flag; -XX:-AggressiveHeap is invalid. + private static final String option = "-XX:+AggressiveHeap"; + + // Option requires at least 256M, else error during option processing. + private static final long minMemory = 256 * 1024 * 1024; + + // bool UseParallelGC := true {product} + private static final String parallelGCPattern = + " *bool +UseParallelGC *:= *true +\\{product\\}"; + + private static void testFlag() throws Exception { + ProcessBuilder pb = ProcessTools.createJavaProcessBuilder( + option, "-XX:+PrintFlagsFinal", "-version"); + + OutputAnalyzer output = new OutputAnalyzer(pb.start()); + + output.shouldHaveExitValue(0); + + String value = output.firstMatch(parallelGCPattern); + if (value == null) { + throw new RuntimeException( + option + " didn't set UseParallelGC"); + } + } + + private static boolean haveRequiredMemory() throws Exception { + MBeanServer server = ManagementFactory.getPlatformMBeanServer(); + ObjectName os = new ObjectName("java.lang", "type", "OperatingSystem"); + Object attr = server.getAttribute(os, "TotalPhysicalMemorySize"); + String value = attr.toString(); + long memory = Long.parseLong(value); + return memory >= minMemory; + } + + private static boolean canUseAggressiveHeapOption() throws Exception { + if (!haveRequiredMemory()) { + System.out.println( + "Skipping test of " + option + " : insufficient memory"); + return false; + } + return true; + } +} + From bugzilla-daemon at icedtea.classpath.org Wed Aug 2 07:50:58 2017 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 02 Aug 2017 07:50:58 +0000 Subject: [Bug 3410] [IcedTea7] Backport "8179084: HotSpot VM fails to start when AggressiveHeap is set" In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3410 --- Comment #3 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=a8044a7634d0 author: dholmes date: Mon Jul 31 06:02:56 2017 +0100 8179084, PR3410, RH1455694: HotSpot VM fails to start when AggressiveHeap is set Reviewed-by: kbarrett, stefank -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From andrew at icedtea.classpath.org Wed Aug 2 07:51:06 2017 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 02 Aug 2017 07:51:06 +0000 Subject: /hg/release/icedtea7-forest-2.6/jdk: 8181419, PR3414, RH1463144:... Message-ID: changeset 5f11354f6257 in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=5f11354f6257 author: stuefe date: Mon Jun 19 11:52:01 2017 +0200 8181419, PR3414, RH1463144: Race in jdwp invoker handling may lead to crashes or invalid results Reviewed-by: sspitsyn, sgehwolf, clanger diffstat: src/share/back/invoker.c | 45 ++++++++++++++++++++------------------------- 1 files changed, 20 insertions(+), 25 deletions(-) diffs (83 lines): diff -r a1b7baf74b49 -r 5f11354f6257 src/share/back/invoker.c --- a/src/share/back/invoker.c Wed Jun 07 17:32:36 2017 +0100 +++ b/src/share/back/invoker.c Mon Jun 19 11:52:01 2017 +0200 @@ -212,30 +212,6 @@ } /* - * Delete saved global references - if any - for: - * - a potentially thrown Exception - * - a returned refernce/array value - * See invoker_doInvoke() and invoke* methods where global references - * are being saved. - */ -static void -deletePotentiallySavedGlobalRefs(JNIEnv *env, InvokeRequest *request) -{ - /* Delete potentially saved return value */ - if ((request->invokeType == INVOKE_CONSTRUCTOR) || - (returnTypeTag(request->methodSignature) == JDWP_TAG(OBJECT)) || - (returnTypeTag(request->methodSignature) == JDWP_TAG(ARRAY))) { - if (request->returnValue.l != NULL) { - tossGlobalRef(env, &(request->returnValue.l)); - } - } - /* Delete potentially saved exception */ - if (request->exception != NULL) { - tossGlobalRef(env, &(request->exception)); - } -} - -/* * Delete global argument references from the request which got put there before a * invoke request was carried out. See fillInvokeRequest(). */ @@ -744,6 +720,7 @@ jint id; InvokeRequest *request; jboolean detached; + jboolean mustReleaseReturnValue = JNI_FALSE; JDI_ASSERT(thread); @@ -787,6 +764,13 @@ id = request->id; exc = request->exception; returnValue = request->returnValue; + + /* Release return value and exception references, but delay the release + * until after the return packet was sent. */ + mustReleaseReturnValue = request->invokeType == INVOKE_CONSTRUCTOR || + returnTypeTag(request->methodSignature) == JDWP_TAG(OBJECT) || + returnTypeTag(request->methodSignature) == JDWP_TAG(ARRAY); + } /* @@ -801,6 +785,12 @@ */ deleteGlobalArgumentRefs(env, request); + /* From now on, do not access the request structure anymore + * for this request id, because once we give up the invokerLock it may + * be immediately reused by a new invoke request. + */ + request = NULL; + /* * Give up the lock before I/O operation */ @@ -821,7 +811,12 @@ */ eventHandler_lock(); // for proper lock order debugMonitorEnter(invokerLock); - deletePotentiallySavedGlobalRefs(env, request); + if (mustReleaseReturnValue && returnValue.l != NULL) { + tossGlobalRef(env, &returnValue.l); + } + if (exc != NULL) { + tossGlobalRef(env, &exc); + } debugMonitorExit(invokerLock); eventHandler_unlock(); } From bugzilla-daemon at icedtea.classpath.org Wed Aug 2 07:51:12 2017 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 02 Aug 2017 07:51:12 +0000 Subject: [Bug 3414] [IcedTea7] Backport "8181419: Race in jdwp invoker handling may lead to crashes or invalid results" In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3414 --- Comment #3 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=5f11354f6257 author: stuefe date: Mon Jun 19 11:52:01 2017 +0200 8181419, PR3414, RH1463144: Race in jdwp invoker handling may lead to crashes or invalid results Reviewed-by: sspitsyn, sgehwolf, clanger -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From andrew at icedtea.classpath.org Wed Aug 2 10:18:50 2017 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 02 Aug 2017 10:18:50 +0000 Subject: /hg/icedtea7: Bump to icedtea-2.7.0pre13. Message-ID: changeset a98aaa5d9311 in /hg/icedtea7 details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=a98aaa5d9311 author: Andrew John Hughes date: Wed Aug 02 09:19:23 2017 +0100 Bump to icedtea-2.7.0pre13. Upstream changes: - S6515172, PR3362: Runtime.availableProcessors() ignores Linux taskset command - S7177216, PR3398, RH1446700: native2ascii changes file permissions of input file - S8179084, PR3410, RH1455694: HotSpot VM fails to start when AggressiveHeap is set - S8181419, PR3414, RH1463144: Race in jdwp invoker handling may lead to crashes or invalid results ChangeLog: 2017-08-01 Andrew John Hughes Bump to icedtea-2.7.0pre13. * Makefile.am: (CORBA_CHANGESET): Update to icedtea-2.7.0pre13. (JAXP_CHANGESET): Likewise. (JAXWS_CHANGESET): Likewise. (JDK_CHANGESET): Likewise. (LANGTOOLS_CHANGESET): Likewise. (OPENJDK_CHANGESET): Likewise. (CORBA_SHA256SUM): Likewise. (JAXP_SHA256SUM): Likewise. (JAXWS_SHA256SUM): Likewise. (JDK_SHA256SUM): Likewise. (LANGTOOLS_SHA256SUM): Likewise. (OPENJDK_SHA256SUM): Likewise. * NEWS: Updated. * configure.ac: Bump to 2.7.0pre13. * hotspot.map.in: Update to icedtea-2.7.0pre13. diffstat: ChangeLog | 20 ++++++++++++++++++++ Makefile.am | 26 +++++++++++++------------- NEWS | 3 +++ configure.ac | 2 +- hotspot.map.in | 2 +- 5 files changed, 38 insertions(+), 15 deletions(-) diffs (95 lines): diff -r f1d865ecc241 -r a98aaa5d9311 ChangeLog --- a/ChangeLog Thu Jul 27 16:56:47 2017 +0100 +++ b/ChangeLog Wed Aug 02 09:19:23 2017 +0100 @@ -1,3 +1,23 @@ +2017-08-01 Andrew John Hughes + + Bump to icedtea-2.7.0pre13. + * Makefile.am: + (CORBA_CHANGESET): Update to icedtea-2.7.0pre13. + (JAXP_CHANGESET): Likewise. + (JAXWS_CHANGESET): Likewise. + (JDK_CHANGESET): Likewise. + (LANGTOOLS_CHANGESET): Likewise. + (OPENJDK_CHANGESET): Likewise. + (CORBA_SHA256SUM): Likewise. + (JAXP_SHA256SUM): Likewise. + (JAXWS_SHA256SUM): Likewise. + (JDK_SHA256SUM): Likewise. + (LANGTOOLS_SHA256SUM): Likewise. + (OPENJDK_SHA256SUM): Likewise. + * NEWS: Updated. + * configure.ac: Bump to 2.7.0pre13. + * hotspot.map.in: Update to icedtea-2.7.0pre13. + 2017-07-14 Andrew John Hughes Bump to icedtea-2.7.0pre12. diff -r f1d865ecc241 -r a98aaa5d9311 Makefile.am --- a/Makefile.am Thu Jul 27 16:56:47 2017 +0100 +++ b/Makefile.am Wed Aug 02 09:19:23 2017 +0100 @@ -4,19 +4,19 @@ BUILD_VERSION = b02 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION) -CORBA_CHANGESET = 3ca84ee78bd3 -JAXP_CHANGESET = b24121efd081 -JAXWS_CHANGESET = 878d12a073cb -JDK_CHANGESET = 5af12d99fb1e -LANGTOOLS_CHANGESET = aca9535e921d -OPENJDK_CHANGESET = 325028fb6c2a - -CORBA_SHA256SUM = 598b368fc8b5c4a06c1e342fad382ef3e9d1bc73bf55910b56ef35dd64823646 -JAXP_SHA256SUM = a4f53d69a27279f64061adab340bb46567f58e5a612ef4fc46014082215b1881 -JAXWS_SHA256SUM = 67d3bd4d18fb4f35c67d103cd68836d0b8a36443f96e0ba0c76f04f5e565f5a1 -JDK_SHA256SUM = f4e399d066e843c9085c92c2da54ba5a998d70dd0de44979d5a4449725923eb4 -LANGTOOLS_SHA256SUM = 7f2b3c90391ea0360e7910f90029903098ebf7e0d52ed73d402a55024e2a9d03 -OPENJDK_SHA256SUM = dc90ec25c74d1cc847c8a98d13a95cf833a4de5cdba5f8b2707eda8c615bc1b6 +CORBA_CHANGESET = 11f5122b24e0 +JAXP_CHANGESET = 03c6bf5e7a4d +JAXWS_CHANGESET = e76c114177c1 +JDK_CHANGESET = 0e380c5a1bff +LANGTOOLS_CHANGESET = a4036f67fb21 +OPENJDK_CHANGESET = 602895b43dd8 + +CORBA_SHA256SUM = db3d7e294f4d603f8025d400ca4e4daf4c7c54f2a2f8ed4f6381f058c80e4424 +JAXP_SHA256SUM = eb13dc70acc6f66c3ae611139e93e1dbd7cd8f64d7f88c2e1a7d93fd1d483730 +JAXWS_SHA256SUM = 2293e56f541305510e6fa90444ae75321eb0f91471f634f483f45cfce6ac7e53 +JDK_SHA256SUM = 6fd7d82a1b5fe91268f9884bf32d8332e54514c6d28affc84d7e21de2b9abdeb +LANGTOOLS_SHA256SUM = 7aef5fcbfd40de785b34d0bde6f0845af0f7ad7967682c66165f34e7bd177646 +OPENJDK_SHA256SUM = 3545ab18f4ed5b72e5838600f0c94ba5f05f4bcd0c996b6b7cf8bf447e645dc7 DROP_URL = http://icedtea.classpath.org/download/drops diff -r f1d865ecc241 -r a98aaa5d9311 NEWS --- a/NEWS Thu Jul 27 16:56:47 2017 +0100 +++ b/NEWS Wed Aug 02 09:19:23 2017 +0100 @@ -17,9 +17,12 @@ * New features - PR3180: Support building without pre-compiled headers * Backports + - S7177216, PR3398, RH1446700: native2ascii changes file permissions of input file - S8076221, PR2809, RH1302385: Disable RC4 cipher suites - S8078823, PR2809: javax/net/ssl/ciphersuites/DisabledAlgorithms.java fails intermittently - S8148516, PR2809: Improve the default strength of EC in JDK [test/javax/net/ssl/ciphersuites/DisabledAlgorithms.java update] + - S8179084, PR3410, RH1455694: HotSpot VM fails to start when AggressiveHeap is set + - S8181419, PR3414, RH1463144: Race in jdwp invoker handling may lead to crashes or invalid results * Bug fixes - PR3162: Remove reference to AbstractPlainDatagramSocketImpl.c, removed in 8072466 diff -r f1d865ecc241 -r a98aaa5d9311 configure.ac --- a/configure.ac Thu Jul 27 16:56:47 2017 +0100 +++ b/configure.ac Wed Aug 02 09:19:23 2017 +0100 @@ -1,4 +1,4 @@ -AC_INIT([icedtea], [2.7.0pre12], [distro-pkg-dev at openjdk.java.net]) +AC_INIT([icedtea], [2.7.0pre13], [distro-pkg-dev at openjdk.java.net]) AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) AM_MAINTAINER_MODE([enable]) AC_CONFIG_FILES([Makefile]) diff -r f1d865ecc241 -r a98aaa5d9311 hotspot.map.in --- a/hotspot.map.in Thu Jul 27 16:56:47 2017 +0100 +++ b/hotspot.map.in Wed Aug 02 09:19:23 2017 +0100 @@ -1,2 +1,2 @@ # version type(drop/hg) url changeset sha256sum -default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 490b222d74de 41449cbb9e5981f22d09bf24a9d4fd68c54c62e12170eff1b9908d909082cdca +default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 2a6fcefff99a 89f75d9185b5cf19a3e2d143636b45bf3eb3ecd38ddd884b9897e373ee8fd8b0 From bugzilla-daemon at icedtea.classpath.org Wed Aug 2 10:19:02 2017 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 02 Aug 2017 10:19:02 +0000 Subject: [Bug 3362] [IcedTea7] Backport "6515172: Runtime.availableProcessors() ignores Linux taskset command" In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3362 --- Comment #4 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea7?cmd=changeset;node=a98aaa5d9311 author: Andrew John Hughes date: Wed Aug 02 09:19:23 2017 +0100 Bump to icedtea-2.7.0pre13. Upstream changes: - S6515172, PR3362: Runtime.availableProcessors() ignores Linux taskset command - S7177216, PR3398, RH1446700: native2ascii changes file permissions of input file - S8179084, PR3410, RH1455694: HotSpot VM fails to start when AggressiveHeap is set - S8181419, PR3414, RH1463144: Race in jdwp invoker handling may lead to crashes or invalid results ChangeLog: 2017-08-01 Andrew John Hughes Bump to icedtea-2.7.0pre13. * Makefile.am: (CORBA_CHANGESET): Update to icedtea-2.7.0pre13. (JAXP_CHANGESET): Likewise. (JAXWS_CHANGESET): Likewise. (JDK_CHANGESET): Likewise. (LANGTOOLS_CHANGESET): Likewise. (OPENJDK_CHANGESET): Likewise. (CORBA_SHA256SUM): Likewise. (JAXP_SHA256SUM): Likewise. (JAXWS_SHA256SUM): Likewise. (JDK_SHA256SUM): Likewise. (LANGTOOLS_SHA256SUM): Likewise. (OPENJDK_SHA256SUM): Likewise. * NEWS: Updated. * configure.ac: Bump to 2.7.0pre13. * hotspot.map.in: Update to icedtea-2.7.0pre13. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Wed Aug 2 10:19:16 2017 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 02 Aug 2017 10:19:16 +0000 Subject: [Bug 3414] [IcedTea7] Backport "8181419: Race in jdwp invoker handling may lead to crashes or invalid results" In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3414 --- Comment #4 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea7?cmd=changeset;node=a98aaa5d9311 author: Andrew John Hughes date: Wed Aug 02 09:19:23 2017 +0100 Bump to icedtea-2.7.0pre13. Upstream changes: - S6515172, PR3362: Runtime.availableProcessors() ignores Linux taskset command - S7177216, PR3398, RH1446700: native2ascii changes file permissions of input file - S8179084, PR3410, RH1455694: HotSpot VM fails to start when AggressiveHeap is set - S8181419, PR3414, RH1463144: Race in jdwp invoker handling may lead to crashes or invalid results ChangeLog: 2017-08-01 Andrew John Hughes Bump to icedtea-2.7.0pre13. * Makefile.am: (CORBA_CHANGESET): Update to icedtea-2.7.0pre13. (JAXP_CHANGESET): Likewise. (JAXWS_CHANGESET): Likewise. (JDK_CHANGESET): Likewise. (LANGTOOLS_CHANGESET): Likewise. (OPENJDK_CHANGESET): Likewise. (CORBA_SHA256SUM): Likewise. (JAXP_SHA256SUM): Likewise. (JAXWS_SHA256SUM): Likewise. (JDK_SHA256SUM): Likewise. (LANGTOOLS_SHA256SUM): Likewise. (OPENJDK_SHA256SUM): Likewise. * NEWS: Updated. * configure.ac: Bump to 2.7.0pre13. * hotspot.map.in: Update to icedtea-2.7.0pre13. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Wed Aug 2 10:19:19 2017 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 02 Aug 2017 10:19:19 +0000 Subject: [Bug 3410] [IcedTea7] Backport "8179084: HotSpot VM fails to start when AggressiveHeap is set" In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3410 --- Comment #4 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea7?cmd=changeset;node=a98aaa5d9311 author: Andrew John Hughes date: Wed Aug 02 09:19:23 2017 +0100 Bump to icedtea-2.7.0pre13. Upstream changes: - S6515172, PR3362: Runtime.availableProcessors() ignores Linux taskset command - S7177216, PR3398, RH1446700: native2ascii changes file permissions of input file - S8179084, PR3410, RH1455694: HotSpot VM fails to start when AggressiveHeap is set - S8181419, PR3414, RH1463144: Race in jdwp invoker handling may lead to crashes or invalid results ChangeLog: 2017-08-01 Andrew John Hughes Bump to icedtea-2.7.0pre13. * Makefile.am: (CORBA_CHANGESET): Update to icedtea-2.7.0pre13. (JAXP_CHANGESET): Likewise. (JAXWS_CHANGESET): Likewise. (JDK_CHANGESET): Likewise. (LANGTOOLS_CHANGESET): Likewise. (OPENJDK_CHANGESET): Likewise. (CORBA_SHA256SUM): Likewise. (JAXP_SHA256SUM): Likewise. (JAXWS_SHA256SUM): Likewise. (JDK_SHA256SUM): Likewise. (LANGTOOLS_SHA256SUM): Likewise. (OPENJDK_SHA256SUM): Likewise. * NEWS: Updated. * configure.ac: Bump to 2.7.0pre13. * hotspot.map.in: Update to icedtea-2.7.0pre13. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Wed Aug 2 10:19:21 2017 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 02 Aug 2017 10:19:21 +0000 Subject: [Bug 3398] [IcedTea7] native2ascii changes file permissions of input file In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3398 --- Comment #4 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea7?cmd=changeset;node=a98aaa5d9311 author: Andrew John Hughes date: Wed Aug 02 09:19:23 2017 +0100 Bump to icedtea-2.7.0pre13. Upstream changes: - S6515172, PR3362: Runtime.availableProcessors() ignores Linux taskset command - S7177216, PR3398, RH1446700: native2ascii changes file permissions of input file - S8179084, PR3410, RH1455694: HotSpot VM fails to start when AggressiveHeap is set - S8181419, PR3414, RH1463144: Race in jdwp invoker handling may lead to crashes or invalid results ChangeLog: 2017-08-01 Andrew John Hughes Bump to icedtea-2.7.0pre13. * Makefile.am: (CORBA_CHANGESET): Update to icedtea-2.7.0pre13. (JAXP_CHANGESET): Likewise. (JAXWS_CHANGESET): Likewise. (JDK_CHANGESET): Likewise. (LANGTOOLS_CHANGESET): Likewise. (OPENJDK_CHANGESET): Likewise. (CORBA_SHA256SUM): Likewise. (JAXP_SHA256SUM): Likewise. (JAXWS_SHA256SUM): Likewise. (JDK_SHA256SUM): Likewise. (LANGTOOLS_SHA256SUM): Likewise. (OPENJDK_SHA256SUM): Likewise. * NEWS: Updated. * configure.ac: Bump to 2.7.0pre13. * hotspot.map.in: Update to icedtea-2.7.0pre13. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Wed Aug 2 10:46:24 2017 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 02 Aug 2017 10:46:24 +0000 Subject: [Bug 3362] [IcedTea7] Backport "6515172: Runtime.availableProcessors() ignores Linux taskset command" In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3362 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED --- Comment #5 from Andrew John Hughes --- Fixed in 2.6.10 and 2.7.0pre13. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Wed Aug 2 10:47:51 2017 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 02 Aug 2017 10:47:51 +0000 Subject: [Bug 3398] [IcedTea7] native2ascii changes file permissions of input file In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3398 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED --- Comment #5 from Andrew John Hughes --- Fixed in 2.6.11pre01 and 2.7.0pre13. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Wed Aug 2 10:48:39 2017 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 02 Aug 2017 10:48:39 +0000 Subject: [Bug 3410] [IcedTea7] Backport "8179084: HotSpot VM fails to start when AggressiveHeap is set" In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3410 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED --- Comment #5 from Andrew John Hughes --- Fixed in 2.6.11pre01 and 2.7.0pre13. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Wed Aug 2 10:50:21 2017 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 02 Aug 2017 10:50:21 +0000 Subject: [Bug 3414] [IcedTea7] Backport "8181419: Race in jdwp invoker handling may lead to crashes or invalid results" In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3414 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED --- Comment #5 from Andrew John Hughes --- Fixed in 2.6.11pre01 and 2.7.0pre13. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From robert at marcanoonline.com Wed Aug 2 19:39:48 2017 From: robert at marcanoonline.com (Robert Marcano) Date: Wed, 2 Aug 2017 15:39:48 -0400 Subject: Should I report this bug to Icedtea or directly to OpenJDK Message-ID: <5471d6b9-b052-c475-5446-7d2d8b7eec63@marcanoonline.com> Greetings. Where is the best place to report OpenJDK Java 8 bugs for font related problems (printing)?. I ask because IIRC Icedtea provided the implementation for OpenJDK text layout but it looks like recent Icedtea doesn't provides those patches, Are those parts of Icedtea already upstreamed for OpenJDK 8? Bug doens't happen on Oracle JVMs, when printing font metrics under some conditions return negative or zero ascents. I have a test case but I want to know where is the best bug database to report it. From andrew at icedtea.classpath.org Thu Aug 3 05:51:24 2017 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 03 Aug 2017 05:51:24 +0000 Subject: /hg/icedtea7: 2 new changesets Message-ID: changeset 1742e9f317d3 in /hg/icedtea7 details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=1742e9f317d3 author: Andrew John Hughes date: Thu Aug 03 07:00:47 2017 +0100 PR3379: Perl should be mandatory 2017-05-10 Andrew John Hughes PR3379: Perl should be mandatory * configure.ac: Change Perl macro invocation to use IT_FIND_TOOL and make it unconditional. changeset 12c4c5ba02a1 in /hg/icedtea7 details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=12c4c5ba02a1 author: Andrew John Hughes date: Tue May 16 03:02:53 2017 +0100 PR3390: javac.in and javah.in should use @PERL@ rather than a hardcoded path 2017-05-15 Andrew John Hughes PR3390: javac.in and javah.in should use @PERL@ rather than a hardcoded path * javac.in: Use @PERL at . * javah.in: Likewise. diffstat: ChangeLog | 14 ++++++++++++++ configure.ac | 6 +----- javac.in | 2 +- javah.in | 2 +- 4 files changed, 17 insertions(+), 7 deletions(-) diffs (62 lines): diff -r a98aaa5d9311 -r 12c4c5ba02a1 ChangeLog --- a/ChangeLog Wed Aug 02 09:19:23 2017 +0100 +++ b/ChangeLog Tue May 16 03:02:53 2017 +0100 @@ -1,3 +1,17 @@ +2017-05-15 Andrew John Hughes + + PR3390: javac.in and javah.in should use @PERL@ + rather than a hardcoded path + * javac.in: Use @PERL at . + * javah.in: Likewise. + +2017-05-10 Andrew John Hughes + + PR3379: Perl should be mandatory + * configure.ac: + Change Perl macro invocation to use IT_FIND_TOOL + and make it unconditional. + 2017-08-01 Andrew John Hughes Bump to icedtea-2.7.0pre13. diff -r a98aaa5d9311 -r 12c4c5ba02a1 configure.ac --- a/configure.ac Wed Aug 02 09:19:23 2017 +0100 +++ b/configure.ac Tue May 16 03:02:53 2017 +0100 @@ -42,6 +42,7 @@ dnl OpenJDK's README-builds.html lists gawk as a build dependency so we dnl check for it explicitly rather than using AC_PROG_AWK. IT_FIND_TOOL([GAWK], [gawk]) +IT_FIND_TOOL([PERL], [perl]) IT_CHECK_FOR_MERCURIAL IT_OBTAIN_HG_REVISIONS AC_PATH_TOOL([LSB_RELEASE],[lsb_release]) @@ -329,11 +330,6 @@ ]])], [AC_MSG_RESULT([yes])], [SDT_H_FOUND='no'; AC_MSG_WARN([systemtap sdt.h or g++ too old])]) AC_LANG_POP([C++]) if test "x${SDT_H_FOUND}" = "xyes"; then - AC_PATH_TOOL([PERL],[perl]) - if test x"${PERL}" = x ; then - AC_MSG_WARN([Perl not found in PATH; SystemTap tests will not be able to run]) - fi - AC_SUBST(PERL) AC_PATH_TOOL([STAP],[stap]) if test x"${STAP}" = x ; then AC_MSG_WARN([stap not found in PATH; SystemTap tests will not be able to run]) diff -r a98aaa5d9311 -r 12c4c5ba02a1 javac.in --- a/javac.in Wed Aug 02 09:19:23 2017 +0100 +++ b/javac.in Tue May 16 03:02:53 2017 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!@PERL@ -w use strict; use constant NO_DUP_ARGS => qw(-source -target -d -encoding); use constant STRIP_ARGS_1 => qw(-Werror -implicit:none -J-Xbootclasspath/p:); diff -r a98aaa5d9311 -r 12c4c5ba02a1 javah.in --- a/javah.in Wed Aug 02 09:19:23 2017 +0100 +++ b/javah.in Tue May 16 03:02:53 2017 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!@PERL@ -w use strict; exec '@JAVAH@', (grep !/^-X/, @ARGV) ; From bugzilla-daemon at icedtea.classpath.org Thu Aug 3 05:51:32 2017 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 03 Aug 2017 05:51:32 +0000 Subject: [Bug 3379] [IcedTea7] Perl should be mandatory In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3379 --- Comment #2 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea7?cmd=changeset;node=1742e9f317d3 author: Andrew John Hughes date: Thu Aug 03 07:00:47 2017 +0100 PR3379: Perl should be mandatory 2017-05-10 Andrew John Hughes PR3379: Perl should be mandatory * configure.ac: Change Perl macro invocation to use IT_FIND_TOOL and make it unconditional. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Aug 3 05:51:39 2017 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 03 Aug 2017 05:51:39 +0000 Subject: [Bug 3390] [IcedTea7] javac.in and javah.in should use @PERL@ rather than a hardcoded path In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3390 --- Comment #2 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea7?cmd=changeset;node=12c4c5ba02a1 author: Andrew John Hughes date: Tue May 16 03:02:53 2017 +0100 PR3390: javac.in and javah.in should use @PERL@ rather than a hardcoded path 2017-05-15 Andrew John Hughes PR3390: javac.in and javah.in should use @PERL@ rather than a hardcoded path * javac.in: Use @PERL at . * javah.in: Likewise. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From rkennke at redhat.com Thu Aug 3 10:40:30 2017 From: rkennke at redhat.com (Roman Kennke) Date: Thu, 3 Aug 2017 12:40:30 +0200 Subject: Should I report this bug to Icedtea or directly to OpenJDK In-Reply-To: <5471d6b9-b052-c475-5446-7d2d8b7eec63@marcanoonline.com> References: <5471d6b9-b052-c475-5446-7d2d8b7eec63@marcanoonline.com> Message-ID: Am 02.08.2017 um 21:39 schrieb Robert Marcano: > Greetings. Where is the best place to report OpenJDK Java 8 bugs for > font related problems (printing)?. I ask because IIRC Icedtea provided > the implementation for OpenJDK text layout but it looks like recent > Icedtea doesn't provides those patches, Are those parts of Icedtea > already upstreamed for OpenJDK 8? > > Bug doens't happen on Oracle JVMs, when printing font metrics under > some conditions return negative or zero ascents. I have a test case > but I want to know where is the best bug database to report it. Hi Robert, as far as I know, IcedTea does not, and has never, provided a different font and text layout implementation compared to OpenJDK. However, OpenJDK uses a different implementation than Oracle JDK (not sure if it's still the case in JDK9 and 10, but I'm pretty sure it was the case with JDK8). The best bugs database to report bugs to is https://bugs.openjdk.java.net Best regards, Roman From dalibor.topic at oracle.com Thu Aug 3 11:09:04 2017 From: dalibor.topic at oracle.com (dalibor topic) Date: Thu, 3 Aug 2017 13:09:04 +0200 Subject: Should I report this bug to Icedtea or directly to OpenJDK In-Reply-To: References: <5471d6b9-b052-c475-5446-7d2d8b7eec63@marcanoonline.com> Message-ID: <8c2574ca-cbaa-a523-ffc6-0117fa51b468@oracle.com> On 03.08.2017 12:40, Roman Kennke wrote: > Am 02.08.2017 um 21:39 schrieb Robert Marcano: >> Greetings. Where is the best place to report OpenJDK Java 8 bugs for >> font related problems (printing)?. I ask because IIRC Icedtea provided >> the implementation for OpenJDK text layout but it looks like recent >> Icedtea doesn't provides those patches, Are those parts of Icedtea >> already upstreamed for OpenJDK 8? >> >> Bug doens't happen on Oracle JVMs, when printing font metrics under >> some conditions return negative or zero ascents. I have a test case >> but I want to know where is the best bug database to report it. > > Hi Robert, > > as far as I know, IcedTea does not, and has never, provided a different > font and text layout implementation compared to OpenJDK. However, > OpenJDK uses a different implementation than Oracle JDK (not sure if > it's still the case in JDK9 and 10, but I'm pretty sure it was the case > with JDK8). > > The best bugs database to report bugs to is https://bugs.openjdk.java.net Unless you are a JDK developer, please use bugs.java.com to report issues with your own builds of OpenJDK sources. If the issue is something that was discovered on a downstream build, provided to you by a third party (some operating system distribution, etc.), please use their mechanism for reporting issues in their builds instead, as such builds may contain additional patches. cheers, dalibor topic -- Dalibor Topic | Principal Product Manager Phone: +494089091214 | Mobile: +491737185961 ORACLE Deutschland B.V. & Co. KG | K?hneh?fe 5 | 22761 Hamburg ORACLE Deutschland B.V. & Co. KG Hauptverwaltung: Riesstr. 25, D-80992 M?nchen Registergericht: Amtsgericht M?nchen, HRA 95603 Komplement?rin: ORACLE Deutschland Verwaltung B.V. Hertogswetering 163/167, 3543 AS Utrecht, Niederlande Handelsregister der Handelskammer Midden-Niederlande, Nr. 30143697 Gesch?ftsf?hrer: Alexander van der Ven, Jan Schultheiss, Val Maher Oracle is committed to developing practices and products that help protect the environment From robert at marcanoonline.com Thu Aug 3 12:53:40 2017 From: robert at marcanoonline.com (Robert Marcano) Date: Thu, 3 Aug 2017 08:53:40 -0400 Subject: Should I report this bug to Icedtea or directly to OpenJDK In-Reply-To: <8c2574ca-cbaa-a523-ffc6-0117fa51b468@oracle.com> References: <5471d6b9-b052-c475-5446-7d2d8b7eec63@marcanoonline.com> <8c2574ca-cbaa-a523-ffc6-0117fa51b468@oracle.com> Message-ID: <436b0398-4af5-aa9d-9690-bf51b202d411@marcanoonline.com> On 08/03/2017 07:09 AM, dalibor topic wrote: ... > Unless you are a JDK developer, please use bugs.java.com to report > issues with your own builds of OpenJDK sources. > > If the issue is something that was discovered on a downstream build, > provided to you by a third party (some operating system distribution, > etc.), please use their mechanism for reporting issues in their builds > instead, as such builds may contain additional patches. Thanks, I checked the Fedora SRPMS and didn't see patches related to that. Submitted to the Red Hat bugzilla. for the record it is https://bugzilla.redhat.com/show_bug.cgi?id=1478006 > > cheers, > dalibor topic From dalibor.topic at oracle.com Thu Aug 3 12:57:52 2017 From: dalibor.topic at oracle.com (dalibor topic) Date: Thu, 3 Aug 2017 14:57:52 +0200 Subject: Should I report this bug to Icedtea or directly to OpenJDK In-Reply-To: <436b0398-4af5-aa9d-9690-bf51b202d411@marcanoonline.com> References: <5471d6b9-b052-c475-5446-7d2d8b7eec63@marcanoonline.com> <8c2574ca-cbaa-a523-ffc6-0117fa51b468@oracle.com> <436b0398-4af5-aa9d-9690-bf51b202d411@marcanoonline.com> Message-ID: <46061b61-24ab-887a-00a9-149fe402d569@oracle.com> On 03.08.2017 14:53, Robert Marcano wrote: > On 08/03/2017 07:09 AM, dalibor topic wrote: > ... >> Unless you are a JDK developer, please use bugs.java.com to report >> issues with your own builds of OpenJDK sources. >> >> If the issue is something that was discovered on a downstream build, >> provided to you by a third party (some operating system distribution, >> etc.), please use their mechanism for reporting issues in their builds >> instead, as such builds may contain additional patches. > > Thanks, I checked the Fedora SRPMS and didn't see patches related to that. > > Submitted to the Red Hat bugzilla. for the record it is > https://bugzilla.redhat.com/show_bug.cgi?id=1478006 Thank you for checking and filing the issue! cheers, dalibor topic -- Dalibor Topic | Principal Product Manager Phone: +494089091214 | Mobile: +491737185961 ORACLE Deutschland B.V. & Co. KG | K?hneh?fe 5 | 22761 Hamburg ORACLE Deutschland B.V. & Co. KG Hauptverwaltung: Riesstr. 25, D-80992 M?nchen Registergericht: Amtsgericht M?nchen, HRA 95603 Komplement?rin: ORACLE Deutschland Verwaltung B.V. Hertogswetering 163/167, 3543 AS Utrecht, Niederlande Handelsregister der Handelskammer Midden-Niederlande, Nr. 30143697 Gesch?ftsf?hrer: Alexander van der Ven, Jan Schultheiss, Val Maher Oracle is committed to developing practices and products that help protect the environment From philip.race at oracle.com Thu Aug 3 13:39:42 2017 From: philip.race at oracle.com (Philip Race) Date: Thu, 03 Aug 2017 06:39:42 -0700 Subject: Should I report this bug to Icedtea or directly to OpenJDK In-Reply-To: <5471d6b9-b052-c475-5446-7d2d8b7eec63@marcanoonline.com> References: <5471d6b9-b052-c475-5446-7d2d8b7eec63@marcanoonline.com> Message-ID: <5983279E.2020607@oracle.com> On 8/2/17, 12:39 PM, Robert Marcano wrote: > Greetings. Where is the best place to report OpenJDK Java 8 bugs for > font related problems (printing)?. I ask because IIRC Icedtea provided > the implementation for OpenJDK text layout but it looks like recent > Icedtea doesn't provides those patches, Are those parts of Icedtea > already upstreamed for OpenJDK 8? Although I don't follow icedtea at all closely, I do know about openjdk .. and icedtea did not provide "the implementation for OpenJDK text layout". > > Bug doens't happen on Oracle JVMs, when printing font metrics under > some conditions return negative or zero ascents. I have a test case > but I want to know where is the best bug database to report it. I think this is a known OpenJDK bug : https://bugs.openjdk.java.net/browse/JDK-8139178 -phil. From robert at marcanoonline.com Thu Aug 3 15:35:28 2017 From: robert at marcanoonline.com (Robert Marcano) Date: Thu, 3 Aug 2017 11:35:28 -0400 Subject: Should I report this bug to Icedtea or directly to OpenJDK In-Reply-To: <5983279E.2020607@oracle.com> References: <5471d6b9-b052-c475-5446-7d2d8b7eec63@marcanoonline.com> <5983279E.2020607@oracle.com> Message-ID: <9c9fc8d3-d86d-555e-ea05-0410e92b0d0d@marcanoonline.com> On 08/03/2017 09:39 AM, Philip Race wrote: > On 8/2/17, 12:39 PM, Robert Marcano wrote: >> Greetings. Where is the best place to report OpenJDK Java 8 bugs for >> font related problems (printing)?. I ask because IIRC Icedtea provided >> the implementation for OpenJDK text layout but it looks like recent >> Icedtea doesn't provides those patches, Are those parts of Icedtea >> already upstreamed for OpenJDK 8? > Although I don't follow icedtea at all closely, I do know about openjdk .. > and icedtea did not provide "the implementation for OpenJDK text layout". > >> >> Bug doens't happen on Oracle JVMs, when printing font metrics under >> some conditions return negative or zero ascents. I have a test case >> but I want to know where is the best bug database to report it. > > I think this is a known OpenJDK bug : > https://bugs.openjdk.java.net/browse/JDK-8139178 Oh! I didn't found it, So sad it is really an old bug. will add a comment about it happening when a transparency is present (even on portrait printing). > > -phil. From andrew at icedtea.classpath.org Thu Aug 3 16:19:22 2017 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 03 Aug 2017 16:19:22 +0000 Subject: /hg/release/icedtea7-forest-2.6: 5 new changesets Message-ID: changeset fb3647a63c8b in /hg/release/icedtea7-forest-2.6 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6?cmd=changeset;node=fb3647a63c8b author: andrew date: Tue Aug 01 13:31:35 2017 +0100 Added tag icedtea-2.6.11pre01 for changeset 54009dd18b70 changeset c63b09823b9f in /hg/release/icedtea7-forest-2.6 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6?cmd=changeset;node=c63b09823b9f author: andrew date: Tue Aug 01 14:12:25 2017 +0100 Added tag jdk7u151-b00 for changeset ae6c3762cdc9 changeset deb01d2b601b in /hg/release/icedtea7-forest-2.6 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6?cmd=changeset;node=deb01d2b601b author: andrew date: Wed Aug 02 02:32:39 2017 +0100 Merge jdk7u151-b00 changeset b9fe3c787ec7 in /hg/release/icedtea7-forest-2.6 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6?cmd=changeset;node=b9fe3c787ec7 author: andrew date: Thu Aug 03 07:27:52 2017 +0100 Added tag jdk7u151-b01 for changeset c63b09823b9f changeset 499e7894cc44 in /hg/release/icedtea7-forest-2.6 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6?cmd=changeset;node=499e7894cc44 author: andrew date: Thu Aug 03 17:03:27 2017 +0100 Merge jdk7u151-b01 diffstat: .hgtags | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (10 lines): diff -r 54009dd18b70 -r 499e7894cc44 .hgtags --- a/.hgtags Wed May 17 17:02:00 2017 +0100 +++ b/.hgtags Thu Aug 03 17:03:27 2017 +0100 @@ -669,3 +669,6 @@ b21d7bc25e0f96c6ed9b19e1ea0ea6253c34d7fe jdk7u141-b01 db8fe12e5e508b18dd0aeb166099406a774b0d04 jdk7u141-b02 b3f98f0d454923698116f756711d79c0578f1a8e icedtea-2.6.10 +54009dd18b706ad1ef023cd472a8c1a76f9faac6 icedtea-2.6.11pre01 +ae6c3762cdc9b1610211cd1ad1a29ed1a7f8471e jdk7u151-b00 +c63b09823b9fa0ddeb37c1ac534569a9227c5bf6 jdk7u151-b01 From andrew at icedtea.classpath.org Thu Aug 3 16:19:28 2017 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 03 Aug 2017 16:19:28 +0000 Subject: /hg/release/icedtea7-forest-2.6/corba: 5 new changesets Message-ID: changeset 7abd14872cb3 in /hg/release/icedtea7-forest-2.6/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/corba?cmd=changeset;node=7abd14872cb3 author: andrew date: Tue Aug 01 13:31:32 2017 +0100 Added tag icedtea-2.6.11pre01 for changeset ff69bc83070b changeset f74af33b4963 in /hg/release/icedtea7-forest-2.6/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/corba?cmd=changeset;node=f74af33b4963 author: andrew date: Tue Aug 01 14:12:26 2017 +0100 Added tag jdk7u151-b00 for changeset d232281a177c changeset ff9dc0591ac5 in /hg/release/icedtea7-forest-2.6/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/corba?cmd=changeset;node=ff9dc0591ac5 author: andrew date: Wed Aug 02 02:32:41 2017 +0100 Merge jdk7u151-b00 changeset 829d2dbc9d2c in /hg/release/icedtea7-forest-2.6/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/corba?cmd=changeset;node=829d2dbc9d2c author: andrew date: Thu Aug 03 07:27:54 2017 +0100 Added tag jdk7u151-b01 for changeset f74af33b4963 changeset 803456f62297 in /hg/release/icedtea7-forest-2.6/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/corba?cmd=changeset;node=803456f62297 author: andrew date: Thu Aug 03 17:03:27 2017 +0100 Merge jdk7u151-b01 diffstat: .hgtags | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (10 lines): diff -r ff69bc83070b -r 803456f62297 .hgtags --- a/.hgtags Wed May 17 17:01:53 2017 +0100 +++ b/.hgtags Thu Aug 03 17:03:27 2017 +0100 @@ -671,3 +671,6 @@ caa46a309b1195a0301956e7416633b717553925 jdk7u141-b01 39240de9d27767c8bad74e34f83f0a4902a9ef85 jdk7u141-b02 4d807b58849e7d0aa829ba744c9d94ffb78d0943 icedtea-2.6.10 +ff69bc83070b70b07cc9eea4731e9332acdcdff7 icedtea-2.6.11pre01 +d232281a177cd3f80d48eca3f1bbc3919f720a1e jdk7u151-b00 +f74af33b4963a7c484ffa605f11e41efd92966e3 jdk7u151-b01 From andrew at icedtea.classpath.org Thu Aug 3 16:19:37 2017 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 03 Aug 2017 16:19:37 +0000 Subject: /hg/release/icedtea7-forest-2.6/jaxp: 9 new changesets Message-ID: changeset 7cabbb86d747 in /hg/release/icedtea7-forest-2.6/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jaxp?cmd=changeset;node=7cabbb86d747 author: andrew date: Tue Aug 01 13:31:32 2017 +0100 Added tag icedtea-2.6.11pre01 for changeset f16026b79deb changeset 922361b28778 in /hg/release/icedtea7-forest-2.6/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jaxp?cmd=changeset;node=922361b28778 author: aefimov date: Wed Jul 26 15:09:26 2017 +0100 8172469: Transform Transformer Exceptions Reviewed-by: joehw changeset 53caea33a6d1 in /hg/release/icedtea7-forest-2.6/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jaxp?cmd=changeset;node=53caea33a6d1 author: aefimov date: Thu Apr 06 21:26:31 2017 +0300 8176731: JCK tests in api/javax_xml/transform/ spec conformance started failing after 8172469 Reviewed-by: joehw, dfuchs changeset 2b90e2ab84bf in /hg/release/icedtea7-forest-2.6/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jaxp?cmd=changeset;node=2b90e2ab84bf author: ljiang date: Tue Jun 06 09:39:00 2017 -0700 8181591: 8u141 L10n resource file update Reviewed-by: coffeys changeset 26391fa1d876 in /hg/release/icedtea7-forest-2.6/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jaxp?cmd=changeset;node=26391fa1d876 author: andrew date: Fri Jul 28 13:17:19 2017 +0100 8185501: Missing import in JAXP code Summary: DTMManager missing an ObjectFactory import after JDK-8172469 Reviewed-by: andrew Contributed-by: Michal Vala changeset 57fc772ac86a in /hg/release/icedtea7-forest-2.6/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jaxp?cmd=changeset;node=57fc772ac86a author: andrew date: Tue Aug 01 14:12:27 2017 +0100 Added tag jdk7u151-b00 for changeset 26391fa1d876 changeset ade7d84bee25 in /hg/release/icedtea7-forest-2.6/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jaxp?cmd=changeset;node=ade7d84bee25 author: andrew date: Wed Aug 02 02:32:45 2017 +0100 Merge jdk7u151-b00 changeset 9a5675f6421e in /hg/release/icedtea7-forest-2.6/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jaxp?cmd=changeset;node=9a5675f6421e author: andrew date: Thu Aug 03 07:27:55 2017 +0100 Added tag jdk7u151-b01 for changeset 57fc772ac86a changeset 46f2d7395127 in /hg/release/icedtea7-forest-2.6/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jaxp?cmd=changeset;node=46f2d7395127 author: andrew date: Thu Aug 03 17:03:27 2017 +0100 Merge jdk7u151-b01 diffstat: .hgtags | 3 + src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java | 2 +- src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_sv.properties | 2 +- src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_sv.properties | 4 +- src/com/sun/org/apache/xml/internal/dtm/DTMConfigurationException.java | 101 -- src/com/sun/org/apache/xml/internal/dtm/DTMException.java | 345 +--------- src/com/sun/org/apache/xml/internal/dtm/DTMManager.java | 42 +- src/com/sun/org/apache/xml/internal/res/XMLErrorResources_sv.java | 2 +- src/javax/xml/transform/TransformerConfigurationException.java | 2 + src/javax/xml/transform/TransformerException.java | 137 ++- 10 files changed, 106 insertions(+), 534 deletions(-) diffs (truncated from 955 to 500 lines): diff -r f16026b79deb -r 46f2d7395127 .hgtags --- a/.hgtags Wed May 17 17:01:54 2017 +0100 +++ b/.hgtags Thu Aug 03 17:03:27 2017 +0100 @@ -672,3 +672,6 @@ e096a279a1c226d7d3a4aa19d5beeba1fb0507cf jdk7u141-b01 b4b91a7beb185c0a8a14b83d2b05cfd7fc33c6fe jdk7u141-b02 4099d8cf255f2eac54b9d2ed1db1bc452ddbe4e4 icedtea-2.6.10 +f16026b79deb95d60dc9d213a0a417c626d00e4c icedtea-2.6.11pre01 +26391fa1d876e3bf563f21328d7ea24d5d657b21 jdk7u151-b00 +57fc772ac86ac6cbd297cd6f09a63f9c016c271c jdk7u151-b01 diff -r f16026b79deb -r 46f2d7395127 src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java --- a/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java Wed May 17 17:01:54 2017 +0100 +++ b/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java Thu Aug 03 17:03:27 2017 +0100 @@ -483,7 +483,7 @@ {"ER0000" , "{0}" }, { ER_NO_CURLYBRACE, - "Fel: Uttryck kan inte inneh\u00E5lla '{'"}, + "Fel: Uttryck f\u00E5r inte inneh\u00E5lla '{'"}, { ER_ILLEGAL_ATTRIBUTE , "{0} har ett otill\u00E5tet attribut: {1}"}, diff -r f16026b79deb -r 46f2d7395127 src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_sv.properties --- a/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_sv.properties Wed May 17 17:01:54 2017 +0100 +++ b/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_sv.properties Thu Aug 03 17:03:27 2017 +0100 @@ -33,4 +33,4 @@ # Messages from erroneous set-up IncompatibleNamespaceContext = Typ av NamespaceContext \u00E4r inkompatibel med XInclude; det kr\u00E4vs en instans av XIncludeNamespaceSupport -ExpandedSystemId = Kunde inte ut\u00F6ka system-ID:t f\u00F6r inkluderad resurs +ExpandedSystemId = Kunde inte ut\u00F6ka system-id:t f\u00F6r inkluderad resurs diff -r f16026b79deb -r 46f2d7395127 src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_sv.properties --- a/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_sv.properties Wed May 17 17:01:54 2017 +0100 +++ b/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_sv.properties Thu Aug 03 17:03:27 2017 +0100 @@ -80,7 +80,7 @@ cvc-pattern-valid = cvc-pattern-valid: V\u00E4rdet ''{0}'' \u00E4r ogiltigt med aktuellt m\u00F6nster ''{1}'' f\u00F6r typ ''{2}''. cvc-totalDigits-valid = cvc-totalDigits-valid: V\u00E4rdet ''{0}'' har {1} siffror, men det totala antalet siffror \u00E4r begr\u00E4nsat till {2}. cvc-type.2 = cvc-type.2: Typdefinitionen kan inte vara abstrakt f\u00F6r elementet {0}. - cvc-type.3.1.1 = cvc-type.3.1.1: Elementet ''{0}'' har enkel typ och kan inte inneh\u00E5lla attribut, ut\u00F6ver s\u00E5dana vars namnrymd \u00E4r identisk med ''http://www.w3.org/2001/XMLSchema-instance'' och vars [lokala namn] har n\u00E5gotdera av ''type'', ''nil'', ''schemaLocation'' eller ''noNamespaceSchemaLocation''. Hittade dock attributet ''{1}''. + cvc-type.3.1.1 = cvc-type.3.1.1: Elementet ''{0}'' har enkel typ och f\u00E5r inte inneh\u00E5lla attribut, ut\u00F6ver s\u00E5dana vars namnrymd \u00E4r identisk med ''http://www.w3.org/2001/XMLSchema-instance'' och vars [lokala namn] har n\u00E5gotdera av ''type'', ''nil'', ''schemaLocation'' eller ''noNamespaceSchemaLocation''. Hittade dock attributet ''{1}''. cvc-type.3.1.2 = cvc-type.3.1.2: Elementet ''{0}'' har enkel typ och f\u00E5r inte inneh\u00E5lla [underordnade] med elementinformation. cvc-type.3.1.3 = cvc-type.3.1.3: V\u00E4rdet ''{1}'' i elementet ''{0}'' \u00E4r ogiltigt. @@ -251,7 +251,7 @@ rcase-RecurseUnordered.2 = rcase-RecurseUnordered.2: Det finns ingen fullst\u00E4ndigt fungerande mappning mellan partiklarna. # We're using sch-props-correct.2 instead of the old src-redefine.1 # src-redefine.1 = src-redefine.1: The component ''{0}'' is begin redefined, but its corresponding component isn't in the schema document being redefined (with namespace ''{2}''), but in a different document, with namespace ''{1}''. - sch-props-correct.2 = sch-props-correct.2: Ett schema kan inte inneh\u00E5lla tv\u00E5 globala komponenter med samma namn. Detta schema har tv\u00E5 f\u00F6rekomster av ''{0}''. + sch-props-correct.2 = sch-props-correct.2: Ett schema f\u00E5r inte inneh\u00E5lla tv\u00E5 globala komponenter med samma namn. Detta schema har tv\u00E5 f\u00F6rekomster av ''{0}''. st-props-correct.2 = st-props-correct.2: Cirkul\u00E4ra definitioner har identifierats f\u00F6r enkel typ ''{0}''. Detta inneb\u00E4r att ''{0}'' ing\u00E5r i sin egen typhierarki, vilket \u00E4r fel. st-props-correct.3 = st-props-correct.3: Ett fel intr\u00E4ffade f\u00F6r typ ''{0}''. V\u00E4rdet f\u00F6r '{'slutgiltigt'}' i '{'bastypdefinitionen'}', ''{1}'', f\u00F6rbjuder h\u00E4rledning med begr\u00E4nsning. totalDigits-valid-restriction = totalDigits-valid-restriction: I definitionen f\u00F6r {2} \u00E4r v\u00E4rdet ''{0}'' f\u00F6r ''totalDigits'' ogiltigt eftersom det m\u00E5ste vara mindre \u00E4n eller lika med v\u00E4rdet f\u00F6r ''totalDigits'' som har angetts som ''{1}'' i n\u00E5gon typ f\u00F6r \u00F6verordnad. diff -r f16026b79deb -r 46f2d7395127 src/com/sun/org/apache/xml/internal/dtm/DTMConfigurationException.java --- a/src/com/sun/org/apache/xml/internal/dtm/DTMConfigurationException.java Wed May 17 17:01:54 2017 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,101 +0,0 @@ -/* - * reserved comment block - * DO NOT REMOVE OR ALTER! - */ -/* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/* - * $Id: DTMConfigurationException.java,v 1.2.4.1 2005/09/15 08:14:52 suresh_emailid Exp $ - */ -package com.sun.org.apache.xml.internal.dtm; - -import javax.xml.transform.SourceLocator; - -/** - * Indicates a serious configuration error. - */ -public class DTMConfigurationException extends DTMException { - static final long serialVersionUID = -4607874078818418046L; - - /** - * Create a new DTMConfigurationException with no - * detail mesage. - */ - public DTMConfigurationException() { - super("Configuration Error"); - } - - /** - * Create a new DTMConfigurationException with - * the String specified as an error message. - * - * @param msg The error message for the exception. - */ - public DTMConfigurationException(String msg) { - super(msg); - } - - /** - * Create a new DTMConfigurationException with a - * given Exception base cause of the error. - * - * @param e The exception to be encapsulated in a - * DTMConfigurationException. - */ - public DTMConfigurationException(Throwable e) { - super(e); - } - - /** - * Create a new DTMConfigurationException with the - * given Exception base cause and detail message. - * - * @param msg The detail message. - * @param e The exception to be wrapped in a DTMConfigurationException - */ - public DTMConfigurationException(String msg, Throwable e) { - super(msg, e); - } - - /** - * Create a new DTMConfigurationException from a message and a Locator. - * - *

This constructor is especially useful when an application is - * creating its own exception from within a DocumentHandler - * callback.

- * - * @param message The error or warning message. - * @param locator The locator object for the error or warning. - */ - public DTMConfigurationException(String message, - SourceLocator locator) { - super(message, locator); - } - - /** - * Wrap an existing exception in a DTMConfigurationException. - * - * @param message The error or warning message, or null to - * use the message from the embedded exception. - * @param locator The locator object for the error or warning. - * @param e Any exception. - */ - public DTMConfigurationException(String message, - SourceLocator locator, - Throwable e) { - super(message, locator, e); - } -} diff -r f16026b79deb -r 46f2d7395127 src/com/sun/org/apache/xml/internal/dtm/DTMException.java --- a/src/com/sun/org/apache/xml/internal/dtm/DTMException.java Wed May 17 17:01:54 2017 +0100 +++ b/src/com/sun/org/apache/xml/internal/dtm/DTMException.java Thu Aug 03 17:03:27 2017 +0100 @@ -1,13 +1,13 @@ /* - * reserved comment block - * DO NOT REMOVE OR ALTER! + * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. */ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -17,129 +17,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* - * $Id: DTMException.java,v 1.3 2005/09/28 13:48:50 pvedula Exp $ - */ package com.sun.org.apache.xml.internal.dtm; - -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; - -import javax.xml.transform.SourceLocator; - -import com.sun.org.apache.xml.internal.res.XMLErrorResources; -import com.sun.org.apache.xml.internal.res.XMLMessages; - - /** - * This class specifies an exceptional condition that occured + * This class specifies an exceptional condition that occurred * in the DTM module. */ public class DTMException extends RuntimeException { static final long serialVersionUID = -775576419181334734L; - /** Field locator specifies where the error occured. - * @serial */ - SourceLocator locator; - - /** - * Method getLocator retrieves an instance of a SourceLocator - * object that specifies where an error occured. - * - * @return A SourceLocator object, or null if none was specified. - */ - public SourceLocator getLocator() { - return locator; - } - - /** - * Method setLocator sets an instance of a SourceLocator - * object that specifies where an error occured. - * - * @param location A SourceLocator object, or null to clear the location. - */ - public void setLocator(SourceLocator location) { - locator = location; - } - - /** Field containedException specifies a wrapped exception. May be null. - * @serial */ - Throwable containedException; - - /** - * This method retrieves an exception that this exception wraps. - * - * @return An Throwable object, or null. - * @see #getCause - */ - public Throwable getException() { - return containedException; - } - - /** - * Returns the cause of this throwable or null if the - * cause is nonexistent or unknown. (The cause is the throwable that - * caused this throwable to get thrown.) - */ - public Throwable getCause() { - - return ((containedException == this) - ? null - : containedException); - } - - /** - * Initializes the cause of this throwable to the specified value. - * (The cause is the throwable that caused this throwable to get thrown.) - * - *

This method can be called at most once. It is generally called from - * within the constructor, or immediately after creating the - * throwable. If this throwable was created - * with {@link #DTMException(Throwable)} or - * {@link #DTMException(String,Throwable)}, this method cannot be called - * even once. - * - * @param cause the cause (which is saved for later retrieval by the - * {@link #getCause()} method). (A null value is - * permitted, and indicates that the cause is nonexistent or - * unknown.) - * @return a reference to this Throwable instance. - * @throws IllegalArgumentException if cause is this - * throwable. (A throwable cannot - * be its own cause.) - * @throws IllegalStateException if this throwable was - * created with {@link #DTMException(Throwable)} or - * {@link #DTMException(String,Throwable)}, or this method has already - * been called on this throwable. - */ - public synchronized Throwable initCause(Throwable cause) { - - if ((this.containedException == null) && (cause != null)) { - throw new IllegalStateException(XMLMessages.createXMLMessage(XMLErrorResources.ER_CANNOT_OVERWRITE_CAUSE, null)); //"Can't overwrite cause"); - } - - if (cause == this) { - throw new IllegalArgumentException( - XMLMessages.createXMLMessage(XMLErrorResources.ER_SELF_CAUSATION_NOT_PERMITTED, null)); //"Self-causation not permitted"); - } - - this.containedException = cause; - - return this; - } - /** * Create a new DTMException. * * @param message The error or warning message. */ public DTMException(String message) { - super(message); - - this.containedException = null; - this.locator = null; } /** @@ -148,11 +41,7 @@ * @param e The exception to be wrapped. */ public DTMException(Throwable e) { - - super(e.getMessage()); - - this.containedException = e; - this.locator = null; + super(e); } /** @@ -166,220 +55,6 @@ * @param e Any exception */ public DTMException(String message, Throwable e) { - - super(((message == null) || (message.length() == 0)) - ? e.getMessage() - : message); - - this.containedException = e; - this.locator = null; - } - - /** - * Create a new DTMException from a message and a Locator. - * - *

This constructor is especially useful when an application is - * creating its own exception from within a DocumentHandler - * callback.

- * - * @param message The error or warning message. - * @param locator The locator object for the error or warning. - */ - public DTMException(String message, SourceLocator locator) { - - super(message); - - this.containedException = null; - this.locator = locator; - } - - /** - * Wrap an existing exception in a DTMException. - * - * @param message The error or warning message, or null to - * use the message from the embedded exception. - * @param locator The locator object for the error or warning. - * @param e Any exception - */ - public DTMException(String message, SourceLocator locator, - Throwable e) { - - super(message); - - this.containedException = e; - this.locator = locator; - } - - /** - * Get the error message with location information - * appended. - */ - public String getMessageAndLocation() { - - StringBuffer sbuffer = new StringBuffer(); - String message = super.getMessage(); - - if (null != message) { - sbuffer.append(message); - } - - if (null != locator) { - String systemID = locator.getSystemId(); - int line = locator.getLineNumber(); - int column = locator.getColumnNumber(); - - if (null != systemID) { - sbuffer.append("; SystemID: "); - sbuffer.append(systemID); - } - - if (0 != line) { - sbuffer.append("; Line#: "); - sbuffer.append(line); - } - - if (0 != column) { - sbuffer.append("; Column#: "); - sbuffer.append(column); - } - } - - return sbuffer.toString(); - } - - /** - * Get the location information as a string. - * - * @return A string with location info, or null - * if there is no location information. - */ - public String getLocationAsString() { - - if (null != locator) { - StringBuffer sbuffer = new StringBuffer(); - String systemID = locator.getSystemId(); - int line = locator.getLineNumber(); - int column = locator.getColumnNumber(); - - if (null != systemID) { - sbuffer.append("; SystemID: "); - sbuffer.append(systemID); - } - - if (0 != line) { - sbuffer.append("; Line#: "); - sbuffer.append(line); - } - - if (0 != column) { - sbuffer.append("; Column#: "); - sbuffer.append(column); - } - - return sbuffer.toString(); - } else { - return null; - } - } - - /** - * Print the the trace of methods from where the error - * originated. This will trace all nested exception - * objects, as well as this object. - */ - public void printStackTrace() { - printStackTrace(new java.io.PrintWriter(System.err, true)); - } - - /** - * Print the the trace of methods from where the error - * originated. This will trace all nested exception - * objects, as well as this object. - * @param s The stream where the dump will be sent to. - */ - public void printStackTrace(java.io.PrintStream s) { - printStackTrace(new java.io.PrintWriter(s)); - } - - /** - * Print the the trace of methods from where the error - * originated. This will trace all nested exception - * objects, as well as this object. - * @param s The writer where the dump will be sent to. - */ - public void printStackTrace(java.io.PrintWriter s) { - - if (s == null) { - s = new java.io.PrintWriter(System.err, true); - } - - try { - String locInfo = getLocationAsString(); - - if (null != locInfo) { - s.println(locInfo); - } - - super.printStackTrace(s); - } catch (Throwable e) {} - - boolean isJdk14OrHigher = false; - try { - Throwable.class.getMethod("getCause", (Class[]) null); - isJdk14OrHigher = true; - } catch (NoSuchMethodException nsme) { - // do nothing - } - - // The printStackTrace method of the Throwable class in jdk 1.4 - // and higher will include the cause when printing the backtrace. - // The following code is only required when using jdk 1.3 or lower - if (!isJdk14OrHigher) { - Throwable exception = getException(); - From andrew at icedtea.classpath.org Thu Aug 3 16:19:45 2017 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 03 Aug 2017 16:19:45 +0000 Subject: /hg/release/icedtea7-forest-2.6/jaxws: 6 new changesets Message-ID: changeset e29485ee5e2b in /hg/release/icedtea7-forest-2.6/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jaxws?cmd=changeset;node=e29485ee5e2b author: andrew date: Tue Aug 01 13:31:33 2017 +0100 Added tag icedtea-2.6.11pre01 for changeset f8bd60e99896 changeset 1f0dd7a7e0cc in /hg/release/icedtea7-forest-2.6/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jaxws?cmd=changeset;node=1f0dd7a7e0cc author: aefimov date: Thu Jul 27 04:25:00 2017 +0100 8182054: Improve wsdl support Summary: Also reviewed by Roman Grigoriadi Reviewed-by: joehw, lancea changeset 3233576db658 in /hg/release/icedtea7-forest-2.6/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jaxws?cmd=changeset;node=3233576db658 author: andrew date: Tue Aug 01 14:12:28 2017 +0100 Added tag jdk7u151-b00 for changeset 1f0dd7a7e0cc changeset b34f34493e72 in /hg/release/icedtea7-forest-2.6/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jaxws?cmd=changeset;node=b34f34493e72 author: andrew date: Wed Aug 02 02:32:47 2017 +0100 Merge jdk7u151-b00 changeset 7a9a6ffac242 in /hg/release/icedtea7-forest-2.6/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jaxws?cmd=changeset;node=7a9a6ffac242 author: andrew date: Thu Aug 03 07:27:56 2017 +0100 Added tag jdk7u151-b01 for changeset 3233576db658 changeset e17af60ebbd6 in /hg/release/icedtea7-forest-2.6/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jaxws?cmd=changeset;node=e17af60ebbd6 author: andrew date: Thu Aug 03 17:03:27 2017 +0100 Merge jdk7u151-b01 diffstat: .hgtags | 3 + src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/Options.java | 19 +- src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/WsimportOptions.java | 6 + src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/DOMForest.java | 25 +- src/share/jaxws_classes/com/sun/tools/internal/xjc/Options.java | 15 +- src/share/jaxws_classes/com/sun/xml/internal/ws/util/DOMUtil.java | 63 +--- src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/XmlUtil.java | 129 +++++++++- 7 files changed, 201 insertions(+), 59 deletions(-) diffs (truncated from 506 to 500 lines): diff -r f8bd60e99896 -r e17af60ebbd6 .hgtags --- a/.hgtags Wed May 17 17:01:56 2017 +0100 +++ b/.hgtags Thu Aug 03 17:03:27 2017 +0100 @@ -671,3 +671,6 @@ 506e24eee4e1887fbfdd77512f830b75e14c5759 jdk7u141-b01 1af82a2d3d16626b8d2f5e633d23c027975406b8 jdk7u141-b02 bc4f48c1ccba5dc37b360629ebf4539e85d481bd icedtea-2.6.10 +f8bd60e998968cc16e72c76a7dc8eadb3a980960 icedtea-2.6.11pre01 +1f0dd7a7e0ccaa340db533da400bb83ca1ad3cf2 jdk7u151-b00 +3233576db658552e8933b1cd86f5586507564f44 jdk7u151-b01 diff -r f8bd60e99896 -r e17af60ebbd6 src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/Options.java --- a/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/Options.java Wed May 17 17:01:56 2017 +0100 +++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/Options.java Thu Aug 03 17:03:27 2017 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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 @@ -79,6 +79,15 @@ */ public boolean nocompile; + /** + * If true XML security features when parsing XML documents will be disabled. + * The default value is false. + * + * Boolean + * @since 2.2.9 + */ + public boolean disableXmlSecurity; + public enum Target { V2_0, V2_1, V2_2; @@ -310,6 +319,9 @@ throw new BadCommandLineException(WscompileMessages.WSCOMPILE_NO_SUCH_DIRECTORY(sourceDir.getPath())); } return 2; + } else if (args[i].equals("-disableXmlSecurity")) { + disableXmlSecurity(); + return 1; } else if (args[i].equals("-extension")) { compatibilityMode = EXTENSION; return 1; @@ -326,6 +338,11 @@ return 0; } + // protected method to allow overriding + protected void disableXmlSecurity() { + disableXmlSecurity= true; + } + /** * Obtains an operand and reports an error if it's not there. */ diff -r f8bd60e99896 -r e17af60ebbd6 src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/WsimportOptions.java --- a/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/WsimportOptions.java Wed May 17 17:01:56 2017 +0100 +++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/WsimportOptions.java Thu Aug 03 17:03:27 2017 +0100 @@ -445,4 +445,10 @@ } } } + + @Override + protected void disableXmlSecurity() { + super.disableXmlSecurity(); + schemaCompiler.getOptions().disableXmlSecurity = true; + } } diff -r f8bd60e99896 -r e17af60ebbd6 src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/DOMForest.java --- a/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/DOMForest.java Wed May 17 17:01:56 2017 +0100 +++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/DOMForest.java Thu Aug 03 17:03:27 2017 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2017, 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 @@ -26,15 +26,12 @@ package com.sun.tools.internal.ws.wsdl.parser; import com.sun.istack.internal.NotNull; -import com.sun.tools.internal.ws.resources.WscompileMessages; -import com.sun.tools.internal.ws.wscompile.AbortException; -import com.sun.tools.internal.ws.wscompile.DefaultAuthenticator; +import com.sun.tools.internal.ws.util.xml.XmlUtil; import com.sun.tools.internal.ws.wscompile.ErrorReceiver; import com.sun.tools.internal.ws.wscompile.WsimportOptions; import com.sun.tools.internal.ws.wsdl.document.schema.SchemaConstants; import com.sun.tools.internal.xjc.reader.internalizer.LocatorTable; import com.sun.xml.internal.bind.marshaller.DataWriter; -import com.sun.xml.internal.ws.util.JAXWSUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; @@ -51,9 +48,6 @@ import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.sax.SAXResult; -import javax.net.ssl.HttpsURLConnection; -import javax.net.ssl.HostnameVerifier; -import javax.net.ssl.SSLSession; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -118,13 +112,13 @@ this.entityResolver = entityResolver; this.errorReceiver = errReceiver; this.logic = logic; + // secure xml processing can be switched off if input requires it + boolean disableXmlSecurity = options == null ? false : options.disableXmlSecurity; + + DocumentBuilderFactory dbf = XmlUtil.newDocumentBuilderFactory(disableXmlSecurity); + this.parserFactory = XmlUtil.newSAXParserFactory(disableXmlSecurity); try { - DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); - dbf.setNamespaceAware(true); this.documentBuilder = dbf.newDocumentBuilder(); - - this.parserFactory = SAXParserFactory.newInstance(); - this.parserFactory.setNamespaceAware(true); } catch (ParserConfigurationException e) { throw new AssertionError(e); } @@ -368,7 +362,10 @@ public void dump(OutputStream out) throws IOException { try { // create identity transformer - Transformer it = TransformerFactory.newInstance().newTransformer(); + // secure xml processing can be switched off if input requires it + boolean secureProcessingEnabled = options == null || !options.disableXmlSecurity; + TransformerFactory tf = XmlUtil.newTransformerFactory(secureProcessingEnabled); + Transformer it = tf.newTransformer(); for (Map.Entry e : core.entrySet()) { out.write(("---<< " + e.getKey() + '\n').getBytes()); diff -r f8bd60e99896 -r e17af60ebbd6 src/share/jaxws_classes/com/sun/tools/internal/xjc/Options.java --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/Options.java Wed May 17 17:01:56 2017 +0100 +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/Options.java Thu Aug 03 17:03:27 2017 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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 @@ -104,6 +104,15 @@ public String encoding; /** + * If true XML security features when parsing XML documents will be disabled. + * The default value is false. + * + * Boolean + * @since 2.2.6 + */ + public boolean disableXmlSecurity; + + /** * Check the source schemas with extra scrutiny. * The exact meaning depends on the schema language. */ @@ -540,6 +549,10 @@ enableIntrospection = true; return 1; } + if (args[i].equals("-disableXmlSecurity")) { + disableXmlSecurity = true; + return 1; + } if (args[i].equals("-contentForWildcard")) { contentForWildcard = true; return 1; diff -r f8bd60e99896 -r e17af60ebbd6 src/share/jaxws_classes/com/sun/xml/internal/ws/util/DOMUtil.java --- a/src/share/jaxws_classes/com/sun/xml/internal/ws/util/DOMUtil.java Wed May 17 17:01:56 2017 +0100 +++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/util/DOMUtil.java Thu Aug 03 17:03:27 2017 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2017, 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 @@ -25,29 +25,27 @@ package com.sun.xml.internal.ws.util; -import org.w3c.dom.Document; -import org.w3c.dom.NamedNodeMap; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; -import org.w3c.dom.Element; -import org.xml.sax.SAXException; +import com.sun.istack.internal.NotNull; +import com.sun.istack.internal.Nullable; +import com.sun.xml.internal.ws.util.xml.XmlUtil; +import javax.xml.XMLConstants; +import javax.xml.namespace.NamespaceContext; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.FactoryConfigurationError; import javax.xml.parsers.ParserConfigurationException; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; -import javax.xml.XMLConstants; -import javax.xml.namespace.NamespaceContext; -import java.io.IOException; -import java.io.InputStream; +import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import java.util.ArrayList; -import com.sun.istack.internal.NotNull; -import com.sun.istack.internal.Nullable; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; /** * @author: JAXWS Development Team @@ -63,8 +61,7 @@ synchronized (DOMUtil.class) { if (db == null) { try { - DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); - dbf.setNamespaceAware(true); + DocumentBuilderFactory dbf = XmlUtil.newDocumentBuilderFactory(); db = dbf.newDocumentBuilder(); } catch (ParserConfigurationException e) { throw new FactoryConfigurationError(e); @@ -74,28 +71,6 @@ } } - public static Node createDOMNode(InputStream inputStream) { - - DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); - dbf.setNamespaceAware(true); - dbf.setValidating(false); - try { - DocumentBuilder builder = dbf.newDocumentBuilder(); - try { - return builder.parse(inputStream); - } catch (SAXException e) { - e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. - } catch (IOException e) { - e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. - } - } catch (ParserConfigurationException pce) { - IllegalArgumentException iae = new IllegalArgumentException(pce.getMessage()); - iae.initCause(pce); - throw iae; - } - return null; - } - /** * Traverses a DOM node and writes out on a streaming writer. * @@ -112,6 +87,7 @@ switch (child.getNodeType()) { case Node.PROCESSING_INSTRUCTION_NODE: writer.writeProcessingInstruction(child.getNodeValue()); + break; case Node.DOCUMENT_TYPE_NODE: break; case Node.CDATA_SECTION_NODE: @@ -126,6 +102,7 @@ case Node.ELEMENT_NODE: serializeNode((Element) child, writer); break; + default: break; } } } @@ -222,8 +199,9 @@ for (Node n = e.getFirstChild(); n != null; n = n.getNextSibling()) { if (n.getNodeType() == Node.ELEMENT_NODE) { Element c = (Element) n; - if (c.getLocalName().equals(local) && c.getNamespaceURI().equals(nsUri)) + if (c.getLocalName().equals(local) && c.getNamespaceURI().equals(nsUri)) { return c; + } } } return null; @@ -232,8 +210,11 @@ private static @NotNull String fixNull(@Nullable String s) { - if (s == null) return ""; - else return s; + if (s == null) { + return ""; + } else { + return s; + } } /** diff -r f8bd60e99896 -r e17af60ebbd6 src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/XmlUtil.java --- a/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/XmlUtil.java Wed May 17 17:01:56 2017 +0100 +++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/XmlUtil.java Thu Aug 03 17:03:27 2017 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2017, 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 @@ -40,13 +40,18 @@ import org.xml.sax.EntityResolver; import org.xml.sax.ErrorHandler; import org.xml.sax.SAXException; +import org.xml.sax.SAXNotRecognizedException; +import org.xml.sax.SAXNotSupportedException; import org.xml.sax.SAXParseException; import org.xml.sax.XMLReader; import org.xml.sax.InputSource; +import javax.xml.XMLConstants; import javax.xml.namespace.QName; +import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParserFactory; +import javax.xml.stream.XMLInputFactory; import javax.xml.transform.Result; import javax.xml.transform.Source; import javax.xml.transform.Transformer; @@ -57,16 +62,22 @@ import javax.xml.transform.sax.TransformerHandler; import javax.xml.transform.stream.StreamSource; import javax.xml.ws.WebServiceException; +import javax.xml.xpath.XPathFactory; +import javax.xml.xpath.XPathFactoryConfigurationException; import java.io.IOException; import java.io.InputStream; import java.io.OutputStreamWriter; import java.io.Writer; import java.net.URL; +import java.security.AccessController; +import java.security.PrivilegedAction; import java.util.ArrayList; import java.util.Enumeration; import java.util.Iterator; import java.util.List; import java.util.StringTokenizer; +import java.util.logging.Level; +import java.util.logging.Logger; /** * @author WS Development Team @@ -75,6 +86,27 @@ private final static String LEXICAL_HANDLER_PROPERTY = "http://xml.org/sax/properties/lexical-handler"; + private static final String DISALLOW_DOCTYPE_DECL = "http://apache.org/xml/features/disallow-doctype-decl"; + + private static final String EXTERNAL_GE = "http://xml.org/sax/features/external-general-entities"; + + private static final String EXTERNAL_PE = "http://xml.org/sax/features/external-parameter-entities"; + + private static final String LOAD_EXTERNAL_DTD = "http://apache.org/xml/features/nonvalidating/load-external-dtd"; + + private static final Logger LOGGER = Logger.getLogger(XmlUtil.class.getName()); + + private static final String DISABLE_XML_SECURITY = "com.sun.xml.internal.ws.disableXmlSecurity"; + + private static boolean XML_SECURITY_DISABLED = AccessController.doPrivileged( + new PrivilegedAction() { + @Override + public Boolean run() { + return Boolean.getBoolean(DISABLE_XML_SECURITY); + } + } + ); + public static String getPrefix(String s) { int i = s.indexOf(':'); if (i == -1) @@ -163,7 +195,7 @@ } public static String getTextForNode(Node node) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); NodeList children = node.getChildNodes(); if (children.getLength() == 0) @@ -334,15 +366,108 @@ * {@link ErrorHandler} that always treat the error as fatal. */ public static final ErrorHandler DRACONIAN_ERROR_HANDLER = new ErrorHandler() { + @Override public void warning(SAXParseException exception) { } + @Override public void error(SAXParseException exception) throws SAXException { throw exception; } + @Override public void fatalError(SAXParseException exception) throws SAXException { throw exception; } }; + + public static DocumentBuilderFactory newDocumentBuilderFactory() { + return newDocumentBuilderFactory(false); + } + + public static DocumentBuilderFactory newDocumentBuilderFactory(boolean disableSecurity) { + DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); + String featureToSet = XMLConstants.FEATURE_SECURE_PROCESSING; + try { + boolean securityOn = !isXMLSecurityDisabled(disableSecurity); + factory.setFeature(featureToSet, securityOn); + factory.setNamespaceAware(true); + if (securityOn) { + factory.setExpandEntityReferences(false); + featureToSet = DISALLOW_DOCTYPE_DECL; + factory.setFeature(featureToSet, true); + featureToSet = EXTERNAL_GE; + factory.setFeature(featureToSet, false); + featureToSet = EXTERNAL_PE; + factory.setFeature(featureToSet, false); + featureToSet = LOAD_EXTERNAL_DTD; + factory.setFeature(featureToSet, false); + } + } catch (ParserConfigurationException e) { + LOGGER.log(Level.WARNING, "Factory [{0}] doesn't support "+featureToSet+" feature!", new Object[] {factory.getClass().getName()} ); + } + return factory; + } + + public static TransformerFactory newTransformerFactory(boolean secureXmlProcessingEnabled) { + TransformerFactory factory = TransformerFactory.newInstance(); + try { + factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, isXMLSecurityDisabled(secureXmlProcessingEnabled)); + } catch (TransformerConfigurationException e) { + LOGGER.log(Level.WARNING, "Factory [{0}] doesn't support secure xml processing!", new Object[]{factory.getClass().getName()}); + } + return factory; + } + + public static TransformerFactory newTransformerFactory() { + return newTransformerFactory(true); + } + + public static SAXParserFactory newSAXParserFactory(boolean disableSecurity) { + SAXParserFactory factory = SAXParserFactory.newInstance(); + String featureToSet = XMLConstants.FEATURE_SECURE_PROCESSING; + try { + boolean securityOn = !isXMLSecurityDisabled(disableSecurity); + factory.setFeature(featureToSet, securityOn); + factory.setNamespaceAware(true); + if (securityOn) { + featureToSet = DISALLOW_DOCTYPE_DECL; + factory.setFeature(featureToSet, true); + featureToSet = EXTERNAL_GE; + factory.setFeature(featureToSet, false); + featureToSet = EXTERNAL_PE; + factory.setFeature(featureToSet, false); + featureToSet = LOAD_EXTERNAL_DTD; + factory.setFeature(featureToSet, false); + } + } catch (ParserConfigurationException | SAXNotRecognizedException | SAXNotSupportedException e) { + LOGGER.log(Level.WARNING, "Factory [{0}] doesn't support "+featureToSet+" feature!", new Object[]{factory.getClass().getName()}); + } + return factory; + } + + public static XPathFactory newXPathFactory(boolean secureXmlProcessingEnabled) { + XPathFactory factory = XPathFactory.newInstance(); + try { + factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, isXMLSecurityDisabled(secureXmlProcessingEnabled)); + } catch (XPathFactoryConfigurationException e) { + LOGGER.log(Level.WARNING, "Factory [{0}] doesn't support secure xml processing!", new Object[] { factory.getClass().getName() } ); + } + return factory; + } + + public static XMLInputFactory newXMLInputFactory(boolean secureXmlProcessingEnabled) { + XMLInputFactory factory = XMLInputFactory.newInstance(); + if (isXMLSecurityDisabled(secureXmlProcessingEnabled)) { + // TODO-Miran: are those apppropriate defaults? + factory.setProperty(XMLInputFactory.SUPPORT_DTD, false); + factory.setProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES, false); + } + return factory; + } From andrew at icedtea.classpath.org Thu Aug 3 16:19:50 2017 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 03 Aug 2017 16:19:50 +0000 Subject: /hg/release/icedtea7-forest-2.6/langtools: 5 new changesets Message-ID: changeset 84706d66cf26 in /hg/release/icedtea7-forest-2.6/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/langtools?cmd=changeset;node=84706d66cf26 author: andrew date: Tue Aug 01 13:31:34 2017 +0100 Added tag icedtea-2.6.11pre01 for changeset a4814b6ff893 changeset 205349c408f4 in /hg/release/icedtea7-forest-2.6/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/langtools?cmd=changeset;node=205349c408f4 author: andrew date: Tue Aug 01 14:12:29 2017 +0100 Added tag jdk7u151-b00 for changeset 4624941508c1 changeset 20494825f6ca in /hg/release/icedtea7-forest-2.6/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/langtools?cmd=changeset;node=20494825f6ca author: andrew date: Wed Aug 02 02:32:55 2017 +0100 Merge jdk7u151-b00 changeset 47eceb9c81a2 in /hg/release/icedtea7-forest-2.6/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/langtools?cmd=changeset;node=47eceb9c81a2 author: andrew date: Thu Aug 03 07:27:58 2017 +0100 Added tag jdk7u151-b01 for changeset 205349c408f4 changeset cddb1f9f8b9c in /hg/release/icedtea7-forest-2.6/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/langtools?cmd=changeset;node=cddb1f9f8b9c author: andrew date: Thu Aug 03 17:03:28 2017 +0100 Merge jdk7u151-b01 diffstat: .hgtags | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (10 lines): diff -r a4814b6ff893 -r cddb1f9f8b9c .hgtags --- a/.hgtags Wed May 17 17:01:59 2017 +0100 +++ b/.hgtags Thu Aug 03 17:03:28 2017 +0100 @@ -671,3 +671,6 @@ 853798299f7a4f38745632dc256219fbf75f861e jdk7u141-b01 ba8ba083c4392a1ddfe40467de1e08d77443807e jdk7u141-b02 6e30439005f6e6a63661192738e27e8d374d72d8 icedtea-2.6.10 +a4814b6ff893d36aea91ccb16990d8a34840c07f icedtea-2.6.11pre01 +4624941508c189c7b81c3393664741640a9b0467 jdk7u151-b00 +205349c408f4715dbbaf428ceafca676e2333979 jdk7u151-b01 From andrew at icedtea.classpath.org Thu Aug 3 16:19:58 2017 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 03 Aug 2017 16:19:58 +0000 Subject: /hg/release/icedtea7-forest-2.6/hotspot: 18 new changesets Message-ID: changeset e2b0fcea4493 in /hg/release/icedtea7-forest-2.6/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=e2b0fcea4493 author: andrew date: Tue Aug 01 13:31:36 2017 +0100 Added tag icedtea-2.6.11pre01 for changeset a8044a7634d0 changeset 70191d4fad0c in /hg/release/icedtea7-forest-2.6/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=70191d4fad0c author: thartmann date: Thu Mar 30 15:28:33 2017 +0200 8173770: Image conversion improvements Reviewed-by: kvn, vlivanov, dlong, rhalade, mschoene, iignatyev changeset 3a1e34513b37 in /hg/release/icedtea7-forest-2.6/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=3a1e34513b37 author: andrew date: Wed Jul 26 19:57:31 2017 +0100 8179887: Build failure with glibc >= 2.24: error: 'int readdir_r(DIR*, dirent*, dirent**)' is deprecated Summary: Disable deprecated declarations so the build doesn't fail with -Werror Reviewed-by: omajid changeset c2c1b068bd58 in /hg/release/icedtea7-forest-2.6/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=c2c1b068bd58 author: roland date: Wed Jul 26 22:37:27 2017 +0100 8024069: replace_in_map() should operate on parent maps Summary: type information gets lost because replace_in_map() doesn't update parent maps Reviewed-by: kvn, twisti changeset 0f18bae8b113 in /hg/release/icedtea7-forest-2.6/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=0f18bae8b113 author: roland date: Wed Jul 26 23:35:36 2017 +0100 8026796: Make replace_in_map() on parent maps generic Summary: propagate node replacements along control flow edges to callers Reviewed-by: kvn, vlivanov changeset d7dca9011eba in /hg/release/icedtea7-forest-2.6/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=d7dca9011eba author: vlivanov date: Mon Jul 14 03:29:42 2014 -0700 8048703: ReplacedNodes dumps it's content to tty Reviewed-by: roland, iveresov, drchase changeset d7ea04813d4b in /hg/release/icedtea7-forest-2.6/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=d7ea04813d4b author: roland date: Wed Feb 15 17:26:37 2017 -0800 8174164: SafePointNode::_replaced_nodes breaks with irreducible loops Reviewed-by: kvn changeset c511b66277fb in /hg/release/icedtea7-forest-2.6/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=c511b66277fb author: roland date: Thu Feb 16 15:14:44 2017 -0800 8175097: [TESTBUG] 8174164 fix missed the test Reviewed-by: kvn changeset c3c450608912 in /hg/release/icedtea7-forest-2.6/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=c3c450608912 author: mdoerr date: Fri Jun 02 08:45:34 2017 +0200 8181420: PPC: Image conversion improvements Reviewed-by: thartmann, simonis, mbaesken changeset 75662a7ec171 in /hg/release/icedtea7-forest-2.6/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=75662a7ec171 author: jvanek date: Fri Jul 28 13:33:03 2017 +0100 8185502: No overflow operator on OpenJDK 7 Summary: Remove usage of overflow in x86_32.ad Reviewed-by: roland, andrew changeset 9c1a6eb49acb in /hg/release/icedtea7-forest-2.6/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=9c1a6eb49acb author: andrew date: Tue Aug 01 14:12:31 2017 +0100 Added tag jdk7u151-b00 for changeset 75662a7ec171 changeset 2f25ab14c09e in /hg/release/icedtea7-forest-2.6/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=2f25ab14c09e author: andrew date: Wed Aug 02 02:32:58 2017 +0100 Merge jdk7u151-b00 changeset ad21f8170b18 in /hg/release/icedtea7-forest-2.6/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=ad21f8170b18 author: aph date: Wed Aug 02 08:41:53 2017 +0100 8144028, PR3431: Use AArch64 bit-test instructions in C2 Reviewed-by: kvn changeset c8d9c145e76a in /hg/release/icedtea7-forest-2.6/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=c8d9c145e76a author: fyang date: Wed Mar 23 18:00:46 2016 +0800 8152537, PR3431: aarch64: Make use of CBZ and CBNZ when comparing unsigned values with zero. Summary: aarch64: c2 make use of CBZ and CBNZ when comparing unsigned values with zero. Reviewed-by: aph changeset dd276016c8d1 in /hg/release/icedtea7-forest-2.6/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=dd276016c8d1 author: roland date: Tue Jul 04 21:23:37 2017 +0100 8183551, PR3431: AArch64: Image conversion improvements changeset d0c7cea0660f in /hg/release/icedtea7-forest-2.6/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=d0c7cea0660f author: andrew date: Thu Aug 03 07:27:30 2017 +0100 8185716: OpenJDK 7 PPC64 port uses a different ins_encode format in ppc.ad Summary: Use existing ins_encode format for implementing 8181420 Reviewed-by: omajid changeset 1396a255c595 in /hg/release/icedtea7-forest-2.6/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=1396a255c595 author: andrew date: Thu Aug 03 07:27:59 2017 +0100 Added tag jdk7u151-b01 for changeset d0c7cea0660f changeset 809ae803d8ea in /hg/release/icedtea7-forest-2.6/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=809ae803d8ea author: andrew date: Thu Aug 03 17:03:28 2017 +0100 Merge jdk7u151-b01 diffstat: .hgtags | 3 + make/linux/makefiles/gcc.make | 1 + src/cpu/aarch64/vm/aarch64.ad | 234 +++++++++++++++++++++++++++- src/cpu/aarch64/vm/assembler_aarch64.hpp | 7 +- src/cpu/ppc/vm/ppc.ad | 25 ++ src/cpu/sparc/vm/sparc.ad | 134 ++++++++++++++++ src/cpu/x86/vm/x86_32.ad | 150 +++++++++++++++++- src/cpu/x86/vm/x86_64.ad | 42 +++++ src/share/vm/adlc/archDesc.cpp | 1 + src/share/vm/opto/c2_globals.hpp | 2 +- src/share/vm/opto/callGenerator.cpp | 11 +- src/share/vm/opto/callnode.cpp | 1 + src/share/vm/opto/callnode.hpp | 33 +++ src/share/vm/opto/classes.hpp | 1 + src/share/vm/opto/compile.cpp | 9 +- src/share/vm/opto/compile.hpp | 4 +- src/share/vm/opto/graphKit.cpp | 43 ++++- src/share/vm/opto/graphKit.hpp | 2 +- src/share/vm/opto/ifnode.cpp | 2 +- src/share/vm/opto/loopPredicate.cpp | 219 +++++++++++++++---------- src/share/vm/opto/loopnode.cpp | 4 +- src/share/vm/opto/loopnode.hpp | 11 +- src/share/vm/opto/loopopts.cpp | 4 +- src/share/vm/opto/multnode.cpp | 57 ++++++ src/share/vm/opto/multnode.hpp | 8 + src/share/vm/opto/node.cpp | 6 + src/share/vm/opto/output.cpp | 1 + src/share/vm/opto/parse.hpp | 5 +- src/share/vm/opto/parse1.cpp | 27 +++- src/share/vm/opto/replacednodes.cpp | 223 ++++++++++++++++++++++++++ src/share/vm/opto/replacednodes.hpp | 81 +++++++++ src/share/vm/opto/subnode.cpp | 54 ++++++ src/share/vm/opto/subnode.hpp | 9 + src/share/vm/runtime/vmStructs.cpp | 1 + src/share/vm/utilities/growableArray.hpp | 3 +- test/compiler/c2/TestReplacedNodesOSR.java | 86 ++++++++++ test/compiler/codegen/8144028/BitTests.java | 164 +++++++++++++++++++ 37 files changed, 1543 insertions(+), 125 deletions(-) diffs (truncated from 2377 to 500 lines): diff -r a8044a7634d0 -r 809ae803d8ea .hgtags --- a/.hgtags Mon Jul 31 06:02:56 2017 +0100 +++ b/.hgtags Thu Aug 03 17:03:28 2017 +0100 @@ -906,3 +906,6 @@ 22c5a6ca09e35b63baf51bad4cb3d8f0cf326705 jdk7u141-b01 56ad25be7d88c2c2da562fe1e8879c8723d01da1 jdk7u141-b02 8edec8d2933aa575e7da2656b0fc4d8b904b1997 icedtea-2.6.10 +a8044a7634d086a85ac71b8674b432424606a85c icedtea-2.6.11pre01 +75662a7ec1719b3133636d09bd078968579a55ab jdk7u151-b00 +d0c7cea0660f7a8188a7b8c1f6d1a6c8d6388fb0 jdk7u151-b01 diff -r a8044a7634d0 -r 809ae803d8ea make/linux/makefiles/gcc.make --- a/make/linux/makefiles/gcc.make Mon Jul 31 06:02:56 2017 +0100 +++ b/make/linux/makefiles/gcc.make Thu Aug 03 17:03:28 2017 +0100 @@ -172,6 +172,7 @@ else ACCEPTABLE_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare endif +ACCEPTABLE_WARNINGS += -Wno-deprecated-declarations CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ACCEPTABLE_WARNINGS) # Special cases diff -r a8044a7634d0 -r 809ae803d8ea src/cpu/aarch64/vm/aarch64.ad --- a/src/cpu/aarch64/vm/aarch64.ad Mon Jul 31 06:02:56 2017 +0100 +++ b/src/cpu/aarch64/vm/aarch64.ad Thu Aug 03 17:03:28 2017 +0100 @@ -2439,7 +2439,6 @@ int disp = $mem$$disp; if (index == -1) { __ prfm(Address(base, disp), PSTL1KEEP); - __ nop(); } else { Register index_reg = as_Register(index); if (disp == 0) { @@ -10534,7 +10533,7 @@ ins_pipe(icmp_reg_reg); %} -instruct compL_reg_immI0(rFlagsReg cr, iRegL op1, immI0 zero) +instruct compL_reg_immL0(rFlagsReg cr, iRegL op1, immL0 zero) %{ match(Set cr (CmpL op1 zero)); @@ -10576,6 +10575,62 @@ ins_pipe(icmp_reg_imm); %} +instruct compUL_reg_reg(rFlagsRegU cr, iRegL op1, iRegL op2) +%{ + match(Set cr (CmpUL op1 op2)); + + effect(DEF cr, USE op1, USE op2); + + ins_cost(INSN_COST); + format %{ "cmp $op1, $op2" %} + + ins_encode(aarch64_enc_cmp(op1, op2)); + + ins_pipe(icmp_reg_reg); +%} + +instruct compUL_reg_immL0(rFlagsRegU cr, iRegL op1, immL0 zero) +%{ + match(Set cr (CmpUL op1 zero)); + + effect(DEF cr, USE op1); + + ins_cost(INSN_COST); + format %{ "tst $op1" %} + + ins_encode(aarch64_enc_cmp_imm_addsub(op1, zero)); + + ins_pipe(icmp_reg_imm); +%} + +instruct compUL_reg_immLAddSub(rFlagsRegU cr, iRegL op1, immLAddSub op2) +%{ + match(Set cr (CmpUL op1 op2)); + + effect(DEF cr, USE op1); + + ins_cost(INSN_COST); + format %{ "cmp $op1, $op2" %} + + ins_encode(aarch64_enc_cmp_imm_addsub(op1, op2)); + + ins_pipe(icmp_reg_imm); +%} + +instruct compUL_reg_immL(rFlagsRegU cr, iRegL op1, immL op2) +%{ + match(Set cr (CmpUL op1 op2)); + + effect(DEF cr, USE op1); + + ins_cost(INSN_COST * 2); + format %{ "cmp $op1, $op2" %} + + ins_encode(aarch64_enc_cmp_imm(op1, op2)); + + ins_pipe(icmp_reg_imm); +%} + instruct compP_reg_reg(rFlagsRegU cr, iRegP op1, iRegP op2) %{ match(Set cr (CmpP op1 op2)); @@ -11054,6 +11109,181 @@ ins_pipe(pipe_cmp_branch); %} +instruct cmpUI_imm0_branch(cmpOpU cmp, iRegIorL2I op1, immI0 op2, label labl, rFlagsRegU cr) %{ + match(If cmp (CmpU op1 op2)); + predicate(n->in(1)->as_Bool()->_test._test == BoolTest::ne + || n->in(1)->as_Bool()->_test._test == BoolTest::eq + || n->in(1)->as_Bool()->_test._test == BoolTest::gt + || n->in(1)->as_Bool()->_test._test == BoolTest::le); + effect(USE labl); + + ins_cost(BRANCH_COST); + format %{ "cbw$cmp $op1, $labl" %} + ins_encode %{ + Label* L = $labl$$label; + Assembler::Condition cond = (Assembler::Condition)$cmp$$cmpcode; + if (cond == Assembler::EQ || cond == Assembler::LS) + __ cbzw($op1$$Register, *L); + else + __ cbnzw($op1$$Register, *L); + %} + ins_pipe(pipe_cmp_branch); +%} + +instruct cmpUL_imm0_branch(cmpOpU cmp, iRegL op1, immL0 op2, label labl, rFlagsRegU cr) %{ + match(If cmp (CmpUL op1 op2)); + predicate(n->in(1)->as_Bool()->_test._test == BoolTest::ne + || n->in(1)->as_Bool()->_test._test == BoolTest::eq + || n->in(1)->as_Bool()->_test._test == BoolTest::gt + || n->in(1)->as_Bool()->_test._test == BoolTest::le); + effect(USE labl); + + ins_cost(BRANCH_COST); + format %{ "cb$cmp $op1, $labl" %} + ins_encode %{ + Label* L = $labl$$label; + Assembler::Condition cond = (Assembler::Condition)$cmp$$cmpcode; + if (cond == Assembler::EQ || cond == Assembler::LS) + __ cbz($op1$$Register, *L); + else + __ cbnz($op1$$Register, *L); + %} + ins_pipe(pipe_cmp_branch); +%} + +// Test bit and Branch + +instruct cmpL_branch_sign(cmpOp cmp, iRegL op1, immL0 op2, label labl, rFlagsReg cr) %{ + match(If cmp (CmpL op1 op2)); + predicate(n->in(1)->as_Bool()->_test._test == BoolTest::lt + || n->in(1)->as_Bool()->_test._test == BoolTest::ge); + effect(USE labl); + + ins_cost(BRANCH_COST); + format %{ "cb$cmp $op1, $labl # long" %} + ins_encode %{ + Label* L = $labl$$label; + Assembler::Condition cond = (Assembler::Condition)$cmp$$cmpcode; + if (cond == Assembler::LT) + __ tbnz($op1$$Register, 63, *L); + else + __ tbz($op1$$Register, 63, *L); + %} + ins_pipe(pipe_cmp_branch); +%} + +instruct cmpI_branch_sign(cmpOp cmp, iRegIorL2I op1, immI0 op2, label labl, rFlagsReg cr) %{ + match(If cmp (CmpI op1 op2)); + predicate(n->in(1)->as_Bool()->_test._test == BoolTest::lt + || n->in(1)->as_Bool()->_test._test == BoolTest::ge); + effect(USE labl); + + ins_cost(BRANCH_COST); + format %{ "cb$cmp $op1, $labl # int" %} + ins_encode %{ + Label* L = $labl$$label; + Assembler::Condition cond = (Assembler::Condition)$cmp$$cmpcode; + if (cond == Assembler::LT) + __ tbnz($op1$$Register, 31, *L); + else + __ tbz($op1$$Register, 31, *L); + %} + ins_pipe(pipe_cmp_branch); +%} + +instruct cmpL_branch_bit(cmpOp cmp, iRegL op1, immL op2, immL0 op3, label labl, rFlagsReg cr) %{ + match(If cmp (CmpL (AndL op1 op2) op3)); + predicate((n->in(1)->as_Bool()->_test._test == BoolTest::ne + || n->in(1)->as_Bool()->_test._test == BoolTest::eq) + && is_power_of_2(n->in(2)->in(1)->in(2)->get_long())); + effect(USE labl); + + ins_cost(BRANCH_COST); + format %{ "tb$cmp $op1, $op2, $labl" %} + ins_encode %{ + Label* L = $labl$$label; + Assembler::Condition cond = (Assembler::Condition)$cmp$$cmpcode; + int bit = exact_log2($op2$$constant); + if (cond == Assembler::EQ) + __ tbz($op1$$Register, bit, *L); + else + __ tbnz($op1$$Register, bit, *L); + %} + ins_pipe(pipe_cmp_branch); +%} + +instruct cmpI_branch_bit(cmpOp cmp, iRegIorL2I op1, immI op2, immI0 op3, label labl, rFlagsReg cr) %{ + match(If cmp (CmpI (AndI op1 op2) op3)); + predicate((n->in(1)->as_Bool()->_test._test == BoolTest::ne + || n->in(1)->as_Bool()->_test._test == BoolTest::eq) + && is_power_of_2(n->in(2)->in(1)->in(2)->get_int())); + effect(USE labl); + + ins_cost(BRANCH_COST); + format %{ "tb$cmp $op1, $op2, $labl" %} + ins_encode %{ + Label* L = $labl$$label; + Assembler::Condition cond = (Assembler::Condition)$cmp$$cmpcode; + int bit = exact_log2($op2$$constant); + if (cond == Assembler::EQ) + __ tbz($op1$$Register, bit, *L); + else + __ tbnz($op1$$Register, bit, *L); + %} + ins_pipe(pipe_cmp_branch); +%} + +// Test bits + +instruct cmpL_and(cmpOp cmp, iRegL op1, immL op2, immL0 op3, rFlagsReg cr) %{ + match(Set cr (CmpL (AndL op1 op2) op3)); + predicate(Assembler::operand_valid_for_logical_immediate + (/*is_32*/false, n->in(1)->in(2)->get_long())); + + ins_cost(INSN_COST); + format %{ "tst $op1, $op2 # long" %} + ins_encode %{ + __ tst($op1$$Register, $op2$$constant); + %} + ins_pipe(ialu_reg_reg); +%} + +instruct cmpI_and(cmpOp cmp, iRegIorL2I op1, immI op2, immI0 op3, rFlagsReg cr) %{ + match(Set cr (CmpI (AndI op1 op2) op3)); + predicate(Assembler::operand_valid_for_logical_immediate + (/*is_32*/true, n->in(1)->in(2)->get_int())); + + ins_cost(INSN_COST); + format %{ "tst $op1, $op2 # int" %} + ins_encode %{ + __ tstw($op1$$Register, $op2$$constant); + %} + ins_pipe(ialu_reg_reg); +%} + +instruct cmpL_and_reg(cmpOp cmp, iRegL op1, iRegL op2, immL0 op3, rFlagsReg cr) %{ + match(Set cr (CmpL (AndL op1 op2) op3)); + + ins_cost(INSN_COST); + format %{ "tst $op1, $op2 # long" %} + ins_encode %{ + __ tst($op1$$Register, $op2$$Register); + %} + ins_pipe(ialu_reg_reg); +%} + +instruct cmpI_and_reg(cmpOp cmp, iRegIorL2I op1, iRegIorL2I op2, immI0 op3, rFlagsReg cr) %{ + match(Set cr (CmpI (AndI op1 op2) op3)); + + ins_cost(INSN_COST); + format %{ "tstw $op1, $op2 # int" %} + ins_encode %{ + __ tstw($op1$$Register, $op2$$Register); + %} + ins_pipe(ialu_reg_reg); +%} + + // Conditional Far Branch // Conditional Far Branch Unsigned // TODO: fixme diff -r a8044a7634d0 -r 809ae803d8ea src/cpu/aarch64/vm/assembler_aarch64.hpp --- a/src/cpu/aarch64/vm/assembler_aarch64.hpp Mon Jul 31 06:02:56 2017 +0100 +++ b/src/cpu/aarch64/vm/assembler_aarch64.hpp Thu Aug 03 17:03:28 2017 +0100 @@ -2459,8 +2459,11 @@ inline void moviw(Register Rd, unsigned imm) { orrw(Rd, zr, imm); } inline void movi(Register Rd, unsigned imm) { orr(Rd, zr, imm); } - inline void tstw(Register Rd, unsigned imm) { andsw(zr, Rd, imm); } - inline void tst(Register Rd, unsigned imm) { ands(zr, Rd, imm); } + inline void tstw(Register Rd, Register Rn) { andsw(zr, Rd, Rn); } + inline void tst(Register Rd, Register Rn) { ands(zr, Rd, Rn); } + + inline void tstw(Register Rd, uint64_t imm) { andsw(zr, Rd, imm); } + inline void tst(Register Rd, uint64_t imm) { ands(zr, Rd, imm); } inline void bfiw(Register Rd, Register Rn, unsigned lsb, unsigned width) { bfmw(Rd, Rn, ((32 - lsb) & 31), (width - 1)); diff -r a8044a7634d0 -r 809ae803d8ea src/cpu/ppc/vm/ppc.ad --- a/src/cpu/ppc/vm/ppc.ad Mon Jul 31 06:02:56 2017 +0100 +++ b/src/cpu/ppc/vm/ppc.ad Thu Aug 03 17:03:28 2017 +0100 @@ -3498,6 +3498,14 @@ __ cmplwi(Rcrx, Rsrc1, Isrc2); %} + enc_class enc_cmpldi(flagsReg crx, iRegIsrc src1, uimmL16 src2) %{ + // TODO: PPC port $archOpcode(ppc64Opcode_cmpli); + MacroAssembler _masm(&cbuf); + Register Rsrc1 = reg_to_register_object($src1$$reg); + ConditionRegister Rcrx = reg_to_ConditionRegister_object($crx$$reg); + __ cmpldi(Rcrx, Rsrc1, $src2$$constant); + %} + enc_class enc_btst_reg(iRegIsrc src1, iRegIsrc src2) %{ // TODO: PPC port $archOpcode(ppc64Opcode_and_); @@ -11356,6 +11364,23 @@ ins_pipe(pipe_class_compare); %} +// Added CmpUL for LoopPredicate. +instruct cmpUL_reg_reg(flagsReg crx, iRegLsrc src1, iRegLsrc src2) %{ + match(Set crx (CmpUL src1 src2)); + format %{ "CMPLD $crx, $src1, $src2" %} + size(4); + ins_encode( enc_cmpld(crx, src1, src2) ); + ins_pipe(pipe_class_compare); +%} + +instruct cmpUL_reg_imm16(flagsReg crx, iRegLsrc src1, uimmL16 src2) %{ + match(Set crx (CmpUL src1 src2)); + format %{ "CMPLDI $crx, $src1, $src2" %} + size(4); + ins_encode( enc_cmpldi(crx, src1, src2) ); + ins_pipe(pipe_class_compare); +%} + instruct testL_reg_reg(flagsRegCR0 cr0, iRegLsrc src1, iRegLsrc src2, immL_0 zero) %{ match(Set cr0 (CmpL (AndL src1 src2) zero)); // r0 is killed diff -r a8044a7634d0 -r 809ae803d8ea src/cpu/sparc/vm/sparc.ad --- a/src/cpu/sparc/vm/sparc.ad Mon Jul 31 06:02:56 2017 +0100 +++ b/src/cpu/sparc/vm/sparc.ad Thu Aug 03 17:03:28 2017 +0100 @@ -3448,6 +3448,16 @@ interface(CONST_INTER); %} +// Unsigned Long Immediate: 12-bit (non-negative that fits in simm13) +operand immUL12() %{ + predicate((0 <= n->get_long()) && (n->get_long() == (int)n->get_long()) && Assembler::is_simm13((int)n->get_long())); + match(ConL); + op_cost(0); + + format %{ %} + interface(CONST_INTER); +%} + // Int Immediate non-negative operand immU31() %{ @@ -4064,6 +4074,15 @@ interface(REG_INTER); %} +// Condition Code Register, unsigned long comparisons. +operand flagsRegUL() %{ + constraint(ALLOC_IN_RC(int_flags)); + match(RegFlags); + + format %{ "xcc_UL" %} + interface(REG_INTER); +%} + // Condition Code Register, floating comparisons, unordered same as "less". operand flagsRegF() %{ constraint(ALLOC_IN_RC(float_flags)); @@ -8860,6 +8879,17 @@ ins_pipe(ialu_cconly_reg_reg); %} +instruct compUL_iReg(flagsRegUL xcc, iRegL op1, iRegL op2) %{ + match(Set xcc (CmpUL op1 op2)); + effect(DEF xcc, USE op1, USE op2); + + size(4); + format %{ "CMP $op1,$op2\t! unsigned long" %} + opcode(Assembler::subcc_op3, Assembler::arith_op); + ins_encode(form3_rs1_rs2_rd(op1, op2, R_G0)); + ins_pipe(ialu_cconly_reg_reg); +%} + instruct compI_iReg_imm13(flagsReg icc, iRegI op1, immI13 op2) %{ match(Set icc (CmpI op1 op2)); effect( DEF icc, USE op1 ); @@ -8946,6 +8976,17 @@ ins_pipe(ialu_cconly_reg_imm); %} +instruct compUL_iReg_imm13(flagsRegUL xcc, iRegL op1, immUL12 op2) %{ + match(Set xcc (CmpUL op1 op2)); + effect(DEF xcc, USE op1, USE op2); + + size(4); + format %{ "CMP $op1,$op2\t! unsigned long" %} + opcode(Assembler::subcc_op3, Assembler::arith_op); + ins_encode(form3_rs1_simm13_rd(op1, op2, R_G0)); + ins_pipe(ialu_cconly_reg_imm); +%} + // Compare Pointers instruct compP_iRegP(flagsRegP pcc, iRegP op1, iRegP op2 ) %{ match(Set pcc (CmpP op1 op2)); @@ -9312,6 +9353,44 @@ ins_pipe(cmp_br_reg_imm); %} +instruct cmpUL_reg_branch(cmpOpU cmp, iRegL op1, iRegL op2, label labl, flagsRegUL xcc) %{ + match(If cmp (CmpUL op1 op2)); + effect(USE labl, KILL xcc); + + size(12); + ins_cost(BRANCH_COST); + format %{ "CMP $op1,$op2\t! unsigned long\n\t" + "BP$cmp $labl" %} + ins_encode %{ + Label* L = $labl$$label; + Assembler::Predict predict_taken = + cbuf.is_backward_branch(*L) ? Assembler::pt : Assembler::pn; + __ cmp($op1$$Register, $op2$$Register); + __ bp((Assembler::Condition)($cmp$$cmpcode), false, Assembler::xcc, predict_taken, *L); + __ delayed()->nop(); + %} + ins_pipe(cmp_br_reg_reg); +%} + +instruct cmpUL_imm_branch(cmpOpU cmp, iRegL op1, immL5 op2, label labl, flagsRegUL xcc) %{ + match(If cmp (CmpUL op1 op2)); + effect(USE labl, KILL xcc); + + size(12); + ins_cost(BRANCH_COST); + format %{ "CMP $op1,$op2\t! unsigned long\n\t" + "BP$cmp $labl" %} + ins_encode %{ + Label* L = $labl$$label; + Assembler::Predict predict_taken = + cbuf.is_backward_branch(*L) ? Assembler::pt : Assembler::pn; + __ cmp($op1$$Register, $op2$$constant); + __ bp((Assembler::Condition)($cmp$$cmpcode), false, Assembler::xcc, predict_taken, *L); + __ delayed()->nop(); + %} + ins_pipe(cmp_br_reg_imm); +%} + instruct cmpL_reg_branch(cmpOp cmp, iRegL op1, iRegL op2, label labl, flagsRegL xcc) %{ match(If cmp (CmpL op1 op2)); effect(USE labl, KILL xcc); @@ -9540,6 +9619,42 @@ ins_pipe(cbcond_reg_imm); %} +instruct cmpUL_reg_branch_short(cmpOpU cmp, iRegL op1, iRegL op2, label labl, flagsRegUL xcc) %{ + match(If cmp (CmpUL op1 op2)); + predicate(UseCBCond); + effect(USE labl, KILL xcc); + + size(4); + ins_cost(BRANCH_COST); + format %{ "CXB$cmp $op1,$op2,$labl\t! unsigned long" %} + ins_encode %{ + Label* L = $labl$$label; + assert(__ use_cbcond(*L), "back to back cbcond"); + __ cbcond((Assembler::Condition)($cmp$$cmpcode), Assembler::xcc, $op1$$Register, $op2$$Register, *L); + %} + ins_short_branch(1); + ins_avoid_back_to_back(AVOID_BEFORE_AND_AFTER); + ins_pipe(cbcond_reg_reg); +%} + +instruct cmpUL_imm_branch_short(cmpOpU cmp, iRegL op1, immL5 op2, label labl, flagsRegUL xcc) %{ + match(If cmp (CmpUL op1 op2)); + predicate(UseCBCond); + effect(USE labl, KILL xcc); + + size(4); + ins_cost(BRANCH_COST); + format %{ "CXB$cmp $op1,$op2,$labl\t! unsigned long" %} + ins_encode %{ + Label* L = $labl$$label; + assert(__ use_cbcond(*L), "back to back cbcond"); + __ cbcond((Assembler::Condition)($cmp$$cmpcode), Assembler::xcc, $op1$$Register, $op2$$constant, *L); + %} + ins_short_branch(1); + ins_avoid_back_to_back(AVOID_BEFORE_AND_AFTER); + ins_pipe(cbcond_reg_imm); From bugzilla-daemon at icedtea.classpath.org Thu Aug 3 16:20:06 2017 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 03 Aug 2017 16:20:06 +0000 Subject: [Bug 3431] [IcedTea7] Backport "8183551, CVE-2017-10074: AArch64: Image conversion improvements" In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3431 --- Comment #1 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=ad21f8170b18 author: aph date: Wed Aug 02 08:41:53 2017 +0100 8144028, PR3431: Use AArch64 bit-test instructions in C2 Reviewed-by: kvn -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Aug 3 16:20:14 2017 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 03 Aug 2017 16:20:14 +0000 Subject: [Bug 3431] [IcedTea7] Backport "8183551, CVE-2017-10074: AArch64: Image conversion improvements" In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3431 --- Comment #2 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=c8d9c145e76a author: fyang date: Wed Mar 23 18:00:46 2016 +0800 8152537, PR3431: aarch64: Make use of CBZ and CBNZ when comparing unsigned values with zero. Summary: aarch64: c2 make use of CBZ and CBNZ when comparing unsigned values with zero. Reviewed-by: aph -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Aug 3 16:20:20 2017 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 03 Aug 2017 16:20:20 +0000 Subject: [Bug 3431] [IcedTea7] Backport "8183551, CVE-2017-10074: AArch64: Image conversion improvements" In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3431 --- Comment #3 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=dd276016c8d1 author: roland date: Tue Jul 04 21:23:37 2017 +0100 8183551, PR3431: AArch64: Image conversion improvements -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From andrew at icedtea.classpath.org Thu Aug 3 16:20:37 2017 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 03 Aug 2017 16:20:37 +0000 Subject: /hg/release/icedtea7-forest-2.6/jdk: 57 new changesets Message-ID: changeset e2fb915afbd0 in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=e2fb915afbd0 author: andrew date: Tue Aug 01 13:31:34 2017 +0100 Added tag icedtea-2.6.11pre01 for changeset 5f11354f6257 changeset a9717ab00796 in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=a9717ab00796 author: alanb date: Fri Jul 07 15:59:03 2017 +0100 7117357: Warnings in sun.instrument, tools and other sun.* classes Reviewed-by: lancea, chegar changeset 848ccfd27743 in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=848ccfd27743 author: mchung date: Tue Jan 17 15:55:40 2012 -0800 7117570: Warnings in sun.mangement.* and its subpackages Reviewed-by: mchung, dsamersoff Contributed-by: kurchi.subhra.hazra at oracle.com changeset 4f24be04a422 in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=4f24be04a422 author: jbachorik date: Fri Jul 07 19:53:38 2017 +0100 8139870: sun.management.LazyCompositeData.isTypeMatched() fails for composite types with items of ArrayType Reviewed-by: dfuchs changeset c9d307e51b37 in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=c9d307e51b37 author: azvegint date: Thu Aug 11 13:22:51 2016 +0300 8155690: Update libPNG library to the latest up-to-date Reviewed-by: serb changeset acf72ae6145d in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=acf72ae6145d author: prr date: Wed Feb 12 11:36:38 2014 -0800 8031737: CHECK_NULL and CHECK_EXCEPTION macros cleanup Reviewed-by: rriggs, mchung, mduigou changeset d127560ad6ff in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=d127560ad6ff author: prr date: Fri Feb 14 10:14:11 2014 -0800 8034912: backport of 8031737 to jdk8u breaks linux buld. Reviewed-by: mchung changeset 986500b85859 in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=986500b85859 author: pchelko date: Tue Jul 11 21:06:17 2017 +0100 8030787: [Parfait] JNI-related warnings from b119 for jdk/src/share/native/sun/awt/image Reviewed-by: serb, prr changeset 98b0dbc4bc08 in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=98b0dbc4bc08 author: pchelko date: Thu Mar 13 15:33:43 2014 +0400 8037287: Windows build failed after JDK-8030787 Reviewed-by: serb, bagiras changeset 03a56cf98284 in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=03a56cf98284 author: goetz date: Thu Feb 20 15:03:10 2014 +0100 8030875: Macros for checking and returning on exceptions Summary: Add missing 8030875 changes in 8u Reviewed-by: mchung, kvn changeset 366c03690390 in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=366c03690390 author: jdv date: Thu Oct 06 09:19:32 2016 -0700 8162461: Hang due to JNI up-call made whilst holding JNI critical lock Reviewed-by: prr, aghaisas changeset 28459ff19e0d in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=28459ff19e0d author: smarks date: Wed Jul 12 03:18:46 2017 +0100 8022440: suppress deprecation warnings in sun.rmi Reviewed-by: mduigou changeset aac0cba4d82e in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=aac0cba4d82e author: coffeys date: Thu Jul 13 05:15:10 2017 +0100 8163958: Improved garbage collection Reviewed-by: rriggs changeset eeb56f4c36b1 in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=eeb56f4c36b1 author: horii date: Wed Sep 14 22:11:54 2016 -0400 8165231: java.nio.Bits.unaligned() doesn't return true on ppc Reviewed-by: simonis, coffeys changeset b765de0cf211 in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=b765de0cf211 author: bgopularam date: Wed May 24 02:25:28 2017 -0700 8165367: Additional tests for JEP 288: Disable SHA-1 Certificates Summary: The new tests just focus on the usage constraints TLSSever and TLSClient with TLS communication Reviewed-by: ascarpino changeset 4f11e3edecf9 in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=4f11e3edecf9 author: prr date: Fri Jul 14 15:42:34 2017 +0100 8167228: Update to libpng 1.6.28 Reviewed-by: serb, azvegint changeset d76d9a9720ef in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=d76d9a9720ef author: prr date: Fri Mar 17 16:41:06 2017 -0700 8169209: Improved image post-processing steps Reviewed-by: serb, vadim, mschoene changeset acd986bf1ba5 in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=acd986bf1ba5 author: igerasim date: Thu Jul 13 22:44:24 2017 +0100 8169392: Additional jar validation steps Reviewed-by: mullan, herrick, ahgross changeset b37777c2c9c5 in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=b37777c2c9c5 author: smarks date: Sun Feb 12 21:56:24 2012 -0800 7143230: fix warnings in java.util.jar, sun.tools.jar, zipfs demo, etc. Reviewed-by: alanb, chegar, lancea, smarks Contributed-by: Mani Sarkar , Michael Barker , Carl Jokl , Dinuk Weerasinghe , Markus Stoy , Tom Anderson changeset f2a67bbbcb99 in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=f2a67bbbcb99 author: hseigel date: Wed Dec 21 10:15:49 2016 -0500 8170966: Right parenthesis issue Reviewed-by: acorn, ctornqvi, mschoene Contributed-by: harold.seigel at oracle.com changeset a13bafb05072 in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=a13bafb05072 author: igerasim date: Fri Jul 14 04:40:15 2017 +0100 8172204: Better Thread Pool execution Reviewed-by: alanb, skoivu, rriggs changeset f014749131f6 in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=f014749131f6 author: prr date: Fri Jul 14 04:55:25 2017 +0100 8172461: Service Registration Lifecycle Reviewed-by: serb, vadim, skoivu, shurailine changeset 8f40b239d609 in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=8f40b239d609 author: bpb date: Fri Jul 14 05:21:12 2017 +0100 8172465: Better handling of channel groups Reviewed-by: alanb, coffeys, skoivu, rhalade, chegar changeset d4a33ff7f1dd in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=d4a33ff7f1dd author: aefimov date: Fri Jul 14 17:32:08 2017 +0100 8173286: Better reading of text catalogs Reviewed-by: joehw, dfuchs, skoivu, rhalade changeset 9976ce1ff903 in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=9976ce1ff903 author: smarks date: Fri Jul 14 17:42:44 2017 +0100 8173697: Less Active Activations Reviewed-by: skoivu, rhalade, rriggs, chegar, coffeys changeset 79f9ef695052 in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=79f9ef695052 author: prr date: Fri Jul 14 18:21:30 2017 +0100 8174098: Better image fetching Reviewed-by: serb, vadim, skoivu changeset a632a29f0478 in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=a632a29f0478 author: rpatil date: Wed Mar 15 14:14:57 2017 +0530 8174105: Better naming attribution Reviewed-by: chegar, dfuchs, rriggs, vtewari changeset 3cf8f6451be3 in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=3cf8f6451be3 author: robm date: Fri Jul 14 18:46:12 2017 +0100 8174113: Better sourcing of code Reviewed-by: weijun changeset 8f1c0d565d13 in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=8f1c0d565d13 author: adinn date: Sat Jul 15 21:26:47 2017 +0100 8174729: Race Condition in java.lang.reflect.WeakCache Summary: Race can occur between Proxy.getProxyClass and Proxy.isProxyClass Reviewed-by: mchung changeset 0e846618238e in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=0e846618238e author: robm date: Sun Jul 16 00:29:10 2017 +0100 8174770: Check registry registration location Reviewed-by: rriggs changeset fbe9c6c3e78c in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=fbe9c6c3e78c author: igerasim date: Tue Jul 18 00:17:03 2017 +0100 8174873: Improved certificate procesing Reviewed-by: jnimeh, ahgross, rhalade changeset 8f032f02516a in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=8f032f02516a author: robm date: Thu May 18 22:52:38 2017 +0100 8175106: Higher quality DSA operations Reviewed-by: xuelei, apetcher changeset e9869356eb8a in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=e9869356eb8a author: robm date: Wed May 24 17:35:54 2017 +0100 8175110: Higher quality ECDSA operations Reviewed-by: xuelei, apetcher changeset f6daf5edd956 in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=f6daf5edd956 author: alexp date: Thu Apr 21 17:08:50 2016 +0300 8143377: Test PKCS8Test.java fails Reviewed-by: coffeys Contributed-by: artem.kosarev at oracle.com changeset d4e4af750774 in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=d4e4af750774 author: igerasim date: Tue Jul 18 06:14:47 2017 +0100 8175251: Failed to load RSA private key from pkcs12 Summary: Enhanced DER library with extra arg to control leading-0 check Reviewed-by: mullan changeset c54643d2a32b in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=c54643d2a32b author: shshahma date: Tue Jul 18 06:45:42 2017 +0100 8176055: JMX diagnostic improvements Reviewed-by: dfuchs, mchung, ahgross, rhalade, jwilhelm changeset fe453cb558d3 in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=fe453cb558d3 author: coffeys date: Mon Apr 11 08:00:21 2016 +0100 8149450: LdapCtx.processReturnCode() throwing Null Pointer Exception Reviewed-by: xuelei changeset 4092c1c94820 in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=4092c1c94820 author: aefimov date: Tue Jul 18 20:29:30 2017 +0100 8176067: Proper directory lookup processing Reviewed-by: weijun changeset 4ae0ef9be3ac in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=4ae0ef9be3ac author: igerasim date: Thu Mar 30 22:29:57 2017 -0700 8176760: Better handling of PKCS8 material Reviewed-by: ascarpino, ahgross changeset 5ccb8bdab06c in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=5ccb8bdab06c author: igerasim date: Wed Mar 15 10:58:05 2017 -0700 8176769: Remove accidental spec change in jdk8u Reviewed-by: chegar changeset a2a339770678 in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=a2a339770678 author: igerasim date: Tue May 23 11:30:25 2017 -0700 8178135: Additional elliptic curve support Reviewed-by: mullan changeset fa22e8668c4d in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=fa22e8668c4d author: azvegint date: Mon Jul 24 14:14:10 2017 +0100 8178996: [macos] JComboBox doesn't display popup in mixed JavaFX Swing Application on 8u131 and Mac OS 10.12 Reviewed-by: serb, ssadetsky changeset 851cd45750d2 in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=851cd45750d2 author: alexsch date: Mon Jul 24 14:23:48 2017 +0100 8035629: [parfait] JNI exc pending in jdk/src/windows/native/sun/windows/ShellFolder2.cpp Reviewed-by: serb, pchelko changeset 02e2b83365a6 in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=02e2b83365a6 author: serb date: Mon Jul 24 14:26:23 2017 +0100 8080492: [Parfait] Uninitialised variable in jdk/src/java/desktop/windows/native/libawt/ Reviewed-by: prr, vadim changeset 084e64d9d62d in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=084e64d9d62d author: pkbalakr date: Mon Jul 24 14:34:53 2017 +0100 8179014: JFileChooser with Windows look and feel crashes on win 10 Reviewed-by: serb, prr changeset 2ca4c6bfce3a in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=2ca4c6bfce3a author: rriggs date: Mon Jul 24 18:47:53 2017 +0100 8156804: Better constraint checking Summary: Sync with upstream version Reviewed-by: dfuchs, ahgross changeset 085ef4fafefb in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=085ef4fafefb author: aefimov date: Thu Jun 01 15:45:33 2017 +0100 8180582: The bind to rmiregistry is rejected by registryFilter even though registryFilter is set Summary: The Registry MAXDEPTH should allow binding more complex objects Reviewed-by: dfuchs, smarks changeset 4549e025778c in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=4549e025778c author: ljiang date: Mon Jul 24 19:28:56 2017 +0100 8181591: 8u141 L10n resource file update Reviewed-by: coffeys changeset 330cce590879 in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=330cce590879 author: rpatil date: Mon Apr 10 16:17:00 2017 +0530 8177449: (tz) Support tzdata2017b Reviewed-by: martin, naoto changeset a6d3c4449a8a in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=a6d3c4449a8a author: mcherkas date: Tue Feb 07 19:54:46 2017 +0300 8173145: Menu is activated after using mnemonic Alt/Key combination Reviewed-by: serb, ssadetsky changeset dd5b6b40726c in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=dd5b6b40726c author: psandoz date: Tue Jul 25 03:29:17 2017 +0100 8184119: Incorrect return processing for the LF editor of MethodHandles.permuteArguments Reviewed-by: jrose, redestad, vlivanov changeset 871e3350966f in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=871e3350966f author: igerasim date: Fri Jul 21 20:03:30 2017 -0700 8184993: Jar file verification failing with SecurityException: digest missing xxx Reviewed-by: sherman, mullan changeset da1c09ab9b74 in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=da1c09ab9b74 author: andrew date: Tue Aug 01 14:12:33 2017 +0100 Added tag jdk7u151-b00 for changeset 871e3350966f changeset 9f7b8fb4edd4 in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=9f7b8fb4edd4 author: andrew date: Wed Aug 02 02:33:07 2017 +0100 Merge jdk7u151-b00 changeset ad08fea7cd1a in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=ad08fea7cd1a author: andrew date: Thu Aug 03 07:28:01 2017 +0100 Added tag jdk7u151-b01 for changeset da1c09ab9b74 changeset e7911076eff3 in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=e7911076eff3 author: andrew date: Thu Aug 03 17:03:28 2017 +0100 Merge jdk7u151-b01 changeset 082c6e8b8812 in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=082c6e8b8812 author: andrew date: Thu Aug 03 17:21:57 2017 +0100 Bump to icedtea-2.6.11 diffstat: .hgtags | 3 + make/jdk_generic_profile.sh | 2 +- make/sun/javazic/tzdata/VERSION | 2 +- make/sun/javazic/tzdata/africa | 25 +- make/sun/javazic/tzdata/iso3166.tab | 4 +- make/sun/javazic/tzdata/northamerica | 8 + make/sun/rmi/rmi/Makefile | 36 +- make/sun/splashscreen/FILES_c.gmk | 6 +- src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java | 15 +- src/share/classes/com/sun/accessibility/internal/resources/accessibility_sv.properties | 2 +- src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java | 17 +- src/share/classes/com/sun/java/swing/plaf/windows/WindowsRootPaneUI.java | 7 +- src/share/classes/com/sun/jndi/ldap/LdapClient.java | 3 +- src/share/classes/com/sun/jndi/ldap/LdapCtx.java | 25 +- src/share/classes/com/sun/jndi/ldap/LdapReferralException.java | 17 +- src/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java | 5 +- src/share/classes/java/lang/invoke/LambdaForm.java | 6 +- src/share/classes/java/rmi/activation/ActivationID.java | 38 +- src/share/classes/java/security/CodeSource.java | 11 +- src/share/classes/java/util/concurrent/ThreadPoolExecutor.java | 25 +- src/share/classes/java/util/jar/Attributes.java | 14 +- src/share/classes/java/util/jar/JarVerifier.java | 129 +- src/share/classes/java/util/zip/ZipFile.java | 21 +- src/share/classes/javax/imageio/spi/ServiceRegistry.java | 26 +- src/share/classes/javax/naming/directory/BasicAttribute.java | 4 +- src/share/classes/sun/awt/image/ImageWatched.java | 35 +- src/share/classes/sun/awt/resources/awt_sv.properties | 2 +- src/share/classes/sun/instrument/InstrumentationImpl.java | 14 +- src/share/classes/sun/instrument/TransformerManager.java | 2 +- src/share/classes/sun/launcher/resources/launcher_es.properties | 4 +- src/share/classes/sun/launcher/resources/launcher_sv.properties | 4 +- src/share/classes/sun/management/Agent.java | 16 +- src/share/classes/sun/management/ConnectorAddressLink.java | 16 +- src/share/classes/sun/management/Flag.java | 2 +- src/share/classes/sun/management/GarbageCollectionNotifInfoCompositeData.java | 12 +- src/share/classes/sun/management/GarbageCollectorImpl.java | 9 +- src/share/classes/sun/management/GcInfoBuilder.java | 2 +- src/share/classes/sun/management/GcInfoCompositeData.java | 29 +- src/share/classes/sun/management/HotSpotDiagnostic.java | 19 +- src/share/classes/sun/management/HotspotCompilation.java | 14 +- src/share/classes/sun/management/HotspotThread.java | 2 +- src/share/classes/sun/management/LazyCompositeData.java | 81 +- src/share/classes/sun/management/ManagementFactoryHelper.java | 6 +- src/share/classes/sun/management/MappedMXBeanType.java | 66 +- src/share/classes/sun/management/MonitorInfoCompositeData.java | 2 +- src/share/classes/sun/management/NotificationEmitterSupport.java | 12 +- src/share/classes/sun/management/RuntimeImpl.java | 2 +- src/share/classes/sun/management/ThreadInfoCompositeData.java | 2 +- src/share/classes/sun/management/counter/perf/PerfInstrumentation.java | 15 +- src/share/classes/sun/management/jmxremote/ConnectorBootstrap.java | 44 +- src/share/classes/sun/management/jmxremote/SingleEntryRegistry.java | 25 +- src/share/classes/sun/management/resources/agent_sv.properties | 12 +- src/share/classes/sun/management/snmp/AdaptorBootstrap.java | 7 +- src/share/classes/sun/management/snmp/jvminstr/JVM_MANAGEMENT_MIB_IMPL.java | 10 +- src/share/classes/sun/management/snmp/jvminstr/JvmMemGCTableMetaImpl.java | 2 + src/share/classes/sun/management/snmp/jvminstr/JvmMemManagerTableMetaImpl.java | 11 +- src/share/classes/sun/management/snmp/jvminstr/JvmMemMgrPoolRelTableMetaImpl.java | 22 +- src/share/classes/sun/management/snmp/jvminstr/JvmMemPoolTableMetaImpl.java | 11 +- src/share/classes/sun/management/snmp/jvminstr/JvmMemoryImpl.java | 2 +- src/share/classes/sun/management/snmp/jvminstr/JvmMemoryMetaImpl.java | 2 + src/share/classes/sun/management/snmp/jvminstr/JvmOSImpl.java | 2 + src/share/classes/sun/management/snmp/jvminstr/JvmRTBootClassPathEntryImpl.java | 2 + src/share/classes/sun/management/snmp/jvminstr/JvmRTBootClassPathTableMetaImpl.java | 5 +- src/share/classes/sun/management/snmp/jvminstr/JvmRTClassPathEntryImpl.java | 1 + src/share/classes/sun/management/snmp/jvminstr/JvmRTClassPathTableMetaImpl.java | 5 +- src/share/classes/sun/management/snmp/jvminstr/JvmRTInputArgsEntryImpl.java | 1 + src/share/classes/sun/management/snmp/jvminstr/JvmRTInputArgsTableMetaImpl.java | 5 +- src/share/classes/sun/management/snmp/jvminstr/JvmRTLibraryPathEntryImpl.java | 1 + src/share/classes/sun/management/snmp/jvminstr/JvmRTLibraryPathTableMetaImpl.java | 4 +- src/share/classes/sun/management/snmp/jvminstr/JvmRuntimeMetaImpl.java | 1 + src/share/classes/sun/management/snmp/jvminstr/JvmThreadInstanceEntryImpl.java | 2 + src/share/classes/sun/management/snmp/jvminstr/JvmThreadInstanceTableMetaImpl.java | 9 +- src/share/classes/sun/management/snmp/jvminstr/JvmThreadingMetaImpl.java | 2 + src/share/classes/sun/management/snmp/jvmmib/EnumJvmClassesVerboseLevel.java | 9 +- src/share/classes/sun/management/snmp/jvmmib/EnumJvmJITCompilerTimeMonitoring.java | 9 +- src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemManagerState.java | 10 +- src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemPoolCollectThreshdSupport.java | 9 +- src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemPoolState.java | 9 +- src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemPoolThreshdSupport.java | 9 +- src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemPoolType.java | 9 +- src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemoryGCCall.java | 9 +- src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemoryGCVerboseLevel.java | 9 +- src/share/classes/sun/management/snmp/jvmmib/EnumJvmRTBootClassPathSupport.java | 9 +- src/share/classes/sun/management/snmp/jvmmib/EnumJvmThreadContentionMonitoring.java | 9 +- src/share/classes/sun/management/snmp/jvmmib/EnumJvmThreadCpuTimeMonitoring.java | 9 +- src/share/classes/sun/management/snmp/jvmmib/JVM_MANAGEMENT_MIB.java | 1 + src/share/classes/sun/management/snmp/jvmmib/JVM_MANAGEMENT_MIBOidTable.java | 1 + src/share/classes/sun/management/snmp/jvmmib/JvmClassLoadingMeta.java | 1 + src/share/classes/sun/management/snmp/jvmmib/JvmCompilationMeta.java | 1 + src/share/classes/sun/management/snmp/jvmmib/JvmMemGCEntryMeta.java | 1 + src/share/classes/sun/management/snmp/jvmmib/JvmMemGCTableMeta.java | 1 + src/share/classes/sun/management/snmp/jvmmib/JvmMemManagerEntryMeta.java | 1 + src/share/classes/sun/management/snmp/jvmmib/JvmMemManagerTableMeta.java | 1 + src/share/classes/sun/management/snmp/jvmmib/JvmMemMgrPoolRelEntryMeta.java | 1 + src/share/classes/sun/management/snmp/jvmmib/JvmMemMgrPoolRelTableMeta.java | 1 + src/share/classes/sun/management/snmp/jvmmib/JvmMemPoolEntryMeta.java | 1 + src/share/classes/sun/management/snmp/jvmmib/JvmMemPoolTableMeta.java | 2 + src/share/classes/sun/management/snmp/jvmmib/JvmOSMeta.java | 2 + src/share/classes/sun/management/snmp/jvmmib/JvmRTBootClassPathEntryMeta.java | 1 + src/share/classes/sun/management/snmp/jvmmib/JvmRTBootClassPathTableMeta.java | 1 + src/share/classes/sun/management/snmp/jvmmib/JvmRTClassPathEntryMeta.java | 1 + src/share/classes/sun/management/snmp/jvmmib/JvmRTClassPathTableMeta.java | 1 + src/share/classes/sun/management/snmp/jvmmib/JvmRTInputArgsEntryMeta.java | 1 + src/share/classes/sun/management/snmp/jvmmib/JvmRTInputArgsTableMeta.java | 1 + src/share/classes/sun/management/snmp/jvmmib/JvmRTLibraryPathEntryMeta.java | 1 + src/share/classes/sun/management/snmp/jvmmib/JvmRTLibraryPathTableMeta.java | 1 + src/share/classes/sun/management/snmp/jvmmib/JvmRuntimeMeta.java | 1 + src/share/classes/sun/management/snmp/jvmmib/JvmThreadInstanceEntryMeta.java | 1 + src/share/classes/sun/management/snmp/jvmmib/JvmThreadInstanceTableMeta.java | 1 + src/share/classes/sun/management/snmp/jvmmib/JvmThreadingMeta.java | 1 + src/share/classes/sun/management/snmp/util/MibLogger.java | 8 +- src/share/classes/sun/management/snmp/util/SnmpListTableCache.java | 10 +- src/share/classes/sun/management/snmp/util/SnmpNamedListTableCache.java | 26 +- src/share/classes/sun/management/snmp/util/SnmpTableCache.java | 2 +- src/share/classes/sun/net/RegisteredDomain.java | 8 +- src/share/classes/sun/net/www/protocol/jar/Handler.java | 1 + src/share/classes/sun/nio/ch/AsynchronousChannelGroupImpl.java | 20 +- src/share/classes/sun/rmi/registry/RegistryImpl.java | 143 +- src/share/classes/sun/rmi/registry/RegistryImpl_Skel.java | 177 + src/share/classes/sun/rmi/registry/RegistryImpl_Stub.java | 189 + src/share/classes/sun/rmi/runtime/Log.java | 3 +- src/share/classes/sun/rmi/server/ActivatableRef.java | 3 +- src/share/classes/sun/rmi/server/Activation.java | 69 +- src/share/classes/sun/rmi/server/Dispatcher.java | 3 +- src/share/classes/sun/rmi/server/LoaderHandler.java | 3 +- src/share/classes/sun/rmi/server/UnicastRef.java | 17 +- src/share/classes/sun/rmi/server/UnicastServerRef.java | 112 +- src/share/classes/sun/rmi/server/Util.java | 3 +- src/share/classes/sun/rmi/transport/ConnectionInputStream.java | 10 +- src/share/classes/sun/rmi/transport/DGCClient.java | 10 + src/share/classes/sun/rmi/transport/DGCImpl.java | 75 +- src/share/classes/sun/rmi/transport/DGCImpl_Skel.java | 112 + src/share/classes/sun/rmi/transport/DGCImpl_Stub.java | 192 + src/share/classes/sun/rmi/transport/StreamRemoteCall.java | 10 +- src/share/classes/sun/rmi/transport/Transport.java | 1 + src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java | 3 +- src/share/classes/sun/rmi/transport/tcp/ConnectionMultiplexer.java | 3 +- src/share/classes/sun/rmi/transport/tcp/TCPTransport.java | 1 + src/share/classes/sun/security/ec/ECDSASignature.java | 22 +- src/share/classes/sun/security/pkcs/PKCS8Key.java | 16 +- src/share/classes/sun/security/provider/DSA.java | 57 +- src/share/classes/sun/security/provider/certpath/ldap/LDAPCertStore.java | 4 +- src/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java | 45 +- src/share/classes/sun/security/rsa/RSAPublicKeyImpl.java | 6 +- src/share/classes/sun/security/tools/keytool/Resources_sv.java | 16 +- src/share/classes/sun/security/tools/policytool/Resources_sv.java | 6 +- src/share/classes/sun/security/util/AuthResources_sv.java | 4 +- src/share/classes/sun/security/util/DerInputBuffer.java | 22 +- src/share/classes/sun/security/util/DerInputStream.java | 60 +- src/share/classes/sun/security/util/DerValue.java | 63 +- src/share/classes/sun/security/util/HostnameChecker.java | 42 +- src/share/classes/sun/security/util/ManifestEntryVerifier.java | 9 +- src/share/classes/sun/security/util/Resources_sv.java | 18 +- src/share/classes/sun/tools/attach/HotSpotAttachProvider.java | 48 +- src/share/classes/sun/tools/jar/CommandLine.java | 8 +- src/share/classes/sun/tools/jar/Manifest.java | 14 +- src/share/classes/sun/tools/jar/SignatureFile.java | 26 +- src/share/classes/sun/tools/jinfo/JInfo.java | 4 +- src/share/classes/sun/tools/jmap/JMap.java | 4 +- src/share/classes/sun/tools/jps/Jps.java | 6 +- src/share/classes/sun/tools/jstack/JStack.java | 2 +- src/share/classes/sun/tools/serialver/SerialVer.java | 18 +- src/share/demo/management/MemoryMonitor/MemoryMonitor.java | 14 +- src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileStore.java | 2 +- src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java | 4 +- src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java | 2 +- src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipInfo.java | 4 +- src/share/lib/security/java.security-linux | 16 +- src/share/lib/security/java.security-macosx | 12 +- src/share/lib/security/java.security-solaris | 16 +- src/share/lib/security/java.security-windows | 16 +- src/share/native/com/sun/java/util/jar/pack/coding.cpp | 4 +- src/share/native/com/sun/java/util/jar/pack/defines.h | 4 - src/share/native/common/check_code.c | 40 +- src/share/native/common/jni_util.h | 32 + src/share/native/java/net/net_util.h | 3 - src/share/native/sun/awt/image/BufImgSurfaceData.c | 30 +- src/share/native/sun/awt/image/DataBufferNative.c | 4 +- src/share/native/sun/awt/image/awt_ImageRep.c | 12 +- src/share/native/sun/awt/image/awt_parseImage.c | 78 +- src/share/native/sun/awt/image/gif/gifdecoder.c | 18 +- src/share/native/sun/awt/image/imageInitIDs.c | 250 +- src/share/native/sun/awt/image/jpeg/imageioJPEG.c | 290 +- src/share/native/sun/awt/image/jpeg/jpegdecoder.c | 18 +- src/share/native/sun/awt/libpng/CHANGES | 379 +- src/share/native/sun/awt/libpng/LICENSE | 35 +- src/share/native/sun/awt/libpng/README | 5 +- src/share/native/sun/awt/libpng/png.c | 536 +- src/share/native/sun/awt/libpng/png.h | 384 +- src/share/native/sun/awt/libpng/pngconf.h | 50 +- src/share/native/sun/awt/libpng/pngdebug.h | 2 +- src/share/native/sun/awt/libpng/pngerror.c | 74 +- src/share/native/sun/awt/libpng/pngget.c | 74 +- src/share/native/sun/awt/libpng/pnginfo.h | 2 +- src/share/native/sun/awt/libpng/pnglibconf.h | 22 +- src/share/native/sun/awt/libpng/pngmem.c | 22 +- src/share/native/sun/awt/libpng/pngpread.c | 46 +- src/share/native/sun/awt/libpng/pngpriv.h | 275 +- src/share/native/sun/awt/libpng/pngread.c | 445 +- src/share/native/sun/awt/libpng/pngrio.c | 6 +- src/share/native/sun/awt/libpng/pngrtran.c | 96 +- src/share/native/sun/awt/libpng/pngrutil.c | 335 +- src/share/native/sun/awt/libpng/pngset.c | 304 +- src/share/native/sun/awt/libpng/pngstruct.h | 10 +- src/share/native/sun/awt/libpng/pngtest.c | 2101 ------- src/share/native/sun/awt/libpng/pngtrans.c | 15 +- src/share/native/sun/awt/libpng/pngwio.c | 196 - src/share/native/sun/awt/libpng/pngwrite.c | 2258 -------- src/share/native/sun/awt/libpng/pngwtran.c | 604 -- src/share/native/sun/awt/libpng/pngwutil.c | 2737 ---------- src/share/native/sun/misc/Version.c | 10 + src/share/native/sun/security/ec/ECC_JNI.cpp | 6 +- src/share/native/sun/security/ec/ecc_impl.h | 6 +- src/share/native/sun/security/ec/impl/ec.c | 38 +- src/share/native/sun/security/ec/impl/ec2.h | 5 +- src/share/native/sun/security/ec/impl/ec2_aff.c | 6 +- src/share/native/sun/security/ec/impl/ec2_mont.c | 9 +- src/share/native/sun/security/ec/impl/ecl-priv.h | 14 +- src/share/native/sun/security/ec/impl/ecl.h | 8 +- src/share/native/sun/security/ec/impl/ecl_mult.c | 34 +- src/share/native/sun/security/ec/impl/ecp.h | 13 +- src/share/native/sun/security/ec/impl/ecp_aff.c | 6 +- src/share/native/sun/security/ec/impl/ecp_jac.c | 18 +- src/share/native/sun/security/ec/impl/ecp_jm.c | 74 +- src/windows/native/sun/java2d/d3d/D3DBlitLoops.cpp | 8 +- src/windows/native/sun/java2d/d3d/D3DTextRenderer.cpp | 4 +- src/windows/native/sun/windows/ShellFolder2.cpp | 41 +- src/windows/native/sun/windows/awt_Component.cpp | 4 + src/windows/native/sun/windows/awt_DesktopProperties.cpp | 4 +- src/windows/native/sun/windows/awt_Font.cpp | 8 +- src/windows/native/sun/windows/awt_Frame.cpp | 6 +- src/windows/native/sun/windows/awt_Label.cpp | 9 +- src/windows/native/sun/windows/awt_PrintJob.cpp | 4 +- src/windows/native/sun/windows/awt_TextComponent.cpp | 3 +- test/com/sun/java/swing/plaf/windows/Test8173145.java | 123 + test/java/lang/invoke/PermuteArgsReturnVoidTest.java | 90 + test/java/rmi/registry/serialFilter/RegistryFilterTest.java | 242 + test/java/util/zip/ZipFile/ReadZip.java | 48 +- test/javax/swing/JFileChooser/GodMode/JFileChooserTest.java | 191 + test/sun/management/LazyCompositeDataTest.java | 163 + test/sun/security/pkcs/pkcs8/PKCS8Test.java | 39 +- test/sun/security/pkcs/pkcs8/TestLeadingZeros.java | 82 + test/sun/security/ssl/CertPathRestrictions/JSSEClient.java | 66 + test/sun/security/ssl/CertPathRestrictions/JSSEServer.java | 81 + test/sun/security/ssl/CertPathRestrictions/TLSRestrictions.java | 541 + test/sun/security/ssl/CertPathRestrictions/certs/END_ENTITY_SHA1-INTER_CA_SHA256-ROOT_CA_SHA256-PRIV.key | 26 + test/sun/security/ssl/CertPathRestrictions/certs/END_ENTITY_SHA1-INTER_CA_SHA256-ROOT_CA_SHA256.cer | 81 + test/sun/security/ssl/CertPathRestrictions/certs/END_ENTITY_SHA256-INTER_CA_SHA1-ROOT_CA_SHA1-PRIV.key | 26 + test/sun/security/ssl/CertPathRestrictions/certs/END_ENTITY_SHA256-INTER_CA_SHA1-ROOT_CA_SHA1.cer | 81 + test/sun/security/ssl/CertPathRestrictions/certs/END_ENTITY_SHA256-INTER_CA_SHA1-ROOT_CA_SHA256-PRIV.key | 26 + test/sun/security/ssl/CertPathRestrictions/certs/END_ENTITY_SHA256-INTER_CA_SHA1-ROOT_CA_SHA256.cer | 81 + test/sun/security/ssl/CertPathRestrictions/certs/END_ENTITY_SHA256-INTER_CA_SHA256-ROOT_CA_SHA1-PRIV.key | 26 + test/sun/security/ssl/CertPathRestrictions/certs/END_ENTITY_SHA256-INTER_CA_SHA256-ROOT_CA_SHA1.cer | 81 + test/sun/security/ssl/CertPathRestrictions/certs/END_ENTITY_SHA256-INTER_CA_SHA256-ROOT_CA_SHA256-PRIV.key | 26 + test/sun/security/ssl/CertPathRestrictions/certs/END_ENTITY_SHA256-INTER_CA_SHA256-ROOT_CA_SHA256.cer | 81 + test/sun/security/ssl/CertPathRestrictions/certs/INTER_CA_SHA1-ROOT_CA_SHA1-PRIV.key | 26 + test/sun/security/ssl/CertPathRestrictions/certs/INTER_CA_SHA1-ROOT_CA_SHA1.cer | 80 + test/sun/security/ssl/CertPathRestrictions/certs/INTER_CA_SHA1-ROOT_CA_SHA256-PRIV.key | 26 + test/sun/security/ssl/CertPathRestrictions/certs/INTER_CA_SHA1-ROOT_CA_SHA256.cer | 80 + test/sun/security/ssl/CertPathRestrictions/certs/INTER_CA_SHA256-ROOT_CA_SHA1-PRIV.key | 26 + test/sun/security/ssl/CertPathRestrictions/certs/INTER_CA_SHA256-ROOT_CA_SHA1.cer | 80 + test/sun/security/ssl/CertPathRestrictions/certs/INTER_CA_SHA256-ROOT_CA_SHA256-PRIV.key | 26 + test/sun/security/ssl/CertPathRestrictions/certs/INTER_CA_SHA256-ROOT_CA_SHA256.cer | 80 + test/sun/security/ssl/CertPathRestrictions/certs/ROOT_CA_SHA1-PRIV.key | 26 + test/sun/security/ssl/CertPathRestrictions/certs/ROOT_CA_SHA1.cer | 80 + test/sun/security/ssl/CertPathRestrictions/certs/ROOT_CA_SHA256-PRIV.key | 26 + test/sun/security/ssl/CertPathRestrictions/certs/ROOT_CA_SHA256.cer | 80 + 267 files changed, 7467 insertions(+), 10467 deletions(-) diffs (truncated from 27415 to 500 lines): diff -r 5f11354f6257 -r 082c6e8b8812 .hgtags --- a/.hgtags Mon Jun 19 11:52:01 2017 +0200 +++ b/.hgtags Thu Aug 03 17:21:57 2017 +0100 @@ -658,3 +658,6 @@ a319566e15f5611bae9cfda2696e8217020a9269 jdk7u141-b01 19a085e656145471455d7fbd648717f94281a729 jdk7u141-b02 11e15e5078285d0454cb087bf43c8cf4d43d98ef icedtea-2.6.10 +5f11354f6257afb5ad2c2055a2effc604a0a860b icedtea-2.6.11pre01 +871e3350966f67b95768a94c1854f1515cfa56ca jdk7u151-b00 +da1c09ab9b742fa77c0e667c2218b8d626432656 jdk7u151-b01 diff -r 5f11354f6257 -r 082c6e8b8812 make/jdk_generic_profile.sh --- a/make/jdk_generic_profile.sh Mon Jun 19 11:52:01 2017 +0200 +++ b/make/jdk_generic_profile.sh Thu Aug 03 17:21:57 2017 +0100 @@ -672,7 +672,7 @@ # IcedTea versioning export ICEDTEA_NAME="IcedTea" -export PACKAGE_VERSION="2.6.10" +export PACKAGE_VERSION="2.6.11" export DERIVATIVE_ID="${ICEDTEA_NAME} ${PACKAGE_VERSION}" echo "Building ${DERIVATIVE_ID}" diff -r 5f11354f6257 -r 082c6e8b8812 make/sun/javazic/tzdata/VERSION --- a/make/sun/javazic/tzdata/VERSION Mon Jun 19 11:52:01 2017 +0200 +++ b/make/sun/javazic/tzdata/VERSION Thu Aug 03 17:21:57 2017 +0100 @@ -21,4 +21,4 @@ # or visit www.oracle.com if you need additional information or have any # questions. # -tzdata2017a +tzdata2017b diff -r 5f11354f6257 -r 082c6e8b8812 make/sun/javazic/tzdata/africa --- a/make/sun/javazic/tzdata/africa Mon Jun 19 11:52:01 2017 +0200 +++ b/make/sun/javazic/tzdata/africa Thu Aug 03 17:21:57 2017 +0100 @@ -443,18 +443,25 @@ # See Africa/Johannesburg. # Liberia -# From Paul Eggert (2006-03-22): -# In 1972 Liberia was the last country to switch -# from a UTC offset that was not a multiple of 15 or 20 minutes. -# Howse reports that it was in honor of their president's birthday. -# Shank & Pottenger report the date as May 1, whereas Howse reports Jan; -# go with Shanks & Pottenger. -# For Liberia before 1972, Shanks & Pottenger report -0:44, whereas Howse and -# Whitman each report -0:44:30; go with the more precise figure. +# +# From Paul Eggert (2017-03-02): +# +# The Nautical Almanac for the Year 1970, p 264, is the source for -0:44:30. +# +# In 1972 Liberia was the last country to switch from a UTC offset +# that was not a multiple of 15 or 20 minutes. The 1972 change was on +# 1972-01-07, according to an entry dated 1972-01-04 on p 330 of: +# Presidential Papers: First year of the administration of +# President William R. Tolbert, Jr., July 23, 1971-July 31, 1972. +# Monrovia: Executive Mansion. +# +# Use the abbreviation "MMT" before 1972, as the more-accurate numeric +# abbreviation "-004430" would be one byte over the POSIX limit. +# # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Monrovia -0:43:08 - LMT 1882 -0:43:08 - MMT 1919 Mar # Monrovia Mean Time - -0:44:30 - -004430 1972 May + -0:44:30 - MMT 1972 Jan 7 # approximately MMT 0:00 - GMT ############################################################################### diff -r 5f11354f6257 -r 082c6e8b8812 make/sun/javazic/tzdata/iso3166.tab --- a/make/sun/javazic/tzdata/iso3166.tab Mon Jun 19 11:52:01 2017 +0200 +++ b/make/sun/javazic/tzdata/iso3166.tab Thu Aug 03 17:21:57 2017 +0100 @@ -32,8 +32,8 @@ # All text uses UTF-8 encoding. The columns of the table are as follows: # # 1. ISO 3166-1 alpha-2 country code, current as of -# ISO 3166-1 Newsletter VI-16 (2013-07-11). See: Updates on ISO 3166 -# http://www.iso.org/iso/home/standards/country_codes/updates_on_iso_3166.htm +# ISO 3166-1 N905 (2016-11-15). See: Updates on ISO 3166-1 +# http://isotc.iso.org/livelink/livelink/Open/16944257 # 2. The usual English name for the coded region, # chosen so that alphabetic sorting of subsets produces helpful lists. # This is not the same as the English name in the ISO 3166 tables. diff -r 5f11354f6257 -r 082c6e8b8812 make/sun/javazic/tzdata/northamerica --- a/make/sun/javazic/tzdata/northamerica Mon Jun 19 11:52:01 2017 +0200 +++ b/make/sun/javazic/tzdata/northamerica Thu Aug 03 17:21:57 2017 +0100 @@ -3162,6 +3162,12 @@ # http://www.vantbefinfo.com/changement-dheure-pas-pour-haiti/ # http://news.anmwe.com/haiti-lheure-nationale-ne-sera-ni-avancee-ni-reculee-cette-annee/ +# From Steffen Thorsen (2017-03-12): +# We have received 4 mails from different people telling that Haiti +# has started DST again today, and this source seems to confirm that, +# I have not been able to find a more authoritative source: +# https://www.haitilibre.com/en/news-20319-haiti-notices-time-change-in-haiti.html + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Haiti 1983 only - May 8 0:00 1:00 D Rule Haiti 1984 1987 - Apr lastSun 0:00 1:00 D @@ -3174,6 +3180,8 @@ Rule Haiti 2005 2006 - Oct lastSun 0:00 0 S Rule Haiti 2012 2015 - Mar Sun>=8 2:00 1:00 D Rule Haiti 2012 2015 - Nov Sun>=1 2:00 0 S +Rule Haiti 2017 max - Mar Sun>=8 2:00 1:00 D +Rule Haiti 2017 max - Nov Sun>=1 2:00 0 S # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone America/Port-au-Prince -4:49:20 - LMT 1890 -4:49 - PPMT 1917 Jan 24 12:00 # P-a-P MT diff -r 5f11354f6257 -r 082c6e8b8812 make/sun/rmi/rmi/Makefile --- a/make/sun/rmi/rmi/Makefile Mon Jun 19 11:52:01 2017 +0200 +++ b/make/sun/rmi/rmi/Makefile Thu Aug 03 17:21:57 2017 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1998, 2017, 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 @@ -52,16 +52,9 @@ include $(BUILDDIR)/common/Rules.gmk # -# Full package names of implementations requiring stubs -# -REMOTE_impls = \ - sun.rmi.registry.RegistryImpl \ - sun.rmi.transport.DGCImpl - -# # The java-rmi.cgi script in bin/ only gets delivered in certain situations # -BUILD_TARGETS = stubs +BUILD_TARGETS = ifeq ($(PLATFORM), linux) BUILD_TARGETS += bin endif @@ -75,29 +68,6 @@ clean clobber:: bin.clean - -# -# Compile stubs and skeletons for remote implementations -# (use -v1.1 for backward interoperability) -# -# gnumake 3.78.1 on windows attempts to build the target even -# though it exists. Not sure why, but a check for file existence -# has been added... -# -$(CLASSBINDIR)/%_Skel.class $(CLASSBINDIR)/%_Stub.class: $(CLASSBINDIR)/%.class - if [ ! -s $@ ] ; \ - then $(RMIC) -v1.1 -classpath \ - "$(CLASSBINDIR)" \ - -d $(CLASSBINDIR) '$(subst /,.,$(<:$(CLASSBINDIR)/%.class=%))' ; \ - fi - @$(java-vm-cleanup) - -REMOTE_files = $(subst .,/,$(REMOTE_impls)) -FILES_stubs = $(REMOTE_files:%=$(CLASSBINDIR)/%_Stub.class) -FILES_skels = $(REMOTE_files:%=$(CLASSBINDIR)/%_Skel.class) - -stubs: $(FILES_stubs) $(FILES_skels) - bin: $(BINDIR)/java-rmi.cgi $(BINDIR)/java-rmi.cgi: $(PLATFORM_SRC)/bin/java-rmi.cgi.sh @@ -107,5 +77,5 @@ bin.clean: $(RM) $(BINDIR)/java-rmi.cgi -.PHONY: stubs bin bin.clean +.PHONY: bin bin.clean diff -r 5f11354f6257 -r 082c6e8b8812 make/sun/splashscreen/FILES_c.gmk --- a/make/sun/splashscreen/FILES_c.gmk Mon Jun 19 11:52:01 2017 +0200 +++ b/make/sun/splashscreen/FILES_c.gmk Thu Aug 03 17:21:57 2017 +0100 @@ -111,11 +111,7 @@ pngrtran.c \ pngrutil.c \ pngset.c \ - pngtrans.c \ - pngwio.c \ - pngwrite.c \ - pngwtran.c \ - pngwutil.c + pngtrans.c endif ifneq ($(SYSTEM_GIF), true) diff -r 5f11354f6257 -r 082c6e8b8812 src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java --- a/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java Mon Jun 19 11:52:01 2017 +0200 +++ b/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java Thu Aug 03 17:21:57 2017 +0100 @@ -272,16 +272,21 @@ contentView.execute(new CFNativeAction() { @Override public void run(final long viewPtr) { + boolean hasOwnerPtr = false; + if (owner != null) { - owner.execute(new CFNativeAction() { + hasOwnerPtr = 0L != owner.executeGet(new CFNativeActionGet() { @Override - public void run(long ownerPtr) { + public long run(long ownerPtr) { ref.set(nativeCreateNSWindow(viewPtr, ownerPtr, styleBits, - bounds.x, bounds.y, - bounds.width, bounds.height)); + bounds.x, bounds.y, + bounds.width, bounds.height)); + return 1; } }); - } else { + } + + if (!hasOwnerPtr) { ref.set(nativeCreateNSWindow(viewPtr, 0, styleBits, bounds.x, bounds.y, bounds.width, bounds.height)); diff -r 5f11354f6257 -r 082c6e8b8812 src/share/classes/com/sun/accessibility/internal/resources/accessibility_sv.properties --- a/src/share/classes/com/sun/accessibility/internal/resources/accessibility_sv.properties Mon Jun 19 11:52:01 2017 +0200 +++ b/src/share/classes/com/sun/accessibility/internal/resources/accessibility_sv.properties Thu Aug 03 17:21:57 2017 +0100 @@ -93,7 +93,7 @@ resizable=storleks\u00E4ndringsbar selectable=valbar selected=vald -showing=visas +showing=visar singleline=en rad transient=tillf\u00E4llig visible=synlig diff -r 5f11354f6257 -r 082c6e8b8812 src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java --- a/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java Mon Jun 19 11:52:01 2017 +0200 +++ b/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java Thu Aug 03 17:21:57 2017 +0100 @@ -387,6 +387,17 @@ } } + private void skipPastImage(int imageIndex) { + cbLock.lock(); + try { + gotoImage(imageIndex); + skipImage(); + } catch (IOException | IndexOutOfBoundsException e) { + } finally { + cbLock.unlock(); + } + } + private int getNumImagesOnThread(boolean allowSearch) throws IOException { if (numImages != 0) { @@ -1228,7 +1239,8 @@ // Note that getData disables acceleration on buffer, but it is // just a 1-line intermediate data transfer buffer that will not // affect the acceleration of the resulting image. - aborted = readImage(structPointer, + aborted = readImage(imageIndex, + structPointer, buffer.getData(), numRasterBands, srcBands, @@ -1390,7 +1402,8 @@ /** * Returns true if the read was aborted. */ - private native boolean readImage(long structPointer, + private native boolean readImage(int imageIndex, + long structPointer, byte [] buffer, int numRasterBands, int [] srcBands, diff -r 5f11354f6257 -r 082c6e8b8812 src/share/classes/com/sun/java/swing/plaf/windows/WindowsRootPaneUI.java --- a/src/share/classes/com/sun/java/swing/plaf/windows/WindowsRootPaneUI.java Mon Jun 19 11:52:01 2017 +0200 +++ b/src/share/classes/com/sun/java/swing/plaf/windows/WindowsRootPaneUI.java Thu Aug 03 17:21:57 2017 +0100 @@ -165,8 +165,11 @@ } public boolean postProcessKeyEvent(KeyEvent ev) { - if(ev.isConsumed()) { - // do not manage consumed event + if(ev.isConsumed() && ev.getKeyCode() != KeyEvent.VK_ALT) { + // mnemonic combination, it's consumed, but we need + // set altKeyPressed to false, otherwise after selection + // component by mnemonic combination a menu will be open + altKeyPressed = false; return false; } if (ev.getKeyCode() == KeyEvent.VK_ALT) { diff -r 5f11354f6257 -r 082c6e8b8812 src/share/classes/com/sun/jndi/ldap/LdapClient.java --- a/src/share/classes/com/sun/jndi/ldap/LdapClient.java Mon Jun 19 11:52:01 2017 +0200 +++ b/src/share/classes/com/sun/jndi/ldap/LdapClient.java Thu Aug 03 17:21:57 2017 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2017, 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 @@ -1233,6 +1233,7 @@ static final int LDAP_REF_FOLLOW = 0x01; // follow referrals static final int LDAP_REF_THROW = 0x02; // throw referral ex. static final int LDAP_REF_IGNORE = 0x03; // ignore referrals + static final int LDAP_REF_FOLLOW_SCHEME = 0x04; // follow referrals of the same scheme static final String LDAP_URL = "ldap://"; // LDAPv3 static final String LDAPS_URL = "ldaps://"; // LDAPv3 diff -r 5f11354f6257 -r 082c6e8b8812 src/share/classes/com/sun/jndi/ldap/LdapCtx.java --- a/src/share/classes/com/sun/jndi/ldap/LdapCtx.java Mon Jun 19 11:52:01 2017 +0200 +++ b/src/share/classes/com/sun/jndi/ldap/LdapCtx.java Thu Aug 03 17:21:57 2017 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2017, 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 @@ -2413,6 +2413,9 @@ // First determine the referral mode if (ref != null) { switch (ref) { + case "follow-scheme": + handleReferrals = LdapClient.LDAP_REF_FOLLOW_SCHEME; + break; case "follow": handleReferrals = LdapClient.LDAP_REF_FOLLOW; break; @@ -2975,7 +2978,23 @@ r = new LdapReferralException(resolvedName, resolvedObj, remainName, msg, envprops, fullDN, handleReferrals, reqCtls); // only one set of URLs is present - r.setReferralInfo(res.referrals.elementAt(0), false); + Vector refs; + if (res.referrals == null) { + refs = null; + } else if (handleReferrals == LdapClient.LDAP_REF_FOLLOW_SCHEME) { + refs = new Vector<>(); + for (String s : res.referrals.elementAt(0)) { + if (s.startsWith("ldap:")) { + refs.add(s); + } + } + if (refs.isEmpty()) { + refs = null; + } + } else { + refs = res.referrals.elementAt(0); + } + r.setReferralInfo(refs, false); if (hopCount > 1) { r.setHopCount(hopCount); @@ -3044,7 +3063,7 @@ * assume name resolution has not yet completed. */ if (((res.entries == null) || (res.entries.isEmpty())) && - (res.referrals.size() == 1)) { + ((res.referrals != null) && (res.referrals.size() == 1))) { r.setReferralInfo(res.referrals, false); diff -r 5f11354f6257 -r 082c6e8b8812 src/share/classes/com/sun/jndi/ldap/LdapReferralException.java --- a/src/share/classes/com/sun/jndi/ldap/LdapReferralException.java Mon Jun 19 11:52:01 2017 +0200 +++ b/src/share/classes/com/sun/jndi/ldap/LdapReferralException.java Thu Aug 03 17:21:57 2017 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2017, 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 @@ -117,7 +117,8 @@ // If following referral, request controls are passed to referral ctx this.reqCtls = - (handleReferrals == LdapClient.LDAP_REF_FOLLOW ? reqCtls : null); + (handleReferrals == LdapClient.LDAP_REF_FOLLOW || + handleReferrals == LdapClient.LDAP_REF_FOLLOW_SCHEME ? reqCtls : null); } /** @@ -217,13 +218,15 @@ System.out.println("LdapReferralException.setReferralInfo"); this.referrals = referrals; - if (referrals != null) { - referralCount = referrals.size(); - } + referralCount = (referrals == null) ? 0 : referrals.size(); if (debug) { - for (int i = 0; i < referralCount; i++) { - System.out.println(" [" + i + "] " + referrals.elementAt(i)); + if (referrals != null) { + for (int i = 0; i < referralCount; i++) { + System.out.println(" [" + i + "] " + referrals.elementAt(i)); + } + } else { + System.out.println("setReferralInfo : referrals == null"); } } } diff -r 5f11354f6257 -r 082c6e8b8812 src/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java --- a/src/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java Mon Jun 19 11:52:01 2017 +0200 +++ b/src/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java Thu Aug 03 17:21:57 2017 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2017, 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 @@ -62,9 +62,10 @@ * @param outputFile the system-dependent filename * @param live if true dump only live objects * i.e. objects that are reachable from others - * @throws IOException if the outputFile + * @throws IOException if the outputFile already exists, * cannot be created, opened, or written to. * @throws UnsupportedOperationException if this operation is not supported. + * @throws IllegalArgumentException if outputFile does not end with ".hprof" suffix. * @throws NullPointerException if outputFile is null. * @throws SecurityException * If a security manager exists and its {@link diff -r 5f11354f6257 -r 082c6e8b8812 src/share/classes/java/lang/invoke/LambdaForm.java --- a/src/share/classes/java/lang/invoke/LambdaForm.java Mon Jun 19 11:52:01 2017 +0200 +++ b/src/share/classes/java/lang/invoke/LambdaForm.java Thu Aug 03 17:21:57 2017 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2017, 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 @@ -918,10 +918,10 @@ System.arraycopy(names, skip+outArgs, names2, skip+inTypes, bodyLength); int arity2 = names2.length - bodyLength; int result2 = result; - if (result2 >= 0) { + if (result2 >= skip) { if (result2 < skip+outArgs) { // return the corresponding inArg - result2 = reorder[result2-skip]; + result2 = reorder[result2 - skip] + skip; } else { result2 = result2 - outArgs + inTypes; } diff -r 5f11354f6257 -r 082c6e8b8812 src/share/classes/java/rmi/activation/ActivationID.java --- a/src/share/classes/java/rmi/activation/ActivationID.java Mon Jun 19 11:52:01 2017 +0200 +++ b/src/share/classes/java/rmi/activation/ActivationID.java Thu Aug 03 17:21:57 2017 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2017, 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 @@ -40,6 +40,12 @@ import java.rmi.server.RemoteObjectInvocationHandler; import java.rmi.server.RemoteRef; import java.rmi.server.UID; +import java.security.AccessControlContext; +import java.security.AccessController; +import java.security.Permissions; +import java.security.PrivilegedActionException; +import java.security.PrivilegedExceptionAction; +import java.security.ProtectionDomain; /** * Activation makes use of special identifiers to denote remote @@ -81,6 +87,14 @@ /** indicate compatibility with the Java 2 SDK v1.2 version of class */ private static final long serialVersionUID = -4608673054848209235L; + /** an AccessControlContext with no permissions */ + private static final AccessControlContext NOPERMS_ACC; + static { + Permissions perms = new Permissions(); + ProtectionDomain[] pd = { new ProtectionDomain(null, perms) }; + NOPERMS_ACC = new AccessControlContext(pd); + } + /** * The constructor for ActivationID takes a single * argument, activator, that specifies a remote reference to the @@ -112,15 +126,21 @@ throws ActivationException, UnknownObjectException, RemoteException { try { - MarshalledObject mobj = + final MarshalledObject mobj = activator.activate(this, force); - return mobj.get(); - } catch (RemoteException e) { - throw e; - } catch (IOException e) { - throw new UnmarshalException("activation failed", e); - } catch (ClassNotFoundException e) { - throw new UnmarshalException("activation failed", e); + return AccessController.doPrivileged( From andrew at icedtea.classpath.org Thu Aug 3 19:48:39 2017 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 03 Aug 2017 19:48:39 +0000 Subject: /hg/icedtea7: Added tag icedtea-2.7.0pre13 for changeset 12c4c5b... Message-ID: changeset c9d88a4e6a7d in /hg/icedtea7 details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=c9d88a4e6a7d author: Andrew John Hughes date: Thu Aug 03 21:00:02 2017 +0100 Added tag icedtea-2.7.0pre13 for changeset 12c4c5ba02a1 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 12c4c5ba02a1 -r c9d88a4e6a7d .hgtags --- a/.hgtags Tue May 16 03:02:53 2017 +0100 +++ b/.hgtags Thu Aug 03 21:00:02 2017 +0100 @@ -71,3 +71,4 @@ df0f259a2fcc790ec9ffbbdb343d556b9adb320d icedtea-2.7.0pre10 c0d45d84fc4a9eaa414555ceb840739c56e765df icedtea-2.7.0pre11 0e1ff6b44292ea1f621fed9e1a0d2e749dc3888f icedtea-2.7.0pre12 +12c4c5ba02a160c2241509fce5fd0c2a32013c48 icedtea-2.7.0pre13 From gnu.andrew at redhat.com Thu Aug 3 22:20:02 2017 From: gnu.andrew at redhat.com (Andrew Hughes) Date: Thu, 3 Aug 2017 23:20:02 +0100 Subject: Should I report this bug to Icedtea or directly to OpenJDK In-Reply-To: <5983279E.2020607@oracle.com> References: <5471d6b9-b052-c475-5446-7d2d8b7eec63@marcanoonline.com> <5983279E.2020607@oracle.com> Message-ID: On 3 August 2017 at 14:39, Philip Race wrote: > On 8/2/17, 12:39 PM, Robert Marcano wrote: >> >> Greetings. Where is the best place to report OpenJDK Java 8 bugs for font >> related problems (printing)?. I ask because IIRC Icedtea provided the >> implementation for OpenJDK text layout but it looks like recent Icedtea >> doesn't provides those patches, Are those parts of Icedtea already >> upstreamed for OpenJDK 8? > > Although I don't follow icedtea at all closely, I do know about openjdk .. > and icedtea did not provide "the implementation for OpenJDK text layout". > In the very early days, it did have its own text layout implementation, taken from GNU Classpath, as the OpenJDK project only provided binary plugs for this, which were unusable by GNU/Linux distributions. IcedTea itself, however, has never produced much actual code. It's more a system to make OpenJDK packagable. However, I think where the confusion arises, is that Oracle's proprietary binaries don't use the OpenJDK text layout code, so the main example people are aware of where this code *is* used are binaries produced from IcedTea on various distros. That said, the Fedora java-1.8.0-openjdk binaries are not based on IcedTea, but on the aarch64/jdk8u tree, with the additional maintenance headaches this leads to. -- Andrew :) Senior Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Web Site: http://fuseyism.com Twitter: https://twitter.com/gnu_andrew_java PGP Key: ed25519/0xCFDA0F9B35964222 (hkp://keys.gnupg.net) Fingerprint = 5132 579D D154 0ED2 3E04 C5A0 CFDA 0F9B 3596 4222 From philip.race at oracle.com Thu Aug 3 22:35:25 2017 From: philip.race at oracle.com (Philip Race) Date: Thu, 03 Aug 2017 15:35:25 -0700 Subject: Should I report this bug to Icedtea or directly to OpenJDK In-Reply-To: References: <5471d6b9-b052-c475-5446-7d2d8b7eec63@marcanoonline.com> <5983279E.2020607@oracle.com> Message-ID: <5983A52D.4090809@oracle.com> Andrew, On 8/3/17, 3:20 PM, Andrew Hughes wrote: > However, I think where the confusion arises, is that Oracle's > proprietary binaries don't use the OpenJDK text layout code, so The only text related difference between Oracle JDK and OpenJDK is the font rasteriser used (t2k vs freetype) and that is not at all the same thing as text layout. So are you are referring to the font rasteriser ? One component of the whole wad-of-stuff. If icedtea used something else for text layout that is a different matter but those libraries are what Oracle JDK + OpenJDK have always used for font rasterisation. FWIW the bug here is in the way freetype is used .. -phil. From adinn at redhat.com Fri Aug 4 07:44:48 2017 From: adinn at redhat.com (Andrew Dinn) Date: Fri, 4 Aug 2017 08:44:48 +0100 Subject: Should I report this bug to Icedtea or directly to OpenJDK In-Reply-To: <5983A52D.4090809@oracle.com> References: <5471d6b9-b052-c475-5446-7d2d8b7eec63@marcanoonline.com> <5983279E.2020607@oracle.com> <5983A52D.4090809@oracle.com> Message-ID: <465d7814-7f7b-ae0c-93cf-0f21df3c3390@redhat.com> Hi Phil, On 03/08/17 23:35, Philip Race wrote: > The only text related difference between Oracle JDK and OpenJDK is the > font rasteriser > used (t2k vs freetype) and that is not at all the same thing as text > layout. Well, that's good to know! > So are you are referring to the font rasteriser ? One component of the > whole wad-of-stuff. I believe Andrew (Hughes) was referring to differences well in the past. I certainly don't think he meant that GNU Classpath code used then to replace your then binary only code is still in use now. I am sure Andrew will clarify this. > If icedtea used something else for text layout that is a different > matter but those > libraries are what Oracle JDK + OpenJDK have always used for font > rasterisation. I wouldn't want to pre-empt whatever answer Andrew gives (he knows far more than me in this area, particularly of the early history of icedtea) but I will make a related comment. It's obviously very difficult for non-Oracle OpenJDK devs to have a clear idea of what changes the Oracle JDK includes modulo the open version of the source even though our assumption is that they are fairly small. I have been asked quite a few times about what these changes might be and differences in text handling is the number one most common thing people have brought up as an observable difference that they would like me to explain (usually it's "why does X break/not break on OpenJDK when X doesn't break/breaks on Oracle JDK", occasionally expressed with a tad more rhetorical force). That may just be because text differences are easiest to spot of course. Anyway, the point is that perhaps there is some only partially informed folklore at play in our guesses as to what goes on in the closed source code. regards, Andrew Dinn ----------- Senior Principal Software Engineer Red Hat UK Ltd Registered in England and Wales under Company Registration No. 03798903 Directors: Michael Cunningham, Michael ("Mike") O'Neill, Eric Shander From bugzilla-daemon at icedtea.classpath.org Tue Aug 8 15:30:41 2017 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 08 Aug 2017 15:30:41 +0000 Subject: [Bug 3432] New: Mopex fatal error Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3432 Bug ID: 3432 Summary: Mopex fatal error Product: IcedTea Version: unspecified Hardware: x86_64 OS: Linux Status: NEW Severity: critical Priority: P5 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: paulbonneym at gmail.com CC: unassigned at icedtea.classpath.org Created attachment 1638 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=1638&action=edit Mopex error log I think that this error is the same one as ID 1463, but I do not have any other java virtual environment; I do not have a jvm directory inside /usr/lib/. I have been trying to install icedtea to attempt to follow the fix there, but I am very new to all of this software and don't really know where to begin. If there is a beginner's guide to all this or just a list of software to install with a few instructions on how to do so effectively, that would be mush appreciated. I will include the terminal message and the error log from Mopex as well as the terminal messages from trying to configure icedtea6-1.9.13 and icedtea-2.6.9. For running mopex: -Platform: Screen Size: 1366x768 -Platform: Platform: Linux minor= 6 _________________ Platform.computerDirName(): Thread: main: 08/8 09:49:02 dir= /home/paul/.spot userHome= /home/paul ~~~~~~~~~~~~~~~~~ _________________ Platform: Thread: main: 08/8 09:49:02 Working dir: /home/paul/.spot ~~~~~~~~~~~~~~~~~ _________________ Platform.prepareDir(): Thread: main: 08/8 09:49:02 retval = true exist= true canWrite= true ~~~~~~~~~~~~~~~~~ _________________ Platform.determineWorkingDir(): Thread: main: 08/8 09:49:02 inDir= /home/paul/.spot dir= /home/paul/.spot ~~~~~~~~~~~~~~~~~ Installer: (uplink_util.jar) rootDir: /home/paul/Documents/Mopex # # A fatal error has been detected by the Java Runtime Environment: # # SIGSEGV (0xb) at pc=0x00007fbededf9161, pid=2302, tid=140457459357440 # # JRE version: 6.0_20-b20 # Java VM: OpenJDK 64-Bit Server VM (19.0-b06 mixed mode linux-amd64 compressed oops) # Derivative: IcedTea6 1.9.1 # Distribution: Custom build (Wed Oct 13 22:53:58 UTC 2010) # Problematic frame: # C [ld-linux-x86-64.so.2+0x17161] # # An error report file with more information is saved as: # /home/paul/Documents/Mopex/hs_err_pid2302.log # # If you would like to submit a bug report, please include # instructions how to reproduce the bug and visit: # http://icedtea.classpath.org/bugzilla # The crash happened outside the Java Virtual Machine in native code. # See problematic frame for where to report the bug. # Aborted (core dumped) For attempting to configure icedtea6-1.9.13: checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking how to create a pax tar archive... gnutar checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking for style of include used by make... GNU checking dependency style of gcc... none checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... none checking for make... /usr/bin/make checking for gzip... /bin/gzip checking for ant... /usr/bin/ant checking for find... /usr/bin/find checking for patch... /usr/bin/patch checking for tar... /bin/tar checking for chmod... /bin/chmod checking for md5sum... /usr/bin/md5sum checking for sha256sum... /usr/bin/sha256sum checking for wget... /usr/bin/wget checking for zip... /usr/bin/zip checking for unzip... /usr/bin/unzip checking for cpio... /bin/cpio checking for file... /usr/bin/file checking for fastjar... fastjar checking for ldd... ldd checking for gawk... /usr/bin/gawk checking for hg... no checking for an OpenJDK source directory... /home/paul/Downloads/icedtea6-1.9.13/openjdk checking for lsb_release... /usr/bin/lsb_release checking whether to compile ecj natively... no checking which HotSpot build to use... original checking for linux32... /usr/bin/linux32 checking version of GCC... 5.4.0 (major version 5, minor version 4) checking for an existing OpenJDK installation... no checking for getconf... /usr/bin/getconf checking the number of online processors... 4 checking how many parallel build jobs to execute... 2 checking if cp supports --reflink... yes checking if we can hard link rather than copy from /home/paul/Downloads/icedtea6-1.9.13... yes checking if a PaX-enabled kernel is running... no checking for an Ant home directory... /usr/share/ant checking whether to include PulseAudio support... no checking whether to build documentation... yes checking whether to enable experimental OpenJDK cross-compilation support... no checking whether to include the XRender pipeline... yes checking whether to include NIO2 support... no checking whether to include SystemTap tracing support... no checking for system library directory... checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.9.0... yes checking for NSS... no configure: WARNING: Could not find NSS; using as its location. checking whether to include the NSS-based security provider... disabled by default (edit java.security to enable) checking for distribution package version... none checking build identification... Built on Ubuntu 16.04.2 LTS (Tue Aug 8 10:27:45 CDT 2017) checking for a GCJ JDK home directory... configure: error: "A GCJ JDK home directory could not be found." For trying to configure icedtea-2.6.9: checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking how to create a pax tar archive... gnutar checking whether to enable maintainer-specific portions of Makefiles... yes checking which branch and release of IcedTea is being built... branch 2.6, release 2.6.9 for OpenJDK 1.7.0 checking build system type... x86_64-pc-linux-gnu checking host system type... x86_64-pc-linux-gnu checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking whether gcc understands -c and -o together... yes checking for style of include used by make... GNU checking dependency style of gcc... none checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... none checking for gmake... no checking for make... /usr/bin/make checking for gzip... /bin/gzip checking for ant... /usr/bin/ant checking for gfind... no checking for find... /usr/bin/find checking for gpatch... no checking for patch... /usr/bin/patch checking for gtar... no checking for tar... /bin/tar checking for chmod... /bin/chmod checking for gsha256sum... no checking for sha256sum... /usr/bin/sha256sum checking for wget... /usr/bin/wget checking for zip... /usr/bin/zip checking for unzip... /usr/bin/unzip checking for cpio... /bin/cpio checking for file... /usr/bin/file checking for readlink... /bin/readlink checking for fastjar... /usr/bin/fastjar checking for gsed... no checking for sed... /bin/sed checking for ldd... ldd checking for gawk... /usr/bin/gawk checking for hg... no checking for an OpenJDK source directory... /home/paul/Downloads/icedtea-2.6.9/openjdk checking for lsb_release... /usr/bin/lsb_release checking for /etc/mime.types... yes checking if /etc/mime.types has text/x-java-source... no checking whether to use CACAO as VM... no checking whether to use JamVM as VM... no checking whether to use the Shark JIT... no checking if a native HotSpot port is available for this architecture... yes checking how to run the C preprocessor... gcc -E checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking whether to use the zero-assembler port... no checking whether byte ordering is bigendian... no checking which HotSpot build to use... default checking for linux32... /usr/bin/linux32 checking version of GCC... 5.4.0 (major version 5, minor version 4) checking for getconf... /usr/bin/getconf checking the number of online processors... 4 checking if cp supports --reflink... yes checking if we can hard link rather than copy from /home/paul/Downloads/icedtea-2.6.9... yes checking whether to disable the execution of the JTReg tests... no checking whether to disable the execution of the HotSpot JTReg tests... no checking whether to disable the execution of the langtools JTReg tests... no checking whether to disable the execution of the JDK JTReg tests... no checking whether to disable the execution of the SystemTap tests... no checking for system library directory... checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.9.0... yes checking whether to enable the PKCS11 crypto provider using NSS... disabled by default (edit java.security to enable) checking for NSS... no configure: WARNING: Could not find NSS; using as its location. checking whether to enable the Sun elliptic curve crypto provider... no checking whether to build native code with debugging information... yes checking whether to build Java bytecode with debugging information... yes checking where fonts are stored... /usr/share/fonts checking if /usr/share/fonts is a valid directory... yes checking for xvfb-run... no checking whether to build documentation... yes checking for distribution package version... none checking build identification... Built on Ubuntu 16.04.2 LTS (Tue Aug 8 10:32:19 CDT 2017) checking how many parallel build jobs to execute... 2 checking whether to build a bootstrap version first... yes checking whether to download tarballs... yes checking for a JDK home directory... not specified checking for /usr/lib/jvm/java-gcj... not found checking for /usr/lib/jvm/gcj-jdk... not found checking for /usr/lib/jvm/cacao... not found checking for /usr/lib/jvm/icedtea-7... not found checking for /usr/lib/jvm/icedtea7... not found checking for /usr/lib/jvm/java-7-openjdk... not found checking for /usr/lib/jvm/java-1.7.0-openjdk... not found checking for /usr/lib/jvm/java-1.7.0-openjdk.x86_64... not found checking for /usr/lib64/jvm/java-1.7.0-openjdk... not found checking for /usr/lib/jvm/java-1.7.0... not found checking for /usr/lib/jvm/icedtea-6... not found checking for /usr/lib/jvm/icedtea6... not found checking for /usr/lib/jvm/java-6-openjdk... not found checking for /usr/lib/jvm/java-1.6.0-openjdk... not found checking for /usr/lib/jvm/java-1.6.0-openjdk.x86_64... not found checking for /usr/lib64/jvm/java-1.6.0-openjdk... not found checking for /usr/lib/jvm/java-1.6.0... not found checking for /usr/lib/jvm/java-openjdk... not found checking for /usr/lib/jvm/openjdk... not found checking for /usr/lib/jvm/java-icedtea... not found checking for /etc/alternatives/java_sdk_openjdk... not found configure: error: "A JDK home directory could not be found. Try specifying one using --with-jdk-home=" Thank you very much for your help with this. Best, Paul -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From gnu_andrew at member.fsf.org Tue Aug 8 20:31:29 2017 From: gnu_andrew at member.fsf.org (Andrew Hughes) Date: Tue, 8 Aug 2017 21:31:29 +0100 Subject: [SECURITY] IcedTea 2.6.11 for OpenJDK 7 Released! Message-ID: <20170808203129.GA12491@carrie.the212.com> The IcedTea project provides a harness to build the source code from OpenJDK using Free Software build tools, along with additional features such as the ability to build against system libraries and support for alternative virtual machines and architectures beyond those supported by OpenJDK. This release updates our OpenJDK 7 support in the 2.6.x series with the July 2017 security fixes from OpenJDK 7 u151. If you find an issue with the release, please report it to our bug database (http://icedtea.classpath.org/bugzilla) under the appropriate component. Development discussion takes place on the distro-pkg-dev at openjdk.java.net mailing list and patches are always welcome. Full details of the release can be found below. What?s New? =========== New in release 2.6.11 (2017-08-08): * Security fixes - S8163958, CVE-2017-10102: Improved garbage collection - S8167228: Update to libpng 1.6.28 - S8169209, CVE-2017-10053: Improved image post-processing steps - S8169392, CVE-2017-10067: Additional jar validation steps - S8170966, CVE-2017-10081: Right parenthesis issue - S8172204, CVE-2017-10087: Better Thread Pool execution - S8172461, CVE-2017-10089: Service Registration Lifecycle - S8172465, CVE-2017-10090: Better handling of channel groups - S8172469, CVE-2017-10096: Transform Transformer Exceptions - S8173286, CVE-2017-10101: Better reading of text catalogs - S8173697, CVE-2017-10107: Less Active Activations - S8173770, CVE-2017-10074: Image conversion improvements - S8174098, CVE-2017-10110: Better image fetching - S8174105, CVE-2017-10108: Better naming attribution - S8174113, CVE-2017-10109: Better sourcing of code - S8174770: Check registry registration location - S8174873: Improved certificate processing - S8175106, CVE-2017-10115: Higher quality DSA operations - S8175110, CVE-2017-10118: Higher quality ECDSA operations - S8176055: JMX diagnostic improvements - S8176067, CVE-2017-10116: Proper directory lookup processing - S8176760, CVE-2017-10135: Better handling of PKCS8 material - S8178135, CVE-2017-10176: Additional elliptic curve support - S8181420, CVE-2017-10074: PPC: Image conversion improvements - S8183551, CVE-2017-10074, PR3423: AArch64: Image conversion improvements - S8184119, CVE-2017-10111: Incorrect return processing for the LF editor of MethodHandles.permuteArguments * Import of OpenJDK 7 u151 build 0 - S7117357: Warnings in sun.instrument, tools and other sun.* classes - S7117570: Warnings in sun.mangement.* and its subpackages - S7143230: fix warnings in java.util.jar, sun.tools.jar, zipfs demo, etc. - S8022440: suppress deprecation warnings in sun.rmi - S8024069: replace_in_map() should operate on parent maps - S8026796: Make replace_in_map() on parent maps generic - S8030787: [Parfait] JNI-related warnings from b119 for jdk/src/share/native/sun/awt/image - S8030875: Macros for checking and returning on exceptions - S8031737: CHECK_NULL and CHECK_EXCEPTION macros cleanup - S8034912: backport of 8031737 to jdk8u breaks linux buld. - S8035629: [parfait] JNI exc pending in jdk/src/windows/native/sun/windows/ShellFolder2.cpp - S8037287: Windows build failed after JDK-8030787 - S8048703: ReplacedNodes dumps it's content to tty - S8080492: [Parfait] Uninitialised variable in jdk/src/java/desktop/windows/native/libawt/ - S8139870: sun.management.LazyCompositeData.isTypeMatched() fails for composite types with items of ArrayType - S8143377: Test PKCS8Test.java fails - S8149450: LdapCtx.processReturnCode() throwing Null Pointer Exception - S8155690: Update libPNG library to the latest up-to-date - S8156804: Better constraint checking (sync with upstream version) - S8162461: Hang due to JNI up-call made whilst holding JNI critical lock - S8165231: java.nio.Bits.unaligned() doesn't return true on ppc - S8165367: Additional tests for JEP 288: Disable SHA-1 Certificates - S8173145: Menu is activated after using mnemonic Alt/Key combination - S8174164: SafePointNode::_replaced_nodes breaks with irreducible loops - S8175097: [TESTBUG] 8174164 fix missed the test - S8175251: Failed to load RSA private key from pkcs12 - S8176731: JCK tests in api/javax_xml/transform/ spec conformance started failing after 8172469 - S8176769: Remove accidental spec change in jdk8u - S8177449: (tz) Support tzdata2017b - S8178996: [macos] JComboBox doesn't display popup in mixed JavaFX Swing Application on 8u131 and Mac OS 10.12 - S8179014: JFileChooser with Windows look and feel crashes on win 10 - S8179887: Build failure with glibc >= 2.24: error: 'int readdir_r(DIR*, dirent*, dirent**)' is deprecated - S8180582: The bind to rmiregistry is rejected by registryFilter even though registryFilter is set - S8181591: 8u141 L10n resource file update - S8182054: Improve wsdl support - S8184993: Jar file verification failing with SecurityException: digest missing xxx - S8185501: Missing import in JAXP code - S8185502: No overflow operator on OpenJDK 7 * Import of OpenJDK 7 u151 build 1 - S8185716: OpenJDK 7 PPC64 port uses a different ins_encode format in ppc.ad * Backports - S7177216, PR3398, RH1446700: native2ascii changes file permissions of input file - S8179084, PR3410, RH1455694: HotSpot VM fails to start when AggressiveHeap is set - S8181419, PR3414, RH1463144: Race in jdwp invoker handling may lead to crashes or invalid results * AArch64 port - S8144028, PR3431: Use AArch64 bit-test instructions in C2 - S8152537, PR3431: aarch64: Make use of CBZ and CBNZ when comparing unsigned values with zero. The tarballs can be downloaded from: * http://icedtea.classpath.org/download/source/icedtea-2.6.11.tar.gz * http://icedtea.classpath.org/download/source/icedtea-2.6.11.tar.xz We provide both gzip and xz tarballs, so that those who are able to make use of the smaller tarball produced by xz may do so. The tarballs are accompanied by digital signatures available at: * http://icedtea.classpath.org/download/source/icedtea-2.6.11.tar.gz.sig * http://icedtea.classpath.org/download/source/icedtea-2.6.11.tar.xz.sig These are produced using my public key. See details below. PGP Key: ed25519/0xCFDA0F9B35964222 (hkp://keys.gnupg.net) Fingerprint = 5132 579D D154 0ED2 3E04 C5A0 CFDA 0F9B 3596 4222 GnuPG >= 2.1 is required to be able to handle this key. SHA256 checksums: 5dfbe0f40d8b6004d49add4ec398d1c91d4c02b11716297055e5d73919fb85be icedtea-2.6.11.tar.gz f100c3bfffa5ea0b9a2184346856a1d3db7f8d2a45c74523ad928dcf179ad0e3 icedtea-2.6.11.tar.gz.sig 20063c314535e4ed4b8099e497b880e4f346c85e7315a2573d0f398b973777c5 icedtea-2.6.11.tar.xz 43bf76c60d219ef76b0e03484ee92d0d7657dafae51f21ed088ee5bb5ee654ca icedtea-2.6.11.tar.xz.sig The checksums can be downloaded from: * http://icedtea.classpath.org/download/source/icedtea-2.6.11.sha256 The following people helped with these releases: * Severin Gehwolf (S8181419/PR3414/RH1463144 JDWP race) * Andrew Hughes (all other backports & bug fixes, release management) * Roland Westrelin (S8183551/PR3423/CVE-2017-10074 AArch64 fix) We would also like to thank the bug reporters and testers! To get started: $ tar xzf icedtea-2.6.11.tar.gz or: $ tar x -I xz -f icedtea-2.6.11.tar.xz then: $ mkdir icedtea-build $ cd icedtea-build $ ../icedtea-2.6.11/configure $ make Full build requirements and instructions are available in the INSTALL file. Happy hacking! -- Andrew :) Senior Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) PGP Key: ed25519/0xCFDA0F9B35964222 (hkp://keys.gnupg.net) Fingerprint = 5132 579D D154 0ED2 3E04 C5A0 CFDA 0F9B 3596 4222 -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 228 bytes Desc: Digital signature URL: From bugzilla-daemon at icedtea.classpath.org Thu Aug 10 04:11:11 2017 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 10 Aug 2017 04:11:11 +0000 Subject: [Bug 3433] New: Backport of 8185164: GetOwnedMonitorInfo() returns incorrect owned monitor Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3433 Bug ID: 3433 Summary: Backport of 8185164: GetOwnedMonitorInfo() returns incorrect owned monitor Product: IcedTea Version: 7-hg Hardware: all OS: All Status: NEW Severity: minor Priority: P5 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: yasuenag at gmail.com CC: unassigned at icedtea.classpath.org Please backport JDK-8185164: GetOwnedMonitorInfo() returns incorrect owned monitor JBS: https://bugs.openjdk.java.net/browse/JDK-8185164 Changeset: http://hg.openjdk.java.net/jdk10/hs/hotspot/rev/f2ec523d900b Review thread: http://mail.openjdk.java.net/pipermail/serviceability-dev/2017-August/021591.html This bug has been fixed in 10. I labeled 9-bp to this issue, and I send RFA to jdk8u mailing list[1]. [1] http://mail.openjdk.java.net/pipermail/jdk8u-dev/2017-August/006808.html -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From andrew at icedtea.classpath.org Thu Aug 10 05:17:13 2017 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 10 Aug 2017 05:17:13 +0000 Subject: /hg/release/icedtea7-2.6: 2 new changesets Message-ID: changeset b4e586e969d9 in /hg/release/icedtea7-2.6 details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=b4e586e969d9 author: Andrew John Hughes date: Fri Aug 04 19:25:36 2017 +0100 Bump to 2.6.11. Upstream changes: - Bump to icedtea-2.6.11 - S7117357: Warnings in sun.instrument, tools and other sun.* classes - S7117570: Warnings in sun.mangement.* and its subpackages - S7143230: fix warnings in java.util.jar, sun.tools.jar, zipfs demo, etc. - S8022440: suppress deprecation warnings in sun.rmi - S8024069: replace_in_map() should operate on parent maps - S8026796: Make replace_in_map() on parent maps generic - S8030787: [Parfait] JNI-related warnings from b119 for jdk/src/share/native/sun/awt/image - S8030875: Macros for checking and returning on exceptions - S8031737: CHECK_NULL and CHECK_EXCEPTION macros cleanup - S8034912: backport of 8031737 to jdk8u breaks linux buld. - S8035629: [parfait] JNI exc pending in jdk/src/windows/native/sun/windows/ShellFolder2.cpp - S8037287: Windows build failed after JDK-8030787 - S8048703: ReplacedNodes dumps it's content to tty - S8080492: [Parfait] Uninitialised variable in jdk/src/java/desktop/windows/native/libawt/ - S8139870: sun.management.LazyCompositeData.isTypeMatched() fails for composite types with items of ArrayType - S8143377: Test PKCS8Test.java fails - S8144028, PR3431: Use AArch64 bit-test instructions in C2 - S8149450: LdapCtx.processReturnCode() throwing Null Pointer Exception - S8152537, PR3431: aarch64: Make use of CBZ and CBNZ when comparing unsigned values with zero. - S8155690: Update libPNG library to the latest up-to-date - S8156804: Better constraint checking - S8162461: Hang due to JNI up-call made whilst holding JNI critical lock - S8163958: Improved garbage collection - S8165231: java.nio.Bits.unaligned() doesn't return true on ppc - S8165367: Additional tests for JEP 288: Disable SHA-1 Certificates - S8167228: Update to libpng 1.6.28 - S8169209: Improved image post-processing steps - S8169392: Additional jar validation steps - S8170966: Right parenthesis issue - S8172204: Better Thread Pool execution - S8172461: Service Registration Lifecycle - S8172465: Better handling of channel groups - S8172469: Transform Transformer Exceptions - S8173145: Menu is activated after using mnemonic Alt/Key combination - S8173286: Better reading of text catalogs - S8173697: Less Active Activations - S8173770: Image conversion improvements - S8174098: Better image fetching - S8174105: Better naming attribution - S8174113: Better sourcing of code - S8174164: SafePointNode::_replaced_nodes breaks with irreducible loops - S8174729: Race Condition in java.lang.reflect.WeakCache - S8174770: Check registry registration location - S8174873: Improved certificate procesing - S8175097: [TESTBUG] 8174164 fix missed the test - S8175106: Higher quality DSA operations - S8175110: Higher quality ECDSA operations - S8175251: Failed to load RSA private key from pkcs12 - S8176055: JMX diagnostic improvements - S8176067: Proper directory lookup processing - S8176731: JCK tests in api/javax_xml/transform/ spec conformance started failing after 8172469 - S8176760: Better handling of PKCS8 material - S8176769: Remove accidental spec change in jdk8u - S8177449: (tz) Support tzdata2017b - S8178135: Additional elliptic curve support - S8178996: [macos] JComboBox doesn't display popup in mixed JavaFX Swing Application on 8u131 and Mac OS 10.12 - S8179014: JFileChooser with Windows look and feel crashes on win 10 - S8179887: Build failure with glibc >= 2.24: error: 'int readdir_r(DIR*, dirent*, dirent**)' is deprecated - S8180582: The bind to rmiregistry is rejected by registryFilter even though registryFilter is set - S8181420: PPC: Image conversion improvements - S8181591: 8u141 L10n resource file update - S8182054: Improve wsdl support - S8183551, PR3431: AArch64: Image conversion improvements - S8184119: Incorrect return processing for the LF editor of MethodHandles.permuteArguments - S8184993: Jar file verification failing with SecurityException: digest missing xxx - S8185501: Missing import in JAXP code - S8185502: No overflow operator on OpenJDK 7 - S8185716: OpenJDK 7 PPC64 port uses a different ins_encode format in ppc.ad ChangeLog: 2017-08-01 Andrew John Hughes Bump to 2.6.11. * Makefile.am, (JDK_UPDATE_VERSION): Bump to 141. (BUILD_VERSION): Set to b01. (CORBA_CHANGESET): Update to icedtea-2.6.11. (JAXP_CHANGESET): Likewise. (JAXWS_CHANGESET): Likewise. (JDK_CHANGESET): Likewise. (LANGTOOLS_CHANGESET): Likewise. (OPENJDK_CHANGESET): Likewise. (CORBA_SHA256SUM): Likewise. (JAXP_SHA256SUM): Likewise. (JAXWS_SHA256SUM): Likewise. (JDK_SHA256SUM): Likewise. (LANGTOOLS_SHA256SUM): Likewise. (OPENJDK_SHA256SUM): Likewise. * NEWS: Updated. * configure.ac: Bump to 2.6.11. * hotspot.map.in: Update to icedtea-2.6.11. * patches/boot/ecj-diamond.patch: Regenerated. Add cases in java.util.jar.Attributes, java.util.jar.JarVerifier, javax.imageio.spi.ServiceRegistry, sun.management.ConnectorAddressLink, sun.management.counter.perf.PerfInstrumentation, sun.management.Flag, sun.management.GarbageCollectionNotifInfoCompositeData, sun.management.HotspotCompilation, sun.management.HotspotDiagnostic, sun.management.HotspotThread, sun.management.jmxremote.ConnectorBootstrap, sun.management.ManagementFactoryHelper, sun.management.MappedMXBeanType, sun.management.NotificationEmitterSupport, sun.management.RuntimeImpl, sun.net.RegisterDomain, sun.tools.jar.CommandLine, sun.tools.jar.Manifest and sun.tools.jar.SignatureFile * patches/boot/ecj-multicatch.patch: Add cases in com.sun.imageio.plugins.jpeg.JPEGImageReader, sun.management.Agent, sun.management.GarbageCollectionNotifInfoCompositeData, sun.management.GcInfoCompositeData, sun.rmi.server.UnicastRef, sun.rmi.server.UnicastServerRef, javax.xml.transform.TransformerException, com.sun.xml.internal.ws.util.xml.XmlUtil, sun.rmi.registry.RegistryImpl_Skel and sun.rmi.transport.DGCImpl_Stub * patches/boot/ecj-stringswitch.patch: Regenerated. * patches/boot/ecj-trywithresources.patch: Add cases in sun.management.jmxremote.ConnectorBootstrap. changeset ca9128374846 in /hg/release/icedtea7-2.6 details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=ca9128374846 author: Andrew John Hughes date: Tue Aug 08 15:22:45 2017 +0100 Set release date to today. 2017-08-08 Andrew John Hughes * NEWS: Set release date to today. diffstat: ChangeLog | 60 + Makefile.am | 30 +- NEWS | 75 +- configure.ac | 2 +- hotspot.map.in | 2 +- patches/boot/ecj-diamond.patch | 2535 ++++++++++++++++++------------ patches/boot/ecj-multicatch.patch | 246 +++ patches/boot/ecj-stringswitch.patch | 844 +++++----- patches/boot/ecj-trywithresources.patch | 68 + 9 files changed, 2417 insertions(+), 1445 deletions(-) diffs (truncated from 7049 to 500 lines): diff -r c14782803cc7 -r ca9128374846 ChangeLog --- a/ChangeLog Tue Aug 01 14:13:09 2017 +0100 +++ b/ChangeLog Tue Aug 08 15:22:45 2017 +0100 @@ -1,3 +1,63 @@ +2017-08-08 Andrew John Hughes + + * NEWS: Set release date to today. + +2017-08-01 Andrew John Hughes + + Bump to 2.6.11. + * Makefile.am, + (JDK_UPDATE_VERSION): Bump to 141. + (BUILD_VERSION): Set to b01. + (CORBA_CHANGESET): Update to icedtea-2.6.11. + (JAXP_CHANGESET): Likewise. + (JAXWS_CHANGESET): Likewise. + (JDK_CHANGESET): Likewise. + (LANGTOOLS_CHANGESET): Likewise. + (OPENJDK_CHANGESET): Likewise. + (CORBA_SHA256SUM): Likewise. + (JAXP_SHA256SUM): Likewise. + (JAXWS_SHA256SUM): Likewise. + (JDK_SHA256SUM): Likewise. + (LANGTOOLS_SHA256SUM): Likewise. + (OPENJDK_SHA256SUM): Likewise. + * NEWS: Updated. + * configure.ac: Bump to 2.6.11. + * hotspot.map.in: Update to icedtea-2.6.11. + * patches/boot/ecj-diamond.patch: + Regenerated. Add cases in + java.util.jar.Attributes, java.util.jar.JarVerifier, + javax.imageio.spi.ServiceRegistry, + sun.management.ConnectorAddressLink, + sun.management.counter.perf.PerfInstrumentation, + sun.management.Flag, + sun.management.GarbageCollectionNotifInfoCompositeData, + sun.management.HotspotCompilation, + sun.management.HotspotDiagnostic, + sun.management.HotspotThread, + sun.management.jmxremote.ConnectorBootstrap, + sun.management.ManagementFactoryHelper, + sun.management.MappedMXBeanType, + sun.management.NotificationEmitterSupport, + sun.management.RuntimeImpl, + sun.net.RegisterDomain, + sun.tools.jar.CommandLine, + sun.tools.jar.Manifest and sun.tools.jar.SignatureFile + * patches/boot/ecj-multicatch.patch: + Add cases in + com.sun.imageio.plugins.jpeg.JPEGImageReader, + sun.management.Agent, + sun.management.GarbageCollectionNotifInfoCompositeData, + sun.management.GcInfoCompositeData, + sun.rmi.server.UnicastRef, sun.rmi.server.UnicastServerRef, + javax.xml.transform.TransformerException, + com.sun.xml.internal.ws.util.xml.XmlUtil, + sun.rmi.registry.RegistryImpl_Skel and + sun.rmi.transport.DGCImpl_Stub + * patches/boot/ecj-stringswitch.patch: Regenerated. + * patches/boot/ecj-trywithresources.patch: + Add cases in + sun.management.jmxremote.ConnectorBootstrap. + 2017-08-01 Andrew John Hughes Bump to 2.6.11pre01. diff -r c14782803cc7 -r ca9128374846 Makefile.am --- a/Makefile.am Tue Aug 01 14:13:09 2017 +0100 +++ b/Makefile.am Tue Aug 08 15:22:45 2017 +0100 @@ -1,22 +1,22 @@ # Dependencies -JDK_UPDATE_VERSION = 141 -BUILD_VERSION = b02 +JDK_UPDATE_VERSION = 151 +BUILD_VERSION = b01 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION) -CORBA_CHANGESET = ff69bc83070b -JAXP_CHANGESET = f16026b79deb -JAXWS_CHANGESET = f8bd60e99896 -JDK_CHANGESET = 5f11354f6257 -LANGTOOLS_CHANGESET = a4814b6ff893 -OPENJDK_CHANGESET = 54009dd18b70 - -CORBA_SHA256SUM = 6d69d2fdcc01e3687b297f224fb93113a8c61ea44384695e597d1572b502cb91 -JAXP_SHA256SUM = c34909de8b989b67dec34b06231d42f1d209b81887f22ceef3fb2b8d2ef436aa -JAXWS_SHA256SUM = dd19633f86c870b6b729bb2249fcc6266764827819ef6198c2fd7d286b11a551 -JDK_SHA256SUM = a7d4679fa6f098dca5a61d88e42fbe02d0f6e6c4fba77d6a7fbb65f8b2a86360 -LANGTOOLS_SHA256SUM = b7ed8702b9eed001732d60bf8359cb90130aefa61e4ac23e44576c513116f8dd -OPENJDK_SHA256SUM = cb12df6ddb68e811bb932de6f059d0ab1708d784f46fd3eddf311a924929b468 +CORBA_CHANGESET = 803456f62297 +JAXP_CHANGESET = 46f2d7395127 +JAXWS_CHANGESET = e17af60ebbd6 +JDK_CHANGESET = 082c6e8b8812 +LANGTOOLS_CHANGESET = cddb1f9f8b9c +OPENJDK_CHANGESET = 499e7894cc44 + +CORBA_SHA256SUM = ff818ceedd154fa4d55d38b50fccd6a19de242a592d9ffbed7368bc56c091b81 +JAXP_SHA256SUM = a2642f8792edf7e40169ddafcd7a3c297e75b41f7c65fac2a84787376a65977d +JAXWS_SHA256SUM = a299f434b48e5ed1e57085be5515ea1dbfbad971d08d386f070d653d2ea878be +JDK_SHA256SUM = ce4eca8a320c7514a7ecaa513a2a9cbb82a74e0256c8ba277fa692debe952eb5 +LANGTOOLS_SHA256SUM = 650a2d3881ba02ea10cbb6ddeef3888103fccaa904cb23517e07b3acd26d4c7f +OPENJDK_SHA256SUM = 0d521feed6275102ba3b3ee394330fefe20463dd63caa7197c7fd93e132519fe DROP_URL = http://icedtea.classpath.org/download/drops diff -r c14782803cc7 -r ca9128374846 NEWS --- a/NEWS Tue Aug 01 14:13:09 2017 +0100 +++ b/NEWS Tue Aug 08 15:22:45 2017 +0100 @@ -12,12 +12,83 @@ CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY -New in release 2.6.11 (2017-07-XX): - +New in release 2.6.11 (2017-08-08): + +* Security fixes + - S8163958, CVE-2017-10102: Improved garbage collection + - S8167228: Update to libpng 1.6.28 + - S8169209, CVE-2017-10053: Improved image post-processing steps + - S8169392, CVE-2017-10067: Additional jar validation steps + - S8170966, CVE-2017-10081: Right parenthesis issue + - S8172204, CVE-2017-10087: Better Thread Pool execution + - S8172461, CVE-2017-10089: Service Registration Lifecycle + - S8172465, CVE-2017-10090: Better handling of channel groups + - S8172469, CVE-2017-10096: Transform Transformer Exceptions + - S8173286, CVE-2017-10101: Better reading of text catalogs + - S8173697, CVE-2017-10107: Less Active Activations + - S8173770, CVE-2017-10074: Image conversion improvements + - S8174098, CVE-2017-10110: Better image fetching + - S8174105, CVE-2017-10108: Better naming attribution + - S8174113, CVE-2017-10109: Better sourcing of code + - S8174770: Check registry registration location + - S8174873: Improved certificate processing + - S8175106, CVE-2017-10115: Higher quality DSA operations + - S8175110, CVE-2017-10118: Higher quality ECDSA operations + - S8176055: JMX diagnostic improvements + - S8176067, CVE-2017-10116: Proper directory lookup processing + - S8176760, CVE-2017-10135: Better handling of PKCS8 material + - S8178135, CVE-2017-10176: Additional elliptic curve support + - S8181420, CVE-2017-10074: PPC: Image conversion improvements + - S8183551, CVE-2017-10074, PR3423: AArch64: Image conversion improvements + - S8184119, CVE-2017-10111: Incorrect return processing for the LF editor of MethodHandles.permuteArguments +* Import of OpenJDK 7 u151 build 0 + - S7117357: Warnings in sun.instrument, tools and other sun.* classes + - S7117570: Warnings in sun.mangement.* and its subpackages + - S7143230: fix warnings in java.util.jar, sun.tools.jar, zipfs demo, etc. + - S8022440: suppress deprecation warnings in sun.rmi + - S8024069: replace_in_map() should operate on parent maps + - S8026796: Make replace_in_map() on parent maps generic + - S8030787: [Parfait] JNI-related warnings from b119 for jdk/src/share/native/sun/awt/image + - S8030875: Macros for checking and returning on exceptions + - S8031737: CHECK_NULL and CHECK_EXCEPTION macros cleanup + - S8034912: backport of 8031737 to jdk8u breaks linux buld. + - S8035629: [parfait] JNI exc pending in jdk/src/windows/native/sun/windows/ShellFolder2.cpp + - S8037287: Windows build failed after JDK-8030787 + - S8048703: ReplacedNodes dumps it's content to tty + - S8080492: [Parfait] Uninitialised variable in jdk/src/java/desktop/windows/native/libawt/ + - S8139870: sun.management.LazyCompositeData.isTypeMatched() fails for composite types with items of ArrayType + - S8143377: Test PKCS8Test.java fails + - S8149450: LdapCtx.processReturnCode() throwing Null Pointer Exception + - S8155690: Update libPNG library to the latest up-to-date + - S8156804: Better constraint checking (sync with upstream version) + - S8162461: Hang due to JNI up-call made whilst holding JNI critical lock + - S8165231: java.nio.Bits.unaligned() doesn't return true on ppc + - S8165367: Additional tests for JEP 288: Disable SHA-1 Certificates + - S8173145: Menu is activated after using mnemonic Alt/Key combination + - S8174164: SafePointNode::_replaced_nodes breaks with irreducible loops + - S8175097: [TESTBUG] 8174164 fix missed the test + - S8175251: Failed to load RSA private key from pkcs12 + - S8176731: JCK tests in api/javax_xml/transform/ spec conformance started failing after 8172469 + - S8176769: Remove accidental spec change in jdk8u + - S8177449: (tz) Support tzdata2017b + - S8178996: [macos] JComboBox doesn't display popup in mixed JavaFX Swing Application on 8u131 and Mac OS 10.12 + - S8179014: JFileChooser with Windows look and feel crashes on win 10 + - S8179887: Build failure with glibc >= 2.24: error: 'int readdir_r(DIR*, dirent*, dirent**)' is deprecated + - S8180582: The bind to rmiregistry is rejected by registryFilter even though registryFilter is set + - S8181591: 8u141 L10n resource file update + - S8182054: Improve wsdl support + - S8184993: Jar file verification failing with SecurityException: digest missing xxx + - S8185501: Missing import in JAXP code + - S8185502: No overflow operator on OpenJDK 7 +* Import of OpenJDK 7 u151 build 1 + - S8185716: OpenJDK 7 PPC64 port uses a different ins_encode format in ppc.ad * Backports - S7177216, PR3398, RH1446700: native2ascii changes file permissions of input file - S8179084, PR3410, RH1455694: HotSpot VM fails to start when AggressiveHeap is set - S8181419, PR3414, RH1463144: Race in jdwp invoker handling may lead to crashes or invalid results +* AArch64 port + - S8144028, PR3431: Use AArch64 bit-test instructions in C2 + - S8152537, PR3431: aarch64: Make use of CBZ and CBNZ when comparing unsigned values with zero. New in release 2.6.10 (2017-05-16): diff -r c14782803cc7 -r ca9128374846 configure.ac --- a/configure.ac Tue Aug 01 14:13:09 2017 +0100 +++ b/configure.ac Tue Aug 08 15:22:45 2017 +0100 @@ -1,4 +1,4 @@ -AC_INIT([icedtea], [2.6.11pre01], [distro-pkg-dev at openjdk.java.net]) +AC_INIT([icedtea], [2.6.11], [distro-pkg-dev at openjdk.java.net]) AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) AM_MAINTAINER_MODE([enable]) AC_CONFIG_FILES([Makefile]) diff -r c14782803cc7 -r ca9128374846 hotspot.map.in --- a/hotspot.map.in Tue Aug 01 14:13:09 2017 +0100 +++ b/hotspot.map.in Tue Aug 08 15:22:45 2017 +0100 @@ -1,2 +1,2 @@ # version type(drop/hg) url changeset sha256sum -default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ a8044a7634d0 c1f2132ccb1e89cef9a440ea394108ee5203de7834974842a539526676cebd1c +default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 809ae803d8ea a6055f2eb2c6f159fdc20fc5268ffb27d6cb7959ed7af28ee8a0f862b5b6dbf8 diff -r c14782803cc7 -r ca9128374846 patches/boot/ecj-diamond.patch --- a/patches/boot/ecj-diamond.patch Tue Aug 01 14:13:09 2017 +0100 +++ b/patches/boot/ecj-diamond.patch Tue Aug 08 15:22:45 2017 +0100 @@ -1,6 +1,6 @@ diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java ---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2017-02-13 17:08:52.000000000 +0000 -+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2017-04-27 19:36:26.028892332 +0100 +--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2017-08-03 17:03:27.000000000 +0100 ++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2017-08-03 23:28:06.555896022 +0100 @@ -58,7 +58,7 @@ private CorbaConnection conn; @@ -11,8 +11,8 @@ public static synchronized void cleanCache( ORB orb ) { synchronized (iorMapLock) { diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java ---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java 2017-02-13 17:08:52.000000000 +0000 -+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java 2017-04-27 19:36:26.028892332 +0100 +--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java 2017-08-03 17:03:27.000000000 +0100 ++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java 2017-08-03 23:28:06.555896022 +0100 @@ -50,7 +50,7 @@ */ private class HookPutFields extends ObjectOutputStream.PutField @@ -23,8 +23,8 @@ /** * Put the value of the named boolean field into the persistent field. diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java ---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2017-02-13 17:08:52.000000000 +0000 -+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2017-04-27 19:36:26.028892332 +0100 +--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2017-08-03 17:03:27.000000000 +0100 ++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2017-08-03 23:28:06.555896022 +0100 @@ -1315,7 +1315,7 @@ protected void shutdownServants(boolean wait_for_completion) { Set oaset; @@ -35,8 +35,8 @@ for (ObjectAdapterFactory oaf : oaset) diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java ---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2017-02-13 17:08:52.000000000 +0000 -+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2017-04-27 19:36:26.028892332 +0100 +--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2017-08-03 17:03:27.000000000 +0100 ++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2017-08-03 23:28:06.555896022 +0100 @@ -108,7 +108,7 @@ private ThreadGroup threadGroup; @@ -56,8 +56,8 @@ for (WorkerThread wt : copy) { diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltSets.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltSets.java ---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltSets.java 2017-02-13 17:08:52.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltSets.java 2017-04-27 19:36:26.028892332 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltSets.java 2017-08-03 17:03:27.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltSets.java 2017-08-03 23:28:06.555896022 +0100 @@ -192,7 +192,7 @@ NodeSet dist = new NodeSet(); dist.setShouldCacheNodes(true); @@ -68,8 +68,8 @@ for (int i = 0; i < nl.getLength(); i++) { diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java ---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java 2017-02-13 17:08:52.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java 2017-04-27 19:36:26.028892332 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java 2017-08-03 17:03:27.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java 2017-08-03 23:28:06.555896022 +0100 @@ -220,7 +220,7 @@ public Map getEnvironmentHash() { @@ -188,8 +188,8 @@ jarVersions.put(new Long(440237), "xalan.jar from xalan-j_1_2"); jarVersions.put(new Long(436094), "xalan.jar from xalan-j_1_2_1"); diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java ---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java 2017-02-13 17:08:52.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java 2017-04-27 19:36:26.028892332 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java 2017-08-03 17:03:27.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java 2017-08-03 23:28:06.555896022 +0100 @@ -51,7 +51,7 @@ /** * Legal conversions between internal types. @@ -200,8 +200,8 @@ static { // Possible type conversions between internal types diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java ---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java 2017-02-13 17:08:52.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java 2017-04-27 19:36:26.032892268 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java 2017-08-03 17:03:27.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java 2017-08-03 23:28:06.555896022 +0100 @@ -139,7 +139,7 @@ private boolean _isStatic = false; @@ -225,8 +225,8 @@ // Possible conversions between Java and internal types java2Internal.put(Boolean.TYPE, Type.Boolean); diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java ---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java 2017-02-13 17:08:52.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java 2017-04-27 19:36:26.032892268 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java 2017-08-03 17:03:27.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java 2017-08-03 23:28:06.555896022 +0100 @@ -107,7 +107,7 @@ // Check if we have any declared namespaces @@ -273,8 +273,8 @@ SyntaxTreeNode n = _attributeElements.get(k); if (n instanceof LiteralAttribute) { diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java ---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java 2017-02-13 17:08:52.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java 2017-04-27 19:36:26.032892268 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java 2017-08-03 17:03:27.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java 2017-08-03 23:28:06.559895959 +0100 @@ -129,22 +129,22 @@ /** * A mapping between templates and test sequences. @@ -327,8 +327,8 @@ _rootPattern = null; diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java ---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java 2017-02-13 17:08:52.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java 2017-04-27 19:36:26.032892268 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java 2017-08-03 17:03:27.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java 2017-08-03 23:28:06.559895959 +0100 @@ -107,11 +107,11 @@ } @@ -365,9 +365,9 @@ _prefixMapping.put(prefix, uri); } diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java ---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java 2017-02-13 17:08:52.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java 2017-04-27 19:36:26.032892268 +0100 -@@ -121,7 +121,7 @@ +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java 2017-08-03 17:03:27.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java 2017-08-03 23:28:06.559895959 +0100 +@@ -122,7 +122,7 @@ /** * Mapping between mode names and Mode instances. */ @@ -376,7 +376,7 @@ /** * A reference to the default Mode object. -@@ -131,7 +131,7 @@ +@@ -132,7 +132,7 @@ /** * Mapping between extension URIs and their prefixes. */ @@ -385,7 +385,7 @@ /** * Reference to the stylesheet from which this stylesheet was -@@ -164,7 +164,7 @@ +@@ -165,7 +165,7 @@ /** * Mapping between key names and Key objects (needed by Key/IdPattern). */ @@ -395,8 +395,8 @@ /** * A reference to the SourceLoader set by the user (a URIResolver diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java ---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java 2017-02-13 17:08:52.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java 2017-04-27 19:36:26.032892268 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java 2017-08-03 17:03:27.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java 2017-08-03 23:28:06.559895959 +0100 @@ -38,8 +38,8 @@ final class SymbolTable { @@ -479,8 +479,8 @@ // Register the namespace URI Integer refcnt = _excludedURI.get(uri); diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java ---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java 2017-02-13 17:08:52.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java 2017-04-27 19:36:26.032892268 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java 2017-08-03 17:03:27.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java 2017-08-03 23:28:06.559895959 +0100 @@ -70,7 +70,7 @@ protected SyntaxTreeNode _parent; // Parent node private Stylesheet _stylesheet; // Stylesheet ancestor node @@ -509,8 +509,8 @@ locals.add(varOrParamName); } diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java ---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java 2017-02-13 17:08:52.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java 2017-04-27 19:36:26.032892268 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java 2017-08-03 17:03:27.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java 2017-08-03 23:28:06.559895959 +0100 @@ -127,7 +127,7 @@ * times. Note that patterns whose kernels are "*", "node()" * and "@*" can between shared by test sequences. @@ -521,8 +521,8 @@ public MethodGenerator(int access_flags, Type return_type, diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MultiHashtable.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MultiHashtable.java ---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MultiHashtable.java 2017-02-13 17:08:52.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MultiHashtable.java 2017-04-27 19:36:26.032892268 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MultiHashtable.java 2017-08-03 17:03:27.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MultiHashtable.java 2017-08-03 23:28:06.559895959 +0100 @@ -37,7 +37,7 @@ public final class MultiHashtable { static final long serialVersionUID = -6151608290510033572L; @@ -542,8 +542,8 @@ } set.add(value); diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java ---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java 2017-02-13 17:08:52.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java 2017-04-27 19:36:26.032892268 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java 2017-08-03 17:03:27.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java 2017-08-03 23:28:06.559895959 +0100 @@ -170,7 +170,7 @@ _parser = new Parser(this, useServicesMechanism); _featureManager = featureManager; @@ -572,8 +572,8 @@ _parser.init(); //_variableSerial = 1; diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java ---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java 2017-02-13 17:08:52.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java 2017-04-27 19:36:26.032892268 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java 2017-08-03 17:03:27.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java 2017-08-03 23:28:06.559895959 +0100 @@ -169,7 +169,7 @@ _count = 0; _current = 0; @@ -584,8 +584,8 @@ try { diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMWSFilter.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMWSFilter.java ---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMWSFilter.java 2017-02-13 17:08:52.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMWSFilter.java 2017-04-27 19:36:26.032892268 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMWSFilter.java 2017-08-03 17:03:27.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMWSFilter.java 2017-08-03 23:28:06.559895959 +0100 @@ -60,7 +60,7 @@ */ public DOMWSFilter(AbstractTranslet translet) { @@ -596,8 +596,8 @@ if (translet instanceof StripFilter) { m_filter = (StripFilter) translet; diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/KeyIndex.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/KeyIndex.java ---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/KeyIndex.java 2017-02-13 17:08:52.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/KeyIndex.java 2017-04-27 19:36:26.032892268 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/KeyIndex.java 2017-08-03 17:03:27.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/KeyIndex.java 2017-08-03 23:28:06.559895959 +0100 @@ -59,7 +59,7 @@ /** * A mapping from a document node to the mapping between values and nodesets @@ -626,8 +626,8 @@ } else { nodes = index.get(id); diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java ---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java 2017-02-13 17:08:52.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java 2017-04-27 19:36:26.032892268 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java 2017-08-03 17:03:27.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java 2017-08-03 23:28:06.559895959 +0100 @@ -56,7 +56,7 @@ private int _free; private int _size; @@ -638,8 +638,8 @@ private final class AxisIterator extends DTMAxisIteratorBase { // constitutive data diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java ---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java 2017-02-13 17:08:52.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java 2017-04-27 19:36:26.032892268 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java 2017-08-03 17:03:27.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java 2017-08-03 23:28:06.559895959 +0100 @@ -114,7 +114,7 @@ private int _namesSize = -1; @@ -659,8 +659,8 @@ } diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java ---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java 2017-02-13 17:08:52.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java 2017-04-27 19:36:26.032892268 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java 2017-08-03 17:03:27.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java 2017-08-03 23:28:06.559895959 +0100 @@ -279,7 +279,7 @@ */ public void addDecimalFormat(String name, DecimalFormatSymbols symbols) { @@ -689,8 +689,8 @@ } diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2SAX.java openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2SAX.java ---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2SAX.java 2017-02-13 17:08:52.000000000 +0000 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2SAX.java 2017-04-27 19:36:26.032892268 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2SAX.java 2017-08-03 17:03:27.000000000 +0100 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2SAX.java 2017-08-03 23:28:06.559895959 +0100 @@ -58,7 +58,7 @@ private ContentHandler _sax = null; private LexicalHandler _lex = null; @@ -701,8 +701,8 @@ public DOM2SAX(Node root) { From bugzilla-daemon at icedtea.classpath.org Thu Aug 10 05:17:20 2017 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 10 Aug 2017 05:17:20 +0000 Subject: [Bug 3431] [IcedTea7] Backport "8183551, CVE-2017-10074: AArch64: Image conversion improvements" In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3431 --- Comment #4 from hg commits --- details: http://icedtea.classpath.org//hg/release/icedtea7-2.6?cmd=changeset;node=b4e586e969d9 author: Andrew John Hughes date: Fri Aug 04 19:25:36 2017 +0100 Bump to 2.6.11. Upstream changes: - Bump to icedtea-2.6.11 - S7117357: Warnings in sun.instrument, tools and other sun.* classes - S7117570: Warnings in sun.mangement.* and its subpackages - S7143230: fix warnings in java.util.jar, sun.tools.jar, zipfs demo, etc. - S8022440: suppress deprecation warnings in sun.rmi - S8024069: replace_in_map() should operate on parent maps - S8026796: Make replace_in_map() on parent maps generic - S8030787: [Parfait] JNI-related warnings from b119 for jdk/src/share/native/sun/awt/image - S8030875: Macros for checking and returning on exceptions - S8031737: CHECK_NULL and CHECK_EXCEPTION macros cleanup - S8034912: backport of 8031737 to jdk8u breaks linux buld. - S8035629: [parfait] JNI exc pending in jdk/src/windows/native/sun/windows/ShellFolder2.cpp - S8037287: Windows build failed after JDK-8030787 - S8048703: ReplacedNodes dumps it's content to tty - S8080492: [Parfait] Uninitialised variable in jdk/src/java/desktop/windows/native/libawt/ - S8139870: sun.management.LazyCompositeData.isTypeMatched() fails for composite types with items of ArrayType - S8143377: Test PKCS8Test.java fails - S8144028, PR3431: Use AArch64 bit-test instructions in C2 - S8149450: LdapCtx.processReturnCode() throwing Null Pointer Exception - S8152537, PR3431: aarch64: Make use of CBZ and CBNZ when comparing unsigned values with zero. - S8155690: Update libPNG library to the latest up-to-date - S8156804: Better constraint checking - S8162461: Hang due to JNI up-call made whilst holding JNI critical lock - S8163958: Improved garbage collection - S8165231: java.nio.Bits.unaligned() doesn't return true on ppc - S8165367: Additional tests for JEP 288: Disable SHA-1 Certificates - S8167228: Update to libpng 1.6.28 - S8169209: Improved image post-processing steps - S8169392: Additional jar validation steps - S8170966: Right parenthesis issue - S8172204: Better Thread Pool execution - S8172461: Service Registration Lifecycle - S8172465: Better handling of channel groups - S8172469: Transform Transformer Exceptions - S8173145: Menu is activated after using mnemonic Alt/Key combination - S8173286: Better reading of text catalogs - S8173697: Less Active Activations - S8173770: Image conversion improvements - S8174098: Better image fetching - S8174105: Better naming attribution - S8174113: Better sourcing of code - S8174164: SafePointNode::_replaced_nodes breaks with irreducible loops - S8174729: Race Condition in java.lang.reflect.WeakCache - S8174770: Check registry registration location - S8174873: Improved certificate procesing - S8175097: [TESTBUG] 8174164 fix missed the test - S8175106: Higher quality DSA operations - S8175110: Higher quality ECDSA operations - S8175251: Failed to load RSA private key from pkcs12 - S8176055: JMX diagnostic improvements - S8176067: Proper directory lookup processing - S8176731: JCK tests in api/javax_xml/transform/ spec conformance started failing after 8172469 - S8176760: Better handling of PKCS8 material - S8176769: Remove accidental spec change in jdk8u - S8177449: (tz) Support tzdata2017b - S8178135: Additional elliptic curve support - S8178996: [macos] JComboBox doesn't display popup in mixed JavaFX Swing Application on 8u131 and Mac OS 10.12 - S8179014: JFileChooser with Windows look and feel crashes on win 10 - S8179887: Build failure with glibc >= 2.24: error: 'int readdir_r(DIR*, dirent*, dirent**)' is deprecated - S8180582: The bind to rmiregistry is rejected by registryFilter even though registryFilter is set - S8181420: PPC: Image conversion improvements - S8181591: 8u141 L10n resource file update - S8182054: Improve wsdl support - S8183551, PR3431: AArch64: Image conversion improvements - S8184119: Incorrect return processing for the LF editor of MethodHandles.permuteArguments - S8184993: Jar file verification failing with SecurityException: digest missing xxx - S8185501: Missing import in JAXP code - S8185502: No overflow operator on OpenJDK 7 - S8185716: OpenJDK 7 PPC64 port uses a different ins_encode format in ppc.ad ChangeLog: 2017-08-01 Andrew John Hughes Bump to 2.6.11. * Makefile.am, (JDK_UPDATE_VERSION): Bump to 141. (BUILD_VERSION): Set to b01. (CORBA_CHANGESET): Update to icedtea-2.6.11. (JAXP_CHANGESET): Likewise. (JAXWS_CHANGESET): Likewise. (JDK_CHANGESET): Likewise. (LANGTOOLS_CHANGESET): Likewise. (OPENJDK_CHANGESET): Likewise. (CORBA_SHA256SUM): Likewise. (JAXP_SHA256SUM): Likewise. (JAXWS_SHA256SUM): Likewise. (JDK_SHA256SUM): Likewise. (LANGTOOLS_SHA256SUM): Likewise. (OPENJDK_SHA256SUM): Likewise. * NEWS: Updated. * configure.ac: Bump to 2.6.11. * hotspot.map.in: Update to icedtea-2.6.11. * patches/boot/ecj-diamond.patch: Regenerated. Add cases in java.util.jar.Attributes, java.util.jar.JarVerifier, javax.imageio.spi.ServiceRegistry, sun.management.ConnectorAddressLink, sun.management.counter.perf.PerfInstrumentation, sun.management.Flag, sun.management.GarbageCollectionNotifInfoCompositeData, sun.management.HotspotCompilation, sun.management.HotspotDiagnostic, sun.management.HotspotThread, sun.management.jmxremote.ConnectorBootstrap, sun.management.ManagementFactoryHelper, sun.management.MappedMXBeanType, sun.management.NotificationEmitterSupport, sun.management.RuntimeImpl, sun.net.RegisterDomain, sun.tools.jar.CommandLine, sun.tools.jar.Manifest and sun.tools.jar.SignatureFile * patches/boot/ecj-multicatch.patch: Add cases in com.sun.imageio.plugins.jpeg.JPEGImageReader, sun.management.Agent, sun.management.GarbageCollectionNotifInfoCompositeData, sun.management.GcInfoCompositeData, sun.rmi.server.UnicastRef, sun.rmi.server.UnicastServerRef, javax.xml.transform.TransformerException, com.sun.xml.internal.ws.util.xml.XmlUtil, sun.rmi.registry.RegistryImpl_Skel and sun.rmi.transport.DGCImpl_Stub * patches/boot/ecj-stringswitch.patch: Regenerated. * patches/boot/ecj-trywithresources.patch: Add cases in sun.management.jmxremote.ConnectorBootstrap. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From andrew at icedtea.classpath.org Thu Aug 10 05:19:44 2017 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 10 Aug 2017 05:19:44 +0000 Subject: /hg/release/icedtea7-forest-2.6: Added tag icedtea-2.6.11 for ch... Message-ID: changeset f53c56dda663 in /hg/release/icedtea7-forest-2.6 details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6?cmd=changeset;node=f53c56dda663 author: andrew date: Thu Aug 10 06:31:30 2017 +0100 Added tag icedtea-2.6.11 for changeset 499e7894cc44 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 499e7894cc44 -r f53c56dda663 .hgtags --- a/.hgtags Thu Aug 03 17:03:27 2017 +0100 +++ b/.hgtags Thu Aug 10 06:31:30 2017 +0100 @@ -672,3 +672,4 @@ 54009dd18b706ad1ef023cd472a8c1a76f9faac6 icedtea-2.6.11pre01 ae6c3762cdc9b1610211cd1ad1a29ed1a7f8471e jdk7u151-b00 c63b09823b9fa0ddeb37c1ac534569a9227c5bf6 jdk7u151-b01 +499e7894cc4485715dbcc4f1d7436feda0668b70 icedtea-2.6.11 From andrew at icedtea.classpath.org Thu Aug 10 05:19:49 2017 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 10 Aug 2017 05:19:49 +0000 Subject: /hg/release/icedtea7-forest-2.6/corba: Added tag icedtea-2.6.11 ... Message-ID: changeset a7f8705b50f5 in /hg/release/icedtea7-forest-2.6/corba details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/corba?cmd=changeset;node=a7f8705b50f5 author: andrew date: Thu Aug 10 06:31:27 2017 +0100 Added tag icedtea-2.6.11 for changeset 803456f62297 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 803456f62297 -r a7f8705b50f5 .hgtags --- a/.hgtags Thu Aug 03 17:03:27 2017 +0100 +++ b/.hgtags Thu Aug 10 06:31:27 2017 +0100 @@ -674,3 +674,4 @@ ff69bc83070b70b07cc9eea4731e9332acdcdff7 icedtea-2.6.11pre01 d232281a177cd3f80d48eca3f1bbc3919f720a1e jdk7u151-b00 f74af33b4963a7c484ffa605f11e41efd92966e3 jdk7u151-b01 +803456f62297d9d22725e414f29e09d0c008ca43 icedtea-2.6.11 From andrew at icedtea.classpath.org Thu Aug 10 05:19:53 2017 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 10 Aug 2017 05:19:53 +0000 Subject: /hg/release/icedtea7-forest-2.6/jaxp: Added tag icedtea-2.6.11 f... Message-ID: changeset 968b46df5f0e in /hg/release/icedtea7-forest-2.6/jaxp details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jaxp?cmd=changeset;node=968b46df5f0e author: andrew date: Thu Aug 10 06:31:27 2017 +0100 Added tag icedtea-2.6.11 for changeset 46f2d7395127 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 46f2d7395127 -r 968b46df5f0e .hgtags --- a/.hgtags Thu Aug 03 17:03:27 2017 +0100 +++ b/.hgtags Thu Aug 10 06:31:27 2017 +0100 @@ -675,3 +675,4 @@ f16026b79deb95d60dc9d213a0a417c626d00e4c icedtea-2.6.11pre01 26391fa1d876e3bf563f21328d7ea24d5d657b21 jdk7u151-b00 57fc772ac86ac6cbd297cd6f09a63f9c016c271c jdk7u151-b01 +46f2d7395127d38d0f5fd9b270f4edeb8939b248 icedtea-2.6.11 From andrew at icedtea.classpath.org Thu Aug 10 05:19:58 2017 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 10 Aug 2017 05:19:58 +0000 Subject: /hg/release/icedtea7-forest-2.6/jaxws: Added tag icedtea-2.6.11 ... Message-ID: changeset 3e70a6a17fa9 in /hg/release/icedtea7-forest-2.6/jaxws details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jaxws?cmd=changeset;node=3e70a6a17fa9 author: andrew date: Thu Aug 10 06:31:28 2017 +0100 Added tag icedtea-2.6.11 for changeset e17af60ebbd6 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r e17af60ebbd6 -r 3e70a6a17fa9 .hgtags --- a/.hgtags Thu Aug 03 17:03:27 2017 +0100 +++ b/.hgtags Thu Aug 10 06:31:28 2017 +0100 @@ -674,3 +674,4 @@ f8bd60e998968cc16e72c76a7dc8eadb3a980960 icedtea-2.6.11pre01 1f0dd7a7e0ccaa340db533da400bb83ca1ad3cf2 jdk7u151-b00 3233576db658552e8933b1cd86f5586507564f44 jdk7u151-b01 +e17af60ebbd6a4cf4e75181ae474123e52eb0ebc icedtea-2.6.11 From andrew at icedtea.classpath.org Thu Aug 10 05:20:03 2017 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 10 Aug 2017 05:20:03 +0000 Subject: /hg/release/icedtea7-forest-2.6/langtools: Added tag icedtea-2.6... Message-ID: changeset e24f25323b84 in /hg/release/icedtea7-forest-2.6/langtools details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/langtools?cmd=changeset;node=e24f25323b84 author: andrew date: Thu Aug 10 06:31:30 2017 +0100 Added tag icedtea-2.6.11 for changeset cddb1f9f8b9c diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r cddb1f9f8b9c -r e24f25323b84 .hgtags --- a/.hgtags Thu Aug 03 17:03:28 2017 +0100 +++ b/.hgtags Thu Aug 10 06:31:30 2017 +0100 @@ -674,3 +674,4 @@ a4814b6ff893d36aea91ccb16990d8a34840c07f icedtea-2.6.11pre01 4624941508c189c7b81c3393664741640a9b0467 jdk7u151-b00 205349c408f4715dbbaf428ceafca676e2333979 jdk7u151-b01 +cddb1f9f8b9cee5f9c54ececf59ecb51e1bbb730 icedtea-2.6.11 From andrew at icedtea.classpath.org Thu Aug 10 05:20:08 2017 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 10 Aug 2017 05:20:08 +0000 Subject: /hg/release/icedtea7-forest-2.6/hotspot: Added tag icedtea-2.6.1... Message-ID: changeset 3bcb98075200 in /hg/release/icedtea7-forest-2.6/hotspot details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=3bcb98075200 author: andrew date: Thu Aug 10 06:31:31 2017 +0100 Added tag icedtea-2.6.11 for changeset 809ae803d8ea diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 809ae803d8ea -r 3bcb98075200 .hgtags --- a/.hgtags Thu Aug 03 17:03:28 2017 +0100 +++ b/.hgtags Thu Aug 10 06:31:31 2017 +0100 @@ -909,3 +909,4 @@ a8044a7634d086a85ac71b8674b432424606a85c icedtea-2.6.11pre01 75662a7ec1719b3133636d09bd078968579a55ab jdk7u151-b00 d0c7cea0660f7a8188a7b8c1f6d1a6c8d6388fb0 jdk7u151-b01 +809ae803d8ea9fd1af5cda606931959086dde30c icedtea-2.6.11 From andrew at icedtea.classpath.org Thu Aug 10 05:20:14 2017 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 10 Aug 2017 05:20:14 +0000 Subject: /hg/release/icedtea7-forest-2.6/jdk: Added tag icedtea-2.6.11 fo... Message-ID: changeset e84636d7183c in /hg/release/icedtea7-forest-2.6/jdk details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=e84636d7183c author: andrew date: Thu Aug 10 06:31:29 2017 +0100 Added tag icedtea-2.6.11 for changeset 082c6e8b8812 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 082c6e8b8812 -r e84636d7183c .hgtags --- a/.hgtags Thu Aug 03 17:21:57 2017 +0100 +++ b/.hgtags Thu Aug 10 06:31:29 2017 +0100 @@ -661,3 +661,4 @@ 5f11354f6257afb5ad2c2055a2effc604a0a860b icedtea-2.6.11pre01 871e3350966f67b95768a94c1854f1515cfa56ca jdk7u151-b00 da1c09ab9b742fa77c0e667c2218b8d626432656 jdk7u151-b01 +082c6e8b8812ad9c8bc175b2bcb65a3c470f36cd icedtea-2.6.11 From bugzilla-daemon at icedtea.classpath.org Thu Aug 10 05:57:56 2017 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 10 Aug 2017 05:57:56 +0000 Subject: [Bug 3433] Backport of 8185164: GetOwnedMonitorInfo() returns incorrect owned monitor In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3433 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Target Milestone|--- |2.6.12 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From andrew at icedtea.classpath.org Thu Aug 10 06:02:19 2017 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 10 Aug 2017 06:02:19 +0000 Subject: /hg/release/icedtea7-2.6: 2 new changesets Message-ID: changeset 105183b232e0 in /hg/release/icedtea7-2.6 details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=105183b232e0 author: Andrew John Hughes date: Thu Aug 10 06:30:25 2017 +0100 Added tag icedtea-2.6.11 for changeset ca9128374846 changeset a5d248ab7da3 in /hg/release/icedtea7-2.6 details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=a5d248ab7da3 author: Andrew John Hughes date: Thu Aug 10 07:14:00 2017 +0100 Start 2.6.12 release cycle. 2017-08-09 Andrew John Hughes * NEWS: Add section for 2.6.12. * configure.ac: Bump to 2.6.12pre00. diffstat: .hgtags | 1 + ChangeLog | 5 +++++ NEWS | 2 ++ configure.ac | 2 +- 4 files changed, 9 insertions(+), 1 deletions(-) diffs (41 lines): diff -r ca9128374846 -r a5d248ab7da3 .hgtags --- a/.hgtags Tue Aug 08 15:22:45 2017 +0100 +++ b/.hgtags Thu Aug 10 07:14:00 2017 +0100 @@ -76,3 +76,4 @@ 522b039fb608f817d500e0df3b5488808bc97a6e icedtea-2.6.10pre01 ed3a064f86655b3742334bbd592b2f1624f44cf6 icedtea-2.6.10 2019ab2d8dc7f3472d45d2a87172d2258b18e9bc icedtea-2.6.11pre01 +ca912837484636232172dcce97145dcb8205f3df icedtea-2.6.11 diff -r ca9128374846 -r a5d248ab7da3 ChangeLog --- a/ChangeLog Tue Aug 08 15:22:45 2017 +0100 +++ b/ChangeLog Thu Aug 10 07:14:00 2017 +0100 @@ -1,3 +1,8 @@ +2017-08-09 Andrew John Hughes + + * NEWS: Add section for 2.6.12. + * configure.ac: Bump to 2.6.12pre00. + 2017-08-08 Andrew John Hughes * NEWS: Set release date to today. diff -r ca9128374846 -r a5d248ab7da3 NEWS --- a/NEWS Tue Aug 08 15:22:45 2017 +0100 +++ b/NEWS Thu Aug 10 07:14:00 2017 +0100 @@ -12,6 +12,8 @@ CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY +New in release 2.6.12 (2017-10-XX): + New in release 2.6.11 (2017-08-08): * Security fixes diff -r ca9128374846 -r a5d248ab7da3 configure.ac --- a/configure.ac Tue Aug 08 15:22:45 2017 +0100 +++ b/configure.ac Thu Aug 10 07:14:00 2017 +0100 @@ -1,4 +1,4 @@ -AC_INIT([icedtea], [2.6.11], [distro-pkg-dev at openjdk.java.net]) +AC_INIT([icedtea], [2.6.12pre00], [distro-pkg-dev at openjdk.java.net]) AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) AM_MAINTAINER_MODE([enable]) AC_CONFIG_FILES([Makefile]) From andrew at icedtea.classpath.org Thu Aug 10 06:09:24 2017 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 10 Aug 2017 06:09:24 +0000 Subject: /hg/icedtea7: Add 2.6.11 release notes. Message-ID: changeset 0932f17a5dcd in /hg/icedtea7 details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=0932f17a5dcd author: Andrew John Hughes date: Thu Aug 10 07:20:50 2017 +0100 Add 2.6.11 release notes. 2017-08-09 Andrew John Hughes * NEWS: Add 2.6.11 release notes. diffstat: ChangeLog | 4 +++ NEWS | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 82 insertions(+), 3 deletions(-) diffs (107 lines): diff -r c9d88a4e6a7d -r 0932f17a5dcd ChangeLog --- a/ChangeLog Thu Aug 03 21:00:02 2017 +0100 +++ b/ChangeLog Thu Aug 10 07:20:50 2017 +0100 @@ -1,3 +1,7 @@ +2017-08-09 Andrew John Hughes + + * NEWS: Add 2.6.11 release notes. + 2017-05-15 Andrew John Hughes PR3390: javac.in and javah.in should use @PERL@ diff -r c9d88a4e6a7d -r 0932f17a5dcd NEWS --- a/NEWS Thu Aug 03 21:00:02 2017 +0100 +++ b/NEWS Thu Aug 10 07:20:50 2017 +0100 @@ -17,14 +17,89 @@ * New features - PR3180: Support building without pre-compiled headers * Backports - - S7177216, PR3398, RH1446700: native2ascii changes file permissions of input file - S8076221, PR2809, RH1302385: Disable RC4 cipher suites - S8078823, PR2809: javax/net/ssl/ciphersuites/DisabledAlgorithms.java fails intermittently - S8148516, PR2809: Improve the default strength of EC in JDK [test/javax/net/ssl/ciphersuites/DisabledAlgorithms.java update] +* Bug fixes + - PR3162: Remove reference to AbstractPlainDatagramSocketImpl.c, removed in 8072466 + +New in release 2.6.11 (2017-08-08): + +* Security fixes + - S8163958, CVE-2017-10102: Improved garbage collection + - S8167228: Update to libpng 1.6.28 + - S8169209, CVE-2017-10053: Improved image post-processing steps + - S8169392, CVE-2017-10067: Additional jar validation steps + - S8170966, CVE-2017-10081: Right parenthesis issue + - S8172204, CVE-2017-10087: Better Thread Pool execution + - S8172461, CVE-2017-10089: Service Registration Lifecycle + - S8172465, CVE-2017-10090: Better handling of channel groups + - S8172469, CVE-2017-10096: Transform Transformer Exceptions + - S8173286, CVE-2017-10101: Better reading of text catalogs + - S8173697, CVE-2017-10107: Less Active Activations + - S8173770, CVE-2017-10074: Image conversion improvements + - S8174098, CVE-2017-10110: Better image fetching + - S8174105, CVE-2017-10108: Better naming attribution + - S8174113, CVE-2017-10109: Better sourcing of code + - S8174770: Check registry registration location + - S8174873: Improved certificate processing + - S8175106, CVE-2017-10115: Higher quality DSA operations + - S8175110, CVE-2017-10118: Higher quality ECDSA operations + - S8176055: JMX diagnostic improvements + - S8176067, CVE-2017-10116: Proper directory lookup processing + - S8176760, CVE-2017-10135: Better handling of PKCS8 material + - S8178135, CVE-2017-10176: Additional elliptic curve support + - S8181420, CVE-2017-10074: PPC: Image conversion improvements + - S8183551, CVE-2017-10074, PR3423: AArch64: Image conversion improvements + - S8184119, CVE-2017-10111: Incorrect return processing for the LF editor of MethodHandles.permuteArguments +* Import of OpenJDK 7 u151 build 0 + - S7117357: Warnings in sun.instrument, tools and other sun.* classes + - S7117570: Warnings in sun.mangement.* and its subpackages + - S7143230: fix warnings in java.util.jar, sun.tools.jar, zipfs demo, etc. + - S8022440: suppress deprecation warnings in sun.rmi + - S8024069: replace_in_map() should operate on parent maps + - S8026796: Make replace_in_map() on parent maps generic + - S8030787: [Parfait] JNI-related warnings from b119 for jdk/src/share/native/sun/awt/image + - S8030875: Macros for checking and returning on exceptions + - S8031737: CHECK_NULL and CHECK_EXCEPTION macros cleanup + - S8034912: backport of 8031737 to jdk8u breaks linux buld. + - S8035629: [parfait] JNI exc pending in jdk/src/windows/native/sun/windows/ShellFolder2.cpp + - S8037287: Windows build failed after JDK-8030787 + - S8048703: ReplacedNodes dumps it's content to tty + - S8080492: [Parfait] Uninitialised variable in jdk/src/java/desktop/windows/native/libawt/ + - S8139870: sun.management.LazyCompositeData.isTypeMatched() fails for composite types with items of ArrayType + - S8143377: Test PKCS8Test.java fails + - S8149450: LdapCtx.processReturnCode() throwing Null Pointer Exception + - S8155690: Update libPNG library to the latest up-to-date + - S8156804: Better constraint checking (sync with upstream version) + - S8162461: Hang due to JNI up-call made whilst holding JNI critical lock + - S8165231: java.nio.Bits.unaligned() doesn't return true on ppc + - S8165367: Additional tests for JEP 288: Disable SHA-1 Certificates + - S8173145: Menu is activated after using mnemonic Alt/Key combination + - S8174164: SafePointNode::_replaced_nodes breaks with irreducible loops + - S8175097: [TESTBUG] 8174164 fix missed the test + - S8175251: Failed to load RSA private key from pkcs12 + - S8176731: JCK tests in api/javax_xml/transform/ spec conformance started failing after 8172469 + - S8176769: Remove accidental spec change in jdk8u + - S8177449: (tz) Support tzdata2017b + - S8178996: [macos] JComboBox doesn't display popup in mixed JavaFX Swing Application on 8u131 and Mac OS 10.12 + - S8179014: JFileChooser with Windows look and feel crashes on win 10 + - S8179887: Build failure with glibc >= 2.24: error: 'int readdir_r(DIR*, dirent*, dirent**)' is deprecated + - S8180582: The bind to rmiregistry is rejected by registryFilter even though registryFilter is set + - S8181591: 8u141 L10n resource file update + - S8182054: Improve wsdl support + - S8184993: Jar file verification failing with SecurityException: digest missing xxx + - S8185501: Missing import in JAXP code + - S8185502: No overflow operator on OpenJDK 7 +* Import of OpenJDK 7 u151 build 1 + - S8185716: OpenJDK 7 PPC64 port uses a different ins_encode format in ppc.ad +* Backports + - S7177216, PR3398, RH1446700: native2ascii changes file permissions of input file - S8179084, PR3410, RH1455694: HotSpot VM fails to start when AggressiveHeap is set - S8181419, PR3414, RH1463144: Race in jdwp invoker handling may lead to crashes or invalid results -* Bug fixes - - PR3162: Remove reference to AbstractPlainDatagramSocketImpl.c, removed in 8072466 +* AArch64 port + - S8144028, PR3431: Use AArch64 bit-test instructions in C2 + - S8152537, PR3431: aarch64: Make use of CBZ and CBNZ when comparing unsigned values with zero. New in release 2.6.10 (2017-05-16): From bugzilla-daemon at icedtea.classpath.org Thu Aug 10 06:10:34 2017 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 10 Aug 2017 06:10:34 +0000 Subject: [Bug 3379] [IcedTea7] Perl should be mandatory In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3379 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED --- Comment #3 from Andrew John Hughes --- Fixed in 2.6.10 and 2.7.0pre13. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Aug 10 06:11:41 2017 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 10 Aug 2017 06:11:41 +0000 Subject: [Bug 3390] [IcedTea7] javac.in and javah.in should use @PERL@ rather than a hardcoded path In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3390 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED --- Comment #3 from Andrew John Hughes --- Fixed in 2.6.10 and 2.7.0pre13. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Thu Aug 10 06:34:45 2017 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 10 Aug 2017 06:34:45 +0000 Subject: [Bug 3433] Backport of 8185164: GetOwnedMonitorInfo() returns incorrect owned monitor In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3433 --- Comment #1 from Yasumasa Suenaga --- This change cannot apply to jdk7. However, I want you to apply the change for objectMonitor.cpp. It is the essence of this request. http://mail.openjdk.java.net/pipermail/jdk8u-dev/2017-August/006813.html -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Sat Aug 12 10:34:58 2017 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sat, 12 Aug 2017 10:34:58 +0000 Subject: [Bug 3433] Backport of 8185164: GetOwnedMonitorInfo() returns incorrect owned monitor In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3433 --- Comment #2 from Yasumasa Suenaga --- This patch has been backported to jdk8u: http://hg.openjdk.java.net/jdk8u/jdk8u-dev/hotspot/rev/b55756ea22d8 I guess this changeset can be applied to IcedTea 7. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Tue Aug 15 16:42:41 2017 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 15 Aug 2017 16:42:41 +0000 Subject: [Bug 3435] Hacked by ./M4RY_PR0S4 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3435 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Group| |security CC| |unassigned at icedtea.classpat | |h.org Component|Fields & Values |IcedTea Product|Bug Database |IcedTea -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Tue Aug 15 16:42:54 2017 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 15 Aug 2017 16:42:54 +0000 Subject: [Bug 3435] Hacked by ./M4RY_PR0S4 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3435 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Reporter|1 |0 accessible| | -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Tue Aug 15 16:43:28 2017 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 15 Aug 2017 16:43:28 +0000 Subject: [Bug 3435] Hacked by ./M4RY_PR0S4 In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3435 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #1641|0 |1 is obsolete| | -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Tue Aug 15 16:56:59 2017 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 15 Aug 2017 16:56:59 +0000 Subject: [Bug 3433] [IcedTea7] Backport "8185164: GetOwnedMonitorInfo() returns incorrect owned monitor" In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3433 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Summary|Backport of 8185164: |[IcedTea7] Backport |GetOwnedMonitorInfo() |"8185164: |returns incorrect owned |GetOwnedMonitorInfo() |monitor |returns incorrect owned | |monitor" -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Tue Aug 15 16:57:39 2017 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 15 Aug 2017 16:57:39 +0000 Subject: [Bug 3438] New: [IcedTea8] Backport "8185164: GetOwnedMonitorInfo() returns incorrect owned monitor" Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3438 Bug ID: 3438 Summary: [IcedTea8] Backport "8185164: GetOwnedMonitorInfo() returns incorrect owned monitor" Product: IcedTea Version: 8-hg Hardware: all OS: All Status: NEW Severity: minor Priority: P5 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: gnu.andrew at redhat.com CC: unassigned at icedtea.classpath.org Clone of bug 3433 for IcedTea 3.x. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Tue Aug 15 16:57:52 2017 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 15 Aug 2017 16:57:52 +0000 Subject: [Bug 3438] [IcedTea8] Backport "8185164: GetOwnedMonitorInfo() returns incorrect owned monitor" In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3438 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Target Milestone|--- |3.6.0 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Wed Aug 16 15:08:24 2017 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 16 Aug 2017 15:08:24 +0000 Subject: [Bug 3439] New: [IcedTea8] Backport "8146086: Publishing two webservices on same port fails with "java.net.BindException: Address already in use"" Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3439 Bug ID: 3439 Summary: [IcedTea8] Backport "8146086: Publishing two webservices on same port fails with "java.net.BindException: Address already in use"" Product: IcedTea Version: 8-hg Hardware: all OS: All Status: NEW Severity: normal Priority: P5 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: gnu.andrew at redhat.com CC: unassigned at icedtea.classpath.org https://bugzilla.redhat.com/show_bug.cgi?id=1478405 https://bugzilla.redhat.com/show_bug.cgi?id=1478402 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Wed Aug 16 15:08:54 2017 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 16 Aug 2017 15:08:54 +0000 Subject: [Bug 3439] [IcedTea8] Backport "8146086: Publishing two webservices on same port fails with "java.net.BindException: Address already in use"" In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3439 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED URL| |https://bugs.openjdk.java.n | |et/browse/JDK-8146086 Target Milestone|--- |3.6.0 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Mon Aug 21 10:57:44 2017 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 21 Aug 2017 10:57:44 +0000 Subject: [Bug 3441] New: saddasd Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3441 Bug ID: 3441 Summary: saddasd Product: IcedTea Version: 2.6.2 Hardware: x86_64 OS: Windows Status: NEW Severity: normal Priority: P5 Component: AddVM Assignee: doko at ubuntu.com Reporter: retasbro.01 at gmail.com CC: unassigned at icedtea.classpath.org Created attachment 1645 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=1645&action=edit sadsada sadasdasdsa -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Mon Aug 21 18:03:45 2017 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 21 Aug 2017 18:03:45 +0000 Subject: [Bug 3443] New: [IcedTea7] OpenJDK on aarch64 has fatal error "Field too big for insn" Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3443 Bug ID: 3443 Summary: [IcedTea7] OpenJDK on aarch64 has fatal error "Field too big for insn" Product: IcedTea Version: 7-hg Hardware: aarch64 OS: All Status: NEW Severity: major Priority: P5 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: gnu.andrew at redhat.com CC: unassigned at icedtea.classpath.org https://bugzilla.redhat.com/show_bug.cgi?id=1482244 # A fatal error has been detected by the Java Runtime Environment: # # Internal Error (assembler_aarch64.hpp:226), pid=14956, tid=281472602731008 # guarantee(chk == -1 || chk == 0) failed: Field too big for insn # # JRE version: OpenJDK Runtime Environment (7.0_151) (build 1.7.0_151-mockbuild_2017_08_02_08_31-b00) # Java VM: OpenJDK 64-Bit Server VM (24.151-b00 mixed mode linux-aarch64 compressed oops) # Derivative: IcedTea 2.6.10 # Distribution: Red Hat Enterprise Linux Server release 7.4 (Maipo), package rhel-2.6.11.1.el7_4-aarch64 u151-b00 # Failed to write core dump. Core dumps have been disabled. To enable core dumping, try "ulimit -c unlimited" before starting Java again "8144028: Use AArch64 bit-test instructions in C2" had to be backported for one of the security fixes. It looks like we also need: 8145438: Guarantee failures since 8144028: Use AArch64 bit-test instructions in C2 Summary: Implement short and long versions of bit test instructions. Reviewed-by: kvn -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Mon Aug 21 18:06:50 2017 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 21 Aug 2017 18:06:50 +0000 Subject: [Bug 3443] [IcedTea7] OpenJDK on aarch64 has fatal error "Field too big for insn" In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3443 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED Target Milestone|--- |2.6.12 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Mon Aug 21 18:07:43 2017 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 21 Aug 2017 18:07:43 +0000 Subject: [Bug 3443] [IcedTea7] OpenJDK on aarch64 has fatal error "Field too big for insn" In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3443 Andrew John Hughes changed: What |Removed |Added ---------------------------------------------------------------------------- URL| |https://bugs.openjdk.java.n | |et/browse/JDK-8145438 -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From aph at redhat.com Tue Aug 22 09:22:06 2017 From: aph at redhat.com (Andrew Haley) Date: Tue, 22 Aug 2017 10:22:06 +0100 Subject: [Bug 3443] New: [IcedTea7] OpenJDK on aarch64 has fatal error "Field too big for insn" In-Reply-To: References: Message-ID: On 21/08/17 19:03, bugzilla-daemon at icedtea.classpath.org wrote: > "8144028: Use AArch64 bit-test instructions in C2" had to be backported for one > of the security fixes. 8144028 is just a performance fix. How is it needed by one of the security fixes? Which one? -- Andrew Haley Java Platform Lead Engineer Red Hat UK Ltd. EAC8 43EB D3EF DB98 CC77 2FAD A5CD 6035 332F A671 From andrew at icedtea.classpath.org Fri Aug 25 16:18:47 2017 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 25 Aug 2017 16:18:47 +0000 Subject: /hg/icedtea7-forest/corba: 5 new changesets Message-ID: changeset b20a7028f741 in /hg/icedtea7-forest/corba details: http://icedtea.classpath.org/hg/icedtea7-forest/corba?cmd=changeset;node=b20a7028f741 author: andrew date: Wed Aug 16 16:15:08 2017 +0100 Added tag icedtea-2.7.0pre13 for changeset 11f5122b24e0 changeset d232281a177c in /hg/icedtea7-forest/corba details: http://icedtea.classpath.org/hg/icedtea7-forest/corba?cmd=changeset;node=d232281a177c author: andrew date: Wed May 03 03:39:45 2017 +0100 Added tag jdk7u141-b02 for changeset 39240de9d277 changeset f74af33b4963 in /hg/icedtea7-forest/corba details: http://icedtea.classpath.org/hg/icedtea7-forest/corba?cmd=changeset;node=f74af33b4963 author: andrew date: Tue Aug 01 14:12:26 2017 +0100 Added tag jdk7u151-b00 for changeset d232281a177c changeset 829d2dbc9d2c in /hg/icedtea7-forest/corba details: http://icedtea.classpath.org/hg/icedtea7-forest/corba?cmd=changeset;node=829d2dbc9d2c author: andrew date: Thu Aug 03 07:27:54 2017 +0100 Added tag jdk7u151-b01 for changeset f74af33b4963 changeset 772062092675 in /hg/icedtea7-forest/corba details: http://icedtea.classpath.org/hg/icedtea7-forest/corba?cmd=changeset;node=772062092675 author: andrew date: Tue Aug 22 02:03:44 2017 +0100 Merge jdk7u151-b01 diffstat: .hgtags | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 11f5122b24e0 -r 772062092675 .hgtags --- a/.hgtags Thu Jul 27 16:57:27 2017 +0100 +++ b/.hgtags Tue Aug 22 02:03:44 2017 +0100 @@ -665,3 +665,7 @@ 61c10a1eaa7b6f77e63f90e624a82a664a451d42 jdk7u141-b00 caa46a309b1195a0301956e7416633b717553925 jdk7u141-b01 3ca84ee78bd392cad0e29f7c9d0098565c94b085 icedtea-2.7.0pre12 +11f5122b24e0dc471d4add89e4a2089579f78fad icedtea-2.7.0pre13 +39240de9d27767c8bad74e34f83f0a4902a9ef85 jdk7u141-b02 +d232281a177cd3f80d48eca3f1bbc3919f720a1e jdk7u151-b00 +f74af33b4963a7c484ffa605f11e41efd92966e3 jdk7u151-b01 From andrew at icedtea.classpath.org Fri Aug 25 16:18:53 2017 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 25 Aug 2017 16:18:53 +0000 Subject: /hg/icedtea7-forest/jaxp: 9 new changesets Message-ID: changeset a23041fec82b in /hg/icedtea7-forest/jaxp details: http://icedtea.classpath.org/hg/icedtea7-forest/jaxp?cmd=changeset;node=a23041fec82b author: andrew date: Wed Aug 16 16:15:09 2017 +0100 Added tag icedtea-2.7.0pre13 for changeset 03c6bf5e7a4d changeset 008d9fffd739 in /hg/icedtea7-forest/jaxp details: http://icedtea.classpath.org/hg/icedtea7-forest/jaxp?cmd=changeset;node=008d9fffd739 author: andrew date: Wed May 03 03:39:47 2017 +0100 Added tag jdk7u141-b02 for changeset b4b91a7beb18 changeset 922361b28778 in /hg/icedtea7-forest/jaxp details: http://icedtea.classpath.org/hg/icedtea7-forest/jaxp?cmd=changeset;node=922361b28778 author: aefimov date: Wed Jul 26 15:09:26 2017 +0100 8172469: Transform Transformer Exceptions Reviewed-by: joehw changeset 53caea33a6d1 in /hg/icedtea7-forest/jaxp details: http://icedtea.classpath.org/hg/icedtea7-forest/jaxp?cmd=changeset;node=53caea33a6d1 author: aefimov date: Thu Apr 06 21:26:31 2017 +0300 8176731: JCK tests in api/javax_xml/transform/ spec conformance started failing after 8172469 Reviewed-by: joehw, dfuchs changeset 2b90e2ab84bf in /hg/icedtea7-forest/jaxp details: http://icedtea.classpath.org/hg/icedtea7-forest/jaxp?cmd=changeset;node=2b90e2ab84bf author: ljiang date: Tue Jun 06 09:39:00 2017 -0700 8181591: 8u141 L10n resource file update Reviewed-by: coffeys changeset 26391fa1d876 in /hg/icedtea7-forest/jaxp details: http://icedtea.classpath.org/hg/icedtea7-forest/jaxp?cmd=changeset;node=26391fa1d876 author: andrew date: Fri Jul 28 13:17:19 2017 +0100 8185501: Missing import in JAXP code Summary: DTMManager missing an ObjectFactory import after JDK-8172469 Reviewed-by: andrew Contributed-by: Michal Vala changeset 57fc772ac86a in /hg/icedtea7-forest/jaxp details: http://icedtea.classpath.org/hg/icedtea7-forest/jaxp?cmd=changeset;node=57fc772ac86a author: andrew date: Tue Aug 01 14:12:27 2017 +0100 Added tag jdk7u151-b00 for changeset 26391fa1d876 changeset 9a5675f6421e in /hg/icedtea7-forest/jaxp details: http://icedtea.classpath.org/hg/icedtea7-forest/jaxp?cmd=changeset;node=9a5675f6421e author: andrew date: Thu Aug 03 07:27:55 2017 +0100 Added tag jdk7u151-b01 for changeset 57fc772ac86a changeset 112c9edb3630 in /hg/icedtea7-forest/jaxp details: http://icedtea.classpath.org/hg/icedtea7-forest/jaxp?cmd=changeset;node=112c9edb3630 author: andrew date: Tue Aug 22 02:03:46 2017 +0100 Merge jdk7u151-b01 diffstat: .hgtags | 4 + src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java | 2 +- src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_sv.properties | 2 +- src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_sv.properties | 4 +- src/com/sun/org/apache/xml/internal/dtm/DTMConfigurationException.java | 101 -- src/com/sun/org/apache/xml/internal/dtm/DTMException.java | 345 +--------- src/com/sun/org/apache/xml/internal/dtm/DTMManager.java | 42 +- src/com/sun/org/apache/xml/internal/res/XMLErrorResources_sv.java | 2 +- src/javax/xml/transform/TransformerConfigurationException.java | 2 + src/javax/xml/transform/TransformerException.java | 137 ++- 10 files changed, 107 insertions(+), 534 deletions(-) diffs (truncated from 956 to 500 lines): diff -r 03c6bf5e7a4d -r 112c9edb3630 .hgtags --- a/.hgtags Thu Jul 27 16:57:27 2017 +0100 +++ b/.hgtags Tue Aug 22 02:03:46 2017 +0100 @@ -666,3 +666,7 @@ f347b141975453f642ae1140a45aa7c6127551dd jdk7u141-b00 e096a279a1c226d7d3a4aa19d5beeba1fb0507cf jdk7u141-b01 b24121efd081d1385be1591e0350bfe736118e71 icedtea-2.7.0pre12 +03c6bf5e7a4d69177c9bc8bb3e8d68656890f790 icedtea-2.7.0pre13 +b4b91a7beb185c0a8a14b83d2b05cfd7fc33c6fe jdk7u141-b02 +26391fa1d876e3bf563f21328d7ea24d5d657b21 jdk7u151-b00 +57fc772ac86ac6cbd297cd6f09a63f9c016c271c jdk7u151-b01 diff -r 03c6bf5e7a4d -r 112c9edb3630 src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java --- a/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java Thu Jul 27 16:57:27 2017 +0100 +++ b/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java Tue Aug 22 02:03:46 2017 +0100 @@ -483,7 +483,7 @@ {"ER0000" , "{0}" }, { ER_NO_CURLYBRACE, - "Fel: Uttryck kan inte inneh\u00E5lla '{'"}, + "Fel: Uttryck f\u00E5r inte inneh\u00E5lla '{'"}, { ER_ILLEGAL_ATTRIBUTE , "{0} har ett otill\u00E5tet attribut: {1}"}, diff -r 03c6bf5e7a4d -r 112c9edb3630 src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_sv.properties --- a/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_sv.properties Thu Jul 27 16:57:27 2017 +0100 +++ b/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_sv.properties Tue Aug 22 02:03:46 2017 +0100 @@ -33,4 +33,4 @@ # Messages from erroneous set-up IncompatibleNamespaceContext = Typ av NamespaceContext \u00E4r inkompatibel med XInclude; det kr\u00E4vs en instans av XIncludeNamespaceSupport -ExpandedSystemId = Kunde inte ut\u00F6ka system-ID:t f\u00F6r inkluderad resurs +ExpandedSystemId = Kunde inte ut\u00F6ka system-id:t f\u00F6r inkluderad resurs diff -r 03c6bf5e7a4d -r 112c9edb3630 src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_sv.properties --- a/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_sv.properties Thu Jul 27 16:57:27 2017 +0100 +++ b/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_sv.properties Tue Aug 22 02:03:46 2017 +0100 @@ -80,7 +80,7 @@ cvc-pattern-valid = cvc-pattern-valid: V\u00E4rdet ''{0}'' \u00E4r ogiltigt med aktuellt m\u00F6nster ''{1}'' f\u00F6r typ ''{2}''. cvc-totalDigits-valid = cvc-totalDigits-valid: V\u00E4rdet ''{0}'' har {1} siffror, men det totala antalet siffror \u00E4r begr\u00E4nsat till {2}. cvc-type.2 = cvc-type.2: Typdefinitionen kan inte vara abstrakt f\u00F6r elementet {0}. - cvc-type.3.1.1 = cvc-type.3.1.1: Elementet ''{0}'' har enkel typ och kan inte inneh\u00E5lla attribut, ut\u00F6ver s\u00E5dana vars namnrymd \u00E4r identisk med ''http://www.w3.org/2001/XMLSchema-instance'' och vars [lokala namn] har n\u00E5gotdera av ''type'', ''nil'', ''schemaLocation'' eller ''noNamespaceSchemaLocation''. Hittade dock attributet ''{1}''. + cvc-type.3.1.1 = cvc-type.3.1.1: Elementet ''{0}'' har enkel typ och f\u00E5r inte inneh\u00E5lla attribut, ut\u00F6ver s\u00E5dana vars namnrymd \u00E4r identisk med ''http://www.w3.org/2001/XMLSchema-instance'' och vars [lokala namn] har n\u00E5gotdera av ''type'', ''nil'', ''schemaLocation'' eller ''noNamespaceSchemaLocation''. Hittade dock attributet ''{1}''. cvc-type.3.1.2 = cvc-type.3.1.2: Elementet ''{0}'' har enkel typ och f\u00E5r inte inneh\u00E5lla [underordnade] med elementinformation. cvc-type.3.1.3 = cvc-type.3.1.3: V\u00E4rdet ''{1}'' i elementet ''{0}'' \u00E4r ogiltigt. @@ -251,7 +251,7 @@ rcase-RecurseUnordered.2 = rcase-RecurseUnordered.2: Det finns ingen fullst\u00E4ndigt fungerande mappning mellan partiklarna. # We're using sch-props-correct.2 instead of the old src-redefine.1 # src-redefine.1 = src-redefine.1: The component ''{0}'' is begin redefined, but its corresponding component isn't in the schema document being redefined (with namespace ''{2}''), but in a different document, with namespace ''{1}''. - sch-props-correct.2 = sch-props-correct.2: Ett schema kan inte inneh\u00E5lla tv\u00E5 globala komponenter med samma namn. Detta schema har tv\u00E5 f\u00F6rekomster av ''{0}''. + sch-props-correct.2 = sch-props-correct.2: Ett schema f\u00E5r inte inneh\u00E5lla tv\u00E5 globala komponenter med samma namn. Detta schema har tv\u00E5 f\u00F6rekomster av ''{0}''. st-props-correct.2 = st-props-correct.2: Cirkul\u00E4ra definitioner har identifierats f\u00F6r enkel typ ''{0}''. Detta inneb\u00E4r att ''{0}'' ing\u00E5r i sin egen typhierarki, vilket \u00E4r fel. st-props-correct.3 = st-props-correct.3: Ett fel intr\u00E4ffade f\u00F6r typ ''{0}''. V\u00E4rdet f\u00F6r '{'slutgiltigt'}' i '{'bastypdefinitionen'}', ''{1}'', f\u00F6rbjuder h\u00E4rledning med begr\u00E4nsning. totalDigits-valid-restriction = totalDigits-valid-restriction: I definitionen f\u00F6r {2} \u00E4r v\u00E4rdet ''{0}'' f\u00F6r ''totalDigits'' ogiltigt eftersom det m\u00E5ste vara mindre \u00E4n eller lika med v\u00E4rdet f\u00F6r ''totalDigits'' som har angetts som ''{1}'' i n\u00E5gon typ f\u00F6r \u00F6verordnad. diff -r 03c6bf5e7a4d -r 112c9edb3630 src/com/sun/org/apache/xml/internal/dtm/DTMConfigurationException.java --- a/src/com/sun/org/apache/xml/internal/dtm/DTMConfigurationException.java Thu Jul 27 16:57:27 2017 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,101 +0,0 @@ -/* - * reserved comment block - * DO NOT REMOVE OR ALTER! - */ -/* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/* - * $Id: DTMConfigurationException.java,v 1.2.4.1 2005/09/15 08:14:52 suresh_emailid Exp $ - */ -package com.sun.org.apache.xml.internal.dtm; - -import javax.xml.transform.SourceLocator; - -/** - * Indicates a serious configuration error. - */ -public class DTMConfigurationException extends DTMException { - static final long serialVersionUID = -4607874078818418046L; - - /** - * Create a new DTMConfigurationException with no - * detail mesage. - */ - public DTMConfigurationException() { - super("Configuration Error"); - } - - /** - * Create a new DTMConfigurationException with - * the String specified as an error message. - * - * @param msg The error message for the exception. - */ - public DTMConfigurationException(String msg) { - super(msg); - } - - /** - * Create a new DTMConfigurationException with a - * given Exception base cause of the error. - * - * @param e The exception to be encapsulated in a - * DTMConfigurationException. - */ - public DTMConfigurationException(Throwable e) { - super(e); - } - - /** - * Create a new DTMConfigurationException with the - * given Exception base cause and detail message. - * - * @param msg The detail message. - * @param e The exception to be wrapped in a DTMConfigurationException - */ - public DTMConfigurationException(String msg, Throwable e) { - super(msg, e); - } - - /** - * Create a new DTMConfigurationException from a message and a Locator. - * - *

This constructor is especially useful when an application is - * creating its own exception from within a DocumentHandler - * callback.

- * - * @param message The error or warning message. - * @param locator The locator object for the error or warning. - */ - public DTMConfigurationException(String message, - SourceLocator locator) { - super(message, locator); - } - - /** - * Wrap an existing exception in a DTMConfigurationException. - * - * @param message The error or warning message, or null to - * use the message from the embedded exception. - * @param locator The locator object for the error or warning. - * @param e Any exception. - */ - public DTMConfigurationException(String message, - SourceLocator locator, - Throwable e) { - super(message, locator, e); - } -} diff -r 03c6bf5e7a4d -r 112c9edb3630 src/com/sun/org/apache/xml/internal/dtm/DTMException.java --- a/src/com/sun/org/apache/xml/internal/dtm/DTMException.java Thu Jul 27 16:57:27 2017 +0100 +++ b/src/com/sun/org/apache/xml/internal/dtm/DTMException.java Tue Aug 22 02:03:46 2017 +0100 @@ -1,13 +1,13 @@ /* - * reserved comment block - * DO NOT REMOVE OR ALTER! + * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. */ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * @@ -17,129 +17,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* - * $Id: DTMException.java,v 1.3 2005/09/28 13:48:50 pvedula Exp $ - */ package com.sun.org.apache.xml.internal.dtm; - -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; - -import javax.xml.transform.SourceLocator; - -import com.sun.org.apache.xml.internal.res.XMLErrorResources; -import com.sun.org.apache.xml.internal.res.XMLMessages; - - /** - * This class specifies an exceptional condition that occured + * This class specifies an exceptional condition that occurred * in the DTM module. */ public class DTMException extends RuntimeException { static final long serialVersionUID = -775576419181334734L; - /** Field locator specifies where the error occured. - * @serial */ - SourceLocator locator; - - /** - * Method getLocator retrieves an instance of a SourceLocator - * object that specifies where an error occured. - * - * @return A SourceLocator object, or null if none was specified. - */ - public SourceLocator getLocator() { - return locator; - } - - /** - * Method setLocator sets an instance of a SourceLocator - * object that specifies where an error occured. - * - * @param location A SourceLocator object, or null to clear the location. - */ - public void setLocator(SourceLocator location) { - locator = location; - } - - /** Field containedException specifies a wrapped exception. May be null. - * @serial */ - Throwable containedException; - - /** - * This method retrieves an exception that this exception wraps. - * - * @return An Throwable object, or null. - * @see #getCause - */ - public Throwable getException() { - return containedException; - } - - /** - * Returns the cause of this throwable or null if the - * cause is nonexistent or unknown. (The cause is the throwable that - * caused this throwable to get thrown.) - */ - public Throwable getCause() { - - return ((containedException == this) - ? null - : containedException); - } - - /** - * Initializes the cause of this throwable to the specified value. - * (The cause is the throwable that caused this throwable to get thrown.) - * - *

This method can be called at most once. It is generally called from - * within the constructor, or immediately after creating the - * throwable. If this throwable was created - * with {@link #DTMException(Throwable)} or - * {@link #DTMException(String,Throwable)}, this method cannot be called - * even once. - * - * @param cause the cause (which is saved for later retrieval by the - * {@link #getCause()} method). (A null value is - * permitted, and indicates that the cause is nonexistent or - * unknown.) - * @return a reference to this Throwable instance. - * @throws IllegalArgumentException if cause is this - * throwable. (A throwable cannot - * be its own cause.) - * @throws IllegalStateException if this throwable was - * created with {@link #DTMException(Throwable)} or - * {@link #DTMException(String,Throwable)}, or this method has already - * been called on this throwable. - */ - public synchronized Throwable initCause(Throwable cause) { - - if ((this.containedException == null) && (cause != null)) { - throw new IllegalStateException(XMLMessages.createXMLMessage(XMLErrorResources.ER_CANNOT_OVERWRITE_CAUSE, null)); //"Can't overwrite cause"); - } - - if (cause == this) { - throw new IllegalArgumentException( - XMLMessages.createXMLMessage(XMLErrorResources.ER_SELF_CAUSATION_NOT_PERMITTED, null)); //"Self-causation not permitted"); - } - - this.containedException = cause; - - return this; - } - /** * Create a new DTMException. * * @param message The error or warning message. */ public DTMException(String message) { - super(message); - - this.containedException = null; - this.locator = null; } /** @@ -148,11 +41,7 @@ * @param e The exception to be wrapped. */ public DTMException(Throwable e) { - - super(e.getMessage()); - - this.containedException = e; - this.locator = null; + super(e); } /** @@ -166,220 +55,6 @@ * @param e Any exception */ public DTMException(String message, Throwable e) { - - super(((message == null) || (message.length() == 0)) - ? e.getMessage() - : message); - - this.containedException = e; - this.locator = null; - } - - /** - * Create a new DTMException from a message and a Locator. - * - *

This constructor is especially useful when an application is - * creating its own exception from within a DocumentHandler - * callback.

- * - * @param message The error or warning message. - * @param locator The locator object for the error or warning. - */ - public DTMException(String message, SourceLocator locator) { - - super(message); - - this.containedException = null; - this.locator = locator; - } - - /** - * Wrap an existing exception in a DTMException. - * - * @param message The error or warning message, or null to - * use the message from the embedded exception. - * @param locator The locator object for the error or warning. - * @param e Any exception - */ - public DTMException(String message, SourceLocator locator, - Throwable e) { - - super(message); - - this.containedException = e; - this.locator = locator; - } - - /** - * Get the error message with location information - * appended. - */ - public String getMessageAndLocation() { - - StringBuffer sbuffer = new StringBuffer(); - String message = super.getMessage(); - - if (null != message) { - sbuffer.append(message); - } - - if (null != locator) { - String systemID = locator.getSystemId(); - int line = locator.getLineNumber(); - int column = locator.getColumnNumber(); - - if (null != systemID) { - sbuffer.append("; SystemID: "); - sbuffer.append(systemID); - } - - if (0 != line) { - sbuffer.append("; Line#: "); - sbuffer.append(line); - } - - if (0 != column) { - sbuffer.append("; Column#: "); - sbuffer.append(column); - } - } - - return sbuffer.toString(); - } - - /** - * Get the location information as a string. - * - * @return A string with location info, or null - * if there is no location information. - */ - public String getLocationAsString() { - - if (null != locator) { - StringBuffer sbuffer = new StringBuffer(); - String systemID = locator.getSystemId(); - int line = locator.getLineNumber(); - int column = locator.getColumnNumber(); - - if (null != systemID) { - sbuffer.append("; SystemID: "); - sbuffer.append(systemID); - } - - if (0 != line) { - sbuffer.append("; Line#: "); - sbuffer.append(line); - } - - if (0 != column) { - sbuffer.append("; Column#: "); - sbuffer.append(column); - } - - return sbuffer.toString(); - } else { - return null; - } - } - - /** - * Print the the trace of methods from where the error - * originated. This will trace all nested exception - * objects, as well as this object. - */ - public void printStackTrace() { - printStackTrace(new java.io.PrintWriter(System.err, true)); - } - - /** - * Print the the trace of methods from where the error - * originated. This will trace all nested exception - * objects, as well as this object. - * @param s The stream where the dump will be sent to. - */ - public void printStackTrace(java.io.PrintStream s) { - printStackTrace(new java.io.PrintWriter(s)); - } - - /** - * Print the the trace of methods from where the error - * originated. This will trace all nested exception - * objects, as well as this object. - * @param s The writer where the dump will be sent to. - */ - public void printStackTrace(java.io.PrintWriter s) { - - if (s == null) { - s = new java.io.PrintWriter(System.err, true); - } - - try { - String locInfo = getLocationAsString(); - - if (null != locInfo) { - s.println(locInfo); - } - - super.printStackTrace(s); - } catch (Throwable e) {} - - boolean isJdk14OrHigher = false; - try { - Throwable.class.getMethod("getCause", (Class[]) null); - isJdk14OrHigher = true; - } catch (NoSuchMethodException nsme) { - // do nothing - } - - // The printStackTrace method of the Throwable class in jdk 1.4 - // and higher will include the cause when printing the backtrace. - // The following code is only required when using jdk 1.3 or lower - if (!isJdk14OrHigher) { - Throwable exception = getException(); From andrew at icedtea.classpath.org Fri Aug 25 16:19:00 2017 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 25 Aug 2017 16:19:00 +0000 Subject: /hg/icedtea7-forest/jaxws: 6 new changesets Message-ID: changeset b79bed2853ae in /hg/icedtea7-forest/jaxws details: http://icedtea.classpath.org/hg/icedtea7-forest/jaxws?cmd=changeset;node=b79bed2853ae author: andrew date: Wed Aug 16 16:15:09 2017 +0100 Added tag icedtea-2.7.0pre13 for changeset e76c114177c1 changeset 2f079804f696 in /hg/icedtea7-forest/jaxws details: http://icedtea.classpath.org/hg/icedtea7-forest/jaxws?cmd=changeset;node=2f079804f696 author: andrew date: Wed May 03 03:39:48 2017 +0100 Added tag jdk7u141-b02 for changeset 1af82a2d3d16 changeset 1f0dd7a7e0cc in /hg/icedtea7-forest/jaxws details: http://icedtea.classpath.org/hg/icedtea7-forest/jaxws?cmd=changeset;node=1f0dd7a7e0cc author: aefimov date: Thu Jul 27 04:25:00 2017 +0100 8182054: Improve wsdl support Summary: Also reviewed by Roman Grigoriadi Reviewed-by: joehw, lancea changeset 3233576db658 in /hg/icedtea7-forest/jaxws details: http://icedtea.classpath.org/hg/icedtea7-forest/jaxws?cmd=changeset;node=3233576db658 author: andrew date: Tue Aug 01 14:12:28 2017 +0100 Added tag jdk7u151-b00 for changeset 1f0dd7a7e0cc changeset 7a9a6ffac242 in /hg/icedtea7-forest/jaxws details: http://icedtea.classpath.org/hg/icedtea7-forest/jaxws?cmd=changeset;node=7a9a6ffac242 author: andrew date: Thu Aug 03 07:27:56 2017 +0100 Added tag jdk7u151-b01 for changeset 3233576db658 changeset 30295a209fc5 in /hg/icedtea7-forest/jaxws details: http://icedtea.classpath.org/hg/icedtea7-forest/jaxws?cmd=changeset;node=30295a209fc5 author: andrew date: Tue Aug 22 02:03:47 2017 +0100 Merge jdk7u151-b01 diffstat: .hgtags | 4 + src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/Options.java | 19 +- src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/WsimportOptions.java | 6 + src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/DOMForest.java | 25 +- src/share/jaxws_classes/com/sun/tools/internal/xjc/Options.java | 15 +- src/share/jaxws_classes/com/sun/xml/internal/ws/util/DOMUtil.java | 63 +--- src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/XmlUtil.java | 129 +++++++++- 7 files changed, 202 insertions(+), 59 deletions(-) diffs (truncated from 507 to 500 lines): diff -r e76c114177c1 -r 30295a209fc5 .hgtags --- a/.hgtags Thu Jul 27 16:57:29 2017 +0100 +++ b/.hgtags Tue Aug 22 02:03:47 2017 +0100 @@ -665,3 +665,7 @@ 90c86962aa2e81ecd8d5d79a282f2492447e4c6e jdk7u141-b00 506e24eee4e1887fbfdd77512f830b75e14c5759 jdk7u141-b01 878d12a073cb9af917bae81b86acfdf3262e9f6d icedtea-2.7.0pre12 +e76c114177c1723134c9e65c0510046284956e8a icedtea-2.7.0pre13 +1af82a2d3d16626b8d2f5e633d23c027975406b8 jdk7u141-b02 +1f0dd7a7e0ccaa340db533da400bb83ca1ad3cf2 jdk7u151-b00 +3233576db658552e8933b1cd86f5586507564f44 jdk7u151-b01 diff -r e76c114177c1 -r 30295a209fc5 src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/Options.java --- a/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/Options.java Thu Jul 27 16:57:29 2017 +0100 +++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/Options.java Tue Aug 22 02:03:47 2017 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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 @@ -79,6 +79,15 @@ */ public boolean nocompile; + /** + * If true XML security features when parsing XML documents will be disabled. + * The default value is false. + * + * Boolean + * @since 2.2.9 + */ + public boolean disableXmlSecurity; + public enum Target { V2_0, V2_1, V2_2; @@ -310,6 +319,9 @@ throw new BadCommandLineException(WscompileMessages.WSCOMPILE_NO_SUCH_DIRECTORY(sourceDir.getPath())); } return 2; + } else if (args[i].equals("-disableXmlSecurity")) { + disableXmlSecurity(); + return 1; } else if (args[i].equals("-extension")) { compatibilityMode = EXTENSION; return 1; @@ -326,6 +338,11 @@ return 0; } + // protected method to allow overriding + protected void disableXmlSecurity() { + disableXmlSecurity= true; + } + /** * Obtains an operand and reports an error if it's not there. */ diff -r e76c114177c1 -r 30295a209fc5 src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/WsimportOptions.java --- a/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/WsimportOptions.java Thu Jul 27 16:57:29 2017 +0100 +++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/WsimportOptions.java Tue Aug 22 02:03:47 2017 +0100 @@ -445,4 +445,10 @@ } } } + + @Override + protected void disableXmlSecurity() { + super.disableXmlSecurity(); + schemaCompiler.getOptions().disableXmlSecurity = true; + } } diff -r e76c114177c1 -r 30295a209fc5 src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/DOMForest.java --- a/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/DOMForest.java Thu Jul 27 16:57:29 2017 +0100 +++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/DOMForest.java Tue Aug 22 02:03:47 2017 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2017, 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 @@ -26,15 +26,12 @@ package com.sun.tools.internal.ws.wsdl.parser; import com.sun.istack.internal.NotNull; -import com.sun.tools.internal.ws.resources.WscompileMessages; -import com.sun.tools.internal.ws.wscompile.AbortException; -import com.sun.tools.internal.ws.wscompile.DefaultAuthenticator; +import com.sun.tools.internal.ws.util.xml.XmlUtil; import com.sun.tools.internal.ws.wscompile.ErrorReceiver; import com.sun.tools.internal.ws.wscompile.WsimportOptions; import com.sun.tools.internal.ws.wsdl.document.schema.SchemaConstants; import com.sun.tools.internal.xjc.reader.internalizer.LocatorTable; import com.sun.xml.internal.bind.marshaller.DataWriter; -import com.sun.xml.internal.ws.util.JAXWSUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; @@ -51,9 +48,6 @@ import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.sax.SAXResult; -import javax.net.ssl.HttpsURLConnection; -import javax.net.ssl.HostnameVerifier; -import javax.net.ssl.SSLSession; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -118,13 +112,13 @@ this.entityResolver = entityResolver; this.errorReceiver = errReceiver; this.logic = logic; + // secure xml processing can be switched off if input requires it + boolean disableXmlSecurity = options == null ? false : options.disableXmlSecurity; + + DocumentBuilderFactory dbf = XmlUtil.newDocumentBuilderFactory(disableXmlSecurity); + this.parserFactory = XmlUtil.newSAXParserFactory(disableXmlSecurity); try { - DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); - dbf.setNamespaceAware(true); this.documentBuilder = dbf.newDocumentBuilder(); - - this.parserFactory = SAXParserFactory.newInstance(); - this.parserFactory.setNamespaceAware(true); } catch (ParserConfigurationException e) { throw new AssertionError(e); } @@ -368,7 +362,10 @@ public void dump(OutputStream out) throws IOException { try { // create identity transformer - Transformer it = TransformerFactory.newInstance().newTransformer(); + // secure xml processing can be switched off if input requires it + boolean secureProcessingEnabled = options == null || !options.disableXmlSecurity; + TransformerFactory tf = XmlUtil.newTransformerFactory(secureProcessingEnabled); + Transformer it = tf.newTransformer(); for (Map.Entry e : core.entrySet()) { out.write(("---<< " + e.getKey() + '\n').getBytes()); diff -r e76c114177c1 -r 30295a209fc5 src/share/jaxws_classes/com/sun/tools/internal/xjc/Options.java --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/Options.java Thu Jul 27 16:57:29 2017 +0100 +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/Options.java Tue Aug 22 02:03:47 2017 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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 @@ -104,6 +104,15 @@ public String encoding; /** + * If true XML security features when parsing XML documents will be disabled. + * The default value is false. + * + * Boolean + * @since 2.2.6 + */ + public boolean disableXmlSecurity; + + /** * Check the source schemas with extra scrutiny. * The exact meaning depends on the schema language. */ @@ -540,6 +549,10 @@ enableIntrospection = true; return 1; } + if (args[i].equals("-disableXmlSecurity")) { + disableXmlSecurity = true; + return 1; + } if (args[i].equals("-contentForWildcard")) { contentForWildcard = true; return 1; diff -r e76c114177c1 -r 30295a209fc5 src/share/jaxws_classes/com/sun/xml/internal/ws/util/DOMUtil.java --- a/src/share/jaxws_classes/com/sun/xml/internal/ws/util/DOMUtil.java Thu Jul 27 16:57:29 2017 +0100 +++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/util/DOMUtil.java Tue Aug 22 02:03:47 2017 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2017, 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 @@ -25,29 +25,27 @@ package com.sun.xml.internal.ws.util; -import org.w3c.dom.Document; -import org.w3c.dom.NamedNodeMap; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; -import org.w3c.dom.Element; -import org.xml.sax.SAXException; +import com.sun.istack.internal.NotNull; +import com.sun.istack.internal.Nullable; +import com.sun.xml.internal.ws.util.xml.XmlUtil; +import javax.xml.XMLConstants; +import javax.xml.namespace.NamespaceContext; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.FactoryConfigurationError; import javax.xml.parsers.ParserConfigurationException; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; -import javax.xml.XMLConstants; -import javax.xml.namespace.NamespaceContext; -import java.io.IOException; -import java.io.InputStream; +import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import java.util.ArrayList; -import com.sun.istack.internal.NotNull; -import com.sun.istack.internal.Nullable; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; /** * @author: JAXWS Development Team @@ -63,8 +61,7 @@ synchronized (DOMUtil.class) { if (db == null) { try { - DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); - dbf.setNamespaceAware(true); + DocumentBuilderFactory dbf = XmlUtil.newDocumentBuilderFactory(); db = dbf.newDocumentBuilder(); } catch (ParserConfigurationException e) { throw new FactoryConfigurationError(e); @@ -74,28 +71,6 @@ } } - public static Node createDOMNode(InputStream inputStream) { - - DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); - dbf.setNamespaceAware(true); - dbf.setValidating(false); - try { - DocumentBuilder builder = dbf.newDocumentBuilder(); - try { - return builder.parse(inputStream); - } catch (SAXException e) { - e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. - } catch (IOException e) { - e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. - } - } catch (ParserConfigurationException pce) { - IllegalArgumentException iae = new IllegalArgumentException(pce.getMessage()); - iae.initCause(pce); - throw iae; - } - return null; - } - /** * Traverses a DOM node and writes out on a streaming writer. * @@ -112,6 +87,7 @@ switch (child.getNodeType()) { case Node.PROCESSING_INSTRUCTION_NODE: writer.writeProcessingInstruction(child.getNodeValue()); + break; case Node.DOCUMENT_TYPE_NODE: break; case Node.CDATA_SECTION_NODE: @@ -126,6 +102,7 @@ case Node.ELEMENT_NODE: serializeNode((Element) child, writer); break; + default: break; } } } @@ -222,8 +199,9 @@ for (Node n = e.getFirstChild(); n != null; n = n.getNextSibling()) { if (n.getNodeType() == Node.ELEMENT_NODE) { Element c = (Element) n; - if (c.getLocalName().equals(local) && c.getNamespaceURI().equals(nsUri)) + if (c.getLocalName().equals(local) && c.getNamespaceURI().equals(nsUri)) { return c; + } } } return null; @@ -232,8 +210,11 @@ private static @NotNull String fixNull(@Nullable String s) { - if (s == null) return ""; - else return s; + if (s == null) { + return ""; + } else { + return s; + } } /** diff -r e76c114177c1 -r 30295a209fc5 src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/XmlUtil.java --- a/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/XmlUtil.java Thu Jul 27 16:57:29 2017 +0100 +++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/XmlUtil.java Tue Aug 22 02:03:47 2017 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2017, 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 @@ -40,13 +40,18 @@ import org.xml.sax.EntityResolver; import org.xml.sax.ErrorHandler; import org.xml.sax.SAXException; +import org.xml.sax.SAXNotRecognizedException; +import org.xml.sax.SAXNotSupportedException; import org.xml.sax.SAXParseException; import org.xml.sax.XMLReader; import org.xml.sax.InputSource; +import javax.xml.XMLConstants; import javax.xml.namespace.QName; +import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParserFactory; +import javax.xml.stream.XMLInputFactory; import javax.xml.transform.Result; import javax.xml.transform.Source; import javax.xml.transform.Transformer; @@ -57,16 +62,22 @@ import javax.xml.transform.sax.TransformerHandler; import javax.xml.transform.stream.StreamSource; import javax.xml.ws.WebServiceException; +import javax.xml.xpath.XPathFactory; +import javax.xml.xpath.XPathFactoryConfigurationException; import java.io.IOException; import java.io.InputStream; import java.io.OutputStreamWriter; import java.io.Writer; import java.net.URL; +import java.security.AccessController; +import java.security.PrivilegedAction; import java.util.ArrayList; import java.util.Enumeration; import java.util.Iterator; import java.util.List; import java.util.StringTokenizer; +import java.util.logging.Level; +import java.util.logging.Logger; /** * @author WS Development Team @@ -75,6 +86,27 @@ private final static String LEXICAL_HANDLER_PROPERTY = "http://xml.org/sax/properties/lexical-handler"; + private static final String DISALLOW_DOCTYPE_DECL = "http://apache.org/xml/features/disallow-doctype-decl"; + + private static final String EXTERNAL_GE = "http://xml.org/sax/features/external-general-entities"; + + private static final String EXTERNAL_PE = "http://xml.org/sax/features/external-parameter-entities"; + + private static final String LOAD_EXTERNAL_DTD = "http://apache.org/xml/features/nonvalidating/load-external-dtd"; + + private static final Logger LOGGER = Logger.getLogger(XmlUtil.class.getName()); + + private static final String DISABLE_XML_SECURITY = "com.sun.xml.internal.ws.disableXmlSecurity"; + + private static boolean XML_SECURITY_DISABLED = AccessController.doPrivileged( + new PrivilegedAction() { + @Override + public Boolean run() { + return Boolean.getBoolean(DISABLE_XML_SECURITY); + } + } + ); + public static String getPrefix(String s) { int i = s.indexOf(':'); if (i == -1) @@ -163,7 +195,7 @@ } public static String getTextForNode(Node node) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); NodeList children = node.getChildNodes(); if (children.getLength() == 0) @@ -334,15 +366,108 @@ * {@link ErrorHandler} that always treat the error as fatal. */ public static final ErrorHandler DRACONIAN_ERROR_HANDLER = new ErrorHandler() { + @Override public void warning(SAXParseException exception) { } + @Override public void error(SAXParseException exception) throws SAXException { throw exception; } + @Override public void fatalError(SAXParseException exception) throws SAXException { throw exception; } }; + + public static DocumentBuilderFactory newDocumentBuilderFactory() { + return newDocumentBuilderFactory(false); + } + + public static DocumentBuilderFactory newDocumentBuilderFactory(boolean disableSecurity) { + DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); + String featureToSet = XMLConstants.FEATURE_SECURE_PROCESSING; + try { + boolean securityOn = !isXMLSecurityDisabled(disableSecurity); + factory.setFeature(featureToSet, securityOn); + factory.setNamespaceAware(true); + if (securityOn) { + factory.setExpandEntityReferences(false); + featureToSet = DISALLOW_DOCTYPE_DECL; + factory.setFeature(featureToSet, true); + featureToSet = EXTERNAL_GE; + factory.setFeature(featureToSet, false); + featureToSet = EXTERNAL_PE; + factory.setFeature(featureToSet, false); + featureToSet = LOAD_EXTERNAL_DTD; + factory.setFeature(featureToSet, false); + } + } catch (ParserConfigurationException e) { + LOGGER.log(Level.WARNING, "Factory [{0}] doesn't support "+featureToSet+" feature!", new Object[] {factory.getClass().getName()} ); + } + return factory; + } + + public static TransformerFactory newTransformerFactory(boolean secureXmlProcessingEnabled) { + TransformerFactory factory = TransformerFactory.newInstance(); + try { + factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, isXMLSecurityDisabled(secureXmlProcessingEnabled)); + } catch (TransformerConfigurationException e) { + LOGGER.log(Level.WARNING, "Factory [{0}] doesn't support secure xml processing!", new Object[]{factory.getClass().getName()}); + } + return factory; + } + + public static TransformerFactory newTransformerFactory() { + return newTransformerFactory(true); + } + + public static SAXParserFactory newSAXParserFactory(boolean disableSecurity) { + SAXParserFactory factory = SAXParserFactory.newInstance(); + String featureToSet = XMLConstants.FEATURE_SECURE_PROCESSING; + try { + boolean securityOn = !isXMLSecurityDisabled(disableSecurity); + factory.setFeature(featureToSet, securityOn); + factory.setNamespaceAware(true); + if (securityOn) { + featureToSet = DISALLOW_DOCTYPE_DECL; + factory.setFeature(featureToSet, true); + featureToSet = EXTERNAL_GE; + factory.setFeature(featureToSet, false); + featureToSet = EXTERNAL_PE; + factory.setFeature(featureToSet, false); + featureToSet = LOAD_EXTERNAL_DTD; + factory.setFeature(featureToSet, false); + } + } catch (ParserConfigurationException | SAXNotRecognizedException | SAXNotSupportedException e) { + LOGGER.log(Level.WARNING, "Factory [{0}] doesn't support "+featureToSet+" feature!", new Object[]{factory.getClass().getName()}); + } + return factory; + } + + public static XPathFactory newXPathFactory(boolean secureXmlProcessingEnabled) { + XPathFactory factory = XPathFactory.newInstance(); + try { + factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, isXMLSecurityDisabled(secureXmlProcessingEnabled)); + } catch (XPathFactoryConfigurationException e) { + LOGGER.log(Level.WARNING, "Factory [{0}] doesn't support secure xml processing!", new Object[] { factory.getClass().getName() } ); + } + return factory; + } + + public static XMLInputFactory newXMLInputFactory(boolean secureXmlProcessingEnabled) { + XMLInputFactory factory = XMLInputFactory.newInstance(); + if (isXMLSecurityDisabled(secureXmlProcessingEnabled)) { + // TODO-Miran: are those apppropriate defaults? + factory.setProperty(XMLInputFactory.SUPPORT_DTD, false); + factory.setProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES, false); + } + return factory; From andrew at icedtea.classpath.org Fri Aug 25 16:19:06 2017 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 25 Aug 2017 16:19:06 +0000 Subject: /hg/icedtea7-forest/langtools: 5 new changesets Message-ID: changeset f789c0188e34 in /hg/icedtea7-forest/langtools details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=f789c0188e34 author: andrew date: Wed Aug 16 16:15:11 2017 +0100 Added tag icedtea-2.7.0pre13 for changeset a4036f67fb21 changeset 4624941508c1 in /hg/icedtea7-forest/langtools details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=4624941508c1 author: andrew date: Wed May 03 03:39:50 2017 +0100 Added tag jdk7u141-b02 for changeset ba8ba083c439 changeset 205349c408f4 in /hg/icedtea7-forest/langtools details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=205349c408f4 author: andrew date: Tue Aug 01 14:12:29 2017 +0100 Added tag jdk7u151-b00 for changeset 4624941508c1 changeset 47eceb9c81a2 in /hg/icedtea7-forest/langtools details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=47eceb9c81a2 author: andrew date: Thu Aug 03 07:27:58 2017 +0100 Added tag jdk7u151-b01 for changeset 205349c408f4 changeset c347e7b1109b in /hg/icedtea7-forest/langtools details: http://icedtea.classpath.org/hg/icedtea7-forest/langtools?cmd=changeset;node=c347e7b1109b author: andrew date: Tue Aug 22 02:03:50 2017 +0100 Merge jdk7u151-b01 diffstat: .hgtags | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diffs (11 lines): diff -r a4036f67fb21 -r c347e7b1109b .hgtags --- a/.hgtags Thu Jul 27 16:57:31 2017 +0100 +++ b/.hgtags Tue Aug 22 02:03:50 2017 +0100 @@ -665,3 +665,7 @@ b1802aa8be3a49d2a5c07160f2406165e309efde jdk7u141-b00 853798299f7a4f38745632dc256219fbf75f861e jdk7u141-b01 aca9535e921d64914e5288699c20e422e726df9a icedtea-2.7.0pre12 +a4036f67fb2179c3dbf8ca55d02e6ce210877448 icedtea-2.7.0pre13 +ba8ba083c4392a1ddfe40467de1e08d77443807e jdk7u141-b02 +4624941508c189c7b81c3393664741640a9b0467 jdk7u151-b00 +205349c408f4715dbbaf428ceafca676e2333979 jdk7u151-b01 From andrew at icedtea.classpath.org Fri Aug 25 16:19:13 2017 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 25 Aug 2017 16:19:13 +0000 Subject: /hg/icedtea7-forest/hotspot: 19 new changesets Message-ID: changeset e1f7ba65ead8 in /hg/icedtea7-forest/hotspot details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=e1f7ba65ead8 author: andrew date: Wed Aug 16 16:15:12 2017 +0100 Added tag icedtea-2.7.0pre13 for changeset 2a6fcefff99a changeset caa1441e595c in /hg/icedtea7-forest/hotspot details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=caa1441e595c author: andrew date: Wed May 03 03:39:51 2017 +0100 Added tag jdk7u141-b02 for changeset 56ad25be7d88 changeset 70191d4fad0c in /hg/icedtea7-forest/hotspot details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=70191d4fad0c author: thartmann date: Thu Mar 30 15:28:33 2017 +0200 8173770: Image conversion improvements Reviewed-by: kvn, vlivanov, dlong, rhalade, mschoene, iignatyev changeset 3a1e34513b37 in /hg/icedtea7-forest/hotspot details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=3a1e34513b37 author: andrew date: Wed Jul 26 19:57:31 2017 +0100 8179887: Build failure with glibc >= 2.24: error: 'int readdir_r(DIR*, dirent*, dirent**)' is deprecated Summary: Disable deprecated declarations so the build doesn't fail with -Werror Reviewed-by: omajid changeset c2c1b068bd58 in /hg/icedtea7-forest/hotspot details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=c2c1b068bd58 author: roland date: Wed Jul 26 22:37:27 2017 +0100 8024069: replace_in_map() should operate on parent maps Summary: type information gets lost because replace_in_map() doesn't update parent maps Reviewed-by: kvn, twisti changeset 0f18bae8b113 in /hg/icedtea7-forest/hotspot details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=0f18bae8b113 author: roland date: Wed Jul 26 23:35:36 2017 +0100 8026796: Make replace_in_map() on parent maps generic Summary: propagate node replacements along control flow edges to callers Reviewed-by: kvn, vlivanov changeset d7dca9011eba in /hg/icedtea7-forest/hotspot details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=d7dca9011eba author: vlivanov date: Mon Jul 14 03:29:42 2014 -0700 8048703: ReplacedNodes dumps it's content to tty Reviewed-by: roland, iveresov, drchase changeset d7ea04813d4b in /hg/icedtea7-forest/hotspot details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=d7ea04813d4b author: roland date: Wed Feb 15 17:26:37 2017 -0800 8174164: SafePointNode::_replaced_nodes breaks with irreducible loops Reviewed-by: kvn changeset c511b66277fb in /hg/icedtea7-forest/hotspot details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=c511b66277fb author: roland date: Thu Feb 16 15:14:44 2017 -0800 8175097: [TESTBUG] 8174164 fix missed the test Reviewed-by: kvn changeset c3c450608912 in /hg/icedtea7-forest/hotspot details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=c3c450608912 author: mdoerr date: Fri Jun 02 08:45:34 2017 +0200 8181420: PPC: Image conversion improvements Reviewed-by: thartmann, simonis, mbaesken changeset 75662a7ec171 in /hg/icedtea7-forest/hotspot details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=75662a7ec171 author: jvanek date: Fri Jul 28 13:33:03 2017 +0100 8185502: No overflow operator on OpenJDK 7 Summary: Remove usage of overflow in x86_32.ad Reviewed-by: roland, andrew changeset 9c1a6eb49acb in /hg/icedtea7-forest/hotspot details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=9c1a6eb49acb author: andrew date: Tue Aug 01 14:12:31 2017 +0100 Added tag jdk7u151-b00 for changeset 75662a7ec171 changeset d0c7cea0660f in /hg/icedtea7-forest/hotspot details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=d0c7cea0660f author: andrew date: Thu Aug 03 07:27:30 2017 +0100 8185716: OpenJDK 7 PPC64 port uses a different ins_encode format in ppc.ad Summary: Use existing ins_encode format for implementing 8181420 Reviewed-by: omajid changeset 1396a255c595 in /hg/icedtea7-forest/hotspot details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=1396a255c595 author: andrew date: Thu Aug 03 07:27:59 2017 +0100 Added tag jdk7u151-b01 for changeset d0c7cea0660f changeset a76b3fcf0261 in /hg/icedtea7-forest/hotspot details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=a76b3fcf0261 author: andrew date: Tue Aug 22 02:03:52 2017 +0100 Merge jdk7u151-b01 changeset 56c4b6069614 in /hg/icedtea7-forest/hotspot details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=56c4b6069614 author: aph date: Wed Aug 02 08:41:53 2017 +0100 8144028, PR3431: Use AArch64 bit-test instructions in C2 Reviewed-by: kvn changeset e5f3942b379a in /hg/icedtea7-forest/hotspot details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=e5f3942b379a author: fyang date: Wed Mar 23 18:00:46 2016 +0800 8152537, PR3431: aarch64: Make use of CBZ and CBNZ when comparing unsigned values with zero. Summary: aarch64: c2 make use of CBZ and CBNZ when comparing unsigned values with zero. Reviewed-by: aph changeset 541e6b9eb05f in /hg/icedtea7-forest/hotspot details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=541e6b9eb05f author: roland date: Tue Jul 04 21:23:37 2017 +0100 8183551, PR3431: AArch64: Image conversion improvements changeset 46d12689c870 in /hg/icedtea7-forest/hotspot details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=46d12689c870 author: aph date: Tue Aug 22 18:17:20 2017 +0100 8145438, PR3443, RH1482244: Guarantee failures since 8144028: Use AArch64 bit-test instructions in C2 Summary: Implement short and long versions of bit test instructions. Reviewed-by: kvn diffstat: .hgtags | 4 + make/linux/makefiles/gcc.make | 1 + src/cpu/aarch64/vm/aarch64.ad | 312 ++++++++++++++++++++++- src/cpu/aarch64/vm/assembler_aarch64.hpp | 33 ++- src/cpu/aarch64/vm/c1_MacroAssembler_aarch64.hpp | 2 + src/cpu/aarch64/vm/interp_masm_aarch64.cpp | 5 +- src/cpu/ppc/vm/ppc.ad | 25 + src/cpu/sparc/vm/sparc.ad | 134 +++++++++ src/cpu/x86/vm/x86_32.ad | 150 ++++++++++- src/cpu/x86/vm/x86_64.ad | 42 +++ src/share/vm/adlc/archDesc.cpp | 1 + src/share/vm/adlc/formssel.cpp | 3 +- src/share/vm/opto/c2_globals.hpp | 2 +- src/share/vm/opto/callGenerator.cpp | 11 +- src/share/vm/opto/callnode.cpp | 1 + src/share/vm/opto/callnode.hpp | 33 ++ src/share/vm/opto/classes.hpp | 1 + src/share/vm/opto/compile.cpp | 9 +- src/share/vm/opto/compile.hpp | 4 +- src/share/vm/opto/graphKit.cpp | 43 ++- src/share/vm/opto/graphKit.hpp | 2 +- src/share/vm/opto/ifnode.cpp | 2 +- src/share/vm/opto/loopPredicate.cpp | 219 +++++++++------ src/share/vm/opto/loopnode.cpp | 4 +- src/share/vm/opto/loopnode.hpp | 11 +- src/share/vm/opto/loopopts.cpp | 4 +- src/share/vm/opto/multnode.cpp | 57 ++++ src/share/vm/opto/multnode.hpp | 8 + src/share/vm/opto/node.cpp | 6 + src/share/vm/opto/output.cpp | 1 + src/share/vm/opto/parse.hpp | 5 +- src/share/vm/opto/parse1.cpp | 27 +- src/share/vm/opto/replacednodes.cpp | 223 ++++++++++++++++ src/share/vm/opto/replacednodes.hpp | 81 +++++ src/share/vm/opto/subnode.cpp | 54 +++ src/share/vm/opto/subnode.hpp | 9 + src/share/vm/runtime/vmStructs.cpp | 1 + src/share/vm/utilities/growableArray.hpp | 3 +- test/compiler/c2/TestReplacedNodesOSR.java | 86 ++++++ test/compiler/codegen/8144028/BitTests.java | 164 ++++++++++++ 40 files changed, 1650 insertions(+), 133 deletions(-) diffs (truncated from 2536 to 500 lines): diff -r 2a6fcefff99a -r 46d12689c870 .hgtags --- a/.hgtags Mon Jul 31 06:02:56 2017 +0100 +++ b/.hgtags Tue Aug 22 18:17:20 2017 +0100 @@ -900,3 +900,7 @@ be8da42894af5f7d11b4bad83e166186f01ce1b4 jdk7u141-b00 22c5a6ca09e35b63baf51bad4cb3d8f0cf326705 jdk7u141-b01 490b222d74de50e26c5b485c1fa47208541ade89 icedtea-2.7.0pre12 +2a6fcefff99ada26438e02d582ee9b497665994e icedtea-2.7.0pre13 +56ad25be7d88c2c2da562fe1e8879c8723d01da1 jdk7u141-b02 +75662a7ec1719b3133636d09bd078968579a55ab jdk7u151-b00 +d0c7cea0660f7a8188a7b8c1f6d1a6c8d6388fb0 jdk7u151-b01 diff -r 2a6fcefff99a -r 46d12689c870 make/linux/makefiles/gcc.make --- a/make/linux/makefiles/gcc.make Mon Jul 31 06:02:56 2017 +0100 +++ b/make/linux/makefiles/gcc.make Tue Aug 22 18:17:20 2017 +0100 @@ -172,6 +172,7 @@ else ACCEPTABLE_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare endif +ACCEPTABLE_WARNINGS += -Wno-deprecated-declarations CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ACCEPTABLE_WARNINGS) # Special cases diff -r 2a6fcefff99a -r 46d12689c870 src/cpu/aarch64/vm/aarch64.ad --- a/src/cpu/aarch64/vm/aarch64.ad Mon Jul 31 06:02:56 2017 +0100 +++ b/src/cpu/aarch64/vm/aarch64.ad Tue Aug 22 18:17:20 2017 +0100 @@ -1540,10 +1540,14 @@ return 0; } -bool Matcher::is_short_branch_offset(int rule, int br_size, int offset) -{ - Unimplemented(); - return false; +// Is this branch offset short enough that a short branch can be used? +// +// NOTE: If the platform does not provide any short branch variants, then +// this method should return false for offset 0. +bool Matcher::is_short_branch_offset(int rule, int br_size, int offset) { + // The passed offset is relative to address of the branch. + + return (-32768 <= offset && offset < 32768); } const bool Matcher::isSimpleConstant64(jlong value) { @@ -2439,7 +2443,6 @@ int disp = $mem$$disp; if (index == -1) { __ prfm(Address(base, disp), PSTL1KEEP); - __ nop(); } else { Register index_reg = as_Register(index); if (disp == 0) { @@ -10534,7 +10537,7 @@ ins_pipe(icmp_reg_reg); %} -instruct compL_reg_immI0(rFlagsReg cr, iRegL op1, immI0 zero) +instruct compL_reg_immL0(rFlagsReg cr, iRegL op1, immL0 zero) %{ match(Set cr (CmpL op1 zero)); @@ -10576,6 +10579,62 @@ ins_pipe(icmp_reg_imm); %} +instruct compUL_reg_reg(rFlagsRegU cr, iRegL op1, iRegL op2) +%{ + match(Set cr (CmpUL op1 op2)); + + effect(DEF cr, USE op1, USE op2); + + ins_cost(INSN_COST); + format %{ "cmp $op1, $op2" %} + + ins_encode(aarch64_enc_cmp(op1, op2)); + + ins_pipe(icmp_reg_reg); +%} + +instruct compUL_reg_immL0(rFlagsRegU cr, iRegL op1, immL0 zero) +%{ + match(Set cr (CmpUL op1 zero)); + + effect(DEF cr, USE op1); + + ins_cost(INSN_COST); + format %{ "tst $op1" %} + + ins_encode(aarch64_enc_cmp_imm_addsub(op1, zero)); + + ins_pipe(icmp_reg_imm); +%} + +instruct compUL_reg_immLAddSub(rFlagsRegU cr, iRegL op1, immLAddSub op2) +%{ + match(Set cr (CmpUL op1 op2)); + + effect(DEF cr, USE op1); + + ins_cost(INSN_COST); + format %{ "cmp $op1, $op2" %} + + ins_encode(aarch64_enc_cmp_imm_addsub(op1, op2)); + + ins_pipe(icmp_reg_imm); +%} + +instruct compUL_reg_immL(rFlagsRegU cr, iRegL op1, immL op2) +%{ + match(Set cr (CmpUL op1 op2)); + + effect(DEF cr, USE op1); + + ins_cost(INSN_COST * 2); + format %{ "cmp $op1, $op2" %} + + ins_encode(aarch64_enc_cmp_imm(op1, op2)); + + ins_pipe(icmp_reg_imm); +%} + instruct compP_reg_reg(rFlagsRegU cr, iRegP op1, iRegP op2) %{ match(Set cr (CmpP op1 op2)); @@ -11054,6 +11113,247 @@ ins_pipe(pipe_cmp_branch); %} +instruct cmpUI_imm0_branch(cmpOpU cmp, iRegIorL2I op1, immI0 op2, label labl, rFlagsRegU cr) %{ + match(If cmp (CmpU op1 op2)); + predicate(n->in(1)->as_Bool()->_test._test == BoolTest::ne + || n->in(1)->as_Bool()->_test._test == BoolTest::eq + || n->in(1)->as_Bool()->_test._test == BoolTest::gt + || n->in(1)->as_Bool()->_test._test == BoolTest::le); + effect(USE labl); + + ins_cost(BRANCH_COST); + format %{ "cbw$cmp $op1, $labl" %} + ins_encode %{ + Label* L = $labl$$label; + Assembler::Condition cond = (Assembler::Condition)$cmp$$cmpcode; + if (cond == Assembler::EQ || cond == Assembler::LS) + __ cbzw($op1$$Register, *L); + else + __ cbnzw($op1$$Register, *L); + %} + ins_pipe(pipe_cmp_branch); +%} + +instruct cmpUL_imm0_branch(cmpOpU cmp, iRegL op1, immL0 op2, label labl, rFlagsRegU cr) %{ + match(If cmp (CmpUL op1 op2)); + predicate(n->in(1)->as_Bool()->_test._test == BoolTest::ne + || n->in(1)->as_Bool()->_test._test == BoolTest::eq + || n->in(1)->as_Bool()->_test._test == BoolTest::gt + || n->in(1)->as_Bool()->_test._test == BoolTest::le); + effect(USE labl); + + ins_cost(BRANCH_COST); + format %{ "cb$cmp $op1, $labl" %} + ins_encode %{ + Label* L = $labl$$label; + Assembler::Condition cond = (Assembler::Condition)$cmp$$cmpcode; + if (cond == Assembler::EQ || cond == Assembler::LS) + __ cbz($op1$$Register, *L); + else + __ cbnz($op1$$Register, *L); + %} + ins_pipe(pipe_cmp_branch); +%} + +// Test bit and Branch + +// Patterns for short (< 32KiB) variants +instruct cmpL_branch_sign(cmpOp cmp, iRegL op1, immL0 op2, label labl) %{ + match(If cmp (CmpL op1 op2)); + predicate(n->in(1)->as_Bool()->_test._test == BoolTest::lt + || n->in(1)->as_Bool()->_test._test == BoolTest::ge); + effect(USE labl); + + ins_cost(BRANCH_COST); + format %{ "cb$cmp $op1, $labl # long" %} + ins_encode %{ + Label* L = $labl$$label; + Assembler::Condition cond = + ((Assembler::Condition)$cmp$$cmpcode == Assembler::LT) ? Assembler::NE : Assembler::EQ; + __ tbr(cond, $op1$$Register, 63, *L); + %} + ins_pipe(pipe_cmp_branch); + ins_short_branch(1); +%} + +instruct cmpI_branch_sign(cmpOp cmp, iRegIorL2I op1, immI0 op2, label labl) %{ + match(If cmp (CmpI op1 op2)); + predicate(n->in(1)->as_Bool()->_test._test == BoolTest::lt + || n->in(1)->as_Bool()->_test._test == BoolTest::ge); + effect(USE labl); + + ins_cost(BRANCH_COST); + format %{ "cb$cmp $op1, $labl # int" %} + ins_encode %{ + Label* L = $labl$$label; + Assembler::Condition cond = + ((Assembler::Condition)$cmp$$cmpcode == Assembler::LT) ? Assembler::NE : Assembler::EQ; + __ tbr(cond, $op1$$Register, 31, *L); + %} + ins_pipe(pipe_cmp_branch); + ins_short_branch(1); +%} + +instruct cmpL_branch_bit(cmpOp cmp, iRegL op1, immL op2, immL0 op3, label labl) %{ + match(If cmp (CmpL (AndL op1 op2) op3)); + predicate((n->in(1)->as_Bool()->_test._test == BoolTest::ne + || n->in(1)->as_Bool()->_test._test == BoolTest::eq) + && is_power_of_2(n->in(2)->in(1)->in(2)->get_long())); + effect(USE labl); + + ins_cost(BRANCH_COST); + format %{ "tb$cmp $op1, $op2, $labl" %} + ins_encode %{ + Label* L = $labl$$label; + Assembler::Condition cond = (Assembler::Condition)$cmp$$cmpcode; + int bit = exact_log2($op2$$constant); + __ tbr(cond, $op1$$Register, bit, *L); + %} + ins_pipe(pipe_cmp_branch); + ins_short_branch(1); +%} + +instruct cmpI_branch_bit(cmpOp cmp, iRegIorL2I op1, immI op2, immI0 op3, label labl) %{ + match(If cmp (CmpI (AndI op1 op2) op3)); + predicate((n->in(1)->as_Bool()->_test._test == BoolTest::ne + || n->in(1)->as_Bool()->_test._test == BoolTest::eq) + && is_power_of_2(n->in(2)->in(1)->in(2)->get_int())); + effect(USE labl); + + ins_cost(BRANCH_COST); + format %{ "tb$cmp $op1, $op2, $labl" %} + ins_encode %{ + Label* L = $labl$$label; + Assembler::Condition cond = (Assembler::Condition)$cmp$$cmpcode; + int bit = exact_log2($op2$$constant); + __ tbr(cond, $op1$$Register, bit, *L); + %} + ins_pipe(pipe_cmp_branch); + ins_short_branch(1); +%} + +// And far variants +instruct far_cmpL_branch_sign(cmpOp cmp, iRegL op1, immL0 op2, label labl) %{ + match(If cmp (CmpL op1 op2)); + predicate(n->in(1)->as_Bool()->_test._test == BoolTest::lt + || n->in(1)->as_Bool()->_test._test == BoolTest::ge); + effect(USE labl); + + ins_cost(BRANCH_COST); + format %{ "cb$cmp $op1, $labl # long" %} + ins_encode %{ + Label* L = $labl$$label; + Assembler::Condition cond = + ((Assembler::Condition)$cmp$$cmpcode == Assembler::LT) ? Assembler::NE : Assembler::EQ; + __ tbr(cond, $op1$$Register, 63, *L, /*far*/true); + %} + ins_pipe(pipe_cmp_branch); +%} + +instruct far_cmpI_branch_sign(cmpOp cmp, iRegIorL2I op1, immI0 op2, label labl) %{ + match(If cmp (CmpI op1 op2)); + predicate(n->in(1)->as_Bool()->_test._test == BoolTest::lt + || n->in(1)->as_Bool()->_test._test == BoolTest::ge); + effect(USE labl); + + ins_cost(BRANCH_COST); + format %{ "cb$cmp $op1, $labl # int" %} + ins_encode %{ + Label* L = $labl$$label; + Assembler::Condition cond = + ((Assembler::Condition)$cmp$$cmpcode == Assembler::LT) ? Assembler::NE : Assembler::EQ; + __ tbr(cond, $op1$$Register, 31, *L, /*far*/true); + %} + ins_pipe(pipe_cmp_branch); +%} + +instruct far_cmpL_branch_bit(cmpOp cmp, iRegL op1, immL op2, immL0 op3, label labl) %{ + match(If cmp (CmpL (AndL op1 op2) op3)); + predicate((n->in(1)->as_Bool()->_test._test == BoolTest::ne + || n->in(1)->as_Bool()->_test._test == BoolTest::eq) + && is_power_of_2(n->in(2)->in(1)->in(2)->get_long())); + effect(USE labl); + + ins_cost(BRANCH_COST); + format %{ "tb$cmp $op1, $op2, $labl" %} + ins_encode %{ + Label* L = $labl$$label; + Assembler::Condition cond = (Assembler::Condition)$cmp$$cmpcode; + int bit = exact_log2($op2$$constant); + __ tbr(cond, $op1$$Register, bit, *L, /*far*/true); + %} + ins_pipe(pipe_cmp_branch); +%} + +instruct far_cmpI_branch_bit(cmpOp cmp, iRegIorL2I op1, immI op2, immI0 op3, label labl) %{ + match(If cmp (CmpI (AndI op1 op2) op3)); + predicate((n->in(1)->as_Bool()->_test._test == BoolTest::ne + || n->in(1)->as_Bool()->_test._test == BoolTest::eq) + && is_power_of_2(n->in(2)->in(1)->in(2)->get_int())); + effect(USE labl); + + ins_cost(BRANCH_COST); + format %{ "tb$cmp $op1, $op2, $labl" %} + ins_encode %{ + Label* L = $labl$$label; + Assembler::Condition cond = (Assembler::Condition)$cmp$$cmpcode; + int bit = exact_log2($op2$$constant); + __ tbr(cond, $op1$$Register, bit, *L, /*far*/true); + %} + ins_pipe(pipe_cmp_branch); +%} + +// Test bits + +instruct cmpL_and(cmpOp cmp, iRegL op1, immL op2, immL0 op3, rFlagsReg cr) %{ + match(Set cr (CmpL (AndL op1 op2) op3)); + predicate(Assembler::operand_valid_for_logical_immediate + (/*is_32*/false, n->in(1)->in(2)->get_long())); + + ins_cost(INSN_COST); + format %{ "tst $op1, $op2 # long" %} + ins_encode %{ + __ tst($op1$$Register, $op2$$constant); + %} + ins_pipe(ialu_reg_reg); +%} + +instruct cmpI_and(cmpOp cmp, iRegIorL2I op1, immI op2, immI0 op3, rFlagsReg cr) %{ + match(Set cr (CmpI (AndI op1 op2) op3)); + predicate(Assembler::operand_valid_for_logical_immediate + (/*is_32*/true, n->in(1)->in(2)->get_int())); + + ins_cost(INSN_COST); + format %{ "tst $op1, $op2 # int" %} + ins_encode %{ + __ tstw($op1$$Register, $op2$$constant); + %} + ins_pipe(ialu_reg_reg); +%} + +instruct cmpL_and_reg(cmpOp cmp, iRegL op1, iRegL op2, immL0 op3, rFlagsReg cr) %{ + match(Set cr (CmpL (AndL op1 op2) op3)); + + ins_cost(INSN_COST); + format %{ "tst $op1, $op2 # long" %} + ins_encode %{ + __ tst($op1$$Register, $op2$$Register); + %} + ins_pipe(ialu_reg_reg); +%} + +instruct cmpI_and_reg(cmpOp cmp, iRegIorL2I op1, iRegIorL2I op2, immI0 op3, rFlagsReg cr) %{ + match(Set cr (CmpI (AndI op1 op2) op3)); + + ins_cost(INSN_COST); + format %{ "tstw $op1, $op2 # int" %} + ins_encode %{ + __ tstw($op1$$Register, $op2$$Register); + %} + ins_pipe(ialu_reg_reg); +%} + + // Conditional Far Branch // Conditional Far Branch Unsigned // TODO: fixme diff -r 2a6fcefff99a -r 46d12689c870 src/cpu/aarch64/vm/assembler_aarch64.hpp --- a/src/cpu/aarch64/vm/assembler_aarch64.hpp Mon Jul 31 06:02:56 2017 +0100 +++ b/src/cpu/aarch64/vm/assembler_aarch64.hpp Tue Aug 22 18:17:20 2017 +0100 @@ -2459,8 +2459,11 @@ inline void moviw(Register Rd, unsigned imm) { orrw(Rd, zr, imm); } inline void movi(Register Rd, unsigned imm) { orr(Rd, zr, imm); } - inline void tstw(Register Rd, unsigned imm) { andsw(zr, Rd, imm); } - inline void tst(Register Rd, unsigned imm) { ands(zr, Rd, imm); } + inline void tstw(Register Rd, Register Rn) { andsw(zr, Rd, Rn); } + inline void tst(Register Rd, Register Rn) { ands(zr, Rd, Rn); } + + inline void tstw(Register Rd, uint64_t imm) { andsw(zr, Rd, imm); } + inline void tst(Register Rd, uint64_t imm) { ands(zr, Rd, imm); } inline void bfiw(Register Rd, Register Rn, unsigned lsb, unsigned width) { bfmw(Rd, Rn, ((32 - lsb) & 31), (width - 1)); @@ -2720,6 +2723,32 @@ void movptr(Register r, uintptr_t imm64); +public: + + // Generalized Test Bit And Branch, including a "far" variety which + // spans more than 32KiB. + void tbr(Condition cond, Register Rt, int bitpos, Label &dest, bool far = false) { + assert(cond == EQ || cond == NE, "must be"); + + if (far) + cond = ~cond; + + void (Assembler::* branch)(Register Rt, int bitpos, Label &L); + if (cond == Assembler::EQ) + branch = &Assembler::tbz; + else + branch = &Assembler::tbnz; + + if (far) { + Label L; + (this->*branch)(Rt, bitpos, L); + b(dest); + bind(L); + } else { + (this->*branch)(Rt, bitpos, dest); + } + } + // macro instructions for accessing and updating floating point // status register // diff -r 2a6fcefff99a -r 46d12689c870 src/cpu/aarch64/vm/c1_MacroAssembler_aarch64.hpp --- a/src/cpu/aarch64/vm/c1_MacroAssembler_aarch64.hpp Mon Jul 31 06:02:56 2017 +0100 +++ b/src/cpu/aarch64/vm/c1_MacroAssembler_aarch64.hpp Tue Aug 22 18:17:20 2017 +0100 @@ -27,6 +27,8 @@ #ifndef CPU_AARCH64_VM_C1_MACROASSEMBLER_AARCH64_HPP #define CPU_AARCH64_VM_C1_MACROASSEMBLER_AARCH64_HPP +using MacroAssembler::null_check; + // C1_MacroAssembler contains high-level macros for C1 private: diff -r 2a6fcefff99a -r 46d12689c870 src/cpu/aarch64/vm/interp_masm_aarch64.cpp --- a/src/cpu/aarch64/vm/interp_masm_aarch64.cpp Mon Jul 31 06:02:56 2017 +0100 +++ b/src/cpu/aarch64/vm/interp_masm_aarch64.cpp Tue Aug 22 18:17:20 2017 +0100 @@ -1370,9 +1370,8 @@ // the code to check if the event should be sent. if (JvmtiExport::can_post_interpreter_events()) { Label L; - ldr(r3, Address(rthread, JavaThread::interp_only_mode_offset())); - tst(r3, ~0); - br(Assembler::EQ, L); + ldrw(r3, Address(rthread, JavaThread::interp_only_mode_offset())); + cbzw(r3, L); call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::post_method_entry)); bind(L); diff -r 2a6fcefff99a -r 46d12689c870 src/cpu/ppc/vm/ppc.ad --- a/src/cpu/ppc/vm/ppc.ad Mon Jul 31 06:02:56 2017 +0100 +++ b/src/cpu/ppc/vm/ppc.ad Tue Aug 22 18:17:20 2017 +0100 @@ -3498,6 +3498,14 @@ __ cmplwi(Rcrx, Rsrc1, Isrc2); %} + enc_class enc_cmpldi(flagsReg crx, iRegIsrc src1, uimmL16 src2) %{ + // TODO: PPC port $archOpcode(ppc64Opcode_cmpli); + MacroAssembler _masm(&cbuf); + Register Rsrc1 = reg_to_register_object($src1$$reg); + ConditionRegister Rcrx = reg_to_ConditionRegister_object($crx$$reg); + __ cmpldi(Rcrx, Rsrc1, $src2$$constant); + %} + enc_class enc_btst_reg(iRegIsrc src1, iRegIsrc src2) %{ // TODO: PPC port $archOpcode(ppc64Opcode_and_); @@ -11356,6 +11364,23 @@ ins_pipe(pipe_class_compare); %} +// Added CmpUL for LoopPredicate. +instruct cmpUL_reg_reg(flagsReg crx, iRegLsrc src1, iRegLsrc src2) %{ + match(Set crx (CmpUL src1 src2)); + format %{ "CMPLD $crx, $src1, $src2" %} + size(4); + ins_encode( enc_cmpld(crx, src1, src2) ); + ins_pipe(pipe_class_compare); +%} + +instruct cmpUL_reg_imm16(flagsReg crx, iRegLsrc src1, uimmL16 src2) %{ + match(Set crx (CmpUL src1 src2)); + format %{ "CMPLDI $crx, $src1, $src2" %} + size(4); + ins_encode( enc_cmpldi(crx, src1, src2) ); + ins_pipe(pipe_class_compare); +%} + instruct testL_reg_reg(flagsRegCR0 cr0, iRegLsrc src1, iRegLsrc src2, immL_0 zero) %{ match(Set cr0 (CmpL (AndL src1 src2) zero)); // r0 is killed diff -r 2a6fcefff99a -r 46d12689c870 src/cpu/sparc/vm/sparc.ad --- a/src/cpu/sparc/vm/sparc.ad Mon Jul 31 06:02:56 2017 +0100 +++ b/src/cpu/sparc/vm/sparc.ad Tue Aug 22 18:17:20 2017 +0100 @@ -3448,6 +3448,16 @@ interface(CONST_INTER); %} +// Unsigned Long Immediate: 12-bit (non-negative that fits in simm13) +operand immUL12() %{ From bugzilla-daemon at icedtea.classpath.org Fri Aug 25 16:19:20 2017 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 25 Aug 2017 16:19:20 +0000 Subject: [Bug 3431] [IcedTea7] Backport "8183551, CVE-2017-10074: AArch64: Image conversion improvements" In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3431 --- Comment #5 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea7-forest/hotspot?cmd=changeset;node=56c4b6069614 author: aph date: Wed Aug 02 08:41:53 2017 +0100 8144028, PR3431: Use AArch64 bit-test instructions in C2 Reviewed-by: kvn -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Fri Aug 25 16:19:45 2017 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 25 Aug 2017 16:19:45 +0000 Subject: [Bug 3431] [IcedTea7] Backport "8183551, CVE-2017-10074: AArch64: Image conversion improvements" In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3431 --- Comment #6 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea7-forest/hotspot?cmd=changeset;node=e5f3942b379a author: fyang date: Wed Mar 23 18:00:46 2016 +0800 8152537, PR3431: aarch64: Make use of CBZ and CBNZ when comparing unsigned values with zero. Summary: aarch64: c2 make use of CBZ and CBNZ when comparing unsigned values with zero. Reviewed-by: aph -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Fri Aug 25 16:19:52 2017 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 25 Aug 2017 16:19:52 +0000 Subject: [Bug 3431] [IcedTea7] Backport "8183551, CVE-2017-10074: AArch64: Image conversion improvements" In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3431 --- Comment #7 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea7-forest/hotspot?cmd=changeset;node=541e6b9eb05f author: roland date: Tue Jul 04 21:23:37 2017 +0100 8183551, PR3431: AArch64: Image conversion improvements -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From bugzilla-daemon at icedtea.classpath.org Fri Aug 25 16:19:59 2017 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 25 Aug 2017 16:19:59 +0000 Subject: [Bug 3443] [IcedTea7] OpenJDK on aarch64 has fatal error "Field too big for insn" In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3443 --- Comment #1 from hg commits --- details: http://icedtea.classpath.org//hg/icedtea7-forest/hotspot?cmd=changeset;node=46d12689c870 author: aph date: Tue Aug 22 18:17:20 2017 +0100 8145438, PR3443, RH1482244: Guarantee failures since 8144028: Use AArch64 bit-test instructions in C2 Summary: Implement short and long versions of bit test instructions. Reviewed-by: kvn -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: From andrew at icedtea.classpath.org Fri Aug 25 16:20:15 2017 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 25 Aug 2017 16:20:15 +0000 Subject: /hg/icedtea7-forest/jdk: 56 new changesets Message-ID: changeset 350a10c3a425 in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=350a10c3a425 author: andrew date: Wed Aug 16 16:15:10 2017 +0100 Added tag icedtea-2.7.0pre13 for changeset 0e380c5a1bff changeset 15ba571f7278 in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=15ba571f7278 author: andrew date: Wed May 03 03:39:53 2017 +0100 Added tag jdk7u141-b02 for changeset 19a085e65614 changeset a9717ab00796 in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=a9717ab00796 author: alanb date: Fri Jul 07 15:59:03 2017 +0100 7117357: Warnings in sun.instrument, tools and other sun.* classes Reviewed-by: lancea, chegar changeset 848ccfd27743 in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=848ccfd27743 author: mchung date: Tue Jan 17 15:55:40 2012 -0800 7117570: Warnings in sun.mangement.* and its subpackages Reviewed-by: mchung, dsamersoff Contributed-by: kurchi.subhra.hazra at oracle.com changeset 4f24be04a422 in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=4f24be04a422 author: jbachorik date: Fri Jul 07 19:53:38 2017 +0100 8139870: sun.management.LazyCompositeData.isTypeMatched() fails for composite types with items of ArrayType Reviewed-by: dfuchs changeset c9d307e51b37 in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=c9d307e51b37 author: azvegint date: Thu Aug 11 13:22:51 2016 +0300 8155690: Update libPNG library to the latest up-to-date Reviewed-by: serb changeset acf72ae6145d in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=acf72ae6145d author: prr date: Wed Feb 12 11:36:38 2014 -0800 8031737: CHECK_NULL and CHECK_EXCEPTION macros cleanup Reviewed-by: rriggs, mchung, mduigou changeset d127560ad6ff in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=d127560ad6ff author: prr date: Fri Feb 14 10:14:11 2014 -0800 8034912: backport of 8031737 to jdk8u breaks linux buld. Reviewed-by: mchung changeset 986500b85859 in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=986500b85859 author: pchelko date: Tue Jul 11 21:06:17 2017 +0100 8030787: [Parfait] JNI-related warnings from b119 for jdk/src/share/native/sun/awt/image Reviewed-by: serb, prr changeset 98b0dbc4bc08 in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=98b0dbc4bc08 author: pchelko date: Thu Mar 13 15:33:43 2014 +0400 8037287: Windows build failed after JDK-8030787 Reviewed-by: serb, bagiras changeset 03a56cf98284 in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=03a56cf98284 author: goetz date: Thu Feb 20 15:03:10 2014 +0100 8030875: Macros for checking and returning on exceptions Summary: Add missing 8030875 changes in 8u Reviewed-by: mchung, kvn changeset 366c03690390 in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=366c03690390 author: jdv date: Thu Oct 06 09:19:32 2016 -0700 8162461: Hang due to JNI up-call made whilst holding JNI critical lock Reviewed-by: prr, aghaisas changeset 28459ff19e0d in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=28459ff19e0d author: smarks date: Wed Jul 12 03:18:46 2017 +0100 8022440: suppress deprecation warnings in sun.rmi Reviewed-by: mduigou changeset aac0cba4d82e in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=aac0cba4d82e author: coffeys date: Thu Jul 13 05:15:10 2017 +0100 8163958: Improved garbage collection Reviewed-by: rriggs changeset eeb56f4c36b1 in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=eeb56f4c36b1 author: horii date: Wed Sep 14 22:11:54 2016 -0400 8165231: java.nio.Bits.unaligned() doesn't return true on ppc Reviewed-by: simonis, coffeys changeset b765de0cf211 in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=b765de0cf211 author: bgopularam date: Wed May 24 02:25:28 2017 -0700 8165367: Additional tests for JEP 288: Disable SHA-1 Certificates Summary: The new tests just focus on the usage constraints TLSSever and TLSClient with TLS communication Reviewed-by: ascarpino changeset 4f11e3edecf9 in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=4f11e3edecf9 author: prr date: Fri Jul 14 15:42:34 2017 +0100 8167228: Update to libpng 1.6.28 Reviewed-by: serb, azvegint changeset d76d9a9720ef in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=d76d9a9720ef author: prr date: Fri Mar 17 16:41:06 2017 -0700 8169209: Improved image post-processing steps Reviewed-by: serb, vadim, mschoene changeset acd986bf1ba5 in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=acd986bf1ba5 author: igerasim date: Thu Jul 13 22:44:24 2017 +0100 8169392: Additional jar validation steps Reviewed-by: mullan, herrick, ahgross changeset b37777c2c9c5 in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=b37777c2c9c5 author: smarks date: Sun Feb 12 21:56:24 2012 -0800 7143230: fix warnings in java.util.jar, sun.tools.jar, zipfs demo, etc. Reviewed-by: alanb, chegar, lancea, smarks Contributed-by: Mani Sarkar , Michael Barker , Carl Jokl , Dinuk Weerasinghe , Markus Stoy , Tom Anderson changeset f2a67bbbcb99 in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=f2a67bbbcb99 author: hseigel date: Wed Dec 21 10:15:49 2016 -0500 8170966: Right parenthesis issue Reviewed-by: acorn, ctornqvi, mschoene Contributed-by: harold.seigel at oracle.com changeset a13bafb05072 in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=a13bafb05072 author: igerasim date: Fri Jul 14 04:40:15 2017 +0100 8172204: Better Thread Pool execution Reviewed-by: alanb, skoivu, rriggs changeset f014749131f6 in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=f014749131f6 author: prr date: Fri Jul 14 04:55:25 2017 +0100 8172461: Service Registration Lifecycle Reviewed-by: serb, vadim, skoivu, shurailine changeset 8f40b239d609 in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=8f40b239d609 author: bpb date: Fri Jul 14 05:21:12 2017 +0100 8172465: Better handling of channel groups Reviewed-by: alanb, coffeys, skoivu, rhalade, chegar changeset d4a33ff7f1dd in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=d4a33ff7f1dd author: aefimov date: Fri Jul 14 17:32:08 2017 +0100 8173286: Better reading of text catalogs Reviewed-by: joehw, dfuchs, skoivu, rhalade changeset 9976ce1ff903 in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=9976ce1ff903 author: smarks date: Fri Jul 14 17:42:44 2017 +0100 8173697: Less Active Activations Reviewed-by: skoivu, rhalade, rriggs, chegar, coffeys changeset 79f9ef695052 in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=79f9ef695052 author: prr date: Fri Jul 14 18:21:30 2017 +0100 8174098: Better image fetching Reviewed-by: serb, vadim, skoivu changeset a632a29f0478 in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=a632a29f0478 author: rpatil date: Wed Mar 15 14:14:57 2017 +0530 8174105: Better naming attribution Reviewed-by: chegar, dfuchs, rriggs, vtewari changeset 3cf8f6451be3 in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=3cf8f6451be3 author: robm date: Fri Jul 14 18:46:12 2017 +0100 8174113: Better sourcing of code Reviewed-by: weijun changeset 8f1c0d565d13 in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=8f1c0d565d13 author: adinn date: Sat Jul 15 21:26:47 2017 +0100 8174729: Race Condition in java.lang.reflect.WeakCache Summary: Race can occur between Proxy.getProxyClass and Proxy.isProxyClass Reviewed-by: mchung changeset 0e846618238e in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=0e846618238e author: robm date: Sun Jul 16 00:29:10 2017 +0100 8174770: Check registry registration location Reviewed-by: rriggs changeset fbe9c6c3e78c in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=fbe9c6c3e78c author: igerasim date: Tue Jul 18 00:17:03 2017 +0100 8174873: Improved certificate procesing Reviewed-by: jnimeh, ahgross, rhalade changeset 8f032f02516a in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=8f032f02516a author: robm date: Thu May 18 22:52:38 2017 +0100 8175106: Higher quality DSA operations Reviewed-by: xuelei, apetcher changeset e9869356eb8a in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=e9869356eb8a author: robm date: Wed May 24 17:35:54 2017 +0100 8175110: Higher quality ECDSA operations Reviewed-by: xuelei, apetcher changeset f6daf5edd956 in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=f6daf5edd956 author: alexp date: Thu Apr 21 17:08:50 2016 +0300 8143377: Test PKCS8Test.java fails Reviewed-by: coffeys Contributed-by: artem.kosarev at oracle.com changeset d4e4af750774 in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=d4e4af750774 author: igerasim date: Tue Jul 18 06:14:47 2017 +0100 8175251: Failed to load RSA private key from pkcs12 Summary: Enhanced DER library with extra arg to control leading-0 check Reviewed-by: mullan changeset c54643d2a32b in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=c54643d2a32b author: shshahma date: Tue Jul 18 06:45:42 2017 +0100 8176055: JMX diagnostic improvements Reviewed-by: dfuchs, mchung, ahgross, rhalade, jwilhelm changeset fe453cb558d3 in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=fe453cb558d3 author: coffeys date: Mon Apr 11 08:00:21 2016 +0100 8149450: LdapCtx.processReturnCode() throwing Null Pointer Exception Reviewed-by: xuelei changeset 4092c1c94820 in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=4092c1c94820 author: aefimov date: Tue Jul 18 20:29:30 2017 +0100 8176067: Proper directory lookup processing Reviewed-by: weijun changeset 4ae0ef9be3ac in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=4ae0ef9be3ac author: igerasim date: Thu Mar 30 22:29:57 2017 -0700 8176760: Better handling of PKCS8 material Reviewed-by: ascarpino, ahgross changeset 5ccb8bdab06c in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=5ccb8bdab06c author: igerasim date: Wed Mar 15 10:58:05 2017 -0700 8176769: Remove accidental spec change in jdk8u Reviewed-by: chegar changeset a2a339770678 in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=a2a339770678 author: igerasim date: Tue May 23 11:30:25 2017 -0700 8178135: Additional elliptic curve support Reviewed-by: mullan changeset fa22e8668c4d in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=fa22e8668c4d author: azvegint date: Mon Jul 24 14:14:10 2017 +0100 8178996: [macos] JComboBox doesn't display popup in mixed JavaFX Swing Application on 8u131 and Mac OS 10.12 Reviewed-by: serb, ssadetsky changeset 851cd45750d2 in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=851cd45750d2 author: alexsch date: Mon Jul 24 14:23:48 2017 +0100 8035629: [parfait] JNI exc pending in jdk/src/windows/native/sun/windows/ShellFolder2.cpp Reviewed-by: serb, pchelko changeset 02e2b83365a6 in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=02e2b83365a6 author: serb date: Mon Jul 24 14:26:23 2017 +0100 8080492: [Parfait] Uninitialised variable in jdk/src/java/desktop/windows/native/libawt/ Reviewed-by: prr, vadim changeset 084e64d9d62d in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=084e64d9d62d author: pkbalakr date: Mon Jul 24 14:34:53 2017 +0100 8179014: JFileChooser with Windows look and feel crashes on win 10 Reviewed-by: serb, prr changeset 2ca4c6bfce3a in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=2ca4c6bfce3a author: rriggs date: Mon Jul 24 18:47:53 2017 +0100 8156804: Better constraint checking Summary: Sync with upstream version Reviewed-by: dfuchs, ahgross changeset 085ef4fafefb in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=085ef4fafefb author: aefimov date: Thu Jun 01 15:45:33 2017 +0100 8180582: The bind to rmiregistry is rejected by registryFilter even though registryFilter is set Summary: The Registry MAXDEPTH should allow binding more complex objects Reviewed-by: dfuchs, smarks changeset 4549e025778c in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=4549e025778c author: ljiang date: Mon Jul 24 19:28:56 2017 +0100 8181591: 8u141 L10n resource file update Reviewed-by: coffeys changeset 330cce590879 in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=330cce590879 author: rpatil date: Mon Apr 10 16:17:00 2017 +0530 8177449: (tz) Support tzdata2017b Reviewed-by: martin, naoto changeset a6d3c4449a8a in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=a6d3c4449a8a author: mcherkas date: Tue Feb 07 19:54:46 2017 +0300 8173145: Menu is activated after using mnemonic Alt/Key combination Reviewed-by: serb, ssadetsky changeset dd5b6b40726c in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=dd5b6b40726c author: psandoz date: Tue Jul 25 03:29:17 2017 +0100 8184119: Incorrect return processing for the LF editor of MethodHandles.permuteArguments Reviewed-by: jrose, redestad, vlivanov changeset 871e3350966f in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=871e3350966f author: igerasim date: Fri Jul 21 20:03:30 2017 -0700 8184993: Jar file verification failing with SecurityException: digest missing xxx Reviewed-by: sherman, mullan changeset da1c09ab9b74 in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=da1c09ab9b74 author: andrew date: Tue Aug 01 14:12:33 2017 +0100 Added tag jdk7u151-b00 for changeset 871e3350966f changeset ad08fea7cd1a in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=ad08fea7cd1a author: andrew date: Thu Aug 03 07:28:01 2017 +0100 Added tag jdk7u151-b01 for changeset da1c09ab9b74 changeset 85bcd2abf0a2 in /hg/icedtea7-forest/jdk details: http://icedtea.classpath.org/hg/icedtea7-forest/jdk?cmd=changeset;node=85bcd2abf0a2 author: andrew date: Tue Aug 22 02:03:52 2017 +0100 Merge jdk7u151-b01 diffstat: .hgtags | 4 + make/sun/javazic/tzdata/VERSION | 2 +- make/sun/javazic/tzdata/africa | 25 +- make/sun/javazic/tzdata/iso3166.tab | 4 +- make/sun/javazic/tzdata/northamerica | 8 + make/sun/rmi/rmi/Makefile | 36 +- make/sun/splashscreen/FILES_c.gmk | 6 +- src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java | 15 +- src/share/classes/com/sun/accessibility/internal/resources/accessibility_sv.properties | 2 +- src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java | 17 +- src/share/classes/com/sun/java/swing/plaf/windows/WindowsRootPaneUI.java | 7 +- src/share/classes/com/sun/jndi/ldap/LdapClient.java | 3 +- src/share/classes/com/sun/jndi/ldap/LdapCtx.java | 25 +- src/share/classes/com/sun/jndi/ldap/LdapReferralException.java | 17 +- src/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java | 5 +- src/share/classes/java/lang/invoke/LambdaForm.java | 6 +- src/share/classes/java/rmi/activation/ActivationID.java | 38 +- src/share/classes/java/security/CodeSource.java | 11 +- src/share/classes/java/util/concurrent/ThreadPoolExecutor.java | 25 +- src/share/classes/java/util/jar/Attributes.java | 14 +- src/share/classes/java/util/jar/JarVerifier.java | 129 +- src/share/classes/java/util/zip/ZipFile.java | 21 +- src/share/classes/javax/imageio/spi/ServiceRegistry.java | 26 +- src/share/classes/javax/naming/directory/BasicAttribute.java | 4 +- src/share/classes/sun/awt/image/ImageWatched.java | 35 +- src/share/classes/sun/awt/resources/awt_sv.properties | 2 +- src/share/classes/sun/instrument/InstrumentationImpl.java | 14 +- src/share/classes/sun/instrument/TransformerManager.java | 2 +- src/share/classes/sun/launcher/resources/launcher_es.properties | 4 +- src/share/classes/sun/launcher/resources/launcher_sv.properties | 4 +- src/share/classes/sun/management/Agent.java | 16 +- src/share/classes/sun/management/ConnectorAddressLink.java | 16 +- src/share/classes/sun/management/Flag.java | 2 +- src/share/classes/sun/management/GarbageCollectionNotifInfoCompositeData.java | 12 +- src/share/classes/sun/management/GarbageCollectorImpl.java | 9 +- src/share/classes/sun/management/GcInfoBuilder.java | 2 +- src/share/classes/sun/management/GcInfoCompositeData.java | 29 +- src/share/classes/sun/management/HotSpotDiagnostic.java | 19 +- src/share/classes/sun/management/HotspotCompilation.java | 14 +- src/share/classes/sun/management/HotspotThread.java | 2 +- src/share/classes/sun/management/LazyCompositeData.java | 81 +- src/share/classes/sun/management/ManagementFactoryHelper.java | 6 +- src/share/classes/sun/management/MappedMXBeanType.java | 66 +- src/share/classes/sun/management/MonitorInfoCompositeData.java | 2 +- src/share/classes/sun/management/NotificationEmitterSupport.java | 12 +- src/share/classes/sun/management/RuntimeImpl.java | 2 +- src/share/classes/sun/management/ThreadInfoCompositeData.java | 2 +- src/share/classes/sun/management/counter/perf/PerfInstrumentation.java | 15 +- src/share/classes/sun/management/jmxremote/ConnectorBootstrap.java | 44 +- src/share/classes/sun/management/jmxremote/SingleEntryRegistry.java | 25 +- src/share/classes/sun/management/resources/agent_sv.properties | 12 +- src/share/classes/sun/management/snmp/AdaptorBootstrap.java | 7 +- src/share/classes/sun/management/snmp/jvminstr/JVM_MANAGEMENT_MIB_IMPL.java | 10 +- src/share/classes/sun/management/snmp/jvminstr/JvmMemGCTableMetaImpl.java | 2 + src/share/classes/sun/management/snmp/jvminstr/JvmMemManagerTableMetaImpl.java | 11 +- src/share/classes/sun/management/snmp/jvminstr/JvmMemMgrPoolRelTableMetaImpl.java | 22 +- src/share/classes/sun/management/snmp/jvminstr/JvmMemPoolTableMetaImpl.java | 11 +- src/share/classes/sun/management/snmp/jvminstr/JvmMemoryImpl.java | 2 +- src/share/classes/sun/management/snmp/jvminstr/JvmMemoryMetaImpl.java | 2 + src/share/classes/sun/management/snmp/jvminstr/JvmOSImpl.java | 2 + src/share/classes/sun/management/snmp/jvminstr/JvmRTBootClassPathEntryImpl.java | 2 + src/share/classes/sun/management/snmp/jvminstr/JvmRTBootClassPathTableMetaImpl.java | 5 +- src/share/classes/sun/management/snmp/jvminstr/JvmRTClassPathEntryImpl.java | 1 + src/share/classes/sun/management/snmp/jvminstr/JvmRTClassPathTableMetaImpl.java | 5 +- src/share/classes/sun/management/snmp/jvminstr/JvmRTInputArgsEntryImpl.java | 1 + src/share/classes/sun/management/snmp/jvminstr/JvmRTInputArgsTableMetaImpl.java | 5 +- src/share/classes/sun/management/snmp/jvminstr/JvmRTLibraryPathEntryImpl.java | 1 + src/share/classes/sun/management/snmp/jvminstr/JvmRTLibraryPathTableMetaImpl.java | 4 +- src/share/classes/sun/management/snmp/jvminstr/JvmRuntimeMetaImpl.java | 1 + src/share/classes/sun/management/snmp/jvminstr/JvmThreadInstanceEntryImpl.java | 2 + src/share/classes/sun/management/snmp/jvminstr/JvmThreadInstanceTableMetaImpl.java | 9 +- src/share/classes/sun/management/snmp/jvminstr/JvmThreadingMetaImpl.java | 2 + src/share/classes/sun/management/snmp/jvmmib/EnumJvmClassesVerboseLevel.java | 9 +- src/share/classes/sun/management/snmp/jvmmib/EnumJvmJITCompilerTimeMonitoring.java | 9 +- src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemManagerState.java | 10 +- src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemPoolCollectThreshdSupport.java | 9 +- src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemPoolState.java | 9 +- src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemPoolThreshdSupport.java | 9 +- src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemPoolType.java | 9 +- src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemoryGCCall.java | 9 +- src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemoryGCVerboseLevel.java | 9 +- src/share/classes/sun/management/snmp/jvmmib/EnumJvmRTBootClassPathSupport.java | 9 +- src/share/classes/sun/management/snmp/jvmmib/EnumJvmThreadContentionMonitoring.java | 9 +- src/share/classes/sun/management/snmp/jvmmib/EnumJvmThreadCpuTimeMonitoring.java | 9 +- src/share/classes/sun/management/snmp/jvmmib/JVM_MANAGEMENT_MIB.java | 1 + src/share/classes/sun/management/snmp/jvmmib/JVM_MANAGEMENT_MIBOidTable.java | 1 + src/share/classes/sun/management/snmp/jvmmib/JvmClassLoadingMeta.java | 1 + src/share/classes/sun/management/snmp/jvmmib/JvmCompilationMeta.java | 1 + src/share/classes/sun/management/snmp/jvmmib/JvmMemGCEntryMeta.java | 1 + src/share/classes/sun/management/snmp/jvmmib/JvmMemGCTableMeta.java | 1 + src/share/classes/sun/management/snmp/jvmmib/JvmMemManagerEntryMeta.java | 1 + src/share/classes/sun/management/snmp/jvmmib/JvmMemManagerTableMeta.java | 1 + src/share/classes/sun/management/snmp/jvmmib/JvmMemMgrPoolRelEntryMeta.java | 1 + src/share/classes/sun/management/snmp/jvmmib/JvmMemMgrPoolRelTableMeta.java | 1 + src/share/classes/sun/management/snmp/jvmmib/JvmMemPoolEntryMeta.java | 1 + src/share/classes/sun/management/snmp/jvmmib/JvmMemPoolTableMeta.java | 2 + src/share/classes/sun/management/snmp/jvmmib/JvmOSMeta.java | 2 + src/share/classes/sun/management/snmp/jvmmib/JvmRTBootClassPathEntryMeta.java | 1 + src/share/classes/sun/management/snmp/jvmmib/JvmRTBootClassPathTableMeta.java | 1 + src/share/classes/sun/management/snmp/jvmmib/JvmRTClassPathEntryMeta.java | 1 + src/share/classes/sun/management/snmp/jvmmib/JvmRTClassPathTableMeta.java | 1 + src/share/classes/sun/management/snmp/jvmmib/JvmRTInputArgsEntryMeta.java | 1 + src/share/classes/sun/management/snmp/jvmmib/JvmRTInputArgsTableMeta.java | 1 + src/share/classes/sun/management/snmp/jvmmib/JvmRTLibraryPathEntryMeta.java | 1 + src/share/classes/sun/management/snmp/jvmmib/JvmRTLibraryPathTableMeta.java | 1 + src/share/classes/sun/management/snmp/jvmmib/JvmRuntimeMeta.java | 1 + src/share/classes/sun/management/snmp/jvmmib/JvmThreadInstanceEntryMeta.java | 1 + src/share/classes/sun/management/snmp/jvmmib/JvmThreadInstanceTableMeta.java | 1 + src/share/classes/sun/management/snmp/jvmmib/JvmThreadingMeta.java | 1 + src/share/classes/sun/management/snmp/util/MibLogger.java | 8 +- src/share/classes/sun/management/snmp/util/SnmpListTableCache.java | 10 +- src/share/classes/sun/management/snmp/util/SnmpNamedListTableCache.java | 26 +- src/share/classes/sun/management/snmp/util/SnmpTableCache.java | 2 +- src/share/classes/sun/net/RegisteredDomain.java | 8 +- src/share/classes/sun/net/www/protocol/jar/Handler.java | 1 + src/share/classes/sun/nio/ch/AsynchronousChannelGroupImpl.java | 20 +- src/share/classes/sun/rmi/registry/RegistryImpl.java | 143 +- src/share/classes/sun/rmi/registry/RegistryImpl_Skel.java | 177 + src/share/classes/sun/rmi/registry/RegistryImpl_Stub.java | 189 + src/share/classes/sun/rmi/runtime/Log.java | 3 +- src/share/classes/sun/rmi/server/ActivatableRef.java | 3 +- src/share/classes/sun/rmi/server/Activation.java | 69 +- src/share/classes/sun/rmi/server/Dispatcher.java | 3 +- src/share/classes/sun/rmi/server/LoaderHandler.java | 3 +- src/share/classes/sun/rmi/server/UnicastRef.java | 17 +- src/share/classes/sun/rmi/server/UnicastServerRef.java | 112 +- src/share/classes/sun/rmi/server/Util.java | 3 +- src/share/classes/sun/rmi/transport/ConnectionInputStream.java | 10 +- src/share/classes/sun/rmi/transport/DGCClient.java | 10 + src/share/classes/sun/rmi/transport/DGCImpl.java | 75 +- src/share/classes/sun/rmi/transport/DGCImpl_Skel.java | 112 + src/share/classes/sun/rmi/transport/DGCImpl_Stub.java | 192 + src/share/classes/sun/rmi/transport/StreamRemoteCall.java | 10 +- src/share/classes/sun/rmi/transport/Transport.java | 1 + src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java | 3 +- src/share/classes/sun/rmi/transport/tcp/ConnectionMultiplexer.java | 3 +- src/share/classes/sun/rmi/transport/tcp/TCPTransport.java | 1 + src/share/classes/sun/security/ec/ECDSASignature.java | 22 +- src/share/classes/sun/security/pkcs/PKCS8Key.java | 16 +- src/share/classes/sun/security/provider/DSA.java | 57 +- src/share/classes/sun/security/provider/certpath/ldap/LDAPCertStore.java | 4 +- src/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java | 45 +- src/share/classes/sun/security/rsa/RSAPublicKeyImpl.java | 6 +- src/share/classes/sun/security/tools/keytool/Resources_sv.java | 16 +- src/share/classes/sun/security/tools/policytool/Resources_sv.java | 6 +- src/share/classes/sun/security/util/AuthResources_sv.java | 4 +- src/share/classes/sun/security/util/DerInputBuffer.java | 22 +- src/share/classes/sun/security/util/DerInputStream.java | 60 +- src/share/classes/sun/security/util/DerValue.java | 63 +- src/share/classes/sun/security/util/HostnameChecker.java | 42 +- src/share/classes/sun/security/util/ManifestEntryVerifier.java | 9 +- src/share/classes/sun/security/util/Resources_sv.java | 18 +- src/share/classes/sun/tools/attach/HotSpotAttachProvider.java | 48 +- src/share/classes/sun/tools/jar/CommandLine.java | 8 +- src/share/classes/sun/tools/jar/Manifest.java | 14 +- src/share/classes/sun/tools/jar/SignatureFile.java | 26 +- src/share/classes/sun/tools/jinfo/JInfo.java | 4 +- src/share/classes/sun/tools/jmap/JMap.java | 4 +- src/share/classes/sun/tools/jps/Jps.java | 6 +- src/share/classes/sun/tools/jstack/JStack.java | 2 +- src/share/classes/sun/tools/serialver/SerialVer.java | 18 +- src/share/demo/management/MemoryMonitor/MemoryMonitor.java | 14 +- src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileStore.java | 2 +- src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java | 4 +- src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java | 2 +- src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipInfo.java | 4 +- src/share/lib/security/java.security-linux | 16 +- src/share/lib/security/java.security-macosx | 12 +- src/share/lib/security/java.security-solaris | 16 +- src/share/lib/security/java.security-windows | 16 +- src/share/native/com/sun/java/util/jar/pack/coding.cpp | 4 +- src/share/native/com/sun/java/util/jar/pack/defines.h | 4 - src/share/native/common/check_code.c | 40 +- src/share/native/common/jni_util.h | 32 + src/share/native/java/net/net_util.h | 3 - src/share/native/sun/awt/image/BufImgSurfaceData.c | 30 +- src/share/native/sun/awt/image/DataBufferNative.c | 4 +- src/share/native/sun/awt/image/awt_ImageRep.c | 12 +- src/share/native/sun/awt/image/awt_parseImage.c | 78 +- src/share/native/sun/awt/image/gif/gifdecoder.c | 18 +- src/share/native/sun/awt/image/imageInitIDs.c | 250 +- src/share/native/sun/awt/image/jpeg/imageioJPEG.c | 290 +- src/share/native/sun/awt/image/jpeg/jpegdecoder.c | 18 +- src/share/native/sun/awt/libpng/CHANGES | 379 +- src/share/native/sun/awt/libpng/LICENSE | 35 +- src/share/native/sun/awt/libpng/README | 5 +- src/share/native/sun/awt/libpng/png.c | 536 +- src/share/native/sun/awt/libpng/png.h | 384 +- src/share/native/sun/awt/libpng/pngconf.h | 50 +- src/share/native/sun/awt/libpng/pngdebug.h | 2 +- src/share/native/sun/awt/libpng/pngerror.c | 74 +- src/share/native/sun/awt/libpng/pngget.c | 74 +- src/share/native/sun/awt/libpng/pnginfo.h | 2 +- src/share/native/sun/awt/libpng/pnglibconf.h | 22 +- src/share/native/sun/awt/libpng/pngmem.c | 22 +- src/share/native/sun/awt/libpng/pngpread.c | 46 +- src/share/native/sun/awt/libpng/pngpriv.h | 275 +- src/share/native/sun/awt/libpng/pngread.c | 445 +- src/share/native/sun/awt/libpng/pngrio.c | 6 +- src/share/native/sun/awt/libpng/pngrtran.c | 96 +- src/share/native/sun/awt/libpng/pngrutil.c | 335 +- src/share/native/sun/awt/libpng/pngset.c | 304 +- src/share/native/sun/awt/libpng/pngstruct.h | 10 +- src/share/native/sun/awt/libpng/pngtest.c | 2101 ------- src/share/native/sun/awt/libpng/pngtrans.c | 15 +- src/share/native/sun/awt/libpng/pngwio.c | 196 - src/share/native/sun/awt/libpng/pngwrite.c | 2258 -------- src/share/native/sun/awt/libpng/pngwtran.c | 604 -- src/share/native/sun/awt/libpng/pngwutil.c | 2737 ---------- src/share/native/sun/misc/Version.c | 10 + src/share/native/sun/security/ec/ECC_JNI.cpp | 6 +- src/share/native/sun/security/ec/ecc_impl.h | 6 +- src/share/native/sun/security/ec/impl/ec.c | 38 +- src/share/native/sun/security/ec/impl/ec2.h | 5 +- src/share/native/sun/security/ec/impl/ec2_aff.c | 6 +- src/share/native/sun/security/ec/impl/ec2_mont.c | 9 +- src/share/native/sun/security/ec/impl/ecl-priv.h | 14 +- src/share/native/sun/security/ec/impl/ecl.h | 8 +- src/share/native/sun/security/ec/impl/ecl_mult.c | 34 +- src/share/native/sun/security/ec/impl/ecp.h | 13 +- src/share/native/sun/security/ec/impl/ecp_aff.c | 6 +- src/share/native/sun/security/ec/impl/ecp_jac.c | 18 +- src/share/native/sun/security/ec/impl/ecp_jm.c | 74 +- src/windows/native/sun/java2d/d3d/D3DBlitLoops.cpp | 8 +- src/windows/native/sun/java2d/d3d/D3DTextRenderer.cpp | 4 +- src/windows/native/sun/windows/ShellFolder2.cpp | 41 +- src/windows/native/sun/windows/awt_Component.cpp | 4 + src/windows/native/sun/windows/awt_DesktopProperties.cpp | 4 +- src/windows/native/sun/windows/awt_Font.cpp | 8 +- src/windows/native/sun/windows/awt_Frame.cpp | 6 +- src/windows/native/sun/windows/awt_Label.cpp | 9 +- src/windows/native/sun/windows/awt_PrintJob.cpp | 4 +- src/windows/native/sun/windows/awt_TextComponent.cpp | 3 +- test/com/sun/java/swing/plaf/windows/Test8173145.java | 123 + test/java/lang/invoke/PermuteArgsReturnVoidTest.java | 90 + test/java/rmi/registry/serialFilter/RegistryFilterTest.java | 242 + test/java/util/zip/ZipFile/ReadZip.java | 48 +- test/javax/swing/JFileChooser/GodMode/JFileChooserTest.java | 191 + test/sun/management/LazyCompositeDataTest.java | 163 + test/sun/security/pkcs/pkcs8/PKCS8Test.java | 39 +- test/sun/security/pkcs/pkcs8/TestLeadingZeros.java | 82 + test/sun/security/ssl/CertPathRestrictions/JSSEClient.java | 66 + test/sun/security/ssl/CertPathRestrictions/JSSEServer.java | 81 + test/sun/security/ssl/CertPathRestrictions/TLSRestrictions.java | 541 + test/sun/security/ssl/CertPathRestrictions/certs/END_ENTITY_SHA1-INTER_CA_SHA256-ROOT_CA_SHA256-PRIV.key | 26 + test/sun/security/ssl/CertPathRestrictions/certs/END_ENTITY_SHA1-INTER_CA_SHA256-ROOT_CA_SHA256.cer | 81 + test/sun/security/ssl/CertPathRestrictions/certs/END_ENTITY_SHA256-INTER_CA_SHA1-ROOT_CA_SHA1-PRIV.key | 26 + test/sun/security/ssl/CertPathRestrictions/certs/END_ENTITY_SHA256-INTER_CA_SHA1-ROOT_CA_SHA1.cer | 81 + test/sun/security/ssl/CertPathRestrictions/certs/END_ENTITY_SHA256-INTER_CA_SHA1-ROOT_CA_SHA256-PRIV.key | 26 + test/sun/security/ssl/CertPathRestrictions/certs/END_ENTITY_SHA256-INTER_CA_SHA1-ROOT_CA_SHA256.cer | 81 + test/sun/security/ssl/CertPathRestrictions/certs/END_ENTITY_SHA256-INTER_CA_SHA256-ROOT_CA_SHA1-PRIV.key | 26 + test/sun/security/ssl/CertPathRestrictions/certs/END_ENTITY_SHA256-INTER_CA_SHA256-ROOT_CA_SHA1.cer | 81 + test/sun/security/ssl/CertPathRestrictions/certs/END_ENTITY_SHA256-INTER_CA_SHA256-ROOT_CA_SHA256-PRIV.key | 26 + test/sun/security/ssl/CertPathRestrictions/certs/END_ENTITY_SHA256-INTER_CA_SHA256-ROOT_CA_SHA256.cer | 81 + test/sun/security/ssl/CertPathRestrictions/certs/INTER_CA_SHA1-ROOT_CA_SHA1-PRIV.key | 26 + test/sun/security/ssl/CertPathRestrictions/certs/INTER_CA_SHA1-ROOT_CA_SHA1.cer | 80 + test/sun/security/ssl/CertPathRestrictions/certs/INTER_CA_SHA1-ROOT_CA_SHA256-PRIV.key | 26 + test/sun/security/ssl/CertPathRestrictions/certs/INTER_CA_SHA1-ROOT_CA_SHA256.cer | 80 + test/sun/security/ssl/CertPathRestrictions/certs/INTER_CA_SHA256-ROOT_CA_SHA1-PRIV.key | 26 + test/sun/security/ssl/CertPathRestrictions/certs/INTER_CA_SHA256-ROOT_CA_SHA1.cer | 80 + test/sun/security/ssl/CertPathRestrictions/certs/INTER_CA_SHA256-ROOT_CA_SHA256-PRIV.key | 26 + test/sun/security/ssl/CertPathRestrictions/certs/INTER_CA_SHA256-ROOT_CA_SHA256.cer | 80 + test/sun/security/ssl/CertPathRestrictions/certs/ROOT_CA_SHA1-PRIV.key | 26 + test/sun/security/ssl/CertPathRestrictions/certs/ROOT_CA_SHA1.cer | 80 + test/sun/security/ssl/CertPathRestrictions/certs/ROOT_CA_SHA256-PRIV.key | 26 + test/sun/security/ssl/CertPathRestrictions/certs/ROOT_CA_SHA256.cer | 80 + 266 files changed, 7467 insertions(+), 10466 deletions(-) diffs (truncated from 27404 to 500 lines): diff -r 0e380c5a1bff -r 85bcd2abf0a2 .hgtags --- a/.hgtags Mon Jun 19 11:52:01 2017 +0200 +++ b/.hgtags Tue Aug 22 02:03:52 2017 +0100 @@ -652,3 +652,7 @@ e890a6aef6223d428376aac846c1d1f3e40dbda7 jdk7u141-b00 a319566e15f5611bae9cfda2696e8217020a9269 jdk7u141-b01 5af12d99fb1ea4642305058adb1f3f771d8b5eff icedtea-2.7.0pre12 +0e380c5a1bff8694655fa262a110f347a77da044 icedtea-2.7.0pre13 +19a085e656145471455d7fbd648717f94281a729 jdk7u141-b02 +871e3350966f67b95768a94c1854f1515cfa56ca jdk7u151-b00 +da1c09ab9b742fa77c0e667c2218b8d626432656 jdk7u151-b01 diff -r 0e380c5a1bff -r 85bcd2abf0a2 make/sun/javazic/tzdata/VERSION --- a/make/sun/javazic/tzdata/VERSION Mon Jun 19 11:52:01 2017 +0200 +++ b/make/sun/javazic/tzdata/VERSION Tue Aug 22 02:03:52 2017 +0100 @@ -21,4 +21,4 @@ # or visit www.oracle.com if you need additional information or have any # questions. # -tzdata2017a +tzdata2017b diff -r 0e380c5a1bff -r 85bcd2abf0a2 make/sun/javazic/tzdata/africa --- a/make/sun/javazic/tzdata/africa Mon Jun 19 11:52:01 2017 +0200 +++ b/make/sun/javazic/tzdata/africa Tue Aug 22 02:03:52 2017 +0100 @@ -443,18 +443,25 @@ # See Africa/Johannesburg. # Liberia -# From Paul Eggert (2006-03-22): -# In 1972 Liberia was the last country to switch -# from a UTC offset that was not a multiple of 15 or 20 minutes. -# Howse reports that it was in honor of their president's birthday. -# Shank & Pottenger report the date as May 1, whereas Howse reports Jan; -# go with Shanks & Pottenger. -# For Liberia before 1972, Shanks & Pottenger report -0:44, whereas Howse and -# Whitman each report -0:44:30; go with the more precise figure. +# +# From Paul Eggert (2017-03-02): +# +# The Nautical Almanac for the Year 1970, p 264, is the source for -0:44:30. +# +# In 1972 Liberia was the last country to switch from a UTC offset +# that was not a multiple of 15 or 20 minutes. The 1972 change was on +# 1972-01-07, according to an entry dated 1972-01-04 on p 330 of: +# Presidential Papers: First year of the administration of +# President William R. Tolbert, Jr., July 23, 1971-July 31, 1972. +# Monrovia: Executive Mansion. +# +# Use the abbreviation "MMT" before 1972, as the more-accurate numeric +# abbreviation "-004430" would be one byte over the POSIX limit. +# # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Monrovia -0:43:08 - LMT 1882 -0:43:08 - MMT 1919 Mar # Monrovia Mean Time - -0:44:30 - -004430 1972 May + -0:44:30 - MMT 1972 Jan 7 # approximately MMT 0:00 - GMT ############################################################################### diff -r 0e380c5a1bff -r 85bcd2abf0a2 make/sun/javazic/tzdata/iso3166.tab --- a/make/sun/javazic/tzdata/iso3166.tab Mon Jun 19 11:52:01 2017 +0200 +++ b/make/sun/javazic/tzdata/iso3166.tab Tue Aug 22 02:03:52 2017 +0100 @@ -32,8 +32,8 @@ # All text uses UTF-8 encoding. The columns of the table are as follows: # # 1. ISO 3166-1 alpha-2 country code, current as of -# ISO 3166-1 Newsletter VI-16 (2013-07-11). See: Updates on ISO 3166 -# http://www.iso.org/iso/home/standards/country_codes/updates_on_iso_3166.htm +# ISO 3166-1 N905 (2016-11-15). See: Updates on ISO 3166-1 +# http://isotc.iso.org/livelink/livelink/Open/16944257 # 2. The usual English name for the coded region, # chosen so that alphabetic sorting of subsets produces helpful lists. # This is not the same as the English name in the ISO 3166 tables. diff -r 0e380c5a1bff -r 85bcd2abf0a2 make/sun/javazic/tzdata/northamerica --- a/make/sun/javazic/tzdata/northamerica Mon Jun 19 11:52:01 2017 +0200 +++ b/make/sun/javazic/tzdata/northamerica Tue Aug 22 02:03:52 2017 +0100 @@ -3162,6 +3162,12 @@ # http://www.vantbefinfo.com/changement-dheure-pas-pour-haiti/ # http://news.anmwe.com/haiti-lheure-nationale-ne-sera-ni-avancee-ni-reculee-cette-annee/ +# From Steffen Thorsen (2017-03-12): +# We have received 4 mails from different people telling that Haiti +# has started DST again today, and this source seems to confirm that, +# I have not been able to find a more authoritative source: +# https://www.haitilibre.com/en/news-20319-haiti-notices-time-change-in-haiti.html + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Haiti 1983 only - May 8 0:00 1:00 D Rule Haiti 1984 1987 - Apr lastSun 0:00 1:00 D @@ -3174,6 +3180,8 @@ Rule Haiti 2005 2006 - Oct lastSun 0:00 0 S Rule Haiti 2012 2015 - Mar Sun>=8 2:00 1:00 D Rule Haiti 2012 2015 - Nov Sun>=1 2:00 0 S +Rule Haiti 2017 max - Mar Sun>=8 2:00 1:00 D +Rule Haiti 2017 max - Nov Sun>=1 2:00 0 S # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone America/Port-au-Prince -4:49:20 - LMT 1890 -4:49 - PPMT 1917 Jan 24 12:00 # P-a-P MT diff -r 0e380c5a1bff -r 85bcd2abf0a2 make/sun/rmi/rmi/Makefile --- a/make/sun/rmi/rmi/Makefile Mon Jun 19 11:52:01 2017 +0200 +++ b/make/sun/rmi/rmi/Makefile Tue Aug 22 02:03:52 2017 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1998, 2017, 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 @@ -52,16 +52,9 @@ include $(BUILDDIR)/common/Rules.gmk # -# Full package names of implementations requiring stubs -# -REMOTE_impls = \ - sun.rmi.registry.RegistryImpl \ - sun.rmi.transport.DGCImpl - -# # The java-rmi.cgi script in bin/ only gets delivered in certain situations # -BUILD_TARGETS = stubs +BUILD_TARGETS = ifeq ($(PLATFORM), linux) BUILD_TARGETS += bin endif @@ -75,29 +68,6 @@ clean clobber:: bin.clean - -# -# Compile stubs and skeletons for remote implementations -# (use -v1.1 for backward interoperability) -# -# gnumake 3.78.1 on windows attempts to build the target even -# though it exists. Not sure why, but a check for file existence -# has been added... -# -$(CLASSBINDIR)/%_Skel.class $(CLASSBINDIR)/%_Stub.class: $(CLASSBINDIR)/%.class - if [ ! -s $@ ] ; \ - then $(RMIC) -v1.1 -classpath \ - "$(CLASSBINDIR)" \ - -d $(CLASSBINDIR) '$(subst /,.,$(<:$(CLASSBINDIR)/%.class=%))' ; \ - fi - @$(java-vm-cleanup) - -REMOTE_files = $(subst .,/,$(REMOTE_impls)) -FILES_stubs = $(REMOTE_files:%=$(CLASSBINDIR)/%_Stub.class) -FILES_skels = $(REMOTE_files:%=$(CLASSBINDIR)/%_Skel.class) - -stubs: $(FILES_stubs) $(FILES_skels) - bin: $(BINDIR)/java-rmi.cgi $(BINDIR)/java-rmi.cgi: $(PLATFORM_SRC)/bin/java-rmi.cgi.sh @@ -107,5 +77,5 @@ bin.clean: $(RM) $(BINDIR)/java-rmi.cgi -.PHONY: stubs bin bin.clean +.PHONY: bin bin.clean diff -r 0e380c5a1bff -r 85bcd2abf0a2 make/sun/splashscreen/FILES_c.gmk --- a/make/sun/splashscreen/FILES_c.gmk Mon Jun 19 11:52:01 2017 +0200 +++ b/make/sun/splashscreen/FILES_c.gmk Tue Aug 22 02:03:52 2017 +0100 @@ -111,11 +111,7 @@ pngrtran.c \ pngrutil.c \ pngset.c \ - pngtrans.c \ - pngwio.c \ - pngwrite.c \ - pngwtran.c \ - pngwutil.c + pngtrans.c endif ifneq ($(SYSTEM_GIF), true) diff -r 0e380c5a1bff -r 85bcd2abf0a2 src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java --- a/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java Mon Jun 19 11:52:01 2017 +0200 +++ b/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java Tue Aug 22 02:03:52 2017 +0100 @@ -272,16 +272,21 @@ contentView.execute(new CFNativeAction() { @Override public void run(final long viewPtr) { + boolean hasOwnerPtr = false; + if (owner != null) { - owner.execute(new CFNativeAction() { + hasOwnerPtr = 0L != owner.executeGet(new CFNativeActionGet() { @Override - public void run(long ownerPtr) { + public long run(long ownerPtr) { ref.set(nativeCreateNSWindow(viewPtr, ownerPtr, styleBits, - bounds.x, bounds.y, - bounds.width, bounds.height)); + bounds.x, bounds.y, + bounds.width, bounds.height)); + return 1; } }); - } else { + } + + if (!hasOwnerPtr) { ref.set(nativeCreateNSWindow(viewPtr, 0, styleBits, bounds.x, bounds.y, bounds.width, bounds.height)); diff -r 0e380c5a1bff -r 85bcd2abf0a2 src/share/classes/com/sun/accessibility/internal/resources/accessibility_sv.properties --- a/src/share/classes/com/sun/accessibility/internal/resources/accessibility_sv.properties Mon Jun 19 11:52:01 2017 +0200 +++ b/src/share/classes/com/sun/accessibility/internal/resources/accessibility_sv.properties Tue Aug 22 02:03:52 2017 +0100 @@ -93,7 +93,7 @@ resizable=storleks\u00E4ndringsbar selectable=valbar selected=vald -showing=visas +showing=visar singleline=en rad transient=tillf\u00E4llig visible=synlig diff -r 0e380c5a1bff -r 85bcd2abf0a2 src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java --- a/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java Mon Jun 19 11:52:01 2017 +0200 +++ b/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java Tue Aug 22 02:03:52 2017 +0100 @@ -387,6 +387,17 @@ } } + private void skipPastImage(int imageIndex) { + cbLock.lock(); + try { + gotoImage(imageIndex); + skipImage(); + } catch (IOException | IndexOutOfBoundsException e) { + } finally { + cbLock.unlock(); + } + } + private int getNumImagesOnThread(boolean allowSearch) throws IOException { if (numImages != 0) { @@ -1228,7 +1239,8 @@ // Note that getData disables acceleration on buffer, but it is // just a 1-line intermediate data transfer buffer that will not // affect the acceleration of the resulting image. - aborted = readImage(structPointer, + aborted = readImage(imageIndex, + structPointer, buffer.getData(), numRasterBands, srcBands, @@ -1390,7 +1402,8 @@ /** * Returns true if the read was aborted. */ - private native boolean readImage(long structPointer, + private native boolean readImage(int imageIndex, + long structPointer, byte [] buffer, int numRasterBands, int [] srcBands, diff -r 0e380c5a1bff -r 85bcd2abf0a2 src/share/classes/com/sun/java/swing/plaf/windows/WindowsRootPaneUI.java --- a/src/share/classes/com/sun/java/swing/plaf/windows/WindowsRootPaneUI.java Mon Jun 19 11:52:01 2017 +0200 +++ b/src/share/classes/com/sun/java/swing/plaf/windows/WindowsRootPaneUI.java Tue Aug 22 02:03:52 2017 +0100 @@ -165,8 +165,11 @@ } public boolean postProcessKeyEvent(KeyEvent ev) { - if(ev.isConsumed()) { - // do not manage consumed event + if(ev.isConsumed() && ev.getKeyCode() != KeyEvent.VK_ALT) { + // mnemonic combination, it's consumed, but we need + // set altKeyPressed to false, otherwise after selection + // component by mnemonic combination a menu will be open + altKeyPressed = false; return false; } if (ev.getKeyCode() == KeyEvent.VK_ALT) { diff -r 0e380c5a1bff -r 85bcd2abf0a2 src/share/classes/com/sun/jndi/ldap/LdapClient.java --- a/src/share/classes/com/sun/jndi/ldap/LdapClient.java Mon Jun 19 11:52:01 2017 +0200 +++ b/src/share/classes/com/sun/jndi/ldap/LdapClient.java Tue Aug 22 02:03:52 2017 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2017, 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 @@ -1233,6 +1233,7 @@ static final int LDAP_REF_FOLLOW = 0x01; // follow referrals static final int LDAP_REF_THROW = 0x02; // throw referral ex. static final int LDAP_REF_IGNORE = 0x03; // ignore referrals + static final int LDAP_REF_FOLLOW_SCHEME = 0x04; // follow referrals of the same scheme static final String LDAP_URL = "ldap://"; // LDAPv3 static final String LDAPS_URL = "ldaps://"; // LDAPv3 diff -r 0e380c5a1bff -r 85bcd2abf0a2 src/share/classes/com/sun/jndi/ldap/LdapCtx.java --- a/src/share/classes/com/sun/jndi/ldap/LdapCtx.java Mon Jun 19 11:52:01 2017 +0200 +++ b/src/share/classes/com/sun/jndi/ldap/LdapCtx.java Tue Aug 22 02:03:52 2017 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2017, 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 @@ -2413,6 +2413,9 @@ // First determine the referral mode if (ref != null) { switch (ref) { + case "follow-scheme": + handleReferrals = LdapClient.LDAP_REF_FOLLOW_SCHEME; + break; case "follow": handleReferrals = LdapClient.LDAP_REF_FOLLOW; break; @@ -2975,7 +2978,23 @@ r = new LdapReferralException(resolvedName, resolvedObj, remainName, msg, envprops, fullDN, handleReferrals, reqCtls); // only one set of URLs is present - r.setReferralInfo(res.referrals.elementAt(0), false); + Vector refs; + if (res.referrals == null) { + refs = null; + } else if (handleReferrals == LdapClient.LDAP_REF_FOLLOW_SCHEME) { + refs = new Vector<>(); + for (String s : res.referrals.elementAt(0)) { + if (s.startsWith("ldap:")) { + refs.add(s); + } + } + if (refs.isEmpty()) { + refs = null; + } + } else { + refs = res.referrals.elementAt(0); + } + r.setReferralInfo(refs, false); if (hopCount > 1) { r.setHopCount(hopCount); @@ -3044,7 +3063,7 @@ * assume name resolution has not yet completed. */ if (((res.entries == null) || (res.entries.isEmpty())) && - (res.referrals.size() == 1)) { + ((res.referrals != null) && (res.referrals.size() == 1))) { r.setReferralInfo(res.referrals, false); diff -r 0e380c5a1bff -r 85bcd2abf0a2 src/share/classes/com/sun/jndi/ldap/LdapReferralException.java --- a/src/share/classes/com/sun/jndi/ldap/LdapReferralException.java Mon Jun 19 11:52:01 2017 +0200 +++ b/src/share/classes/com/sun/jndi/ldap/LdapReferralException.java Tue Aug 22 02:03:52 2017 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2017, 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 @@ -117,7 +117,8 @@ // If following referral, request controls are passed to referral ctx this.reqCtls = - (handleReferrals == LdapClient.LDAP_REF_FOLLOW ? reqCtls : null); + (handleReferrals == LdapClient.LDAP_REF_FOLLOW || + handleReferrals == LdapClient.LDAP_REF_FOLLOW_SCHEME ? reqCtls : null); } /** @@ -217,13 +218,15 @@ System.out.println("LdapReferralException.setReferralInfo"); this.referrals = referrals; - if (referrals != null) { - referralCount = referrals.size(); - } + referralCount = (referrals == null) ? 0 : referrals.size(); if (debug) { - for (int i = 0; i < referralCount; i++) { - System.out.println(" [" + i + "] " + referrals.elementAt(i)); + if (referrals != null) { + for (int i = 0; i < referralCount; i++) { + System.out.println(" [" + i + "] " + referrals.elementAt(i)); + } + } else { + System.out.println("setReferralInfo : referrals == null"); } } } diff -r 0e380c5a1bff -r 85bcd2abf0a2 src/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java --- a/src/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java Mon Jun 19 11:52:01 2017 +0200 +++ b/src/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java Tue Aug 22 02:03:52 2017 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2017, 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 @@ -62,9 +62,10 @@ * @param outputFile the system-dependent filename * @param live if true dump only live objects * i.e. objects that are reachable from others - * @throws IOException if the outputFile + * @throws IOException if the outputFile already exists, * cannot be created, opened, or written to. * @throws UnsupportedOperationException if this operation is not supported. + * @throws IllegalArgumentException if outputFile does not end with ".hprof" suffix. * @throws NullPointerException if outputFile is null. * @throws SecurityException * If a security manager exists and its {@link diff -r 0e380c5a1bff -r 85bcd2abf0a2 src/share/classes/java/lang/invoke/LambdaForm.java --- a/src/share/classes/java/lang/invoke/LambdaForm.java Mon Jun 19 11:52:01 2017 +0200 +++ b/src/share/classes/java/lang/invoke/LambdaForm.java Tue Aug 22 02:03:52 2017 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2017, 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 @@ -918,10 +918,10 @@ System.arraycopy(names, skip+outArgs, names2, skip+inTypes, bodyLength); int arity2 = names2.length - bodyLength; int result2 = result; - if (result2 >= 0) { + if (result2 >= skip) { if (result2 < skip+outArgs) { // return the corresponding inArg - result2 = reorder[result2-skip]; + result2 = reorder[result2 - skip] + skip; } else { result2 = result2 - outArgs + inTypes; } diff -r 0e380c5a1bff -r 85bcd2abf0a2 src/share/classes/java/rmi/activation/ActivationID.java --- a/src/share/classes/java/rmi/activation/ActivationID.java Mon Jun 19 11:52:01 2017 +0200 +++ b/src/share/classes/java/rmi/activation/ActivationID.java Tue Aug 22 02:03:52 2017 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2017, 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 @@ -40,6 +40,12 @@ import java.rmi.server.RemoteObjectInvocationHandler; import java.rmi.server.RemoteRef; import java.rmi.server.UID; +import java.security.AccessControlContext; +import java.security.AccessController; +import java.security.Permissions; +import java.security.PrivilegedActionException; +import java.security.PrivilegedExceptionAction; +import java.security.ProtectionDomain; /** * Activation makes use of special identifiers to denote remote @@ -81,6 +87,14 @@ /** indicate compatibility with the Java 2 SDK v1.2 version of class */ private static final long serialVersionUID = -4608673054848209235L; + /** an AccessControlContext with no permissions */ + private static final AccessControlContext NOPERMS_ACC; + static { + Permissions perms = new Permissions(); + ProtectionDomain[] pd = { new ProtectionDomain(null, perms) }; + NOPERMS_ACC = new AccessControlContext(pd); + } + /** * The constructor for ActivationID takes a single * argument, activator, that specifies a remote reference to the @@ -112,15 +126,21 @@ throws ActivationException, UnknownObjectException, RemoteException { try { - MarshalledObject mobj = + final MarshalledObject mobj = activator.activate(this, force); - return mobj.get(); - } catch (RemoteException e) { - throw e; - } catch (IOException e) { - throw new UnmarshalException("activation failed", e); - } catch (ClassNotFoundException e) { - throw new UnmarshalException("activation failed", e); + return AccessController.doPrivileged( + new PrivilegedExceptionAction() { + public Remote run() throws IOException, ClassNotFoundException { + return mobj.get(); + } + }, NOPERMS_ACC); + } catch (PrivilegedActionException pae) { + Exception ex = pae.getException(); + if (ex instanceof RemoteException) { + throw (RemoteException) ex; + } else { + throw new UnmarshalException("activation failed", ex); From bugzilla-daemon at icedtea.classpath.org Mon Aug 28 14:12:25 2017 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 28 Aug 2017 14:12:25 +0000 Subject: [Bug 3446] New: Crashing Apache Tomcat Server Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3446 Bug ID: 3446 Summary: Crashing Apache Tomcat Server Product: IcedTea Version: unspecified Hardware: x86_64 OS: Linux Status: NEW Severity: critical Priority: P5 Component: IcedTea Assignee: gnu.andrew at redhat.com Reporter: snehalskerkar at gmail.com CC: unassigned at icedtea.classpath.org Created attachment 1649 --> http://icedtea.classpath.org/bugzilla/attachment.cgi?id=1649&action=edit tomcat_server_crash_logs Hi, We have deployed server on Ubuntu 14.x, JRE v7.0. Recently we're facing server crash abruptly which was working fine previously, but now it is getting frequently crashed. We check memory and cCPU usage of that server and everything is working fine. We're not able to reproduce the steps. Below are the logs for server crash. ---------xxxxxxxxxxx--------- # # A fatal error has been detected by the Java Runtime Environment: # # SIGSEGV (0xb) at pc=0x00007ff79aa5d2bb, pid=1215, tid=140699912767232 # # JRE version: OpenJDK Runtime Environment (7.0_101) (build 1.7.0_101-b00) # Java VM: OpenJDK 64-Bit Server VM (24.95-b01 mixed mode linux-amd64 compressed oops) # Derivative: IcedTea 2.6.6 # Distribution: Ubuntu 14.04 LTS, package 7u101-2.6.6-0ubuntu0.14.04.1 # Problematic frame: # C [libc.so.6+0x13d2bb] # # Failed to write core dump. Core dumps have been disabled. To enable core dumping, try "ulimit -c unlimited" before starting Java again # # If you would like to submit a bug report, please include # instructions on how to reproduce the bug and visit: # http://icedtea.classpath.org/bugzilla # The crash happened outside the Java Virtual Machine in native code. # See problematic frame for where to report the bug. # --------------- T H R E A D --------------- Current thread (0x00007ff764142000): JavaThread "http-bio-8080-exec-410" daemon [_thread_in_native, id=3134, stack(0x00007ff740420000,0x00007ff740521000)] siginfo:si_signo=SIGSEGV: si_errno=0, si_code=128 (), si_addr=0x0000000000000000 ---------xxxxxxxxxxx--------- PFA log file for more detailed logs. Can anyone please help out the reason behind it? -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: