stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Yumin Qi 2016-01-15 19:18:42 +00:00
commit c5715d5ebc
614 changed files with 3396 additions and 2737 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.hgtags
View File

@ -342,3 +342,4 @@ f242d4332f563648426a1b0fa02d8741beba19ef jdk9-b92
4edcff1b9a8875eb6380a2165dfec599e8e3f7c0 jdk-9+97 4edcff1b9a8875eb6380a2165dfec599e8e3f7c0 jdk-9+97
d00ad2d9049ac60815f70bff445e95df85648bd2 jdk-9+98 d00ad2d9049ac60815f70bff445e95df85648bd2 jdk-9+98
f9bcdce2df26678c3fe468130b535c0342c69b89 jdk-9+99 f9bcdce2df26678c3fe468130b535c0342c69b89 jdk-9+99
4379223f8806626852c46c52d4e7a27a584b406e jdk-9+100

1
.hgtags-top-repo
View File

@ -342,3 +342,4 @@ cf1dc4c035fb84693d4ae5ad818785cb4d1465d1 jdk9-b90
75c3897541ecb52ee16d001ea605b12971df7303 jdk-9+97 75c3897541ecb52ee16d001ea605b12971df7303 jdk-9+97
48987460c7d49a29013963ee44d090194396bb61 jdk-9+98 48987460c7d49a29013963ee44d090194396bb61 jdk-9+98
7c0577bea4c65d69c5bef67023a89d2efa4fb2f7 jdk-9+99 7c0577bea4c65d69c5bef67023a89d2efa4fb2f7 jdk-9+99
c1f30ac14db0eaff398429c04cd9fab92e1b4b2a jdk-9+100

49
common/autoconf/build-performance.m4
View File

@ -251,6 +251,24 @@ AC_DEFUN([BPERF_SETUP_CCACHE_USAGE],
fi fi
]) ])
################################################################################
#
# Runs icecc-create-env once and prints the error if it fails
#
# $1: arguments to icecc-create-env
# $2: log file
#
AC_DEFUN([BPERF_RUN_ICECC_CREATE_ENV],
[
cd ${CONFIGURESUPPORT_OUTPUTDIR}/icecc \
&& ${ICECC_CREATE_ENV} $1 > $2 2>&1
if test "$?" != "0"; then
AC_MSG_NOTICE([icecc-create-env output:])
cat $2
AC_MSG_ERROR([Failed to create icecc compiler environment])
fi
])
################################################################################ ################################################################################
# #
# Optionally enable distributed compilation of native code using icecc/icecream # Optionally enable distributed compilation of native code using icecc/icecream
@ -271,16 +289,18 @@ AC_DEFUN([BPERF_SETUP_ICECC],
# be sent to the other hosts in the icecream cluster. # be sent to the other hosts in the icecream cluster.
icecc_create_env_log="${CONFIGURESUPPORT_OUTPUTDIR}/icecc/icecc_create_env.log" icecc_create_env_log="${CONFIGURESUPPORT_OUTPUTDIR}/icecc/icecc_create_env.log"
${MKDIR} -p ${CONFIGURESUPPORT_OUTPUTDIR}/icecc ${MKDIR} -p ${CONFIGURESUPPORT_OUTPUTDIR}/icecc
AC_MSG_CHECKING([for icecc build environment for target compiler]) # Older versions of icecc does not have the --gcc parameter
if ${ICECC_CREATE_ENV} | $GREP -q -e --gcc; then
icecc_gcc_arg="--gcc"
fi
if test "x${TOOLCHAIN_TYPE}" = "xgcc"; then if test "x${TOOLCHAIN_TYPE}" = "xgcc"; then
cd ${CONFIGURESUPPORT_OUTPUTDIR}/icecc \ BPERF_RUN_ICECC_CREATE_ENV([${icecc_gcc_arg} ${CC} ${CXX}], \
&& ${ICECC_CREATE_ENV} --gcc ${CC} ${CXX} > ${icecc_create_env_log} ${icecc_create_env_log})
elif test "x$TOOLCHAIN_TYPE" = "xclang"; then elif test "x$TOOLCHAIN_TYPE" = "xclang"; then
# For clang, the icecc compilerwrapper is needed. It usually resides next # For clang, the icecc compilerwrapper is needed. It usually resides next
# to icecc-create-env. # to icecc-create-env.
BASIC_REQUIRE_PROGS(ICECC_WRAPPER, compilerwrapper) BASIC_REQUIRE_PROGS(ICECC_WRAPPER, compilerwrapper)
cd ${CONFIGURESUPPORT_OUTPUTDIR}/icecc \ BPERF_RUN_ICECC_CREATE_ENV([--clang ${CC} ${ICECC_WRAPPER}], ${icecc_create_env_log})
&& ${ICECC_CREATE_ENV} --clang ${CC} ${ICECC_WRAPPER} > ${icecc_create_env_log}
else else
AC_MSG_ERROR([Can only create icecc compiler packages for toolchain types gcc and clang]) AC_MSG_ERROR([Can only create icecc compiler packages for toolchain types gcc and clang])
fi fi
@ -289,24 +309,31 @@ AC_DEFUN([BPERF_SETUP_ICECC],
# to find it. # to find it.
ICECC_ENV_BUNDLE_BASENAME="`${SED} -n '/^creating/s/creating //p' ${icecc_create_env_log}`" ICECC_ENV_BUNDLE_BASENAME="`${SED} -n '/^creating/s/creating //p' ${icecc_create_env_log}`"
ICECC_ENV_BUNDLE="${CONFIGURESUPPORT_OUTPUTDIR}/icecc/${ICECC_ENV_BUNDLE_BASENAME}" ICECC_ENV_BUNDLE="${CONFIGURESUPPORT_OUTPUTDIR}/icecc/${ICECC_ENV_BUNDLE_BASENAME}"
if test ! -f ${ICECC_ENV_BUNDLE}; then
AC_MSG_ERROR([icecc-create-env did not produce an environment ${ICECC_ENV_BUNDLE}])
fi
AC_MSG_CHECKING([for icecc build environment for target compiler])
AC_MSG_RESULT([${ICECC_ENV_BUNDLE}]) AC_MSG_RESULT([${ICECC_ENV_BUNDLE}])
ICECC="ICECC_VERSION=${ICECC_ENV_BUNDLE} ICECC_CC=${CC} ICECC_CXX=${CXX} ${ICECC_CMD}" ICECC="ICECC_VERSION=${ICECC_ENV_BUNDLE} ICECC_CC=${CC} ICECC_CXX=${CXX} ${ICECC_CMD}"
if test "x${COMPILE_TYPE}" = "xcross"; then if test "x${COMPILE_TYPE}" = "xcross"; then
# If cross compiling, create a separate env package for the build compiler # If cross compiling, create a separate env package for the build compiler
AC_MSG_CHECKING([for icecc build environment for build compiler])
# Assume "gcc" or "cc" is gcc and "clang" is clang. Otherwise bail. # Assume "gcc" or "cc" is gcc and "clang" is clang. Otherwise bail.
icecc_create_env_log_build="${CONFIGURESUPPORT_OUTPUTDIR}/icecc/icecc_create_env_build.log"
if test "x${BUILD_CC##*/}" = "xgcc" || test "x${BUILD_CC##*/}" = "xcc"; then if test "x${BUILD_CC##*/}" = "xgcc" || test "x${BUILD_CC##*/}" = "xcc"; then
cd ${CONFIGURESUPPORT_OUTPUTDIR}/icecc \ BPERF_RUN_ICECC_CREATE_ENV([${icecc_gcc_arg} ${BUILD_CC} ${BUILD_CXX}], \
&& ${ICECC_CREATE_ENV} --gcc ${BUILD_CC} ${BUILD_CXX} > ${icecc_create_env_log} ${icecc_create_env_log_build})
elif test "x${BUILD_CC##*/}" = "xclang"; then elif test "x${BUILD_CC##*/}" = "xclang"; then
cd ${CONFIGURESUPPORT_OUTPUTDIR}/icecc \ BPERF_RUN_ICECC_CREATE_ENV([--clang ${BUILD_CC} ${ICECC_WRAPPER}], ${icecc_create_env_log_build})
&& ${ICECC_CREATE_ENV} --clang ${BUILD_CC} ${ICECC_WRAPPER} > ${icecc_create_env_log}
else else
AC_MSG_ERROR([Cannot create icecc compiler package for ${BUILD_CC}]) AC_MSG_ERROR([Cannot create icecc compiler package for ${BUILD_CC}])
fi fi
ICECC_ENV_BUNDLE_BASENAME="`${SED} -n '/^creating/s/creating //p' ${icecc_create_env_log}`" ICECC_ENV_BUNDLE_BASENAME="`${SED} -n '/^creating/s/creating //p' ${icecc_create_env_log_build}`"
ICECC_ENV_BUNDLE="${CONFIGURESUPPORT_OUTPUTDIR}/icecc/${ICECC_ENV_BUNDLE_BASENAME}" ICECC_ENV_BUNDLE="${CONFIGURESUPPORT_OUTPUTDIR}/icecc/${ICECC_ENV_BUNDLE_BASENAME}"
if test ! -f ${ICECC_ENV_BUNDLE}; then
AC_MSG_ERROR([icecc-create-env did not produce an environment ${ICECC_ENV_BUNDLE}])
fi
AC_MSG_CHECKING([for icecc build environment for build compiler])
AC_MSG_RESULT([${ICECC_ENV_BUNDLE}]) AC_MSG_RESULT([${ICECC_ENV_BUNDLE}])
BUILD_ICECC="ICECC_VERSION=${ICECC_ENV_BUNDLE} ICECC_CC=${BUILD_CC} \ BUILD_ICECC="ICECC_VERSION=${ICECC_ENV_BUNDLE} ICECC_CC=${BUILD_CC} \
ICECC_CXX=${BUILD_CXX} ${ICECC_CMD}" ICECC_CXX=${BUILD_CXX} ${ICECC_CMD}"

20
common/autoconf/flags.m4
View File

@ -128,6 +128,26 @@ AC_DEFUN_ONCE([FLAGS_SETUP_INIT_FLAGS],
else else
COMPILER_TARGET_BITS_FLAG="-m" COMPILER_TARGET_BITS_FLAG="-m"
COMPILER_COMMAND_FILE_FLAG="@" COMPILER_COMMAND_FILE_FLAG="@"
# The solstudio linker does not support @-files.
if test "x$TOOLCHAIN_TYPE" = xsolstudio; then
COMPILER_COMMAND_FILE_FLAG=
fi
# Check if @file is supported by gcc
if test "x$TOOLCHAIN_TYPE" = xgcc; then
AC_MSG_CHECKING([if @file is supported by gcc])
# Extra emtpy "" to prevent ECHO from interpreting '--version' as argument
$ECHO "" "--version" > command.file
if $CXX @command.file 2>&AS_MESSAGE_LOG_FD >&AS_MESSAGE_LOG_FD; then
AC_MSG_RESULT(yes)
COMPILER_COMMAND_FILE_FLAG="@"
else
AC_MSG_RESULT(no)
COMPILER_COMMAND_FILE_FLAG=
fi
rm -rf command.file
fi
fi fi
AC_SUBST(COMPILER_TARGET_BITS_FLAG) AC_SUBST(COMPILER_TARGET_BITS_FLAG)
AC_SUBST(COMPILER_COMMAND_FILE_FLAG) AC_SUBST(COMPILER_COMMAND_FILE_FLAG)

133
common/autoconf/generated-configure.sh
View File

@ -3792,6 +3792,15 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
################################################################################
#
# Runs icecc-create-env once and prints the error if it fails
#
# $1: arguments to icecc-create-env
# $2: log file
#
################################################################################ ################################################################################
# #
# Optionally enable distributed compilation of native code using icecc/icecream # Optionally enable distributed compilation of native code using icecc/icecream
@ -4308,7 +4317,7 @@ pkgadd_help() {
# #
# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
@ -4801,7 +4810,7 @@ VS_SDK_PLATFORM_NAME_2013=
#CUSTOM_AUTOCONF_INCLUDE #CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks: # Do not change or remove the following line, it is needed for consistency checks:
DATE_WHEN_GENERATED=1450277321 DATE_WHEN_GENERATED=1452261921
############################################################################### ###############################################################################
# #
@ -45930,6 +45939,29 @@ $as_echo "$tool_specified" >&6; }
else else
COMPILER_TARGET_BITS_FLAG="-m" COMPILER_TARGET_BITS_FLAG="-m"
COMPILER_COMMAND_FILE_FLAG="@" COMPILER_COMMAND_FILE_FLAG="@"
# The solstudio linker does not support @-files.
if test "x$TOOLCHAIN_TYPE" = xsolstudio; then
COMPILER_COMMAND_FILE_FLAG=
fi
# Check if @file is supported by gcc
if test "x$TOOLCHAIN_TYPE" = xgcc; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if @file is supported by gcc" >&5
$as_echo_n "checking if @file is supported by gcc... " >&6; }
# Extra emtpy "" to prevent ECHO from interpreting '--version' as argument
$ECHO "" "--version" > command.file
if $CXX @command.file 2>&5 >&5; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
COMPILER_COMMAND_FILE_FLAG="@"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
COMPILER_COMMAND_FILE_FLAG=
fi
rm -rf command.file
fi
fi fi
@ -51742,12 +51774,28 @@ $as_echo "$as_me: WARNING: cups not used, so --with-cups[-*] is ignored" >&2;}
fi fi
if test "x${with_cups}" != x; then if test "x${with_cups}" != x; then
CUPS_CFLAGS="-I${with_cups}/include" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cups headers" >&5
CUPS_FOUND=yes $as_echo_n "checking for cups headers... " >&6; }
if test -s "${with_cups}/include/cups/cups.h"; then
CUPS_CFLAGS="-I${with_cups}/include"
CUPS_FOUND=yes
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CUPS_FOUND" >&5
$as_echo "$CUPS_FOUND" >&6; }
else
as_fn_error $? "Can't find 'include/cups/cups.h' under ${with_cups} given with the --with-cups option." "$LINENO" 5
fi
fi fi
if test "x${with_cups_include}" != x; then if test "x${with_cups_include}" != x; then
CUPS_CFLAGS="-I${with_cups_include}" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cups headers" >&5
CUPS_FOUND=yes $as_echo_n "checking for cups headers... " >&6; }
if test -s "${with_cups_include}/cups/cups.h"; then
CUPS_CFLAGS="-I${with_cups_include}"
CUPS_FOUND=yes
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CUPS_FOUND" >&5
$as_echo "$CUPS_FOUND" >&6; }
else
as_fn_error $? "Can't find 'cups/cups.h' under ${with_cups_include} given with the --with-cups-include option." "$LINENO" 5
fi
fi fi
if test "x$CUPS_FOUND" = xno; then if test "x$CUPS_FOUND" = xno; then
# Are the cups headers installed in the default /usr/include location? # Are the cups headers installed in the default /usr/include location?
@ -59543,11 +59591,23 @@ $as_echo "$tool_specified" >&6; }
# be sent to the other hosts in the icecream cluster. # be sent to the other hosts in the icecream cluster.
icecc_create_env_log="${CONFIGURESUPPORT_OUTPUTDIR}/icecc/icecc_create_env.log" icecc_create_env_log="${CONFIGURESUPPORT_OUTPUTDIR}/icecc/icecc_create_env.log"
${MKDIR} -p ${CONFIGURESUPPORT_OUTPUTDIR}/icecc ${MKDIR} -p ${CONFIGURESUPPORT_OUTPUTDIR}/icecc
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for icecc build environment for target compiler" >&5 # Older versions of icecc does not have the --gcc parameter
$as_echo_n "checking for icecc build environment for target compiler... " >&6; } if ${ICECC_CREATE_ENV} | $GREP -q -e --gcc; then
icecc_gcc_arg="--gcc"
fi
if test "x${TOOLCHAIN_TYPE}" = "xgcc"; then if test "x${TOOLCHAIN_TYPE}" = "xgcc"; then
cd ${CONFIGURESUPPORT_OUTPUTDIR}/icecc \
&& ${ICECC_CREATE_ENV} --gcc ${CC} ${CXX} > ${icecc_create_env_log} cd ${CONFIGURESUPPORT_OUTPUTDIR}/icecc \
&& ${ICECC_CREATE_ENV} ${icecc_gcc_arg} ${CC} ${CXX} > \
${icecc_create_env_log} 2>&1
if test "$?" != "0"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: icecc-create-env output:" >&5
$as_echo "$as_me: icecc-create-env output:" >&6;}
cat \
${icecc_create_env_log}
as_fn_error $? "Failed to create icecc compiler environment" "$LINENO" 5
fi
elif test "x$TOOLCHAIN_TYPE" = "xclang"; then elif test "x$TOOLCHAIN_TYPE" = "xclang"; then
# For clang, the icecc compilerwrapper is needed. It usually resides next # For clang, the icecc compilerwrapper is needed. It usually resides next
# to icecc-create-env. # to icecc-create-env.
@ -59755,8 +59815,16 @@ $as_echo "$tool_specified" >&6; }
fi fi
cd ${CONFIGURESUPPORT_OUTPUTDIR}/icecc \
&& ${ICECC_CREATE_ENV} --clang ${CC} ${ICECC_WRAPPER} > ${icecc_create_env_log} cd ${CONFIGURESUPPORT_OUTPUTDIR}/icecc \
&& ${ICECC_CREATE_ENV} --clang ${CC} ${ICECC_WRAPPER} > ${icecc_create_env_log} 2>&1
if test "$?" != "0"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: icecc-create-env output:" >&5
$as_echo "$as_me: icecc-create-env output:" >&6;}
cat ${icecc_create_env_log}
as_fn_error $? "Failed to create icecc compiler environment" "$LINENO" 5
fi
else else
as_fn_error $? "Can only create icecc compiler packages for toolchain types gcc and clang" "$LINENO" 5 as_fn_error $? "Can only create icecc compiler packages for toolchain types gcc and clang" "$LINENO" 5
fi fi
@ -59765,26 +59833,53 @@ $as_echo "$tool_specified" >&6; }
# to find it. # to find it.
ICECC_ENV_BUNDLE_BASENAME="`${SED} -n '/^creating/s/creating //p' ${icecc_create_env_log}`" ICECC_ENV_BUNDLE_BASENAME="`${SED} -n '/^creating/s/creating //p' ${icecc_create_env_log}`"
ICECC_ENV_BUNDLE="${CONFIGURESUPPORT_OUTPUTDIR}/icecc/${ICECC_ENV_BUNDLE_BASENAME}" ICECC_ENV_BUNDLE="${CONFIGURESUPPORT_OUTPUTDIR}/icecc/${ICECC_ENV_BUNDLE_BASENAME}"
if test ! -f ${ICECC_ENV_BUNDLE}; then
as_fn_error $? "icecc-create-env did not produce an environment ${ICECC_ENV_BUNDLE}" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for icecc build environment for target compiler" >&5
$as_echo_n "checking for icecc build environment for target compiler... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ICECC_ENV_BUNDLE}" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ICECC_ENV_BUNDLE}" >&5
$as_echo "${ICECC_ENV_BUNDLE}" >&6; } $as_echo "${ICECC_ENV_BUNDLE}" >&6; }
ICECC="ICECC_VERSION=${ICECC_ENV_BUNDLE} ICECC_CC=${CC} ICECC_CXX=${CXX} ${ICECC_CMD}" ICECC="ICECC_VERSION=${ICECC_ENV_BUNDLE} ICECC_CC=${CC} ICECC_CXX=${CXX} ${ICECC_CMD}"
if test "x${COMPILE_TYPE}" = "xcross"; then if test "x${COMPILE_TYPE}" = "xcross"; then
# If cross compiling, create a separate env package for the build compiler # If cross compiling, create a separate env package for the build compiler
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for icecc build environment for build compiler" >&5
$as_echo_n "checking for icecc build environment for build compiler... " >&6; }
# Assume "gcc" or "cc" is gcc and "clang" is clang. Otherwise bail. # Assume "gcc" or "cc" is gcc and "clang" is clang. Otherwise bail.
icecc_create_env_log_build="${CONFIGURESUPPORT_OUTPUTDIR}/icecc/icecc_create_env_build.log"
if test "x${BUILD_CC##*/}" = "xgcc" || test "x${BUILD_CC##*/}" = "xcc"; then if test "x${BUILD_CC##*/}" = "xgcc" || test "x${BUILD_CC##*/}" = "xcc"; then
cd ${CONFIGURESUPPORT_OUTPUTDIR}/icecc \
&& ${ICECC_CREATE_ENV} --gcc ${BUILD_CC} ${BUILD_CXX} > ${icecc_create_env_log} cd ${CONFIGURESUPPORT_OUTPUTDIR}/icecc \
&& ${ICECC_CREATE_ENV} ${icecc_gcc_arg} ${BUILD_CC} ${BUILD_CXX} > \
${icecc_create_env_log_build} 2>&1
if test "$?" != "0"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: icecc-create-env output:" >&5
$as_echo "$as_me: icecc-create-env output:" >&6;}
cat \
${icecc_create_env_log_build}
as_fn_error $? "Failed to create icecc compiler environment" "$LINENO" 5
fi
elif test "x${BUILD_CC##*/}" = "xclang"; then elif test "x${BUILD_CC##*/}" = "xclang"; then
cd ${CONFIGURESUPPORT_OUTPUTDIR}/icecc \
&& ${ICECC_CREATE_ENV} --clang ${BUILD_CC} ${ICECC_WRAPPER} > ${icecc_create_env_log} cd ${CONFIGURESUPPORT_OUTPUTDIR}/icecc \
&& ${ICECC_CREATE_ENV} --clang ${BUILD_CC} ${ICECC_WRAPPER} > ${icecc_create_env_log_build} 2>&1
if test "$?" != "0"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: icecc-create-env output:" >&5
$as_echo "$as_me: icecc-create-env output:" >&6;}
cat ${icecc_create_env_log_build}
as_fn_error $? "Failed to create icecc compiler environment" "$LINENO" 5
fi
else else
as_fn_error $? "Cannot create icecc compiler package for ${BUILD_CC}" "$LINENO" 5 as_fn_error $? "Cannot create icecc compiler package for ${BUILD_CC}" "$LINENO" 5
fi fi
ICECC_ENV_BUNDLE_BASENAME="`${SED} -n '/^creating/s/creating //p' ${icecc_create_env_log}`" ICECC_ENV_BUNDLE_BASENAME="`${SED} -n '/^creating/s/creating //p' ${icecc_create_env_log_build}`"
ICECC_ENV_BUNDLE="${CONFIGURESUPPORT_OUTPUTDIR}/icecc/${ICECC_ENV_BUNDLE_BASENAME}" ICECC_ENV_BUNDLE="${CONFIGURESUPPORT_OUTPUTDIR}/icecc/${ICECC_ENV_BUNDLE_BASENAME}"
if test ! -f ${ICECC_ENV_BUNDLE}; then
as_fn_error $? "icecc-create-env did not produce an environment ${ICECC_ENV_BUNDLE}" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for icecc build environment for build compiler" >&5
$as_echo_n "checking for icecc build environment for build compiler... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ICECC_ENV_BUNDLE}" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ICECC_ENV_BUNDLE}" >&5
$as_echo "${ICECC_ENV_BUNDLE}" >&6; } $as_echo "${ICECC_ENV_BUNDLE}" >&6; }
BUILD_ICECC="ICECC_VERSION=${ICECC_ENV_BUNDLE} ICECC_CC=${BUILD_CC} \ BUILD_ICECC="ICECC_VERSION=${ICECC_ENV_BUNDLE} ICECC_CC=${BUILD_CC} \

22
common/autoconf/lib-cups.m4
View File

