# HG changeset patch
# User duke
# Date 1499290975 -7200
# Node ID 4261be231c018d9ea67a7b8f3eb5573d8bb89d24
# Parent d1320b34c90fbe048ba8b51c7392363489947065# Parent f207a3d741da36735e827dd0b02138735488e857
Merge
diff -r d1320b34c90f -r 4261be231c01 .hgtags-top-repo
--- a/.hgtags-top-repo Wed Jun 21 11:41:14 2017 -0700
+++ b/.hgtags-top-repo Wed Jul 05 23:42:55 2017 +0200
@@ -428,3 +428,5 @@
2c25fc24103251f9711a1c280c31e1e41016d90f jdk-9+172
6b750cdb823a029a25ff2e560302cc2d28a86cb6 jdk-10+11
88d7fd969e7df0e07a53b201cfd29393ca33ede9 jdk-9+173
+5466f409346e0446ee9a6daeb7f5d75c8fc76823 jdk-9+174
+8d4ed1e06fe184c9cb08c5b708e7d6f5c066644f jdk-10+12
diff -r d1320b34c90f -r 4261be231c01 common/autoconf/generated-configure.sh
--- a/common/autoconf/generated-configure.sh Wed Jun 21 11:41:14 2017 -0700
+++ b/common/autoconf/generated-configure.sh Wed Jul 05 23:42:55 2017 +0200
@@ -688,6 +688,7 @@
LIBFFI_CFLAGS
ALSA_LIBS
ALSA_CFLAGS
+FREETYPE_LICENSE
FREETYPE_BUNDLE_LIB_PATH
FREETYPE_LIBS
FREETYPE_CFLAGS
@@ -1200,6 +1201,7 @@
with_freetype_lib
with_freetype_src
enable_freetype_bundling
+with_freetype_license
with_alsa
with_alsa_include
with_alsa_lib
@@ -2153,6 +2155,7 @@
--with-freetype-src specify directory with freetype sources to
automatically build the library (experimental,
Windows-only)
+ --with-freetype-license if bundling freetype, also bundle this license file
--with-alsa specify prefix directory for the alsa package
(expecting the libraries under PATH/lib and the
headers under PATH/include)
@@ -5186,7 +5189,7 @@
#CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1494858828
+DATE_WHEN_GENERATED=1496926402
###############################################################################
#
@@ -57906,6 +57909,12 @@
fi
+# Check whether --with-freetype-license was given.
+if test "${with_freetype_license+set}" = set; then :
+ withval=$with_freetype_license;
+fi
+
+
# Need to specify explicitly since it needs to be overridden on some versions of macosx
FREETYPE_BASE_NAME=freetype
FREETYPE_CFLAGS=
@@ -63852,6 +63861,153 @@
fi # end freetype needed
+ FREETYPE_LICENSE=""
+ if test "x$with_freetype_license" = "xyes"; then
+ as_fn_error $? "--with-freetype-license must have a value" "$LINENO" 5
+ elif test "x$with_freetype_license" != "x"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype license" >&5
+$as_echo_n "checking for freetype license... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_freetype_license" >&5
+$as_echo "$with_freetype_license" >&6; }
+ FREETYPE_LICENSE="$with_freetype_license"
+
+ # Only process if variable expands to non-empty
+
+ if test "x$FREETYPE_LICENSE" != x; then
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+
+ # Input might be given as Windows format, start by converting to
+ # unix format.
+ path="$FREETYPE_LICENSE"
+ new_path=`$CYGPATH -u "$path"`
+
+ # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
+ # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
+ # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
+ # "foo.exe" is OK but "foo" is an error.
+ #
+ # This test is therefore slightly more accurate than "test -f" to check for file precense.
+ # It is also a way to make sure we got the proper file name for the real test later on.
+ test_shortpath=`$CYGPATH -s -m "$new_path" 2> /dev/null`
+ if test "x$test_shortpath" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FREETYPE_LICENSE, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of FREETYPE_LICENSE, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Cannot locate the the path of FREETYPE_LICENSE" "$LINENO" 5
+ fi
+
+ # Call helper function which possibly converts this using DOS-style short mode.
+ # If so, the updated path is stored in $new_path.
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-._/a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ shortmode_path=`$CYGPATH -s -m -a "$input_path"`
+ path_after_shortmode=`$CYGPATH -u "$shortmode_path"`
+ if test "x$path_after_shortmode" != "x$input_to_shortpath"; then
+ # Going to short mode and back again did indeed matter. Since short mode is
+ # case insensitive, let's make it lowercase to improve readability.
+ shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ # Now convert it back to Unix-style (cygpath)
+ input_path=`$CYGPATH -u "$shortmode_path"`
+ new_path="$input_path"
+ fi
+ fi
+
+ test_cygdrive_prefix=`$ECHO $input_path | $GREP ^/cygdrive/`
+ if test "x$test_cygdrive_prefix" = x; then
+ # As a simple fix, exclude /usr/bin since it's not a real path.
+ if test "x`$ECHO $new_path | $GREP ^/usr/bin/`" = x; then
+ # The path is in a Cygwin special directory (e.g. /home). We need this converted to
+ # a path prefixed by /cygdrive for fixpath to work.
+ new_path="$CYGWIN_ROOT_PATH$input_path"
+ fi
+ fi
+
+
+ if test "x$path" != "x$new_path"; then
+ FREETYPE_LICENSE="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FREETYPE_LICENSE to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting FREETYPE_LICENSE to \"$new_path\"" >&6;}
+ fi
+
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+
+ path="$FREETYPE_LICENSE"
+ has_colon=`$ECHO $path | $GREP ^.:`
+ new_path="$path"
+ if test "x$has_colon" = x; then
+ # Not in mixed or Windows style, start by that.
+ new_path=`cmd //c echo $path`
+ fi
+
+
+ input_path="$new_path"
+ # Check if we need to convert this using DOS-style short mode. If the path
+ # contains just simple characters, use it. Otherwise (spaces, weird characters),
+ # take no chances and rewrite it.
+ # Note: m4 eats our [], so we need to use [ and ] instead.
+ has_forbidden_chars=`$ECHO "$input_path" | $GREP [^-_/:a-zA-Z0-9]`
+ if test "x$has_forbidden_chars" != x; then
+ # Now convert it to mixed DOS-style, short mode (no spaces, and / instead of \)
+ new_path=`cmd /c "for %A in (\"$input_path\") do @echo %~sA"|$TR \\\\\\\\ / | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ fi
+
+
+ windows_path="$new_path"
+ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
+ unix_path=`$CYGPATH -u "$windows_path"`
+ new_path="$unix_path"
+ elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
+ unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'`
+ new_path="$unix_path"
+ fi
+
+ if test "x$path" != "x$new_path"; then
+ FREETYPE_LICENSE="$new_path"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FREETYPE_LICENSE to \"$new_path\"" >&5
+$as_echo "$as_me: Rewriting FREETYPE_LICENSE to \"$new_path\"" >&6;}
+ fi
+
+ # Save the first 10 bytes of this path to the storage, so fixpath can work.
+ all_fixpath_prefixes=("${all_fixpath_prefixes[@]}" "${new_path:0:10}")
+
+ else
+ # We're on a unix platform. Hooray! :)
+ path="$FREETYPE_LICENSE"
+ has_space=`$ECHO "$path" | $GREP " "`
+ if test "x$has_space" != x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FREETYPE_LICENSE, which resolves as \"$path\", is invalid." >&5
+$as_echo "$as_me: The path of FREETYPE_LICENSE, which resolves as \"$path\", is invalid." >&6;}
+ as_fn_error $? "Spaces are not allowed in this path." "$LINENO" 5
+ fi
+
+ # Use eval to expand a potential ~
+ eval path="$path"
+ if test ! -f "$path" && test ! -d "$path"; then
+ as_fn_error $? "The path of FREETYPE_LICENSE, which resolves as \"$path\", is not found." "$LINENO" 5
+ fi
+
+ if test -d "$path"; then
+ FREETYPE_LICENSE="`cd "$path"; $THEPWDCMD -L`"
+ else
+ dir="`$DIRNAME "$path"`"
+ base="`$BASENAME "$path"`"
+ FREETYPE_LICENSE="`cd "$dir"; $THEPWDCMD -L`/$base"
+ fi
+ fi
+ fi
+
+ if test ! -f "$FREETYPE_LICENSE"; then
+ as_fn_error $? "$FREETYPE_LICENSE cannot be found" "$LINENO" 5
+ fi
+ fi
+
+
diff -r d1320b34c90f -r 4261be231c01 common/autoconf/lib-freetype.m4
--- a/common/autoconf/lib-freetype.m4 Wed Jun 21 11:41:14 2017 -0700
+++ b/common/autoconf/lib-freetype.m4 Wed Jul 05 23:42:55 2017 +0200
@@ -194,6 +194,8 @@
[specify directory with freetype sources to automatically build the library (experimental, Windows-only)])])
AC_ARG_ENABLE(freetype-bundling, [AS_HELP_STRING([--disable-freetype-bundling],
[disable bundling of the freetype library with the build result @<:@enabled on Windows or when using --with-freetype, disabled otherwise@:>@])])
+ AC_ARG_WITH(freetype-license, [AS_HELP_STRING([--with-freetype-license],
+ [if bundling freetype, also bundle this license file])])
# Need to specify explicitly since it needs to be overridden on some versions of macosx
FREETYPE_BASE_NAME=freetype
@@ -443,7 +445,21 @@
fi # end freetype needed
+ FREETYPE_LICENSE=""
+ if test "x$with_freetype_license" = "xyes"; then
+ AC_MSG_ERROR([--with-freetype-license must have a value])
+ elif test "x$with_freetype_license" != "x"; then
+ AC_MSG_CHECKING([for freetype license])
+ AC_MSG_RESULT([$with_freetype_license])
+ FREETYPE_LICENSE="$with_freetype_license"
+ BASIC_FIXUP_PATH(FREETYPE_LICENSE)
+ if test ! -f "$FREETYPE_LICENSE"; then
+ AC_MSG_ERROR([$FREETYPE_LICENSE cannot be found])
+ fi
+ fi
+
AC_SUBST(FREETYPE_BUNDLE_LIB_PATH)
AC_SUBST(FREETYPE_CFLAGS)
AC_SUBST(FREETYPE_LIBS)
+ AC_SUBST(FREETYPE_LICENSE)
])
diff -r d1320b34c90f -r 4261be231c01 common/autoconf/spec.gmk.in
--- a/common/autoconf/spec.gmk.in Wed Jun 21 11:41:14 2017 -0700
+++ b/common/autoconf/spec.gmk.in Wed Jul 05 23:42:55 2017 +0200
@@ -312,6 +312,7 @@
FREETYPE_LIBS:=@FREETYPE_LIBS@
FREETYPE_CFLAGS:=@FREETYPE_CFLAGS@
FREETYPE_BUNDLE_LIB_PATH=@FREETYPE_BUNDLE_LIB_PATH@
+FREETYPE_LICENSE=@FREETYPE_LICENSE@
CUPS_CFLAGS:=@CUPS_CFLAGS@
ALSA_LIBS:=@ALSA_LIBS@
ALSA_CFLAGS:=@ALSA_CFLAGS@
diff -r d1320b34c90f -r 4261be231c01 common/conf/jib-profiles.js
--- a/common/conf/jib-profiles.js Wed Jun 21 11:41:14 2017 -0700
+++ b/common/conf/jib-profiles.js Wed Jul 05 23:42:55 2017 +0200
@@ -893,6 +893,16 @@
}
});
+ // The windows ri profile needs to add the freetype license file
+ profilesRiFreetype = {
+ "windows-x86-ri": {
+ configure_args: "--with-freetype-license="
+ + input.get("freetype", "install_path")
+ + "/freetype-2.7.1-v120-x86/freetype.md"
+ }
+ };
+ profiles = concatObjects(profiles, profilesRiFreetype);
+
// Generate the missing platform attributes
profiles = generatePlatformAttributes(profiles);
profiles = generateDefaultMakeTargetsConfigureArg(common, profiles);
diff -r d1320b34c90f -r 4261be231c01 hotspot/.hgtags
--- a/hotspot/.hgtags Wed Jun 21 11:41:14 2017 -0700
+++ b/hotspot/.hgtags Wed Jul 05 23:42:55 2017 +0200
@@ -588,3 +588,5 @@
1ae9e84f68b359420d2d153ecfe5ee2903e33a2e jdk-9+172
7f14e550f1e8abea41c223e5fdad2261e99ba929 jdk-10+11
e64b1cb48d6e7703928a9d1da106fc27f8cb65fd jdk-9+173
+944791f8160185bffa13fbb821fc09b6198f1f25 jdk-9+174
+070aa7a2eb14c4645f7eb31384cba0a2ba72a4b5 jdk-10+12
diff -r d1320b34c90f -r 4261be231c01 hotspot/src/jdk.hotspot.agent/share/classes/module-info.java
--- a/hotspot/src/jdk.hotspot.agent/share/classes/module-info.java Wed Jun 21 11:41:14 2017 -0700
+++ b/hotspot/src/jdk.hotspot.agent/share/classes/module-info.java Wed Jul 05 23:42:55 2017 +0200
@@ -26,6 +26,15 @@
/**
* Defines the implementation of the HotSpot Serviceability Agent.
*
+ * This module includes the {@index jhsdb jhsdb tool} tool to
+ * attach to a running Java Virtual Machine (JVM) or launch a postmortem
+ * debugger to analyze the content of a core-dump from a crashed JVM.
+ *
+ *
+ * - Tool Guides:
+ * - {@extLink jhsdb_tool_reference jhsdb}
+ *
+ *
* @moduleGraph
* @since 9
*/
diff -r d1320b34c90f -r 4261be231c01 hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StandardGraphBuilderPlugins.java
--- a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StandardGraphBuilderPlugins.java Wed Jun 21 11:41:14 2017 -0700
+++ b/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StandardGraphBuilderPlugins.java Wed Jul 05 23:42:55 2017 +0200
@@ -251,7 +251,13 @@
for (JavaKind kind : new JavaKind[]{JavaKind.Int, JavaKind.Long, JavaKind.Object}) {
Class javaClass = kind == JavaKind.Object ? Object.class : kind.toJavaClass();
- r.register5("compareAndSwap" + kind.name(), Receiver.class, Object.class, long.class, javaClass, javaClass, new InvocationPlugin() {
+ String casName;
+ if (Java8OrEarlier) {
+ casName = "compareAndSwap";
+ } else {
+ casName = "compareAndSet";
+ }
+ r.register5(casName + kind.name(), Receiver.class, Object.class, long.class, javaClass, javaClass, new InvocationPlugin() {
@Override
public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver unsafe, ValueNode object, ValueNode offset, ValueNode expected, ValueNode x) {
// Emits a null-check for the otherwise unused receiver
diff -r d1320b34c90f -r 4261be231c01 hotspot/src/share/vm/classfile/vmSymbols.hpp
diff -r d1320b34c90f -r 4261be231c01 hotspot/src/share/vm/utilities/globalDefinitions.hpp
--- a/hotspot/src/share/vm/utilities/globalDefinitions.hpp Wed Jun 21 11:41:14 2017 -0700
+++ b/hotspot/src/share/vm/utilities/globalDefinitions.hpp Wed Jul 05 23:42:55 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2016, 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
@@ -1095,8 +1095,11 @@
#undef min
#endif
-#define max(a,b) Do_not_use_max_use_MAX2_instead
-#define min(a,b) Do_not_use_min_use_MIN2_instead
+// The following defines serve the purpose of preventing use of accidentally
+// included min max macros from compiling, while continuing to allow innocent
+// min and max identifiers in the code to compile as intended.
+#define max max
+#define min min
// It is necessary to use templates here. Having normal overloaded
// functions does not work because it is necessary to provide both 32-
diff -r d1320b34c90f -r 4261be231c01 hotspot/test/compiler/c2/cr8004867/TestIntUnsafeCAS.java
--- a/hotspot/test/compiler/c2/cr8004867/TestIntUnsafeCAS.java Wed Jun 21 11:41:14 2017 -0700
+++ b/hotspot/test/compiler/c2/cr8004867/TestIntUnsafeCAS.java Wed Jul 05 23:42:55 2017 +0200
@@ -773,221 +773,221 @@
static void test_ci(int[] a) {
for (int i = 0; i < ARRLEN; i+=1) {
- unsafe.compareAndSwapInt(a, byte_offset(i), -1, -123);
+ unsafe.compareAndSetInt(a, byte_offset(i), -1, -123);
}
}
static void test_vi(int[] a, int b, int old) {
for (int i = 0; i < ARRLEN; i+=1) {
- unsafe.compareAndSwapInt(a, byte_offset(i), old, b);
+ unsafe.compareAndSetInt(a, byte_offset(i), old, b);
}
}
static void test_cp(int[] a, int[] b) {
for (int i = 0; i < ARRLEN; i+=1) {
- unsafe.compareAndSwapInt(a, byte_offset(i), -123, b[i]);
+ unsafe.compareAndSetInt(a, byte_offset(i), -123, b[i]);
}
}
static void test_2ci(int[] a, int[] b) {
for (int i = 0; i < ARRLEN; i+=1) {
- unsafe.compareAndSwapInt(a, byte_offset(i), 123, -123);
- unsafe.compareAndSwapInt(b, byte_offset(i), 123, -103);
+ unsafe.compareAndSetInt(a, byte_offset(i), 123, -123);
+ unsafe.compareAndSetInt(b, byte_offset(i), 123, -103);
}
}
static void test_2vi(int[] a, int[] b, int c, int d) {
for (int i = 0; i < ARRLEN; i+=1) {
- unsafe.compareAndSwapInt(a, byte_offset(i), -123, c);
- unsafe.compareAndSwapInt(b, byte_offset(i), -103, d);
+ unsafe.compareAndSetInt(a, byte_offset(i), -123, c);
+ unsafe.compareAndSetInt(b, byte_offset(i), -103, d);
}
}
static void test_ci_neg(int[] a, int old) {
for (int i = ARRLEN-1; i >= 0; i-=1) {
- unsafe.compareAndSwapInt(a, byte_offset(i), old, -123);
+ unsafe.compareAndSetInt(a, byte_offset(i), old, -123);
}
}
static void test_vi_neg(int[] a, int b, int old) {
for (int i = ARRLEN-1; i >= 0; i-=1) {
- unsafe.compareAndSwapInt(a, byte_offset(i), old, b);
+ unsafe.compareAndSetInt(a, byte_offset(i), old, b);
}
}
static void test_cp_neg(int[] a, int[] b) {
for (int i = ARRLEN-1; i >= 0; i-=1) {
- unsafe.compareAndSwapInt(a, byte_offset(i), -123, b[i]);
+ unsafe.compareAndSetInt(a, byte_offset(i), -123, b[i]);
}
}
static void test_2ci_neg(int[] a, int[] b) {
for (int i = ARRLEN-1; i >= 0; i-=1) {
- unsafe.compareAndSwapInt(a, byte_offset(i), 123, -123);
- unsafe.compareAndSwapInt(b, byte_offset(i), 123, -103);
+ unsafe.compareAndSetInt(a, byte_offset(i), 123, -123);
+ unsafe.compareAndSetInt(b, byte_offset(i), 123, -103);
}
}
static void test_2vi_neg(int[] a, int[] b, int c, int d) {
for (int i = ARRLEN-1; i >= 0; i-=1) {
- unsafe.compareAndSwapInt(a, byte_offset(i), -123, c);
- unsafe.compareAndSwapInt(b, byte_offset(i), -103, d);
+ unsafe.compareAndSetInt(a, byte_offset(i), -123, c);
+ unsafe.compareAndSetInt(b, byte_offset(i), -103, d);
}
}
static void test_ci_oppos(int[] a, int old) {
int limit = ARRLEN-1;
for (int i = 0; i < ARRLEN; i+=1) {
- unsafe.compareAndSwapInt(a, byte_offset(limit-i), old, -123);
+ unsafe.compareAndSetInt(a, byte_offset(limit-i), old, -123);
}
}
static void test_vi_oppos(int[] a, int b, int old) {
int limit = ARRLEN-1;
for (int i = limit; i >= 0; i-=1) {
- unsafe.compareAndSwapInt(a, byte_offset(limit-i), old, b);
+ unsafe.compareAndSetInt(a, byte_offset(limit-i), old, b);
}
}
static void test_cp_oppos(int[] a, int[] b) {
int limit = ARRLEN-1;
for (int i = 0; i < ARRLEN; i+=1) {
- unsafe.compareAndSwapInt(a, byte_offset(i), -123, b[limit-i]);
+ unsafe.compareAndSetInt(a, byte_offset(i), -123, b[limit-i]);
}
}
static void test_2ci_oppos(int[] a, int[] b) {
int limit = ARRLEN-1;
for (int i = 0; i < ARRLEN; i+=1) {
- unsafe.compareAndSwapInt(a, byte_offset(limit-i), 123, -123);
- unsafe.compareAndSwapInt(b, byte_offset(i), 123, -103);
+ unsafe.compareAndSetInt(a, byte_offset(limit-i), 123, -123);
+ unsafe.compareAndSetInt(b, byte_offset(i), 123, -103);
}
}
static void test_2vi_oppos(int[] a, int[] b, int c, int d) {
int limit = ARRLEN-1;
for (int i = limit; i >= 0; i-=1) {
- unsafe.compareAndSwapInt(a, byte_offset(i), -123, c);
- unsafe.compareAndSwapInt(b, byte_offset(limit-i), -103, d);
+ unsafe.compareAndSetInt(a, byte_offset(i), -123, c);
+ unsafe.compareAndSetInt(b, byte_offset(limit-i), -103, d);
}
}
static void test_ci_off(int[] a, int old) {
for (int i = 0; i < ARRLEN-OFFSET; i+=1) {
- unsafe.compareAndSwapInt(a, byte_offset(i+OFFSET), old, -123);
+ unsafe.compareAndSetInt(a, byte_offset(i+OFFSET), old, -123);
}
}
static void test_vi_off(int[] a, int b, int old) {
for (int i = 0; i < ARRLEN-OFFSET; i+=1) {
- unsafe.compareAndSwapInt(a, byte_offset(i+OFFSET), old, b);
+ unsafe.compareAndSetInt(a, byte_offset(i+OFFSET), old, b);
}
}
static void test_cp_off(int[] a, int[] b) {
for (int i = 0; i < ARRLEN-OFFSET; i+=1) {
- unsafe.compareAndSwapInt(a, byte_offset(i+OFFSET), -123, b[i+OFFSET]);
+ unsafe.compareAndSetInt(a, byte_offset(i+OFFSET), -123, b[i+OFFSET]);
}
}
static void test_2ci_off(int[] a, int[] b) {
for (int i = 0; i < ARRLEN-OFFSET; i+=1) {
- unsafe.compareAndSwapInt(a, byte_offset(i+OFFSET), 123, -123);
- unsafe.compareAndSwapInt(b, byte_offset(i+OFFSET), 123, -103);
+ unsafe.compareAndSetInt(a, byte_offset(i+OFFSET), 123, -123);
+ unsafe.compareAndSetInt(b, byte_offset(i+OFFSET), 123, -103);
}
}
static void test_2vi_off(int[] a, int[] b, int c, int d) {
for (int i = 0; i < ARRLEN-OFFSET; i+=1) {
- unsafe.compareAndSwapInt(a, byte_offset(i+OFFSET), -123, c);
- unsafe.compareAndSwapInt(b, byte_offset(i+OFFSET), -103, d);
+ unsafe.compareAndSetInt(a, byte_offset(i+OFFSET), -123, c);
+ unsafe.compareAndSetInt(b, byte_offset(i+OFFSET), -103, d);
}
}
static void test_ci_inv(int[] a, int k, int old) {
for (int i = 0; i < ARRLEN-k; i+=1) {
- unsafe.compareAndSwapInt(a, byte_offset(i+k), old, -123);
+ unsafe.compareAndSetInt(a, byte_offset(i+k), old, -123);
}
}
static void test_vi_inv(int[] a, int b, int k, int old) {
for (int i = 0; i < ARRLEN-k; i+=1) {
- unsafe.compareAndSwapInt(a, byte_offset(i+k), old, b);
+ unsafe.compareAndSetInt(a, byte_offset(i+k), old, b);
}
}
static void test_cp_inv(int[] a, int[] b, int k) {
for (int i = 0; i < ARRLEN-k; i+=1) {
- unsafe.compareAndSwapInt(a, byte_offset(i+k), -123, b[i+k]);
+ unsafe.compareAndSetInt(a, byte_offset(i+k), -123, b[i+k]);
}
}
static void test_2ci_inv(int[] a, int[] b, int k) {
for (int i = 0; i < ARRLEN-k; i+=1) {
- unsafe.compareAndSwapInt(a, byte_offset(i+k), 123, -123);
- unsafe.compareAndSwapInt(b, byte_offset(i+k), 123, -103);
+ unsafe.compareAndSetInt(a, byte_offset(i+k), 123, -123);
+ unsafe.compareAndSetInt(b, byte_offset(i+k), 123, -103);
}
}
static void test_2vi_inv(int[] a, int[] b, int c, int d, int k) {
for (int i = 0; i < ARRLEN-k; i+=1) {
- unsafe.compareAndSwapInt(a, byte_offset(i+k), -123, c);
- unsafe.compareAndSwapInt(b, byte_offset(i+k), -103, d);
+ unsafe.compareAndSetInt(a, byte_offset(i+k), -123, c);
+ unsafe.compareAndSetInt(b, byte_offset(i+k), -103, d);
}
}
static void test_ci_scl(int[] a, int old) {
for (int i = 0; i*SCALE < ARRLEN; i+=1) {
- unsafe.compareAndSwapInt(a, byte_offset(i*SCALE), old, -123);
+ unsafe.compareAndSetInt(a, byte_offset(i*SCALE), old, -123);
}
}
static void test_vi_scl(int[] a, int b, int old) {
for (int i = 0; i*SCALE < ARRLEN; i+=1) {
- unsafe.compareAndSwapInt(a, byte_offset(i*SCALE), old, b);
+ unsafe.compareAndSetInt(a, byte_offset(i*SCALE), old, b);
}
}
static void test_cp_scl(int[] a, int[] b) {
for (int i = 0; i*SCALE < ARRLEN; i+=1) {
- unsafe.compareAndSwapInt(a, byte_offset(i*SCALE), -123, b[i*SCALE]);
+ unsafe.compareAndSetInt(a, byte_offset(i*SCALE), -123, b[i*SCALE]);
}
}
static void test_2ci_scl(int[] a, int[] b) {
for (int i = 0; i*SCALE < ARRLEN; i+=1) {
- unsafe.compareAndSwapInt(a, byte_offset(i*SCALE), 123, -123);
- unsafe.compareAndSwapInt(b, byte_offset(i*SCALE), 123, -103);
+ unsafe.compareAndSetInt(a, byte_offset(i*SCALE), 123, -123);
+ unsafe.compareAndSetInt(b, byte_offset(i*SCALE), 123, -103);
}
}
static void test_2vi_scl(int[] a, int[] b, int c, int d) {
for (int i = 0; i*SCALE < ARRLEN; i+=1) {
- unsafe.compareAndSwapInt(a, byte_offset(i*SCALE), -123, c);
- unsafe.compareAndSwapInt(b, byte_offset(i*SCALE), -103, d);
+ unsafe.compareAndSetInt(a, byte_offset(i*SCALE), -123, c);
+ unsafe.compareAndSetInt(b, byte_offset(i*SCALE), -103, d);
}
}
static void test_cp_alndst(int[] a, int[] b) {
for (int i = 0; i < ARRLEN-ALIGN_OFF; i+=1) {
- unsafe.compareAndSwapInt(a, byte_offset(i+ALIGN_OFF), -1, b[i]);
+ unsafe.compareAndSetInt(a, byte_offset(i+ALIGN_OFF), -1, b[i]);
}
}
static void test_cp_alnsrc(int[] a, int[] b) {
for (int i = 0; i < ARRLEN-ALIGN_OFF; i+=1) {
int old = unsafe.getIntVolatile(a, byte_offset(i));
- unsafe.compareAndSwapInt(a, byte_offset(i), old, b[i+ALIGN_OFF]);
+ unsafe.compareAndSetInt(a, byte_offset(i), old, b[i+ALIGN_OFF]);
}
}
static void test_2ci_aln(int[] a, int[] b) {
for (int i = 0; i < ARRLEN-ALIGN_OFF; i+=1) {
- unsafe.compareAndSwapInt(a, byte_offset(i+ALIGN_OFF), -1, -123);
+ unsafe.compareAndSetInt(a, byte_offset(i+ALIGN_OFF), -1, -123);
int old = unsafe.getIntVolatile(b, byte_offset(i));
- unsafe.compareAndSwapInt(b, byte_offset(i), old, -103);
+ unsafe.compareAndSetInt(b, byte_offset(i), old, -103);
}
}
static void test_2vi_aln(int[] a, int[] b, int c, int d) {
for (int i = 0; i < ARRLEN-ALIGN_OFF; i+=1) {
int old = unsafe.getIntVolatile(a, byte_offset(i));
- unsafe.compareAndSwapInt(a, byte_offset(i), old, c);
+ unsafe.compareAndSetInt(a, byte_offset(i), old, c);
old = unsafe.getIntVolatile(b, byte_offset(i+ALIGN_OFF));
- unsafe.compareAndSwapInt(b, byte_offset(i+ALIGN_OFF), old, d);
+ unsafe.compareAndSetInt(b, byte_offset(i+ALIGN_OFF), old, d);
}
}
static void test_cp_unalndst(int[] a, int[] b) {
for (int i = 0; i < ARRLEN-UNALIGN_OFF; i+=1) {
- unsafe.compareAndSwapInt(a, byte_offset(i+UNALIGN_OFF), -1, b[i]);
+ unsafe.compareAndSetInt(a, byte_offset(i+UNALIGN_OFF), -1, b[i]);
}
}
static void test_cp_unalnsrc(int[] a, int[] b) {
for (int i = 0; i < ARRLEN-UNALIGN_OFF; i+=1) {
int old = unsafe.getIntVolatile(a, byte_offset(i));
- unsafe.compareAndSwapInt(a, byte_offset(i), old, b[i+UNALIGN_OFF]);
+ unsafe.compareAndSetInt(a, byte_offset(i), old, b[i+UNALIGN_OFF]);
}
}
static void test_2ci_unaln(int[] a, int[] b) {
for (int i = 0; i < ARRLEN-UNALIGN_OFF; i+=1) {
- unsafe.compareAndSwapInt(a, byte_offset(i+UNALIGN_OFF), -1, -123);
+ unsafe.compareAndSetInt(a, byte_offset(i+UNALIGN_OFF), -1, -123);
int old = unsafe.getIntVolatile(b, byte_offset(i));
- unsafe.compareAndSwapInt(b, byte_offset(i), old, -103);
+ unsafe.compareAndSetInt(b, byte_offset(i), old, -103);
}
}
static void test_2vi_unaln(int[] a, int[] b, int c, int d) {
for (int i = 0; i < ARRLEN-UNALIGN_OFF; i+=1) {
int old = unsafe.getIntVolatile(a, byte_offset(i));
- unsafe.compareAndSwapInt(a, byte_offset(i), old, c);
+ unsafe.compareAndSetInt(a, byte_offset(i), old, c);
old = unsafe.getIntVolatile(b, byte_offset(i+UNALIGN_OFF));
- unsafe.compareAndSwapInt(b, byte_offset(i+UNALIGN_OFF), old, d);
+ unsafe.compareAndSetInt(b, byte_offset(i+UNALIGN_OFF), old, d);
}
}
diff -r d1320b34c90f -r 4261be231c01 hotspot/test/compiler/profiling/UnsafeAccess.java
--- a/hotspot/test/compiler/profiling/UnsafeAccess.java Wed Jun 21 11:41:14 2017 -0700
+++ b/hotspot/test/compiler/profiling/UnsafeAccess.java Wed Jul 05 23:42:55 2017 +0200
@@ -64,7 +64,7 @@
static Object helperUnsafeLoadStore(Object o, boolean isObjArray) {
if (isObjArray) {
Object o1 = U.getObject(o, off);
- U.compareAndSwapObject(o, off, o1, new Object());
+ U.compareAndSetObject(o, off, o1, new Object());
}
return o;
}
diff -r d1320b34c90f -r 4261be231c01 make/CreateJmods.gmk
--- a/make/CreateJmods.gmk Wed Jun 21 11:41:14 2017 -0700
+++ b/make/CreateJmods.gmk Wed Jul 05 23:42:55 2017 +0200
@@ -81,6 +81,7 @@
LEGAL_NOTICES := \
$(SUPPORT_OUTPUTDIR)/modules_legal/java.base \
+ $(wildcard $(SUPPORT_OUTPUTDIR)/modules_legal/$(MODULE)) \
$(call FindModuleLegalDirs, $(MODULE)) \
#
diff -r d1320b34c90f -r 4261be231c01 make/Main.gmk
--- a/make/Main.gmk Wed Jun 21 11:41:14 2017 -0700
+++ b/make/Main.gmk Wed Jul 05 23:42:55 2017 +0200
@@ -843,7 +843,7 @@
build-test-hotspot-jtreg-native: buildtools-jdk \
hotspot-$(JVM_VARIANT_MAIN)-libs
- build-test-jdk-jtreg-native: buildtools-jdk
+ build-test-jdk-jtreg-native: buildtools-jdk java.base-libs
test-image-hotspot-jtreg-native: build-test-hotspot-jtreg-native
diff -r d1320b34c90f -r 4261be231c01 make/common/Modules.gmk
--- a/make/common/Modules.gmk Wed Jun 21 11:41:14 2017 -0700
+++ b/make/common/Modules.gmk Wed Jul 05 23:42:55 2017 +0200
@@ -175,10 +175,13 @@
jdk.policytool \
jdk.rmic \
jdk.scripting.nashorn \
+ jdk.scripting.nashorn.shell \
jdk.sctp \
jdk.security.auth \
jdk.security.jgss \
+ jdk.xml.bind \
jdk.xml.dom \
+ jdk.xml.ws \
jdk.zipfs \
#
diff -r d1320b34c90f -r 4261be231c01 make/jprt.properties
--- a/make/jprt.properties Wed Jun 21 11:41:14 2017 -0700
+++ b/make/jprt.properties Wed Jul 05 23:42:55 2017 +0200
@@ -174,7 +174,13 @@
# Select test targets - jprt default for jprt.test.set is "default"
jprt.test.targets=${my.test.targets.${jprt.test.set}}
jprt.make.rule.test.targets=${my.make.rule.test.targets.${jprt.test.set}}
-jprt.test.bundle.targets=${my.jprt.test.bundle.targets.${jprt.test.set}}
+
+# Not all test targets need the test image
+jprt.test.bundle.targets=\
+ ${my.make.rule.test.targets.hotspot.reg}, \
+ ${my.make.rule.test.targets.hotspot.gtest} \
+ ${my.make.rule.test.targets.nativesanity} \
+ ${my.test.target.set:TESTNAME=jdk_lang}
# 7155453: Work-around to prevent popups on OSX from blocking test completion
# but the work-around is added to all platforms to be consistent
@@ -473,20 +479,11 @@
${my.make.rule.test.targets.hotspot.reg} \
${my.make.rule.test.targets.hotspot.other}
-# Install the test bundle for the testset hotspot jtreg tests
-# (but not for the other Makefile based tests)
-my.jprt.test.bundle.targets.hotspot= \
- ${my.make.rule.test.targets.hotspot.reg}, \
- ${my.make.rule.test.targets.hotspot.gtest}
-
# Native jdk and hotspot test targets (testset=nativesanity)
my.make.rule.test.targets.nativesanity= \
${my.test.target.set:TESTNAME=jdk_native_sanity}, \
${my.test.target.set:TESTNAME=hotspot_native_sanity}
-# Install the test bundle for the nativesanity jtreg tests
-my.jprt.test.bundle.targets.nativesanity=${my.make.rule.test.targets.nativesanity}
-
################################################################################
# Testset buildinfra
my.build.flavors.buildinfra = \