# HG changeset patch
# User duke
# Date 1499280115 -7200
# Node ID d201ac02bb3f84790573837058821174f183f46d
# Parent 7c5e7ba80fcd2785b84b06397b280e2e16254f7b# Parent 243b84f44954e0aef6a98fa8ed733c3366e5f91d
Merge
diff -r 7c5e7ba80fcd -r d201ac02bb3f .hgtags-top-repo
--- a/.hgtags-top-repo Thu Jul 16 19:28:37 2015 -0700
+++ b/.hgtags-top-repo Wed Jul 05 20:41:55 2017 +0200
@@ -315,3 +315,4 @@
eed77fcd77711fcdba05f18fc22f37d86efb243c jdk9-b70
c706ef5ea5da00078dc5e4334660315f7d99c15b jdk9-b71
8582c35016fb6211b373810b6b172feccf9c483b jdk9-b72
+4c2cbaae528bce970dabbb5676005d379357f4b6 jdk9-b73
diff -r 7c5e7ba80fcd -r d201ac02bb3f make/Javadoc.gmk
--- a/make/Javadoc.gmk Thu Jul 16 19:28:37 2015 -0700
+++ b/make/Javadoc.gmk Wed Jul 05 20:41:55 2017 +0200
@@ -410,7 +410,8 @@
$(prep-target)
@($(call COMMON_JAVADOCFLAGS) ; \
$(call COMMON_JAVADOCTAGS) ; \
- $(call OptionOnly,-Xdoclint:none) ; \
+ $(call OptionOnly,-Xdoclint:reference) ; \
+ $(call OptionOnly,-Xdoclint/package:-org.omg.*) ; \
$(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
$(call OptionPair,-encoding,ISO-8859-1) ; \
$(call OptionOnly,-splitIndex) ; \
diff -r 7c5e7ba80fcd -r d201ac02bb3f make/jprt.properties
--- a/make/jprt.properties Thu Jul 16 19:28:37 2015 -0700
+++ b/make/jprt.properties Wed Jul 05 20:41:55 2017 +0200
@@ -61,7 +61,7 @@
# Use these configure args to define debug level
jprt.debug.build.configure.args=--with-debug-level=slowdebug
-jprt.fastdebug.build.configure.args=--with-debug-level=fastdebug
+jprt.fastdebug.build.configure.args=--with-debug-level=fastdebug --disable-precompiled-headers
jprt.product.build.configure.args=--with-debug-level=release
jprt.optimized.build.configure.args=--with-debug-level=optimized
jprt.debugOpen.build.configure.args=${jprt.debug.build.configure.args} --enable-openjdk-only
@@ -121,9 +121,7 @@
${jprt.fastdebugOpen.build.configure.args}
jprt.i586.productOpen.build.configure.args= \
${my.i586.default.build.configure.args} \
- ${jprt.productOpen.build.configure.args}
-
-jprt.windows_i586.build.configure.args= \
+ ${jprt.productOpen.build.configure.args}jprt.windows_i586.build.configure.args= \
--with-devkit=$VS2013_HOME \
${jprt.i586.build.configure.args}
jprt.windows_x64.build.configure.args= \
@@ -281,12 +279,7 @@
solaris_sparcv9_5.11-{product|fastdebug}-c2-GCBasher_SerialGC, \
solaris_sparcv9_5.11-{product|fastdebug}-c2-GCBasher_ParallelGC, \
solaris_sparcv9_5.11-{product|fastdebug}-c2-GCBasher_CMS, \
- solaris_sparcv9_5.11-{product|fastdebug}-c2-GCBasher_G1, \
- solaris_sparcv9_5.11-{product|fastdebug}-c2-jbb_default_nontiered, \
- solaris_sparcv9_5.11-{product|fastdebug}-c2-jbb_SerialGC, \
- solaris_sparcv9_5.11-{product|fastdebug}-c2-jbb_ParallelGC, \
- solaris_sparcv9_5.11-{product|fastdebug}-c2-jbb_CMS, \
- solaris_sparcv9_5.11-{product|fastdebug}-c2-jbb_G1
+ solaris_sparcv9_5.11-{product|fastdebug}-c2-GCBasher_G1
my.test.targets.hotspot.solaris.x64= \
solaris_x64_5.11-{product|fastdebug}-c2-jvm98, \
@@ -298,10 +291,7 @@
solaris_x64_5.11-{product|fastdebug}-c2-GCBasher_SerialGC, \
solaris_x64_5.11-{product|fastdebug}-c2-GCBasher_ParallelGC, \
solaris_x64_5.11-{product|fastdebug}-c2-GCBasher_CMS, \
- solaris_x64_5.11-{product|fastdebug}-c2-GCBasher_G1, \
- solaris_x64_5.11-{product|fastdebug}-c2-jbb_default_nontiered, \
- solaris_x64_5.11-{product|fastdebug}-c2-jbb_SerialGC, \
- solaris_x64_5.11-{product|fastdebug}-c2-jbb_ParallelGC,
+ solaris_x64_5.11-{product|fastdebug}-c2-GCBasher_G1
my.test.targets.hotspot.linux.i586= \
linux_i586_2.6-{product|fastdebug}-{c1|c2}-jvm98, \
@@ -315,12 +305,7 @@
linux_i586_2.6-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC, \
linux_i586_2.6-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \
linux_i586_2.6-{product|fastdebug}-{c1|c2}-GCBasher_CMS, \
- linux_i586_2.6-{product|fastdebug}-{c1|c2}-GCBasher_G1, \
- linux_i586_2.6-{product|fastdebug}-c1-jbb_SerialGC, \
- linux_i586_2.6-{product|fastdebug}-c2-jbb_default_nontiered, \
- linux_i586_2.6-{product|fastdebug}-c1-jbb_ParallelGC, \
- linux_i586_2.6-{product|fastdebug}-c1-jbb_CMS, \
- linux_i586_2.6-{product|fastdebug}-c1-jbb_G1
+ linux_i586_2.6-{product|fastdebug}-{c1|c2}-GCBasher_G1
my.test.targets.hotspot.linux.x64= \
linux_x64_2.6-{product|fastdebug}-c2-jvm98, \
@@ -329,10 +314,7 @@
linux_x64_2.6-{product|fastdebug}-c2-GCBasher_SerialGC, \
linux_x64_2.6-{product|fastdebug}-c2-GCBasher_ParallelGC, \
linux_x64_2.6-{product|fastdebug}-c2-GCBasher_CMS, \
- linux_x64_2.6-{product|fastdebug}-c2-GCBasher_G1, \
- linux_x64_2.6-{product|fastdebug}-c2-jbb_default_nontiered, \
- linux_x64_2.6-{product|fastdebug}-c2-jbb_ParallelGC, \
- linux_x64_2.6-{product|fastdebug}-c2-jbb_G1
+ linux_x64_2.6-{product|fastdebug}-c2-GCBasher_G1
my.test.targets.hotspot.macosx.x64= \
macosx_x64_10.9-{product|fastdebug}-c2-jvm98, \
@@ -341,10 +323,7 @@
macosx_x64_10.9-{product|fastdebug}-c2-GCBasher_SerialGC, \
macosx_x64_10.9-{product|fastdebug}-c2-GCBasher_ParallelGC, \
macosx_x64_10.9-{product|fastdebug}-c2-GCBasher_CMS, \
- macosx_x64_10.9-{product|fastdebug}-c2-GCBasher_G1, \
- macosx_x64_10.9-{product|fastdebug}-c2-jbb_default_nontiered, \
- macosx_x64_10.9-{product|fastdebug}-c2-jbb_ParallelGC, \
- macosx_x64_10.9-{product|fastdebug}-c2-jbb_G1
+ macosx_x64_10.9-{product|fastdebug}-c2-GCBasher_G1
my.test.targets.hotspot.windows.i586= \
windows_i586_6.2-{product|fastdebug}-{c1|c2}-jvm98, \
@@ -357,12 +336,7 @@
windows_i586_6.2-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC, \
windows_i586_6.2-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \
windows_i586_6.2-{product|fastdebug}-{c1|c2}-GCBasher_CMS, \
- windows_i586_6.2-{product|fastdebug}-{c1|c2}-GCBasher_G1, \
- windows_i586_6.2-{product|fastdebug}-{c1|c2}-jbb_default, \
- windows_i586_6.2-{product|fastdebug}-c2-jbb_default_nontiered, \
- windows_i586_6.2-product-{c1|c2}-jbb_ParallelGC, \
- windows_i586_6.2-product-{c1|c2}-jbb_CMS, \
- windows_i586_6.2-product-{c1|c2}-jbb_G1
+ windows_i586_6.2-{product|fastdebug}-{c1|c2}-GCBasher_G1
my.test.targets.hotspot.windows.x64= \
windows_x64_6.2-{product|fastdebug}-c2-jvm98, \
@@ -374,12 +348,7 @@
windows_x64_6.2-{product|fastdebug}-c2-GCBasher_SerialGC, \
windows_x64_6.2-{product|fastdebug}-c2-GCBasher_ParallelGC, \
windows_x64_6.2-{product|fastdebug}-c2-GCBasher_CMS, \
- windows_x64_6.2-{product|fastdebug}-c2-GCBasher_G1, \
- windows_x64_6.2-{product|fastdebug}-c2-jbb_default, \
- windows_x64_6.2-{product|fastdebug}-c2-jbb_default_nontiered, \
- windows_x64_6.2-product-c2-jbb_CMS, \
- windows_x64_6.2-product-c2-jbb_ParallelGC, \
- windows_x64_6.2-product-c2-jbb_G1
+ windows_x64_6.2-{product|fastdebug}-c2-GCBasher_G1
# Some basic "smoke" tests for OpenJDK builds
my.test.targets.hotspot.open= \
diff -r 7c5e7ba80fcd -r d201ac02bb3f modules.xml
--- a/modules.xml Thu Jul 16 19:28:37 2015 -0700
+++ b/modules.xml Wed Jul 05 20:41:55 2017 +0200
@@ -219,6 +219,10 @@
jdk.dev
+ jdk.internal.jimage.decompressor
+ jdk.dev
+
+
jdk.internal.org.objectweb.asm
java.instrument
jdk.jfr
@@ -246,6 +250,10 @@
jdk.scripting.nashorn
+ jdk.internal
+ jdk.jfr
+
+
sun.misc
java.corba
java.desktop
@@ -285,6 +293,7 @@
sun.net.util
+ java.desktop
jdk.jconsole
jdk.naming.dns
diff -r 7c5e7ba80fcd -r d201ac02bb3f test/lib/Makefile
--- a/test/lib/Makefile Thu Jul 16 19:28:37 2015 -0700
+++ b/test/lib/Makefile Wed Jul 05 20:41:55 2017 +0200
@@ -8,7 +8,7 @@
#
# 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
+# 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).
#
diff -r 7c5e7ba80fcd -r d201ac02bb3f test/lib/sun/hotspot/WhiteBox.java
--- a/test/lib/sun/hotspot/WhiteBox.java Thu Jul 16 19:28:37 2015 -0700
+++ b/test/lib/sun/hotspot/WhiteBox.java Wed Jul 05 20:41:55 2017 +0200
@@ -26,6 +26,7 @@
import java.lang.management.MemoryUsage;
import java.lang.reflect.Executable;
+import java.nio.ByteBuffer;
import java.util.Arrays;
import java.util.List;
import java.util.function.BiFunction;
@@ -37,7 +38,6 @@
import sun.hotspot.parser.DiagnosticCommand;
public class WhiteBox {
-
@SuppressWarnings("serial")
public static class WhiteBoxPermission extends BasicPermission {
public WhiteBoxPermission(String s) {
@@ -362,6 +362,23 @@
.orElse(null);
}
+ public native boolean readImageFile(String imagePath);
+ public native long imageOpenImage(String imagePath, boolean bigEndian);
+ public native void imageCloseImage(long id);
+ public native long imageGetIndexAddress(long id);
+ public native long imageGetDataAddress(long id);
+ public native boolean imageReadCompressed(long id, long offset,
+ ByteBuffer compressedBuffer, long compressedSize,
+ ByteBuffer uncompressedBuffer, long uncompressedSize);
+ public native boolean imageRead(long id, long offset,
+ ByteBuffer uncompressedBuffer, long uncompressedSize);
+ public native byte[] imageGetStringBytes(long id, int offset);
+ public native long imageGetStringsSize(long id);
+ public native long[] imageGetAttributes(long id, int offset);
+ public native long[] imageFindAttributes(long id, byte[] path);
+ public native int[] imageAttributeOffsets(long id);
+ public native int imageGetIntAtAddress(long address, int offset, boolean big_endian);
+
// Safepoint Checking
public native void assertMatchingSafepointCalls(boolean mutexSafepointValue, boolean attemptedNoSafepointValue);