@ -1,5 +1,5 @@
# #
# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
@ -48,12 +48,24 @@ AC_DEFUN_ONCE([LIB_SETUP_CUPS],
fi fi
if test "x${with_cups}" != x; then if test "x${with_cups}" != x; then
CUPS_CFLAGS="-I${with_cups}/include" AC_MSG_CHECKING([for cups headers])
CUPS_FOUND=yes if test -s "${with_cups}/include/cups/cups.h"; then
CUPS_CFLAGS="-I${with_cups}/include"
CUPS_FOUND=yes
AC_MSG_RESULT([$CUPS_FOUND])
else
AC_MSG_ERROR([Can't find 'include/cups/cups.h' under ${with_cups} given with the --with-cups option.])
fi
fi fi
if test "x${with_cups_include}" != x; then if test "x${with_cups_include}" != x; then
CUPS_CFLAGS="-I${with_cups_include}" AC_MSG_CHECKING([for cups headers])
CUPS_FOUND=yes if test -s "${with_cups_include}/cups/cups.h"; then
CUPS_CFLAGS="-I${with_cups_include}"
CUPS_FOUND=yes
AC_MSG_RESULT([$CUPS_FOUND])
else
AC_MSG_ERROR([Can't find 'cups/cups.h' under ${with_cups_include} given with the --with-cups-include option.])
fi
fi fi
if test "x$CUPS_FOUND" = xno; then if test "x$CUPS_FOUND" = xno; then
# Are the cups headers installed in the default /usr/include location? # Are the cups headers installed in the default /usr/include location?

1
corba/.hgtags
View File

@ -342,3 +342,4 @@ feb1bd85d7990dcf5584ca9e53104269c01db006 jdk-9+96
10a482b863582376d4ca229090334b23b05159fc jdk-9+97 10a482b863582376d4ca229090334b23b05159fc jdk-9+97
ea285530245cf4e0edf0479121a41347d3030eba jdk-9+98 ea285530245cf4e0edf0479121a41347d3030eba jdk-9+98
180212ee1d8710691ba9944593dfc1ff3e4f1532 jdk-9+99 180212ee1d8710691ba9944593dfc1ff3e4f1532 jdk-9+99
791d0d3ac0138faeb6110bd840a4545bc1950df2 jdk-9+100

1
hotspot/.hgtags
View File

@ -502,3 +502,4 @@ a94bb7203596dd632486f1e3655fa5f70541dc08 jdk-9+96
de592ea5f7ba0f8a8c5afc03bd169f7690c72b6f jdk-9+97 de592ea5f7ba0f8a8c5afc03bd169f7690c72b6f jdk-9+97
e5b1a23be1e105417ba1c4c576ab373eb3fa2c2b jdk-9+98 e5b1a23be1e105417ba1c4c576ab373eb3fa2c2b jdk-9+98
f008e8cc10d5b3212fb22d58c96fa01d38654f19 jdk-9+99 f008e8cc10d5b3212fb22d58c96fa01d38654f19 jdk-9+99
bdb0acafc63c42e84d9d8195bf2e2b25ee9c3306 jdk-9+100

2
hotspot/src/share/vm/prims/jvm.cpp
View File

@ -285,7 +285,7 @@ JVM_LEAF(jlong, JVM_NanoTime(JNIEnv *env, jclass ignored))
return os::javaTimeNanos(); return os::javaTimeNanos();
JVM_END JVM_END
// The function below is actually exposed by sun.misc.VM and not // The function below is actually exposed by jdk.internal.misc.VM and not
// java.lang.System, but we choose to keep it here so that it stays next // java.lang.System, but we choose to keep it here so that it stays next
// to JVM_CurrentTimeMillis and JVM_NanoTime // to JVM_CurrentTimeMillis and JVM_NanoTime

1
jaxp/.hgtags
View File

@ -342,3 +342,4 @@ c8d0845877a811ab4350935892f826929359a3ff jdk-9+95
9c107c050335d7ee63b2a8b38ca5d498f19713a2 jdk-9+97 9c107c050335d7ee63b2a8b38ca5d498f19713a2 jdk-9+97
52b01339235f24c93b679bd6b8fb36a1072ad0ac jdk-9+98 52b01339235f24c93b679bd6b8fb36a1072ad0ac jdk-9+98
52774b544850c791f1d1c67db2601b33739b18c9 jdk-9+99 52774b544850c791f1d1c67db2601b33739b18c9 jdk-9+99
d45bcd374f6057851e3c2dcd45607cd362afadfa jdk-9+100

1
jaxws/.hgtags
View File

@ -345,3 +345,4 @@ b55cebc47555293cf9c2aefb3bf63c56e847ab19 jdk-9+96
7293db4716ee25b814e14f738b9acfb85700e3fa jdk-9+97 7293db4716ee25b814e14f738b9acfb85700e3fa jdk-9+97
67c84077edc3db6b24998b35970b37c01aae985e jdk-9+98 67c84077edc3db6b24998b35970b37c01aae985e jdk-9+98
97b31ca0dd77483cf20ff99a033a455673639578 jdk-9+99 97b31ca0dd77483cf20ff99a033a455673639578 jdk-9+99
d0a97e57d2336238edf6a4cd60aafe67deb7258d jdk-9+100

1
jdk/.hgtags
View File

@ -342,3 +342,4 @@ c021b855f51e572e63982654b17742cb1f814fb4 jdk-9+96
fdd84b2265ddce7f50e084b7c8635189bba6f012 jdk-9+97 fdd84b2265ddce7f50e084b7c8635189bba6f012 jdk-9+97
f86ee68d1107dad41a27efc34306e0e56244a12e jdk-9+98 f86ee68d1107dad41a27efc34306e0e56244a12e jdk-9+98
e1a789be1535741274c9779f4d4ca3495196b5c3 jdk-9+99 e1a789be1535741274c9779f4d4ca3495196b5c3 jdk-9+99
3d452840f48299a36842760d17c0c8402f0e1266 jdk-9+100

1
jdk/make/gendata/GendataBreakIterator.gmk
View File

@ -48,7 +48,6 @@ BREAK_ITERATOR_CLASSES := $(BUILDTOOLS_OUTPUTDIR)/break_iterator_classes
$(eval $(call SetupJavaCompilation,BUILD_BREAKITERATOR, \ $(eval $(call SetupJavaCompilation,BUILD_BREAKITERATOR, \
SETUP := GENERATE_OLDBYTECODE, \ SETUP := GENERATE_OLDBYTECODE, \
SRC := $(TEXT_SRCDIR), \ SRC := $(TEXT_SRCDIR), \
INCLUDES := $(TEXT_PKG), \
INCLUDE_FILES := $(TEXT_SOURCES), \ INCLUDE_FILES := $(TEXT_SOURCES), \
BIN := $(BREAK_ITERATOR_CLASSES))) BIN := $(BREAK_ITERATOR_CLASSES)))

15
jdk/make/mapfiles/libjava/mapfile-vers
View File

@ -216,6 +216,7 @@ SUNWprivate_1.1 {
Java_java_lang_SecurityManager_getClassContext; Java_java_lang_SecurityManager_getClassContext;
Java_java_lang_Shutdown_halt0; Java_java_lang_Shutdown_halt0;
Java_java_lang_String_intern; Java_java_lang_String_intern;
Java_java_lang_StringCoding_err;
Java_java_lang_StringUTF16_isBigEndian; Java_java_lang_StringUTF16_isBigEndian;
Java_java_lang_System_identityHashCode; Java_java_lang_System_identityHashCode;
Java_java_lang_System_initProperties; Java_java_lang_System_initProperties;
@ -243,8 +244,6 @@ SUNWprivate_1.1 {
Java_java_util_TimeZone_getSystemTimeZoneID; Java_java_util_TimeZone_getSystemTimeZoneID;
Java_java_util_TimeZone_getSystemGMTOffsetID; Java_java_util_TimeZone_getSystemGMTOffsetID;
Java_java_util_concurrent_atomic_AtomicLong_VMSupportsCS8; Java_java_util_concurrent_atomic_AtomicLong_VMSupportsCS8;
Java_sun_misc_MessageUtils_toStderr;
Java_sun_misc_MessageUtils_toStdout;
Java_sun_misc_NativeSignalHandler_handle0; Java_sun_misc_NativeSignalHandler_handle0;
Java_sun_misc_Signal_findSignal; Java_sun_misc_Signal_findSignal;
Java_sun_misc_Signal_handle0; Java_sun_misc_Signal_handle0;
@ -274,12 +273,12 @@ SUNWprivate_1.1 {
Java_sun_reflect_Reflection_getClassAccessFlags; Java_sun_reflect_Reflection_getClassAccessFlags;
Java_sun_misc_Version_getJdkVersionInfo; Java_sun_misc_Version_getJdkVersionInfo;
Java_sun_misc_Version_getJvmVersionInfo; Java_sun_misc_Version_getJvmVersionInfo;
Java_sun_misc_VM_latestUserDefinedLoader; Java_jdk_internal_misc_VM_latestUserDefinedLoader;
Java_sun_misc_VM_getuid; Java_jdk_internal_misc_VM_getuid;
Java_sun_misc_VM_geteuid; Java_jdk_internal_misc_VM_geteuid;
Java_sun_misc_VM_getgid; Java_jdk_internal_misc_VM_getgid;
Java_sun_misc_VM_getegid; Java_jdk_internal_misc_VM_getegid;
Java_sun_misc_VM_initialize; Java_jdk_internal_misc_VM_initialize;
Java_sun_misc_VMSupport_initAgentProperties; Java_sun_misc_VMSupport_initAgentProperties;
Java_sun_misc_VMSupport_getVMTemporaryDirectory; Java_sun_misc_VMSupport_getVMTemporaryDirectory;

2
jdk/make/src/classes/build/tools/dtdbuilder/DTDParser.java
View File

@ -35,8 +35,6 @@ import java.util.Hashtable;
import java.util.BitSet; import java.util.BitSet;
import java.text.MessageFormat; import java.text.MessageFormat;
import sun.misc.MessageUtils;
/** /**
* A parser for DTDs. This parser roughly corresponds to the * A parser for DTDs. This parser roughly corresponds to the
* rules specified in "The SGML Handbook" by Charles F. Goldfarb. * rules specified in "The SGML Handbook" by Charles F. Goldfarb.

45
jdk/make/src/classes/build/tools/spp/Spp.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -32,9 +32,10 @@ import java.util.regex.*;
* Spp: A simple regex-based stream preprocessor based on Mark Reinhold's * Spp: A simple regex-based stream preprocessor based on Mark Reinhold's
* sed-based spp.sh * sed-based spp.sh
* *
* Usage: java build.tools.spp.Spp [-be] [-Kkey] -Dvar=value ... <in >out * Usage: java build.tools.spp.Spp [-be] [-nel] [-Kkey] -Dvar=value ... <in >out
* *
* Source-file constructs * If -nel is declared then empty lines will not be substituted for lines of
* text in the template that do not appear in the output.
* *
* Meaningful only at beginning of line, works with any number of keys: * Meaningful only at beginning of line, works with any number of keys:
* *
@ -64,9 +65,10 @@ import java.util.regex.*;
public class Spp { public class Spp {
public static void main(String args[]) throws Exception { public static void main(String args[]) throws Exception {
Map<String, String> vars = new HashMap<String, String>(); Map<String, String> vars = new HashMap<>();
Set<String> keys = new HashSet<String>(); Set<String> keys = new HashSet<>();
boolean be = false; boolean be = false;
boolean el = true;
for (String arg:args) { for (String arg:args) {
if (arg.startsWith("-D")) { if (arg.startsWith("-D")) {
@ -76,8 +78,10 @@ public class Spp {
keys.add(arg.substring(2)); keys.add(arg.substring(2));
} else if ("-be".equals(arg)) { } else if ("-be".equals(arg)) {
be = true; be = true;
} else if ("-nel".equals(arg)) {
el = false;
} else { } else {
System.err.println("Usage: java build.tools.spp.Spp [-be] [-Kkey] -Dvar=value ... <in >out"); System.err.println("Usage: java build.tools.spp.Spp [-be] [-nel] [-Kkey] -Dvar=value ... <in >out");
System.exit(-1); System.exit(-1);
} }
} }
@ -85,7 +89,7 @@ public class Spp {
StringBuffer out = new StringBuffer(); StringBuffer out = new StringBuffer();
new Spp().spp(new Scanner(System.in), new Spp().spp(new Scanner(System.in),
out, "", out, "",
keys, vars, be, keys, vars, be, el,
false); false);
System.out.print(out.toString()); System.out.print(out.toString());
} }
@ -93,7 +97,7 @@ public class Spp {
static final String LNSEP = System.getProperty("line.separator"); static final String LNSEP = System.getProperty("line.separator");
static final String KEY = "([a-zA-Z0-9]+)"; static final String KEY = "([a-zA-Z0-9]+)";
static final String VAR = "([a-zA-Z0-9_\\-]+)"; static final String VAR = "([a-zA-Z0-9_\\-]+)";
static final String TEXT = "([a-zA-Z0-9&;,.<>/#() \\$]+)"; // $ -- hack embedded $var$ static final String TEXT = "([a-zA-Z0-9&;,.<>/#() \\?\\[\\]\\$]+)"; // $ -- hack embedded $var$
static final int GN_NOT = 1; static final int GN_NOT = 1;
static final int GN_KEY = 2; static final int GN_KEY = 2;
@ -101,11 +105,11 @@ public class Spp {
static final int GN_NO = 5; static final int GN_NO = 5;
static final int GN_VAR = 6; static final int GN_VAR = 6;
Matcher ifkey = Pattern.compile("^#if\\[(!)?" + KEY + "\\]").matcher(""); final Matcher ifkey = Pattern.compile("^#if\\[(!)?" + KEY + "\\]").matcher("");
Matcher elsekey = Pattern.compile("^#else\\[(!)?" + KEY + "\\]").matcher(""); final Matcher elsekey = Pattern.compile("^#else\\[(!)?" + KEY + "\\]").matcher("");
Matcher endkey = Pattern.compile("^#end\\[(!)?" + KEY + "\\]").matcher(""); final Matcher endkey = Pattern.compile("^#end\\[(!)?" + KEY + "\\]").matcher("");
Matcher vardef = Pattern.compile("\\{#if\\[(!)?" + KEY + "\\]\\?" + TEXT + "(:"+ TEXT + ")?\\}|\\$" + VAR + "\\$").matcher(""); final Matcher vardef = Pattern.compile("\\{#if\\[(!)?" + KEY + "\\]\\?" + TEXT + "(:"+ TEXT + ")?\\}|\\$" + VAR + "\\$").matcher("");
Matcher vardef2 = Pattern.compile("\\$" + VAR + "\\$").matcher(""); final Matcher vardef2 = Pattern.compile("\\$" + VAR + "\\$").matcher("");
void append(StringBuffer buf, String ln, void append(StringBuffer buf, String ln,
Set<String> keys, Map<String, String> vars) { Set<String> keys, Map<String, String> vars) {
@ -135,7 +139,7 @@ public class Spp {
// return true if #end[key], #end or EOF reached // return true if #end[key], #end or EOF reached
boolean spp(Scanner in, StringBuffer buf, String key, boolean spp(Scanner in, StringBuffer buf, String key,
Set<String> keys, Map<String, String> vars, Set<String> keys, Map<String, String> vars,
boolean be, boolean skip) { boolean be, boolean el, boolean skip) {
while (in.hasNextLine()) { while (in.hasNextLine()) {
String ln = in.nextLine(); String ln = in.nextLine();
if (be) { if (be) {
@ -154,9 +158,9 @@ public class Spp {
boolean test = keys.contains(k); boolean test = keys.contains(k);
if (ifkey.group(GN_NOT) != null) if (ifkey.group(GN_NOT) != null)
test = !test; test = !test;
buf.append(LNSEP); if (el) buf.append(LNSEP);
if (!spp(in, buf, k, keys, vars, be, skip || !test)) { if (!spp(in, buf, k, keys, vars, be, el, skip || !test)) {
spp(in, buf, k, keys, vars, be, skip || test); spp(in, buf, k, keys, vars, be, el, skip || test);
} }
continue; continue;
} }
@ -164,14 +168,14 @@ public class Spp {
if (!key.equals(elsekey.group(GN_KEY))) { if (!key.equals(elsekey.group(GN_KEY))) {
throw new Error("Mis-matched #if-else-end at line <" + ln + ">"); throw new Error("Mis-matched #if-else-end at line <" + ln + ">");
} }
buf.append(LNSEP); if (el) buf.append(LNSEP);
return false; return false;
} }
if (endkey.reset(ln).find()) { if (endkey.reset(ln).find()) {
if (!key.equals(endkey.group(GN_KEY))) { if (!key.equals(endkey.group(GN_KEY))) {
throw new Error("Mis-matched #if-else-end at line <" + ln + ">"); throw new Error("Mis-matched #if-else-end at line <" + ln + ">");
} }
buf.append(LNSEP); if (el) buf.append(LNSEP);
return true; return true;
} }
if (ln.startsWith("#warn")) { if (ln.startsWith("#warn")) {
@ -181,8 +185,9 @@ public class Spp {
} }
if (!skip) { if (!skip) {
append(buf, ln, keys, vars); append(buf, ln, keys, vars);
if (!el) buf.append(LNSEP);
} }
buf.append(LNSEP); if (el) buf.append(LNSEP);
} }
return true; return true;
} }

32
jdk/src/java.base/share/classes/com/sun/crypto/provider/CounterMode.java
View File

@ -26,7 +26,9 @@
package com.sun.crypto.provider; package com.sun.crypto.provider;
import java.security.InvalidKeyException; import java.security.InvalidKeyException;
import java.util.Objects;
import jdk.internal.HotSpotIntrinsicCandidate;
/** /**
* This class represents ciphers in counter (CTR) mode. * This class represents ciphers in counter (CTR) mode.
@ -138,7 +140,7 @@ final class CounterMode extends FeedbackCipher {
* <code>cipherOffset</code>. * <code>cipherOffset</code>.
* *
* @param in the buffer with the input data to be encrypted * @param in the buffer with the input data to be encrypted
* @param inOffset the offset in <code>plain</code> * @param inOff the offset in <code>plain</code>
* @param len the length of the input data * @param len the length of the input data
* @param out the buffer for the result * @param out the buffer for the result
* @param outOff the offset in <code>cipher</code> * @param outOff the offset in <code>cipher</code>
@ -170,6 +172,15 @@ final class CounterMode extends FeedbackCipher {
* are encrypted on demand. * are encrypted on demand.
*/ */
private int crypt(byte[] in, int inOff, int len, byte[] out, int outOff) { private int crypt(byte[] in, int inOff, int len, byte[] out, int outOff) {
cryptBlockCheck(in, inOff, len);
cryptBlockCheck(out, outOff, len);
return implCrypt(in, inOff, len, out, outOff);
}
// Implementation of crpyt() method. Possibly replaced with a compiler intrinsic.
@HotSpotIntrinsicCandidate
private int implCrypt(byte[] in, int inOff, int len, byte[] out, int outOff) {
int result = len; int result = len;
while (len-- > 0) { while (len-- > 0) {
if (used >= blockSize) { if (used >= blockSize) {
@ -181,4 +192,23 @@ final class CounterMode extends FeedbackCipher {
} }
return result; return result;
} }
// Used to perform all checks required by the Java semantics
// (i.e., null checks and bounds checks) on the input parameters to crypt().
// Normally, the Java Runtime performs these checks, however, as crypt() is
// possibly replaced with compiler intrinsic, the JDK performs the
// required checks instead.
// Does not check accesses to class-internal (private) arrays.
private static void cryptBlockCheck(byte[] array, int offset, int len) {
Objects.requireNonNull(array);
if (offset < 0 || len < 0 || offset >= array.length) {
throw new ArrayIndexOutOfBoundsException(offset);
}
int largestIndex = offset + len - 1;
if (largestIndex < 0 || largestIndex >= array.length) {
throw new ArrayIndexOutOfBoundsException(largestIndex);
}
}
} }

2
jdk/src/java.base/share/classes/java/io/ObjectInputStream.java
View File

@ -2135,7 +2135,7 @@ public class ObjectInputStream
* corresponding modifications to the above class. * corresponding modifications to the above class.
*/ */
private static ClassLoader latestUserDefinedLoader() { private static ClassLoader latestUserDefinedLoader() {
return sun.misc.VM.latestUserDefinedLoader(); return jdk.internal.misc.VM.latestUserDefinedLoader();
} }
/** /**

5
jdk/src/java.base/share/classes/java/lang/Class.java
View File

@ -56,6 +56,7 @@ import java.util.HashMap;
import java.util.Objects; import java.util.Objects;
import java.util.StringJoiner; import java.util.StringJoiner;
import jdk.internal.misc.Unsafe; import jdk.internal.misc.Unsafe;
import jdk.internal.misc.VM;
import jdk.internal.HotSpotIntrinsicCandidate; import jdk.internal.HotSpotIntrinsicCandidate;
import sun.reflect.CallerSensitive; import sun.reflect.CallerSensitive;
import sun.reflect.ConstantPool; import sun.reflect.ConstantPool;
@ -360,9 +361,9 @@ public final class Class<T> implements java.io.Serializable,
// Reflective call to get caller class is only needed if a security manager // Reflective call to get caller class is only needed if a security manager
// is present. Avoid the overhead of making this call otherwise. // is present. Avoid the overhead of making this call otherwise.
caller = Reflection.getCallerClass(); caller = Reflection.getCallerClass();
if (sun.misc.VM.isSystemDomainLoader(loader)) { if (VM.isSystemDomainLoader(loader)) {
ClassLoader ccl = ClassLoader.getClassLoader(caller); ClassLoader ccl = ClassLoader.getClassLoader(caller);
if (!sun.misc.VM.isSystemDomainLoader(ccl)) { if (!VM.isSystemDomainLoader(ccl)) {
sm.checkPermission( sm.checkPermission(
SecurityConstants.GET_CLASSLOADER_PERMISSION); SecurityConstants.GET_CLASSLOADER_PERMISSION);
} }

5
jdk/src/java.base/share/classes/java/lang/Integer.java
View File

@ -28,6 +28,7 @@ package java.lang;
import java.lang.annotation.Native; import java.lang.annotation.Native;
import java.util.Objects; import java.util.Objects;
import jdk.internal.HotSpotIntrinsicCandidate; import jdk.internal.HotSpotIntrinsicCandidate;
import jdk.internal.misc.VM;
import static java.lang.String.COMPACT_STRINGS; import static java.lang.String.COMPACT_STRINGS;
import static java.lang.String.LATIN1; import static java.lang.String.LATIN1;
@ -1018,7 +1019,7 @@ public final class Integer extends Number implements Comparable<Integer> {
* may be controlled by the {@code -XX:AutoBoxCacheMax=<size>} option. * may be controlled by the {@code -XX:AutoBoxCacheMax=<size>} option.
* During VM initialization, java.lang.Integer.IntegerCache.high property * During VM initialization, java.lang.Integer.IntegerCache.high property
* may be set and saved in the private system properties in the * may be set and saved in the private system properties in the
* sun.misc.VM class. * jdk.internal.misc.VM class.
*/ */
private static class IntegerCache { private static class IntegerCache {
@ -1030,7 +1031,7 @@ public final class Integer extends Number implements Comparable<Integer> {
// high value may be configured by property // high value may be configured by property
int h = 127; int h = 127;
String integerCacheHighPropValue = String integerCacheHighPropValue =
sun.misc.VM.getSavedProperty("java.lang.Integer.IntegerCache.high"); VM.getSavedProperty("java.lang.Integer.IntegerCache.high");
if (integerCacheHighPropValue != null) { if (integerCacheHighPropValue != null) {
try { try {
int i = parseInt(integerCacheHighPropValue); int i = parseInt(integerCacheHighPropValue);

3
jdk/src/java.base/share/classes/java/lang/LiveStackFrame.java
View File

@ -61,6 +61,9 @@ interface LiveStackFrame extends StackFrame {
* local variable array is an {@link PrimitiveValue} object; * local variable array is an {@link PrimitiveValue} object;
* otherwise, the element is an {@code Object}. * otherwise, the element is an {@code Object}.
* *
* <p>The returned array may contain null entries if a local variable is not
* live.
*
* @return the local variable array of this stack frame. * @return the local variable array of this stack frame.
*/ */
public Object[] getLocals(); public Object[] getLocals();

2
jdk/src/java.base/share/classes/java/lang/StackStreamFactory.java
View File

@ -24,7 +24,7 @@
*/ */
package java.lang; package java.lang;
import sun.misc.VM; import jdk.internal.misc.VM;
import java.io.PrintStream; import java.io.PrintStream;
import java.lang.StackWalker.Option; import java.lang.StackWalker.Option;

28
jdk/src/java.base/share/classes/java/lang/StringCoding.java
View File

@ -39,7 +39,6 @@ import java.nio.charset.IllegalCharsetNameException;
import java.nio.charset.UnsupportedCharsetException; import java.nio.charset.UnsupportedCharsetException;
import java.util.Arrays; import java.util.Arrays;
import jdk.internal.HotSpotIntrinsicCandidate; import jdk.internal.HotSpotIntrinsicCandidate;
import sun.misc.MessageUtils;
import sun.nio.cs.HistoricallyNamedCharset; import sun.nio.cs.HistoricallyNamedCharset;
import sun.nio.cs.ArrayDecoder; import sun.nio.cs.ArrayDecoder;
import sun.nio.cs.ArrayEncoder; import sun.nio.cs.ArrayEncoder;
@ -106,11 +105,11 @@ class StringCoding {
private static void warnUnsupportedCharset(String csn) { private static void warnUnsupportedCharset(String csn) {
if (warnUnsupportedCharset) { if (warnUnsupportedCharset) {
// Use sun.misc.MessageUtils rather than the Logging API or // Use err(String) rather than the Logging API or System.err
// System.err since this method may be called during VM // since this method may be called during VM initialization
// initialization before either is available. // before either is available.
MessageUtils.err("WARNING: Default charset " + csn + err("WARNING: Default charset " + csn +
" not supported, using ISO-8859-1 instead"); " not supported, using ISO-8859-1 instead\n");
warnUnsupportedCharset = false; warnUnsupportedCharset = false;
} }
} }
@ -341,10 +340,9 @@ class StringCoding {
try { try {
return decode("ISO-8859-1", ba, off, len); return decode("ISO-8859-1", ba, off, len);
} catch (UnsupportedEncodingException x) { } catch (UnsupportedEncodingException x) {
// If this code is hit during VM initialization, MessageUtils is // If this code is hit during VM initialization, err(String) is
// the only way we will be able to get any kind of error message. // the only way we will be able to get any kind of error message.
MessageUtils.err("ISO-8859-1 charset not available: " err("ISO-8859-1 charset not available: " + x.toString() + "\n");
+ x.toString());
// If we can not find ISO-8859-1 (a required encoding) then things // If we can not find ISO-8859-1 (a required encoding) then things
// are seriously wrong with the installation. // are seriously wrong with the installation.
System.exit(1); System.exit(1);
@ -653,14 +651,20 @@ class StringCoding {
try { try {
return encode("ISO-8859-1", coder, val); return encode("ISO-8859-1", coder, val);
} catch (UnsupportedEncodingException x) { } catch (UnsupportedEncodingException x) {
// If this code is hit during VM initialization, MessageUtils is // If this code is hit during VM initialization, err(String) is
// the only way we will be able to get any kind of error message. // the only way we will be able to get any kind of error message.
MessageUtils.err("ISO-8859-1 charset not available: " err("ISO-8859-1 charset not available: " + x.toString() + "\n");
+ x.toString());
// If we can not find ISO-8859-1 (a required encoding) then things // If we can not find ISO-8859-1 (a required encoding) then things
// are seriously wrong with the installation. // are seriously wrong with the installation.
System.exit(1); System.exit(1);
return null; return null;
} }
} }
/**
* Print a message directly to stderr, bypassing all character conversion
* methods.
* @param msg message to print
*/
private static native void err(String msg);
} }

15
jdk/src/java.base/share/classes/java/lang/System.java
View File

@ -46,6 +46,7 @@ import sun.reflect.annotation.AnnotationType;
import jdk.internal.HotSpotIntrinsicCandidate; import jdk.internal.HotSpotIntrinsicCandidate;
import jdk.internal.misc.JavaLangAccess;; import jdk.internal.misc.JavaLangAccess;;
import jdk.internal.misc.SharedSecrets;; import jdk.internal.misc.SharedSecrets;;
import jdk.internal.misc.VM;
import jdk.internal.logger.LoggerFinderLoader; import jdk.internal.logger.LoggerFinderLoader;
import jdk.internal.logger.LazyLoggers; import jdk.internal.logger.LazyLoggers;
import jdk.internal.logger.LocalizedLoggerWrapper; import jdk.internal.logger.LocalizedLoggerWrapper;
@ -1534,6 +1535,8 @@ public final class System {
* @return an instance of {@link Logger} that can be used by the calling * @return an instance of {@link Logger} that can be used by the calling
* class. * class.
* @throws NullPointerException if {@code name} is {@code null}. * @throws NullPointerException if {@code name} is {@code null}.
*
* @since 9
*/ */
@CallerSensitive @CallerSensitive
public static Logger getLogger(String name) { public static Logger getLogger(String name) {
@ -1571,6 +1574,8 @@ public final class System {
* resource bundle for message localization. * resource bundle for message localization.
* @throws NullPointerException if {@code name} is {@code null} or * @throws NullPointerException if {@code name} is {@code null} or
* {@code bundle} is {@code null}. * {@code bundle} is {@code null}.
*
* @since 9
*/ */
@CallerSensitive @CallerSensitive
public static Logger getLogger(String name, ResourceBundle bundle) { public static Logger getLogger(String name, ResourceBundle bundle) {
@ -1817,12 +1822,12 @@ public final class System {
// removed from the system properties. // removed from the system properties.
// //
// See java.lang.Integer.IntegerCache and the // See java.lang.Integer.IntegerCache and the
// sun.misc.VM.saveAndRemoveProperties method for example. // VM.saveAndRemoveProperties method for example.
// //
// Save a private copy of the system properties object that // Save a private copy of the system properties object that
// can only be accessed by the internal implementation. Remove // can only be accessed by the internal implementation. Remove
// certain system properties that are not intended for public access. // certain system properties that are not intended for public access.
sun.misc.VM.saveAndRemoveProperties(props); VM.saveAndRemoveProperties(props);
lineSeparator = props.getProperty("line.separator"); lineSeparator = props.getProperty("line.separator");
@ -1846,7 +1851,7 @@ public final class System {
// set for the class libraries. Currently this is no-op everywhere except // set for the class libraries. Currently this is no-op everywhere except
// for Windows where the process-wide error mode is set before the java.io // for Windows where the process-wide error mode is set before the java.io
// classes are used. // classes are used.
sun.misc.VM.initializeOSEnvironment(); VM.initializeOSEnvironment();
// The main thread is not added to its thread group in the same // The main thread is not added to its thread group in the same
// way as other threads; we must do it ourselves here. // way as other threads; we must do it ourselves here.
@ -1857,10 +1862,10 @@ public final class System {
setJavaLangAccess(); setJavaLangAccess();
// Subsystems that are invoked during initialization can invoke // Subsystems that are invoked during initialization can invoke
// sun.misc.VM.isBooted() in order to avoid doing things that should // VM.isBooted() in order to avoid doing things that should
// wait until the application class loader has been set up. // wait until the application class loader has been set up.
// IMPORTANT: Ensure that this remains the last initialization action! // IMPORTANT: Ensure that this remains the last initialization action!
sun.misc.VM.booted(); VM.booted();
} }
private static void setJavaLangAccess() { private static void setJavaLangAccess() {

2
jdk/src/java.base/share/classes/java/lang/Thread.java
View File

@ -1869,7 +1869,7 @@ class Thread implements Runnable {
*/ */
public State getState() { public State getState() {
// get current thread state // get current thread state
return sun.misc.VM.toThreadState(threadStatus); return jdk.internal.misc.VM.toThreadState(threadStatus);
} }
// Added in JSR-166 // Added in JSR-166

2
jdk/src/java.base/share/classes/java/lang/ThreadGroup.java
View File

@ -27,7 +27,7 @@ package java.lang;
import java.io.PrintStream; import java.io.PrintStream;
import java.util.Arrays; import java.util.Arrays;
import sun.misc.VM; import jdk.internal.misc.VM;
/** /**
* A thread group represents a set of threads. In addition, a thread * A thread group represents a set of threads. In addition, a thread

2
jdk/src/java.base/share/classes/java/lang/Throwable.java
View File

@ -24,7 +24,7 @@
*/ */
package java.lang; package java.lang;
import sun.misc.VM; import jdk.internal.misc.VM;
import java.io.*; import java.io.*;
import java.util.*; import java.util.*;

26
jdk/src/java.base/share/classes/java/lang/invoke/BoundMethodHandle.java
View File

@ -25,25 +25,25 @@
package java.lang.invoke; package java.lang.invoke;
import static jdk.internal.org.objectweb.asm.Opcodes.*; import jdk.internal.vm.annotation.Stable;
import static java.lang.invoke.LambdaForm.*; import jdk.internal.org.objectweb.asm.ClassWriter;
import static java.lang.invoke.LambdaForm.BasicType.*; import jdk.internal.org.objectweb.asm.FieldVisitor;
import static java.lang.invoke.MethodHandleStatics.*; import jdk.internal.org.objectweb.asm.MethodVisitor;
import sun.invoke.util.ValueConversions;
import sun.invoke.util.Wrapper;
import java.lang.invoke.LambdaForm.NamedFunction; import java.lang.invoke.LambdaForm.NamedFunction;
import java.lang.invoke.MethodHandles.Lookup; import java.lang.invoke.MethodHandles.Lookup;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.util.Arrays; import java.util.Arrays;
import java.util.function.Function;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.function.Function;
import jdk.internal.org.objectweb.asm.FieldVisitor; import static java.lang.invoke.LambdaForm.BasicType;
import sun.invoke.util.ValueConversions; import static java.lang.invoke.LambdaForm.BasicType.*;
import sun.invoke.util.Wrapper; import static java.lang.invoke.MethodHandleStatics.*;
import static jdk.internal.org.objectweb.asm.Opcodes.*;
import jdk.internal.org.objectweb.asm.ClassWriter;
import jdk.internal.org.objectweb.asm.MethodVisitor;
/** /**
* The flavor of method handle which emulates an invoke instruction * The flavor of method handle which emulates an invoke instruction
@ -459,7 +459,7 @@ import jdk.internal.org.objectweb.asm.MethodVisitor;
static final String BMH_SIG = "L"+BMH+";"; static final String BMH_SIG = "L"+BMH+";";
static final String SPECIES_DATA = "java/lang/invoke/BoundMethodHandle$SpeciesData"; static final String SPECIES_DATA = "java/lang/invoke/BoundMethodHandle$SpeciesData";
static final String SPECIES_DATA_SIG = "L"+SPECIES_DATA+";"; static final String SPECIES_DATA_SIG = "L"+SPECIES_DATA+";";
static final String STABLE_SIG = "Ljava/lang/invoke/Stable;"; static final String STABLE_SIG = "Ljdk/internal/vm/annotation/Stable;";
static final String SPECIES_PREFIX_NAME = "Species_"; static final String SPECIES_PREFIX_NAME = "Species_";
static final String SPECIES_PREFIX_PATH = BMH + "$" + SPECIES_PREFIX_NAME; static final String SPECIES_PREFIX_PATH = BMH + "$" + SPECIES_PREFIX_NAME;

24
jdk/src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java
View File

@ -26,20 +26,24 @@
package java.lang.invoke; package java.lang.invoke;
import jdk.internal.misc.Unsafe; import jdk.internal.misc.Unsafe;
import java.lang.reflect.Method; import jdk.internal.vm.annotation.ForceInline;
import java.util.Arrays;
import sun.invoke.util.VerifyAccess;
import static java.lang.invoke.MethodHandleNatives.Constants.*;
import static java.lang.invoke.LambdaForm.*;
import static java.lang.invoke.MethodTypeForm.*;
import static java.lang.invoke.MethodHandleStatics.*;
import java.lang.ref.WeakReference;
import java.lang.reflect.Field;
import java.util.Objects;
import sun.invoke.util.ValueConversions; import sun.invoke.util.ValueConversions;
import sun.invoke.util.VerifyAccess;
import sun.invoke.util.VerifyType; import sun.invoke.util.VerifyType;
import sun.invoke.util.Wrapper; import sun.invoke.util.Wrapper;
import java.lang.ref.WeakReference;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.Arrays;
import java.util.Objects;
import static java.lang.invoke.LambdaForm.*;
import static java.lang.invoke.MethodHandleNatives.Constants.*;
import static java.lang.invoke.MethodHandleStatics.UNSAFE;
import static java.lang.invoke.MethodHandleStatics.newInternalError;
import static java.lang.invoke.MethodTypeForm.*;
/** /**
* The flavor of method handle which implements a constant reference * The flavor of method handle which implements a constant reference
* to a class member. * to a class member.

8
jdk/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java
View File

@ -625,9 +625,9 @@ class InvokerBytecodeGenerator {
if (lambdaForm.forceInline) { if (lambdaForm.forceInline) {
// Force inlining of this invoker method. // Force inlining of this invoker method.
mv.visitAnnotation("Ljava/lang/invoke/ForceInline;", true); mv.visitAnnotation("Ljdk/internal/vm/annotation/ForceInline;", true);
} else { } else {
mv.visitAnnotation("Ljava/lang/invoke/DontInline;", true); mv.visitAnnotation("Ljdk/internal/vm/annotation/DontInline;", true);
} }
if (lambdaForm.customized != null) { if (lambdaForm.customized != null) {
@ -1309,7 +1309,7 @@ class InvokerBytecodeGenerator {
mv.visitAnnotation("Ljava/lang/invoke/LambdaForm$Hidden;", true); mv.visitAnnotation("Ljava/lang/invoke/LambdaForm$Hidden;", true);
// Don't inline the interpreter entry. // Don't inline the interpreter entry.
mv.visitAnnotation("Ljava/lang/invoke/DontInline;", true); mv.visitAnnotation("Ljdk/internal/vm/annotation/DontInline;", true);
// create parameter array // create parameter array
emitIconstInsn(invokerType.parameterCount()); emitIconstInsn(invokerType.parameterCount());
@ -1368,7 +1368,7 @@ class InvokerBytecodeGenerator {
mv.visitAnnotation("Ljava/lang/invoke/LambdaForm$Hidden;", true); mv.visitAnnotation("Ljava/lang/invoke/LambdaForm$Hidden;", true);
// Force inlining of this invoker method. // Force inlining of this invoker method.
mv.visitAnnotation("Ljava/lang/invoke/ForceInline;", true); mv.visitAnnotation("Ljdk/internal/vm/annotation/ForceInline;", true);
// Load receiver // Load receiver
emitAloadInsn(0); emitAloadInsn(0);

4
jdk/src/java.base/share/classes/java/lang/invoke/Invokers.java
View File

@ -25,6 +25,10 @@
package java.lang.invoke; package java.lang.invoke;
import jdk.internal.vm.annotation.DontInline;
import jdk.internal.vm.annotation.ForceInline;
import jdk.internal.vm.annotation.Stable;
import java.lang.reflect.Array; import java.lang.reflect.Array;
import java.util.Arrays; import java.util.Arrays;

20
jdk/src/java.base/share/classes/java/lang/invoke/LambdaForm.java
View File

@ -25,18 +25,24 @@
package java.lang.invoke; package java.lang.invoke;
import java.lang.annotation.*; import jdk.internal.vm.annotation.DontInline;
import jdk.internal.vm.annotation.Stable;
import sun.invoke.util.Wrapper;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import java.lang.reflect.Field;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.List;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import sun.invoke.util.Wrapper;
import java.lang.reflect.Field;
import static java.lang.invoke.LambdaForm.BasicType.*; import static java.lang.invoke.LambdaForm.BasicType.*;
import static java.lang.invoke.MethodHandleStatics.*; import static java.lang.invoke.MethodHandleNatives.Constants.REF_invokeStatic;
import static java.lang.invoke.MethodHandleNatives.Constants.*; import static java.lang.invoke.MethodHandleStatics.debugEnabled;
import static java.lang.invoke.MethodHandleStatics.newInternalError;
/** /**
* The symbolic, non-executable form of a method handle's invocation semantics. * The symbolic, non-executable form of a method handle's invocation semantics.

3
jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java
View File

@ -33,6 +33,7 @@ import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.function.Function; import java.util.function.Function;
import jdk.internal.vm.annotation.Stable;
import sun.invoke.empty.Empty; import sun.invoke.empty.Empty;
import sun.invoke.util.ValueConversions; import sun.invoke.util.ValueConversions;
import sun.invoke.util.VerifyType; import sun.invoke.util.VerifyType;
@ -1487,7 +1488,7 @@ import static java.lang.invoke.MethodHandles.Lookup.IMPL_LOOKUP;
} }
private static final int LEFT_ARGS = FILL_ARRAYS_COUNT - 1; private static final int LEFT_ARGS = FILL_ARRAYS_COUNT - 1;
private static final @Stable MethodHandle[] FILL_ARRAY_TO_RIGHT = new MethodHandle[MAX_ARITY+1]; private static final @Stable MethodHandle[] FILL_ARRAY_TO_RIGHT = new MethodHandle[MAX_ARITY + 1];
/** fill_array_to_right(N).invoke(a, argL..arg[N-1]) /** fill_array_to_right(N).invoke(a, argL..arg[N-1])
* fills a[L]..a[N-1] with corresponding arguments, * fills a[L]..a[N-1] with corresponding arguments,
* and then returns a. The value L is a global constant (LEFT_ARGS). * and then returns a. The value L is a global constant (LEFT_ARGS).

2
jdk/src/java.base/share/classes/java/lang/invoke/MethodHandles.java
View File

@ -1836,7 +1836,7 @@ return mh1;
return false; return false;
} }
ClassLoader loader = defc.getClassLoader(); ClassLoader loader = defc.getClassLoader();
if (!sun.misc.VM.isSystemDomainLoader(loader)) { if (!jdk.internal.misc.VM.isSystemDomainLoader(loader)) {
ClassLoader sysl = ClassLoader.getSystemClassLoader(); ClassLoader sysl = ClassLoader.getSystemClassLoader();
boolean found = false; boolean found = false;
while (sysl != null) { while (sysl != null) {

1
jdk/src/java.base/share/classes/java/lang/invoke/MethodType.java
View File

@ -25,6 +25,7 @@
package java.lang.invoke; package java.lang.invoke;
import jdk.internal.vm.annotation.Stable;
import sun.invoke.util.Wrapper; import sun.invoke.util.Wrapper;
import java.lang.ref.WeakReference; import java.lang.ref.WeakReference;
import java.lang.ref.Reference; import java.lang.ref.Reference;

1
jdk/src/java.base/share/classes/java/lang/invoke/MethodTypeForm.java
View File

@ -25,6 +25,7 @@
package java.lang.invoke; package java.lang.invoke;
import jdk.internal.vm.annotation.Stable;
import sun.invoke.util.Wrapper; import sun.invoke.util.Wrapper;
import java.lang.ref.SoftReference; import java.lang.ref.SoftReference;
import static java.lang.invoke.MethodHandleStatics.*; import static java.lang.invoke.MethodHandleStatics.*;

2
jdk/src/java.base/share/classes/java/lang/ref/Cleaner.java
View File

@ -28,7 +28,7 @@ package java.lang.ref;
import java.util.Objects; import java.util.Objects;
import java.util.concurrent.ThreadFactory; import java.util.concurrent.ThreadFactory;
import jdk.internal.misc.CleanerImpl; import jdk.internal.ref.CleanerImpl;
/** /**
* {@code Cleaner} manages a set of object references and corresponding cleaning actions. * {@code Cleaner} manages a set of object references and corresponding cleaning actions.

2
jdk/src/java.base/share/classes/java/lang/ref/Finalizer.java
View File

@ -29,7 +29,7 @@ import java.security.PrivilegedAction;
import java.security.AccessController; import java.security.AccessController;
import jdk.internal.misc.JavaLangAccess; import jdk.internal.misc.JavaLangAccess;
import jdk.internal.misc.SharedSecrets; import jdk.internal.misc.SharedSecrets;
import sun.misc.VM; import jdk.internal.misc.VM;
final class Finalizer extends FinalReference<Object> { /* Package-private; must be in final class Finalizer extends FinalReference<Object> { /* Package-private; must be in
same package as the Reference same package as the Reference

117
jdk/src/java.base/share/classes/java/lang/ref/Reference.java
View File

@ -25,6 +25,7 @@
package java.lang.ref; package java.lang.ref;
import jdk.internal.vm.annotation.DontInline;
import sun.misc.Cleaner; import sun.misc.Cleaner;
import jdk.internal.HotSpotIntrinsicCandidate; import jdk.internal.HotSpotIntrinsicCandidate;
import jdk.internal.misc.JavaLangRefAccess; import jdk.internal.misc.JavaLangRefAccess;
@ -310,4 +311,120 @@ public abstract class Reference<T> {
this.queue = (queue == null) ? ReferenceQueue.NULL : queue; this.queue = (queue == null) ? ReferenceQueue.NULL : queue;
} }
/**
* Ensures that the object referenced by the given reference remains
* <a href="package-summary.html#reachability"><em>strongly reachable</em></a>,
* regardless of any prior actions of the program that might otherwise cause
* the object to become unreachable; thus, the referenced object is not
* reclaimable by garbage collection at least until after the invocation of
* this method. Invocation of this method does not itself initiate garbage
* collection or finalization.
*
* <p> This method establishes an ordering for
* <a href="package-summary.html#reachability"><em>strong reachability</em></a>
* with respect to garbage collection. It controls relations that are
* otherwise only implicit in a program -- the reachability conditions
* triggering garbage collection. This method is designed for use in
* uncommon situations of premature finalization where using
* {@code synchronized} blocks or methods, or using other synchronization
* facilities are not possible or do not provide the desired control. This
* method is applicable only when reclamation may have visible effects,
* which is possible for objects with finalizers (See
* <a href="https://docs.oracle.com/javase/specs/jls/se8/html/jls-12.html#jls-12.6">
* Section 12.6 17 of <cite>The Java&trade; Language Specification</cite></a>)
* that are implemented in ways that rely on ordering control for correctness.
*
* @apiNote
* Finalization may occur whenever the virtual machine detects that no
* reference to an object will ever be stored in the heap: The garbage
* collector may reclaim an object even if the fields of that object are
* still in use, so long as the object has otherwise become unreachable.
* This may have surprising and undesirable effects in cases such as the
* following example in which the bookkeeping associated with a class is
* managed through array indices. Here, method {@code action} uses a
* {@code reachabilityFence} to ensure that the {@code Resource} object is
* not reclaimed before bookkeeping on an associated
* {@code ExternalResource} has been performed; in particular here, to
* ensure that the array slot holding the {@code ExternalResource} is not
* nulled out in method {@link Object#finalize}, which may otherwise run
* concurrently.
*
* <pre> {@code
* class Resource {
* private static ExternalResource[] externalResourceArray = ...
*
* int myIndex;
* Resource(...) {
* myIndex = ...
* externalResourceArray[myIndex] = ...;
* ...
* }
* protected void finalize() {
* externalResourceArray[myIndex] = null;
* ...
* }
* public void action() {
* try {
* // ...
* int i = myIndex;
* Resource.update(externalResourceArray[i]);
* } finally {
* Reference.reachabilityFence(this);
* }
* }
* private static void update(ExternalResource ext) {
* ext.status = ...;
* }
* }}</pre>
*
* Here, the invocation of {@code reachabilityFence} is nonintuitively
* placed <em>after</em> the call to {@code update}, to ensure that the
* array slot is not nulled out by {@link Object#finalize} before the
* update, even if the call to {@code action} was the last use of this
* object. This might be the case if, for example a usage in a user program
* had the form {@code new Resource().action();} which retains no other
* reference to this {@code Resource}. While probably overkill here,
* {@code reachabilityFence} is placed in a {@code finally} block to ensure
* that it is invoked across all paths in the method. In a method with more
* complex control paths, you might need further precautions to ensure that
* {@code reachabilityFence} is encountered along all of them.
*
* <p> It is sometimes possible to better encapsulate use of
* {@code reachabilityFence}. Continuing the above example, if it were
* acceptable for the call to method {@code update} to proceed even if the
* finalizer had already executed (nulling out slot), then you could
* localize use of {@code reachabilityFence}:
*
* <pre> {@code
* public void action2() {
* // ...
* Resource.update(getExternalResource());
* }
* private ExternalResource getExternalResource() {
* ExternalResource ext = externalResourceArray[myIndex];
* Reference.reachabilityFence(this);
* return ext;
* }}</pre>
*
* <p> Method {@code reachabilityFence} is not required in constructions
* that themselves ensure reachability. For example, because objects that
* are locked cannot, in general, be reclaimed, it would suffice if all
* accesses of the object, in all methods of class {@code Resource}
* (including {@code finalize}) were enclosed in {@code synchronized (this)}
* blocks. (Further, such blocks must not include infinite loops, or
* themselves be unreachable, which fall into the corner case exceptions to
* the "in general" disclaimer.) However, method {@code reachabilityFence}
* remains a better option in cases where this approach is not as efficient,
* desirable, or possible; for example because it would encounter deadlock.
*
* @param ref the reference. If {@code null}, this method has no effect.
* @since 9
*/
@DontInline
public static void reachabilityFence(Object ref) {
// Does nothing, because this method is annotated with @DontInline
// HotSpot needs to retain the ref and not GC it before a call to this
// method
}
} }

5
jdk/src/java.base/share/classes/java/lang/ref/ReferenceQueue.java
View File

@ -26,6 +26,7 @@
package java.lang.ref; package java.lang.ref;
import java.util.function.Consumer; import java.util.function.Consumer;
import jdk.internal.misc.VM;
/** /**
* Reference queues, to which registered reference objects are appended by the * Reference queues, to which registered reference objects are appended by the
@ -73,7 +74,7 @@ public class ReferenceQueue<T> {
// Volatiles ensure ordering. // Volatiles ensure ordering.
r.queue = ENQUEUED; r.queue = ENQUEUED;
if (r instanceof FinalReference) { if (r instanceof FinalReference) {
sun.misc.VM.addFinalRefCount(1); VM.addFinalRefCount(1);
} }
lock.notifyAll(); lock.notifyAll();
return true; return true;
@ -93,7 +94,7 @@ public class ReferenceQueue<T> {
r.next = r; r.next = r;
queueLength--; queueLength--;
if (r instanceof FinalReference) { if (r instanceof FinalReference) {
sun.misc.VM.addFinalRefCount(-1); VM.addFinalRefCount(-1);
} }
return r; return r;
} }

2
jdk/src/java.base/share/classes/java/lang/reflect/Proxy.java
View File

@ -34,7 +34,7 @@ import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicLong;
import java.util.function.BiFunction; import java.util.function.BiFunction;
import sun.misc.VM; import jdk.internal.misc.VM;
import sun.reflect.CallerSensitive; import sun.reflect.CallerSensitive;
import sun.reflect.Reflection; import sun.reflect.Reflection;
import sun.reflect.misc.ReflectUtil; import sun.reflect.misc.ReflectUtil;

128
jdk/src/java.base/share/classes/java/net/URI.java
View File

@ -1146,13 +1146,30 @@ public final class URI
if (part != null) { if (part != null) {
return part; return part;
} }
StringBuilder sb = new StringBuilder();
appendSchemeSpecificPart(sb, null, getAuthority(), getUserInfo(), String s = string;
if (s != null) {
// if string is defined, components will have been parsed
int start = 0;
int end = s.length();
if (scheme != null) {
start = scheme.length() + 1;
}
if (fragment != null) {
end -= fragment.length() + 1;
}
if (path != null && path.length() == end - start) {
part = path;
} else {
part = s.substring(start, end);
}
} else {
StringBuilder sb = new StringBuilder();
appendSchemeSpecificPart(sb, null, getAuthority(), getUserInfo(),
host, port, getPath(), getQuery()); host, port, getPath(), getQuery());
if (sb.length() == 0) { part = sb.toString();
return null;
} }
return schemeSpecificPart = sb.toString(); return schemeSpecificPart = part;
} }
/** /**
@ -2059,7 +2076,7 @@ public final class URI
// 5.2 (2): Reference to current document (lone fragment) // 5.2 (2): Reference to current document (lone fragment)
if ((child.scheme == null) && (child.authority == null) if ((child.scheme == null) && (child.authority == null)
&& child.path.equals("") && (child.fragment != null) && child.path.isEmpty() && (child.fragment != null)
&& (child.query == null)) { && (child.query == null)) {
if ((base.fragment != null) if ((base.fragment != null)
&& child.fragment.equals(base.fragment)) { && child.fragment.equals(base.fragment)) {
@ -2647,13 +2664,6 @@ public final class URI
private static final long L_SCHEME = L_ALPHA | L_DIGIT | lowMask("+-."); private static final long L_SCHEME = L_ALPHA | L_DIGIT | lowMask("+-.");
private static final long H_SCHEME = H_ALPHA | H_DIGIT | highMask("+-."); private static final long H_SCHEME = H_ALPHA | H_DIGIT | highMask("+-.");
// uric_no_slash = unreserved | escaped | ";" | "?" | ":" | "@" |
// "&" | "=" | "+" | "$" | ","
private static final long L_URIC_NO_SLASH
= L_UNRESERVED | L_ESCAPED | lowMask(";?:@&=+$,");
private static final long H_URIC_NO_SLASH
= H_UNRESERVED | H_ESCAPED | highMask(";?:@&=+$,");
// scope_id = alpha | digit | "_" | "." // scope_id = alpha | digit | "_" | "."
private static final long L_SCOPE_ID private static final long L_SCOPE_ID
= L_ALPHANUM | lowMask("_."); = L_ALPHANUM | lowMask("_.");
@ -2884,23 +2894,10 @@ public final class URI
// -- Simple access to the input string -- // -- Simple access to the input string --
// Return a substring of the input string
//
private String substring(int start, int end) {
return input.substring(start, end);
}
// Return the char at position p,
// assuming that p < input.length()
//
private char charAt(int p) {
return input.charAt(p);
}
// Tells whether start < end and, if so, whether charAt(start) == c // Tells whether start < end and, if so, whether charAt(start) == c
// //
private boolean at(int start, int end, char c) { private boolean at(int start, int end, char c) {
return (start < end) && (charAt(start) == c); return (start < end) && (input.charAt(start) == c);
} }
// Tells whether start + s.length() < end and, if so, // Tells whether start + s.length() < end and, if so,
@ -2913,7 +2910,7 @@ public final class URI
return false; return false;
int i = 0; int i = 0;
while (i < sn) { while (i < sn) {
if (charAt(p++) != s.charAt(i)) { if (input.charAt(p++) != s.charAt(i)) {
break; break;
} }
i++; i++;
@ -2953,7 +2950,7 @@ public final class URI
// start position. // start position.
// //
private int scan(int start, int end, char c) { private int scan(int start, int end, char c) {
if ((start < end) && (charAt(start) == c)) if ((start < end) && (input.charAt(start) == c))
return start + 1; return start + 1;
return start; return start;
} }
@ -2968,7 +2965,7 @@ public final class URI
private int scan(int start, int end, String err, String stop) { private int scan(int start, int end, String err, String stop) {
int p = start; int p = start;
while (p < end) { while (p < end) {
char c = charAt(p); char c = input.charAt(p);
if (err.indexOf(c) >= 0) if (err.indexOf(c) >= 0)
return -1; return -1;
if (stop.indexOf(c) >= 0) if (stop.indexOf(c) >= 0)
@ -2978,6 +2975,23 @@ public final class URI
return p; return p;
} }
// Scan forward from the given start position. Stop at the first char
// in the stop string (in which case the index of the preceding char is
// returned), or the end of the input string (in which case the length
// of the input string is returned). May return the start position if
// nothing matches.
//
private int scan(int start, int end, String stop) {
int p = start;
while (p < end) {
char c = input.charAt(p);
if (stop.indexOf(c) >= 0)
break;
p++;
}
return p;
}
// Scan a potential escape sequence, starting at the given position, // Scan a potential escape sequence, starting at the given position,
// with the given first char (i.e., charAt(start) == c). // with the given first char (i.e., charAt(start) == c).
// //
@ -2992,8 +3006,8 @@ public final class URI
if (c == '%') { if (c == '%') {
// Process escape pair // Process escape pair
if ((p + 3 <= n) if ((p + 3 <= n)
&& match(charAt(p + 1), L_HEX, H_HEX) && match(input.charAt(p + 1), L_HEX, H_HEX)
&& match(charAt(p + 2), L_HEX, H_HEX)) { && match(input.charAt(p + 2), L_HEX, H_HEX)) {
return p + 3; return p + 3;
} }
fail("Malformed escape pair", p); fail("Malformed escape pair", p);
@ -3013,7 +3027,7 @@ public final class URI
{ {
int p = start; int p = start;
while (p < n) { while (p < n) {
char c = charAt(p); char c = input.charAt(p);
if (match(c, lowMask, highMask)) { if (match(c, lowMask, highMask)) {
p++; p++;
continue; continue;
@ -3059,7 +3073,6 @@ public final class URI
// //
void parse(boolean rsa) throws URISyntaxException { void parse(boolean rsa) throws URISyntaxException {
requireServerAuthority = rsa; requireServerAuthority = rsa;
int ssp; // Start of scheme-specific part
int n = input.length(); int n = input.length();
int p = scan(0, n, "/?#", ":"); int p = scan(0, n, "/?#", ":");
if ((p >= 0) && at(p, n, ':')) { if ((p >= 0) && at(p, n, ':')) {
@ -3067,26 +3080,25 @@ public final class URI
failExpecting("scheme name", 0); failExpecting("scheme name", 0);
checkChar(0, L_ALPHA, H_ALPHA, "scheme name"); checkChar(0, L_ALPHA, H_ALPHA, "scheme name");
checkChars(1, p, L_SCHEME, H_SCHEME, "scheme name"); checkChars(1, p, L_SCHEME, H_SCHEME, "scheme name");
scheme = substring(0, p); scheme = input.substring(0, p);
p++; // Skip ':' p++; // Skip ':'
ssp = p;
if (at(p, n, '/')) { if (at(p, n, '/')) {
p = parseHierarchical(p, n); p = parseHierarchical(p, n);
} else { } else {
int q = scan(p, n, "", "#"); // opaque; need to create the schemeSpecificPart
int q = scan(p, n, "#");
if (q <= p) if (q <= p)
failExpecting("scheme-specific part", p); failExpecting("scheme-specific part", p);
checkChars(p, q, L_URIC, H_URIC, "opaque part"); checkChars(p, q, L_URIC, H_URIC, "opaque part");
schemeSpecificPart = input.substring(p, q);
p = q; p = q;
} }
} else { } else {
ssp = 0;
p = parseHierarchical(0, n); p = parseHierarchical(0, n);
} }
schemeSpecificPart = substring(ssp, p);
if (at(p, n, '#')) { if (at(p, n, '#')) {
checkChars(p + 1, n, L_URIC, H_URIC, "fragment"); checkChars(p + 1, n, L_URIC, H_URIC, "fragment");
fragment = substring(p + 1, n); fragment = input.substring(p + 1, n);
p = n; p = n;
} }
if (p < n) if (p < n)
@ -3113,7 +3125,7 @@ public final class URI
int p = start; int p = start;
if (at(p, n, '/') && at(p + 1, n, '/')) { if (at(p, n, '/') && at(p + 1, n, '/')) {
p += 2; p += 2;
int q = scan(p, n, "", "/?#"); int q = scan(p, n, "/?#");
if (q > p) { if (q > p) {
p = parseAuthority(p, q); p = parseAuthority(p, q);
} else if (q < n) { } else if (q < n) {
@ -3122,15 +3134,15 @@ public final class URI
} else } else
failExpecting("authority", p); failExpecting("authority", p);
} }
int q = scan(p, n, "", "?#"); // DEVIATION: May be empty int q = scan(p, n, "?#"); // DEVIATION: May be empty
checkChars(p, q, L_PATH, H_PATH, "path"); checkChars(p, q, L_PATH, H_PATH, "path");
path = substring(p, q); path = input.substring(p, q);
p = q; p = q;
if (at(p, n, '?')) { if (at(p, n, '?')) {
p++; p++;
q = scan(p, n, "", "#"); q = scan(p, n, "#");
checkChars(p, q, L_URIC, H_URIC, "query"); checkChars(p, q, L_URIC, H_URIC, "query");
query = substring(p, q); query = input.substring(p, q);
p = q; p = q;
} }
return p; return p;
@ -3154,7 +3166,7 @@ public final class URI
boolean serverChars; boolean serverChars;
boolean regChars; boolean regChars;
if (scan(p, n, "", "]") > p) { if (scan(p, n, "]") > p) {
// contains a literal IPv6 address, therefore % is allowed // contains a literal IPv6 address, therefore % is allowed
serverChars = (scan(p, n, L_SERVER_PERCENT, H_SERVER_PERCENT) == n); serverChars = (scan(p, n, L_SERVER_PERCENT, H_SERVER_PERCENT) == n);
} else { } else {
@ -3164,7 +3176,7 @@ public final class URI
if (regChars && !serverChars) { if (regChars && !serverChars) {
// Must be a registry-based authority // Must be a registry-based authority
authority = substring(p, n); authority = input.substring(p, n);
return n; return n;
} }
@ -3176,7 +3188,7 @@ public final class URI
q = parseServer(p, n); q = parseServer(p, n);
if (q < n) if (q < n)
failExpecting("end of authority", q); failExpecting("end of authority", q);
authority = substring(p, n); authority = input.substring(p, n);
} catch (URISyntaxException x) { } catch (URISyntaxException x) {
// Undo results of failed parse // Undo results of failed parse
userInfo = null; userInfo = null;
@ -3198,7 +3210,7 @@ public final class URI
if (q < n) { if (q < n) {
if (regChars) { if (regChars) {
// Registry-based authority // Registry-based authority
authority = substring(p, n); authority = input.substring(p, n);
} else if (ex != null) { } else if (ex != null) {
// Re-throw exception; it was probably due to // Re-throw exception; it was probably due to
// a malformed IPv6 address // a malformed IPv6 address
@ -3224,7 +3236,7 @@ public final class URI
q = scan(p, n, "/?#", "@"); q = scan(p, n, "/?#", "@");
if ((q >= p) && at(q, n, '@')) { if ((q >= p) && at(q, n, '@')) {
checkChars(p, q, L_USERINFO, H_USERINFO, "user info"); checkChars(p, q, L_USERINFO, H_USERINFO, "user info");
userInfo = substring(p, q); userInfo = input.substring(p, q);
p = q + 1; // Skip '@' p = q + 1; // Skip '@'
} }
@ -3235,7 +3247,7 @@ public final class URI
q = scan(p, n, "/?#", "]"); q = scan(p, n, "/?#", "]");
if ((q > p) && at(q, n, ']')) { if ((q > p) && at(q, n, ']')) {
// look for a "%" scope id // look for a "%" scope id
int r = scan (p, q, "", "%"); int r = scan (p, q, "%");
if (r > p) { if (r > p) {
parseIPv6Reference(p, r); parseIPv6Reference(p, r);
if (r+1 == q) { if (r+1 == q) {
@ -3246,7 +3258,7 @@ public final class URI
} else { } else {
parseIPv6Reference(p, q); parseIPv6Reference(p, q);
} }
host = substring(p-1, q+1); host = input.substring(p-1, q+1);
p = q + 1; p = q + 1;
} else { } else {
failExpecting("closing bracket for IPv6 address", q); failExpecting("closing bracket for IPv6 address", q);
@ -3261,7 +3273,7 @@ public final class URI
// port // port
if (at(p, n, ':')) { if (at(p, n, ':')) {
p++; p++;
q = scan(p, n, "", "/"); q = scan(p, n, "/");
if (q > p) { if (q > p) {
checkChars(p, q, L_DIGIT, H_DIGIT, "port number"); checkChars(p, q, L_DIGIT, H_DIGIT, "port number");
try { try {
@ -3361,13 +3373,13 @@ public final class URI
// IPv4 address is followed by something - check that // IPv4 address is followed by something - check that
// it's a ":" as this is the only valid character to // it's a ":" as this is the only valid character to
// follow an address. // follow an address.
if (charAt(p) != ':') { if (input.charAt(p) != ':') {
p = -1; p = -1;
} }
} }
if (p > start) if (p > start)
host = substring(start, p); host = input.substring(start, p);
return p; return p;
} }
@ -3393,7 +3405,7 @@ public final class URI
p = q; p = q;
q = scan(p, n, L_ALPHANUM | L_DASH, H_ALPHANUM | H_DASH); q = scan(p, n, L_ALPHANUM | L_DASH, H_ALPHANUM | H_DASH);
if (q > p) { if (q > p) {
if (charAt(q - 1) == '-') if (input.charAt(q - 1) == '-')
fail("Illegal character in hostname", q - 1); fail("Illegal character in hostname", q - 1);
p = q; p = q;
} }
@ -3412,11 +3424,11 @@ public final class URI
// for a fully qualified hostname check that the rightmost // for a fully qualified hostname check that the rightmost
// label starts with an alpha character. // label starts with an alpha character.
if (l > start && !match(charAt(l), L_ALPHA, H_ALPHA)) { if (l > start && !match(input.charAt(l), L_ALPHA, H_ALPHA)) {
fail("Illegal character in hostname", l); fail("Illegal character in hostname", l);
} }
host = substring(start, p); host = input.substring(start, p);
return p; return p;
} }

2
jdk/src/java.base/share/classes/java/net/URL.java
View File

@ -1242,7 +1242,7 @@ public final class URL implements java.io.Serializable {
private static ThreadLocal<Object> gate = new ThreadLocal<>(); private static ThreadLocal<Object> gate = new ThreadLocal<>();
private static URLStreamHandler lookupViaProviders(final String protocol) { private static URLStreamHandler lookupViaProviders(final String protocol) {
if (!sun.misc.VM.isBooted()) if (!jdk.internal.misc.VM.isBooted())
return null; return null;
if (gate.get() != null) if (gate.get() != null)

7
jdk/src/java.base/share/classes/java/net/URLConnection.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1995, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1995, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -1567,6 +1567,11 @@ public abstract class URLConnection {
} }
} }
if ((c1 == 0x49 && c2 == 0x49 && c3 == 0x2a && c4 == 0x00)
|| (c1 == 0x4d && c2 == 0x4d && c3 == 0x00 && c4 == 0x2a)) {
return "image/tiff";
}
if (c1 == 0xD0 && c2 == 0xCF && c3 == 0x11 && c4 == 0xE0 && if (c1 == 0xD0 && c2 == 0xCF && c3 == 0x11 && c4 == 0xE0 &&
c5 == 0xA1 && c6 == 0xB1 && c7 == 0x1A && c8 == 0xE1) { c5 == 0xA1 && c6 == 0xB1 && c7 == 0x1A && c8 == 0xE1) {

2
jdk/src/java.base/share/classes/java/nio/Bits.java
View File

@ -31,7 +31,7 @@ import jdk.internal.misc.JavaNioAccess;
import jdk.internal.misc.JavaLangRefAccess; import jdk.internal.misc.JavaLangRefAccess;
import jdk.internal.misc.SharedSecrets; import jdk.internal.misc.SharedSecrets;
import jdk.internal.misc.Unsafe; import jdk.internal.misc.Unsafe;
import sun.misc.VM; import jdk.internal.misc.VM;
/** /**
* Access to bits, native and otherwise. * Access to bits, native and otherwise.

2
jdk/src/java.base/share/classes/java/nio/Direct-X-Buffer.java.template
View File

@ -30,7 +30,7 @@ package java.nio;
import java.io.FileDescriptor; import java.io.FileDescriptor;
import sun.misc.Cleaner; import sun.misc.Cleaner;
import jdk.internal.misc.Unsafe; import jdk.internal.misc.Unsafe;
import sun.misc.VM; import jdk.internal.misc.VM;
import sun.nio.ch.DirectBuffer; import sun.nio.ch.DirectBuffer;

7
jdk/src/java.base/share/classes/java/nio/charset/Charset.java
View File

@ -43,6 +43,7 @@ import java.util.ServiceLoader;
import java.util.ServiceConfigurationError; import java.util.ServiceConfigurationError;
import java.util.SortedMap; import java.util.SortedMap;
import java.util.TreeMap; import java.util.TreeMap;
import jdk.internal.misc.VM;
import sun.misc.ASCIICaseInsensitiveComparator; import sun.misc.ASCIICaseInsensitiveComparator;
import sun.nio.cs.StandardCharsets; import sun.nio.cs.StandardCharsets;
import sun.nio.cs.ThreadLocalCoders; import sun.nio.cs.ThreadLocalCoders;
@ -281,7 +282,7 @@ public abstract class Charset
static boolean atBugLevel(String bl) { // package-private static boolean atBugLevel(String bl) { // package-private
String level = bugLevel; String level = bugLevel;
if (level == null) { if (level == null) {
if (!sun.misc.VM.isBooted()) if (!VM.isBooted())
return false; return false;
bugLevel = level = AccessController.doPrivileged( bugLevel = level = AccessController.doPrivileged(
new GetPropertyAction("sun.nio.cs.bugLevel", "")); new GetPropertyAction("sun.nio.cs.bugLevel", ""));
@ -394,7 +395,7 @@ public abstract class Charset
// that loader to be prematurely initialized with incomplete // that loader to be prematurely initialized with incomplete
// information. // information.
// //
if (!sun.misc.VM.isBooted()) if (!VM.isBooted())
return null; return null;
if (gate.get() != null) if (gate.get() != null)
@ -445,7 +446,7 @@ public abstract class Charset
} }
private static Charset lookupExtendedCharset(String charsetName) { private static Charset lookupExtendedCharset(String charsetName) {
if (!sun.misc.VM.isBooted()) // see lookupViaProviders() if (!VM.isBooted()) // see lookupViaProviders()
return null; return null;
CharsetProvider[] ecps = ExtendedProviderHolder.extendedProviders; CharsetProvider[] ecps = ExtendedProviderHolder.extendedProviders;
for (CharsetProvider cp : ecps) { for (CharsetProvider cp : ecps) {

2
jdk/src/java.base/share/classes/java/time/Clock.java
View File

@ -69,7 +69,7 @@ import static java.time.LocalTime.NANOS_PER_MILLI;
import java.io.Serializable; import java.io.Serializable;
import java.util.Objects; import java.util.Objects;
import java.util.TimeZone; import java.util.TimeZone;
import sun.misc.VM; import jdk.internal.misc.VM;
/** /**
* A clock providing access to the current instant, date and time using a time-zone. * A clock providing access to the current instant, date and time using a time-zone.

19
jdk/src/java.base/share/classes/java/time/LocalDate.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -1369,6 +1369,23 @@ public final class LocalDate
if (daysToAdd == 0) { if (daysToAdd == 0) {
return this; return this;
} }
long dom = day + daysToAdd;
if (dom > 0) {
if (dom <= 28) {
return new LocalDate(year, month, (int) dom);
} else if (dom <= 59) { // 59th Jan is 28th Feb, 59th Feb is 31st Mar
long monthLen = lengthOfMonth();
if (dom <= monthLen) {
return new LocalDate(year, month, (int) dom);
} else if (month < 12) {
return new LocalDate(year, month + 1, (int) (dom - monthLen));
} else {
YEAR.checkValidValue(year + 1);
return new LocalDate(year + 1, 1, (int) (dom - monthLen));
}
}
}
long mjDay = Math.addExact(toEpochDay(), daysToAdd); long mjDay = Math.addExact(toEpochDay(), daysToAdd);
return LocalDate.ofEpochDay(mjDay); return LocalDate.ofEpochDay(mjDay);
} }

480
jdk/src/java.base/share/classes/java/util/Arrays.java
View File

@ -110,7 +110,7 @@ public class Arrays {
* Checks that {@code fromIndex} and {@code toIndex} are in * Checks that {@code fromIndex} and {@code toIndex} are in
* the range and throws an exception if they aren't. * the range and throws an exception if they aren't.
*/ */
private static void rangeCheck(int arrayLength, int fromIndex, int toIndex) { static void rangeCheck(int arrayLength, int fromIndex, int toIndex) {
if (fromIndex > toIndex) { if (fromIndex > toIndex) {
throw new IllegalArgumentException( throw new IllegalArgumentException(
"fromIndex(" + fromIndex + ") > toIndex(" + toIndex + ")"); "fromIndex(" + fromIndex + ") > toIndex(" + toIndex + ")");
@ -2579,11 +2579,7 @@ public class Arrays {
if (a2.length != length) if (a2.length != length)
return false; return false;
for (int i=0; i<length; i++) return ArraysSupport.mismatch(a, a2, length) < 0;
if (a[i] != a2[i])
return false;
return true;
} }
/** /**
@ -2628,11 +2624,9 @@ public class Arrays {
if (aLength != bLength) if (aLength != bLength)
return false; return false;
for (int i = 0; i < aLength; i++) return ArraysSupport.mismatch(a, aFromIndex,
if (a[aFromIndex++] != b[bFromIndex++]) b, bFromIndex,
return false; aLength) < 0;
return true;
} }
/** /**
@ -2657,11 +2651,7 @@ public class Arrays {
if (a2.length != length) if (a2.length != length)
return false; return false;
for (int i=0; i<length; i++) return ArraysSupport.mismatch(a, a2, length) < 0;
if (a[i] != a2[i])
return false;
return true;
} }
/** /**
@ -2706,11 +2696,9 @@ public class Arrays {
if (aLength != bLength) if (aLength != bLength)
return false; return false;
for (int i = 0; i < aLength; i++) return ArraysSupport.mismatch(a, aFromIndex,
if (a[aFromIndex++] != b[bFromIndex++]) b, bFromIndex,
return false; aLength) < 0;
return true;
} }
/** /**
@ -2735,11 +2723,7 @@ public class Arrays {
if (a2.length != length) if (a2.length != length)
return false; return false;
for (int i=0; i<length; i++) return ArraysSupport.mismatch(a, a2, length) < 0;
if (a[i] != a2[i])
return false;
return true;
} }
/** /**
@ -2784,11 +2768,9 @@ public class Arrays {
if (aLength != bLength) if (aLength != bLength)
return false; return false;
for (int i = 0; i < aLength; i++) return ArraysSupport.mismatch(a, aFromIndex,
if (a[aFromIndex++] != b[bFromIndex++]) b, bFromIndex,
return false; aLength) < 0;
return true;
} }
/** /**
@ -2814,11 +2796,7 @@ public class Arrays {
if (a2.length != length) if (a2.length != length)
return false; return false;
for (int i=0; i<length; i++) return ArraysSupport.mismatch(a, a2, length) < 0;
if (a[i] != a2[i])
return false;
return true;
} }
/** /**
@ -2863,11 +2841,9 @@ public class Arrays {
if (aLength != bLength) if (aLength != bLength)
return false; return false;
for (int i = 0; i < aLength; i++) return ArraysSupport.mismatch(a, aFromIndex,
if (a[aFromIndex++] != b[bFromIndex++]) b, bFromIndex,
return false; aLength) < 0;
return true;
} }
/** /**
@ -2893,11 +2869,7 @@ public class Arrays {
if (a2.length != length) if (a2.length != length)
return false; return false;
for (int i=0; i<length; i++) return ArraysSupport.mismatch(a, a2, length) < 0;
if (a[i] != a2[i])
return false;
return true;
} }
/** /**
@ -2942,11 +2914,9 @@ public class Arrays {
if (aLength != bLength) if (aLength != bLength)
return false; return false;
for (int i = 0; i < aLength; i++) return ArraysSupport.mismatch(a, aFromIndex,
if (a[aFromIndex++] != b[bFromIndex++]) b, bFromIndex,
return false; aLength) < 0;
return true;
} }
/** /**
@ -2971,11 +2941,7 @@ public class Arrays {
if (a2.length != length) if (a2.length != length)
return false; return false;
for (int i=0; i<length; i++) return ArraysSupport.mismatch(a, a2, length) < 0;
if (a[i] != a2[i])
return false;
return true;
} }
/** /**
@ -3020,11 +2986,9 @@ public class Arrays {
if (aLength != bLength) if (aLength != bLength)
return false; return false;
for (int i = 0; i < aLength; i++) return ArraysSupport.mismatch(a, aFromIndex,
if (a[aFromIndex++] != b[bFromIndex++]) b, bFromIndex,
return false; aLength) < 0;
return true;
} }
/** /**
@ -3055,14 +3019,7 @@ public class Arrays {
if (a2.length != length) if (a2.length != length)
return false; return false;
for (int i=0; i<length; i++) { return ArraysSupport.mismatch(a, a2, length) < 0;
double v1 = a[i], v2 = a2[i];
if (Double.doubleToRawLongBits(v1) != Double.doubleToRawLongBits(v2))
if (!Double.isNaN(v1) || !Double.isNaN(v2))
return false;
}
return true;
} }
/** /**
@ -3113,14 +3070,8 @@ public class Arrays {
if (aLength != bLength) if (aLength != bLength)
return false; return false;
for (int i = 0; i < aLength; i++) { return ArraysSupport.mismatch(a, aFromIndex,
Double va = a[aFromIndex++], vb = b[bFromIndex++]; b, bFromIndex, aLength) < 0;
if (Double.doubleToRawLongBits(va) != Double.doubleToRawLongBits(vb))
if (!Double.isNaN(va) || !Double.isNaN(vb))
return false;
}
return true;
} }
/** /**
@ -3151,14 +3102,7 @@ public class Arrays {
if (a2.length != length) if (a2.length != length)
return false; return false;
for (int i=0; i<length; i++) { return ArraysSupport.mismatch(a, a2, length) < 0;
float v1 = a[i], v2 = a2[i];
if (Float.floatToRawIntBits(v1) != Float.floatToRawIntBits(v2))
if (!Float.isNaN(v1) || !Float.isNaN(v2))
return false;
}
return true;
} }
/** /**
@ -3209,14 +3153,8 @@ public class Arrays {
if (aLength != bLength) if (aLength != bLength)
return false; return false;
for (int i = 0; i < aLength; i++) { return ArraysSupport.mismatch(a, aFromIndex,
float va = a[aFromIndex++], vb = b[bFromIndex++]; b, bFromIndex, aLength) < 0;
if (Float.floatToRawIntBits(va) != Float.floatToRawIntBits(vb))
if (!Float.isNaN(va) || !Float.isNaN(vb))
return false;
}
return true;
} }
/** /**
@ -5804,9 +5742,10 @@ public class Arrays {
if (a == null || b == null) if (a == null || b == null)
return a == null ? -1 : 1; return a == null ? -1 : 1;
int length = Math.min(a.length, b.length); int i = ArraysSupport.mismatch(a, b,
for (int i = 0; i < length; i++) { Math.min(a.length, b.length));
if (a[i] != b[i]) return Boolean.compare(a[i], b[i]); if (i >= 0) {
return Boolean.compare(a[i], b[i]);
} }
return a.length - b.length; return a.length - b.length;
@ -5880,11 +5819,11 @@ public class Arrays {
int aLength = aToIndex - aFromIndex; int aLength = aToIndex - aFromIndex;
int bLength = bToIndex - bFromIndex; int bLength = bToIndex - bFromIndex;
int length = Math.min(aLength, bLength); int i = ArraysSupport.mismatch(a, aFromIndex,
for (int i = 0; i < length; i++) { b, bFromIndex,
boolean va = a[aFromIndex++]; Math.min(aLength, bLength));
boolean vb = b[bFromIndex++]; if (i >= 0) {
if (va != vb) return Boolean.compare(va, vb); return Boolean.compare(a[aFromIndex + i], b[bFromIndex + i]);
} }
return aLength - bLength; return aLength - bLength;
@ -5939,9 +5878,10 @@ public class Arrays {
if (a == null || b == null) if (a == null || b == null)
return a == null ? -1 : 1; return a == null ? -1 : 1;
int length = Math.min(a.length, b.length); int i = ArraysSupport.mismatch(a, b,
for (int i = 0; i < length; i++) { Math.min(a.length, b.length));
if (a[i] != b[i]) return Byte.compare(a[i], b[i]); if (i >= 0) {
return Byte.compare(a[i], b[i]);
} }
return a.length - b.length; return a.length - b.length;
@ -6014,11 +5954,11 @@ public class Arrays {
int aLength = aToIndex - aFromIndex; int aLength = aToIndex - aFromIndex;
int bLength = bToIndex - bFromIndex; int bLength = bToIndex - bFromIndex;
int length = Math.min(aLength, bLength); int i = ArraysSupport.mismatch(a, aFromIndex,
for (int i = 0; i < length; i++) { b, bFromIndex,
byte va = a[aFromIndex++]; Math.min(aLength, bLength));
byte vb = b[bFromIndex++]; if (i >= 0) {
if (va != vb) return Byte.compare(va, vb); return Byte.compare(a[aFromIndex + i], b[bFromIndex + i]);
} }
return aLength - bLength; return aLength - bLength;
@ -6066,9 +6006,10 @@ public class Arrays {
if (a == null || b == null) if (a == null || b == null)
return a == null ? -1 : 1; return a == null ? -1 : 1;
int length = Math.min(a.length, b.length); int i = ArraysSupport.mismatch(a, b,
for (int i = 0; i < length; i++) { Math.min(a.length, b.length));
if (a[i] != b[i]) return Byte.compareUnsigned(a[i], b[i]); if (i >= 0) {
return Byte.compareUnsigned(a[i], b[i]);
} }
return a.length - b.length; return a.length - b.length;
@ -6133,11 +6074,11 @@ public class Arrays {
int aLength = aToIndex - aFromIndex; int aLength = aToIndex - aFromIndex;
int bLength = bToIndex - bFromIndex; int bLength = bToIndex - bFromIndex;
int length = Math.min(aLength, bLength); int i = ArraysSupport.mismatch(a, aFromIndex,
for (int i = 0; i < length; i++) { b, bFromIndex,
byte va = a[aFromIndex++]; Math.min(aLength, bLength));
byte vb = b[bFromIndex++]; if (i >= 0) {
if (va != vb) return Byte.compareUnsigned(va, vb); return Byte.compareUnsigned(a[aFromIndex + i], b[bFromIndex + i]);
} }
return aLength - bLength; return aLength - bLength;
@ -6192,9 +6133,10 @@ public class Arrays {
if (a == null || b == null) if (a == null || b == null)
return a == null ? -1 : 1; return a == null ? -1 : 1;
int length = Math.min(a.length, b.length); int i = ArraysSupport.mismatch(a, b,
for (int i = 0; i < length; i++) { Math.min(a.length, b.length));
if (a[i] != b[i]) return Short.compare(a[i], b[i]); if (i >= 0) {
return Short.compare(a[i], b[i]);
} }
return a.length - b.length; return a.length - b.length;
@ -6267,11 +6209,11 @@ public class Arrays {
int aLength = aToIndex - aFromIndex; int aLength = aToIndex - aFromIndex;
int bLength = bToIndex - bFromIndex; int bLength = bToIndex - bFromIndex;
int length = Math.min(aLength, bLength); int i = ArraysSupport.mismatch(a, aFromIndex,
for (int i = 0; i < length; i++) { b, bFromIndex,
short va = a[aFromIndex++]; Math.min(aLength, bLength));
short vb = b[bFromIndex++]; if (i >= 0) {
if (va != vb) return Short.compare(va, vb); return Short.compare(a[aFromIndex + i], b[bFromIndex + i]);
} }
return aLength - bLength; return aLength - bLength;
@ -6319,9 +6261,10 @@ public class Arrays {
if (a == null || b == null) if (a == null || b == null)
return a == null ? -1 : 1; return a == null ? -1 : 1;
int length = Math.min(a.length, b.length); int i = ArraysSupport.mismatch(a, b,
for (int i = 0; i < length; i++) { Math.min(a.length, b.length));
if (a[i] != b[i]) return Short.compareUnsigned(a[i], b[i]); if (i >= 0) {
return Short.compareUnsigned(a[i], b[i]);
} }
return a.length - b.length; return a.length - b.length;
@ -6385,11 +6328,11 @@ public class Arrays {
int aLength = aToIndex - aFromIndex; int aLength = aToIndex - aFromIndex;
int bLength = bToIndex - bFromIndex; int bLength = bToIndex - bFromIndex;
int length = Math.min(aLength, bLength); int i = ArraysSupport.mismatch(a, aFromIndex,
for (int i = 0; i < length; i++) { b, bFromIndex,
short va = a[aFromIndex++]; Math.min(aLength, bLength));
short vb = b[bFromIndex++]; if (i >= 0) {
if (va != vb) return Short.compareUnsigned(va, vb); return Short.compareUnsigned(a[aFromIndex + i], b[bFromIndex + i]);
} }
return aLength - bLength; return aLength - bLength;
@ -6444,9 +6387,10 @@ public class Arrays {
if (a == null || b == null) if (a == null || b == null)
return a == null ? -1 : 1; return a == null ? -1 : 1;
int length = Math.min(a.length, b.length); int i = ArraysSupport.mismatch(a, b,
for (int i = 0; i < length; i++) { Math.min(a.length, b.length));
if (a[i] != b[i]) return Character.compare(a[i], b[i]); if (i >= 0) {
return Character.compare(a[i], b[i]);
} }
return a.length - b.length; return a.length - b.length;
@ -6519,11 +6463,11 @@ public class Arrays {
int aLength = aToIndex - aFromIndex; int aLength = aToIndex - aFromIndex;
int bLength = bToIndex - bFromIndex; int bLength = bToIndex - bFromIndex;
int length = Math.min(aLength, bLength); int i = ArraysSupport.mismatch(a, aFromIndex,
for (int i = 0; i < length; i++) { b, bFromIndex,
char va = a[aFromIndex++]; Math.min(aLength, bLength));
char vb = b[bFromIndex++]; if (i >= 0) {
if (va != vb) return Character.compare(va, vb); return Character.compare(a[aFromIndex + i], b[bFromIndex + i]);
} }
return aLength - bLength; return aLength - bLength;
@ -6578,9 +6522,10 @@ public class Arrays {
if (a == null || b == null) if (a == null || b == null)
return a == null ? -1 : 1; return a == null ? -1 : 1;
int length = Math.min(a.length, b.length); int i = ArraysSupport.mismatch(a, b,
for (int i = 0; i < length; i++) { Math.min(a.length, b.length));
if (a[i] != b[i]) return Integer.compare(a[i], b[i]); if (i >= 0) {
return Integer.compare(a[i], b[i]);
} }
return a.length - b.length; return a.length - b.length;
@ -6653,11 +6598,11 @@ public class Arrays {
int aLength = aToIndex - aFromIndex; int aLength = aToIndex - aFromIndex;
int bLength = bToIndex - bFromIndex; int bLength = bToIndex - bFromIndex;
int length = Math.min(aLength, bLength); int i = ArraysSupport.mismatch(a, aFromIndex,
for (int i = 0; i < length; i++) { b, bFromIndex,
int va = a[aFromIndex++]; Math.min(aLength, bLength));
int vb = b[bFromIndex++]; if (i >= 0) {
if (va != vb) return Integer.compare(va, vb); return Integer.compare(a[aFromIndex + i], b[bFromIndex + i]);
} }
return aLength - bLength; return aLength - bLength;
@ -6705,9 +6650,10 @@ public class Arrays {
if (a == null || b == null) if (a == null || b == null)
return a == null ? -1 : 1; return a == null ? -1 : 1;
int length = Math.min(a.length, b.length); int i = ArraysSupport.mismatch(a, b,
for (int i = 0; i < length; i++) { Math.min(a.length, b.length));
if (a[i] != b[i]) return Integer.compareUnsigned(a[i], b[i]); if (i >= 0) {
return Integer.compareUnsigned(a[i], b[i]);
} }
return a.length - b.length; return a.length - b.length;
@ -6771,11 +6717,11 @@ public class Arrays {
int aLength = aToIndex - aFromIndex; int aLength = aToIndex - aFromIndex;
int bLength = bToIndex - bFromIndex; int bLength = bToIndex - bFromIndex;
int length = Math.min(aLength, bLength); int i = ArraysSupport.mismatch(a, aFromIndex,
for (int i = 0; i < length; i++) { b, bFromIndex,
int va = a[aFromIndex++]; Math.min(aLength, bLength));
int vb = b[bFromIndex++]; if (i >= 0) {
if (va != vb) return Integer.compareUnsigned(va, vb); return Integer.compareUnsigned(a[aFromIndex + i], b[bFromIndex + i]);
} }
return aLength - bLength; return aLength - bLength;
@ -6830,9 +6776,10 @@ public class Arrays {
if (a == null || b == null) if (a == null || b == null)
return a == null ? -1 : 1; return a == null ? -1 : 1;
int length = Math.min(a.length, b.length); int i = ArraysSupport.mismatch(a, b,
for (int i = 0; i < length; i++) { Math.min(a.length, b.length));
if (a[i] != b[i]) return Long.compare(a[i], b[i]); if (i >= 0) {
return Long.compare(a[i], b[i]);
} }
return a.length - b.length; return a.length - b.length;
@ -6905,11 +6852,11 @@ public class Arrays {
int aLength = aToIndex - aFromIndex; int aLength = aToIndex - aFromIndex;
int bLength = bToIndex - bFromIndex; int bLength = bToIndex - bFromIndex;
int length = Math.min(aLength, bLength); int i = ArraysSupport.mismatch(a, aFromIndex,
for (int i = 0; i < length; i++) { b, bFromIndex,
long va = a[aFromIndex++]; Math.min(aLength, bLength));
long vb = b[bFromIndex++]; if (i >= 0) {
if (va != vb) return Long.compare(va, vb); return Long.compare(a[aFromIndex + i], b[bFromIndex + i]);
} }
return aLength - bLength; return aLength - bLength;
@ -6957,9 +6904,10 @@ public class Arrays {
if (a == null || b == null) if (a == null || b == null)
return a == null ? -1 : 1; return a == null ? -1 : 1;
int length = Math.min(a.length, b.length); int i = ArraysSupport.mismatch(a, b,
for (int i = 0; i < length; i++) { Math.min(a.length, b.length));
if (a[i] != b[i]) return Long.compareUnsigned(a[i], b[i]); if (i >= 0) {
return Long.compareUnsigned(a[i], b[i]);
} }
return a.length - b.length; return a.length - b.length;
@ -7023,11 +6971,11 @@ public class Arrays {
int aLength = aToIndex - aFromIndex; int aLength = aToIndex - aFromIndex;
int bLength = bToIndex - bFromIndex; int bLength = bToIndex - bFromIndex;
int length = Math.min(aLength, bLength); int i = ArraysSupport.mismatch(a, aFromIndex,
for (int i = 0; i < length; i++) { b, bFromIndex,
long va = a[aFromIndex++]; Math.min(aLength, bLength));
long vb = b[bFromIndex++]; if (i >= 0) {
if (va != vb) return Long.compareUnsigned(va, vb); return Long.compareUnsigned(a[aFromIndex + i], b[bFromIndex + i]);
} }
return aLength - bLength; return aLength - bLength;
@ -7082,13 +7030,10 @@ public class Arrays {
if (a == null || b == null) if (a == null || b == null)
return a == null ? -1 : 1; return a == null ? -1 : 1;
int length = Math.min(a.length, b.length); int i = ArraysSupport.mismatch(a, b,
for (int i = 0; i < length; i++) { Math.min(a.length, b.length));
float va = a[i], vb = b[i]; if (i >= 0) {
if (Float.floatToRawIntBits(va) != Float.floatToRawIntBits(vb)) { return Float.compare(a[i], b[i]);
int c = Float.compare(va, vb);
if (c != 0) return c;
}
} }
return a.length - b.length; return a.length - b.length;
@ -7161,13 +7106,11 @@ public class Arrays {
int aLength = aToIndex - aFromIndex; int aLength = aToIndex - aFromIndex;
int bLength = bToIndex - bFromIndex; int bLength = bToIndex - bFromIndex;
int length = Math.min(aLength, bLength); int i = ArraysSupport.mismatch(a, aFromIndex,
for (int i = 0; i < length; i++) { b, bFromIndex,
float va = a[aFromIndex++], vb = b[bFromIndex++]; Math.min(aLength, bLength));
if (Float.floatToRawIntBits(va) != Float.floatToRawIntBits(vb)) { if (i >= 0) {
int c = Float.compare(va, vb); return Float.compare(a[aFromIndex + i], b[bFromIndex + i]);
if (c != 0) return c;
}
} }
return aLength - bLength; return aLength - bLength;
@ -7222,13 +7165,10 @@ public class Arrays {
if (a == null || b == null) if (a == null || b == null)
return a == null ? -1 : 1; return a == null ? -1 : 1;
int length = Math.min(a.length, b.length); int i = ArraysSupport.mismatch(a, b,
for (int i = 0; i < length; i++) { Math.min(a.length, b.length));
double va = a[i], vb = b[i]; if (i >= 0) {
if (Double.doubleToRawLongBits(va) != Double.doubleToRawLongBits(vb)) { return Double.compare(a[i], b[i]);
int c = Double.compare(va, vb);
if (c != 0) return c;
}
} }
return a.length - b.length; return a.length - b.length;
@ -7301,13 +7241,11 @@ public class Arrays {
int aLength = aToIndex - aFromIndex; int aLength = aToIndex - aFromIndex;
int bLength = bToIndex - bFromIndex; int bLength = bToIndex - bFromIndex;
int length = Math.min(aLength, bLength); int i = ArraysSupport.mismatch(a, aFromIndex,
for (int i = 0; i < length; i++) { b, bFromIndex,
double va = a[aFromIndex++], vb = b[bFromIndex++]; Math.min(aLength, bLength));
if (Double.doubleToRawLongBits(va) != Double.doubleToRawLongBits(vb)) { if (i >= 0) {
int c = Double.compare(va, vb); return Double.compare(a[aFromIndex + i], b[bFromIndex + i]);
if (c != 0) return c;
}
} }
return aLength - bLength; return aLength - bLength;
@ -7673,11 +7611,8 @@ public class Arrays {
if (a == b) if (a == b)
return -1; return -1;
for (int i = 0; i < length; i++) { int i = ArraysSupport.mismatch(a, b, length);
if (a[i] != b[i]) return i; return (i < 0 && a.length != b.length) ? length : i;
}
return a.length != b.length ? length : -1;
} }
/** /**
@ -7749,11 +7684,10 @@ public class Arrays {
int aLength = aToIndex - aFromIndex; int aLength = aToIndex - aFromIndex;
int bLength = bToIndex - bFromIndex; int bLength = bToIndex - bFromIndex;
int length = Math.min(aLength, bLength); int length = Math.min(aLength, bLength);
for (int i = 0; i < length; i++) { int i = ArraysSupport.mismatch(a, aFromIndex,
if (a[aFromIndex++] != b[bFromIndex++]) return i; b, bFromIndex,
} length);
return (i < 0 && aLength != bLength) ? length : i;
return aLength != bLength ? length : -1;
} }
// Mismatch byte // Mismatch byte
@ -7804,11 +7738,8 @@ public class Arrays {
if (a == b) if (a == b)
return -1; return -1;
for (int i = 0; i < length; i++) { int i = ArraysSupport.mismatch(a, b, length);
if (a[i] != b[i]) return i; return (i < 0 && a.length != b.length) ? length : i;
}
return a.length != b.length ? length : -1;
} }
/** /**
@ -7880,11 +7811,10 @@ public class Arrays {
int aLength = aToIndex - aFromIndex; int aLength = aToIndex - aFromIndex;
int bLength = bToIndex - bFromIndex; int bLength = bToIndex - bFromIndex;
int length = Math.min(aLength, bLength); int length = Math.min(aLength, bLength);
for (int i = 0; i < length; i++) { int i = ArraysSupport.mismatch(a, aFromIndex,
if (a[aFromIndex++] != b[bFromIndex++]) return i; b, bFromIndex,
} length);
return (i < 0 && aLength != bLength) ? length : i;
return aLength != bLength ? length : -1;
} }
// Mismatch char // Mismatch char
@ -7935,11 +7865,8 @@ public class Arrays {
if (a == b) if (a == b)
return -1; return -1;
for (int i = 0; i < length; i++) { int i = ArraysSupport.mismatch(a, b, length);
if (a[i] != b[i]) return i; return (i < 0 && a.length != b.length) ? length : i;
}
return a.length != b.length ? length : -1;
} }
/** /**
@ -8011,11 +7938,10 @@ public class Arrays {
int aLength = aToIndex - aFromIndex; int aLength = aToIndex - aFromIndex;
int bLength = bToIndex - bFromIndex; int bLength = bToIndex - bFromIndex;
int length = Math.min(aLength, bLength); int length = Math.min(aLength, bLength);
for (int i = 0; i < length; i++) { int i = ArraysSupport.mismatch(a, aFromIndex,
if (a[aFromIndex++] != b[bFromIndex++]) return i; b, bFromIndex,
} length);
return (i < 0 && aLength != bLength) ? length : i;
return aLength != bLength ? length : -1;
} }
// Mismatch short // Mismatch short
@ -8066,11 +7992,8 @@ public class Arrays {
if (a == b) if (a == b)
return -1; return -1;
for (int i = 0; i < length; i++) { int i = ArraysSupport.mismatch(a, b, length);
if (a[i] != b[i]) return i; return (i < 0 && a.length != b.length) ? length : i;
}
return a.length != b.length ? length : -1;
} }
/** /**
@ -8142,11 +8065,10 @@ public class Arrays {
int aLength = aToIndex - aFromIndex; int aLength = aToIndex - aFromIndex;
int bLength = bToIndex - bFromIndex; int bLength = bToIndex - bFromIndex;
int length = Math.min(aLength, bLength); int length = Math.min(aLength, bLength);
for (int i = 0; i < length; i++) { int i = ArraysSupport.mismatch(a, aFromIndex,
if (a[aFromIndex++] != b[bFromIndex++]) return i; b, bFromIndex,
} length);
return (i < 0 && aLength != bLength) ? length : i;
return aLength != bLength ? length : -1;
} }
// Mismatch int // Mismatch int
@ -8197,11 +8119,8 @@ public class Arrays {
if (a == b) if (a == b)
return -1; return -1;
for (int i = 0; i < length; i++) { int i = ArraysSupport.mismatch(a, b, length);
if (a[i] != b[i]) return i; return (i < 0 && a.length != b.length) ? length : i;
}
return a.length != b.length ? length : -1;
} }
/** /**
@ -8273,11 +8192,10 @@ public class Arrays {
int aLength = aToIndex - aFromIndex; int aLength = aToIndex - aFromIndex;
int bLength = bToIndex - bFromIndex; int bLength = bToIndex - bFromIndex;
int length = Math.min(aLength, bLength); int length = Math.min(aLength, bLength);
for (int i = 0; i < length; i++) { int i = ArraysSupport.mismatch(a, aFromIndex,
if (a[aFromIndex++] != b[bFromIndex++]) return i; b, bFromIndex,
} length);
return (i < 0 && aLength != bLength) ? length : i;
return aLength != bLength ? length : -1;
} }
// Mismatch long // Mismatch long
@ -8328,11 +8246,8 @@ public class Arrays {
if (a == b) if (a == b)
return -1; return -1;
for (int i = 0; i < length; i++) { int i = ArraysSupport.mismatch(a, b, length);
if (a[i] != b[i]) return i; return (i < 0 && a.length != b.length) ? length : i;
}
return a.length != b.length ? length : -1;
} }
/** /**
@ -8404,11 +8319,10 @@ public class Arrays {
int aLength = aToIndex - aFromIndex; int aLength = aToIndex - aFromIndex;
int bLength = bToIndex - bFromIndex; int bLength = bToIndex - bFromIndex;
int length = Math.min(aLength, bLength); int length = Math.min(aLength, bLength);
for (int i = 0; i < length; i++) { int i = ArraysSupport.mismatch(a, aFromIndex,
if (a[aFromIndex++] != b[bFromIndex++]) return i; b, bFromIndex,
} length);
return (i < 0 && aLength != bLength) ? length : i;
return aLength != bLength ? length : -1;
} }
// Mismatch float // Mismatch float
@ -8459,14 +8373,8 @@ public class Arrays {
if (a == b) if (a == b)
return -1; return -1;
for (int i = 0; i < length; i++) { int i = ArraysSupport.mismatch(a, b, length);
float va = a[i], vb = b[i]; return (i < 0 && a.length != b.length) ? length : i;
if (Float.floatToRawIntBits(va) != Float.floatToRawIntBits(vb))
if (!Float.isNaN(va) || !Float.isNaN(vb))
return i;
}
return a.length != b.length ? length : -1;
} }
/** /**
@ -8538,14 +8446,10 @@ public class Arrays {
int aLength = aToIndex - aFromIndex; int aLength = aToIndex - aFromIndex;
int bLength = bToIndex - bFromIndex; int bLength = bToIndex - bFromIndex;
int length = Math.min(aLength, bLength); int length = Math.min(aLength, bLength);
for (int i = 0; i < length; i++) { int i = ArraysSupport.mismatch(a, aFromIndex,
float va = a[aFromIndex++], vb = b[bFromIndex++]; b, bFromIndex,
if (Float.floatToRawIntBits(va) != Float.floatToRawIntBits(vb)) length);
if (!Float.isNaN(va) || !Float.isNaN(vb)) return (i < 0 && aLength != bLength) ? length : i;
return i;
}
return aLength != bLength ? length : -1;
} }
// Mismatch double // Mismatch double
@ -8596,14 +8500,8 @@ public class Arrays {
if (a == b) if (a == b)
return -1; return -1;
for (int i = 0; i < length; i++) { int i = ArraysSupport.mismatch(a, b, length);
double va = a[i], vb = b[i]; return (i < 0 && a.length != b.length) ? length : i;
if (Double.doubleToRawLongBits(va) != Double.doubleToRawLongBits(vb))
if (!Double.isNaN(va) || !Double.isNaN(vb))
return i;
}
return a.length != b.length ? length : -1;
} }
/** /**
@ -8675,14 +8573,10 @@ public class Arrays {
int aLength = aToIndex - aFromIndex; int aLength = aToIndex - aFromIndex;
int bLength = bToIndex - bFromIndex; int bLength = bToIndex - bFromIndex;
int length = Math.min(aLength, bLength); int length = Math.min(aLength, bLength);
for (int i = 0; i < length; i++) { int i = ArraysSupport.mismatch(a, aFromIndex,
double va = a[aFromIndex++], vb = b[bFromIndex++]; b, bFromIndex,
if (Double.doubleToRawLongBits(va) != Double.doubleToRawLongBits(vb)) length);
if (!Double.isNaN(va) || !Double.isNaN(vb)) return (i < 0 && aLength != bLength) ? length : i;
return i;
}
return aLength != bLength ? length : -1;
} }
// Mismatch objects // Mismatch objects

545
jdk/src/java.base/share/classes/java/util/ArraysSupport.java Normal file
View File

@ -0,0 +1,545 @@
/*
* Copyright (c) 2015, 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. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* 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.
*/
package java.util;
import jdk.internal.HotSpotIntrinsicCandidate;
import jdk.internal.misc.Unsafe;
/**
* Utility methods to find a mismatch between two primitive arrays.
*
* <p>Array equality and lexicographical comparison can be built on top of
* array mismatch functionality.
*
* <p>The mismatch method implementation, {@link #vectorizedMismatch}, leverages
* vector-based techniques to access and compare the contents of two arrays.
* The Java implementation uses {@code Unsafe.getLongUnaligned} to access the
* content of an array, thus access is supported on platforms that do not
* support unaligned access. For a byte[] array, 8 bytes (64 bits) can be
* accessed and compared as a unit rather than individually, which increases
* the performance when the method is compiled by the HotSpot VM. On supported
* platforms the mismatch implementation is intrinsified to leverage SIMD
* instructions. So for a byte[] array, 16 bytes (128 bits), 32 bytes
* (256 bits), and perhaps in the future even 64 bytes (512 bits), platform
* permitting, can be accessed and compared as a unit, which further increases
* the performance over the Java implementation.
*
* <p>None of the mismatch methods perform array bounds checks. It is the
* responsibility of the caller (direct or otherwise) to perform such checks
* before calling this method.
*/
class ArraysSupport {
static final Unsafe U = Unsafe.getUnsafe();
private static final boolean BIG_ENDIAN = U.isBigEndian();
private static final int LOG2_ARRAY_BOOLEAN_INDEX_SCALE = exactLog2(Unsafe.ARRAY_BOOLEAN_INDEX_SCALE);
private static final int LOG2_ARRAY_BYTE_INDEX_SCALE = exactLog2(Unsafe.ARRAY_BYTE_INDEX_SCALE);
private static final int LOG2_ARRAY_CHAR_INDEX_SCALE = exactLog2(Unsafe.ARRAY_CHAR_INDEX_SCALE);
private static final int LOG2_ARRAY_SHORT_INDEX_SCALE = exactLog2(Unsafe.ARRAY_SHORT_INDEX_SCALE);
private static final int LOG2_ARRAY_INT_INDEX_SCALE = exactLog2(Unsafe.ARRAY_INT_INDEX_SCALE);
private static final int LOG2_ARRAY_LONG_INDEX_SCALE = exactLog2(Unsafe.ARRAY_LONG_INDEX_SCALE);
private static final int LOG2_ARRAY_FLOAT_INDEX_SCALE = exactLog2(Unsafe.ARRAY_FLOAT_INDEX_SCALE);
private static final int LOG2_ARRAY_DOUBLE_INDEX_SCALE = exactLog2(Unsafe.ARRAY_DOUBLE_INDEX_SCALE);
private static final int LOG2_BYTE_BIT_SIZE = exactLog2(Byte.SIZE);
private static int exactLog2(int scale) {
if ((scale & (scale - 1)) != 0)
throw new Error("data type scale not a power of two");
return Integer.numberOfTrailingZeros(scale);
}
private ArraysSupport() {}
/**
* Find the relative index of the first mismatching pair of elements in two
* primitive arrays of the same component type. Pairs of elements will be
* tested in order relative to given offsets into both arrays.
*
* <p>This method does not perform type checks or bounds checks. It is the
* responsibility of the caller to perform such checks before calling this
* method.
*
* <p>The given offsets, in bytes, need not be aligned according to the
* given log<sub>2</sub> size the array elements. More specifically, an
* offset modulus the size need not be zero.
*
* @param a the first array to be tested for mismatch, or {@code null} for
* direct memory access
* @param aOffset the relative offset, in bytes, from the base address of
* the first array to test from, otherwise if the first array is
* {@code null}, an absolute address pointing to the first element to test.
* @param b the second array to be tested for mismatch, or {@code null} for
* direct memory access
* @param bOffset the relative offset, in bytes, from the base address of
* the second array to test from, otherwise if the second array is
* {@code null}, an absolute address pointing to the first element to test.
* @param length the number of array elements to test
* @param log2ArrayIndexScale log<sub>2</sub> of the array index scale, that
* corresponds to the size, in bytes, of an array element.
* @return if a mismatch is found a relative index, between 0 (inclusive)
* and {@code length} (exclusive), of the first mismatching pair of elements
* in the two arrays. Otherwise, if a mismatch is not found the bitwise
* compliment of the number of remaining pairs of elements to be checked in
* the tail of the two arrays.
*/
@HotSpotIntrinsicCandidate
static int vectorizedMismatch(Object a, long aOffset,
Object b, long bOffset,
int length,
int log2ArrayIndexScale) {
// assert a.getClass().isArray();
// assert b.getClass().isArray();
// assert 0 <= length <= sizeOf(a)
// assert 0 <= length <= sizeOf(b)
// assert 0 <= log2ArrayIndexScale <= 3
int log2ValuesPerWidth = LOG2_ARRAY_LONG_INDEX_SCALE - log2ArrayIndexScale;
int wi = 0;
for (; wi < length >> log2ValuesPerWidth; wi++) {
long bi = ((long) wi) << LOG2_ARRAY_LONG_INDEX_SCALE;
long av = U.getLongUnaligned(a, aOffset + bi);
long bv = U.getLongUnaligned(b, bOffset + bi);
if (av != bv) {
long x = av ^ bv;
int o = BIG_ENDIAN
? Long.numberOfLeadingZeros(x) >> (LOG2_BYTE_BIT_SIZE + log2ArrayIndexScale)
: Long.numberOfTrailingZeros(x) >> (LOG2_BYTE_BIT_SIZE + log2ArrayIndexScale);
return (wi << log2ValuesPerWidth) + o;
}
}
// Calculate the tail of remaining elements to check
int tail = length - (wi << log2ValuesPerWidth);
if (log2ArrayIndexScale < LOG2_ARRAY_INT_INDEX_SCALE) {
int wordTail = 1 << (LOG2_ARRAY_INT_INDEX_SCALE - log2ArrayIndexScale);
// Handle 4 bytes or 2 chars in the tail using int width
if (tail >= wordTail) {
long bi = ((long) wi) << LOG2_ARRAY_LONG_INDEX_SCALE;
int av = U.getIntUnaligned(a, aOffset + bi);
int bv = U.getIntUnaligned(b, bOffset + bi);
if (av != bv) {
int x = av ^ bv;
int o = BIG_ENDIAN
? Integer.numberOfLeadingZeros(x) >> (LOG2_BYTE_BIT_SIZE + log2ArrayIndexScale)
: Integer.numberOfTrailingZeros(x) >> (LOG2_BYTE_BIT_SIZE + log2ArrayIndexScale);
return (wi << log2ValuesPerWidth) + o;
}
tail -= wordTail;
}
return ~tail;
}
else {
return ~tail;
}
}
// Booleans
// Each boolean element takes up one byte
static int mismatch(boolean[] a,
boolean[] b,
int length) {
int i = 0;
if (length > 7) {
i = vectorizedMismatch(
a, Unsafe.ARRAY_BOOLEAN_BASE_OFFSET,
b, Unsafe.ARRAY_BOOLEAN_BASE_OFFSET,
length, LOG2_ARRAY_BOOLEAN_INDEX_SCALE);
if (i >= 0)
return i;
i = length - ~i;
}
for (; i < length; i++) {
if (a[i] != b[i])
return i;
}
return -1;
}
static int mismatch(boolean[] a, int aFromIndex,
boolean[] b, int bFromIndex,
int length) {
int i = 0;
if (length > 7) {
int aOffset = Unsafe.ARRAY_BOOLEAN_BASE_OFFSET + aFromIndex;
int bOffset = Unsafe.ARRAY_BOOLEAN_BASE_OFFSET + bFromIndex;
i = vectorizedMismatch(
a, aOffset,
b, bOffset,
length, LOG2_ARRAY_BOOLEAN_INDEX_SCALE);
if (i >= 0)
return i;
i = length - ~i;
}
for (; i < length; i++) {
if (a[aFromIndex + i] != b[bFromIndex + i])
return i;
}
return -1;
}
// Bytes
/**
* Find the index of a mismatch between two arrays.
*
* <p>This method does not perform bounds checks. It is the responsibility
* of the caller to perform such bounds checks before calling this method.
*
* @param a the first array to be tested for a mismatch
* @param b the second array to be tested for a mismatch
* @param length the number of bytes from each array to check
* @return the index of a mismatch between the two arrays, otherwise -1 if
* no mismatch. The index will be within the range of (inclusive) 0 to
* (exclusive) the smaller of the two array lengths.
*/
static int mismatch(byte[] a,
byte[] b,
int length) {
// ISSUE: defer to index receiving methods if performance is good
// assert length <= a.length
// assert length <= b.length
int i = 0;
if (length > 7) {
i = vectorizedMismatch(
a, Unsafe.ARRAY_BYTE_BASE_OFFSET,
b, Unsafe.ARRAY_BYTE_BASE_OFFSET,
length, LOG2_ARRAY_BYTE_INDEX_SCALE);
if (i >= 0)
return i;
// Align to tail
i = length - ~i;
// assert i >= 0 && i <= 7;
}
// Tail < 8 bytes
for (; i < length; i++) {
if (a[i] != b[i])
return i;
}
return -1;
}
/**
* Find the relative index of a mismatch between two arrays starting from
* given indexes.
*
* <p>This method does not perform bounds checks. It is the responsibility
* of the caller to perform such bounds checks before calling this method.
*
* @param a the first array to be tested for a mismatch
* @param aFromIndex the index of the first element (inclusive) in the first
* array to be compared
* @param b the second array to be tested for a mismatch
* @param bFromIndex the index of the first element (inclusive) in the
* second array to be compared
* @param length the number of bytes from each array to check
* @return the relative index of a mismatch between the two arrays,
* otherwise -1 if no mismatch. The index will be within the range of
* (inclusive) 0 to (exclusive) the smaller of the two array bounds.
*/
static int mismatch(byte[] a, int aFromIndex,
byte[] b, int bFromIndex,
int length) {
// assert 0 <= aFromIndex < a.length
// assert 0 <= aFromIndex + length <= a.length
// assert 0 <= bFromIndex < b.length
// assert 0 <= bFromIndex + length <= b.length
// assert length >= 0
int i = 0;
if (length > 7) {
int aOffset = Unsafe.ARRAY_BYTE_BASE_OFFSET + aFromIndex;
int bOffset = Unsafe.ARRAY_BYTE_BASE_OFFSET + bFromIndex;
i = vectorizedMismatch(
a, aOffset,
b, bOffset,
length, LOG2_ARRAY_BYTE_INDEX_SCALE);
if (i >= 0)
return i;
i = length - ~i;
}
for (; i < length; i++) {
if (a[aFromIndex + i] != b[bFromIndex + i])
return i;
}
return -1;
}
// Chars
static int mismatch(char[] a,
char[] b,
int length) {
int i = 0;
if (length > 3) {
i = vectorizedMismatch(
a, Unsafe.ARRAY_CHAR_BASE_OFFSET,
b, Unsafe.ARRAY_CHAR_BASE_OFFSET,
length, LOG2_ARRAY_CHAR_INDEX_SCALE);
if (i >= 0)
return i;
i = length - ~i;
}
for (; i < length; i++) {
if (a[i] != b[i])
return i;
}
return -1;
}
static int mismatch(char[] a, int aFromIndex,
char[] b, int bFromIndex,
int length) {
int i = 0;
if (length > 3) {
int aOffset = Unsafe.ARRAY_CHAR_BASE_OFFSET + (aFromIndex << LOG2_ARRAY_CHAR_INDEX_SCALE);
int bOffset = Unsafe.ARRAY_CHAR_BASE_OFFSET + (bFromIndex << LOG2_ARRAY_CHAR_INDEX_SCALE);
i = vectorizedMismatch(
a, aOffset,
b, bOffset,
length, LOG2_ARRAY_CHAR_INDEX_SCALE);
if (i >= 0)
return i;
i = length - ~i;
}
for (; i < length; i++) {
if (a[aFromIndex + i] != b[bFromIndex + i])
return i;
}
return -1;
}
// Shorts
static int mismatch(short[] a,
short[] b,
int length) {
int i = 0;
if (length > 3) {
i = vectorizedMismatch(
a, Unsafe.ARRAY_SHORT_BASE_OFFSET,
b, Unsafe.ARRAY_SHORT_BASE_OFFSET,
length, LOG2_ARRAY_SHORT_INDEX_SCALE);
if (i >= 0)
return i;
i = length - ~i;
}
for (; i < length; i++) {
if (a[i] != b[i])
return i;
}
return -1;
}
static int mismatch(short[] a, int aFromIndex,
short[] b, int bFromIndex,
int length) {
int i = 0;
if (length > 3) {
int aOffset = Unsafe.ARRAY_SHORT_BASE_OFFSET + (aFromIndex << LOG2_ARRAY_SHORT_INDEX_SCALE);
int bOffset = Unsafe.ARRAY_SHORT_BASE_OFFSET + (bFromIndex << LOG2_ARRAY_SHORT_INDEX_SCALE);
i = vectorizedMismatch(
a, aOffset,
b, bOffset,
length, LOG2_ARRAY_SHORT_INDEX_SCALE);
if (i >= 0)
return i;
i = length - ~i;
}
for (; i < length; i++) {
if (a[aFromIndex + i] != b[bFromIndex + i])
return i;
}
return -1;
}
// Ints
static int mismatch(int[] a,
int[] b,
int length) {
int i = 0;
if (length > 1) {
i = vectorizedMismatch(
a, Unsafe.ARRAY_INT_BASE_OFFSET,
b, Unsafe.ARRAY_INT_BASE_OFFSET,
length, LOG2_ARRAY_INT_INDEX_SCALE);
if (i >= 0)
return i;
i = length - ~i;
}
for (; i < length; i++) {
if (a[i] != b[i])
return i;
}
return -1;
}
static int mismatch(int[] a, int aFromIndex,
int[] b, int bFromIndex,
int length) {
int i = 0;
if (length > 1) {
int aOffset = Unsafe.ARRAY_INT_BASE_OFFSET + (aFromIndex << LOG2_ARRAY_INT_INDEX_SCALE);
int bOffset = Unsafe.ARRAY_INT_BASE_OFFSET + (bFromIndex << LOG2_ARRAY_INT_INDEX_SCALE);
i = vectorizedMismatch(
a, aOffset,
b, bOffset,
length, LOG2_ARRAY_INT_INDEX_SCALE);
if (i >= 0)
return i;
i = length - ~i;
}
for (; i < length; i++) {
if (a[aFromIndex + i] != b[bFromIndex + i])
return i;
}
return -1;
}
// Floats
static int mismatch(float[] a,
float[] b,
int length) {
return mismatch(a, 0, b, 0, length);
}
static int mismatch(float[] a, int aFromIndex,
float[] b, int bFromIndex,
int length) {
int i = 0;
if (length > 1) {
int aOffset = Unsafe.ARRAY_FLOAT_BASE_OFFSET + (aFromIndex << LOG2_ARRAY_FLOAT_INDEX_SCALE);
int bOffset = Unsafe.ARRAY_FLOAT_BASE_OFFSET + (bFromIndex << LOG2_ARRAY_FLOAT_INDEX_SCALE);
i = vectorizedMismatch(
a, aOffset,
b, bOffset,
length, LOG2_ARRAY_FLOAT_INDEX_SCALE);
// Mismatched
if (i >= 0) {
// Check if mismatch is not associated with two NaN values
if (!Float.isNaN(a[aFromIndex + i]) || !Float.isNaN(b[bFromIndex + i]))
return i;
// Mismatch on two different NaN values that are normalized to match
// Fall back to slow mechanism
// ISSUE: Consider looping over vectorizedMismatch adjusting ranges
// However, requires that returned value be relative to input ranges
i++;
}
// Matched
else {
i = length - ~i;
}
}
for (; i < length; i++) {
if (Float.floatToIntBits(a[aFromIndex + i]) != Float.floatToIntBits(b[bFromIndex + i]))
return i;
}
return -1;
}
// 64 bit sizes
// Long
static int mismatch(long[] a,
long[] b,
int length) {
if (length == 0) {
return -1;
}
int i = vectorizedMismatch(
a, Unsafe.ARRAY_LONG_BASE_OFFSET,
b, Unsafe.ARRAY_LONG_BASE_OFFSET,
length, LOG2_ARRAY_LONG_INDEX_SCALE);
return i >= 0 ? i : -1;
}
static int mismatch(long[] a, int aFromIndex,
long[] b, int bFromIndex,
int length) {
if (length == 0) {
return -1;
}
int aOffset = Unsafe.ARRAY_LONG_BASE_OFFSET + (aFromIndex << LOG2_ARRAY_LONG_INDEX_SCALE);
int bOffset = Unsafe.ARRAY_LONG_BASE_OFFSET + (bFromIndex << LOG2_ARRAY_LONG_INDEX_SCALE);
int i = vectorizedMismatch(
a, aOffset,
b, bOffset,
length, LOG2_ARRAY_LONG_INDEX_SCALE);
return i >= 0 ? i : -1;
}
// Double
static int mismatch(double[] a,
double[] b,
int length) {
return mismatch(a, 0, b, 0, length);
}
static int mismatch(double[] a, int aFromIndex,
double[] b, int bFromIndex,
int length) {
if (length == 0) {
return -1;
}
int aOffset = Unsafe.ARRAY_DOUBLE_BASE_OFFSET + (aFromIndex << LOG2_ARRAY_DOUBLE_INDEX_SCALE);
int bOffset = Unsafe.ARRAY_DOUBLE_BASE_OFFSET + (bFromIndex << LOG2_ARRAY_DOUBLE_INDEX_SCALE);
int i = vectorizedMismatch(
a, aOffset,
b, bOffset,
length, LOG2_ARRAY_DOUBLE_INDEX_SCALE);
if (i >= 0) {
// Check if mismatch is not associated with two NaN values
if (!Double.isNaN(a[aFromIndex + i]) || !Double.isNaN(b[bFromIndex + i]))
return i;
// Mismatch on two different NaN values that are normalized to match
// Fall back to slow mechanism
// ISSUE: Consider looping over vectorizedMismatch adjusting ranges
// However, requires that returned value be relative to input ranges
i++;
for (; i < length; i++) {
if (Double.doubleToLongBits(a[aFromIndex + i]) != Double.doubleToLongBits(b[bFromIndex + i]))
return i;
}
}
return -1;
}
}

80
jdk/src/java.base/share/classes/jdk/Exported.java
View File

@ -1,80 +0,0 @@
/*
* Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* 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.
*/
package jdk;
import java.lang.annotation.*;
/**
* Indicates whether or not a JDK specific type or package is an
* exported part of the JDK suitable for use outside of the JDK
* implementation itself.
*
* This annotation should only be applied to types and packages
* <em>outside</em> of the Java SE namespaces of {@code java.*} and
* {@code javax.*} packages. For example, certain portions of {@code
* com.sun.*} are official parts of the JDK meant to be generally
* usable while other portions of {@code com.sun.*} are not. This
* annotation type allows those portions to be easily and
* programmatically distinguished.
*
* <p>If in one release a type or package is
* <code>@Exported(true)</code>, in a subsequent major release such a
* type or package can transition to <code>@Exported(false)</code>.
*
* <p>If a type or package is <code>@Exported(false)</code> in a
* release, it may be removed in a subsequent major release.
*
* <p>If a top-level type has an <code>@Exported</code> annotation,
* any nested member types with the top-level type should have an
* <code>@Exported</code> annotation with the same value.
*
* (In exceptional cases, if a nested type is going to be removed
* before its enclosing type, the nested type's could be
* <code>@Exported(false)</code> while its enclosing type was
* <code>@Exported(true)</code>.)
*
* Likewise, if a package has an <code>@Exported</code> annotation,
* top-level types within that package should also have an
* <code>@Exported</code> annotation.
*
* Sometimes a top-level type may have a different
* <code>@Exported</code> value than its package.
*
* @since 1.8
*/
@Documented
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.TYPE, ElementType.PACKAGE})
@Exported
public @interface Exported {
/**
* Whether or not the annotated type or package is an exported
* part of the JDK.
* @return whether or not the annotated type or package is an exported
* part of the JDK
*/
boolean value() default true;
}

2
jdk/src/java.base/share/classes/jdk/internal/logger/BootstrapLogger.java
View File

@ -48,7 +48,7 @@ import java.util.concurrent.ThreadFactory;
import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import sun.misc.InnocuousThread; import sun.misc.InnocuousThread;
import sun.misc.VM; import jdk.internal.misc.VM;
import sun.util.logging.PlatformLogger; import sun.util.logging.PlatformLogger;
import jdk.internal.logger.LazyLoggers.LazyLoggerAccessor; import jdk.internal.logger.LazyLoggers.LazyLoggerAccessor;

2
jdk/src/java.base/share/classes/jdk/internal/logger/LazyLoggers.java
View File

@ -32,7 +32,7 @@ import java.lang.System.LoggerFinder;
import java.lang.System.Logger; import java.lang.System.Logger;
import java.lang.ref.WeakReference; import java.lang.ref.WeakReference;
import java.util.Objects; import java.util.Objects;
import sun.misc.VM; import jdk.internal.misc.VM;
import sun.util.logging.PlatformLogger; import sun.util.logging.PlatformLogger;
/** /**

788
jdk/src/java.base/share/classes/jdk/internal/misc/CleanerImpl.java
View File

@ -1,788 +0,0 @@
/*
* Copyright (c) 2015, 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. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* 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.
*/
package jdk.internal.misc;
import java.lang.ref.Cleaner;
import java.lang.ref.Cleaner.Cleanable;
import java.lang.ref.PhantomReference;
import java.lang.ref.Reference;
import java.lang.ref.ReferenceQueue;
import java.lang.ref.SoftReference;
import java.lang.ref.WeakReference;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.Objects;
import java.util.concurrent.ThreadFactory;
import java.util.function.Function;
import sun.misc.InnocuousThread;
/**
* CleanerImpl manages a set of object references and corresponding cleaning actions.
* CleanerImpl provides the functionality of {@link java.lang.ref.Cleaner}.
*/
public final class CleanerImpl implements Runnable {
/**
* An object to access the CleanerImpl from a Cleaner; set by Cleaner init.
*/
private static Function<Cleaner, CleanerImpl> cleanerImplAccess = null;
/**
* Heads of a CleanableList for each reference type.
*/
final PhantomCleanable<?> phantomCleanableList;
final WeakCleanable<?> weakCleanableList;
final SoftCleanable<?> softCleanableList;
// The ReferenceQueue of pending cleaning actions
final ReferenceQueue<Object> queue;
/**
* Called by Cleaner static initialization to provide the function
* to map from Cleaner to CleanerImpl.
* @param access a function to map from Cleaner to CleanerImpl
*/
public static void setCleanerImplAccess(Function<Cleaner, CleanerImpl> access) {
if (cleanerImplAccess == null) {
cleanerImplAccess = access;
}
}
/**
* Called to get the CleanerImpl for a Cleaner.
* @param cleaner the cleaner
* @return the corresponding CleanerImpl
*/
private static CleanerImpl getCleanerImpl(Cleaner cleaner) {
return cleanerImplAccess.apply(cleaner);
}
/**
* Constructor for CleanerImpl.
*/
public CleanerImpl() {
queue = new ReferenceQueue<>();
phantomCleanableList = new PhantomCleanableRef(this);
weakCleanableList = new WeakCleanableRef(this);
softCleanableList = new SoftCleanableRef(this);
}
/**
* Starts the Cleaner implementation.
* When started waits for Cleanables to be queued.
* @param service the cleaner
* @param threadFactory the thread factory
*/
public void start(Cleaner service, ThreadFactory threadFactory) {
// schedule a nop cleaning action for the service, so the associated thread
// will continue to run at least until the service is reclaimable.
new PhantomCleanableRef(service, service, () -> {});
if (threadFactory == null) {
threadFactory = CleanerImpl.InnocuousThreadFactory.factory();
}
// now that there's at least one cleaning action, for the service,
// we can start the associated thread, which runs until
// all cleaning actions have been run.
Thread thread = threadFactory.newThread(this);
thread.setDaemon(true);
thread.start();
}
/**
* Process queued Cleanables as long as the cleanable lists are not empty.
* A Cleanable is in one of the lists for each Object and for the Cleaner
* itself.
* Terminates when the Cleaner is no longer reachable and
* has been cleaned and there are no more Cleanable instances
* for which the object is reachable.
* <p>
* If the thread is a ManagedLocalsThread, the threadlocals
* are erased before each cleanup
*/
public void run() {
Thread t = Thread.currentThread();
InnocuousThread mlThread = (t instanceof InnocuousThread)
? (InnocuousThread) t
: null;
while (!phantomCleanableList.isListEmpty() ||
!weakCleanableList.isListEmpty() ||
!softCleanableList.isListEmpty()) {
if (mlThread != null) {
// Clear the thread locals
mlThread.eraseThreadLocals();
}
try {
// Wait for a Ref, with a timeout to avoid getting hung
// due to a race with clear/clean
Cleanable ref = (Cleanable) queue.remove(60 * 1000L);
if (ref != null) {
ref.clean();
}
} catch (InterruptedException i) {
continue; // ignore the interruption
} catch (Throwable e) {
// ignore exceptions from the cleanup action
}
}
}
/**
* PhantomCleanable subclasses efficiently encapsulate cleanup state and
* the cleaning action.
* Subclasses implement the abstract {@link #performCleanup()} method
* to provide the cleaning action.
* When constructed, the object reference and the {@link Cleanable Cleanable}
* are registered with the {@link Cleaner}.
* The Cleaner invokes {@link Cleaner.Cleanable#clean() clean} after the
* referent becomes phantom reachable.
*/
public static abstract class PhantomCleanable<T> extends PhantomReference<T>
implements Cleaner.Cleanable {
/**
* Links to previous and next in a doubly-linked list.
*/
PhantomCleanable<?> prev = this, next = this;
/**
* The CleanerImpl for this Cleanable.
*/
private final CleanerImpl cleanerImpl;
/**
* Constructs new {@code PhantomCleanable} with
* {@code non-null referent} and {@code non-null cleaner}.
* The {@code cleaner} is not retained; it is only used to
* register the newly constructed {@link Cleaner.Cleanable Cleanable}.
*
* @param referent the referent to track
* @param cleaner the {@code Cleaner} to register with
*/
public PhantomCleanable(T referent, Cleaner cleaner) {
super(Objects.requireNonNull(referent), getCleanerImpl(cleaner).queue);
this.cleanerImpl = getCleanerImpl(cleaner);
insert();
// TODO: Replace getClass() with ReachabilityFence when it is available
cleaner.getClass();
referent.getClass();
}
/**
* Construct a new root of the list; not inserted.
*/
PhantomCleanable(CleanerImpl cleanerImpl) {
super(null, null);
this.cleanerImpl = cleanerImpl;
}
/**
* Insert this PhantomCleanable after the list head.
*/
private void insert() {
final PhantomCleanable<?> list = cleanerImpl.phantomCleanableList;
synchronized (list) {
prev = list;
next = list.next;
next.prev = this;
list.next = this;
}
}
/**
* Remove this PhantomCleanable from the list.
*
* @return true if Cleanable was removed or false if not because
* it had already been removed before
*/
private boolean remove() {
PhantomCleanable<?> list = cleanerImpl.phantomCleanableList;
synchronized (list) {
if (next != this) {
next.prev = prev;
prev.next = next;
prev = this;
next = this;
return true;
}
return false;
}
}
/**
* Returns true if the list's next reference refers to itself.
*
* @return true if the list is empty
*/
boolean isListEmpty() {
PhantomCleanable<?> list = cleanerImpl.phantomCleanableList;
synchronized (list) {
return list == list.next;
}
}
/**
* Unregister this PhantomCleanable and invoke {@link #performCleanup()},
* ensuring at-most-once semantics.
*/
@Override
public final void clean() {
if (remove()) {
super.clear();
performCleanup();
}
}
/**
* Unregister this PhantomCleanable and clear the reference.
* Due to inherent concurrency, {@link #performCleanup()} may still be invoked.
*/
@Override
public void clear() {
if (remove()) {
super.clear();
}
}
/**
* The {@code performCleanup} abstract method is overridden
* to implement the cleaning logic.
* The {@code performCleanup} method should not be called except
* by the {@link #clean} method which ensures at most once semantics.
*/
protected abstract void performCleanup();
/**
* This method always throws {@link UnsupportedOperationException}.
* Enqueuing details of {@link Cleaner.Cleanable}
* are a private implementation detail.
*
* @throws UnsupportedOperationException always
*/
@Override
public final boolean isEnqueued() {
throw new UnsupportedOperationException("isEnqueued");
}
/**
* This method always throws {@link UnsupportedOperationException}.
* Enqueuing details of {@link Cleaner.Cleanable}
* are a private implementation detail.
*
* @throws UnsupportedOperationException always
*/
@Override
public final boolean enqueue() {
throw new UnsupportedOperationException("enqueue");
}
}
/**
* WeakCleanable subclasses efficiently encapsulate cleanup state and
* the cleaning action.
* Subclasses implement the abstract {@link #performCleanup()} method
* to provide the cleaning action.
* When constructed, the object reference and the {@link Cleanable Cleanable}
* are registered with the {@link Cleaner}.
* The Cleaner invokes {@link Cleaner.Cleanable#clean() clean} after the
* referent becomes weakly reachable.
*/
public static abstract class WeakCleanable<T> extends WeakReference<T>
implements Cleaner.Cleanable {
/**
* Links to previous and next in a doubly-linked list.
*/
WeakCleanable<?> prev = this, next = this;
/**
* The CleanerImpl for this Cleanable.
*/
private final CleanerImpl cleanerImpl;
/**
* Constructs new {@code WeakCleanableReference} with
* {@code non-null referent} and {@code non-null cleaner}.
* The {@code cleaner} is not retained by this reference; it is only used
* to register the newly constructed {@link Cleaner.Cleanable Cleanable}.
*
* @param referent the referent to track
* @param cleaner the {@code Cleaner} to register new reference with
*/
public WeakCleanable(T referent, Cleaner cleaner) {
super(Objects.requireNonNull(referent), getCleanerImpl(cleaner).queue);
cleanerImpl = getCleanerImpl(cleaner);
insert();
// TODO: Replace getClass() with ReachabilityFence when it is available
cleaner.getClass();
referent.getClass();
}
/**
* Construct a new root of the list; not inserted.
*/
WeakCleanable(CleanerImpl cleanerImpl) {
super(null, null);
this.cleanerImpl = cleanerImpl;
}
/**
* Insert this WeakCleanableReference after the list head.
*/
private void insert() {
final WeakCleanable<?> list = cleanerImpl.weakCleanableList;
synchronized (list) {
prev = list;
next = list.next;
next.prev = this;
list.next = this;
}
}
/**
* Remove this WeakCleanableReference from the list.
*
* @return true if Cleanable was removed or false if not because
* it had already been removed before
*/
private boolean remove() {
WeakCleanable<?> list = cleanerImpl.weakCleanableList;
synchronized (list) {
if (next != this) {
next.prev = prev;
prev.next = next;
prev = this;
next = this;
return true;
}
return false;
}
}
/**
* Returns true if the list's next reference refers to itself.
*
* @return true if the list is empty
*/
boolean isListEmpty() {
WeakCleanable<?> list = cleanerImpl.weakCleanableList;
synchronized (list) {
return list == list.next;
}
}
/**
* Unregister this WeakCleanable reference and invoke {@link #performCleanup()},
* ensuring at-most-once semantics.
*/
@Override
public final void clean() {
if (remove()) {
super.clear();
performCleanup();
}
}
/**
* Unregister this WeakCleanable and clear the reference.
* Due to inherent concurrency, {@link #performCleanup()} may still be invoked.
*/
@Override
public void clear() {
if (remove()) {
super.clear();
}
}
/**
* The {@code performCleanup} abstract method is overridden
* to implement the cleaning logic.
* The {@code performCleanup} method should not be called except
* by the {@link #clean} method which ensures at most once semantics.
*/
protected abstract void performCleanup();
/**
* This method always throws {@link UnsupportedOperationException}.
* Enqueuing details of {@link java.lang.ref.Cleaner.Cleanable}
* are a private implementation detail.
*
* @throws UnsupportedOperationException always
*/
@Override
public final boolean isEnqueued() {
throw new UnsupportedOperationException("isEnqueued");
}
/**
* This method always throws {@link UnsupportedOperationException}.
* Enqueuing details of {@link java.lang.ref.Cleaner.Cleanable}
* are a private implementation detail.
*
* @throws UnsupportedOperationException always
*/
@Override
public final boolean enqueue() {
throw new UnsupportedOperationException("enqueue");
}
}
/**
* SoftCleanable subclasses efficiently encapsulate cleanup state and
* the cleaning action.
* Subclasses implement the abstract {@link #performCleanup()} method
* to provide the cleaning action.
* When constructed, the object reference and the {@link Cleanable Cleanable}
* are registered with the {@link Cleaner}.
* The Cleaner invokes {@link Cleaner.Cleanable#clean() clean} after the
* referent becomes softly reachable.
*/
public static abstract class SoftCleanable<T> extends SoftReference<T>
implements Cleaner.Cleanable {
/**
* Links to previous and next in a doubly-linked list.
*/
SoftCleanable<?> prev = this, next = this;
/**
* The CleanerImpl for this Cleanable.
*/
private final CleanerImpl cleanerImpl;
/**
* Constructs new {@code SoftCleanableReference} with
* {@code non-null referent} and {@code non-null cleaner}.
* The {@code cleaner} is not retained by this reference; it is only used
* to register the newly constructed {@link Cleaner.Cleanable Cleanable}.
*
* @param referent the referent to track
* @param cleaner the {@code Cleaner} to register with
*/
public SoftCleanable(T referent, Cleaner cleaner) {
super(Objects.requireNonNull(referent), getCleanerImpl(cleaner).queue);
cleanerImpl = getCleanerImpl(cleaner);
insert();
// TODO: Replace getClass() with ReachabilityFence when it is available
cleaner.getClass();
referent.getClass();
}
/**
* Construct a new root of the list; not inserted.
*/
SoftCleanable(CleanerImpl cleanerImpl) {
super(null, null);
this.cleanerImpl = cleanerImpl;
}
/**
* Insert this SoftCleanableReference after the list head.
*/
private void insert() {
final SoftCleanable<?> list = cleanerImpl.softCleanableList;
synchronized (list) {
prev = list;
next = list.next;
next.prev = this;
list.next = this;
}
}
/**
* Remove this SoftCleanableReference from the list.
*
* @return true if Cleanable was removed or false if not because
* it had already been removed before
*/
private boolean remove() {
SoftCleanable<?> list = cleanerImpl.softCleanableList;
synchronized (list) {
if (next != this) {
next.prev = prev;
prev.next = next;
prev = this;
next = this;
return true;
}
return false;
}
}
/**
* Returns true if the list's next reference refers to itself.
*
* @return true if the list is empty
*/
boolean isListEmpty() {
SoftCleanable<?> list = cleanerImpl.softCleanableList;
synchronized (list) {
return list == list.next;
}
}
/**
* Unregister this SoftCleanable reference and invoke {@link #performCleanup()},
* ensuring at-most-once semantics.
*/
@Override
public final void clean() {
if (remove()) {
super.clear();
performCleanup();
}
}
/**
* Unregister this SoftCleanable and clear the reference.
* Due to inherent concurrency, {@link #performCleanup()} may still be invoked.
*/
@Override
public void clear() {
if (remove()) {
super.clear();
}
}
/**
* The {@code performCleanup} abstract method is overridden
* to implement the cleaning logic.
* The {@code performCleanup} method should not be called except
* by the {@link #clean} method which ensures at most once semantics.
*/
protected abstract void performCleanup();
/**
* This method always throws {@link UnsupportedOperationException}.
* Enqueuing details of {@link Cleaner.Cleanable}
* are a private implementation detail.
*
* @throws UnsupportedOperationException always
*/
@Override
public final boolean isEnqueued() {
throw new UnsupportedOperationException("isEnqueued");
}
/**
* This method always throws {@link UnsupportedOperationException}.
* Enqueuing details of {@link Cleaner.Cleanable}
* are a private implementation detail.
*
* @throws UnsupportedOperationException always
*/
@Override
public final boolean enqueue() {
throw new UnsupportedOperationException("enqueue");
}
}
/**
* Perform cleaning on an unreachable PhantomReference.
*/
public static final class PhantomCleanableRef extends PhantomCleanable<Object> {
private final Runnable action;
/**
* Constructor for a phantom cleanable reference.
* @param obj the object to monitor
* @param cleaner the cleaner
* @param action the action Runnable
*/
public PhantomCleanableRef(Object obj, Cleaner cleaner, Runnable action) {
super(obj, cleaner);
this.action = action;
}
/**
* Constructor used only for root of phantom cleanable list.
* @param cleanerImpl the cleanerImpl
*/
PhantomCleanableRef(CleanerImpl cleanerImpl) {
super(cleanerImpl);
this.action = null;
}
@Override
protected void performCleanup() {
action.run();
}
/**
* Prevent access to referent even when it is still alive.
*
* @throws UnsupportedOperationException always
*/
@Override
public Object get() {
throw new UnsupportedOperationException("get");
}
/**
* Direct clearing of the referent is not supported.
*
* @throws UnsupportedOperationException always
*/
@Override
public void clear() {
throw new UnsupportedOperationException("clear");
}
}
/**
* Perform cleaning on an unreachable WeakReference.
*/
public static final class WeakCleanableRef extends WeakCleanable<Object> {
private final Runnable action;
/**
* Constructor for a weak cleanable reference.
* @param obj the object to monitor
* @param cleaner the cleaner
* @param action the action Runnable
*/
WeakCleanableRef(Object obj, Cleaner cleaner, Runnable action) {
super(obj, cleaner);
this.action = action;
}
/**
* Constructor used only for root of weak cleanable list.
* @param cleanerImpl the cleanerImpl
*/
WeakCleanableRef(CleanerImpl cleanerImpl) {
super(cleanerImpl);
this.action = null;
}
@Override
protected void performCleanup() {
action.run();
}
/**
* Prevent access to referent even when it is still alive.
*
* @throws UnsupportedOperationException always
*/
@Override
public Object get() {
throw new UnsupportedOperationException("get");
}
/**
* Direct clearing of the referent is not supported.
*
* @throws UnsupportedOperationException always
*/
@Override
public void clear() {
throw new UnsupportedOperationException("clear");
}
}
/**
* Perform cleaning on an unreachable SoftReference.
*/
public static final class SoftCleanableRef extends SoftCleanable<Object> {
private final Runnable action;
/**
* Constructor for a soft cleanable reference.
* @param obj the object to monitor
* @param cleaner the cleaner
* @param action the action Runnable
*/
SoftCleanableRef(Object obj, Cleaner cleaner, Runnable action) {
super(obj, cleaner);
this.action = action;
}
/**
* Constructor used only for root of soft cleanable list.
* @param cleanerImpl the cleanerImpl
*/
SoftCleanableRef(CleanerImpl cleanerImpl) {
super(cleanerImpl);
this.action = null;
}
@Override
protected void performCleanup() {
action.run();
}
/**
* Prevent access to referent even when it is still alive.
*
* @throws UnsupportedOperationException always
*/
@Override
public Object get() {
throw new UnsupportedOperationException("get");
}
/**
* Direct clearing of the referent is not supported.
*
* @throws UnsupportedOperationException always
*/
@Override
public void clear() {
throw new UnsupportedOperationException("clear");
}
}
/**
* A ThreadFactory for InnocuousThreads.
* The factory is a singleton.
*/
static final class InnocuousThreadFactory implements ThreadFactory {
final static ThreadFactory factory = new InnocuousThreadFactory();
static ThreadFactory factory() {
return factory;
}
public Thread newThread(Runnable r) {
return AccessController.doPrivileged((PrivilegedAction<Thread>) () -> {
Thread t = new InnocuousThread(r);
t.setPriority(Thread.MAX_PRIORITY - 2);
t.setName("Cleaner-" + t.getId());
return t;
});
}
}
}

2
jdk/src/java.base/share/classes/jdk/internal/misc/Unsafe.java
View File

@ -30,7 +30,7 @@ import java.security.ProtectionDomain;
import sun.reflect.CallerSensitive; import sun.reflect.CallerSensitive;
import sun.reflect.Reflection; import sun.reflect.Reflection;
import sun.misc.VM; import jdk.internal.misc.VM;
import jdk.internal.HotSpotIntrinsicCandidate; import jdk.internal.HotSpotIntrinsicCandidate;

2
jdk/src/java.base/share/classes/sun/misc/VM.java → jdk/src/java.base/share/classes/jdk/internal/misc/VM.java
View File

@ -23,7 +23,7 @@
* questions. * questions.
*/ */
package sun.misc; package jdk.internal.misc;
import static java.lang.Thread.State.*; import static java.lang.Thread.State.*;
import java.util.Properties; import java.util.Properties;

2
jdk/src/java.base/share/classes/sun/misc/VMNotification.java → jdk/src/java.base/share/classes/jdk/internal/misc/VMNotification.java
View File

@ -23,7 +23,7 @@
* questions. * questions.
*/ */
package sun.misc; package jdk.internal.misc;
/** @deprecated */ /** @deprecated */
@Deprecated @Deprecated

27
jdk/src/java.base/share/classes/java/lang/invoke/DontInline.java → jdk/src/java.base/share/classes/jdk/internal/ref/CleanerFactory.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -23,15 +23,26 @@
* questions. * questions.
*/ */
package java.lang.invoke; package jdk.internal.ref;
import java.lang.annotation.*; import java.lang.ref.Cleaner;
/** /**
* Internal marker for some methods in the JSR 292 implementation. * CleanerFactory provides a Cleaner for use within OpenJDK modules.
* The cleaner is created on the first reference to the CleanerFactory.
*/ */
/*non-public*/ public final class CleanerFactory {
@Target({ElementType.METHOD, ElementType.CONSTRUCTOR})
@Retention(RetentionPolicy.RUNTIME) /* The common Cleaner. */
@interface DontInline { private final static Cleaner commonCleaner = Cleaner.create();
/**
* Cleaner for use within OpenJDK modules.
*
* @return a Cleaner for use within OpenJDK modules
*/
public static Cleaner cleaner() {
return commonCleaner;
}
} }

333
jdk/src/java.base/share/classes/jdk/internal/ref/CleanerImpl.java Normal file
View File

@ -0,0 +1,333 @@
/*
* Copyright (c) 2015, 2016, 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. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* 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.
*/
package jdk.internal.ref;
import java.lang.ref.Cleaner;
import java.lang.ref.Cleaner.Cleanable;
import java.lang.ref.ReferenceQueue;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.concurrent.ThreadFactory;
import java.util.function.Function;
import sun.misc.InnocuousThread;
/**
* CleanerImpl manages a set of object references and corresponding cleaning actions.
* CleanerImpl provides the functionality of {@link java.lang.ref.Cleaner}.
*/
public final class CleanerImpl {
/**
* An object to access the CleanerImpl from a Cleaner; set by Cleaner init.
*/
private static Function<Cleaner, CleanerImpl> cleanerImplAccess = null;
/**
* Heads of a CleanableList for each reference type.
*/
final PhantomCleanable<?> phantomCleanableList;
final WeakCleanable<?> weakCleanableList;
final SoftCleanable<?> softCleanableList;
// The ReferenceQueue of pending cleaning actions
final ReferenceQueue<Object> queue;
/**
* Called by Cleaner static initialization to provide the function
* to map from Cleaner to CleanerImpl.
* @param access a function to map from Cleaner to CleanerImpl
*/
public static void setCleanerImplAccess(Function<Cleaner, CleanerImpl> access) {
if (cleanerImplAccess == null) {
cleanerImplAccess = access;
} else {
throw new InternalError("cleanerImplAccess");
}
}
/**
* Called to get the CleanerImpl for a Cleaner.
* @param cleaner the cleaner
* @return the corresponding CleanerImpl
*/
static CleanerImpl getCleanerImpl(Cleaner cleaner) {
return cleanerImplAccess.apply(cleaner);
}
/**
* Constructor for CleanerImpl.
*/
public CleanerImpl() {
queue = new ReferenceQueue<>();
phantomCleanableList = new PhantomCleanableRef();
weakCleanableList = new WeakCleanableRef();
softCleanableList = new SoftCleanableRef();
}
/**
* Starts the Cleaner implementation.
* Ensure this is the CleanerImpl for the Cleaner.
* When started waits for Cleanables to be queued.
* @param cleaner the cleaner
* @param threadFactory the thread factory
*/
public void start(Cleaner cleaner, ThreadFactory threadFactory) {
if (getCleanerImpl(cleaner) != this) {
throw new AssertionError("wrong cleaner");
}
// schedule a nop cleaning action for the cleaner, so the associated thread
// will continue to run at least until the cleaner is reclaimable.
new PhantomCleanableRef(cleaner, cleaner, () -> {});
if (threadFactory == null) {
threadFactory = CleanerImpl.InnocuousThreadFactory.factory();
}
// now that there's at least one cleaning action, for the cleaner,
// we can start the associated thread, which runs until
// all cleaning actions have been run.
Thread thread = threadFactory.newThread(this::run);
thread.setDaemon(true);
thread.start();
}
/**
* Process queued Cleanables as long as the cleanable lists are not empty.
* A Cleanable is in one of the lists for each Object and for the Cleaner
* itself.
* Terminates when the Cleaner is no longer reachable and
* has been cleaned and there are no more Cleanable instances
* for which the object is reachable.
* <p>
* If the thread is a ManagedLocalsThread, the threadlocals
* are erased before each cleanup
*/
private void run() {
Thread t = Thread.currentThread();
InnocuousThread mlThread = (t instanceof InnocuousThread)
? (InnocuousThread) t
: null;
while (!phantomCleanableList.isListEmpty() ||
!weakCleanableList.isListEmpty() ||
!softCleanableList.isListEmpty()) {
if (mlThread != null) {
// Clear the thread locals
mlThread.eraseThreadLocals();
}
try {
// Wait for a Ref, with a timeout to avoid getting hung
// due to a race with clear/clean
Cleanable ref = (Cleanable) queue.remove(60 * 1000L);
if (ref != null) {
ref.clean();
}
} catch (InterruptedException i) {
continue; // ignore the interruption
} catch (Throwable e) {
// ignore exceptions from the cleanup action
}
}
}
/**
* Perform cleaning on an unreachable PhantomReference.
*/
public static final class PhantomCleanableRef extends PhantomCleanable<Object> {
private final Runnable action;
/**
* Constructor for a phantom cleanable reference.
* @param obj the object to monitor
* @param cleaner the cleaner
* @param action the action Runnable
*/
public PhantomCleanableRef(Object obj, Cleaner cleaner, Runnable action) {
super(obj, cleaner);
this.action = action;
}
/**
* Constructor used only for root of phantom cleanable list.
*/
PhantomCleanableRef() {
super();
this.action = null;
}
@Override
protected void performCleanup() {
action.run();
}
/**
* Prevent access to referent even when it is still alive.
*
* @throws UnsupportedOperationException always
*/
@Override
public Object get() {
throw new UnsupportedOperationException("get");
}
/**
* Direct clearing of the referent is not supported.
*
* @throws UnsupportedOperationException always
*/
@Override
public void clear() {
throw new UnsupportedOperationException("clear");
}
}
/**
* Perform cleaning on an unreachable WeakReference.
*/
public static final class WeakCleanableRef extends WeakCleanable<Object> {
private final Runnable action;
/**
* Constructor for a weak cleanable reference.
* @param obj the object to monitor
* @param cleaner the cleaner
* @param action the action Runnable
*/
WeakCleanableRef(Object obj, Cleaner cleaner, Runnable action) {
super(obj, cleaner);
this.action = action;
}
/**
* Constructor used only for root of weak cleanable list.
*/
WeakCleanableRef() {
super();
this.action = null;
}
@Override
protected void performCleanup() {
action.run();
}
/**
* Prevent access to referent even when it is still alive.
*
* @throws UnsupportedOperationException always
*/
@Override
public Object get() {
throw new UnsupportedOperationException("get");
}
/**
* Direct clearing of the referent is not supported.
*
* @throws UnsupportedOperationException always
*/
@Override
public void clear() {
throw new UnsupportedOperationException("clear");
}
}
/**
* Perform cleaning on an unreachable SoftReference.
*/
public static final class SoftCleanableRef extends SoftCleanable<Object> {
private final Runnable action;
/**
* Constructor for a soft cleanable reference.
* @param obj the object to monitor
* @param cleaner the cleaner
* @param action the action Runnable
*/
SoftCleanableRef(Object obj, Cleaner cleaner, Runnable action) {
super(obj, cleaner);
this.action = action;
}
/**
* Constructor used only for root of soft cleanable list.
*/
SoftCleanableRef() {
super();
this.action = null;
}
@Override
protected void performCleanup() {
action.run();
}
/**
* Prevent access to referent even when it is still alive.
*
* @throws UnsupportedOperationException always
*/
@Override
public Object get() {
throw new UnsupportedOperationException("get");
}
/**
* Direct clearing of the referent is not supported.
*
* @throws UnsupportedOperationException always
*/
@Override
public void clear() {
throw new UnsupportedOperationException("clear");
}
}
/**
* A ThreadFactory for InnocuousThreads.
* The factory is a singleton.
*/
static final class InnocuousThreadFactory implements ThreadFactory {
final static ThreadFactory factory = new InnocuousThreadFactory();
static ThreadFactory factory() {
return factory;
}
public Thread newThread(Runnable r) {
return AccessController.doPrivileged((PrivilegedAction<Thread>) () -> {
Thread t = new InnocuousThread(r);
t.setPriority(Thread.MAX_PRIORITY - 2);
t.setName("Cleaner-" + t.getId());
return t;
});
}
}
}

178
jdk/src/java.base/share/classes/jdk/internal/ref/PhantomCleanable.java Normal file
View File

@ -0,0 +1,178 @@
/*
* Copyright (c) 2015, 2016, 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. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* 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.
*/
package jdk.internal.ref;
import java.lang.ref.Cleaner;
import java.lang.ref.PhantomReference;
import java.util.Objects;
/**
* PhantomCleanable subclasses efficiently encapsulate cleanup state and
* the cleaning action.
* Subclasses implement the abstract {@link #performCleanup()} method
* to provide the cleaning action.
* When constructed, the object reference and the {@link Cleaner.Cleanable Cleanable}
* are registered with the {@link Cleaner}.
* The Cleaner invokes {@link Cleaner.Cleanable#clean() clean} after the
* referent becomes phantom reachable.
*/
public abstract class PhantomCleanable<T> extends PhantomReference<T>
implements Cleaner.Cleanable {
/**
* Links to previous and next in a doubly-linked list.
*/
PhantomCleanable<?> prev = this, next = this;
/**
* The list of PhantomCleanable; synchronizes insert and remove.
*/
private final PhantomCleanable<?> list;
/**
* Constructs new {@code PhantomCleanable} with
* {@code non-null referent} and {@code non-null cleaner}.
* The {@code cleaner} is not retained; it is only used to
* register the newly constructed {@link Cleaner.Cleanable Cleanable}.
*
* @param referent the referent to track
* @param cleaner the {@code Cleaner} to register with
*/
public PhantomCleanable(T referent, Cleaner cleaner) {
super(Objects.requireNonNull(referent), CleanerImpl.getCleanerImpl(cleaner).queue);
this.list = CleanerImpl.getCleanerImpl(cleaner).phantomCleanableList;
insert();
// TODO: Replace getClass() with ReachabilityFence when it is available
cleaner.getClass();
referent.getClass();
}
/**
* Construct a new root of the list; not inserted.
*/
PhantomCleanable() {
super(null, null);
this.list = this;
}
/**
* Insert this PhantomCleanable after the list head.
*/
private void insert() {
synchronized (list) {
prev = list;
next = list.next;
next.prev = this;
list.next = this;
}
}
/**
* Remove this PhantomCleanable from the list.
*
* @return true if Cleanable was removed or false if not because
* it had already been removed before
*/
private boolean remove() {
synchronized (list) {
if (next != this) {
next.prev = prev;
prev.next = next;
prev = this;
next = this;
return true;
}
return false;
}
}
/**
* Returns true if the list's next reference refers to itself.
*
* @return true if the list is empty
*/
boolean isListEmpty() {
synchronized (list) {
return list == list.next;
}
}
/**
* Unregister this PhantomCleanable and invoke {@link #performCleanup()},
* ensuring at-most-once semantics.
*/
@Override
public final void clean() {
if (remove()) {
super.clear();
performCleanup();
}
}
/**
* Unregister this PhantomCleanable and clear the reference.
* Due to inherent concurrency, {@link #performCleanup()} may still be invoked.
*/
@Override
public void clear() {
if (remove()) {
super.clear();
}
}
/**
* The {@code performCleanup} abstract method is overridden
* to implement the cleaning logic.
* The {@code performCleanup} method should not be called except
* by the {@link #clean} method which ensures at most once semantics.
*/
protected abstract void performCleanup();
/**
* This method always throws {@link UnsupportedOperationException}.
* Enqueuing details of {@link Cleaner.Cleanable}
* are a private implementation detail.
*
* @throws UnsupportedOperationException always
*/
@Override
public final boolean isEnqueued() {
throw new UnsupportedOperationException("isEnqueued");
}
/**
* This method always throws {@link UnsupportedOperationException}.
* Enqueuing details of {@link Cleaner.Cleanable}
* are a private implementation detail.
*
* @throws UnsupportedOperationException always
*/
@Override
public final boolean enqueue() {
throw new UnsupportedOperationException("enqueue");
}
}

178
jdk/src/java.base/share/classes/jdk/internal/ref/SoftCleanable.java Normal file
View File

@ -0,0 +1,178 @@
/*
* Copyright (c) 2015, 2016, 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. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* 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.
*/
package jdk.internal.ref;
import java.lang.ref.Cleaner;
import java.lang.ref.SoftReference;
import java.util.Objects;
/**
* SoftCleanable subclasses efficiently encapsulate cleanup state and
* the cleaning action.
* Subclasses implement the abstract {@link #performCleanup()} method
* to provide the cleaning action.
* When constructed, the object reference and the {@link Cleaner.Cleanable Cleanable}
* are registered with the {@link Cleaner}.
* The Cleaner invokes {@link Cleaner.Cleanable#clean() clean} after the
* referent becomes softly reachable.
*/
public abstract class SoftCleanable<T> extends SoftReference<T>
implements Cleaner.Cleanable {
/**
* Links to previous and next in a doubly-linked list.
*/
SoftCleanable<?> prev = this, next = this;
/**
* The list of SoftCleanable; synchronizes insert and remove.
*/
private final SoftCleanable<?> list;
/**
* Constructs new {@code SoftCleanableReference} with
* {@code non-null referent} and {@code non-null cleaner}.
* The {@code cleaner} is not retained by this reference; it is only used
* to register the newly constructed {@link Cleaner.Cleanable Cleanable}.
*
* @param referent the referent to track
* @param cleaner the {@code Cleaner} to register with
*/
public SoftCleanable(T referent, Cleaner cleaner) {
super(Objects.requireNonNull(referent), CleanerImpl.getCleanerImpl(cleaner).queue);
list = CleanerImpl.getCleanerImpl(cleaner).softCleanableList;
insert();
// TODO: Replace getClass() with ReachabilityFence when it is available
cleaner.getClass();
referent.getClass();
}
/**
* Construct a new root of the list; not inserted.
*/
SoftCleanable() {
super(null, null);
this.list = this;
}
/**
* Insert this SoftCleanableReference after the list head.
*/
private void insert() {
synchronized (list) {
prev = list;
next = list.next;
next.prev = this;
list.next = this;
}
}
/**
* Remove this SoftCleanableReference from the list.
*
* @return true if Cleanable was removed or false if not because
* it had already been removed before
*/
private boolean remove() {
synchronized (list) {
if (next != this) {
next.prev = prev;
prev.next = next;
prev = this;
next = this;
return true;
}
return false;
}
}
/**
* Returns true if the list's next reference refers to itself.
*
* @return true if the list is empty
*/
boolean isListEmpty() {
synchronized (list) {
return list == list.next;
}
}
/**
* Unregister this SoftCleanable reference and invoke {@link #performCleanup()},
* ensuring at-most-once semantics.
*/
@Override
public final void clean() {
if (remove()) {
super.clear();
performCleanup();
}
}
/**
* Unregister this SoftCleanable and clear the reference.
* Due to inherent concurrency, {@link #performCleanup()} may still be invoked.
*/
@Override
public void clear() {
if (remove()) {
super.clear();
}
}
/**
* The {@code performCleanup} abstract method is overridden
* to implement the cleaning logic.
* The {@code performCleanup} method should not be called except
* by the {@link #clean} method which ensures at most once semantics.
*/
protected abstract void performCleanup();
/**
* This method always throws {@link UnsupportedOperationException}.
* Enqueuing details of {@link Cleaner.Cleanable}
* are a private implementation detail.
*
* @throws UnsupportedOperationException always
*/
@Override
public final boolean isEnqueued() {
throw new UnsupportedOperationException("isEnqueued");
}
/**
* This method always throws {@link UnsupportedOperationException}.
* Enqueuing details of {@link Cleaner.Cleanable}
* are a private implementation detail.
*
* @throws UnsupportedOperationException always
*/
@Override
public final boolean enqueue() {
throw new UnsupportedOperationException("enqueue");
}
}

178
jdk/src/java.base/share/classes/jdk/internal/ref/WeakCleanable.java Normal file
View File

@ -0,0 +1,178 @@
package jdk.internal.ref;
/*
* Copyright (c) 2015, 2016, 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. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* 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.
*/
import java.lang.ref.Cleaner;
import java.lang.ref.WeakReference;
import java.util.Objects;
/**
* WeakCleanable subclasses efficiently encapsulate cleanup state and
* the cleaning action.
* Subclasses implement the abstract {@link #performCleanup()} method
* to provide the cleaning action.
* When constructed, the object reference and the {@link Cleaner.Cleanable Cleanable}
* are registered with the {@link Cleaner}.
* The Cleaner invokes {@link Cleaner.Cleanable#clean() clean} after the
* referent becomes weakly reachable.
*/
public abstract class WeakCleanable<T> extends WeakReference<T>
implements Cleaner.Cleanable {
/**
* Links to previous and next in a doubly-linked list.
*/
WeakCleanable<?> prev = this, next = this;
/**
* The list of WeakCleanable; synchronizes insert and remove.
*/
private final WeakCleanable<?> list;
/**
* Constructs new {@code WeakCleanableReference} with
* {@code non-null referent} and {@code non-null cleaner}.
* The {@code cleaner} is not retained by this reference; it is only used
* to register the newly constructed {@link Cleaner.Cleanable Cleanable}.
*
* @param referent the referent to track
* @param cleaner the {@code Cleaner} to register new reference with
*/
public WeakCleanable(T referent, Cleaner cleaner) {
super(Objects.requireNonNull(referent), CleanerImpl.getCleanerImpl(cleaner).queue);
list = CleanerImpl.getCleanerImpl(cleaner).weakCleanableList;
insert();
// TODO: Replace getClass() with ReachabilityFence when it is available
cleaner.getClass();
referent.getClass();
}
/**
* Construct a new root of the list; not inserted.
*/
WeakCleanable() {
super(null, null);
this.list = this;
}
/**
* Insert this WeakCleanableReference after the list head.
*/
private void insert() {
synchronized (list) {
prev = list;
next = list.next;
next.prev = this;
list.next = this;
}
}
/**
* Remove this WeakCleanableReference from the list.
*
* @return true if Cleanable was removed or false if not because
* it had already been removed before
*/
private boolean remove() {
synchronized (list) {
if (next != this) {
next.prev = prev;
prev.next = next;
prev = this;
next = this;
return true;
}
return false;
}
}
/**
* Returns true if the list's next reference refers to itself.
*
* @return true if the list is empty
*/
boolean isListEmpty() {
synchronized (list) {
return list == list.next;
}
}
/**
* Unregister this WeakCleanable reference and invoke {@link #performCleanup()},
* ensuring at-most-once semantics.
*/
@Override
public final void clean() {
if (remove()) {
super.clear();
performCleanup();
}
}
/**
* Unregister this WeakCleanable and clear the reference.
* Due to inherent concurrency, {@link #performCleanup()} may still be invoked.
*/
@Override
public void clear() {
if (remove()) {
super.clear();
}
}
/**
* The {@code performCleanup} abstract method is overridden
* to implement the cleaning logic.
* The {@code performCleanup} method should not be called except
* by the {@link #clean} method which ensures at most once semantics.
*/
protected abstract void performCleanup();
/**
* This method always throws {@link UnsupportedOperationException}.
* Enqueuing details of {@link Cleaner.Cleanable}
* are a private implementation detail.
*
* @throws UnsupportedOperationException always
*/
@Override
public final boolean isEnqueued() {
throw new UnsupportedOperationException("isEnqueued");
}
/**
* This method always throws {@link UnsupportedOperationException}.
* Enqueuing details of {@link Cleaner.Cleanable}
* are a private implementation detail.
*
* @throws UnsupportedOperationException always
*/
@Override
public final boolean enqueue() {
throw new UnsupportedOperationException("enqueue");
}
}

50
jdk/src/java.base/share/classes/jdk/internal/vm/annotation/DontInline.java Normal file
View File

@ -0,0 +1,50 @@
/*
* Copyright (c) 2012, 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. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* 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.
*/
package jdk.internal.vm.annotation;
import java.lang.annotation.*;
/**
* A method or constructor may be annotated as "don't inline" if the inlining of
* this method should not be performed by the HotSpot VM.
* <p>
* This annotation must be used sparingly. It is useful when the only
* reasonable alternative is to bind the name of a specific method or
* constructor into the HotSpot VM for special handling by the inlining policy.
* This annotation must not be relied on as an alternative to avoid tuning the
* VM's inlining policy. In a few cases, it may act as a temporary workaround
* until the profiling and inlining performed by the HotSpot VM is sufficiently
* improved.
*
* @implNote
* This annotation only takes effect for methods or constructors of classes
* loaded by the boot loader. Annotations on methods or constructors of classes
* loaded outside of the boot loader are ignored.
*/
@Target({ElementType.METHOD, ElementType.CONSTRUCTOR})
@Retention(RetentionPolicy.RUNTIME)
public @interface DontInline {
}

51
jdk/src/java.base/share/classes/jdk/internal/vm/annotation/ForceInline.java Normal file
View File

@ -0,0 +1,51 @@
/*
* Copyright (c) 2012, 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. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* 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.
*/
package jdk.internal.vm.annotation;
import java.lang.annotation.*;
/**
* A method or constructor may be annotated as "force inline" if the standard
* inlining metrics are to be ignored when the HotSpot VM inlines the method
* or constructor.
* <p>
* This annotation must be used sparingly. It is useful when the only
* reasonable alternative is to bind the name of a specific method or
* constructor into the HotSpot VM for special handling by the inlining policy.
* This annotation must not be relied on as an alternative to avoid tuning the
* VM's inlining policy. In a few cases, it may act as a temporary workaround
* until the profiling and inlining performed by the HotSpot VM is sufficiently
* improved.
*
* @implNote
* This annotation only takes effect for methods or constructors of classes
* loaded by the boot loader. Annotations on methods or constructors of classes
* loaded outside of the boot loader are ignored.
*/
@Target({ElementType.METHOD, ElementType.CONSTRUCTOR})
@Retention(RetentionPolicy.RUNTIME)
public @interface ForceInline {
}

35
jdk/src/java.base/share/classes/java/lang/invoke/Stable.java → jdk/src/java.base/share/classes/jdk/internal/vm/annotation/Stable.java
View File

@ -23,7 +23,7 @@
* questions. * questions.
*/ */
package java.lang.invoke; package jdk.internal.vm.annotation;
import java.lang.annotation.*; import java.lang.annotation.*;
@ -57,17 +57,34 @@ import java.lang.annotation.*;
* <p> * <p>
* Fields which are declared {@code final} may also be annotated as stable. * Fields which are declared {@code final} may also be annotated as stable.
* Since final fields already behave as stable values, such an annotation * Since final fields already behave as stable values, such an annotation
* indicates no additional information, unless the type of the field is * conveys no additional information regarding change of the field's value, but
* an array type. * still conveys information regarding change of additional components values if
* the type of the field is an array type (as described above).
* <p>
* The HotSpot VM relies on this annotation to promote a non-null (resp.,
* non-zero) component value to a constant, thereby enabling superior
* optimizations of code depending on such a value (such as constant folding).
* More specifically, the HotSpot VM will process non-null stable fields (final
* or otherwise) in a similar manner to static final fields with respect to
* promoting the field's value to a constant. Thus, placing aside the
* differences for null/non-null values and arrays, a final stable field is
* treated as if it is really final from both the Java language and the HotSpot
* VM.
* <p> * <p>
* It is (currently) undefined what happens if a field annotated as stable * It is (currently) undefined what happens if a field annotated as stable
* is given a third value. In practice, if the JVM relies on this annotation * is given a third value (by explicitly updating a stable field, a component of
* to promote a field reference to a constant, it may be that the Java memory * a stable array, or a final stable field via reflection or other means).
* model would appear to be broken, if such a constant (the second value of the field) * Since the HotSpot VM promotes a non-null component value to constant, it may
* is used as the value of the field even after the field value has changed. * be that the Java memory model would appear to be broken, if such a constant
* (the second value of the field) is used as the value of the field even after
* the field value has changed (to a third value).
*
* @implNote
* This annotation only takes effect for fields of classes loaded by the boot
* loader. Annoations on fields of classes loaded outside of the boot loader
* are ignored.
*/ */
/* package-private */
@Target(ElementType.FIELD) @Target(ElementType.FIELD)
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@interface Stable { public @interface Stable {
} }

1
jdk/src/java.base/share/classes/jdk/net/ExtendedSocketOptions.java
View File

@ -34,7 +34,6 @@ import java.net.SocketOption;
* *
* @since 1.8 * @since 1.8
*/ */
@jdk.Exported
public final class ExtendedSocketOptions { public final class ExtendedSocketOptions {
private static class ExtSocketOption<T> implements SocketOption<T> { private static class ExtSocketOption<T> implements SocketOption<T> {

1
jdk/src/java.base/share/classes/jdk/net/NetworkPermission.java
View File

@ -61,7 +61,6 @@ import java.security.BasicPermission;
* @since 1.8 * @since 1.8
*/ */
@jdk.Exported
public final class NetworkPermission extends BasicPermission { public final class NetworkPermission extends BasicPermission {
private static final long serialVersionUID = -2012939586906722291L; private static final long serialVersionUID = -2012939586906722291L;

2
jdk/src/java.base/share/classes/jdk/net/SocketFlow.java
View File

@ -45,7 +45,6 @@ import java.lang.annotation.Native;
* *
* @since 1.8 * @since 1.8
*/ */
@jdk.Exported
public class SocketFlow { public class SocketFlow {
private static final int UNSET = -1; private static final int UNSET = -1;
@ -68,7 +67,6 @@ public class SocketFlow {
* *
* @since 1.8 * @since 1.8
*/ */
@jdk.Exported
public enum Status { public enum Status {
/** /**
* Set or get socket option has not been called yet. Status * Set or get socket option has not been called yet. Status

1
jdk/src/java.base/share/classes/jdk/net/Sockets.java
View File

@ -55,7 +55,6 @@ import sun.net.ExtendedOptionsImpl;
* *
* @see java.nio.channels.NetworkChannel * @see java.nio.channels.NetworkChannel
*/ */
@jdk.Exported
public class Sockets { public class Sockets {
private static final HashMap<Class<?>,Set<SocketOption<?>>> private static final HashMap<Class<?>,Set<SocketOption<?>>>

1
jdk/src/java.base/share/classes/jdk/net/package-info.java
View File

@ -30,5 +30,4 @@
* @since 1.8 * @since 1.8
*/ */
@jdk.Exported
package jdk.net; package jdk.net;

5
jdk/src/java.base/share/classes/sun/launcher/LauncherHelper.java
View File

@ -66,6 +66,7 @@ import java.util.TreeSet;
import java.util.jar.Attributes; import java.util.jar.Attributes;
import java.util.jar.JarFile; import java.util.jar.JarFile;
import java.util.jar.Manifest; import java.util.jar.Manifest;
import jdk.internal.misc.VM;
public enum LauncherHelper { public enum LauncherHelper {
INSTANCE; INSTANCE;
@ -86,9 +87,9 @@ public enum LauncherHelper {
private static final String PROP_SETTINGS = "Property settings:"; private static final String PROP_SETTINGS = "Property settings:";
private static final String LOCALE_SETTINGS = "Locale settings:"; private static final String LOCALE_SETTINGS = "Locale settings:";
// sync with java.c and sun.misc.VM // sync with java.c and jdk.internal.misc.VM
private static final String diagprop = "sun.java.launcher.diag"; private static final String diagprop = "sun.java.launcher.diag";
static final boolean trace = sun.misc.VM.getSavedProperty(diagprop) != null; static final boolean trace = VM.getSavedProperty(diagprop) != null;
private static final String defaultBundleName = private static final String defaultBundleName =
"sun.launcher.resources.launcher"; "sun.launcher.resources.launcher";

127
jdk/src/java.base/share/classes/sun/misc/MessageUtils.java
View File

@ -1,127 +0,0 @@
/*
* Copyright (c) 1995, 2000, 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. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* 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.
*/
package sun.misc;
/**
* MessageUtils: miscellaneous utilities for handling error and status
* properties and messages.
*
* @author Herb Jellinek
*/
public class MessageUtils {
// can instantiate it for to allow less verbose use - via instance
// instead of classname
public MessageUtils() { }
public static String subst(String patt, String arg) {
String args[] = { arg };
return subst(patt, args);
}
public static String subst(String patt, String arg1, String arg2) {
String args[] = { arg1, arg2 };
return subst(patt, args);
}
public static String subst(String patt, String arg1, String arg2,
String arg3) {
String args[] = { arg1, arg2, arg3 };
return subst(patt, args);
}
public static String subst(String patt, String args[]) {
StringBuilder result = new StringBuilder();
int len = patt.length();
for (int i = 0; i >= 0 && i < len; i++) {
char ch = patt.charAt(i);
if (ch == '%') {
if (i != len) {
int index = Character.digit(patt.charAt(i + 1), 10);
if (index == -1) {
result.append(patt.charAt(i + 1));
i++;
} else if (index < args.length) {
result.append(args[index]);
i++;
}
}
} else {
result.append(ch);
}
}
return result.toString();
}
public static String substProp(String propName, String arg) {
return subst(System.getProperty(propName), arg);
}
public static String substProp(String propName, String arg1, String arg2) {
return subst(System.getProperty(propName), arg1, arg2);
}
public static String substProp(String propName, String arg1, String arg2,
String arg3) {
return subst(System.getProperty(propName), arg1, arg2, arg3);
}
/**
* Print a message directly to stderr, bypassing all the
* character conversion methods.
* @param msg message to print
*/
public static native void toStderr(String msg);
/**
* Print a message directly to stdout, bypassing all the
* character conversion methods.
* @param msg message to print
*/
public static native void toStdout(String msg);
// Short forms of the above
public static void err(String s) {
toStderr(s + "\n");
}
public static void out(String s) {
toStdout(s + "\n");
}
// Print a stack trace to stderr
//
public static void where() {
Throwable t = new Throwable();
StackTraceElement[] es = t.getStackTrace();
for (int i = 1; i < es.length; i++)
toStderr("\t" + es[i].toString() + "\n");
}
}

13
jdk/src/java.base/share/classes/sun/misc/Unsafe.java
View File

@ -25,13 +25,13 @@
package sun.misc; package sun.misc;
import java.lang.reflect.Field; import jdk.internal.HotSpotIntrinsicCandidate;
import java.security.ProtectionDomain; import jdk.internal.misc.VM;
import sun.reflect.CallerSensitive; import sun.reflect.CallerSensitive;
import sun.reflect.Reflection; import sun.reflect.Reflection;
import jdk.internal.HotSpotIntrinsicCandidate; import java.lang.reflect.Field;
import java.security.ProtectionDomain;
/** /**
@ -1035,9 +1035,4 @@ public final class Unsafe {
private static void throwIllegalAccessError() { private static void throwIllegalAccessError() {
throw new IllegalAccessError(); throw new IllegalAccessError();
} }
// JVM interface methods
private native boolean unalignedAccess0();
private native boolean isBigEndian0();
} }

8
jdk/src/java.base/share/classes/sun/net/www/http/HttpClient.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1994, 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1994, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -967,12 +967,6 @@ public class HttpClient extends NetworkClient {
return ""; return "";
} }
@Override
protected void finalize() throws Throwable {
// This should do nothing. The stream finalizer will
// close the fd.
}
public void setDoNotRetry(boolean value) { public void setDoNotRetry(boolean value) {
// failedOnce is used to determine if a request should be retried. // failedOnce is used to determine if a request should be retried.
failedOnce = value; failedOnce = value;

9
jdk/src/java.base/share/classes/sun/net/www/protocol/jar/URLJarFile.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -108,13 +108,6 @@ public class URLJarFile extends JarFile {
return false; return false;
} }
/*
* close the jar file.
*/
protected void finalize() throws IOException {
close();
}
/** /**
* Returns the <code>ZipEntry</code> for the given entry name or * Returns the <code>ZipEntry</code> for the given entry name or
* <code>null</code> if not found. * <code>null</code> if not found.

2
jdk/src/java.base/share/classes/sun/nio/ch/Util.java
View File

@ -389,7 +389,7 @@ public class Util {
static boolean atBugLevel(String bl) { // package-private static boolean atBugLevel(String bl) { // package-private
if (bugLevel == null) { if (bugLevel == null) {
if (!sun.misc.VM.isBooted()) if (!jdk.internal.misc.VM.isBooted())
return false; return false;
String value = AccessController.doPrivileged( String value = AccessController.doPrivileged(
new GetPropertyAction("sun.nio.ch.bugLevel")); new GetPropertyAction("sun.nio.ch.bugLevel"));

4
jdk/src/java.base/share/classes/sun/nio/cs/StandardCharsets.java.template
View File

@ -156,12 +156,12 @@ public class StandardCharsets extends CharsetProvider {
private boolean initialized = false; private boolean initialized = false;
/* provider the sun.nio.cs.map property fir sjis/ms932 mapping hack /* provider the sun.nio.cs.map property fir sjis/ms932 mapping hack
*/ */
private void init() { private void init() {
if (initialized) if (initialized)
return; return;
if (!sun.misc.VM.isBooted()) if (!jdk.internal.misc.VM.isBooted())
return; return;
initialized = true; initialized = true;

3
jdk/src/java.base/share/classes/sun/reflect/Reflection.java
View File

@ -29,6 +29,7 @@ import java.lang.reflect.*;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import jdk.internal.HotSpotIntrinsicCandidate; import jdk.internal.HotSpotIntrinsicCandidate;
import jdk.internal.misc.VM;
/** Common utility routines used by both java.lang and /** Common utility routines used by both java.lang and
java.lang.reflect */ java.lang.reflect */
@ -335,7 +336,7 @@ public class Reflection {
*/ */
public static boolean isCallerSensitive(Method m) { public static boolean isCallerSensitive(Method m) {
final ClassLoader loader = m.getDeclaringClass().getClassLoader(); final ClassLoader loader = m.getDeclaringClass().getClassLoader();
if (sun.misc.VM.isSystemDomainLoader(loader) || isExtClassLoader(loader)) { if (VM.isSystemDomainLoader(loader) || isExtClassLoader(loader)) {
return m.isAnnotationPresent(CallerSensitive.class); return m.isAnnotationPresent(CallerSensitive.class);
} }
return false; return false;

16
jdk/src/java.base/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -153,13 +153,11 @@ final class SignatureAndHashAlgorithm {
getSupportedAlgorithms(AlgorithmConstraints constraints) { getSupportedAlgorithms(AlgorithmConstraints constraints) {
Collection<SignatureAndHashAlgorithm> supported = new ArrayList<>(); Collection<SignatureAndHashAlgorithm> supported = new ArrayList<>();
synchronized (priorityMap) { for (SignatureAndHashAlgorithm sigAlg : priorityMap.values()) {
for (SignatureAndHashAlgorithm sigAlg : priorityMap.values()) { if (sigAlg.priority <= SUPPORTED_ALG_PRIORITY_MAX_NUM &&
if (sigAlg.priority <= SUPPORTED_ALG_PRIORITY_MAX_NUM && constraints.permits(SIGNATURE_PRIMITIVE_SET,
constraints.permits(SIGNATURE_PRIMITIVE_SET, sigAlg.algorithm, null)) {
sigAlg.algorithm, null)) { supported.add(sigAlg);
supported.add(sigAlg);
}
} }
} }
@ -417,14 +415,12 @@ final class SignatureAndHashAlgorithm {
supports(HashAlgorithm.SHA1, SignatureAlgorithm.ECDSA, supports(HashAlgorithm.SHA1, SignatureAlgorithm.ECDSA,
"SHA1withECDSA", --p); "SHA1withECDSA", --p);
if (Security.getProvider("SunMSCAPI") == null) {
supports(HashAlgorithm.SHA224, SignatureAlgorithm.DSA, supports(HashAlgorithm.SHA224, SignatureAlgorithm.DSA,
"SHA224withDSA", --p); "SHA224withDSA", --p);
supports(HashAlgorithm.SHA224, SignatureAlgorithm.RSA, supports(HashAlgorithm.SHA224, SignatureAlgorithm.RSA,
"SHA224withRSA", --p); "SHA224withRSA", --p);
supports(HashAlgorithm.SHA224, SignatureAlgorithm.ECDSA, supports(HashAlgorithm.SHA224, SignatureAlgorithm.ECDSA,
"SHA224withECDSA", --p); "SHA224withECDSA", --p);
}
supports(HashAlgorithm.SHA256, SignatureAlgorithm.DSA, supports(HashAlgorithm.SHA256, SignatureAlgorithm.DSA,
"SHA256withDSA", --p); "SHA256withDSA", --p);

16
jdk/src/java.base/share/native/libjava/RandomAccessFile.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -103,23 +103,19 @@ Java_java_io_RandomAccessFile_getFilePointer(JNIEnv *env, jobject this) {
JNIEXPORT jlong JNICALL JNIEXPORT jlong JNICALL
Java_java_io_RandomAccessFile_length(JNIEnv *env, jobject this) { Java_java_io_RandomAccessFile_length(JNIEnv *env, jobject this) {
FD fd; FD fd;
jlong cur = jlong_zero; jlong length = jlong_zero;
jlong end = jlong_zero;
fd = GET_FD(this, raf_fd); fd = GET_FD(this, raf_fd);
if (fd == -1) { if (fd == -1) {
JNU_ThrowIOException(env, "Stream Closed"); JNU_ThrowIOException(env, "Stream Closed");
return -1; return -1;
} }
if ((cur = IO_Lseek(fd, 0L, SEEK_CUR)) == -1) { if ((length = IO_GetLength(fd)) == -1) {
JNU_ThrowIOExceptionWithLastError(env, "Seek failed"); JNU_ThrowIOExceptionWithLastError(env, "GetLength failed");
} else if ((end = IO_Lseek(fd, 0L, SEEK_END)) == -1) {
JNU_ThrowIOExceptionWithLastError(env, "Seek failed");
} else if (IO_Lseek(fd, cur, SEEK_SET) == -1) {
JNU_ThrowIOExceptionWithLastError(env, "Seek failed");
} }
return end; return length;
} }
JNIEXPORT void JNICALL JNIEXPORT void JNICALL

15
jdk/src/java.base/share/native/libjava/MessageUtils.c → jdk/src/java.base/share/native/libjava/StringCoding.c
View File

@ -26,11 +26,10 @@
#include <stdlib.h> #include <stdlib.h>
#include <jni.h> #include <jni.h>
#include <jni_util.h> #include <jni_util.h>
#include <jlong.h>
#include <stdio.h> #include <stdio.h>
#include <jvm.h> #include <jvm.h>
#include "sun_misc_MessageUtils.h" #include "java_lang_StringCoding.h"
static void static void
printToFile(JNIEnv *env, jstring s, FILE *file) printToFile(JNIEnv *env, jstring s, FILE *file)
@ -41,8 +40,8 @@ printToFile(JNIEnv *env, jstring s, FILE *file)
const jchar *sAsArray; const jchar *sAsArray;
if (s == NULL) { if (s == NULL) {
s = (*env)->NewStringUTF(env, "null"); JNU_ThrowNullPointerException(env, NULL);
if (s == NULL) return; return;
} }
sAsArray = (*env)->GetStringChars(env, s, NULL); sAsArray = (*env)->GetStringChars(env, s, NULL);
@ -70,13 +69,7 @@ printToFile(JNIEnv *env, jstring s, FILE *file)
} }
JNIEXPORT void JNICALL JNIEXPORT void JNICALL
Java_sun_misc_MessageUtils_toStderr(JNIEnv *env, jclass cls, jstring s) Java_java_lang_StringCoding_err(JNIEnv *env, jclass cls, jstring s)
{ {
printToFile(env, s, stderr); printToFile(env, s, stderr);
} }
JNIEXPORT void JNICALL
Java_sun_misc_MessageUtils_toStdout(JNIEnv *env, jclass cls, jstring s)
{
printToFile(env, s, stdout);
}

10
jdk/src/java.base/share/native/libjava/VM.c
View File

@ -28,7 +28,7 @@
#include "jvm.h" #include "jvm.h"
#include "jdk_util.h" #include "jdk_util.h"
#include "sun_misc_VM.h" #include "jdk_internal_misc_VM.h"
/* Only register the performance-critical methods */ /* Only register the performance-critical methods */
static JNINativeMethod methods[] = { static JNINativeMethod methods[] = {
@ -36,12 +36,12 @@ static JNINativeMethod methods[] = {
}; };
JNIEXPORT jobject JNICALL JNIEXPORT jobject JNICALL
Java_sun_misc_VM_latestUserDefinedLoader(JNIEnv *env, jclass cls) { Java_jdk_internal_misc_VM_latestUserDefinedLoader(JNIEnv *env, jclass cls) {
return JVM_LatestUserDefinedLoader(env); return JVM_LatestUserDefinedLoader(env);
} }
JNIEXPORT void JNICALL JNIEXPORT void JNICALL
Java_sun_misc_VM_initialize(JNIEnv *env, jclass cls) { Java_jdk_internal_misc_VM_initialize(JNIEnv *env, jclass cls) {
if (!JDK_InitJvmHandle()) { if (!JDK_InitJvmHandle()) {
JNU_ThrowInternalError(env, "Handle for JVM not found for symbol lookup"); JNU_ThrowInternalError(env, "Handle for JVM not found for symbol lookup");
return; return;
@ -50,8 +50,8 @@ Java_sun_misc_VM_initialize(JNIEnv *env, jclass cls) {
// Registers implementations of native methods described in methods[] // Registers implementations of native methods described in methods[]
// above. // above.
// In particular, registers JVM_GetNanoTimeAdjustment as the implementation // In particular, registers JVM_GetNanoTimeAdjustment as the implementation
// of the native sun.misc.VM.getNanoTimeAdjustment - avoiding the cost of // of the native VM.getNanoTimeAdjustment - avoiding the cost of
// introducing a Java_sun_misc_VM_getNanoTimeAdjustment wrapper // introducing a Java_jdk_internal_misc_VM_getNanoTimeAdjustment wrapper
(*env)->RegisterNatives(env, cls, (*env)->RegisterNatives(env, cls,
methods, sizeof(methods)/sizeof(methods[0])); methods, sizeof(methods)/sizeof(methods[0]));
} }

4
jdk/src/java.base/unix/classes/sun/misc/OSEnvironment.java → jdk/src/java.base/unix/classes/jdk/internal/misc/OSEnvironment.java
View File

@ -23,12 +23,12 @@
* questions. * questions.
*/ */
package sun.misc; package jdk.internal.misc;
public class OSEnvironment { public class OSEnvironment {
/* /*
* Initialize any miscellenous operating system settings that need to be set * Initialize any miscellaneous operating system settings that need to be set
* for the class libraries. * for the class libraries.
*/ */
public static void initialize() { public static void initialize() {

8
jdk/src/java.base/unix/native/libjava/VM_md.c
View File

@ -28,25 +28,25 @@
JNIEXPORT jlong JNICALL JNIEXPORT jlong JNICALL
Java_sun_misc_VM_getuid(JNIEnv *env, jclass thisclass) { Java_jdk_internal_misc_VM_getuid(JNIEnv *env, jclass thisclass) {
return getuid(); return getuid();
} }
JNIEXPORT jlong JNICALL JNIEXPORT jlong JNICALL
Java_sun_misc_VM_geteuid(JNIEnv *env, jclass thisclass) { Java_jdk_internal_misc_VM_geteuid(JNIEnv *env, jclass thisclass) {
return geteuid(); return geteuid();
} }
JNIEXPORT jlong JNICALL JNIEXPORT jlong JNICALL
Java_sun_misc_VM_getgid(JNIEnv *env, jclass thisclass) { Java_jdk_internal_misc_VM_getgid(JNIEnv *env, jclass thisclass) {
return getgid(); return getgid();
} }
JNIEXPORT jlong JNICALL JNIEXPORT jlong JNICALL
Java_sun_misc_VM_getegid(JNIEnv *env, jclass thisclass) { Java_jdk_internal_misc_VM_getegid(JNIEnv *env, jclass thisclass) {
return getegid(); return getegid();
} }

14
jdk/src/java.base/unix/native/libjava/io_util_md.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -22,7 +22,6 @@
* or visit www.oracle.com if you need additional information or have any * or visit www.oracle.com if you need additional information or have any
* questions. * questions.
*/ */
#include "jni.h" #include "jni.h"
#include "jni_util.h" #include "jni_util.h"
#include "jvm.h" #include "jvm.h"
@ -219,3 +218,14 @@ handleSetLength(FD fd, jlong length)
RESTARTABLE(ftruncate64(fd, length), result); RESTARTABLE(ftruncate64(fd, length), result);
return result; return result;
} }
jlong
handleGetLength(FD fd)
{
struct stat64 sb;
if (fstat64(fd, &sb) == 0) {
return sb.st_size;
} else {
return -1;
}
}

5
jdk/src/java.base/unix/native/libjava/io_util_md.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -39,7 +39,7 @@ ssize_t handleWrite(FD fd, const void *buf, jint len);
ssize_t handleRead(FD fd, void *buf, jint len); ssize_t handleRead(FD fd, void *buf, jint len);
jint handleAvailable(FD fd, jlong *pbytes); jint handleAvailable(FD fd, jlong *pbytes);
jint handleSetLength(FD fd, jlong length); jint handleSetLength(FD fd, jlong length);
jlong handleGetLength(FD fd);
FD handleOpen(const char *path, int oflag, int mode); FD handleOpen(const char *path, int oflag, int mode);
/* /*
@ -72,6 +72,7 @@ FD handleOpen(const char *path, int oflag, int mode);
#define IO_Append handleWrite #define IO_Append handleWrite
#define IO_Available handleAvailable #define IO_Available handleAvailable
#define IO_SetLength handleSetLength #define IO_SetLength handleSetLength
#define IO_GetLength handleGetLength
#ifdef _ALLBSD_SOURCE #ifdef _ALLBSD_SOURCE
#define open64 open #define open64 open

6
jdk/src/java.base/unix/native/libnio/ch/NativeThread.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2002, 2006, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -93,6 +93,10 @@ Java_sun_nio_ch_NativeThread_signal(JNIEnv *env, jclass cl, jlong thread)
#else #else
ret = pthread_kill((pthread_t)thread, INTERRUPT_SIGNAL); ret = pthread_kill((pthread_t)thread, INTERRUPT_SIGNAL);
#endif #endif
#ifdef MACOSX
if (ret != 0 && ret != ESRCH)
#else
if (ret != 0) if (ret != 0)
#endif
JNU_ThrowIOExceptionWithLastError(env, "Thread signal failed"); JNU_ThrowIOExceptionWithLastError(env, "Thread signal failed");
} }

10
jdk/src/java.base/windows/classes/java/lang/ProcessImpl.java
View File

@ -42,8 +42,10 @@ import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import jdk.internal.misc.JavaIOFileDescriptorAccess; import jdk.internal.misc.JavaIOFileDescriptorAccess;
import jdk.internal.misc.SharedSecrets; import jdk.internal.misc.SharedSecrets;
import jdk.internal.ref.CleanerFactory;
/* This class is for the exclusive use of ProcessBuilder.start() to /* This class is for the exclusive use of ProcessBuilder.start() to
* create new processes. * create new processes.
@ -417,6 +419,10 @@ final class ProcessImpl extends Process {
handle = create(cmdstr, envblock, path, handle = create(cmdstr, envblock, path,
stdHandles, redirectErrorStream); stdHandles, redirectErrorStream);
// Register a cleaning function to close the handle
final long local_handle = handle; // local to prevent capture of this
CleanerFactory.cleaner().register(this, () -> closeHandle(local_handle));
processHandle = ProcessHandleImpl.getInternal(getProcessId0(handle)); processHandle = ProcessHandleImpl.getInternal(getProcessId0(handle));
java.security.AccessController.doPrivileged( java.security.AccessController.doPrivileged(
@ -463,10 +469,6 @@ final class ProcessImpl extends Process {
return stderr_stream; return stderr_stream;
} }
protected void finalize() {
closeHandle(handle);
}
private static final int STILL_ACTIVE = getStillActive(); private static final int STILL_ACTIVE = getStillActive();
private static native int getStillActive(); private static native int getStillActive();

4
jdk/src/java.base/windows/classes/sun/misc/OSEnvironment.java → jdk/src/java.base/windows/classes/jdk/internal/misc/OSEnvironment.java
View File

@ -23,14 +23,14 @@
* questions. * questions.
*/ */
package sun.misc; package jdk.internal.misc;
import sun.io.Win32ErrorMode; import sun.io.Win32ErrorMode;
public class OSEnvironment { public class OSEnvironment {
/* /*
* Initialize any miscellenous operating system settings that need to be set * Initialize any miscellaneous operating system settings that need to be set
* for the class libraries. * for the class libraries.
* <p> * <p>
* At this time only the process-wide error mode needs to be set. * At this time only the process-wide error mode needs to be set.

2
jdk/src/java.base/windows/classes/sun/io/Win32ErrorMode.java
View File

@ -66,7 +66,7 @@ public class Win32ErrorMode {
* has completed. * has completed.
*/ */
public static void initialize() { public static void initialize() {
if (!sun.misc.VM.isBooted()) { if (!jdk.internal.misc.VM.isBooted()) {
String s = System.getProperty("sun.io.allowCriticalErrorMessageBox"); String s = System.getProperty("sun.io.allowCriticalErrorMessageBox");
if (s == null || s.equals(Boolean.FALSE.toString())) { if (s == null || s.equals(Boolean.FALSE.toString())) {
long mode = setErrorMode(0); long mode = setErrorMode(0);

8
jdk/src/java.base/windows/native/libjava/VM_md.c
View File

@ -27,28 +27,28 @@
JNIEXPORT jlong JNICALL JNIEXPORT jlong JNICALL
Java_sun_misc_VM_getuid(JNIEnv *env, jclass thisclass) { Java_jdk_internal_misc_VM_getuid(JNIEnv *env, jclass thisclass) {
/* -1 means function not available. */ /* -1 means function not available. */
return -1; return -1;
} }
JNIEXPORT jlong JNICALL JNIEXPORT jlong JNICALL
Java_sun_misc_VM_geteuid(JNIEnv *env, jclass thisclass) { Java_jdk_internal_misc_VM_geteuid(JNIEnv *env, jclass thisclass) {
/* -1 means function not available. */ /* -1 means function not available. */
return -1; return -1;
} }
JNIEXPORT jlong JNICALL JNIEXPORT jlong JNICALL
Java_sun_misc_VM_getgid(JNIEnv *env, jclass thisclass) { Java_jdk_internal_misc_VM_getgid(JNIEnv *env, jclass thisclass) {
/* -1 means function not available. */ /* -1 means function not available. */
return -1; return -1;
} }
JNIEXPORT jlong JNICALL JNIEXPORT jlong JNICALL
Java_sun_misc_VM_getegid(JNIEnv *env, jclass thisclass) { Java_jdk_internal_misc_VM_getegid(JNIEnv *env, jclass thisclass) {
/* -1 means function not available. */ /* -1 means function not available. */
return -1; return -1;

13
jdk/src/java.base/windows/native/libjava/io_util_md.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -584,3 +584,14 @@ handleLseek(FD fd, jlong offset, jint whence)
} }
return long_to_jlong(pos.QuadPart); return long_to_jlong(pos.QuadPart);
} }
jlong
handleGetLength(FD fd) {
HANDLE h = (HANDLE) fd;
LARGE_INTEGER length;
if (GetFileSizeEx(h, &length) != 0) {
return long_to_jlong(length.QuadPart);
} else {
return -1;
}
}

4
jdk/src/java.base/windows/native/libjava/io_util_md.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -44,6 +44,7 @@ int currentDirLength(const WCHAR* path, int pathlen);
int handleAvailable(FD fd, jlong *pbytes); int handleAvailable(FD fd, jlong *pbytes);
int handleSync(FD fd); int handleSync(FD fd);
int handleSetLength(FD fd, jlong length); int handleSetLength(FD fd, jlong length);
jlong handleGetLength(FD fd);
JNIEXPORT jint handleRead(FD fd, void *buf, jint len); JNIEXPORT jint handleRead(FD fd, void *buf, jint len);
jint handleWrite(FD fd, const void *buf, jint len); jint handleWrite(FD fd, const void *buf, jint len);
jint handleAppend(FD fd, const void *buf, jint len); jint handleAppend(FD fd, const void *buf, jint len);
@ -84,6 +85,7 @@ FD winFileHandleOpen(JNIEnv *env, jstring path, int flags);
#define IO_Lseek handleLseek #define IO_Lseek handleLseek
#define IO_Available handleAvailable #define IO_Available handleAvailable
#define IO_SetLength handleSetLength #define IO_SetLength handleSetLength
#define IO_GetLength handleGetLength
/* /*
* Setting the handle field in Java_java_io_FileDescriptor_set for * Setting the handle field in Java_java_io_FileDescriptor_set for

2
jdk/src/java.desktop/share/classes/javax/swing/text/html/parser/Parser.java
View File

@ -35,8 +35,6 @@ import java.util.Vector;
import java.util.Enumeration; import java.util.Enumeration;
import java.net.URL; import java.net.URL;
import sun.misc.MessageUtils;
/** /**
* A simple DTD-driven HTML parser. The parser reads an * A simple DTD-driven HTML parser. The parser reads an
* HTML file from an InputStream and calls various methods * HTML file from an InputStream and calls various methods

3
jdk/src/java.desktop/share/classes/sun/applet/AppletPanel.java
View File

@ -44,7 +44,6 @@ import sun.awt.AppContext;
import sun.awt.EmbeddedFrame; import sun.awt.EmbeddedFrame;
import sun.awt.SunToolkit; import sun.awt.SunToolkit;
import sun.misc.ManagedLocalsThread; import sun.misc.ManagedLocalsThread;
import sun.misc.MessageUtils;
import sun.misc.PerformanceLogger; import sun.misc.PerformanceLogger;
import sun.security.util.SecurityConstants; import sun.security.util.SecurityConstants;
@ -118,8 +117,6 @@ abstract class AppletPanel extends Panel implements AppletStub, Runnable {
*/ */
Dimension currentAppletSize = new Dimension(10, 10); Dimension currentAppletSize = new Dimension(10, 10);
MessageUtils mu = new MessageUtils();
/** /**
* The thread to use during applet loading * The thread to use during applet loading
*/ */

2
jdk/src/java.logging/share/classes/java/util/logging/FileHandler.java
View File

@ -639,7 +639,7 @@ public class FileHandler extends StreamHandler {
continue; continue;
} else if (ch2 == 'h') { } else if (ch2 == 'h') {
file = new File(System.getProperty("user.home")); file = new File(System.getProperty("user.home"));
if (sun.misc.VM.isSetUID()) { if (jdk.internal.misc.VM.isSetUID()) {
// Ok, we are in a set UID program. For safety's sake // Ok, we are in a set UID program. For safety's sake
// we disallow attempts to open files relative to %h. // we disallow attempts to open files relative to %h.
throw new IOException("can't use %h in set UID program"); throw new IOException("can't use %h in set UID program");

2
jdk/src/java.management/share/classes/java/lang/management/ManagementFactory.java
View File

@ -583,7 +583,7 @@ public class ManagementFactory {
ClassLoader loader = ClassLoader loader =
AccessController.doPrivileged( AccessController.doPrivileged(
(PrivilegedAction<ClassLoader>) () -> cls.getClassLoader()); (PrivilegedAction<ClassLoader>) () -> cls.getClassLoader());
if (!sun.misc.VM.isSystemDomainLoader(loader)) { if (!jdk.internal.misc.VM.isSystemDomainLoader(loader)) {
throw new IllegalArgumentException(mxbeanName + throw new IllegalArgumentException(mxbeanName +
" is not a platform MXBean"); " is not a platform MXBean");
} }

2
jdk/src/java.management/share/classes/sun/management/ManagementFactoryHelper.java
View File

@ -473,7 +473,7 @@ public class ManagementFactoryHelper {
public static Thread.State toThreadState(int state) { public static Thread.State toThreadState(int state) {
// suspended and native bits may be set in state // suspended and native bits may be set in state
int threadStatus = state & ~JMM_THREAD_STATE_FLAG_MASK; int threadStatus = state & ~JMM_THREAD_STATE_FLAG_MASK;
return sun.misc.VM.toThreadState(threadStatus); return jdk.internal.misc.VM.toThreadState(threadStatus);
} }
// These values are defined in jmm.h // These values are defined in jmm.h

2
jdk/src/java.management/share/classes/sun/management/MemoryImpl.java
View File

@ -59,7 +59,7 @@ class MemoryImpl extends NotificationEmitterSupport
} }
public int getObjectPendingFinalizationCount() { public int getObjectPendingFinalizationCount() {
return sun.misc.VM.getFinalRefCount(); return jdk.internal.misc.VM.getFinalRefCount();
} }
public void gc() { public void gc() {

Some files were not shown because too many files have changed in this diff Show More