--- a/.hgignore Tue Dec 26 13:38:31 2017 +0530
+++ b/.hgignore Mon Jan 08 08:53:14 2018 -0800
@@ -11,3 +11,5 @@
test/nashorn/script/external
test/nashorn/lib
NashornProfile.txt
+.*/JTreport/.*
+.*/JTwork/.*
--- a/.hgtags Tue Dec 26 13:38:31 2017 +0530
+++ b/.hgtags Mon Jan 08 08:53:14 2018 -0800
@@ -462,3 +462,5 @@
d8c634b016c628622c9abbdc6bf50509e5dedbec jdk-10+35
0ee20aad71c4f33c426372b4c8bcc1235ce2ec08 jdk-11+0
959f2f7cbaa6d2ee45d50029744efb219721576c jdk-10+36
+4f830b447edf04fb4a52151a5ad44d9bb60723cd jdk-10+37
+e569e83139fdfbecfeb3cd9014d560917787f158 jdk-10+38
--- a/make/Images.gmk Tue Dec 26 13:38:31 2017 +0530
+++ b/make/Images.gmk Mon Jan 08 08:53:14 2018 -0800
@@ -210,7 +210,6 @@
jarsigner.1 \
javac.1 \
javadoc.1 \
- javah.1 \
javap.1 \
jconsole.1 \
jcmd.1 \
--- a/make/Main.gmk Tue Dec 26 13:38:31 2017 +0530
+++ b/make/Main.gmk Mon Jan 08 08:53:14 2018 -0800
@@ -637,7 +637,7 @@
# Declare dependencies between hotspot-<variant>* targets
$(foreach v, $(JVM_VARIANTS), \
$(eval hotspot-$v: hotspot-$v-gensrc hotspot-$v-libs) \
- $(eval hotspot-$v-libs: hotspot-$v-gensrc) \
+ $(eval hotspot-$v-libs: hotspot-$v-gensrc java.base-copy) \
)
hotspot-ide-project: hotspot exploded-image
@@ -691,8 +691,9 @@
jdk.jdwp.agent-libs: jdk.jdwp.agent-gensrc
# The swing beans need to have java base properly generated to avoid errors
- # in javadoc.
- java.desktop-gensrc-src: java.base-gensrc
+ # in javadoc. The X11 wrappers need the java.base include files to have been
+ # copied and processed.
+ java.desktop-gensrc-src: java.base-gensrc java.base-copy
# The annotation processing for jdk.internal.vm.ci and jdk.internal.vm.compiler
# needs classes from the current JDK.
--- a/make/RunTestsPrebuiltSpec.gmk Tue Dec 26 13:38:31 2017 +0530
+++ b/make/RunTestsPrebuiltSpec.gmk Mon Jan 08 08:53:14 2018 -0800
@@ -110,7 +110,6 @@
# Java executable definitions
JAVA_CMD := $(BOOT_JDK)/bin/java
JAVAC_CMD := $(BOOT_JDK)/bin/javac
-JAVAH_CMD := $(BOOT_JDK)/bin/javah
JAR_CMD := $(BOOT_JDK)/bin/jar
JLINK_CMD := $(JDK_OUTPUTDIR)/bin/jlink
JMOD_CMD := $(JDK_OUTPUTDIR)/bin/jmod
@@ -120,7 +119,6 @@
JAVA_SMALL := $(FIXPATH) $(JAVA_CMD) $(JAVA_FLAGS_SMALL) $(JAVA_FLAGS)
JAVA_JAVAC := $(FIXPATH) $(JAVA_CMD) $(JAVA_FLAGS_SMALL) $(JAVA_FLAGS)
JAVAC := $(FIXPATH) $(JAVAC_CMD)
-JAVAH := $(FIXPATH) $(JAVAH_CMD)
JAR := $(FIXPATH) $(JAR_CMD)
JLINK := $(FIXPATH) $(JLINK_CMD)
JMOD := $(FIXPATH) $(JMOD_CMD)
--- a/make/autoconf/boot-jdk.m4 Tue Dec 26 13:38:31 2017 +0530
+++ b/make/autoconf/boot-jdk.m4 Mon Jan 08 08:53:14 2018 -0800
@@ -295,7 +295,6 @@
# Setup tools from the Boot JDK.
BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVA, java)
BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVAC, javac)
- BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVAH, javah)
BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVADOC, javadoc)
BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAR, jar)
BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JARSIGNER, jarsigner)
--- a/make/autoconf/bootcycle-spec.gmk.in Tue Dec 26 13:38:31 2017 +0530
+++ b/make/autoconf/bootcycle-spec.gmk.in Mon Jan 08 08:53:14 2018 -0800
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -52,7 +52,6 @@
JAVA_CMD:=$(BOOT_JDK)/bin/java
JAVAC_CMD:=$(BOOT_JDK)/bin/javac
-JAVAH_CMD:=$(BOOT_JDK)/bin/javah
JAR_CMD:=$(BOOT_JDK)/bin/jar
JARSIGNER_CMD:=$(BOOT_JDK)/bin/jarsigner
SJAVAC_SERVER_JAVA_CMD:=$(JAVA_CMD)
--- a/make/autoconf/buildjdk-spec.gmk.in Tue Dec 26 13:38:31 2017 +0530
+++ b/make/autoconf/buildjdk-spec.gmk.in Mon Jan 08 08:53:14 2018 -0800
@@ -55,6 +55,7 @@
OPENJDK_TARGET_CPU_BITS := @OPENJDK_BUILD_CPU_BITS@
OPENJDK_TARGET_CPU_ENDIAN := @OPENJDK_BUILD_CPU_ENDIAN@
OPENJDK_TARGET_CPU_LEGACY := @OPENJDK_BUILD_CPU_LEGACY@
+OPENJDK_TARGET_OS_INCLUDE_SUBDIR := @OPENJDK_BUILD_OS_INCLUDE_SUBDIR@
HOTSPOT_TARGET_OS := @HOTSPOT_BUILD_OS@
HOTSPOT_TARGET_OS_TYPE := @HOTSPOT_BUILD_OS_TYPE@
--- a/make/autoconf/flags.m4 Tue Dec 26 13:38:31 2017 +0530
+++ b/make/autoconf/flags.m4 Mon Jan 08 08:53:14 2018 -0800
@@ -1162,9 +1162,7 @@
# Setup some hard coded includes
$2COMMON_CCXXFLAGS_JDK="[$]$2COMMON_CCXXFLAGS_JDK \
-I\$(SUPPORT_OUTPUTDIR)/modules_include/java.base \
- -I${TOPDIR}/src/java.base/share/native/include \
- -I${TOPDIR}/src/java.base/$OPENJDK_$1_OS/native/include \
- -I${TOPDIR}/src/java.base/$OPENJDK_$1_OS_TYPE/native/include \
+ -I\$(SUPPORT_OUTPUTDIR)/modules_include/java.base/\$(OPENJDK_TARGET_OS_INCLUDE_SUBDIR) \
-I${TOPDIR}/src/java.base/share/native/libjava \
-I${TOPDIR}/src/java.base/$OPENJDK_$1_OS_TYPE/native/libjava \
-I${TOPDIR}/src/hotspot/share/include \
--- a/make/autoconf/generated-configure.sh Tue Dec 26 13:38:31 2017 +0530
+++ b/make/autoconf/generated-configure.sh Mon Jan 08 08:53:14 2018 -0800
@@ -881,12 +881,13 @@
JARSIGNER
JAR
JAVADOC
-JAVAH
JAVAC
JAVA
BOOT_JDK
JAVA_CHECK
JAVAC_CHECK
+VERSION_CLASSFILE_MINOR
+VERSION_CLASSFILE_MAJOR
VENDOR_VERSION_STRING
VERSION_DATE
VERSION_IS_GA
@@ -901,10 +902,10 @@
VERSION_UPDATE
VERSION_INTERIM
VERSION_FEATURE
+COMPANY_NAME
MACOSX_BUNDLE_ID_BASE
MACOSX_BUNDLE_NAME_BASE
HOTSPOT_VM_DISTRO
-COMPANY_NAME
JDK_RC_PLATFORM_NAME
PRODUCT_SUFFIX
PRODUCT_NAME
@@ -968,6 +969,7 @@
USERNAME
TOPDIR
PATH_SEP
+OPENJDK_BUILD_OS_INCLUDE_SUBDIR
HOTSPOT_BUILD_CPU_DEFINE
HOTSPOT_BUILD_CPU_ARCH
HOTSPOT_BUILD_CPU
@@ -978,6 +980,7 @@
OPENJDK_BUILD_CPU_ISADIR
OPENJDK_BUILD_CPU_LEGACY_LIB
OPENJDK_BUILD_CPU_LEGACY
+OPENJDK_TARGET_OS_INCLUDE_SUBDIR
HOTSPOT_TARGET_CPU_DEFINE
HOTSPOT_TARGET_CPU_ARCH
HOTSPOT_TARGET_CPU
@@ -1093,7 +1096,6 @@
docdir
oldincludedir
includedir
-runstatedir
localstatedir
sharedstatedir
sysconfdir
@@ -1147,6 +1149,7 @@
with_version_major
with_version_minor
with_version_security
+with_vendor_name
with_version_string
with_version_pre
with_version_opt
@@ -1299,7 +1302,6 @@
PKG_CONFIG
JAVA
JAVAC
-JAVAH
JAVADOC
JAR
JARSIGNER
@@ -1383,7 +1385,6 @@
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
-runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1636,15 +1637,6 @@
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
- -runstatedir | --runstatedir | --runstatedi | --runstated \
- | --runstate | --runstat | --runsta | --runst | --runs \
- | --run | --ru | --r)
- ac_prev=runstatedir ;;
- -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
- | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
- | --run=* | --ru=* | --r=*)
- runstatedir=$ac_optarg ;;
-
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1782,7 +1774,7 @@
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
- libdir localedir mandir runstatedir
+ libdir localedir mandir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
@@ -1935,7 +1927,6 @@
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
- --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -2083,6 +2074,7 @@
compatibility and is ignored
--with-version-security Deprecated. Option is kept for backwards
compatibility and is ignored
+ --with-vendor-name Set vendor name [not specified]
--with-version-string Set version string [calculated]
--with-version-pre Set the base part of the version 'PRE' field
(pre-release identifier) ['internal']
@@ -2269,7 +2261,6 @@
PKG_CONFIG path to pkg-config utility
JAVA Override default value for JAVA
JAVAC Override default value for JAVAC
- JAVAH Override default value for JAVAH
JAVADOC Override default value for JAVADOC
JAR Override default value for JAR
JARSIGNER Override default value for JARSIGNER
@@ -5185,7 +5176,7 @@
#CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1513206608
+DATE_WHEN_GENERATED=1513805283
###############################################################################
#
@@ -16316,6 +16307,14 @@
fi
+ # For historical reasons, the OS include directories have odd names.
+ OPENJDK_TARGET_OS_INCLUDE_SUBDIR="$OPENJDK_TARGET_OS"
+ if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
+ OPENJDK_TARGET_OS_INCLUDE_SUBDIR="win32"
+ elif test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
+ OPENJDK_TARGET_OS_INCLUDE_SUBDIR="darwin"
+ fi
+
# Also store the legacy naming of the cpu.
@@ -16467,6 +16466,14 @@
fi
+ # For historical reasons, the OS include directories have odd names.
+ OPENJDK_BUILD_OS_INCLUDE_SUBDIR="$OPENJDK_TARGET_OS"
+ if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
+ OPENJDK_BUILD_OS_INCLUDE_SUBDIR="win32"
+ elif test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
+ OPENJDK_BUILD_OS_INCLUDE_SUBDIR="darwin"
+ fi
+
@@ -25055,6 +25062,21 @@
+ # The vendor name, if any
+
+# Check whether --with-vendor-name was given.
+if test "${with_vendor_name+set}" = set; then :
+ withval=$with_vendor_name;
+fi
+
+ if test "x$with_vendor_name" = xyes; then
+ as_fn_error $? "--with-vendor-name must have a value" "$LINENO" 5
+ elif ! [[ $with_vendor_name =~ ^[[:print:]]*$ ]] ; then
+ as_fn_error $? "--with--vendor-name contains non-printing characters: $with_vendor_name" "$LINENO" 5
+ else
+ COMPANY_NAME="$with_vendor_name"
+ fi
+
# Override version from arguments
@@ -25457,6 +25479,10 @@
VENDOR_VERSION_STRING="$with_vendor_version_string"
fi
+ # We could define --with flags for these, if really needed
+ VERSION_CLASSFILE_MAJOR="$DEFAULT_VERSION_CLASSFILE_MAJOR"
+ VERSION_CLASSFILE_MINOR="$DEFAULT_VERSION_CLASSFILE_MINOR"
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for version string" >&5
$as_echo_n "checking for version string... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $VERSION_STRING" >&5
@@ -25478,6 +25504,9 @@
+
+
+
###############################################################################
#
# Setup BootJDK, used to bootstrap the build.
@@ -30908,144 +30937,6 @@
# Publish this variable in the help.
- if [ -z "${JAVAH+x}" ]; then
- # The variable is not set by user, try to locate tool using the code snippet
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for javah in Boot JDK" >&5
-$as_echo_n "checking for javah in Boot JDK... " >&6; }
- JAVAH=$BOOT_JDK/bin/javah
- if test ! -x $JAVAH; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-$as_echo "not found" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitly setting --with-boot-jdk" >&5
-$as_echo "$as_me: Your Boot JDK seems broken. This might be fixed by explicitly setting --with-boot-jdk" >&6;}
- as_fn_error $? "Could not find javah in the Boot JDK" "$LINENO" 5
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
-
-
- else
- # The variable is set, but is it from the command line or the environment?
-
- # Try to remove the string !JAVAH! from our list.
- try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!JAVAH!/}
- if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
- # If it failed, the variable was not from the command line. Ignore it,
- # but warn the user (except for BASH, which is always set by the calling BASH).
- if test "xJAVAH" != xBASH; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of JAVAH from the environment. Use command line variables instead." >&5
-$as_echo "$as_me: WARNING: Ignoring value of JAVAH from the environment. Use command line variables instead." >&2;}
- fi
- # Try to locate tool using the code snippet
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for javah in Boot JDK" >&5
-$as_echo_n "checking for javah in Boot JDK... " >&6; }
- JAVAH=$BOOT_JDK/bin/javah
- if test ! -x $JAVAH; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-$as_echo "not found" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitly setting --with-boot-jdk" >&5
-$as_echo "$as_me: Your Boot JDK seems broken. This might be fixed by explicitly setting --with-boot-jdk" >&6;}
- as_fn_error $? "Could not find javah in the Boot JDK" "$LINENO" 5
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
-
-
- else
- # If it succeeded, then it was overridden by the user. We will use it
- # for the tool.
-
- # First remove it from the list of overridden variables, so we can test
- # for unknown variables in the end.
- CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
-
- # Check if we try to supply an empty value
- if test "x$JAVAH" = x; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: Setting user supplied tool JAVAH= (no value)" >&5
-$as_echo "$as_me: Setting user supplied tool JAVAH= (no value)" >&6;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JAVAH" >&5
-$as_echo_n "checking for JAVAH... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
-$as_echo "disabled" >&6; }
- else
- # Check if the provided tool contains a complete path.
- tool_specified="$JAVAH"
- tool_basename="${tool_specified##*/}"
- if test "x$tool_basename" = "x$tool_specified"; then
- # A command without a complete path is provided, search $PATH.
- { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool JAVAH=$tool_basename" >&5
-$as_echo "$as_me: Will search for user supplied tool JAVAH=$tool_basename" >&6;}
- # Extract the first word of "$tool_basename", so it can be a program name with args.
-set dummy $tool_basename; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_JAVAH+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $JAVAH in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_JAVAH="$JAVAH" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_JAVAH="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-JAVAH=$ac_cv_path_JAVAH
-if test -n "$JAVAH"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVAH" >&5
-$as_echo "$JAVAH" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- if test "x$JAVAH" = x; then
- as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
- fi
- else
- # Otherwise we believe it is a complete path. Use it as it is.
- { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool JAVAH=$tool_specified" >&5
-$as_echo "$as_me: Will use user supplied tool JAVAH=$tool_specified" >&6;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JAVAH" >&5
-$as_echo_n "checking for JAVAH... " >&6; }
- if test ! -x "$tool_specified"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-$as_echo "not found" >&6; }
- as_fn_error $? "User supplied tool JAVAH=$tool_specified does not exist or is not executable" "$LINENO" 5
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
-$as_echo "$tool_specified" >&6; }
- fi
- fi
- fi
-
- fi
-
-
-
- # Use user overridden value if available, otherwise locate tool in the Boot JDK.
-
- # Publish this variable in the help.
-
-
if [ -z "${JAVADOC+x}" ]; then
# The variable is not set by user, try to locate tool using the code snippet
@@ -52888,9 +52779,7 @@
# Setup some hard coded includes
COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK \
-I\$(SUPPORT_OUTPUTDIR)/modules_include/java.base \
- -I${TOPDIR}/src/java.base/share/native/include \
- -I${TOPDIR}/src/java.base/$OPENJDK_TARGET_OS/native/include \
- -I${TOPDIR}/src/java.base/$OPENJDK_TARGET_OS_TYPE/native/include \
+ -I\$(SUPPORT_OUTPUTDIR)/modules_include/java.base/\$(OPENJDK_TARGET_OS_INCLUDE_SUBDIR) \
-I${TOPDIR}/src/java.base/share/native/libjava \
-I${TOPDIR}/src/java.base/$OPENJDK_TARGET_OS_TYPE/native/libjava \
-I${TOPDIR}/src/hotspot/share/include \
@@ -53771,9 +53660,7 @@
# Setup some hard coded includes
OPENJDK_BUILD_COMMON_CCXXFLAGS_JDK="$OPENJDK_BUILD_COMMON_CCXXFLAGS_JDK \
-I\$(SUPPORT_OUTPUTDIR)/modules_include/java.base \
- -I${TOPDIR}/src/java.base/share/native/include \
- -I${TOPDIR}/src/java.base/$OPENJDK_BUILD_OS/native/include \
- -I${TOPDIR}/src/java.base/$OPENJDK_BUILD_OS_TYPE/native/include \
+ -I\$(SUPPORT_OUTPUTDIR)/modules_include/java.base/\$(OPENJDK_TARGET_OS_INCLUDE_SUBDIR) \
-I${TOPDIR}/src/java.base/share/native/libjava \
-I${TOPDIR}/src/java.base/$OPENJDK_BUILD_OS_TYPE/native/libjava \
-I${TOPDIR}/src/hotspot/share/include \
--- a/make/autoconf/jdk-version.m4 Tue Dec 26 13:38:31 2017 +0530
+++ b/make/autoconf/jdk-version.m4 Mon Jan 08 08:53:14 2018 -0800
@@ -74,11 +74,22 @@
AC_SUBST(PRODUCT_NAME)
AC_SUBST(PRODUCT_SUFFIX)
AC_SUBST(JDK_RC_PLATFORM_NAME)
- AC_SUBST(COMPANY_NAME)
AC_SUBST(HOTSPOT_VM_DISTRO)
AC_SUBST(MACOSX_BUNDLE_NAME_BASE)
AC_SUBST(MACOSX_BUNDLE_ID_BASE)
+ # The vendor name, if any
+ AC_ARG_WITH(vendor-name, [AS_HELP_STRING([--with-vendor-name],
+ [Set vendor name @<:@not specified@:>@])])
+ if test "x$with_vendor_name" = xyes; then
+ AC_MSG_ERROR([--with-vendor-name must have a value])
+ elif [ ! [[ $with_vendor_name =~ ^[[:print:]]*$ ]] ]; then
+ AC_MSG_ERROR([--with--vendor-name contains non-printing characters: $with_vendor_name])
+ else
+ COMPANY_NAME="$with_vendor_name"
+ fi
+ AC_SUBST(COMPANY_NAME)
+
# Override version from arguments
# If --with-version-string is set, process it first. It is possible to
@@ -331,6 +342,10 @@
VENDOR_VERSION_STRING="$with_vendor_version_string"
fi
+ # We could define --with flags for these, if really needed
+ VERSION_CLASSFILE_MAJOR="$DEFAULT_VERSION_CLASSFILE_MAJOR"
+ VERSION_CLASSFILE_MINOR="$DEFAULT_VERSION_CLASSFILE_MINOR"
+
AC_MSG_CHECKING([for version string])
AC_MSG_RESULT([$VERSION_STRING])
@@ -348,4 +363,7 @@
AC_SUBST(VERSION_IS_GA)
AC_SUBST(VERSION_DATE)
AC_SUBST(VENDOR_VERSION_STRING)
+ AC_SUBST(VERSION_CLASSFILE_MAJOR)
+ AC_SUBST(VERSION_CLASSFILE_MINOR)
+
])
--- a/make/autoconf/platform.m4 Tue Dec 26 13:38:31 2017 +0530
+++ b/make/autoconf/platform.m4 Mon Jan 08 08:53:14 2018 -0800
@@ -478,6 +478,14 @@
fi
AC_SUBST(HOTSPOT_$1_CPU_DEFINE)
+ # For historical reasons, the OS include directories have odd names.
+ OPENJDK_$1_OS_INCLUDE_SUBDIR="$OPENJDK_TARGET_OS"
+ if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
+ OPENJDK_$1_OS_INCLUDE_SUBDIR="win32"
+ elif test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
+ OPENJDK_$1_OS_INCLUDE_SUBDIR="darwin"
+ fi
+ AC_SUBST(OPENJDK_$1_OS_INCLUDE_SUBDIR)
])
AC_DEFUN([PLATFORM_SET_RELEASE_FILE_OS_VALUES],
--- a/make/autoconf/spec.gmk.in Tue Dec 26 13:38:31 2017 +0530
+++ b/make/autoconf/spec.gmk.in Mon Jan 08 08:53:14 2018 -0800
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2018, 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
@@ -78,6 +78,7 @@
OPENJDK_TARGET_CPU_LEGACY:=@OPENJDK_TARGET_CPU_LEGACY@
OPENJDK_TARGET_CPU_LEGACY_LIB:=@OPENJDK_TARGET_CPU_LEGACY_LIB@
OPENJDK_TARGET_CPU_OSARCH:=@OPENJDK_TARGET_CPU_OSARCH@
+OPENJDK_TARGET_OS_INCLUDE_SUBIDR:=@OPENJDK_TARGET_OS_INCLUDE_SUBDIR@
HOTSPOT_TARGET_OS := @HOTSPOT_TARGET_OS@
HOTSPOT_TARGET_OS_TYPE := @HOTSPOT_TARGET_OS_TYPE@
@@ -100,6 +101,8 @@
OPENJDK_BUILD_CPU_BITS:=@OPENJDK_BUILD_CPU_BITS@
OPENJDK_BUILD_CPU_ENDIAN:=@OPENJDK_BUILD_CPU_ENDIAN@
+OPENJDK_BUILD_OS_INCLUDE_SUBIDR:=@OPENJDK_TARGET_OS_INCLUDE_SUBDIR@
+
# Target platform value in ModuleTarget class file attribute.
OPENJDK_MODULE_TARGET_PLATFORM:=@OPENJDK_MODULE_TARGET_PLATFORM@
@@ -175,6 +178,10 @@
# Vendor version string
VENDOR_VERSION_STRING := @VENDOR_VERSION_STRING@
+# Class-file version
+VERSION_CLASSFILE_MAJOR := @VERSION_CLASSFILE_MAJOR@
+VERSION_CLASSFILE_MINOR := @VERSION_CLASSFILE_MINOR@
+
# Convenience CFLAGS settings for passing version information into native programs.
VERSION_CFLAGS := \
-DVERSION_FEATURE=$(VERSION_FEATURE) \
@@ -190,6 +197,8 @@
-DVERSION_SPECIFICATION='"$(VERSION_SPECIFICATION)"' \
-DVERSION_DATE='"$(VERSION_DATE)"' \
-DVENDOR_VERSION_STRING='"$(VENDOR_VERSION_STRING)"' \
+ -DVERSION_CLASSFILE_MAJOR=$(VERSION_CLASSFILE_MAJOR) \
+ -DVERSION_CLASSFILE_MINOR=$(VERSION_CLASSFILE_MINOR) \
#
# Platform naming variables
@@ -540,7 +549,6 @@
# versions of the variables directly.
JAVA_CMD:=@JAVA@
JAVAC_CMD:=@JAVAC@
-JAVAH_CMD:=@JAVAH@
JAVADOC_CMD:=@JAVADOC@
JAR_CMD:=@JAR@
JLINK_CMD := @JLINK@
@@ -553,7 +561,6 @@
JAVA_SMALL=@FIXPATH@ $(JAVA_CMD) $(JAVA_FLAGS_SMALL) $(JAVA_FLAGS)
JAVA_JAVAC=@FIXPATH@ $(JAVA_CMD) $(JAVA_FLAGS_JAVAC) $(JAVA_FLAGS)
JAVAC=@FIXPATH@ $(JAVAC_CMD)
-JAVAH=@FIXPATH@ $(JAVAH_CMD)
JAVADOC=@FIXPATH@ $(JAVADOC_CMD)
JAR=@FIXPATH@ $(JAR_CMD)
JLINK = @FIXPATH@ $(JLINK_CMD) $(JAVA_TOOL_FLAGS_SMALL)
@@ -578,6 +585,8 @@
INTERIM_LANGTOOLS_MODULES := $(addsuffix .interim, $(INTERIM_LANGTOOLS_BASE_MODULES))
INTERIM_LANGTOOLS_ADD_EXPORTS := \
--add-exports java.base/sun.reflect.annotation=jdk.compiler.interim \
+ --add-exports java.base/jdk.internal.jmod=jdk.compiler.interim \
+ --add-exports java.base/jdk.internal.misc=jdk.compiler.interim \
#
INTERIM_LANGTOOLS_MODULES_COMMA := $(strip $(subst $(SPACE),$(COMMA),$(strip \
$(INTERIM_LANGTOOLS_MODULES))))
@@ -717,7 +726,7 @@
# Directories containing architecture-dependent files should be relative to exec_prefix
INSTALL_EXECPREFIX=@exec_prefix@
-# java,javac,javah,javap etc are installed here.
+# java,javac,javap etc are installed here.
INSTALL_BINDIR=@bindir@
# Read only architecture-independent data
--- a/make/autoconf/version-numbers Tue Dec 26 13:38:31 2017 +0530
+++ b/make/autoconf/version-numbers Mon Jan 08 08:53:14 2018 -0800
@@ -30,6 +30,8 @@
DEFAULT_VERSION_UPDATE=0
DEFAULT_VERSION_PATCH=0
DEFAULT_VERSION_DATE=2018-03-20
+DEFAULT_VERSION_CLASSFILE_MAJOR=55 # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
+DEFAULT_VERSION_CLASSFILE_MINOR=0
LAUNCHER_NAME=openjdk
PRODUCT_NAME=OpenJDK
--- a/make/common/JavaCompilation.gmk Tue Dec 26 13:38:31 2017 +0530
+++ b/make/common/JavaCompilation.gmk Mon Jan 08 08:53:14 2018 -0800
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -46,7 +46,7 @@
# passed to SetupJavaCompilation. This name is used as variable prefix.
#
# Remaining parameters are named arguments. These include:
-# JVM:=The jvm used to run the javac/javah command
+# JVM:=The jvm used to run the javac command
# JAVAC:=The javac jar and bootstrap classpath changes, or just bin/javac if JVM is left out
# FLAGS:=Flags to be supplied to javac
# SERVER_DIR:=Use a javac server (-XDserver) and store the server related files here
--- a/make/conf/jib-profiles.js Tue Dec 26 13:38:31 2017 +0530
+++ b/make/conf/jib-profiles.js Mon Jan 08 08:53:14 2018 -0800
@@ -829,7 +829,7 @@
jtreg: {
server: "javare",
revision: "4.2",
- build_number: "b10",
+ build_number: "b11",
checksum_file: "MD5_VALUES",
file: "jtreg_bin-4.2.zip",
environment_name: "JT_HOME",
--- a/make/copy/Copy-java.base.gmk Tue Dec 26 13:38:31 2017 +0530
+++ b/make/copy/Copy-java.base.gmk Mon Jan 08 08:53:14 2018 -0800
@@ -24,6 +24,7 @@
#
include CopyCommon.gmk
+include TextFileProcessing.gmk
$(eval $(call IncludeCustomExtension, copy/Copy-java.base.gmk))
@@ -244,3 +245,16 @@
endif
################################################################################
+# Generate classfile_constants.h
+
+$(eval $(call SetupTextFileProcessing, CREATE_CLASSFILE_CONSTANTS_H, \
+ SOURCE_FILES := $(TOPDIR)/src/java.base/share/native/include/classfile_constants.h.template, \
+ OUTPUT_FILE := $(SUPPORT_OUTPUTDIR)/modules_include/java.base/classfile_constants.h, \
+ REPLACEMENTS := \
+ @@VERSION_CLASSFILE_MAJOR@@ => $(VERSION_CLASSFILE_MAJOR) ; \
+ @@VERSION_CLASSFILE_MINOR@@ => $(VERSION_CLASSFILE_MINOR) ; , \
+))
+
+TARGETS += $(CREATE_CLASSFILE_CONSTANTS_H)
+
+################################################################################
--- a/make/copy/CopyCommon.gmk Tue Dec 26 13:38:31 2017 +0530
+++ b/make/copy/CopyCommon.gmk Mon Jan 08 08:53:14 2018 -0800
@@ -39,20 +39,12 @@
$(eval $(call SetupCopyFiles, COPY_EXPORTED_INCLUDE, \
SRC := $(INCLUDE_SOURCE_DIR), \
DEST := $(INCLUDE_TARGET_DIR), \
- FILES := $(shell $(FIND) $(INCLUDE_SOURCE_DIR) -type f), \
+ FILES := $(filter %.h, $(call CacheFind, $(INCLUDE_SOURCE_DIR))), \
))
TARGETS += $(COPY_EXPORTED_INCLUDE)
endif
-# For historical reasons, the OS include directories have odd names.
-INCLUDE_TARGET_OS_SUBDIR := $(OPENJDK_TARGET_OS)
-ifeq ($(OPENJDK_TARGET_OS), windows)
- INCLUDE_TARGET_OS_SUBDIR := win32
-else ifeq ($(OPENJDK_TARGET_OS), macosx)
- INCLUDE_TARGET_OS_SUBDIR := darwin
-endif
-
# Use the most specific of OS and OS_TYPE.
INCLUDE_SOURCE_OS_DIR := $(TOPDIR)/src/$(MODULE)/$(OPENJDK_TARGET_OS)/native/include
ifeq ($(wildcard $(INCLUDE_SOURCE_OS_DIR)/*), )
@@ -62,8 +54,8 @@
ifneq ($(wildcard $(INCLUDE_SOURCE_OS_DIR)/*), )
$(eval $(call SetupCopyFiles, COPY_EXPORTED_INCLUDE_OS, \
SRC := $(INCLUDE_SOURCE_OS_DIR), \
- DEST := $(INCLUDE_TARGET_DIR)/$(INCLUDE_TARGET_OS_SUBDIR), \
- FILES := $(shell $(FIND) $(INCLUDE_SOURCE_OS_DIR) -type f), \
+ DEST := $(INCLUDE_TARGET_DIR)/$(OPENJDK_TARGET_OS_INCLUDE_SUBDIR), \
+ FILES := $(filter %.h, $(call CacheFind, $(INCLUDE_SOURCE_OS_DIR))), \
))
TARGETS += $(COPY_EXPORTED_INCLUDE_OS)
--- a/make/gensrc/Gensrc-jdk.compiler.gmk Tue Dec 26 13:38:31 2017 +0530
+++ b/make/gensrc/Gensrc-jdk.compiler.gmk Mon Jan 08 08:53:14 2018 -0800
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -28,11 +28,8 @@
$(eval $(call SetupVersionProperties,JAVAC_VERSION, \
com/sun/tools/javac/resources/version.properties))
-$(eval $(call SetupVersionProperties,JAVAH_VERSION, \
- com/sun/tools/javah/resources/version.properties))
-
$(eval $(call SetupCompileProperties,COMPILE_PROPERTIES, \
- $(JAVAC_VERSION) $(JAVAH_VERSION)))
+ $(JAVAC_VERSION)))
$(eval $(call SetupParseProperties,PARSE_PROPERTIES, \
com/sun/tools/javac/resources/compiler.properties))
--- a/make/gensrc/GensrcX11Wrappers.gmk Tue Dec 26 13:38:31 2017 +0530
+++ b/make/gensrc/GensrcX11Wrappers.gmk Mon Jan 08 08:53:14 2018 -0800
@@ -92,10 +92,10 @@
endif
SIZER_CFLAGS := \
- -I${TOPDIR}/src/hotspot/share/include \
- -I${TOPDIR}/src/hotspot/os/$(HOTSPOT_TARGET_OS_TYPE)/include \
- -I$(TOPDIR)/src/java.base/share/native/include \
- -I$(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/include \
+ -I$(TOPDIR)/src/hotspot/share/include \
+ -I$(TOPDIR)/src/hotspot/os/$(HOTSPOT_TARGET_OS_TYPE)/include \
+ -I$(SUPPORT_OUTPUTDIR)/modules_include/java.base \
+ -I$(SUPPORT_OUTPUTDIR)/modules_include/java.base/$(OPENJDK_TARGET_OS_INCLUDE_SUBDIR) \
-I$(TOPDIR)/src/java.base/share/native/libjava \
-I$(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava \
-I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
--- a/make/hotspot/lib/CompileJvm.gmk Tue Dec 26 13:38:31 2017 +0530
+++ b/make/hotspot/lib/CompileJvm.gmk Mon Jan 08 08:53:14 2018 -0800
@@ -59,8 +59,8 @@
-I$(TOPDIR)/src/hotspot/share/precompiled \
-I$(TOPDIR)/src/hotspot/share/include \
-I$(TOPDIR)/src/hotspot/os/$(HOTSPOT_TARGET_OS_TYPE)/include \
- -I$(TOPDIR)/src/java.base/share/native/include \
- -I$(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/include \
+ -I$(SUPPORT_OUTPUTDIR)/modules_include/java.base \
+ -I$(SUPPORT_OUTPUTDIR)/modules_include/java.base/$(OPENJDK_TARGET_OS_INCLUDE_SUBDIR) \
-I$(TOPDIR)/src/java.base/share/native/libjimage \
#
--- a/make/jdk/src/classes/build/tools/blacklistedcertsconverter/BlacklistedCertsConverter.java Tue Dec 26 13:38:31 2017 +0530
+++ b/make/jdk/src/classes/build/tools/blacklistedcertsconverter/BlacklistedCertsConverter.java Mon Jan 08 08:53:14 2018 -0800
@@ -4,7 +4,9 @@
*
* 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.
+ * 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
--- a/make/jdk/src/classes/build/tools/generatelsrequivmaps/EquivMapsGenerator.java Tue Dec 26 13:38:31 2017 +0530
+++ b/make/jdk/src/classes/build/tools/generatelsrequivmaps/EquivMapsGenerator.java Mon Jan 08 08:53:14 2018 -0800
@@ -4,7 +4,9 @@
*
* 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.
+ * 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
--- a/make/langtools/build.properties Tue Dec 26 13:38:31 2017 +0530
+++ b/make/langtools/build.properties Mon Jan 08 08:53:14 2018 -0800
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -60,7 +60,6 @@
tool.javac.main.class=com.sun.tools.javac.Main
tool.javadoc.main.class=jdk.javadoc.internal.tool.Main
tool.javap.main.class=com.sun.tools.javap.Main
-tool.javah.main.class=com.sun.tools.javah.Main
tool.sjavac.main.class=com.sun.tools.sjavac.Main
tool.jshell.main.class=jdk.internal.jshell.tool.JShellToolProvider
--- a/make/langtools/build.xml Tue Dec 26 13:38:31 2017 +0530
+++ b/make/langtools/build.xml Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
+ ~ Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
~ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
~
~ This code is free software; you can redistribute it and/or modify it
@@ -41,7 +41,7 @@
The output of the build is as follows:
build
- |-bin (scripts to invoke various tools, javac, javah etc.)
+ |-bin (scripts to invoke various tools, javac etc.)
|-genrsc (generated sources - i.e. properties)
|-modules (compiled classes in a modular layout)
|-jtreg (test work/results)
@@ -254,7 +254,6 @@
<build-tool name="javac"/>
<build-tool name="javadoc"/>
<build-tool name="javap"/>
- <build-tool name="javah"/>
<build-tool name="jdeps"/>
<build-tool name="sjavac"/>
<build-tool name="jshell"/>
--- a/make/langtools/intellij/runConfigurations/javah.xml Tue Dec 26 13:38:31 2017 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-<component name="ProjectRunConfigurationManager">
- <configuration default="false" name="javah" type="Application" factoryName="Application">
- <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
- <option name="MAIN_CLASS_NAME" value="com.sun.tools.javah.Main" />
- <option name="VM_PARAMETERS" value='@XPATCH@ --add-exports=jdk.compiler/com.sun.tools.javah=ALL-UNNAMED' />
- <option name="PROGRAM_PARAMETERS" value="" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
- <option name="ALTERNATIVE_JRE_PATH" value="@IDEA_TARGET_JDK@" />
- <option name="ENABLE_SWING_INSPECTOR" value="false" />
- <option name="ENV_VARIABLES" />
- <option name="PASS_PARENT_ENVS" value="true" />
- <module name="langtools" />
- <envs />
- <RunnerSettings RunnerId="Run" />
- <ConfigurationWrapper RunnerId="Run" />
- <method>
- <option name="Make" enabled="false" />
- <option name="AntTarget" enabled="true" antfile="file://$PROJECT_DIR$/.idea/build.xml" target="build-all-classes" />
- </method>
- </configuration>
-</component>
--- a/make/langtools/netbeans/README Tue Dec 26 13:38:31 2017 +0530
+++ b/make/langtools/netbeans/README Mon Jan 08 08:53:14 2018 -0800
@@ -7,7 +7,7 @@
repository.
The repository contains a number of tools:
- javac, javadoc and its doclets, javah and javap.
+ javac, javadoc and its doclets, and javap.
Build Properties.
--- a/make/langtools/test/HelloWorld.apt.gold.txt Tue Dec 26 13:38:31 2017 +0530
+++ b/make/langtools/test/HelloWorld.apt.gold.txt Mon Jan 08 08:53:14 2018 -0800
@@ -11,9 +11,4 @@
* @param args The parameters are ignored.
*/
public static void main(java.lang.String... args);
-
- /**
- * This declaration is for the benefit of javah tests.
- */
- public native void test();
}
--- a/make/langtools/test/HelloWorld.java Tue Dec 26 13:38:31 2017 +0530
+++ b/make/langtools/test/HelloWorld.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -37,9 +37,4 @@
public static void main(String... args) {
System.out.println("Hello World!");
}
-
- /**
- * This declaration is for the benefit of javah tests.
- */
- public native void test();
}
--- a/make/langtools/test/bootstrap/javah.sh Tue Dec 26 13:38:31 2017 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-#!/bin/sh
-
-#
-# Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# @test
-# @summary Verify the basic execution of the bootstrap javah tool.
-
-TESTSRC=${TESTSRC:-.}
-TOPDIR=${TESTSRC}/../../..
-
-${TOPDIR}/dist/bootstrap/bin/javac -d . "${TESTSRC}"/../HelloWorld.java
-${TOPDIR}/dist/bootstrap/bin/javah -classpath . -d . HelloWorld
-
-if diff ${TESTSRC}/../HelloWorld.gold.h HelloWorld.h ; then
- echo "Test passed."
-else
- echo "Test failed."
- exit 1
-fi
--- a/make/langtools/test/contents.gold.txt Tue Dec 26 13:38:31 2017 +0530
+++ b/make/langtools/test/contents.gold.txt Mon Jan 08 08:53:14 2018 -0800
@@ -1,9 +1,7 @@
./bootstrap/bin/javac
./bootstrap/bin/javadoc
-./bootstrap/bin/javah
./bootstrap/lib/doclets.jar
./bootstrap/lib/javac.jar
./bootstrap/lib/javadoc.jar
-./bootstrap/lib/javah.jar
./lib/classes.jar
./lib/src.zip
--- a/make/langtools/test/lib/classes.gold.txt Tue Dec 26 13:38:31 2017 +0530
+++ b/make/langtools/test/lib/classes.gold.txt Mon Jan 08 08:53:14 2018 -0800
@@ -1,9 +1,4 @@
META-INF/MANIFEST.MF
-com/sun/tools/apt/Main.class
-com/sun/tools/apt/main/Main.class
-com/sun/tools/apt/resources/apt.class
-com/sun/tools/apt/resources/apt_ja.class
-com/sun/tools/apt/resources/apt_zh_CN.class
com/sun/tools/doclets/formats/html/resources/standard.class
com/sun/tools/doclets/formats/html/resources/standard_ja.class
com/sun/tools/doclets/formats/html/resources/standard_zh_CN.class
@@ -26,13 +21,3 @@
com/sun/tools/javadoc/resources/javadoc.class
com/sun/tools/javadoc/resources/javadoc_ja.class
com/sun/tools/javadoc/resources/javadoc_zh_CN.class
-com/sun/tools/javah/Main.class
-com/sun/tools/javah/resources/Linux_ppc.class
-com/sun/tools/javah/resources/Linux_sparc.class
-com/sun/tools/javah/resources/SunOS_sparc.class
-com/sun/tools/javah/resources/SunOS_sparcv9.class
-com/sun/tools/javah/resources/l10n.class
-com/sun/tools/javah/resources/l10n_ja.class
-com/sun/tools/javah/resources/l10n_zh_CN.class
-com/sun/tools/javah/resources/win32_x86.class
-sun/tools/javap/Main.class
--- a/make/langtools/test/lib/javah.sh Tue Dec 26 13:38:31 2017 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-#!/bin/sh
-
-#
-# Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# @test
-# @summary Verify the basic execution of the javah classes in classes.jar.
-
-TESTSRC=${TESTSRC:-.}
-TOPDIR=${TESTSRC}/../../..
-TESTJAVAEXE="${TESTJAVA:+${TESTJAVA}/bin/}java"
-
-"${TESTJAVAEXE}" -Xbootclasspath/p:${TOPDIR}/dist/lib/classes.jar \
- com.sun.tools.javac.Main \
- -d . "${TESTSRC}"/../HelloWorld.java
-
-"${TESTJAVAEXE}" -Xbootclasspath/p:${TOPDIR}/dist/lib/classes.jar \
- com.sun.tools.javah.Main \
- -classpath . -d . HelloWorld
-
-if diff ${TESTSRC}/../HelloWorld.gold.h HelloWorld.h ; then
- echo "Test passed."
-else
- echo "Test failed."
- exit 1
-fi
--- a/make/langtools/test/lib/src.gold.txt Tue Dec 26 13:38:31 2017 +0530
+++ b/make/langtools/test/lib/src.gold.txt Mon Jan 08 08:53:14 2018 -0800
@@ -29,15 +29,5 @@
com/sun/tools/javadoc/resources/javadoc.properties
com/sun/tools/javadoc/resources/javadoc_ja.properties
com/sun/tools/javadoc/resources/javadoc_zh_CN.properties
-com/sun/tools/javah/Main.java
-com/sun/tools/javah/resources/Linux_ppc.properties
-com/sun/tools/javah/resources/Linux_sparc.properties
-com/sun/tools/javah/resources/SunOS_sparc.properties
-com/sun/tools/javah/resources/SunOS_sparcv9.properties
-com/sun/tools/javah/resources/l10n.properties
-com/sun/tools/javah/resources/l10n_ja.properties
-com/sun/tools/javah/resources/l10n_zh_CN.properties
-com/sun/tools/javah/resources/win32_x86.properties
javax/lang/model/overview.html
javax/tools/overview.html
-sun/tools/javap/Main.java
--- a/make/langtools/tools/anttasks/SelectToolTask.java Tue Dec 26 13:38:31 2017 +0530
+++ b/make/langtools/tools/anttasks/SelectToolTask.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -76,7 +76,6 @@
NONE(""),
JAVAC("javac"),
JAVADOC("javadoc"),
- JAVAH("javah"),
JAVAP("javap"),
JSHELL("jshell");
--- a/make/nb_native/nbproject/configurations.xml Tue Dec 26 13:38:31 2017 +0530
+++ b/make/nb_native/nbproject/configurations.xml Mon Jan 08 08:53:14 2018 -0800
@@ -6670,18 +6670,6 @@
<in>examples.not-yet.txt</in>
</df>
</df>
- <df name="javah">
- <df name="6572945">
- <df name="gold">
- <df name="jni.dir.1">
- <in>TestClass1.h</in>
- <in>TestClass1_Inner1.h</in>
- <in>TestClass1_Inner2.h</in>
- <in>TestClass2.h</in>
- </df>
- </df>
- </df>
- </df>
<df name="jdeprscan">
<df name="tests">
<df name="jdk">
@@ -40851,26 +40839,6 @@
tool="3"
flavor2="0">
</item>
- <item path="../../test/langtools/tools/javah/6572945/gold/jni.dir.1/TestClass1.h"
- ex="false"
- tool="3"
- flavor2="0">
- </item>
- <item path="../../test/langtools/tools/javah/6572945/gold/jni.dir.1/TestClass1_Inner1.h"
- ex="false"
- tool="3"
- flavor2="0">
- </item>
- <item path="../../test/langtools/tools/javah/6572945/gold/jni.dir.1/TestClass1_Inner2.h"
- ex="false"
- tool="3"
- flavor2="0">
- </item>
- <item path="../../test/langtools/tools/javah/6572945/gold/jni.dir.1/TestClass2.h"
- ex="false"
- tool="3"
- flavor2="0">
- </item>
<item path="../../test/langtools/tools/jdeprscan/tests/jdk/jdeprscan/TestScanExpected.txt"
ex="false"
tool="3"
--- a/make/scripts/compare_exceptions.sh.incl Tue Dec 26 13:38:31 2017 +0530
+++ b/make/scripts/compare_exceptions.sh.incl Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -63,7 +63,6 @@
./bin/java
./bin/javac
./bin/javadoc
- ./bin/javah
./bin/javap
./bin/jdeps
./bin/jcmd
@@ -197,7 +196,6 @@
./bin/java
./bin/javac
./bin/javadoc
- ./bin/javah
./bin/javap
./bin/jdeps
./bin/jcmd
@@ -306,7 +304,6 @@
./bin/java
./bin/javac
./bin/javadoc
- ./bin/javah
./bin/javap
./bin/jdeps
./bin/jcmd
@@ -394,7 +391,6 @@
./bin/java.exe
./bin/javac.exe
./bin/javadoc.exe
- ./bin/javah.exe
./bin/javap.exe
./bin/jdeps.exe
./bin/javaw.exe
@@ -486,7 +482,6 @@
./bin/java
./bin/javac
./bin/javadoc
- ./bin/javah
./bin/javap
./bin/javaws
./bin/jdeps
--- a/make/test/JtregNativeHotspot.gmk Tue Dec 26 13:38:31 2017 +0530
+++ b/make/test/JtregNativeHotspot.gmk Mon Jan 08 08:53:14 2018 -0800
@@ -113,6 +113,8 @@
BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libHandshakeTransitionTest := -lc
BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libHasNoEntryPoint := -lc
BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libReturnError := -lc
+ BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libCNLookUp := -lc
+ BUILD_HOTSPOT_JTREG_LIBRARIES_LDFLAGS_libTestCheckedEnsureLocalCapacity := -lc
endif
ifeq ($(OPENJDK_TARGET_OS), linux)
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp Tue Dec 26 13:38:31 2017 +0530
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp Mon Jan 08 08:53:14 2018 -0800
@@ -3742,13 +3742,16 @@
}
void MacroAssembler::set_narrow_oop(Register dst, jobject obj) {
- assert (UseCompressedOops, "should only be used for compressed oops");
- assert (Universe::heap() != NULL, "java heap should be initialized");
- assert (oop_recorder() != NULL, "this assembler needs an OopRecorder");
-
+#ifdef ASSERT
+ {
+ ThreadInVMfromUnknown tiv;
+ assert (UseCompressedOops, "should only be used for compressed oops");
+ assert (Universe::heap() != NULL, "java heap should be initialized");
+ assert (oop_recorder() != NULL, "this assembler needs an OopRecorder");
+ assert(Universe::heap()->is_in_reserved(JNIHandles::resolve(obj)), "should be real oop");
+ }
+#endif
int oop_index = oop_recorder()->find_index(obj);
- assert(Universe::heap()->is_in_reserved(JNIHandles::resolve(obj)), "should be real oop");
-
InstructionMark im(this);
RelocationHolder rspec = oop_Relocation::spec(oop_index);
code_section()->relocate(inst_mark(), rspec);
@@ -4006,8 +4009,13 @@
if (obj == NULL) {
oop_index = oop_recorder()->allocate_oop_index(obj);
} else {
+#ifdef ASSERT
+ {
+ ThreadInVMfromUnknown tiv;
+ assert(Universe::heap()->is_in_reserved(JNIHandles::resolve(obj)), "should be real oop");
+ }
+#endif
oop_index = oop_recorder()->find_index(obj);
- assert(Universe::heap()->is_in_reserved(JNIHandles::resolve(obj)), "should be real oop");
}
RelocationHolder rspec = oop_Relocation::spec(oop_index);
if (! immediate) {
@@ -4030,8 +4038,13 @@
}
Address MacroAssembler::constant_oop_address(jobject obj) {
- assert(oop_recorder() != NULL, "this assembler needs an OopRecorder");
- assert(Universe::heap()->is_in_reserved(JNIHandles::resolve(obj)), "not an oop");
+#ifdef ASSERT
+ {
+ ThreadInVMfromUnknown tiv;
+ assert(oop_recorder() != NULL, "this assembler needs an OopRecorder");
+ assert(Universe::heap()->is_in_reserved(JNIHandles::resolve(obj)), "not an oop");
+ }
+#endif
int oop_index = oop_recorder()->find_index(obj);
return Address((address)obj, oop_Relocation::spec(oop_index));
}
--- a/src/hotspot/cpu/s390/templateTable_s390.cpp Tue Dec 26 13:38:31 2017 +0530
+++ b/src/hotspot/cpu/s390/templateTable_s390.cpp Mon Jan 08 08:53:14 2018 -0800
@@ -3722,7 +3722,6 @@
Label slow_case;
Label done;
Label initialize_header;
- Label initialize_object; // Including clearing the fields.
Label allocate_shared;
BLOCK_COMMENT("TemplateTable::_new {");
@@ -3760,65 +3759,41 @@
// Allocate the instance
// 1) Try to allocate in the TLAB.
- // 2) If fail and the object is large allocate in the shared Eden.
- // 3) If the above fails (or is not applicable), go to a slow case
+ // 2) If the above fails (or is not applicable), go to a slow case
// (creates a new TLAB, etc.).
-
- // Always go the slow path. See comment above this template.
- const bool allow_shared_alloc = false;
-
+ // Note: compared to other architectures, s390's implementation always goes
+ // to the slow path if TLAB is used and fails.
if (UseTLAB) {
Register RoldTopValue = RallocatedObject;
Register RnewTopValue = tmp;
__ z_lg(RoldTopValue, Address(Z_thread, JavaThread::tlab_top_offset()));
__ load_address(RnewTopValue, Address(RoldTopValue, Rsize));
__ z_cg(RnewTopValue, Address(Z_thread, JavaThread::tlab_end_offset()));
- __ z_brh(allow_shared_alloc ? allocate_shared : slow_case);
+ __ z_brh(slow_case);
__ z_stg(RnewTopValue, Address(Z_thread, JavaThread::tlab_top_offset()));
- if (ZeroTLAB) {
- // The fields have been already cleared.
- __ z_bru(initialize_header);
- } else {
- // Initialize both the header and fields.
- if (allow_shared_alloc) {
- __ z_bru(initialize_object);
- } else {
- // Fallthrough to initialize_object, but assert that it is on fall through path.
- prev_instr_address = __ pc();
- }
- }
- }
-
- if (allow_shared_alloc) {
- // Allocation in shared Eden not implemented, because sapjvm allocation trace does not allow it.
- Unimplemented();
- }
-
- if (UseTLAB) {
+
Register RobjectFields = tmp;
Register Rzero = Z_R1_scratch;
-
- assert(ZeroTLAB || prev_instr_address == __ pc(),
- "must not omit jump to initialize_object above, as it is not on the fall through path");
__ clear_reg(Rzero, true /*whole reg*/, false); // Load 0L into Rzero. Don't set CC.
- // The object is initialized before the header. If the object size is
- // zero, go directly to the header initialization.
- __ bind(initialize_object);
- __ z_aghi(Rsize, (int)-sizeof(oopDesc)); // Subtract header size, set CC.
- __ z_bre(initialize_header); // Jump if size of fields is zero.
-
- // Initialize object fields.
- // See documentation for MVCLE instruction!!!
- assert(RobjectFields->encoding() % 2 == 0, "RobjectFields must be an even register");
- assert(Rsize->encoding() == (RobjectFields->encoding()+1),
- "RobjectFields and Rsize must be a register pair");
- assert(Rzero->encoding() % 2 == 1, "Rzero must be an odd register");
-
- // Set Rzero to 0 and use it as src length, then mvcle will copy nothing
- // and fill the object with the padding value 0.
- __ add2reg(RobjectFields, sizeof(oopDesc), RallocatedObject);
- __ move_long_ext(RobjectFields, as_Register(Rzero->encoding() - 1), 0);
+ if (!ZeroTLAB) {
+ // The object is initialized before the header. If the object size is
+ // zero, go directly to the header initialization.
+ __ z_aghi(Rsize, (int)-sizeof(oopDesc)); // Subtract header size, set CC.
+ __ z_bre(initialize_header); // Jump if size of fields is zero.
+
+ // Initialize object fields.
+ // See documentation for MVCLE instruction!!!
+ assert(RobjectFields->encoding() % 2 == 0, "RobjectFields must be an even register");
+ assert(Rsize->encoding() == (RobjectFields->encoding()+1),
+ "RobjectFields and Rsize must be a register pair");
+ assert(Rzero->encoding() % 2 == 1, "Rzero must be an odd register");
+
+ // Set Rzero to 0 and use it as src length, then mvcle will copy nothing
+ // and fill the object with the padding value 0.
+ __ add2reg(RobjectFields, sizeof(oopDesc), RallocatedObject);
+ __ move_long_ext(RobjectFields, as_Register(Rzero->encoding() - 1), 0);
+ }
// Initialize object header only.
__ bind(initialize_header);
--- a/src/hotspot/cpu/x86/macroAssembler_x86_pow.cpp Tue Dec 26 13:38:31 2017 +0530
+++ b/src/hotspot/cpu/x86/macroAssembler_x86_pow.cpp Mon Jan 08 08:53:14 2018 -0800
@@ -765,6 +765,11 @@
0xfefa39efUL, 0x3fe62e42UL, 0xfefa39efUL, 0xbfe62e42UL
};
+ALIGNED_(8) juint _DOUBLE2[] =
+{
+ 0x00000000UL, 0x40000000UL
+};
+
//registers,
// input: xmm0, xmm1
// scratch: xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7
@@ -803,6 +808,7 @@
address HIGHMASK_LOG_X = (address)_HIGHMASK_LOG_X;
address HALFMASK = (address)_HALFMASK;
address log2 = (address)_log2_pow;
+ address DOUBLE2 = (address)_DOUBLE2;
bind(start);
@@ -810,6 +816,13 @@
movsd(Address(rsp, 8), xmm0);
movsd(Address(rsp, 16), xmm1);
+ // Special case: pow(x, 2.0) => x * x
+ movdq(tmp1, xmm1);
+ cmp64(tmp1, ExternalAddress(DOUBLE2));
+ jccb(Assembler::notEqual, B1_2);
+ mulsd(xmm0, xmm0);
+ jmp(B1_5);
+
bind(B1_2);
pextrw(eax, xmm0, 3);
xorpd(xmm2, xmm2);
--- a/src/hotspot/cpu/x86/vm_version_x86.cpp Tue Dec 26 13:38:31 2017 +0530
+++ b/src/hotspot/cpu/x86/vm_version_x86.cpp Mon Jan 08 08:53:14 2018 -0800
@@ -882,7 +882,7 @@
FLAG_SET_DEFAULT(UseSHA256Intrinsics, false);
}
- if (UseSHA) {
+ if (UseSHA && supports_avx2() && supports_bmi2()) {
if (FLAG_IS_DEFAULT(UseSHA512Intrinsics)) {
FLAG_SET_DEFAULT(UseSHA512Intrinsics, true);
}
--- a/src/hotspot/cpu/x86/x86_64.ad Tue Dec 26 13:38:31 2017 +0530
+++ b/src/hotspot/cpu/x86/x86_64.ad Mon Jan 08 08:53:14 2018 -0800
@@ -547,8 +547,12 @@
#define __ _masm.
+static bool generate_vzeroupper(Compile* C) {
+ return (VM_Version::supports_vzeroupper() && (C->max_vector_size() > 16 || C->clear_upper_avx() == true)) ? true: false; // Generate vzeroupper
+}
+
static int clear_avx_size() {
- return (VM_Version::supports_vzeroupper()) ? 3: 0; // vzeroupper
+ return generate_vzeroupper(Compile::current()) ? 3: 0; // vzeroupper
}
// !!!!! Special hack to get all types of calls to specify the byte offset
@@ -931,7 +935,7 @@
void MachEpilogNode::format(PhaseRegAlloc* ra_, outputStream* st) const
{
Compile* C = ra_->C;
- if (VM_Version::supports_vzeroupper()) {
+ if (generate_vzeroupper(C)) {
st->print("vzeroupper");
st->cr(); st->print("\t");
}
@@ -971,9 +975,11 @@
Compile* C = ra_->C;
MacroAssembler _masm(&cbuf);
- // Clear upper bits of YMM registers when current compiled code uses
- // wide vectors to avoid AVX <-> SSE transition penalty during call.
- __ vzeroupper();
+ if (generate_vzeroupper(C)) {
+ // Clear upper bits of YMM registers when current compiled code uses
+ // wide vectors to avoid AVX <-> SSE transition penalty during call.
+ __ vzeroupper();
+ }
int framesize = C->frame_size_in_bytes();
assert((framesize & (StackAlignmentInBytes-1)) == 0, "frame size not aligned");
@@ -2112,11 +2118,13 @@
enc_class clear_avx %{
debug_only(int off0 = cbuf.insts_size());
- // Clear upper bits of YMM registers to avoid AVX <-> SSE transition penalty
- // Clear upper bits of YMM registers when current compiled code uses
- // wide vectors to avoid AVX <-> SSE transition penalty during call.
- MacroAssembler _masm(&cbuf);
- __ vzeroupper();
+ if (generate_vzeroupper(Compile::current())) {
+ // Clear upper bits of YMM registers to avoid AVX <-> SSE transition penalty
+ // Clear upper bits of YMM registers when current compiled code uses
+ // wide vectors to avoid AVX <-> SSE transition penalty during call.
+ MacroAssembler _masm(&cbuf);
+ __ vzeroupper();
+ }
debug_only(int off1 = cbuf.insts_size());
assert(off1 - off0 == clear_avx_size(), "correct size prediction");
%}
--- a/src/hotspot/os/linux/osContainer_linux.cpp Tue Dec 26 13:38:31 2017 +0530
+++ b/src/hotspot/os/linux/osContainer_linux.cpp Mon Jan 08 08:53:14 2018 -0800
@@ -31,16 +31,11 @@
#include "logging/log.hpp"
#include "osContainer_linux.hpp"
-/*
- * Warning: Some linux distros use 0x7FFFFFFFFFFFF000
- * and others use 0x7FFFFFFFFFFFFFFF for unlimited.
- */
-#define UNLIMITED_MEM CONST64(0x7FFFFFFFFFFFF000)
-
#define PER_CPU_SHARES 1024
bool OSContainer::_is_initialized = false;
bool OSContainer::_is_containerized = false;
+julong _unlimited_memory;
class CgroupSubsystem: CHeapObj<mtInternal> {
friend class OSContainer;
@@ -217,6 +212,8 @@
_is_initialized = true;
_is_containerized = false;
+ _unlimited_memory = (LONG_MAX / os::vm_page_size()) * os::vm_page_size();
+
log_trace(os, container)("OSContainer::init: Initializing Container Support");
if (!UseContainerSupport) {
log_trace(os, container)("Container Support not enabled");
@@ -419,37 +416,37 @@
* OSCONTAINER_ERROR for not supported
*/
jlong OSContainer::memory_limit_in_bytes() {
- GET_CONTAINER_INFO(jlong, memory, "/memory.limit_in_bytes",
- "Memory Limit is: " JLONG_FORMAT, JLONG_FORMAT, memlimit);
+ GET_CONTAINER_INFO(julong, memory, "/memory.limit_in_bytes",
+ "Memory Limit is: " JULONG_FORMAT, JULONG_FORMAT, memlimit);
- if (memlimit >= UNLIMITED_MEM) {
+ if (memlimit >= _unlimited_memory) {
log_trace(os, container)("Memory Limit is: Unlimited");
return (jlong)-1;
}
else {
- return memlimit;
+ return (jlong)memlimit;
}
}
jlong OSContainer::memory_and_swap_limit_in_bytes() {
- GET_CONTAINER_INFO(jlong, memory, "/memory.memsw.limit_in_bytes",
- "Memory and Swap Limit is: " JLONG_FORMAT, JLONG_FORMAT, memswlimit);
- if (memswlimit >= UNLIMITED_MEM) {
+ GET_CONTAINER_INFO(julong, memory, "/memory.memsw.limit_in_bytes",
+ "Memory and Swap Limit is: " JULONG_FORMAT, JULONG_FORMAT, memswlimit);
+ if (memswlimit >= _unlimited_memory) {
log_trace(os, container)("Memory and Swap Limit is: Unlimited");
return (jlong)-1;
} else {
- return memswlimit;
+ return (jlong)memswlimit;
}
}
jlong OSContainer::memory_soft_limit_in_bytes() {
- GET_CONTAINER_INFO(jlong, memory, "/memory.soft_limit_in_bytes",
- "Memory Soft Limit is: " JLONG_FORMAT, JLONG_FORMAT, memsoftlimit);
- if (memsoftlimit >= UNLIMITED_MEM) {
+ GET_CONTAINER_INFO(julong, memory, "/memory.soft_limit_in_bytes",
+ "Memory Soft Limit is: " JULONG_FORMAT, JULONG_FORMAT, memsoftlimit);
+ if (memsoftlimit >= _unlimited_memory) {
log_trace(os, container)("Memory Soft Limit is: Unlimited");
return (jlong)-1;
} else {
- return memsoftlimit;
+ return (jlong)memsoftlimit;
}
}
--- a/src/hotspot/share/ci/ciField.cpp Tue Dec 26 13:38:31 2017 +0530
+++ b/src/hotspot/share/ci/ciField.cpp Mon Jan 08 08:53:14 2018 -0800
@@ -234,7 +234,9 @@
// Get the flags, offset, and canonical holder of the field.
_flags = ciFlags(fd->access_flags());
_offset = fd->offset();
- _holder = CURRENT_ENV->get_instance_klass(fd->field_holder());
+ Klass* field_holder = fd->field_holder();
+ assert(field_holder != NULL, "null field_holder");
+ _holder = CURRENT_ENV->get_instance_klass(field_holder);
// Check to see if the field is constant.
Klass* k = _holder->get_Klass();
--- a/src/hotspot/share/classfile/classFileParser.cpp Tue Dec 26 13:38:31 2017 +0530
+++ b/src/hotspot/share/classfile/classFileParser.cpp Mon Jan 08 08:53:14 2018 -0800
@@ -86,8 +86,6 @@
#define JAVA_CLASSFILE_MAGIC 0xCAFEBABE
#define JAVA_MIN_SUPPORTED_VERSION 45
-#define JAVA_MAX_SUPPORTED_VERSION 54
-#define JAVA_MAX_SUPPORTED_MINOR_VERSION 0
// Used for two backward compatibility reasons:
// - to check for new additions to the class file format in JDK1.5
@@ -110,6 +108,8 @@
#define JAVA_10_VERSION 54
+#define JAVA_11_VERSION 55
+
void ClassFileParser::set_class_bad_constant_seen(short bad_constant) {
assert((bad_constant == 19 || bad_constant == 20) && _major_version >= JAVA_9_VERSION,
"Unexpected bad constant pool entry");
@@ -4642,11 +4642,11 @@
}
static bool is_supported_version(u2 major, u2 minor){
- const u2 max_version = JAVA_MAX_SUPPORTED_VERSION;
+ const u2 max_version = JVM_CLASSFILE_MAJOR_VERSION;
return (major >= JAVA_MIN_SUPPORTED_VERSION) &&
(major <= max_version) &&
((major != max_version) ||
- (minor <= JAVA_MAX_SUPPORTED_MINOR_VERSION));
+ (minor <= JVM_CLASSFILE_MINOR_VERSION));
}
void ClassFileParser::verify_legal_field_modifiers(jint flags,
@@ -5808,8 +5808,8 @@
_class_name->as_C_string(),
_major_version,
_minor_version,
- JAVA_MAX_SUPPORTED_VERSION,
- JAVA_MAX_SUPPORTED_MINOR_VERSION);
+ JVM_CLASSFILE_MAJOR_VERSION,
+ JVM_CLASSFILE_MINOR_VERSION);
return;
}
--- a/src/hotspot/share/classfile/classListParser.cpp Tue Dec 26 13:38:31 2017 +0530
+++ b/src/hotspot/share/classfile/classListParser.cpp Mon Jan 08 08:53:14 2018 -0800
@@ -315,12 +315,13 @@
return k;
}
-InstanceKlass* ClassListParser::load_current_class(TRAPS) {
+Klass* ClassListParser::load_current_class(TRAPS) {
TempNewSymbol class_name_symbol = SymbolTable::new_symbol(_class_name, THREAD);
guarantee(!HAS_PENDING_EXCEPTION, "Exception creating a symbol.");
- InstanceKlass *klass = NULL;
+ Klass *klass = NULL;
if (!is_loading_from_source()) {
+ // Load classes for the boot/platform/app loaders only.
if (is_super_specified()) {
error("If source location is not specified, super class must not be specified");
}
@@ -330,40 +331,36 @@
bool non_array = !FieldType::is_array(class_name_symbol);
- Handle s = java_lang_String::create_from_symbol(class_name_symbol, CHECK_0);
- // Translate to external class name format, i.e., convert '/' chars to '.'
- Handle string = java_lang_String::externalize_classname(s, CHECK_0);
JavaValue result(T_OBJECT);
- InstanceKlass* spec_klass = non_array ?
- SystemDictionary::ClassLoader_klass() : SystemDictionary::Class_klass();
- Symbol* method_name = non_array ?
- vmSymbols::loadClass_name() : vmSymbols::forName_name();
- Handle loader = Handle(THREAD, SystemDictionary::java_system_loader());
+ if (non_array) {
+ // At this point, we are executing in the context of the boot loader. We
+ // cannot call Class.forName because that is context dependent and
+ // would load only classes for the boot loader.
+ //
+ // Instead, let's call java_system_loader().loadClass() directly, which will
+ // delegate to the correct loader (boot, platform or app) depending on
+ // the class name.
- if (non_array) {
+ Handle s = java_lang_String::create_from_symbol(class_name_symbol, CHECK_0);
+ // ClassLoader.loadClass() wants external class name format, i.e., convert '/' chars to '.'
+ Handle ext_class_name = java_lang_String::externalize_classname(s, CHECK_0);
+ Handle loader = Handle(THREAD, SystemDictionary::java_system_loader());
+
JavaCalls::call_virtual(&result,
loader, //SystemDictionary::java_system_loader(),
- spec_klass,
- method_name, //vmSymbols::loadClass_name(),
+ SystemDictionary::ClassLoader_klass(),
+ vmSymbols::loadClass_name(),
vmSymbols::string_class_signature(),
- string,
+ ext_class_name,
THREAD);
} else {
- JavaCalls::call_static(&result,
- spec_klass,
- method_name,
- vmSymbols::string_class_signature(),
- string,
- CHECK_NULL);
+ // array classes are not supported in class list.
+ THROW_NULL(vmSymbols::java_lang_ClassNotFoundException());
}
assert(result.get_type() == T_OBJECT, "just checking");
oop obj = (oop) result.get_jobject();
if (!HAS_PENDING_EXCEPTION && (obj != NULL)) {
- if (non_array) {
- klass = InstanceKlass::cast(java_lang_Class::as_Klass(obj));
- } else {
- klass = static_cast<InstanceKlass*>(java_lang_Class::array_klass_acquire(obj));
- }
+ klass = java_lang_Class::as_Klass(obj);
} else { // load classes in bootclasspath/a
if (HAS_PENDING_EXCEPTION) {
CLEAR_PENDING_EXCEPTION;
@@ -372,7 +369,7 @@
if (non_array) {
Klass* k = SystemDictionary::resolve_or_null(class_name_symbol, CHECK_NULL);
if (k != NULL) {
- klass = InstanceKlass::cast(k);
+ klass = k;
} else {
if (!HAS_PENDING_EXCEPTION) {
THROW_NULL(vmSymbols::java_lang_ClassNotFoundException());
@@ -388,14 +385,15 @@
}
}
- if (klass != NULL && is_id_specified()) {
+ if (klass != NULL && klass->is_instance_klass() && is_id_specified()) {
+ InstanceKlass* ik = InstanceKlass::cast(klass);
int id = this->id();
- SystemDictionaryShared::update_shared_entry(klass, id);
+ SystemDictionaryShared::update_shared_entry(ik, id);
InstanceKlass* old = table()->lookup(id);
- if (old != NULL && old != klass) {
+ if (old != NULL && old != ik) {
error("Duplicated ID %d for class %s", id, _class_name);
}
- table()->add(id, klass);
+ table()->add(id, ik);
}
return klass;
--- a/src/hotspot/share/classfile/classListParser.hpp Tue Dec 26 13:38:31 2017 +0530
+++ b/src/hotspot/share/classfile/classListParser.hpp Mon Jan 08 08:53:14 2018 -0800
@@ -136,7 +136,7 @@
return _class_name;
}
- InstanceKlass* load_current_class(TRAPS);
+ Klass* load_current_class(TRAPS);
bool is_loading_from_source();
--- a/src/hotspot/share/classfile/classLoaderData.cpp Tue Dec 26 13:38:31 2017 +0530
+++ b/src/hotspot/share/classfile/classLoaderData.cpp Mon Jan 08 08:53:14 2018 -0800
@@ -574,9 +574,9 @@
ls.cr();
}
- // In some rare cases items added to this list will not be freed elsewhere.
- // To keep it simple, just free everything in it here.
- free_deallocate_list();
+ // Some items on the _deallocate_list need to free their C heap structures
+ // if they are not already on the _klasses list.
+ unload_deallocate_list();
// Clean up global class iterator for compiler
static_klass_iterator.adjust_saved_class(this);
@@ -755,6 +755,7 @@
}
void ClassLoaderData::remove_handle(OopHandle h) {
+ assert(!is_unloading(), "Do not remove a handle for a CLD that is unloading");
oop* ptr = h.ptr_raw();
if (ptr != NULL) {
assert(_handles.contains(ptr), "Got unexpected handle " PTR_FORMAT, p2i(ptr));
@@ -799,6 +800,7 @@
void ClassLoaderData::free_deallocate_list() {
// Don't need lock, at safepoint
assert(SafepointSynchronize::is_at_safepoint(), "only called at safepoint");
+ assert(!is_unloading(), "only called for ClassLoaderData that are not unloading");
if (_deallocate_list == NULL) {
return;
}
@@ -828,6 +830,36 @@
}
}
+// This is distinct from free_deallocate_list. For class loader data that are
+// unloading, this frees the C heap memory for items on the list, and unlinks
+// scratch or error classes so that unloading events aren't triggered for these
+// classes. The metadata is removed with the unloading metaspace.
+// There isn't C heap memory allocated for methods, so nothing is done for them.
+void ClassLoaderData::unload_deallocate_list() {
+ // Don't need lock, at safepoint
+ assert(SafepointSynchronize::is_at_safepoint(), "only called at safepoint");
+ assert(is_unloading(), "only called for ClassLoaderData that are unloading");
+ if (_deallocate_list == NULL) {
+ return;
+ }
+ // Go backwards because this removes entries that are freed.
+ for (int i = _deallocate_list->length() - 1; i >= 0; i--) {
+ Metadata* m = _deallocate_list->at(i);
+ assert (!m->on_stack(), "wouldn't be unloading if this were so");
+ _deallocate_list->remove_at(i);
+ if (m->is_constantPool()) {
+ ((ConstantPool*)m)->release_C_heap_structures();
+ } else if (m->is_klass()) {
+ InstanceKlass* ik = (InstanceKlass*)m;
+ // also releases ik->constants() C heap memory
+ InstanceKlass::release_C_heap_structures(ik);
+ // Remove the class so unloading events aren't triggered for
+ // this class (scratch or error class) in do_unloading().
+ remove_class(ik);
+ }
+ }
+}
+
// These anonymous class loaders are to contain classes used for JSR292
ClassLoaderData* ClassLoaderData::anonymous_class_loader_data(oop loader, TRAPS) {
// Add a new class loader data to the graph.
--- a/src/hotspot/share/classfile/classLoaderData.hpp Tue Dec 26 13:38:31 2017 +0530
+++ b/src/hotspot/share/classfile/classLoaderData.hpp Mon Jan 08 08:53:14 2018 -0800
@@ -307,7 +307,8 @@
void packages_do(void f(PackageEntry*));
// Deallocate free list during class unloading.
- void free_deallocate_list();
+ void free_deallocate_list(); // for the classes that are not unloaded
+ void unload_deallocate_list(); // for the classes that are unloaded
// Allocate out of this class loader data
MetaWord* allocate(size_t size);
--- a/src/hotspot/share/classfile/vmSymbols.hpp Tue Dec 26 13:38:31 2017 +0530
+++ b/src/hotspot/share/classfile/vmSymbols.hpp Mon Jan 08 08:53:14 2018 -0800
@@ -996,8 +996,8 @@
do_name( montgomerySquare_name, "implMontgomerySquare") \
do_signature(montgomerySquare_signature, "([I[IIJ[I)[I") \
\
- do_class(java_util_ArraysSupport, "java/util/ArraysSupport") \
- do_intrinsic(_vectorizedMismatch, java_util_ArraysSupport, vectorizedMismatch_name, vectorizedMismatch_signature, F_S)\
+ do_class(jdk_internal_util_ArraysSupport, "jdk/internal/util/ArraysSupport") \
+ do_intrinsic(_vectorizedMismatch, jdk_internal_util_ArraysSupport, vectorizedMismatch_name, vectorizedMismatch_signature, F_S)\
do_name(vectorizedMismatch_name, "vectorizedMismatch") \
do_signature(vectorizedMismatch_signature, "(Ljava/lang/Object;JLjava/lang/Object;JII)I") \
\
--- a/src/hotspot/share/compiler/compileBroker.cpp Tue Dec 26 13:38:31 2017 +0530
+++ b/src/hotspot/share/compiler/compileBroker.cpp Mon Jan 08 08:53:14 2018 -0800
@@ -1852,17 +1852,23 @@
TraceTime t1("compilation", &time);
EventCompilation event;
- JVMCIEnv env(task, system_dictionary_modification_counter);
- methodHandle method(thread, target_handle);
- jvmci->compile_method(method, osr_bci, &env);
-
- post_compile(thread, task, event, task->code() != NULL, NULL);
+ // Skip redefined methods
+ if (target_handle->is_old()) {
+ failure_reason = "redefined method";
+ retry_message = "not retryable";
+ compilable = ciEnv::MethodCompilable_never;
+ } else {
+ JVMCIEnv env(task, system_dictionary_modification_counter);
+ methodHandle method(thread, target_handle);
+ jvmci->compile_method(method, osr_bci, &env);
- failure_reason = env.failure_reason();
- if (!env.retryable()) {
- retry_message = "not retryable";
- compilable = ciEnv::MethodCompilable_not_at_tier;
+ failure_reason = env.failure_reason();
+ if (!env.retryable()) {
+ retry_message = "not retryable";
+ compilable = ciEnv::MethodCompilable_not_at_tier;
+ }
}
+ post_compile(thread, task, event, task->code() != NULL, NULL);
} else
#endif // INCLUDE_JVMCI
--- a/src/hotspot/share/gc/g1/g1AllocRegion.cpp Tue Dec 26 13:38:31 2017 +0530
+++ b/src/hotspot/share/gc/g1/g1AllocRegion.cpp Mon Jan 08 08:53:14 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -42,17 +42,17 @@
// Make sure that any allocation attempt on this region will fail
// and will not trigger any asserts.
- assert(allocate(dummy_region, 1, false) == NULL, "should fail");
- assert(par_allocate(dummy_region, 1, false) == NULL, "should fail");
- assert(allocate(dummy_region, 1, true) == NULL, "should fail");
- assert(par_allocate(dummy_region, 1, true) == NULL, "should fail");
+ assert(dummy_region->allocate_no_bot_updates(1) == NULL, "should fail");
+ assert(dummy_region->allocate(1) == NULL, "should fail");
+ DEBUG_ONLY(size_t assert_tmp);
+ assert(dummy_region->par_allocate_no_bot_updates(1, 1, &assert_tmp) == NULL, "should fail");
+ assert(dummy_region->par_allocate(1, 1, &assert_tmp) == NULL, "should fail");
_g1h = g1h;
_dummy_region = dummy_region;
}
-size_t G1AllocRegion::fill_up_remaining_space(HeapRegion* alloc_region,
- bool bot_updates) {
+size_t G1AllocRegion::fill_up_remaining_space(HeapRegion* alloc_region) {
assert(alloc_region != NULL && alloc_region != _dummy_region,
"pre-condition");
size_t result = 0;
@@ -74,7 +74,7 @@
size_t min_word_size_to_fill = CollectedHeap::min_fill_size();
while (free_word_size >= min_word_size_to_fill) {
- HeapWord* dummy = par_allocate(alloc_region, free_word_size, bot_updates);
+ HeapWord* dummy = par_allocate(alloc_region, free_word_size);
if (dummy != NULL) {
// If the allocation was successful we should fill in the space.
CollectedHeap::fill_with_object(dummy, free_word_size);
@@ -110,7 +110,7 @@
"the alloc region should never be empty");
if (fill_up) {
- result = fill_up_remaining_space(alloc_region, _bot_updates);
+ result = fill_up_remaining_space(alloc_region);
}
assert_alloc_region(alloc_region->used() >= _used_bytes_before, "invariant");
@@ -135,7 +135,7 @@
new_alloc_region->reset_pre_dummy_top();
// Need to do this before the allocation
_used_bytes_before = new_alloc_region->used();
- HeapWord* result = allocate(new_alloc_region, word_size, _bot_updates);
+ HeapWord* result = allocate(new_alloc_region, word_size);
assert_alloc_region(result != NULL, "the allocation should succeeded");
OrderAccess::storestore();
@@ -301,7 +301,7 @@
// possible object. In this case this region will not be retained, so the
// original problem cannot occur.
if (to_allocate_words >= G1CollectedHeap::min_fill_size()) {
- HeapWord* dummy = attempt_allocation(to_allocate_words, true /* bot_updates */);
+ HeapWord* dummy = attempt_allocation(to_allocate_words);
CollectedHeap::fill_with_object(dummy, to_allocate_words);
}
}
--- a/src/hotspot/share/gc/g1/g1AllocRegion.hpp Tue Dec 26 13:38:31 2017 +0530
+++ b/src/hotspot/share/gc/g1/g1AllocRegion.hpp Mon Jan 08 08:53:14 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -83,37 +83,27 @@
// whether the _alloc_region is NULL or not.
static HeapRegion* _dummy_region;
- // Some of the methods below take a bot_updates parameter. Its value
- // should be the same as the _bot_updates field. The idea is that
- // the parameter will be a constant for a particular alloc region
- // and, given that these methods will be hopefully inlined, the
- // compiler should compile out the test.
-
// Perform a non-MT-safe allocation out of the given region.
- static inline HeapWord* allocate(HeapRegion* alloc_region,
- size_t word_size,
- bool bot_updates);
+ inline HeapWord* allocate(HeapRegion* alloc_region,
+ size_t word_size);
// Perform a MT-safe allocation out of the given region.
- static inline HeapWord* par_allocate(HeapRegion* alloc_region,
- size_t word_size,
- bool bot_updates);
+ inline HeapWord* par_allocate(HeapRegion* alloc_region,
+ size_t word_size);
// Perform a MT-safe allocation out of the given region, with the given
// minimum and desired size. Returns the actual size allocated (between
// minimum and desired size) in actual_word_size if the allocation has been
// successful.
- static inline HeapWord* par_allocate(HeapRegion* alloc_region,
- size_t min_word_size,
- size_t desired_word_size,
- size_t* actual_word_size,
- bool bot_updates);
+ inline HeapWord* par_allocate(HeapRegion* alloc_region,
+ size_t min_word_size,
+ size_t desired_word_size,
+ size_t* actual_word_size);
// Ensure that the region passed as a parameter has been filled up
// so that noone else can allocate out of it any more.
// Returns the number of bytes that have been wasted by filled up
// the space.
- static size_t fill_up_remaining_space(HeapRegion* alloc_region,
- bool bot_updates);
+ size_t fill_up_remaining_space(HeapRegion* alloc_region);
// After a region is allocated by alloc_new_region, this
// method is used to set it as the active alloc_region
@@ -160,8 +150,7 @@
// First-level allocation: Should be called without holding a
// lock. It will try to allocate lock-free out of the active region,
// or return NULL if it was unable to.
- inline HeapWord* attempt_allocation(size_t word_size,
- bool bot_updates);
+ inline HeapWord* attempt_allocation(size_t word_size);
// Perform an allocation out of the current allocation region, with the given
// minimum and desired size. Returns the actual size allocated (between
// minimum and desired size) in actual_word_size if the allocation has been
@@ -170,8 +159,7 @@
// out of the active region, or return NULL if it was unable to.
inline HeapWord* attempt_allocation(size_t min_word_size,
size_t desired_word_size,
- size_t* actual_word_size,
- bool bot_updates);
+ size_t* actual_word_size);
// Second-level allocation: Should be called while holding a
// lock. It will try to first allocate lock-free out of the active
@@ -179,23 +167,20 @@
// alloc region with a new one. We require that the caller takes the
// appropriate lock before calling this so that it is easier to make
// it conform to its locking protocol.
- inline HeapWord* attempt_allocation_locked(size_t word_size,
- bool bot_updates);
+ inline HeapWord* attempt_allocation_locked(size_t word_size);
// Same as attempt_allocation_locked(size_t, bool), but allowing specification
// of minimum word size of the block in min_word_size, and the maximum word
// size of the allocation in desired_word_size. The actual size of the block is
// returned in actual_word_size.
inline HeapWord* attempt_allocation_locked(size_t min_word_size,
size_t desired_word_size,
- size_t* actual_word_size,
- bool bot_updates);
+ size_t* actual_word_size);
// Should be called to allocate a new region even if the max of this
// type of regions has been reached. Should only be called if other
// allocation attempts have failed and we are not holding a valid
// active region.
- inline HeapWord* attempt_allocation_force(size_t word_size,
- bool bot_updates);
+ inline HeapWord* attempt_allocation_force(size_t word_size);
// Should be called before we start using this object.
void init();
@@ -236,7 +221,7 @@
virtual void retire_region(HeapRegion* alloc_region, size_t allocated_bytes);
virtual size_t retire(bool fill_up);
-public:
+
G1GCAllocRegion(const char* name, bool bot_updates, G1EvacStats* stats, InCSetState::in_cset_state_t purpose)
: G1AllocRegion(name, bot_updates), _stats(stats), _purpose(purpose) {
assert(stats != NULL, "Must pass non-NULL PLAB statistics");
--- a/src/hotspot/share/gc/g1/g1AllocRegion.inline.hpp Tue Dec 26 13:38:31 2017 +0530
+++ b/src/hotspot/share/gc/g1/g1AllocRegion.inline.hpp Mon Jan 08 08:53:14 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -37,52 +37,47 @@
inline HeapWord* G1AllocRegion::allocate(HeapRegion* alloc_region,
- size_t word_size,
- bool bot_updates) {
+ size_t word_size) {
assert(alloc_region != NULL, "pre-condition");
- if (!bot_updates) {
+ if (!_bot_updates) {
return alloc_region->allocate_no_bot_updates(word_size);
} else {
return alloc_region->allocate(word_size);
}
}
-inline HeapWord* G1AllocRegion::par_allocate(HeapRegion* alloc_region, size_t word_size, bool bot_updates) {
+inline HeapWord* G1AllocRegion::par_allocate(HeapRegion* alloc_region, size_t word_size) {
size_t temp;
- return par_allocate(alloc_region, word_size, word_size, &temp, bot_updates);
+ return par_allocate(alloc_region, word_size, word_size, &temp);
}
inline HeapWord* G1AllocRegion::par_allocate(HeapRegion* alloc_region,
size_t min_word_size,
size_t desired_word_size,
- size_t* actual_word_size,
- bool bot_updates) {
+ size_t* actual_word_size) {
assert(alloc_region != NULL, "pre-condition");
assert(!alloc_region->is_empty(), "pre-condition");
- if (!bot_updates) {
+ if (!_bot_updates) {
return alloc_region->par_allocate_no_bot_updates(min_word_size, desired_word_size, actual_word_size);
} else {
return alloc_region->par_allocate(min_word_size, desired_word_size, actual_word_size);
}
}
-inline HeapWord* G1AllocRegion::attempt_allocation(size_t word_size, bool bot_updates) {
+inline HeapWord* G1AllocRegion::attempt_allocation(size_t word_size) {
size_t temp;
- return attempt_allocation(word_size, word_size, &temp, bot_updates);
+ return attempt_allocation(word_size, word_size, &temp);
}
inline HeapWord* G1AllocRegion::attempt_allocation(size_t min_word_size,
size_t desired_word_size,
- size_t* actual_word_size,
- bool bot_updates) {
- assert_alloc_region(bot_updates == _bot_updates, "pre-condition");
-
+ size_t* actual_word_size) {
HeapRegion* alloc_region = _alloc_region;
assert_alloc_region(alloc_region != NULL, "not initialized properly");
- HeapWord* result = par_allocate(alloc_region, min_word_size, desired_word_size, actual_word_size, bot_updates);
+ HeapWord* result = par_allocate(alloc_region, min_word_size, desired_word_size, actual_word_size);
if (result != NULL) {
trace("alloc", min_word_size, desired_word_size, *actual_word_size, result);
return result;
@@ -91,19 +86,18 @@
return NULL;
}
-inline HeapWord* G1AllocRegion::attempt_allocation_locked(size_t word_size, bool bot_updates) {
+inline HeapWord* G1AllocRegion::attempt_allocation_locked(size_t word_size) {
size_t temp;
- return attempt_allocation_locked(word_size, word_size, &temp, bot_updates);
+ return attempt_allocation_locked(word_size, word_size, &temp);
}
inline HeapWord* G1AllocRegion::attempt_allocation_locked(size_t min_word_size,
size_t desired_word_size,
- size_t* actual_word_size,
- bool bot_updates) {
+ size_t* actual_word_size) {
// First we have to redo the allocation, assuming we're holding the
// appropriate lock, in case another thread changed the region while
// we were waiting to get the lock.
- HeapWord* result = attempt_allocation(min_word_size, desired_word_size, actual_word_size, bot_updates);
+ HeapWord* result = attempt_allocation(min_word_size, desired_word_size, actual_word_size);
if (result != NULL) {
return result;
}
@@ -119,9 +113,7 @@
return NULL;
}
-inline HeapWord* G1AllocRegion::attempt_allocation_force(size_t word_size,
- bool bot_updates) {
- assert_alloc_region(bot_updates == _bot_updates, "pre-condition");
+inline HeapWord* G1AllocRegion::attempt_allocation_force(size_t word_size) {
assert_alloc_region(_alloc_region != NULL, "not initialized properly");
trace("forcing alloc", word_size, word_size);
--- a/src/hotspot/share/gc/g1/g1Allocator.cpp Tue Dec 26 13:38:31 2017 +0530
+++ b/src/hotspot/share/gc/g1/g1Allocator.cpp Mon Jan 08 08:53:14 2018 -0800
@@ -190,14 +190,12 @@
HeapWord* result = survivor_gc_alloc_region(context)->attempt_allocation(min_word_size,
desired_word_size,
- actual_word_size,
- false /* bot_updates */);
+ actual_word_size);
if (result == NULL && !survivor_is_full(context)) {
MutexLockerEx x(FreeList_lock, Mutex::_no_safepoint_check_flag);
result = survivor_gc_alloc_region(context)->attempt_allocation_locked(min_word_size,
desired_word_size,
- actual_word_size,
- false /* bot_updates */);
+ actual_word_size);
if (result == NULL) {
set_survivor_full(context);
}
@@ -217,14 +215,12 @@
HeapWord* result = old_gc_alloc_region(context)->attempt_allocation(min_word_size,
desired_word_size,
- actual_word_size,
- true /* bot_updates */);
+ actual_word_size);
if (result == NULL && !old_is_full(context)) {
MutexLockerEx x(FreeList_lock, Mutex::_no_safepoint_check_flag);
result = old_gc_alloc_region(context)->attempt_allocation_locked(min_word_size,
desired_word_size,
- actual_word_size,
- true /* bot_updates */);
+ actual_word_size);
if (result == NULL) {
set_old_full(context);
}
--- a/src/hotspot/share/gc/g1/g1Allocator.inline.hpp Tue Dec 26 13:38:31 2017 +0530
+++ b/src/hotspot/share/gc/g1/g1Allocator.inline.hpp Mon Jan 08 08:53:14 2018 -0800
@@ -30,18 +30,18 @@
#include "gc/shared/plab.inline.hpp"
HeapWord* G1Allocator::attempt_allocation(size_t word_size, AllocationContext_t context) {
- return mutator_alloc_region(context)->attempt_allocation(word_size, false /* bot_updates */);
+ return mutator_alloc_region(context)->attempt_allocation(word_size);
}
HeapWord* G1Allocator::attempt_allocation_locked(size_t word_size, AllocationContext_t context) {
- HeapWord* result = mutator_alloc_region(context)->attempt_allocation_locked(word_size, false /* bot_updates */);
+ HeapWord* result = mutator_alloc_region(context)->attempt_allocation_locked(word_size);
assert(result != NULL || mutator_alloc_region(context)->get() == NULL,
"Must not have a mutator alloc region if there is no memory, but is " PTR_FORMAT, p2i(mutator_alloc_region(context)->get()));
return result;
}
HeapWord* G1Allocator::attempt_allocation_force(size_t word_size, AllocationContext_t context) {
- return mutator_alloc_region(context)->attempt_allocation_force(word_size, false /* bot_updates */);
+ return mutator_alloc_region(context)->attempt_allocation_force(word_size);
}
inline HeapWord* G1PLABAllocator::plab_allocate(InCSetState dest,
--- a/src/hotspot/share/jvmci/jvmciCodeInstaller.cpp Tue Dec 26 13:38:31 2017 +0530
+++ b/src/hotspot/share/jvmci/jvmciCodeInstaller.cpp Mon Jan 08 08:53:14 2018 -0800
@@ -600,6 +600,9 @@
if (!compiled_code->is_a(HotSpotCompiledNmethod::klass())) {
oop stubName = HotSpotCompiledCode::name(compiled_code_obj);
+ if (oopDesc::is_null(stubName)) {
+ JVMCI_ERROR_OK("stub should have a name");
+ }
char* name = strdup(java_lang_String::as_utf8_string(stubName));
cb = RuntimeStub::new_runtime_stub(name,
&buffer,
--- a/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp Tue Dec 26 13:38:31 2017 +0530
+++ b/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp Mon Jan 08 08:53:14 2018 -0800
@@ -761,6 +761,10 @@
C2V_VMENTRY(jboolean, isCompilable,(JNIEnv *, jobject, jobject jvmci_method))
methodHandle method = CompilerToVM::asMethod(jvmci_method);
+ // Skip redefined methods
+ if (method->is_old()) {
+ return false;
+ }
return !method->is_not_compilable(CompLevel_full_optimization);
C2V_END
--- a/src/hotspot/share/memory/metaspace.cpp Tue Dec 26 13:38:31 2017 +0530
+++ b/src/hotspot/share/memory/metaspace.cpp Mon Jan 08 08:53:14 2018 -0800
@@ -3695,7 +3695,6 @@
MaxMetaspaceExpansion = align_down_bounded(MaxMetaspaceExpansion, _commit_alignment);
CompressedClassSpaceSize = align_down_bounded(CompressedClassSpaceSize, _reserve_alignment);
- set_compressed_class_space_size(CompressedClassSpaceSize);
// Initial virtual space size will be calculated at global_initialize()
size_t min_metaspace_sz =
@@ -3714,6 +3713,7 @@
min_metaspace_sz);
}
+ set_compressed_class_space_size(CompressedClassSpaceSize);
}
void Metaspace::global_initialize() {
--- a/src/hotspot/share/memory/metaspaceShared.cpp Tue Dec 26 13:38:31 2017 +0530
+++ b/src/hotspot/share/memory/metaspaceShared.cpp Mon Jan 08 08:53:14 2018 -0800
@@ -1627,14 +1627,16 @@
log_trace(cds)("Shared spaces preloaded: %s", klass->external_name());
}
- InstanceKlass* ik = InstanceKlass::cast(klass);
+ if (klass->is_instance_klass()) {
+ InstanceKlass* ik = InstanceKlass::cast(klass);
- // Link the class to cause the bytecodes to be rewritten and the
- // cpcache to be created. The linking is done as soon as classes
- // are loaded in order that the related data structures (klass and
- // cpCache) are located together.
- try_link_class(ik, THREAD);
- guarantee(!HAS_PENDING_EXCEPTION, "exception in link_class");
+ // Link the class to cause the bytecodes to be rewritten and the
+ // cpcache to be created. The linking is done as soon as classes
+ // are loaded in order that the related data structures (klass and
+ // cpCache) are located together.
+ try_link_class(ik, THREAD);
+ guarantee(!HAS_PENDING_EXCEPTION, "exception in link_class");
+ }
class_count++;
}
--- a/src/hotspot/share/opto/compile.cpp Tue Dec 26 13:38:31 2017 +0530
+++ b/src/hotspot/share/opto/compile.cpp Mon Jan 08 08:53:14 2018 -0800
@@ -1094,6 +1094,7 @@
_major_progress = true; // start out assuming good things will happen
set_has_unsafe_access(false);
set_max_vector_size(0);
+ set_clear_upper_avx(false); //false as default for clear upper bits of ymm registers
Copy::zero_to_bytes(_trap_hist, sizeof(_trap_hist));
set_decompile_count(0);
--- a/src/hotspot/share/opto/compile.hpp Tue Dec 26 13:38:31 2017 +0530
+++ b/src/hotspot/share/opto/compile.hpp Mon Jan 08 08:53:14 2018 -0800
@@ -378,7 +378,8 @@
bool _has_stringbuilder; // True StringBuffers or StringBuilders are allocated
bool _has_boxed_value; // True if a boxed object is allocated
bool _has_reserved_stack_access; // True if the method or an inlined method is annotated with ReservedStackAccess
- int _max_vector_size; // Maximum size of generated vectors
+ uint _max_vector_size; // Maximum size of generated vectors
+ bool _clear_upper_avx; // Clear upper bits of ymm registers using vzeroupper
uint _trap_hist[trapHistLength]; // Cumulative traps
bool _trap_can_recompile; // Have we emitted a recompiling trap?
uint _decompile_count; // Cumulative decompilation counts.
@@ -656,8 +657,10 @@
void set_has_boxed_value(bool z) { _has_boxed_value = z; }
bool has_reserved_stack_access() const { return _has_reserved_stack_access; }
void set_has_reserved_stack_access(bool z) { _has_reserved_stack_access = z; }
- int max_vector_size() const { return _max_vector_size; }
- void set_max_vector_size(int s) { _max_vector_size = s; }
+ uint max_vector_size() const { return _max_vector_size; }
+ void set_max_vector_size(uint s) { _max_vector_size = s; }
+ bool clear_upper_avx() const { return _clear_upper_avx; }
+ void set_clear_upper_avx(bool s) { _clear_upper_avx = s; }
void set_trap_count(uint r, uint c) { assert(r < trapHistLength, "oob"); _trap_hist[r] = c; }
uint trap_count(uint r) const { assert(r < trapHistLength, "oob"); return _trap_hist[r]; }
bool trap_can_recompile() const { return _trap_can_recompile; }
--- a/src/hotspot/share/opto/library_call.cpp Tue Dec 26 13:38:31 2017 +0530
+++ b/src/hotspot/share/opto/library_call.cpp Mon Jan 08 08:53:14 2018 -0800
@@ -328,6 +328,13 @@
bool inline_profileBoolean();
bool inline_isCompileConstant();
+ void clear_upper_avx() {
+#ifdef X86
+ if (UseAVX >= 2) {
+ C->set_clear_upper_avx(true);
+ }
+#endif
+ }
};
//---------------------------make_vm_intrinsic----------------------------
@@ -1082,6 +1089,7 @@
// All these intrinsics have checks.
C->set_has_split_ifs(true); // Has chance for split-if optimization
+ clear_upper_avx();
return _gvn.transform(result);
}
@@ -1156,6 +1164,8 @@
const TypeAryPtr* mtype = (ae == StrIntrinsicNode::UU) ? TypeAryPtr::CHARS : TypeAryPtr::BYTES;
set_result(_gvn.transform(new AryEqNode(control(), memory(mtype), arg1, arg2, ae)));
+ clear_upper_avx();
+
return true;
}
@@ -1227,6 +1237,7 @@
result = _gvn.transform(result);
set_result(result);
replace_in_map(index, result);
+ clear_upper_avx();
return true;
}
@@ -1325,6 +1336,7 @@
set_control(_gvn.transform(region));
record_for_igvn(region);
set_result(_gvn.transform(phi));
+ clear_upper_avx();
return true;
}
@@ -1488,6 +1500,8 @@
if (compress) {
set_result(_gvn.transform(count));
}
+ clear_upper_avx();
+
return true;
}
@@ -1585,6 +1599,8 @@
if (!stopped()) {
set_result(newcopy);
}
+ clear_upper_avx();
+
return true;
}
@@ -1789,10 +1805,19 @@
return StubRoutines::dexp() != NULL ?
runtime_math(OptoRuntime::Math_D_D_Type(), StubRoutines::dexp(), "dexp") :
runtime_math(OptoRuntime::Math_D_D_Type(), FN_PTR(SharedRuntime::dexp), "EXP");
- case vmIntrinsics::_dpow:
- return StubRoutines::dpow() != NULL ?
- runtime_math(OptoRuntime::Math_DD_D_Type(), StubRoutines::dpow(), "dpow") :
+ case vmIntrinsics::_dpow: {
+ Node* exp = round_double_node(argument(2));
+ const TypeD* d = _gvn.type(exp)->isa_double_constant();
+ if (d != NULL && d->getd() == 2.0) {
+ // Special case: pow(x, 2.0) => x * x
+ Node* base = round_double_node(argument(0));
+ set_result(_gvn.transform(new MulDNode(base, base)));
+ return true;
+ }
+ return StubRoutines::dexp() != NULL ?
+ runtime_math(OptoRuntime::Math_DD_D_Type(), StubRoutines::dpow(), "dpow") :
runtime_math(OptoRuntime::Math_DD_D_Type(), FN_PTR(SharedRuntime::dpow), "POW");
+ }
#undef FN_PTR
// These intrinsics are not yet correctly implemented
@@ -5286,6 +5311,8 @@
assert(validated, "shouldn't transform if all arguments not validated");
set_all_memory(n);
}
+ clear_upper_avx();
+
return true;
}
@@ -5406,6 +5433,8 @@
Node* res_mem = _gvn.transform(new SCMemProjNode(enc));
set_memory(res_mem, mtype);
set_result(enc);
+ clear_upper_avx();
+
return true;
}
--- a/src/hotspot/share/opto/superword.cpp Tue Dec 26 13:38:31 2017 +0530
+++ b/src/hotspot/share/opto/superword.cpp Mon Jan 08 08:53:14 2018 -0800
@@ -2442,7 +2442,9 @@
}
}//for (int i = 0; i < _block.length(); i++)
- C->set_max_vector_size(max_vlen_in_bytes);
+ if (max_vlen_in_bytes > C->max_vector_size()) {
+ C->set_max_vector_size(max_vlen_in_bytes);
+ }
if (max_vlen_in_bytes > 0) {
cl->mark_loop_vectorized();
}
--- a/src/hotspot/share/prims/jniCheck.cpp Tue Dec 26 13:38:31 2017 +0530
+++ b/src/hotspot/share/prims/jniCheck.cpp Mon Jan 08 08:53:14 2018 -0800
@@ -826,7 +826,10 @@
}
jint result = UNCHECKED()->EnsureLocalCapacity(env, capacity);
if (result == JNI_OK) {
- add_planned_handle_capacity(thr->active_handles(), capacity);
+ // increase local ref capacity if needed
+ if ((size_t)capacity > thr->active_handles()->get_planned_capacity()) {
+ add_planned_handle_capacity(thr->active_handles(), capacity);
+ }
}
functionExit(thr);
return result;
--- a/src/hotspot/share/runtime/arguments.cpp Tue Dec 26 13:38:31 2017 +0530
+++ b/src/hotspot/share/runtime/arguments.cpp Mon Jan 08 08:53:14 2018 -0800
@@ -497,7 +497,7 @@
{ "MaxRAMFraction", JDK_Version::jdk(10), JDK_Version::undefined(), JDK_Version::undefined() },
{ "MinRAMFraction", JDK_Version::jdk(10), JDK_Version::undefined(), JDK_Version::undefined() },
{ "InitialRAMFraction", JDK_Version::jdk(10), JDK_Version::undefined(), JDK_Version::undefined() },
- { "UseMembar", JDK_Version::jdk(10), JDK_Version::jdk(11), JDK_Version::jdk(12) },
+ { "UseMembar", JDK_Version::jdk(10), JDK_Version::undefined(), JDK_Version::undefined() },
{ "FastTLABRefill", JDK_Version::jdk(10), JDK_Version::jdk(11), JDK_Version::jdk(12) },
{ "SafepointSpinBeforeYield", JDK_Version::jdk(10), JDK_Version::jdk(11), JDK_Version::jdk(12) },
{ "DeferThrSuspendLoopCount", JDK_Version::jdk(10), JDK_Version::jdk(11), JDK_Version::jdk(12) },
--- a/src/hotspot/share/runtime/compilationPolicy.cpp Tue Dec 26 13:38:31 2017 +0530
+++ b/src/hotspot/share/runtime/compilationPolicy.cpp Mon Jan 08 08:53:14 2018 -0800
@@ -470,8 +470,12 @@
if (bci != InvocationEntryBci) {
MethodData* mdo = m->method_data();
if (mdo != NULL) {
- int count = mdo->bci_to_data(branch_bci)->as_JumpData()->taken();
- tty->print_cr("back branch count = %d", count);
+ ProfileData *pd = mdo->bci_to_data(branch_bci);
+ if (pd == NULL) {
+ tty->print_cr("back branch count = N/A (missing ProfileData)");
+ } else {
+ tty->print_cr("back branch count = %d", pd->as_JumpData()->taken());
+ }
}
}
}
--- a/src/hotspot/share/runtime/java.cpp Tue Dec 26 13:38:31 2017 +0530
+++ b/src/hotspot/share/runtime/java.cpp Mon Jan 08 08:53:14 2018 -0800
@@ -357,7 +357,7 @@
MemTracker::final_report(tty);
}
- ThreadsSMRSupport::log_smr_statistics();
+ ThreadsSMRSupport::log_statistics();
}
#else // PRODUCT MODE STATISTICS
@@ -399,7 +399,7 @@
Method::print_touched_methods(tty);
}
- ThreadsSMRSupport::log_smr_statistics();
+ ThreadsSMRSupport::log_statistics();
}
#endif
--- a/src/hotspot/share/runtime/thread.cpp Tue Dec 26 13:38:31 2017 +0530
+++ b/src/hotspot/share/runtime/thread.cpp Mon Jan 08 08:53:14 2018 -0800
@@ -2946,8 +2946,9 @@
if (ct->env() != NULL) {
ct->env()->metadata_do(f);
}
- if (ct->task() != NULL) {
- ct->task()->metadata_do(f);
+ CompileTask* task = ct->task();
+ if (task != NULL) {
+ task->metadata_do(f);
}
}
}
@@ -3001,10 +3002,10 @@
_safepoint_state->print_on(st);
#endif // PRODUCT
if (is_Compiler_thread()) {
- CompilerThread* ct = (CompilerThread*)this;
- if (ct->task() != NULL) {
+ CompileTask *task = ((CompilerThread*)this)->task();
+ if (task != NULL) {
st->print(" Compiling: ");
- ct->task()->print(st, NULL, true, false);
+ task->print(st, NULL, true, false);
} else {
st->print(" No compile task");
}
@@ -3473,7 +3474,7 @@
X = (JavaThread*)prefetch_and_load_ptr((void**)MACRO_current_p, (intx)MACRO_scan_interval))
// All JavaThreads
-#define ALL_JAVA_THREADS(X) DO_JAVA_THREADS(ThreadsSMRSupport::get_smr_java_thread_list(), X)
+#define ALL_JAVA_THREADS(X) DO_JAVA_THREADS(ThreadsSMRSupport::get_java_thread_list(), X)
// All JavaThreads + all non-JavaThreads (i.e., every thread in the system)
void Threads::threads_do(ThreadClosure* tc) {
@@ -4382,7 +4383,7 @@
// that we do not remove thread without safepoint code notice
{ MutexLocker ml(Threads_lock);
- assert(ThreadsSMRSupport::get_smr_java_thread_list()->includes(p), "p must be present");
+ assert(ThreadsSMRSupport::get_java_thread_list()->includes(p), "p must be present");
// Maintain fast thread list
ThreadsSMRSupport::remove_thread(p);
@@ -4610,7 +4611,7 @@
}
#endif // INCLUDE_SERVICES
- ThreadsSMRSupport::print_smr_info_on(st);
+ ThreadsSMRSupport::print_info_on(st);
st->cr();
ALL_JAVA_THREADS(p) {
@@ -4679,7 +4680,7 @@
// memory (even in resource area), it might deadlock the error handler.
void Threads::print_on_error(outputStream* st, Thread* current, char* buf,
int buflen) {
- ThreadsSMRSupport::print_smr_info_on(st);
+ ThreadsSMRSupport::print_info_on(st);
st->cr();
bool found_current = false;
@@ -4712,9 +4713,15 @@
ALL_JAVA_THREADS(thread) {
if (thread->is_Compiler_thread()) {
CompilerThread* ct = (CompilerThread*) thread;
- if (ct->task() != NULL) {
+
+ // Keep task in local variable for NULL check.
+ // ct->_task might be set to NULL by concurring compiler thread
+ // because it completed the compilation. The task is never freed,
+ // though, just returned to a free list.
+ CompileTask* task = ct->task();
+ if (task != NULL) {
thread->print_name_on_error(st, buf, buflen);
- ct->task()->print(st, NULL, true, true);
+ task->print(st, NULL, true, true);
}
}
}
--- a/src/hotspot/share/runtime/thread.hpp Tue Dec 26 13:38:31 2017 +0530
+++ b/src/hotspot/share/runtime/thread.hpp Mon Jan 08 08:53:14 2018 -0800
@@ -2064,13 +2064,13 @@
private:
CompilerCounters* _counters;
- ciEnv* _env;
- CompileLog* _log;
- CompileTask* _task;
- CompileQueue* _queue;
- BufferBlob* _buffer_blob;
+ ciEnv* _env;
+ CompileLog* _log;
+ CompileTask* volatile _task; // print_threads_compiling can read this concurrently.
+ CompileQueue* _queue;
+ BufferBlob* _buffer_blob;
- AbstractCompiler* _compiler;
+ AbstractCompiler* _compiler;
public:
--- a/src/hotspot/share/runtime/threadSMR.cpp Tue Dec 26 13:38:31 2017 +0530
+++ b/src/hotspot/share/runtime/threadSMR.cpp Mon Jan 08 08:53:14 2018 -0800
@@ -31,131 +31,131 @@
#include "utilities/globalDefinitions.hpp"
#include "utilities/resourceHash.hpp"
-Monitor* ThreadsSMRSupport::_smr_delete_lock =
- new Monitor(Monitor::special, "smr_delete_lock",
+Monitor* ThreadsSMRSupport::_delete_lock =
+ new Monitor(Monitor::special, "Thread_SMR_delete_lock",
false /* allow_vm_block */,
Monitor::_safepoint_check_never);
// The '_cnt', '_max' and '_times" fields are enabled via
// -XX:+EnableThreadSMRStatistics:
-// # of parallel threads in _smr_delete_lock->wait().
+// # of parallel threads in _delete_lock->wait().
// Impl note: Hard to imagine > 64K waiting threads so this could be 16-bit,
// but there is no nice 16-bit _FORMAT support.
-uint ThreadsSMRSupport::_smr_delete_lock_wait_cnt = 0;
+uint ThreadsSMRSupport::_delete_lock_wait_cnt = 0;
-// Max # of parallel threads in _smr_delete_lock->wait().
-// Impl note: See _smr_delete_lock_wait_cnt note.
-uint ThreadsSMRSupport::_smr_delete_lock_wait_max = 0;
+// Max # of parallel threads in _delete_lock->wait().
+// Impl note: See _delete_lock_wait_cnt note.
+uint ThreadsSMRSupport::_delete_lock_wait_max = 0;
-// Flag to indicate when an _smr_delete_lock->notify() is needed.
-// Impl note: See _smr_delete_lock_wait_cnt note.
-volatile uint ThreadsSMRSupport::_smr_delete_notify = 0;
+// Flag to indicate when an _delete_lock->notify() is needed.
+// Impl note: See _delete_lock_wait_cnt note.
+volatile uint ThreadsSMRSupport::_delete_notify = 0;
// # of threads deleted over VM lifetime.
// Impl note: Atomically incremented over VM lifetime so use unsigned for more
// range. Unsigned 64-bit would be more future proof, but 64-bit atomic inc
// isn't available everywhere (or is it?).
-volatile uint ThreadsSMRSupport::_smr_deleted_thread_cnt = 0;
+volatile uint ThreadsSMRSupport::_deleted_thread_cnt = 0;
// Max time in millis to delete a thread.
// Impl note: 16-bit might be too small on an overloaded machine. Use
// unsigned since this is a time value. Set via Atomic::cmpxchg() in a
// loop for correctness.
-volatile uint ThreadsSMRSupport::_smr_deleted_thread_time_max = 0;
+volatile uint ThreadsSMRSupport::_deleted_thread_time_max = 0;
// Cumulative time in millis to delete threads.
// Impl note: Atomically added to over VM lifetime so use unsigned for more
// range. Unsigned 64-bit would be more future proof, but 64-bit atomic inc
// isn't available everywhere (or is it?).
-volatile uint ThreadsSMRSupport::_smr_deleted_thread_times = 0;
+volatile uint ThreadsSMRSupport::_deleted_thread_times = 0;
-ThreadsList* volatile ThreadsSMRSupport::_smr_java_thread_list = new ThreadsList(0);
+ThreadsList* volatile ThreadsSMRSupport::_java_thread_list = new ThreadsList(0);
// # of ThreadsLists allocated over VM lifetime.
// Impl note: We allocate a new ThreadsList for every thread create and
// every thread delete so we need a bigger type than the
-// _smr_deleted_thread_cnt field.
-uint64_t ThreadsSMRSupport::_smr_java_thread_list_alloc_cnt = 1;
+// _deleted_thread_cnt field.
+uint64_t ThreadsSMRSupport::_java_thread_list_alloc_cnt = 1;
// # of ThreadsLists freed over VM lifetime.
-// Impl note: See _smr_java_thread_list_alloc_cnt note.
-uint64_t ThreadsSMRSupport::_smr_java_thread_list_free_cnt = 0;
+// Impl note: See _java_thread_list_alloc_cnt note.
+uint64_t ThreadsSMRSupport::_java_thread_list_free_cnt = 0;
// Max size ThreadsList allocated.
// Impl note: Max # of threads alive at one time should fit in unsigned 32-bit.
-uint ThreadsSMRSupport::_smr_java_thread_list_max = 0;
+uint ThreadsSMRSupport::_java_thread_list_max = 0;
// Max # of nested ThreadsLists for a thread.
// Impl note: Hard to imagine > 64K nested ThreadsLists so this could be
// 16-bit, but there is no nice 16-bit _FORMAT support.
-uint ThreadsSMRSupport::_smr_nested_thread_list_max = 0;
+uint ThreadsSMRSupport::_nested_thread_list_max = 0;
// # of ThreadsListHandles deleted over VM lifetime.
// Impl note: Atomically incremented over VM lifetime so use unsigned for
// more range. There will be fewer ThreadsListHandles than threads so
// unsigned 32-bit should be fine.
-volatile uint ThreadsSMRSupport::_smr_tlh_cnt = 0;
+volatile uint ThreadsSMRSupport::_tlh_cnt = 0;
// Max time in millis to delete a ThreadsListHandle.
// Impl note: 16-bit might be too small on an overloaded machine. Use
// unsigned since this is a time value. Set via Atomic::cmpxchg() in a
// loop for correctness.
-volatile uint ThreadsSMRSupport::_smr_tlh_time_max = 0;
+volatile uint ThreadsSMRSupport::_tlh_time_max = 0;
// Cumulative time in millis to delete ThreadsListHandles.
// Impl note: Atomically added to over VM lifetime so use unsigned for more
// range. Unsigned 64-bit would be more future proof, but 64-bit atomic inc
// isn't available everywhere (or is it?).
-volatile uint ThreadsSMRSupport::_smr_tlh_times = 0;
+volatile uint ThreadsSMRSupport::_tlh_times = 0;
-ThreadsList* ThreadsSMRSupport::_smr_to_delete_list = NULL;
+ThreadsList* ThreadsSMRSupport::_to_delete_list = NULL;
// # of parallel ThreadsLists on the to-delete list.
// Impl note: Hard to imagine > 64K ThreadsLists needing to be deleted so
// this could be 16-bit, but there is no nice 16-bit _FORMAT support.
-uint ThreadsSMRSupport::_smr_to_delete_list_cnt = 0;
+uint ThreadsSMRSupport::_to_delete_list_cnt = 0;
// Max # of parallel ThreadsLists on the to-delete list.
-// Impl note: See _smr_to_delete_list_cnt note.
-uint ThreadsSMRSupport::_smr_to_delete_list_max = 0;
+// Impl note: See _to_delete_list_cnt note.
+uint ThreadsSMRSupport::_to_delete_list_max = 0;
// 'inline' functions first so the definitions are before first use:
-inline void ThreadsSMRSupport::add_smr_deleted_thread_times(uint add_value) {
- Atomic::add(add_value, &_smr_deleted_thread_times);
+inline void ThreadsSMRSupport::add_deleted_thread_times(uint add_value) {
+ Atomic::add(add_value, &_deleted_thread_times);
}
-inline void ThreadsSMRSupport::inc_smr_deleted_thread_cnt() {
- Atomic::inc(&_smr_deleted_thread_cnt);
+inline void ThreadsSMRSupport::inc_deleted_thread_cnt() {
+ Atomic::inc(&_deleted_thread_cnt);
}
-inline void ThreadsSMRSupport::inc_smr_java_thread_list_alloc_cnt() {
- _smr_java_thread_list_alloc_cnt++;
+inline void ThreadsSMRSupport::inc_java_thread_list_alloc_cnt() {
+ _java_thread_list_alloc_cnt++;
}
-inline void ThreadsSMRSupport::update_smr_deleted_thread_time_max(uint new_value) {
+inline void ThreadsSMRSupport::update_deleted_thread_time_max(uint new_value) {
while (true) {
- uint cur_value = _smr_deleted_thread_time_max;
+ uint cur_value = _deleted_thread_time_max;
if (new_value <= cur_value) {
// No need to update max value so we're done.
break;
}
- if (Atomic::cmpxchg(new_value, &_smr_deleted_thread_time_max, cur_value) == cur_value) {
+ if (Atomic::cmpxchg(new_value, &_deleted_thread_time_max, cur_value) == cur_value) {
// Updated max value so we're done. Otherwise try it all again.
break;
}
}
}
-inline void ThreadsSMRSupport::update_smr_java_thread_list_max(uint new_value) {
- if (new_value > _smr_java_thread_list_max) {
- _smr_java_thread_list_max = new_value;
+inline void ThreadsSMRSupport::update_java_thread_list_max(uint new_value) {
+ if (new_value > _java_thread_list_max) {
+ _java_thread_list_max = new_value;
}
}
-inline ThreadsList* ThreadsSMRSupport::xchg_smr_java_thread_list(ThreadsList* new_list) {
- return (ThreadsList*)Atomic::xchg(new_list, &_smr_java_thread_list);
+inline ThreadsList* ThreadsSMRSupport::xchg_java_thread_list(ThreadsList* new_list) {
+ return (ThreadsList*)Atomic::xchg(new_list, &_java_thread_list);
}
@@ -268,7 +268,7 @@
}
// The current JavaThread has a hazard ptr (ThreadsList reference)
- // which might be _smr_java_thread_list or it might be an older
+ // which might be _java_thread_list or it might be an older
// ThreadsList that has been removed but not freed. In either case,
// the hazard ptr is protecting all the JavaThreads on that
// ThreadsList.
@@ -347,7 +347,7 @@
if (Thread::is_hazard_ptr_tagged(current_list)) return;
// The current JavaThread has a hazard ptr (ThreadsList reference)
- // which might be _smr_java_thread_list or it might be an older
+ // which might be _java_thread_list or it might be an older
// ThreadsList that has been removed but not freed. In either case,
// the hazard ptr is protecting all the JavaThreads on that
// ThreadsList, but we only care about matching a specific JavaThread.
@@ -476,7 +476,7 @@
if (EnableThreadSMRStatistics) {
_timer.stop();
uint millis = (uint)_timer.milliseconds();
- ThreadsSMRSupport::update_smr_tlh_stats(millis);
+ ThreadsSMRSupport::update_tlh_stats(millis);
}
}
@@ -574,12 +574,12 @@
ThreadsList* threads;
// Stable recording of a hazard ptr for SMR. This code does not use
- // locks so its use of the _smr_java_thread_list & _threads_hazard_ptr
+ // locks so its use of the _java_thread_list & _threads_hazard_ptr
// fields is racy relative to code that uses those fields with locks.
// OrderAccess and Atomic functions are used to deal with those races.
//
while (true) {
- threads = get_smr_java_thread_list();
+ threads = get_java_thread_list();
// Publish a tagged hazard ptr to denote that the hazard ptr is not
// yet verified as being stable. Due to the fence after the hazard
@@ -590,9 +590,9 @@
ThreadsList* unverified_threads = Thread::tag_hazard_ptr(threads);
self->set_threads_hazard_ptr(unverified_threads);
- // If _smr_java_thread_list has changed, we have lost a race with
+ // If _java_thread_list has changed, we have lost a race with
// Threads::add() or Threads::remove() and have to try again.
- if (get_smr_java_thread_list() != threads) {
+ if (get_java_thread_list() != threads) {
continue;
}
@@ -634,15 +634,15 @@
{
// Only grab the Threads_lock if we don't already own it.
MutexLockerEx ml(Threads_lock->owned_by_self() ? NULL : Threads_lock);
- node = new NestedThreadsList(get_smr_java_thread_list());
+ node = new NestedThreadsList(get_java_thread_list());
// We insert at the front of the list to match up with the delete
// in release_stable_list().
node->set_next(self->get_nested_threads_hazard_ptr());
self->set_nested_threads_hazard_ptr(node);
if (EnableThreadSMRStatistics) {
self->inc_nested_threads_hazard_ptr_cnt();
- if (self->nested_threads_hazard_ptr_cnt() > _smr_nested_thread_list_max) {
- _smr_nested_thread_list_max = self->nested_threads_hazard_ptr_cnt();
+ if (self->nested_threads_hazard_ptr_cnt() > _nested_thread_list_max) {
+ _nested_thread_list_max = self->nested_threads_hazard_ptr_cnt();
}
}
}
@@ -652,25 +652,101 @@
}
void ThreadsSMRSupport::add_thread(JavaThread *thread){
- ThreadsList *new_list = ThreadsList::add_thread(ThreadsSMRSupport::get_smr_java_thread_list(), thread);
+ ThreadsList *new_list = ThreadsList::add_thread(ThreadsSMRSupport::get_java_thread_list(), thread);
if (EnableThreadSMRStatistics) {
- ThreadsSMRSupport::inc_smr_java_thread_list_alloc_cnt();
- ThreadsSMRSupport::update_smr_java_thread_list_max(new_list->length());
+ ThreadsSMRSupport::inc_java_thread_list_alloc_cnt();
+ ThreadsSMRSupport::update_java_thread_list_max(new_list->length());
}
- // Initial _smr_java_thread_list will not generate a "Threads::add" mesg.
+ // Initial _java_thread_list will not generate a "Threads::add" mesg.
log_debug(thread, smr)("tid=" UINTX_FORMAT ": Threads::add: new ThreadsList=" INTPTR_FORMAT, os::current_thread_id(), p2i(new_list));
- ThreadsList *old_list = ThreadsSMRSupport::xchg_smr_java_thread_list(new_list);
- ThreadsSMRSupport::smr_free_list(old_list);
+ ThreadsList *old_list = ThreadsSMRSupport::xchg_java_thread_list(new_list);
+ ThreadsSMRSupport::free_list(old_list);
+}
+
+// set_delete_notify() and clear_delete_notify() are called
+// under the protection of the delete_lock, but we also use an
+// Atomic operation to ensure the memory update is seen earlier than
+// when the delete_lock is dropped.
+//
+void ThreadsSMRSupport::clear_delete_notify() {
+ Atomic::dec(&_delete_notify);
+}
+
+bool ThreadsSMRSupport::delete_notify() {
+ // Use load_acquire() in order to see any updates to _delete_notify
+ // earlier than when delete_lock is grabbed.
+ return (OrderAccess::load_acquire(&_delete_notify) != 0);
}
-// set_smr_delete_notify() and clear_smr_delete_notify() are called
-// under the protection of the smr_delete_lock, but we also use an
-// Atomic operation to ensure the memory update is seen earlier than
-// when the smr_delete_lock is dropped.
-//
-void ThreadsSMRSupport::clear_smr_delete_notify() {
- Atomic::dec(&_smr_delete_notify);
+// Safely free a ThreadsList after a Threads::add() or Threads::remove().
+// The specified ThreadsList may not get deleted during this call if it
+// is still in-use (referenced by a hazard ptr). Other ThreadsLists
+// in the chain may get deleted by this call if they are no longer in-use.
+void ThreadsSMRSupport::free_list(ThreadsList* threads) {
+ assert_locked_or_safepoint(Threads_lock);
+
+ threads->set_next_list(_to_delete_list);
+ _to_delete_list = threads;
+ if (EnableThreadSMRStatistics) {
+ _to_delete_list_cnt++;
+ if (_to_delete_list_cnt > _to_delete_list_max) {
+ _to_delete_list_max = _to_delete_list_cnt;
+ }
+ }
+
+ // Hash table size should be first power of two higher than twice the length of the ThreadsList
+ int hash_table_size = MIN2((int)get_java_thread_list()->length(), 32) << 1;
+ hash_table_size--;
+ hash_table_size |= hash_table_size >> 1;
+ hash_table_size |= hash_table_size >> 2;
+ hash_table_size |= hash_table_size >> 4;
+ hash_table_size |= hash_table_size >> 8;
+ hash_table_size |= hash_table_size >> 16;
+ hash_table_size++;
+
+ // Gather a hash table of the current hazard ptrs:
+ ThreadScanHashtable *scan_table = new ThreadScanHashtable(hash_table_size);
+ ScanHazardPtrGatherThreadsListClosure scan_cl(scan_table);
+ Threads::threads_do(&scan_cl);
+
+ // Walk through the linked list of pending freeable ThreadsLists
+ // and free the ones that are not referenced from hazard ptrs.
+ ThreadsList* current = _to_delete_list;
+ ThreadsList* prev = NULL;
+ ThreadsList* next = NULL;
+ bool threads_is_freed = false;
+ while (current != NULL) {
+ next = current->next_list();
+ if (!scan_table->has_entry((void*)current)) {
+ // This ThreadsList is not referenced by a hazard ptr.
+ if (prev != NULL) {
+ prev->set_next_list(next);
+ }
+ if (_to_delete_list == current) {
+ _to_delete_list = next;
+ }
+
+ log_debug(thread, smr)("tid=" UINTX_FORMAT ": ThreadsSMRSupport::free_list: threads=" INTPTR_FORMAT " is freed.", os::current_thread_id(), p2i(current));
+ if (current == threads) threads_is_freed = true;
+ delete current;
+ if (EnableThreadSMRStatistics) {
+ _java_thread_list_free_cnt++;
+ _to_delete_list_cnt--;
+ }
+ } else {
+ prev = current;
+ }
+ current = next;
+ }
+
+ if (!threads_is_freed) {
+ // Only report "is not freed" on the original call to
+ // free_list() for this ThreadsList.
+ log_debug(thread, smr)("tid=" UINTX_FORMAT ": ThreadsSMRSupport::free_list: threads=" INTPTR_FORMAT " is not freed.", os::current_thread_id(), p2i(threads));
+ }
+
+ delete scan_table;
}
// Return true if the specified JavaThread is protected by a hazard
@@ -681,7 +757,7 @@
// Hash table size should be first power of two higher than twice
// the length of the Threads list.
- int hash_table_size = MIN2((int)get_smr_java_thread_list()->length(), 32) << 1;
+ int hash_table_size = MIN2((int)get_java_thread_list()->length(), 32) << 1;
hash_table_size--;
hash_table_size |= hash_table_size >> 1;
hash_table_size |= hash_table_size >> 2;
@@ -736,10 +812,10 @@
self->set_threads_hazard_ptr(NULL);
// We use double-check locking to reduce traffic on the system
- // wide smr_delete_lock.
- if (ThreadsSMRSupport::smr_delete_notify()) {
+ // wide Thread-SMR delete_lock.
+ if (ThreadsSMRSupport::delete_notify()) {
// An exiting thread might be waiting in smr_delete(); we need to
- // check with smr_delete_lock to be sure.
+ // check with delete_lock to be sure.
release_stable_list_wake_up((char *) "regular hazard ptr");
}
}
@@ -772,7 +848,7 @@
}
// An exiting thread might be waiting in smr_delete(); we need to
- // check with smr_delete_lock to be sure.
+ // check with delete_lock to be sure.
release_stable_list_wake_up((char *) "nested hazard ptr");
log_debug(thread, smr)("tid=" UINTX_FORMAT ": ThreadsSMRSupport::release_stable_list: delete NestedThreadsList node containing ThreadsList=" INTPTR_FORMAT, os::current_thread_id(), p2i(node->t_list()));
@@ -781,21 +857,21 @@
}
// Wake up portion of the release stable ThreadsList protocol;
-// uses the smr_delete_lock().
+// uses the delete_lock().
//
void ThreadsSMRSupport::release_stable_list_wake_up(char *log_str) {
assert(log_str != NULL, "sanity check");
- // Note: smr_delete_lock is held in smr_delete() for the entire
+ // Note: delete_lock is held in smr_delete() for the entire
// hazard ptr search so that we do not lose this notify() if
// the exiting thread has to wait. That code path also holds
- // Threads_lock (which was grabbed before smr_delete_lock) so that
+ // Threads_lock (which was grabbed before delete_lock) so that
// threads_do() can be called. This means the system can't start a
// safepoint which means this thread can't take too long to get to
- // a safepoint because of being blocked on smr_delete_lock.
+ // a safepoint because of being blocked on delete_lock.
//
- MonitorLockerEx ml(ThreadsSMRSupport::smr_delete_lock(), Monitor::_no_safepoint_check_flag);
- if (ThreadsSMRSupport::smr_delete_notify()) {
+ MonitorLockerEx ml(ThreadsSMRSupport::delete_lock(), Monitor::_no_safepoint_check_flag);
+ if (ThreadsSMRSupport::delete_notify()) {
// Notify any exiting JavaThreads that are waiting in smr_delete()
// that we've released a ThreadsList.
ml.notify_all();
@@ -804,23 +880,23 @@
}
void ThreadsSMRSupport::remove_thread(JavaThread *thread) {
- ThreadsList *new_list = ThreadsList::remove_thread(ThreadsSMRSupport::get_smr_java_thread_list(), thread);
+ ThreadsList *new_list = ThreadsList::remove_thread(ThreadsSMRSupport::get_java_thread_list(), thread);
if (EnableThreadSMRStatistics) {
- ThreadsSMRSupport::inc_smr_java_thread_list_alloc_cnt();
+ ThreadsSMRSupport::inc_java_thread_list_alloc_cnt();
// This list is smaller so no need to check for a "longest" update.
}
- // Final _smr_java_thread_list will not generate a "Threads::remove" mesg.
+ // Final _java_thread_list will not generate a "Threads::remove" mesg.
log_debug(thread, smr)("tid=" UINTX_FORMAT ": Threads::remove: new ThreadsList=" INTPTR_FORMAT, os::current_thread_id(), p2i(new_list));
- ThreadsList *old_list = ThreadsSMRSupport::xchg_smr_java_thread_list(new_list);
- ThreadsSMRSupport::smr_free_list(old_list);
+ ThreadsList *old_list = ThreadsSMRSupport::xchg_java_thread_list(new_list);
+ ThreadsSMRSupport::free_list(old_list);
}
-// See note for clear_smr_delete_notify().
+// See note for clear_delete_notify().
//
-void ThreadsSMRSupport::set_smr_delete_notify() {
- Atomic::inc(&_smr_delete_notify);
+void ThreadsSMRSupport::set_delete_notify() {
+ Atomic::inc(&_delete_notify);
}
// Safely delete a JavaThread when it is no longer in use by a
@@ -842,16 +918,16 @@
MutexLockerEx ml(Threads_lock, Mutex::_no_safepoint_check_flag);
// Cannot use a MonitorLockerEx helper here because we have
// to drop the Threads_lock first if we wait.
- ThreadsSMRSupport::smr_delete_lock()->lock_without_safepoint_check();
- // Set the smr_delete_notify flag after we grab smr_delete_lock
+ ThreadsSMRSupport::delete_lock()->lock_without_safepoint_check();
+ // Set the delete_notify flag after we grab delete_lock
// and before we scan hazard ptrs because we're doing
// double-check locking in release_stable_list().
- ThreadsSMRSupport::set_smr_delete_notify();
+ ThreadsSMRSupport::set_delete_notify();
if (!is_a_protected_JavaThread(thread)) {
// This is the common case.
- ThreadsSMRSupport::clear_smr_delete_notify();
- ThreadsSMRSupport::smr_delete_lock()->unlock();
+ ThreadsSMRSupport::clear_delete_notify();
+ ThreadsSMRSupport::delete_lock()->unlock();
break;
}
if (!has_logged_once) {
@@ -865,22 +941,22 @@
} // We have to drop the Threads_lock to wait or delete the thread
if (EnableThreadSMRStatistics) {
- _smr_delete_lock_wait_cnt++;
- if (_smr_delete_lock_wait_cnt > _smr_delete_lock_wait_max) {
- _smr_delete_lock_wait_max = _smr_delete_lock_wait_cnt;
+ _delete_lock_wait_cnt++;
+ if (_delete_lock_wait_cnt > _delete_lock_wait_max) {
+ _delete_lock_wait_max = _delete_lock_wait_cnt;
}
}
// Wait for a release_stable_list() call before we check again. No
// safepoint check, no timeout, and not as suspend equivalent flag
// because this JavaThread is not on the Threads list.
- ThreadsSMRSupport::smr_delete_lock()->wait(Mutex::_no_safepoint_check_flag, 0,
+ ThreadsSMRSupport::delete_lock()->wait(Mutex::_no_safepoint_check_flag, 0,
!Mutex::_as_suspend_equivalent_flag);
if (EnableThreadSMRStatistics) {
- _smr_delete_lock_wait_cnt--;
+ _delete_lock_wait_cnt--;
}
- ThreadsSMRSupport::clear_smr_delete_notify();
- ThreadsSMRSupport::smr_delete_lock()->unlock();
+ ThreadsSMRSupport::clear_delete_notify();
+ ThreadsSMRSupport::delete_lock()->unlock();
// Retry the whole scenario.
}
@@ -893,166 +969,89 @@
if (EnableThreadSMRStatistics) {
timer.stop();
uint millis = (uint)timer.milliseconds();
- ThreadsSMRSupport::inc_smr_deleted_thread_cnt();
- ThreadsSMRSupport::add_smr_deleted_thread_times(millis);
- ThreadsSMRSupport::update_smr_deleted_thread_time_max(millis);
+ ThreadsSMRSupport::inc_deleted_thread_cnt();
+ ThreadsSMRSupport::add_deleted_thread_times(millis);
+ ThreadsSMRSupport::update_deleted_thread_time_max(millis);
}
log_debug(thread, smr)("tid=" UINTX_FORMAT ": ThreadsSMRSupport::smr_delete: thread=" INTPTR_FORMAT " is deleted.", os::current_thread_id(), p2i(thread));
}
-bool ThreadsSMRSupport::smr_delete_notify() {
- // Use load_acquire() in order to see any updates to _smr_delete_notify
- // earlier than when smr_delete_lock is grabbed.
- return (OrderAccess::load_acquire(&_smr_delete_notify) != 0);
-}
-
-// Safely free a ThreadsList after a Threads::add() or Threads::remove().
-// The specified ThreadsList may not get deleted during this call if it
-// is still in-use (referenced by a hazard ptr). Other ThreadsLists
-// in the chain may get deleted by this call if they are no longer in-use.
-void ThreadsSMRSupport::smr_free_list(ThreadsList* threads) {
- assert_locked_or_safepoint(Threads_lock);
-
- threads->set_next_list(_smr_to_delete_list);
- _smr_to_delete_list = threads;
- if (EnableThreadSMRStatistics) {
- _smr_to_delete_list_cnt++;
- if (_smr_to_delete_list_cnt > _smr_to_delete_list_max) {
- _smr_to_delete_list_max = _smr_to_delete_list_cnt;
- }
- }
-
- // Hash table size should be first power of two higher than twice the length of the ThreadsList
- int hash_table_size = MIN2((int)get_smr_java_thread_list()->length(), 32) << 1;
- hash_table_size--;
- hash_table_size |= hash_table_size >> 1;
- hash_table_size |= hash_table_size >> 2;
- hash_table_size |= hash_table_size >> 4;
- hash_table_size |= hash_table_size >> 8;
- hash_table_size |= hash_table_size >> 16;
- hash_table_size++;
-
- // Gather a hash table of the current hazard ptrs:
- ThreadScanHashtable *scan_table = new ThreadScanHashtable(hash_table_size);
- ScanHazardPtrGatherThreadsListClosure scan_cl(scan_table);
- Threads::threads_do(&scan_cl);
-
- // Walk through the linked list of pending freeable ThreadsLists
- // and free the ones that are not referenced from hazard ptrs.
- ThreadsList* current = _smr_to_delete_list;
- ThreadsList* prev = NULL;
- ThreadsList* next = NULL;
- bool threads_is_freed = false;
- while (current != NULL) {
- next = current->next_list();
- if (!scan_table->has_entry((void*)current)) {
- // This ThreadsList is not referenced by a hazard ptr.
- if (prev != NULL) {
- prev->set_next_list(next);
- }
- if (_smr_to_delete_list == current) {
- _smr_to_delete_list = next;
- }
-
- log_debug(thread, smr)("tid=" UINTX_FORMAT ": ThreadsSMRSupport::smr_free_list: threads=" INTPTR_FORMAT " is freed.", os::current_thread_id(), p2i(current));
- if (current == threads) threads_is_freed = true;
- delete current;
- if (EnableThreadSMRStatistics) {
- _smr_java_thread_list_free_cnt++;
- _smr_to_delete_list_cnt--;
- }
- } else {
- prev = current;
- }
- current = next;
- }
-
- if (!threads_is_freed) {
- // Only report "is not freed" on the original call to
- // smr_free_list() for this ThreadsList.
- log_debug(thread, smr)("tid=" UINTX_FORMAT ": ThreadsSMRSupport::smr_free_list: threads=" INTPTR_FORMAT " is not freed.", os::current_thread_id(), p2i(threads));
- }
-
- delete scan_table;
-}
-
// Debug, logging, and printing stuff at the end:
// Log Threads class SMR info.
-void ThreadsSMRSupport::log_smr_statistics() {
+void ThreadsSMRSupport::log_statistics() {
LogTarget(Info, thread, smr) log;
if (log.is_enabled()) {
LogStream out(log);
- print_smr_info_on(&out);
+ print_info_on(&out);
}
}
// Print Threads class SMR info.
-void ThreadsSMRSupport::print_smr_info_on(outputStream* st) {
+void ThreadsSMRSupport::print_info_on(outputStream* st) {
// Only grab the Threads_lock if we don't already own it
// and if we are not reporting an error.
MutexLockerEx ml((Threads_lock->owned_by_self() || VMError::is_error_reported()) ? NULL : Threads_lock);
st->print_cr("Threads class SMR info:");
- st->print_cr("_smr_java_thread_list=" INTPTR_FORMAT ", length=%u, "
- "elements={", p2i(_smr_java_thread_list),
- _smr_java_thread_list->length());
- print_smr_info_elements_on(st, _smr_java_thread_list);
+ st->print_cr("_java_thread_list=" INTPTR_FORMAT ", length=%u, "
+ "elements={", p2i(_java_thread_list),
+ _java_thread_list->length());
+ print_info_elements_on(st, _java_thread_list);
st->print_cr("}");
- if (_smr_to_delete_list != NULL) {
- st->print_cr("_smr_to_delete_list=" INTPTR_FORMAT ", length=%u, "
- "elements={", p2i(_smr_to_delete_list),
- _smr_to_delete_list->length());
- print_smr_info_elements_on(st, _smr_to_delete_list);
+ if (_to_delete_list != NULL) {
+ st->print_cr("_to_delete_list=" INTPTR_FORMAT ", length=%u, "
+ "elements={", p2i(_to_delete_list),
+ _to_delete_list->length());
+ print_info_elements_on(st, _to_delete_list);
st->print_cr("}");
- for (ThreadsList *t_list = _smr_to_delete_list->next_list();
+ for (ThreadsList *t_list = _to_delete_list->next_list();
t_list != NULL; t_list = t_list->next_list()) {
st->print("next-> " INTPTR_FORMAT ", length=%u, "
"elements={", p2i(t_list), t_list->length());
- print_smr_info_elements_on(st, t_list);
+ print_info_elements_on(st, t_list);
st->print_cr("}");
}
}
if (!EnableThreadSMRStatistics) {
return;
}
- st->print_cr("_smr_java_thread_list_alloc_cnt=" UINT64_FORMAT ","
- "_smr_java_thread_list_free_cnt=" UINT64_FORMAT ","
- "_smr_java_thread_list_max=%u, "
- "_smr_nested_thread_list_max=%u",
- _smr_java_thread_list_alloc_cnt,
- _smr_java_thread_list_free_cnt,
- _smr_java_thread_list_max,
- _smr_nested_thread_list_max);
- if (_smr_tlh_cnt > 0) {
- st->print_cr("_smr_tlh_cnt=%u"
- ", _smr_tlh_times=%u"
- ", avg_smr_tlh_time=%0.2f"
- ", _smr_tlh_time_max=%u",
- _smr_tlh_cnt, _smr_tlh_times,
- ((double) _smr_tlh_times / _smr_tlh_cnt),
- _smr_tlh_time_max);
+ st->print_cr("_java_thread_list_alloc_cnt=" UINT64_FORMAT ","
+ "_java_thread_list_free_cnt=" UINT64_FORMAT ","
+ "_java_thread_list_max=%u, "
+ "_nested_thread_list_max=%u",
+ _java_thread_list_alloc_cnt,
+ _java_thread_list_free_cnt,
+ _java_thread_list_max,
+ _nested_thread_list_max);
+ if (_tlh_cnt > 0) {
+ st->print_cr("_tlh_cnt=%u"
+ ", _tlh_times=%u"
+ ", avg_tlh_time=%0.2f"
+ ", _tlh_time_max=%u",
+ _tlh_cnt, _tlh_times,
+ ((double) _tlh_times / _tlh_cnt),
+ _tlh_time_max);
}
- if (_smr_deleted_thread_cnt > 0) {
- st->print_cr("_smr_deleted_thread_cnt=%u"
- ", _smr_deleted_thread_times=%u"
- ", avg_smr_deleted_thread_time=%0.2f"
- ", _smr_deleted_thread_time_max=%u",
- _smr_deleted_thread_cnt, _smr_deleted_thread_times,
- ((double) _smr_deleted_thread_times / _smr_deleted_thread_cnt),
- _smr_deleted_thread_time_max);
+ if (_deleted_thread_cnt > 0) {
+ st->print_cr("_deleted_thread_cnt=%u"
+ ", _deleted_thread_times=%u"
+ ", avg_deleted_thread_time=%0.2f"
+ ", _deleted_thread_time_max=%u",
+ _deleted_thread_cnt, _deleted_thread_times,
+ ((double) _deleted_thread_times / _deleted_thread_cnt),
+ _deleted_thread_time_max);
}
- st->print_cr("_smr_delete_lock_wait_cnt=%u, _smr_delete_lock_wait_max=%u",
- _smr_delete_lock_wait_cnt, _smr_delete_lock_wait_max);
- st->print_cr("_smr_to_delete_list_cnt=%u, _smr_to_delete_list_max=%u",
- _smr_to_delete_list_cnt, _smr_to_delete_list_max);
+ st->print_cr("_delete_lock_wait_cnt=%u, _delete_lock_wait_max=%u",
+ _delete_lock_wait_cnt, _delete_lock_wait_max);
+ st->print_cr("_to_delete_list_cnt=%u, _to_delete_list_max=%u",
+ _to_delete_list_cnt, _to_delete_list_max);
}
// Print ThreadsList elements (4 per line).
-void ThreadsSMRSupport::print_smr_info_elements_on(outputStream* st,
- ThreadsList* t_list) {
+void ThreadsSMRSupport::print_info_elements_on(outputStream* st, ThreadsList* t_list) {
uint cnt = 0;
JavaThreadIterator jti(t_list);
for (JavaThread *jt = jti.first(); jt != NULL; jt = jti.next()) {
--- a/src/hotspot/share/runtime/threadSMR.hpp Tue Dec 26 13:38:31 2017 +0530
+++ b/src/hotspot/share/runtime/threadSMR.hpp Mon Jan 08 08:53:14 2018 -0800
@@ -81,67 +81,68 @@
//
class ThreadsSMRSupport : AllStatic {
// The coordination between ThreadsSMRSupport::release_stable_list() and
- // ThreadsSMRSupport::smr_delete() uses the smr_delete_lock in order to
+ // ThreadsSMRSupport::smr_delete() uses the delete_lock in order to
// reduce the traffic on the Threads_lock.
- static Monitor* _smr_delete_lock;
+ static Monitor* _delete_lock;
// The '_cnt', '_max' and '_times" fields are enabled via
// -XX:+EnableThreadSMRStatistics (see thread.cpp for a
// description about each field):
- static uint _smr_delete_lock_wait_cnt;
- static uint _smr_delete_lock_wait_max;
- // The smr_delete_notify flag is used for proper double-check
- // locking in order to reduce the traffic on the smr_delete_lock.
- static volatile uint _smr_delete_notify;
- static volatile uint _smr_deleted_thread_cnt;
- static volatile uint _smr_deleted_thread_time_max;
- static volatile uint _smr_deleted_thread_times;
- static ThreadsList* volatile _smr_java_thread_list;
- static uint64_t _smr_java_thread_list_alloc_cnt;
- static uint64_t _smr_java_thread_list_free_cnt;
- static uint _smr_java_thread_list_max;
- static uint _smr_nested_thread_list_max;
- static volatile uint _smr_tlh_cnt;
- static volatile uint _smr_tlh_time_max;
- static volatile uint _smr_tlh_times;
- static ThreadsList* _smr_to_delete_list;
- static uint _smr_to_delete_list_cnt;
- static uint _smr_to_delete_list_max;
+ static uint _delete_lock_wait_cnt;
+ static uint _delete_lock_wait_max;
+ // The delete_notify flag is used for proper double-check
+ // locking in order to reduce the traffic on the system wide
+ // Thread-SMR delete_lock.
+ static volatile uint _delete_notify;
+ static volatile uint _deleted_thread_cnt;
+ static volatile uint _deleted_thread_time_max;
+ static volatile uint _deleted_thread_times;
+ static ThreadsList* volatile _java_thread_list;
+ static uint64_t _java_thread_list_alloc_cnt;
+ static uint64_t _java_thread_list_free_cnt;
+ static uint _java_thread_list_max;
+ static uint _nested_thread_list_max;
+ static volatile uint _tlh_cnt;
+ static volatile uint _tlh_time_max;
+ static volatile uint _tlh_times;
+ static ThreadsList* _to_delete_list;
+ static uint _to_delete_list_cnt;
+ static uint _to_delete_list_max;
static ThreadsList *acquire_stable_list_fast_path(Thread *self);
static ThreadsList *acquire_stable_list_nested_path(Thread *self);
- static void add_smr_deleted_thread_times(uint add_value);
- static void add_smr_tlh_times(uint add_value);
- static void clear_smr_delete_notify();
- static void inc_smr_deleted_thread_cnt();
- static void inc_smr_java_thread_list_alloc_cnt();
- static void inc_smr_tlh_cnt();
+ static void add_deleted_thread_times(uint add_value);
+ static void add_tlh_times(uint add_value);
+ static void clear_delete_notify();
+ static Monitor* delete_lock() { return _delete_lock; }
+ static bool delete_notify();
+ static void free_list(ThreadsList* threads);
+ static void inc_deleted_thread_cnt();
+ static void inc_java_thread_list_alloc_cnt();
+ static void inc_tlh_cnt();
static bool is_a_protected_JavaThread(JavaThread *thread);
static void release_stable_list_fast_path(Thread *self);
static void release_stable_list_nested_path(Thread *self);
static void release_stable_list_wake_up(char *log_str);
- static void set_smr_delete_notify();
- static Monitor* smr_delete_lock() { return _smr_delete_lock; }
- static bool smr_delete_notify();
- static void smr_free_list(ThreadsList* threads);
- static void update_smr_deleted_thread_time_max(uint new_value);
- static void update_smr_java_thread_list_max(uint new_value);
- static void update_smr_tlh_time_max(uint new_value);
- static ThreadsList* xchg_smr_java_thread_list(ThreadsList* new_list);
+ static void set_delete_notify();
+ static void update_deleted_thread_time_max(uint new_value);
+ static void update_java_thread_list_max(uint new_value);
+ static void update_tlh_time_max(uint new_value);
+ static ThreadsList* xchg_java_thread_list(ThreadsList* new_list);
public:
static ThreadsList *acquire_stable_list(Thread *self, bool is_ThreadsListSetter);
static void add_thread(JavaThread *thread);
- static ThreadsList* get_smr_java_thread_list();
+ static ThreadsList* get_java_thread_list();
static bool is_a_protected_JavaThread_with_lock(JavaThread *thread);
static void release_stable_list(Thread *self);
static void remove_thread(JavaThread *thread);
static void smr_delete(JavaThread *thread);
- static void update_smr_tlh_stats(uint millis);
+ static void update_tlh_stats(uint millis);
// Logging and printing support:
- static void log_smr_statistics();
- static void print_smr_info_elements_on(outputStream* st, ThreadsList* t_list);
- static void print_smr_info_on(outputStream* st);
+ static void log_statistics();
+ static void print_info_elements_on(outputStream* st, ThreadsList* t_list);
+ static void print_info_on(outputStream* st);
};
// A fast list of JavaThreads.
--- a/src/hotspot/share/runtime/threadSMR.inline.hpp Tue Dec 26 13:38:31 2017 +0530
+++ b/src/hotspot/share/runtime/threadSMR.inline.hpp Mon Jan 08 08:53:14 2018 -0800
@@ -53,24 +53,24 @@
}
// These three inlines are private to ThreadsSMRSupport, but
-// they are called by public inline update_smr_tlh_stats() below:
+// they are called by public inline update_tlh_stats() below:
-inline void ThreadsSMRSupport::add_smr_tlh_times(uint add_value) {
- Atomic::add(add_value, &_smr_tlh_times);
+inline void ThreadsSMRSupport::add_tlh_times(uint add_value) {
+ Atomic::add(add_value, &_tlh_times);
}
-inline void ThreadsSMRSupport::inc_smr_tlh_cnt() {
- Atomic::inc(&_smr_tlh_cnt);
+inline void ThreadsSMRSupport::inc_tlh_cnt() {
+ Atomic::inc(&_tlh_cnt);
}
-inline void ThreadsSMRSupport::update_smr_tlh_time_max(uint new_value) {
+inline void ThreadsSMRSupport::update_tlh_time_max(uint new_value) {
while (true) {
- uint cur_value = _smr_tlh_time_max;
+ uint cur_value = _tlh_time_max;
if (new_value <= cur_value) {
// No need to update max value so we're done.
break;
}
- if (Atomic::cmpxchg(new_value, &_smr_tlh_time_max, cur_value) == cur_value) {
+ if (Atomic::cmpxchg(new_value, &_tlh_time_max, cur_value) == cur_value) {
// Updated max value so we're done. Otherwise try it all again.
break;
}
@@ -85,8 +85,8 @@
return ret;
}
-inline ThreadsList* ThreadsSMRSupport::get_smr_java_thread_list() {
- return (ThreadsList*)OrderAccess::load_acquire(&_smr_java_thread_list);
+inline ThreadsList* ThreadsSMRSupport::get_java_thread_list() {
+ return (ThreadsList*)OrderAccess::load_acquire(&_java_thread_list);
}
inline bool ThreadsSMRSupport::is_a_protected_JavaThread_with_lock(JavaThread *thread) {
@@ -94,10 +94,10 @@
return is_a_protected_JavaThread(thread);
}
-inline void ThreadsSMRSupport::update_smr_tlh_stats(uint millis) {
- ThreadsSMRSupport::inc_smr_tlh_cnt();
- ThreadsSMRSupport::add_smr_tlh_times(millis);
- ThreadsSMRSupport::update_smr_tlh_time_max(millis);
+inline void ThreadsSMRSupport::update_tlh_stats(uint millis) {
+ ThreadsSMRSupport::inc_tlh_cnt();
+ ThreadsSMRSupport::add_tlh_times(millis);
+ ThreadsSMRSupport::update_tlh_time_max(millis);
}
#endif // SHARE_VM_RUNTIME_THREADSMR_INLINE_HPP
--- a/src/java.base/share/classes/com/sun/java/util/jar/pack/Constants.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.base/share/classes/com/sun/java/util/jar/pack/Constants.java Mon Jan 08 08:53:14 2018 -0800
@@ -48,6 +48,7 @@
1.8 to 1.8.X 52,0
1.9 to 1.9.X 53,0
1.10 to 1.10.X 54,0
+ 1.11 to 1.11.X 55,0
*/
public static final Package.Version JAVA_MIN_CLASS_VERSION =
@@ -71,6 +72,9 @@
public static final Package.Version JAVA10_MAX_CLASS_VERSION =
Package.Version.of(54, 00);
+ public static final Package.Version JAVA11_MAX_CLASS_VERSION =
+ Package.Version.of(55, 00);
+
public static final int JAVA_PACKAGE_MAGIC = 0xCAFED00D;
public static final Package.Version JAVA5_PACKAGE_VERSION =
@@ -87,7 +91,7 @@
// upper limit, should point to the latest class version
public static final Package.Version JAVA_MAX_CLASS_VERSION =
- JAVA10_MAX_CLASS_VERSION;
+ JAVA11_MAX_CLASS_VERSION;
// upper limit should point to the latest package version, for version info!.
public static final Package.Version MAX_PACKAGE_VERSION =
--- a/src/java.base/share/classes/java/io/ByteArrayOutputStream.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.base/share/classes/java/io/ByteArrayOutputStream.java Mon Jan 08 08:53:14 2018 -0800
@@ -27,6 +27,7 @@
import java.nio.charset.Charset;
import java.util.Arrays;
+import java.util.Objects;
/**
* This class implements an output stream in which the data is
@@ -147,10 +148,7 @@
* @param len the number of bytes to write.
*/
public synchronized void write(byte b[], int off, int len) {
- if ((off < 0) || (off > b.length) || (len < 0) ||
- ((off + len) - b.length > 0)) {
- throw new IndexOutOfBoundsException();
- }
+ Objects.checkFromIndexSize(off, len, b.length);
ensureCapacity(count + len);
System.arraycopy(b, off, buf, count, len);
count += len;
--- a/src/java.base/share/classes/java/io/File.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.base/share/classes/java/io/File.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1994, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2018, 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
@@ -2256,7 +2256,7 @@
private transient volatile Path filePath;
/**
- * Returns a {@link Path java.nio.file.Path} object constructed from the
+ * Returns a {@link Path java.nio.file.Path} object constructed from
* this abstract path. The resulting {@code Path} is associated with the
* {@link java.nio.file.FileSystems#getDefault default-filesystem}.
*
--- a/src/java.base/share/classes/java/io/InputStream.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.base/share/classes/java/io/InputStream.java Mon Jan 08 08:53:14 2018 -0800
@@ -25,7 +25,9 @@
package java.io;
+import java.util.ArrayList;
import java.util.Arrays;
+import java.util.List;
import java.util.Objects;
/**
@@ -229,30 +231,55 @@
* @since 9
*/
public byte[] readAllBytes() throws IOException {
- byte[] buf = new byte[DEFAULT_BUFFER_SIZE];
- int capacity = buf.length;
- int nread = 0;
+ List<byte[]> bufs = null;
+ byte[] result = null;
+ int total = 0;
int n;
- for (;;) {
- // read to EOF which may read more or less than initial buffer size
- while ((n = read(buf, nread, capacity - nread)) > 0)
+ do {
+ byte[] buf = new byte[DEFAULT_BUFFER_SIZE];
+ int nread = 0;
+
+ // read to EOF which may read more or less than buffer size
+ while ((n = read(buf, nread, buf.length - nread)) > 0) {
nread += n;
+ }
- // if the last call to read returned -1, then we're done
- if (n < 0)
- break;
+ if (nread > 0) {
+ if (MAX_BUFFER_SIZE - total < nread) {
+ throw new OutOfMemoryError("Required array size too large");
+ }
+ total += nread;
+ if (result == null) {
+ result = buf;
+ } else {
+ if (bufs == null) {
+ bufs = new ArrayList<>();
+ bufs.add(result);
+ }
+ bufs.add(buf);
+ }
+ }
+ } while (n >= 0); // if the last call to read returned -1, then break
- // need to allocate a larger buffer
- if (capacity <= MAX_BUFFER_SIZE - capacity) {
- capacity = capacity << 1;
- } else {
- if (capacity == MAX_BUFFER_SIZE)
- throw new OutOfMemoryError("Required array size too large");
- capacity = MAX_BUFFER_SIZE;
+ if (bufs == null) {
+ if (result == null) {
+ return new byte[0];
}
- buf = Arrays.copyOf(buf, capacity);
+ return result.length == total ?
+ result : Arrays.copyOf(result, total);
}
- return (capacity == nread) ? buf : Arrays.copyOf(buf, nread);
+
+ result = new byte[total];
+ int offset = 0;
+ int remaining = total;
+ for (byte[] b : bufs) {
+ int len = Math.min(b.length, remaining);
+ System.arraycopy(b, 0, result, offset, len);
+ offset += len;
+ remaining -= len;
+ }
+
+ return result;
}
/**
--- a/src/java.base/share/classes/java/io/ObjectInputStream.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.base/share/classes/java/io/ObjectInputStream.java Mon Jan 08 08:53:14 2018 -0800
@@ -1296,7 +1296,6 @@
* @throws InvalidClassException if the filter rejects creation
*/
private void checkArray(Class<?> arrayType, int arrayLength) throws InvalidClassException {
- Objects.requireNonNull(arrayType);
if (! arrayType.isArray()) {
throw new IllegalArgumentException("not an array type");
}
--- a/src/java.base/share/classes/java/lang/PublicMethods.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.base/share/classes/java/lang/PublicMethods.java Mon Jan 08 08:53:14 2018 -0800
@@ -4,7 +4,9 @@
*
* 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.
+ * 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
--- a/src/java.base/share/classes/java/lang/StringConcatHelper.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.base/share/classes/java/lang/StringConcatHelper.java Mon Jan 08 08:53:14 2018 -0800
@@ -4,7 +4,9 @@
*
* 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.
+ * 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
--- a/src/java.base/share/classes/java/lang/invoke/StringConcatException.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.base/share/classes/java/lang/invoke/StringConcatException.java Mon Jan 08 08:53:14 2018 -0800
@@ -4,7 +4,9 @@
*
* 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.
+ * 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
--- a/src/java.base/share/classes/java/lang/module/ModuleDescriptor.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.base/share/classes/java/lang/module/ModuleDescriptor.java Mon Jan 08 08:53:14 2018 -0800
@@ -2521,7 +2521,7 @@
* the {@code packageFinder} throws an {@link UncheckedIOException} then
* {@link IOException} cause will be re-thrown. </p>
*
- * <p> The module descriptor is read from the buffer stating at index
+ * <p> The module descriptor is read from the buffer starting at index
* {@code p}, where {@code p} is the buffer's {@link ByteBuffer#position()
* position} when this method is invoked. Upon return the buffer's position
* will be equal to {@code p + n} where {@code n} is the number of bytes
--- a/src/java.base/share/classes/java/lang/ref/Reference.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.base/share/classes/java/lang/ref/Reference.java Mon Jan 08 08:53:14 2018 -0800
@@ -141,14 +141,6 @@
}
/*
- * system property to disable clearing before enqueuing.
- */
- private static final class ClearBeforeEnqueue {
- static final boolean DISABLE =
- Boolean.getBoolean("jdk.lang.ref.disableClearBeforeEnqueue");
- }
-
- /*
* Atomically get and clear (set to null) the VM's pending list.
*/
private static native Reference<Object> getAndClearReferencePendingList();
@@ -299,8 +291,7 @@
* it was not registered with a queue when it was created
*/
public boolean enqueue() {
- if (!ClearBeforeEnqueue.DISABLE)
- this.referent = null;
+ this.referent = null;
return this.queue.enqueue(this);
}
--- a/src/java.base/share/classes/java/net/InetSocketAddress.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.base/share/classes/java/net/InetSocketAddress.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, 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
@@ -317,10 +317,9 @@
}
/**
- *
* Gets the {@code InetAddress}.
*
- * @return the InetAdress or {@code null} if it is unresolved.
+ * @return the InetAddress or {@code null} if it is unresolved.
*/
public final InetAddress getAddress() {
return holder.getAddress();
--- a/src/java.base/share/classes/java/nio/Bits.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.base/share/classes/java/nio/Bits.java Mon Jan 08 08:53:14 2018 -0800
@@ -63,38 +63,38 @@
// -- Unsafe access --
- private static final Unsafe unsafe = Unsafe.getUnsafe();
+ private static final Unsafe UNSAFE = Unsafe.getUnsafe();
static Unsafe unsafe() {
- return unsafe;
+ return UNSAFE;
}
// -- Processor and memory-system properties --
- private static final ByteOrder byteOrder
- = unsafe.isBigEndian() ? ByteOrder.BIG_ENDIAN : ByteOrder.LITTLE_ENDIAN;
+ private static final ByteOrder BYTE_ORDER
+ = UNSAFE.isBigEndian() ? ByteOrder.BIG_ENDIAN : ByteOrder.LITTLE_ENDIAN;
static ByteOrder byteOrder() {
- return byteOrder;
+ return BYTE_ORDER;
}
- private static int pageSize = -1;
+ private static int PAGE_SIZE = -1;
static int pageSize() {
- if (pageSize == -1)
- pageSize = unsafe().pageSize();
- return pageSize;
+ if (PAGE_SIZE == -1)
+ PAGE_SIZE = unsafe().pageSize();
+ return PAGE_SIZE;
}
static int pageCount(long size) {
return (int)(size + (long)pageSize() - 1L) / pageSize();
}
- private static boolean unaligned = unsafe.unalignedAccess();
+ private static boolean UNALIGNED = UNSAFE.unalignedAccess();
static boolean unaligned() {
- return unaligned;
+ return UNALIGNED;
}
@@ -103,11 +103,11 @@
// A user-settable upper limit on the maximum amount of allocatable
// direct buffer memory. This value may be changed during VM
// initialization if it is launched with "-XX:MaxDirectMemorySize=<size>".
- private static volatile long maxMemory = VM.maxDirectMemory();
- private static final AtomicLong reservedMemory = new AtomicLong();
- private static final AtomicLong totalCapacity = new AtomicLong();
- private static final AtomicLong count = new AtomicLong();
- private static volatile boolean memoryLimitSet;
+ private static volatile long MAX_MEMORY = VM.maxDirectMemory();
+ private static final AtomicLong RESERVED_MEMORY = new AtomicLong();
+ private static final AtomicLong TOTAL_CAPACITY = new AtomicLong();
+ private static final AtomicLong COUNT = new AtomicLong();
+ private static volatile boolean MEMORY_LIMIT_SET;
// max. number of sleeps during try-reserving with exponentially
// increasing delay before throwing OutOfMemoryError:
@@ -120,9 +120,9 @@
// which a process may access. All sizes are specified in bytes.
static void reserveMemory(long size, int cap) {
- if (!memoryLimitSet && VM.initLevel() >= 1) {
- maxMemory = VM.maxDirectMemory();
- memoryLimitSet = true;
+ if (!MEMORY_LIMIT_SET && VM.initLevel() >= 1) {
+ MAX_MEMORY = VM.maxDirectMemory();
+ MEMORY_LIMIT_SET = true;
}
// optimist!
@@ -200,10 +200,10 @@
// actual memory usage, which will differ when buffers are page
// aligned.
long totalCap;
- while (cap <= maxMemory - (totalCap = totalCapacity.get())) {
- if (totalCapacity.compareAndSet(totalCap, totalCap + cap)) {
- reservedMemory.addAndGet(size);
- count.incrementAndGet();
+ while (cap <= MAX_MEMORY - (totalCap = TOTAL_CAPACITY.get())) {
+ if (TOTAL_CAPACITY.compareAndSet(totalCap, totalCap + cap)) {
+ RESERVED_MEMORY.addAndGet(size);
+ COUNT.incrementAndGet();
return true;
}
}
@@ -213,9 +213,9 @@
static void unreserveMemory(long size, int cap) {
- long cnt = count.decrementAndGet();
- long reservedMem = reservedMemory.addAndGet(-size);
- long totalCap = totalCapacity.addAndGet(-cap);
+ long cnt = COUNT.decrementAndGet();
+ long reservedMem = RESERVED_MEMORY.addAndGet(-size);
+ long totalCap = TOTAL_CAPACITY.addAndGet(-cap);
assert cnt >= 0 && reservedMem >= 0 && totalCap >= 0;
}
@@ -234,15 +234,15 @@
}
@Override
public long getCount() {
- return Bits.count.get();
+ return Bits.COUNT.get();
}
@Override
public long getTotalCapacity() {
- return Bits.totalCapacity.get();
+ return Bits.TOTAL_CAPACITY.get();
}
@Override
public long getMemoryUsed() {
- return Bits.reservedMemory.get();
+ return Bits.RESERVED_MEMORY.get();
}
};
}
--- a/src/java.base/share/classes/java/nio/Buffer.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.base/share/classes/java/nio/Buffer.java Mon Jan 08 08:53:14 2018 -0800
@@ -26,6 +26,7 @@
package java.nio;
import jdk.internal.HotSpotIntrinsicCandidate;
+import jdk.internal.misc.Unsafe;
import java.util.Spliterator;
@@ -181,6 +182,8 @@
*/
public abstract class Buffer {
+ // Cached unsafe-access object
+ static final Unsafe UNSAFE = Bits.unsafe();
/**
* The characteristics of Spliterators that traverse and split elements
@@ -617,6 +620,14 @@
// -- Package-private methods for bounds checking, etc. --
/**
+ *
+ * @return the base reference, paired with the address
+ * field, which in combination can be used for unsafe access into a heap
+ * buffer or direct byte buffer (and views of).
+ */
+ abstract Object base();
+
+ /**
* Checks the current position against the limit, throwing a {@link
* BufferUnderflowException} if it is not smaller than the limit, and then
* increments the position.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/java.base/share/classes/java/nio/BufferMismatch.java Mon Jan 08 08:53:14 2018 -0800
@@ -0,0 +1,198 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. 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.nio;
+
+import jdk.internal.util.ArraysSupport;
+
+/**
+ * Mismatch methods for buffers
+ */
+final class BufferMismatch {
+
+ static int mismatch(ByteBuffer a, int aOff, ByteBuffer b, int bOff, int length) {
+ int i = 0;
+ if (length > 7) {
+ i = ArraysSupport.vectorizedMismatch(
+ a.base(), a.address + aOff,
+ b.base(), b.address + bOff,
+ length,
+ ArraysSupport.LOG2_ARRAY_BYTE_INDEX_SCALE);
+ if (i >= 0) return i;
+ i = length - ~i;
+ }
+ for (; i < length; i++) {
+ if (a.get(aOff + i) != b.get(bOff + i))
+ return i;
+ }
+ return -1;
+ }
+
+ static int mismatch(CharBuffer a, int aOff, CharBuffer b, int bOff, int length) {
+ int i = 0;
+ // Ensure only heap or off-heap buffer instances use the
+ // vectorized mismatch. If either buffer is a StringCharBuffer
+ // (order is null) then the slow path is taken
+ if (length > 3 && a.charRegionOrder() == b.charRegionOrder()
+ && a.charRegionOrder() != null && b.charRegionOrder() != null) {
+ i = ArraysSupport.vectorizedMismatch(
+ a.base(), a.address + (aOff << ArraysSupport.LOG2_ARRAY_CHAR_INDEX_SCALE),
+ b.base(), b.address + (bOff << ArraysSupport.LOG2_ARRAY_CHAR_INDEX_SCALE),
+ length,
+ ArraysSupport.LOG2_ARRAY_CHAR_INDEX_SCALE);
+ if (i >= 0) return i;
+ i = length - ~i;
+ }
+ for (; i < length; i++) {
+ if (a.get(aOff + i) != b.get(bOff + i))
+ return i;
+ }
+ return -1;
+ }
+
+ static int mismatch(ShortBuffer a, int aOff, ShortBuffer b, int bOff, int length) {
+ int i = 0;
+ if (length > 3 && a.order() == b.order()) {
+ i = ArraysSupport.vectorizedMismatch(
+ a.base(), a.address + (aOff << ArraysSupport.LOG2_ARRAY_SHORT_INDEX_SCALE),
+ b.base(), b.address + (bOff << ArraysSupport.LOG2_ARRAY_SHORT_INDEX_SCALE),
+ length,
+ ArraysSupport.LOG2_ARRAY_SHORT_INDEX_SCALE);
+ if (i >= 0) return i;
+ i = length - ~i;
+ }
+ for (; i < length; i++) {
+ if (a.get(aOff + i) != b.get(bOff + i))
+ return i;
+ }
+ return -1;
+ }
+
+ static int mismatch(IntBuffer a, int aOff, IntBuffer b, int bOff, int length) {
+ int i = 0;
+ if (length > 1 && a.order() == b.order()) {
+ i = ArraysSupport.vectorizedMismatch(
+ a.base(), a.address + (aOff << ArraysSupport.LOG2_ARRAY_INT_INDEX_SCALE),
+ b.base(), b.address + (bOff << ArraysSupport.LOG2_ARRAY_INT_INDEX_SCALE),
+ length,
+ ArraysSupport.LOG2_ARRAY_INT_INDEX_SCALE);
+ if (i >= 0) return i;
+ i = length - ~i;
+ }
+ for (; i < length; i++) {
+ if (a.get(aOff + i) != b.get(bOff + i))
+ return i;
+ }
+ return -1;
+ }
+
+ static int mismatch(FloatBuffer a, int aOff, FloatBuffer b, int bOff, int length) {
+ int i = 0;
+ if (length > 1 && a.order() == b.order()) {
+ i = ArraysSupport.vectorizedMismatch(
+ a.base(), a.address + (aOff << ArraysSupport.LOG2_ARRAY_FLOAT_INDEX_SCALE),
+ b.base(), b.address + (bOff << ArraysSupport.LOG2_ARRAY_FLOAT_INDEX_SCALE),
+ length,
+ ArraysSupport.LOG2_ARRAY_FLOAT_INDEX_SCALE);
+ // Mismatched
+ if (i >= 0) {
+ // Check if mismatch is not associated with two NaN values; and
+ // is not associated with +0 and -0
+ float av = a.get(aOff + i);
+ float bv = b.get(bOff + i);
+ if (av != bv && (!Float.isNaN(av) || !Float.isNaN(bv)))
+ return i;
+
+ // 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++) {
+ float av = a.get(aOff + i);
+ float bv = b.get(bOff + i);
+ if (av != bv && (!Float.isNaN(av) || !Float.isNaN(bv)))
+ return i;
+ }
+ return -1;
+ }
+
+ static int mismatch(LongBuffer a, int aOff, LongBuffer b, int bOff, int length) {
+ int i = 0;
+ if (length > 0 && a.order() == b.order()) {
+ i = ArraysSupport.vectorizedMismatch(
+ a.base(), a.address + (aOff << ArraysSupport.LOG2_ARRAY_LONG_INDEX_SCALE),
+ b.base(), b.address + (bOff << ArraysSupport.LOG2_ARRAY_LONG_INDEX_SCALE),
+ length,
+ ArraysSupport.LOG2_ARRAY_LONG_INDEX_SCALE);
+ return i >= 0 ? i : -1;
+ }
+ for (; i < length; i++) {
+ if (a.get(aOff + i) != b.get(bOff + i))
+ return i;
+ }
+ return -1;
+ }
+
+ static int mismatch(DoubleBuffer a, int aOff, DoubleBuffer b, int bOff, int length) {
+ int i = 0;
+ if (length > 0 && a.order() == b.order()) {
+ i = ArraysSupport.vectorizedMismatch(
+ a.base(), a.address + (aOff << ArraysSupport.LOG2_ARRAY_DOUBLE_INDEX_SCALE),
+ b.base(), b.address + (bOff << ArraysSupport.LOG2_ARRAY_DOUBLE_INDEX_SCALE),
+ length,
+ ArraysSupport.LOG2_ARRAY_DOUBLE_INDEX_SCALE);
+ // Mismatched
+ if (i >= 0) {
+ // Check if mismatch is not associated with two NaN values; and
+ // is not associated with +0 and -0
+ double av = a.get(aOff + i);
+ double bv = b.get(bOff + i);
+ if (av != bv && (!Double.isNaN(av) || !Double.isNaN(bv)))
+ return i;
+
+ // 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 {
+ return -1;
+ }
+ }
+ for (; i < length; i++) {
+ double av = a.get(aOff + i);
+ double bv = b.get(bOff + i);
+ if (av != bv && (!Double.isNaN(av) || !Double.isNaN(bv)))
+ return i;
+ }
+ return -1;
+ }
+}
--- a/src/java.base/share/classes/java/nio/ByteBufferAs-X-Buffer.java.template Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.base/share/classes/java/nio/ByteBufferAs-X-Buffer.java.template Mon Jan 08 08:53:14 2018 -0800
@@ -36,9 +36,6 @@
#if[rw]
- // Cached unsafe-access object
- private static final Unsafe unsafe = Bits.unsafe();
-
protected final ByteBuffer bb;
#end[rw]
@@ -74,6 +71,11 @@
#end[rw]
}
+ @Override
+ Object base() {
+ return bb.hb;
+ }
+
public $Type$Buffer slice() {
int pos = this.position();
int lim = this.limit();
@@ -117,20 +119,20 @@
}
public $type$ get() {
- $memtype$ x = unsafe.get$Memtype$Unaligned(bb.hb, byteOffset(nextGetIndex()),
+ $memtype$ x = UNSAFE.get$Memtype$Unaligned(bb.hb, byteOffset(nextGetIndex()),
{#if[boB]?true:false});
return $fromBits$(x);
}
public $type$ get(int i) {
- $memtype$ x = unsafe.get$Memtype$Unaligned(bb.hb, byteOffset(checkIndex(i)),
+ $memtype$ x = UNSAFE.get$Memtype$Unaligned(bb.hb, byteOffset(checkIndex(i)),
{#if[boB]?true:false});
return $fromBits$(x);
}
#if[streamableType]
$type$ getUnchecked(int i) {
- $memtype$ x = unsafe.get$Memtype$Unaligned(bb.hb, byteOffset(i),
+ $memtype$ x = UNSAFE.get$Memtype$Unaligned(bb.hb, byteOffset(i),
{#if[boB]?true:false});
return $fromBits$(x);
}
@@ -141,7 +143,7 @@
public $Type$Buffer put($type$ x) {
#if[rw]
$memtype$ y = $toBits$(x);
- unsafe.put$Memtype$Unaligned(bb.hb, byteOffset(nextPutIndex()), y,
+ UNSAFE.put$Memtype$Unaligned(bb.hb, byteOffset(nextPutIndex()), y,
{#if[boB]?true:false});
return this;
#else[rw]
@@ -152,7 +154,7 @@
public $Type$Buffer put(int i, $type$ x) {
#if[rw]
$memtype$ y = $toBits$(x);
- unsafe.put$Memtype$Unaligned(bb.hb, byteOffset(checkIndex(i)), y,
+ UNSAFE.put$Memtype$Unaligned(bb.hb, byteOffset(checkIndex(i)), y,
{#if[boB]?true:false});
return this;
#else[rw]
@@ -241,4 +243,9 @@
#end[boL]
}
+#if[char]
+ ByteOrder charRegionOrder() {
+ return order();
+ }
+#end[char]
}
--- a/src/java.base/share/classes/java/nio/Direct-X-Buffer-bin.java.template Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.base/share/classes/java/nio/Direct-X-Buffer-bin.java.template Mon Jan 08 08:53:14 2018 -0800
@@ -32,7 +32,7 @@
#if[rw]
private $type$ get$Type$(long a) {
- $memtype$ x = unsafe.get$Memtype$Unaligned(null, a, bigEndian);
+ $memtype$ x = UNSAFE.get$Memtype$Unaligned(null, a, bigEndian);
return $fromBits$(x);
}
@@ -49,7 +49,7 @@
private ByteBuffer put$Type$(long a, $type$ x) {
#if[rw]
$memtype$ y = $toBits$(x);
- unsafe.put$Memtype$Unaligned(null, a, y, bigEndian);
+ UNSAFE.put$Memtype$Unaligned(null, a, y, bigEndian);
return this;
#else[rw]
throw new ReadOnlyBufferException();
@@ -81,7 +81,7 @@
int rem = (off <= lim ? lim - off : 0);
int size = rem >> $LG_BYTES_PER_VALUE$;
- if (!unaligned && ((address + off) % $BYTES_PER_VALUE$ != 0)) {
+ if (!UNALIGNED && ((address + off) % $BYTES_PER_VALUE$ != 0)) {
return (bigEndian
? ($Type$Buffer)(new ByteBufferAs$Type$Buffer$RW$B(this,
-1,
--- a/src/java.base/share/classes/java/nio/Direct-X-Buffer.java.template Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.base/share/classes/java/nio/Direct-X-Buffer.java.template Mon Jan 08 08:53:14 2018 -0800
@@ -28,7 +28,6 @@
package java.nio;
import java.io.FileDescriptor;
-import jdk.internal.misc.Unsafe;
import jdk.internal.misc.VM;
import jdk.internal.ref.Cleaner;
import sun.nio.ch.DirectBuffer;
@@ -45,14 +44,11 @@
#if[rw]
- // Cached unsafe-access object
- protected static final Unsafe unsafe = Bits.unsafe();
-
// Cached array base offset
- private static final long arrayBaseOffset = (long)unsafe.arrayBaseOffset($type$[].class);
+ private static final long ARRAY_BASE_OFFSET = UNSAFE.arrayBaseOffset($type$[].class);
// Cached unaligned-access capability
- protected static final boolean unaligned = Bits.unaligned();
+ protected static final boolean UNALIGNED = Bits.unaligned();
// Base address, used in all indexing calculations
// NOTE: moved up to Buffer.java for speed in JNI GetDirectBufferAddress
@@ -73,8 +69,6 @@
implements Runnable
{
- private static Unsafe unsafe = Unsafe.getUnsafe();
-
private long address;
private long size;
private int capacity;
@@ -91,7 +85,7 @@
// Paranoia
return;
}
- unsafe.freeMemory(address);
+ UNSAFE.freeMemory(address);
address = 0;
Bits.unreserveMemory(size, capacity);
}
@@ -124,12 +118,12 @@
long base = 0;
try {
- base = unsafe.allocateMemory(size);
+ base = UNSAFE.allocateMemory(size);
} catch (OutOfMemoryError x) {
Bits.unreserveMemory(size, cap);
throw x;
}
- unsafe.setMemory(base, size, (byte) 0);
+ UNSAFE.setMemory(base, size, (byte) 0);
if (pa && (base % ps != 0)) {
// Round up to page boundary
address = base + ps - (base & (ps - 1));
@@ -206,6 +200,11 @@
#end[rw]
}
+ @Override
+ Object base() {
+ return null;
+ }
+
public $Type$Buffer slice() {
int pos = this.position();
int lim = this.limit();
@@ -258,16 +257,16 @@
}
public $type$ get() {
- return $fromBits$($swap$(unsafe.get$Swaptype$(ix(nextGetIndex()))));
+ return $fromBits$($swap$(UNSAFE.get$Swaptype$(ix(nextGetIndex()))));
}
public $type$ get(int i) {
- return $fromBits$($swap$(unsafe.get$Swaptype$(ix(checkIndex(i)))));
+ return $fromBits$($swap$(UNSAFE.get$Swaptype$(ix(checkIndex(i)))));
}
#if[streamableType]
$type$ getUnchecked(int i) {
- return $fromBits$($swap$(unsafe.get$Swaptype$(ix(i))));
+ return $fromBits$($swap$(UNSAFE.get$Swaptype$(ix(i))));
}
#end[streamableType]
@@ -282,10 +281,10 @@
if (length > rem)
throw new BufferUnderflowException();
- long dstOffset = arrayBaseOffset + ((long)offset << $LG_BYTES_PER_VALUE$);
+ long dstOffset = ARRAY_BASE_OFFSET + ((long)offset << $LG_BYTES_PER_VALUE$);
#if[!byte]
if (order() != ByteOrder.nativeOrder())
- unsafe.copySwapMemory(null,
+ UNSAFE.copySwapMemory(null,
ix(pos),
dst,
dstOffset,
@@ -293,7 +292,7 @@
(long)1 << $LG_BYTES_PER_VALUE$);
else
#end[!byte]
- unsafe.copyMemory(null,
+ UNSAFE.copyMemory(null,
ix(pos),
dst,
dstOffset,
@@ -312,7 +311,7 @@
public $Type$Buffer put($type$ x) {
#if[rw]
- unsafe.put$Swaptype$(ix(nextPutIndex()), $swap$($toBits$(x)));
+ UNSAFE.put$Swaptype$(ix(nextPutIndex()), $swap$($toBits$(x)));
return this;
#else[rw]
throw new ReadOnlyBufferException();
@@ -321,7 +320,7 @@
public $Type$Buffer put(int i, $type$ x) {
#if[rw]
- unsafe.put$Swaptype$(ix(checkIndex(i)), $swap$($toBits$(x)));
+ UNSAFE.put$Swaptype$(ix(checkIndex(i)), $swap$($toBits$(x)));
return this;
#else[rw]
throw new ReadOnlyBufferException();
@@ -347,7 +346,7 @@
if (srem > rem)
throw new BufferOverflowException();
- unsafe.copyMemory(sb.ix(spos), ix(pos), (long)srem << $LG_BYTES_PER_VALUE$);
+ UNSAFE.copyMemory(sb.ix(spos), ix(pos), (long)srem << $LG_BYTES_PER_VALUE$);
sb.position(spos + srem);
position(pos + srem);
} else if (src.hb != null) {
@@ -380,10 +379,10 @@
if (length > rem)
throw new BufferOverflowException();
- long srcOffset = arrayBaseOffset + ((long)offset << $LG_BYTES_PER_VALUE$);
+ long srcOffset = ARRAY_BASE_OFFSET + ((long)offset << $LG_BYTES_PER_VALUE$);
#if[!byte]
if (order() != ByteOrder.nativeOrder())
- unsafe.copySwapMemory(src,
+ UNSAFE.copySwapMemory(src,
srcOffset,
null,
ix(pos),
@@ -391,7 +390,7 @@
(long)1 << $LG_BYTES_PER_VALUE$);
else
#end[!byte]
- unsafe.copyMemory(src,
+ UNSAFE.copyMemory(src,
srcOffset,
null,
ix(pos),
@@ -413,7 +412,7 @@
assert (pos <= lim);
int rem = (pos <= lim ? lim - pos : 0);
- unsafe.copyMemory(ix(pos), ix(0), (long)rem << $LG_BYTES_PER_VALUE$);
+ UNSAFE.copyMemory(ix(pos), ix(0), (long)rem << $LG_BYTES_PER_VALUE$);
position(rem);
limit(capacity());
discardMark();
@@ -490,17 +489,22 @@
#end[!byte]
+#if[char]
+ ByteOrder charRegionOrder() {
+ return order();
+ }
+#end[char]
#if[byte]
byte _get(int i) { // package-private
- return unsafe.getByte(address + i);
+ return UNSAFE.getByte(address + i);
}
void _put(int i, byte b) { // package-private
#if[rw]
- unsafe.putByte(address + i, b);
+ UNSAFE.putByte(address + i, b);
#else[rw]
throw new ReadOnlyBufferException();
#end[rw]
--- a/src/java.base/share/classes/java/nio/Heap-X-Buffer.java.template Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.base/share/classes/java/nio/Heap-X-Buffer.java.template Mon Jan 08 08:53:14 2018 -0800
@@ -27,8 +27,6 @@
package java.nio;
-import jdk.internal.misc.Unsafe;
-
/**
#if[rw]
* A read/write Heap$Type$Buffer.
@@ -43,6 +41,11 @@
class Heap$Type$Buffer$RW$
extends {#if[ro]?Heap}$Type$Buffer
{
+ // Cached array base offset
+ private static final long ARRAY_BASE_OFFSET = UNSAFE.arrayBaseOffset($type$[].class);
+
+ // Cached array base offset
+ private static final long ARRAY_INDEX_SCALE = UNSAFE.arrayIndexScale($type$[].class);
// For speed these fields are actually declared in X-Buffer;
// these declarations are here as documentation
@@ -53,16 +56,6 @@
#end[rw]
*/
-#if[byte]
-
- // Cached unsafe-access object
- private static final Unsafe unsafe = Bits.unsafe();
-
- // Cached array base offset
- private static final long arrayBaseOffset = unsafe.arrayBaseOffset($type$[].class);
-
-#end[byte]
-
Heap$Type$Buffer$RW$(int cap, int lim) { // package-private
#if[rw]
super(-1, 0, lim, cap, new $type$[cap], 0);
@@ -70,13 +63,11 @@
hb = new $type$[cap];
offset = 0;
*/
+ this.address = ARRAY_BASE_OFFSET;
#else[rw]
super(cap, lim);
this.isReadOnly = true;
#end[rw]
-#if[byte]
- this.address = arrayBaseOffset;
-#end[byte]
}
Heap$Type$Buffer$RW$($type$[] buf, int off, int len) { // package-private
@@ -86,13 +77,11 @@
hb = buf;
offset = 0;
*/
+ this.address = ARRAY_BASE_OFFSET;
#else[rw]
super(buf, off, len);
this.isReadOnly = true;
#end[rw]
-#if[byte]
- this.address = arrayBaseOffset;
-#end[byte]
}
protected Heap$Type$Buffer$RW$($type$[] buf,
@@ -105,13 +94,11 @@
hb = buf;
offset = off;
*/
+ this.address = ARRAY_BASE_OFFSET + off * ARRAY_INDEX_SCALE;
#else[rw]
super(buf, mark, pos, lim, cap, off);
this.isReadOnly = true;
#end[rw]
-#if[byte]
- this.address = arrayBaseOffset + off;
-#end[byte]
}
public $Type$Buffer slice() {
@@ -296,18 +283,18 @@
#if[rw]
public char getChar() {
- return unsafe.getCharUnaligned(hb, byteOffset(nextGetIndex(2)), bigEndian);
+ return UNSAFE.getCharUnaligned(hb, byteOffset(nextGetIndex(2)), bigEndian);
}
public char getChar(int i) {
- return unsafe.getCharUnaligned(hb, byteOffset(checkIndex(i, 2)), bigEndian);
+ return UNSAFE.getCharUnaligned(hb, byteOffset(checkIndex(i, 2)), bigEndian);
}
#end[rw]
public $Type$Buffer putChar(char x) {
#if[rw]
- unsafe.putCharUnaligned(hb, byteOffset(nextPutIndex(2)), x, bigEndian);
+ UNSAFE.putCharUnaligned(hb, byteOffset(nextPutIndex(2)), x, bigEndian);
return this;
#else[rw]
throw new ReadOnlyBufferException();
@@ -316,7 +303,7 @@
public $Type$Buffer putChar(int i, char x) {
#if[rw]
- unsafe.putCharUnaligned(hb, byteOffset(checkIndex(i, 2)), x, bigEndian);
+ UNSAFE.putCharUnaligned(hb, byteOffset(checkIndex(i, 2)), x, bigEndian);
return this;
#else[rw]
throw new ReadOnlyBufferException();
@@ -347,18 +334,18 @@
#if[rw]
public short getShort() {
- return unsafe.getShortUnaligned(hb, byteOffset(nextGetIndex(2)), bigEndian);
+ return UNSAFE.getShortUnaligned(hb, byteOffset(nextGetIndex(2)), bigEndian);
}
public short getShort(int i) {
- return unsafe.getShortUnaligned(hb, byteOffset(checkIndex(i, 2)), bigEndian);
+ return UNSAFE.getShortUnaligned(hb, byteOffset(checkIndex(i, 2)), bigEndian);
}
#end[rw]
public $Type$Buffer putShort(short x) {
#if[rw]
- unsafe.putShortUnaligned(hb, byteOffset(nextPutIndex(2)), x, bigEndian);
+ UNSAFE.putShortUnaligned(hb, byteOffset(nextPutIndex(2)), x, bigEndian);
return this;
#else[rw]
throw new ReadOnlyBufferException();
@@ -367,7 +354,7 @@
public $Type$Buffer putShort(int i, short x) {
#if[rw]
- unsafe.putShortUnaligned(hb, byteOffset(checkIndex(i, 2)), x, bigEndian);
+ UNSAFE.putShortUnaligned(hb, byteOffset(checkIndex(i, 2)), x, bigEndian);
return this;
#else[rw]
throw new ReadOnlyBufferException();
@@ -398,18 +385,18 @@
#if[rw]
public int getInt() {
- return unsafe.getIntUnaligned(hb, byteOffset(nextGetIndex(4)), bigEndian);
+ return UNSAFE.getIntUnaligned(hb, byteOffset(nextGetIndex(4)), bigEndian);
}
public int getInt(int i) {
- return unsafe.getIntUnaligned(hb, byteOffset(checkIndex(i, 4)), bigEndian);
+ return UNSAFE.getIntUnaligned(hb, byteOffset(checkIndex(i, 4)), bigEndian);
}
#end[rw]
public $Type$Buffer putInt(int x) {
#if[rw]
- unsafe.putIntUnaligned(hb, byteOffset(nextPutIndex(4)), x, bigEndian);
+ UNSAFE.putIntUnaligned(hb, byteOffset(nextPutIndex(4)), x, bigEndian);
return this;
#else[rw]
throw new ReadOnlyBufferException();
@@ -418,7 +405,7 @@
public $Type$Buffer putInt(int i, int x) {
#if[rw]
- unsafe.putIntUnaligned(hb, byteOffset(checkIndex(i, 4)), x, bigEndian);
+ UNSAFE.putIntUnaligned(hb, byteOffset(checkIndex(i, 4)), x, bigEndian);
return this;
#else[rw]
throw new ReadOnlyBufferException();
@@ -449,18 +436,18 @@
#if[rw]
public long getLong() {
- return unsafe.getLongUnaligned(hb, byteOffset(nextGetIndex(8)), bigEndian);
+ return UNSAFE.getLongUnaligned(hb, byteOffset(nextGetIndex(8)), bigEndian);
}
public long getLong(int i) {
- return unsafe.getLongUnaligned(hb, byteOffset(checkIndex(i, 8)), bigEndian);
+ return UNSAFE.getLongUnaligned(hb, byteOffset(checkIndex(i, 8)), bigEndian);
}
#end[rw]
public $Type$Buffer putLong(long x) {
#if[rw]
- unsafe.putLongUnaligned(hb, byteOffset(nextPutIndex(8)), x, bigEndian);
+ UNSAFE.putLongUnaligned(hb, byteOffset(nextPutIndex(8)), x, bigEndian);
return this;
#else[rw]
throw new ReadOnlyBufferException();
@@ -469,7 +456,7 @@
public $Type$Buffer putLong(int i, long x) {
#if[rw]
- unsafe.putLongUnaligned(hb, byteOffset(checkIndex(i, 8)), x, bigEndian);
+ UNSAFE.putLongUnaligned(hb, byteOffset(checkIndex(i, 8)), x, bigEndian);
return this;
#else[rw]
throw new ReadOnlyBufferException();
@@ -500,12 +487,12 @@
#if[rw]
public float getFloat() {
- int x = unsafe.getIntUnaligned(hb, byteOffset(nextGetIndex(4)), bigEndian);
+ int x = UNSAFE.getIntUnaligned(hb, byteOffset(nextGetIndex(4)), bigEndian);
return Float.intBitsToFloat(x);
}
public float getFloat(int i) {
- int x = unsafe.getIntUnaligned(hb, byteOffset(checkIndex(i, 4)), bigEndian);
+ int x = UNSAFE.getIntUnaligned(hb, byteOffset(checkIndex(i, 4)), bigEndian);
return Float.intBitsToFloat(x);
}
@@ -514,7 +501,7 @@
public $Type$Buffer putFloat(float x) {
#if[rw]
int y = Float.floatToRawIntBits(x);
- unsafe.putIntUnaligned(hb, byteOffset(nextPutIndex(4)), y, bigEndian);
+ UNSAFE.putIntUnaligned(hb, byteOffset(nextPutIndex(4)), y, bigEndian);
return this;
#else[rw]
throw new ReadOnlyBufferException();
@@ -524,7 +511,7 @@
public $Type$Buffer putFloat(int i, float x) {
#if[rw]
int y = Float.floatToRawIntBits(x);
- unsafe.putIntUnaligned(hb, byteOffset(checkIndex(i, 4)), y, bigEndian);
+ UNSAFE.putIntUnaligned(hb, byteOffset(checkIndex(i, 4)), y, bigEndian);
return this;
#else[rw]
throw new ReadOnlyBufferException();
@@ -555,12 +542,12 @@
#if[rw]
public double getDouble() {
- long x = unsafe.getLongUnaligned(hb, byteOffset(nextGetIndex(8)), bigEndian);
+ long x = UNSAFE.getLongUnaligned(hb, byteOffset(nextGetIndex(8)), bigEndian);
return Double.longBitsToDouble(x);
}
public double getDouble(int i) {
- long x = unsafe.getLongUnaligned(hb, byteOffset(checkIndex(i, 8)), bigEndian);
+ long x = UNSAFE.getLongUnaligned(hb, byteOffset(checkIndex(i, 8)), bigEndian);
return Double.longBitsToDouble(x);
}
@@ -569,7 +556,7 @@
public $Type$Buffer putDouble(double x) {
#if[rw]
long y = Double.doubleToRawLongBits(x);
- unsafe.putLongUnaligned(hb, byteOffset(nextPutIndex(8)), y, bigEndian);
+ UNSAFE.putLongUnaligned(hb, byteOffset(nextPutIndex(8)), y, bigEndian);
return this;
#else[rw]
throw new ReadOnlyBufferException();
@@ -579,7 +566,7 @@
public $Type$Buffer putDouble(int i, double x) {
#if[rw]
long y = Double.doubleToRawLongBits(x);
- unsafe.putLongUnaligned(hb, byteOffset(checkIndex(i, 8)), y, bigEndian);
+ UNSAFE.putLongUnaligned(hb, byteOffset(checkIndex(i, 8)), y, bigEndian);
return this;
#else[rw]
throw new ReadOnlyBufferException();
@@ -643,7 +630,11 @@
public ByteOrder order() {
return ByteOrder.nativeOrder();
}
+#end[!byte]
+#if[char]
-#end[!byte]
-
+ ByteOrder charRegionOrder() {
+ return order();
+ }
+#end[char]
}
--- a/src/java.base/share/classes/java/nio/StringCharBuffer.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.base/share/classes/java/nio/StringCharBuffer.java Mon Jan 08 08:53:14 2018 -0800
@@ -127,4 +127,30 @@
return ByteOrder.nativeOrder();
}
+ ByteOrder charRegionOrder() {
+ return null;
+ }
+
+ public boolean equals(Object ob) {
+ if (this == ob)
+ return true;
+ if (!(ob instanceof CharBuffer))
+ return false;
+ CharBuffer that = (CharBuffer)ob;
+ if (this.remaining() != that.remaining())
+ return false;
+ return BufferMismatch.mismatch(this, this.position(),
+ that, that.position(),
+ this.remaining()) < 0;
+ }
+
+ public int compareTo(CharBuffer that) {
+ int i = BufferMismatch.mismatch(this, this.position(),
+ that, that.position(),
+ Math.min(this.remaining(), that.remaining()));
+ if (i >= 0) {
+ return Character.compare(this.get(this.position() + i), that.get(this.position() + i));
+ }
+ return this.remaining() - that.remaining();
+ }
}
--- a/src/java.base/share/classes/java/nio/X-Buffer.java.template Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.base/share/classes/java/nio/X-Buffer.java.template Mon Jan 08 08:53:14 2018 -0800
@@ -36,6 +36,8 @@
import java.util.stream.$Streamtype$Stream;
#end[streamableType]
+import jdk.internal.util.ArraysSupport;
+
/**
* $A$ $type$ buffer.
*
@@ -287,6 +289,11 @@
this(mark, pos, lim, cap, null, 0);
}
+ @Override
+ Object base() {
+ return hb;
+ }
+
#if[byte]
/**
@@ -1297,19 +1304,9 @@
$Type$Buffer that = ($Type$Buffer)ob;
if (this.remaining() != that.remaining())
return false;
- int p = this.position();
- for (int i = this.limit() - 1, j = that.limit() - 1; i >= p; i--, j--)
- if (!equals(this.get(i), that.get(j)))
- return false;
- return true;
- }
-
- private static boolean equals($type$ x, $type$ y) {
-#if[floatingPointType]
- return (x == y) || ($Fulltype$.isNaN(x) && $Fulltype$.isNaN(y));
-#else[floatingPointType]
- return x == y;
-#end[floatingPointType]
+ return BufferMismatch.mismatch(this, this.position(),
+ that, that.position(),
+ this.remaining()) < 0;
}
/**
@@ -1336,11 +1333,11 @@
* is less than, equal to, or greater than the given buffer
*/
public int compareTo($Type$Buffer that) {
- int n = this.position() + Math.min(this.remaining(), that.remaining());
- for (int i = this.position(), j = that.position(); i < n; i++, j++) {
- int cmp = compare(this.get(i), that.get(j));
- if (cmp != 0)
- return cmp;
+ int i = BufferMismatch.mismatch(this, this.position(),
+ that, that.position(),
+ Math.min(this.remaining(), that.remaining()));
+ if (i >= 0) {
+ return compare(this.get(this.position() + i), that.get(this.position() + i));
}
return this.remaining() - that.remaining();
}
@@ -1571,6 +1568,12 @@
#end[!byte]
+#if[char]
+ // The order or null if the buffer does not cover a memory region,
+ // such as StringCharBuffer
+ abstract ByteOrder charRegionOrder();
+#end[char]
+
#if[byte]
boolean bigEndian // package-private
--- a/src/java.base/share/classes/java/nio/file/Files.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.base/share/classes/java/nio/file/Files.java Mon Jan 08 08:53:14 2018 -0800
@@ -2955,22 +2955,6 @@
}
/**
- * Reads all bytes from an input stream and writes them to an output stream.
- */
- private static long copy(InputStream source, OutputStream sink)
- throws IOException
- {
- long nread = 0L;
- byte[] buf = new byte[BUFFER_SIZE];
- int n;
- while ((n = source.read(buf)) > 0) {
- sink.write(buf, 0, n);
- nread += n;
- }
- return nread;
- }
-
- /**
* Copies all bytes from an input stream to a file. On return, the input
* stream will be at end of stream.
*
@@ -3082,7 +3066,7 @@
// do the copy
try (OutputStream out = ostream) {
- return copy(in, out);
+ return in.transferTo(out);
}
}
@@ -3124,7 +3108,7 @@
Objects.requireNonNull(out);
try (InputStream in = newInputStream(source)) {
- return copy(in, out);
+ return in.transferTo(out);
}
}
--- a/src/java.base/share/classes/java/util/Arrays.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.base/share/classes/java/util/Arrays.java Mon Jan 08 08:53:14 2018 -0800
@@ -26,6 +26,7 @@
package java.util;
import jdk.internal.HotSpotIntrinsicCandidate;
+import jdk.internal.util.ArraysSupport;
import java.lang.reflect.Array;
import java.util.concurrent.ForkJoinPool;
--- a/src/java.base/share/classes/java/util/ArraysSupport.java Tue Dec 26 13:38:31 2017 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,545 +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 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;
- }
-}
--- a/src/java.base/share/classes/java/util/ResourceBundle.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.base/share/classes/java/util/ResourceBundle.java Mon Jan 08 08:53:14 2018 -0800
@@ -204,58 +204,70 @@
* known concrete subclasses {@code ListResourceBundle} and
* {@code PropertyResourceBundle} are thread-safe.
*
- * <h3><a id="bundleprovider">Resource Bundles in Named Modules</a></h3>
+ * <h3><a id="resource-bundle-modules">Resource Bundles and Named Modules</a></h3>
+ *
+ * Resource bundles can be deployed in modules in the following ways:
+ *
+ * <h4>Resource bundles together with an application</h4>
+ *
+ * Resource bundles can be deployed together with an application in the same
+ * module. In that case, the resource bundles are loaded
+ * by code in the module by calling the {@link #getBundle(String)}
+ * or {@link #getBundle(String, Locale)} method.
+ *
+ * <h4><a id="service-providers">Resource bundles as service providers</a></h4>
*
- * When resource bundles are deployed in named modules, the following
- * module-specific requirements and restrictions are applied.
+ * Resource bundles can be deployed in one or more <em>service provider modules</em>
+ * and they can be located using {@link ServiceLoader}.
+ * A {@linkplain ResourceBundleProvider service} interface or class must be
+ * defined. The caller module declares that it uses the service, the service
+ * provider modules declare that they provide implementations of the service.
+ * Refer to {@link ResourceBundleProvider} for developing resource bundle
+ * services and deploying resource bundle providers.
+ * The module obtaining the resource bundle can be a resource bundle
+ * provider itself; in which case this module only locates the resource bundle
+ * via service provider mechanism.
+ *
+ * <p>A {@linkplain ResourceBundleProvider resource bundle provider} can
+ * provide resource bundles in any format such XML which replaces the need
+ * of {@link Control ResourceBundle.Control}.
+ *
+ * <h4><a id="other-modules">Resource bundles in other modules and class path</a></h4>
*
- * <ul>
- * <li>Code in a named module that calls {@link #getBundle(String, Locale)}
- * will locate resource bundles in the caller's module (<em>caller module</em>).</li>
- * <li>If resource bundles are deployed in named modules separate from
- * the caller module, those resource bundles need to be loaded from service
- * providers of {@link ResourceBundleProvider}. The caller module must declare
- * "{@code uses}" and the service interface name is the concatenation of the
- * package name of the base name, string "{@code .spi.}", the simple class
- * name of the base name, and the string "{@code Provider}". The
- * <em>bundle provider modules</em> containing resource bundles must
- * declare "{@code provides}" with the service interface name and
- * its implementation class name. For example, if the base name is
- * "{@code com.example.app.MyResources}", the caller module must declare
- * "{@code uses com.example.app.spi.MyResourcesProvider;}" and a module containing resource
- * bundles must declare "{@code provides com.example.app.spi.MyResourcesProvider
- * with com.example.app.internal.MyResourcesProviderImpl;}"
- * where {@code com.example.app.internal.MyResourcesProviderImpl} is an
- * implementation class of {@code com.example.app.spi.MyResourcesProvider}.</li>
- * <li>If you want to use non-standard formats in named modules, such as XML,
- * {@link ResourceBundleProvider} needs to be used.</li>
- * <li>The {@code getBundle} method with a {@code ClassLoader} may not be able to
- * find resource bundles using the given {@code ClassLoader} in named modules.
- * The {@code getBundle} method with a {@code Module} can be used, instead.</li>
- * <li>{@code ResourceBundle.Control} is <em>not</em> supported in named modules.
- * If the {@code getBundle} method with a {@code ResourceBundle.Control} is called
- * in a named module, the method will throw an {@code UnsupportedOperationException}.
- * Any service providers of {@link ResourceBundleControlProvider} are ignored in
- * named modules.
- * </li>
- * </ul>
+ * Resource bundles in a named module may be <em>encapsulated</em> so that
+ * it cannot be located by code in other modules. Resource bundles
+ * in unnamed modules and class path are open for any module to access.
+ * Resource bundle follows the resource encapsulation rules as specified
+ * in {@link Module#getResourceAsStream(String)}.
+ *
+ * <p>The {@code getBundle} factory methods with no {@code Control} parameter
+ * locate and load resource bundles from
+ * {@linkplain ResourceBundleProvider service providers}.
+ * It may continue the search as if calling {@link Module#getResourceAsStream(String)}
+ * to find the named resource from a given module and calling
+ * {@link ClassLoader#getResourceAsStream(String)}; refer to
+ * the specification of the {@code getBundle} method for details.
+ * Only non-encapsulated resource bundles of "{@code java.class}"
+ * or "{@code java.properties}" format are searched.
*
- * <h3><a id="RBP_support">ResourceBundleProvider Service Providers</a></h3>
+ * <p>If the caller module is a
+ * <a href="{@docRoot}/java/util/spi/ResourceBundleProvider.html#obtain-resource-bundle">
+ * resource bundle provider</a>, it does not fall back to the
+ * class loader search.
+ *
+ * <h4>Resource bundles in automatic modules</h4>
*
- * The {@code getBundle} factory methods load service providers of
- * {@link ResourceBundleProvider}, if available, using {@link ServiceLoader}.
- * The service type is designated by
- * {@code <package name> + ".spi." + <simple name> + "Provider"}. For
- * example, if the base name is "{@code com.example.app.MyResources}", the service
- * type is {@code com.example.app.spi.MyResourcesProvider}.
- * <p>
- * In named modules, the loaded service providers for the given base name are
- * used to load resource bundles. If no service provider is available, or if
- * none of the service providers returns a resource bundle and the caller module
- * doesn't have its own service provider, the {@code getBundle} factory method
- * searches for resource bundles that are local in the caller module and that
- * are visible to the class loader of the caller module. The resource bundle
- * formats for local module searching are "java.class" and "java.properties".
+ * A common format of resource bundles is in {@linkplain PropertyResourceBundle
+ * .properties} file format. Typically {@code .properties} resource bundles
+ * are packaged in a JAR file. Resource bundle only JAR file can be readily
+ * deployed as an <a href="{@docRoot}/java/lang/module/ModuleFinder.html#automatic-modules">
+ * automatic module</a>. For example, if the JAR file contains the
+ * entry "{@code p/q/Foo_ja.properties}" and no {@code .class} entry,
+ * when resolved and defined as an automatic module, no package is derived
+ * for this module. This allows resource bundles in {@code .properties}
+ * format packaged in one or more JAR files that may contain entries
+ * in the same directory and can be resolved successfully as
+ * automatic modules.
*
* <h3>ResourceBundle.Control</h3>
*
@@ -268,6 +280,14 @@
* {@link #getBundle(String, Locale, ClassLoader, Control) getBundle}
* factory method for details.
*
+ * <p> {@link ResourceBundle.Control} is designed for an application deployed
+ * in an unnamed module, for example to support resource bundles in
+ * non-standard formats or package localized resources in a non-traditional
+ * convention. {@link ResourceBundleProvider} is the replacement for
+ * {@code ResourceBundle.Control} when migrating to modules.
+ * {@code UnsupportedOperationException} will be thrown when a factory
+ * method that takes the {@code ResourceBundle.Control} parameter is called.
+ *
* <p><a id="modify_default_behavior">For the {@code getBundle} factory</a>
* methods that take no {@link Control} instance, their <a
* href="#default_behavior"> default behavior</a> of resource bundle loading
@@ -815,14 +835,10 @@
/**
* Gets a resource bundle using the specified base name, the default locale,
- * and the caller's class loader. Calling this method is equivalent to calling
+ * and the caller module. Calling this method is equivalent to calling
* <blockquote>
- * <code>getBundle(baseName, Locale.getDefault(), this.getClass().getClassLoader())</code>,
+ * <code>getBundle(baseName, Locale.getDefault(), callerModule)</code>,
* </blockquote>
- * except that <code>getClassLoader()</code> is run with the security
- * privileges of <code>ResourceBundle</code>.
- * See {@link #getBundle(String, Locale, ClassLoader) getBundle}
- * for a complete description of the search and instantiation strategy.
*
* @param baseName the base name of the resource bundle, a fully qualified class name
* @exception java.lang.NullPointerException
@@ -830,6 +846,9 @@
* @exception MissingResourceException
* if no resource bundle for the specified base name can be found
* @return a resource bundle for the given base name and the default locale
+ *
+ * @see <a href="#default_behavior">Resource Bundle Search and Loading Strategy</a>
+ * @see <a href="#resource-bundle-modules">Resource Bundles and Named Modules</a>
*/
@CallerSensitive
public static final ResourceBundle getBundle(String baseName)
@@ -887,14 +906,10 @@
/**
* Gets a resource bundle using the specified base name and locale,
- * and the caller's class loader. Calling this method is equivalent to calling
+ * and the caller module. Calling this method is equivalent to calling
* <blockquote>
- * <code>getBundle(baseName, locale, this.getClass().getClassLoader())</code>,
+ * <code>getBundle(baseName, locale, callerModule)</code>,
* </blockquote>
- * except that <code>getClassLoader()</code> is run with the security
- * privileges of <code>ResourceBundle</code>.
- * See {@link #getBundle(String, Locale, ClassLoader) getBundle}
- * for a complete description of the search and instantiation strategy.
*
* @param baseName
* the base name of the resource bundle, a fully qualified class name
@@ -905,6 +920,9 @@
* @exception MissingResourceException
* if no resource bundle for the specified base name can be found
* @return a resource bundle for the given base name and locale
+ *
+ * @see <a href="#default_behavior">Resource Bundle Search and Loading Strategy</a>
+ * @see <a href="#resource-bundle-modules">Resource Bundles and Named Modules</a>
*/
@CallerSensitive
public static final ResourceBundle getBundle(String baseName,
@@ -922,19 +940,6 @@
* <code>getBundle(baseName, Locale.getDefault(), module)</code>
* </blockquote>
*
- * <p> Resource bundles in named modules may be encapsulated. When
- * the resource bundle is loaded from a provider, the caller module
- * must have an appropriate <i>uses</i> clause in its <i>module descriptor</i>
- * to declare that the module uses implementations of
- * {@code <package name> + ".spi." + <simple name> + "Provider"}.
- * Otherwise, it will load the resource bundles that are local in the
- * given module or that are visible to the class loader of the given module
- * (refer to the <a href="#bundleprovider">Resource Bundles in Named Modules</a>
- * section for details).
- * When the resource bundle is loaded from the specified module, it is
- * subject to the encapsulation rules specified by
- * {@link Module#getResourceAsStream Module.getResourceAsStream}.
- *
* @param baseName the base name of the resource bundle,
* a fully qualified class name
* @param module the module for which the resource bundle is searched
@@ -950,6 +955,8 @@
* @since 9
* @spec JPMS
* @see ResourceBundleProvider
+ * @see <a href="#default_behavior">Resource Bundle Search and Loading Strategy</a>
+ * @see <a href="#resource-bundle-modules">Resource Bundles and Named Modules</a>
*/
@CallerSensitive
public static ResourceBundle getBundle(String baseName, Module module) {
@@ -963,14 +970,15 @@
* on behalf of the specified module.
*
* <p> Resource bundles in named modules may be encapsulated. When
- * the resource bundle is loaded from a provider, the caller module
+ * the resource bundle is loaded from a
+ * {@linkplain ResourceBundleProvider service provider}, the caller module
* must have an appropriate <i>uses</i> clause in its <i>module descriptor</i>
- * to declare that the module uses implementations of
- * {@code <package name> + ".spi." + <simple name> + "Provider"}.
+ * to declare that the module uses of {@link ResourceBundleProvider}
+ * for the named resource bundle.
* Otherwise, it will load the resource bundles that are local in the
- * given module or that are visible to the class loader of the given module
- * (refer to the <a href="#bundleprovider">Resource Bundles in Named Modules</a>
- * section for details).
+ * given module as if calling {@link Module#getResourceAsStream(String)}
+ * or that are visible to the class loader of the given module
+ * as if calling {@link ClassLoader#getResourceAsStream(String)}.
* When the resource bundle is loaded from the specified module, it is
* subject to the encapsulation rules specified by
* {@link Module#getResourceAsStream Module.getResourceAsStream}.
@@ -1000,6 +1008,8 @@
* @return a resource bundle for the given base name and locale in the module
* @since 9
* @spec JPMS
+ * @see <a href="#default_behavior">Resource Bundle Search and Loading Strategy</a>
+ * @see <a href="#resource-bundle-modules">Resource Bundles and Named Modules</a>
*/
@CallerSensitive
public static ResourceBundle getBundle(String baseName, Locale targetLocale, Module module) {
@@ -1060,28 +1070,25 @@
* Gets a resource bundle using the specified base name, locale, and class
* loader.
*
- * <p>This method behaves the same as calling
- * {@link #getBundle(String, Locale, ClassLoader, Control)} passing a
- * default instance of {@link Control} unless another {@link Control} is
- * provided with the {@link ResourceBundleControlProvider} SPI. Refer to the
+ * <p>When this method is called from a named module and the given
+ * loader is the class loader of the caller module, this is equivalent
+ * to calling:
+ * <blockquote><pre>
+ * getBundle(baseName, targetLocale, callerModule)
+ * </pre></blockquote>
+ *
+ * otherwise, this is equivalent to calling:
+ * <blockquote><pre>
+ * getBundle(baseName, targetLocale, loader, control)
+ * </pre></blockquote>
+ * where {@code control} is the default instance of {@link Control} unless
+ * a {@code Control} instance is provided by
+ * {@link ResourceBundleControlProvider} SPI. Refer to the
* description of <a href="#modify_default_behavior">modifying the default
- * behavior</a>.
- *
- * <p><a id="default_behavior">The following describes the default
- * behavior</a>.
+ * behavior</a>. The following describes the default behavior.
*
* <p>
- * Resource bundles in a named module are private to that module. If
- * the caller is in a named module, this method will find resource bundles
- * from the service providers of {@link java.util.spi.ResourceBundleProvider}
- * if any. Otherwise, it will load the resource bundles that are visible to
- * the given {@code loader} (refer to the
- * <a href="#bundleprovider">Resource Bundles in Named Modules</a> section
- * for details).
- * If the caller is in a named module and the given {@code loader} is
- * different than the caller's class loader, or if the caller is not in
- * a named module, this method will not find resource bundles from named
- * modules.
+ * <b><a id="default_behavior">Resource Bundle Search and Loading Strategy</a></b>
*
* <p><code>getBundle</code> uses the base name, the specified locale, and
* the default locale (obtained from {@link java.util.Locale#getDefault()
@@ -1201,7 +1208,7 @@
*
* <p><b>Note:</b>The <code>baseName</code> argument should be a fully
* qualified class name. However, for compatibility with earlier versions,
- * Sun's Java SE Runtime Environments do not verify this, and so it is
+ * Java SE Runtime Environments do not verify this, and so it is
* possible to access <code>PropertyResourceBundle</code>s by specifying a
* path name (using "/") instead of a fully qualified class name (using
* ".").
@@ -1248,7 +1255,7 @@
*
* @apiNote If the caller module is a named module and the given
* {@code loader} is the caller module's class loader, this method is
- * equivalent to {@code getBundle(baseName, locale)}; otherwise, it will not
+ * equivalent to {@code getBundle(baseName, locale)}; otherwise, it may not
* find resource bundles from named modules.
* Use {@link #getBundle(String, Locale, Module)} to load resource bundles
* on behalf on a specific module instead.
@@ -1264,6 +1271,7 @@
* @since 1.2
* @revised 9
* @spec JPMS
+ * @see <a href="#resource-bundle-modules">Resource Bundles and Named Modules</a>
*/
@CallerSensitive
public static ResourceBundle getBundle(String baseName, Locale locale,
@@ -1278,9 +1286,9 @@
/**
* Returns a resource bundle using the specified base name, target
- * locale, class loader and control. Unlike the {@linkplain
- * #getBundle(String, Locale, ClassLoader) <code>getBundle</code>
- * factory methods with no <code>control</code> argument}, the given
+ * locale, class loader and control. Unlike the {@link
+ * #getBundle(String, Locale, ClassLoader) getBundle}
+ * factory methods with no {@code control} argument, the given
* <code>control</code> specifies how to locate and instantiate resource
* bundles. Conceptually, the bundle loading process with the given
* <code>control</code> is performed in the following steps.
@@ -2365,7 +2373,14 @@
* the callback methods provides the information necessary for the
* factory methods to perform the <a
* href="./ResourceBundle.html#default_behavior">default behavior</a>.
- * <a href="#note">Note that this class is not supported in named modules.</a>
+ *
+ * <p> {@link ResourceBundle.Control} is designed for an application deployed
+ * in an unnamed module, for example to support resource bundles in
+ * non-standard formats or package localized resources in a non-traditional
+ * convention. {@link ResourceBundleProvider} is the replacement for
+ * {@code ResourceBundle.Control} when migrating to modules.
+ * {@code UnsupportedOperationException} will be thrown when a factory
+ * method that takes the {@code ResourceBundle.Control} parameter is called.
*
* <p>In addition to the callback methods, the {@link
* #toBundleName(String, Locale) toBundleName} and {@link
@@ -2501,8 +2516,8 @@
* }
* </pre>
*
- * @apiNote <a id="note">{@code ResourceBundle.Control} is not supported
- * in named modules.</a> If the {@code ResourceBundle.getBundle} method with
+ * @apiNote {@code ResourceBundle.Control} is not supported
+ * in named modules. If the {@code ResourceBundle.getBundle} method with
* a {@code ResourceBundle.Control} is called in a named module, the method
* will throw an {@link UnsupportedOperationException}. Any service providers
* of {@link ResourceBundleControlProvider} are ignored in named modules.
--- a/src/java.base/share/classes/java/util/spi/AbstractResourceBundleProvider.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.base/share/classes/java/util/spi/AbstractResourceBundleProvider.java Mon Jan 08 08:53:14 2018 -0800
@@ -45,42 +45,46 @@
*
* <p>
* Resource bundles can be packaged in one or more
- * named modules, <em>bundle modules</em>. The <em>consumer</em> of the
+ * named modules, <em>service provider modules</em>. The <em>consumer</em> of the
* resource bundle is the one calling {@link ResourceBundle#getBundle(String)}.
* In order for the consumer module to load a resource bundle
* "{@code com.example.app.MyResources}" provided by another module,
* it will use the {@linkplain java.util.ServiceLoader service loader}
- * mechanism. A service interface named "{@code com.example.app.MyResourcesProvider}"
- * must be defined and a <em>bundle provider module</em> will provide an
- * implementation class of "{@code com.example.app.MyResourcesProvider}"
+ * mechanism. A service interface named "{@code com.example.app.spi.MyResourcesProvider}"
+ * must be defined and a <em>service provider module</em> will provide an
+ * implementation class of "{@code com.example.app.spi.MyResourcesProvider}"
* as follows:
*
- * <pre><code>
- * import com.example.app.MyResourcesProvider;
+ * <blockquote><pre>
+ * {@code import com.example.app.spi.MyResourcesProvider;
* class MyResourcesProviderImpl extends AbstractResourceBundleProvider
* implements MyResourcesProvider
* {
+ * public MyResourcesProviderImpl() {
+ * super("java.properties");
+ * }
+ * // this provider maps the resource bundle to per-language package
* protected String toBundleName(String baseName, Locale locale) {
- * // return the bundle name per the naming of the resource bundle
- * :
+ * return "p." + locale.getLanguage() + "." + baseName;
* }
*
* public ResourceBundle getBundle(String baseName, Locale locale) {
- * // this module only provides bundles in french
+ * // this module only provides bundles in French
* if (locale.equals(Locale.FRENCH)) {
* return super.getBundle(baseName, locale);
* }
+ * // otherwise return null
* return null;
* }
- * }</code></pre>
+ * }}</pre></blockquote>
*
- * @see <a href="../ResourceBundle.html#bundleprovider">
- * Resource Bundles in Named Modules</a>
- * @see <a href="../ResourceBundle.html#RBP_support">
- * ResourceBundleProvider Service Providers</a>
+ * Refer to {@link ResourceBundleProvider} for details.
*
+ * @see <a href="../ResourceBundle.html#resource-bundle-modules">
+ * Resource Bundles and Named Modules</a>
* @since 9
* @spec JPMS
+
*/
public abstract class AbstractResourceBundleProvider implements ResourceBundleProvider {
private static final JavaUtilResourceBundleAccess RB_ACCESS =
--- a/src/java.base/share/classes/java/util/spi/ResourceBundleProvider.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.base/share/classes/java/util/spi/ResourceBundleProvider.java Mon Jan 08 08:53:14 2018 -0800
@@ -29,33 +29,117 @@
import java.util.ResourceBundle;
/**
- * {@code ResourceBundleProvider} is a provider interface that is used for
- * loading resource bundles for named modules. Implementation classes of
- * this interface are loaded with {@link java.util.ServiceLoader ServiceLoader}
- * during a call to the
- * {@link ResourceBundle#getBundle(String, Locale, ClassLoader)
- * ResourceBundle.getBundle} method. The provider service type is determined by
- * {@code <package name> + ".spi." + <simple name> + "Provider"}.
+ * {@code ResourceBundleProvider} is a service provider interface for
+ * resource bundles. It is used by
+ * {@link ResourceBundle#getBundle(String) ResourceBundle.getBundle}
+ * factory methods to locate and load the service providers that are deployed as
+ * modules via {@link java.util.ServiceLoader ServiceLoader}.
+ *
+ * <h3>Developing resource bundle services</h3>
*
- * <p>
- * For example, if the base name is "com.example.app.MyResources",
- * {@code com.example.app.spi.MyResourcesProvider} will be the provider service type:
- * <pre>{@code
+ * A service for a resource bundle of a given <em>{@code baseName}</em> must have
+ * a fully-qualified class name of the form:
+ * <blockquote>
+ * {@code <package of baseName> + ".spi." + <simple name of baseName> + "Provider"}
+ * </blockquote>
+ *
+ * The service type is in a {@code spi} subpackage as it may be packaged in
+ * a module separate from the resource bundle providers.
+ * For example, the service for a resource bundle named
+ * {@code com.example.app.MyResources} must be
+ * {@code com.example.app.spi.MyResourcesProvider}:
+ *
+ * <blockquote><pre>
+ * {@code package com.example.app.spi;
* public interface MyResourcesProvider extends ResourceBundleProvider {
* }
- * }</pre>
+ * }</pre></blockquote>
+ *
+ * <h3>Deploying resource bundle service providers</h3>
+ *
+ * Resource bundles can be deployed in one or more service providers
+ * in modules. For example, a provider for a service
+ * named "{@code com.example.app.spi.MyResourcesProvider}"
+ * has the following implementation class:
+ *
+ * <blockquote><pre>
+ * {@code import com.example.app.spi.MyResourcesProvider;
+ * class MyResourcesProviderImpl extends AbstractResourceBundleProvider
+ * implements MyResourcesProvider
+ * {
+ * public MyResourcesProviderImpl() {
+ * super("java.properties");
+ * }
+ * // this provider maps the resource bundle to per-language package
+ * protected String toBundleName(String baseName, Locale locale) {
+ * return "p." + locale.getLanguage() + "." + baseName;
+ * }
+ *
+ * public ResourceBundle getBundle(String baseName, Locale locale) {
+ * // this module only provides bundles in French
+ * if (locale.equals(Locale.FRENCH)) {
+ * return super.getBundle(baseName, locale);
+ * }
+ * // otherwise return null
+ * return null;
+ * }
+ * }}</pre></blockquote>
+ *
+ * This example provides "{@code com.example.app.MyResources}"
+ * resource bundle of the French locale. Traditionally resource bundles of
+ * all locales are packaged in the same package as the resource bundle base name.
+ * When deploying resource bundles in more than one modules and two modules
+ * containing a package of the same name, <em>split package</em>,
+ * is not supported, resource bundles in each module can be packaged in
+ * a different package as shown in this example where this provider packages
+ * the resource bundles in per-language package, i.e. {@code com.example.app.fr}
+ * for French locale.
*
- * <p>
- * This providers's {@link #getBundle(String, Locale) getBundle} method is called
- * through the resource bundle loading process instead of {@link
- * java.util.ResourceBundle.Control#newBundle(String, Locale, String, ClassLoader, boolean)
- * ResourceBundle.Control.newBundle()}. Refer to {@link ResourceBundle} for
- * details.
+ * <p> A provider can provide more than one services, each of which is a service
+ * for a resource bundle of a different base name.
+ *
+ * <p>{@link AbstractResourceBundleProvider}
+ * provides the basic implementation for {@code ResourceBundleProvider}
+ * and a subclass can override the {@link
+ * AbstractResourceBundleProvider#toBundleName(String, Locale) toBundleName}
+ * method to return a provider-specific location of the resource to be loaded,
+ * for example, per-language package.
+ * A provider can override {@link #getBundle ResourceBundleProvider.getBundle}
+ * method for example to only search the known supported locales or
+ * return resource bundles in other formats such as XML.
+ *
+ * <p>The module declaration of this provider module specifies the following
+ * directive:
+ * <pre>
+ * provides com.example.app.spi.MyResourcesProvider with com.example.impl.MyResourcesProviderImpl;
+ * </pre>
+ *
+ * <h3><a id="obtain-resource-bundle">Obtaining resource bundles from providers</a></h3>
*
- * @see <a href="../ResourceBundle.html#bundleprovider">
- * Resource Bundles in Named Modules</a>
- * @see <a href="../ResourceBundle.html#RBP_support">
- * ResourceBundleProvider Service Providers</a>
+ * The module declaration of the <em>consumer module</em> that calls one of the
+ * {@code ResourceBundle.getBundle} factory methods to obtain a resource
+ * bundle from service providers must specify the following directive:
+ * <pre>
+ * uses com.example.app.spi.MyResourcesProvider;
+ * </pre>
+ *
+ * {@link ResourceBundle#getBundle(String, Locale)
+ * ResourceBundle.getBundle("com.example.app.MyResource", locale)}
+ * locates and loads the providers for {@code com.example.app.spi.MyResourcesProvider}
+ * service and then invokes {@link #getBundle(String, Locale)
+ * ResourceBundleProvider.getBundle("com.example.app.MyResource", locale)} to
+ * find the resource bundle of the given base name and locale.
+ * If the consumer module is a resource bundle service provider for
+ * {@code com.example.app.spi.MyResourcesProvider}, {@code ResourceBundle.getBundle}
+ * will locate resource bundles only from service providers.
+ * Otherwise, {@code ResourceBundle.getBundle} may continue the search of
+ * the resource bundle in other modules and class path per the specification
+ * of the {@code ResourceBundle.getBundle} method being called.
+ *
+ * @see AbstractResourceBundleProvider
+ * @see <a href="../ResourceBundle.html#resource-bundle-modules">
+ * Resource Bundles and Named Modules</a>
+ * @see java.util.ServiceLoader
* @since 9
* @spec JPMS
*/
--- a/src/java.base/share/classes/java/util/stream/WhileOps.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.base/share/classes/java/util/stream/WhileOps.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -95,7 +95,7 @@
@Override
public void accept(T t) {
- if (take = predicate.test(t)) {
+ if (take && (take = predicate.test(t))) {
downstream.accept(t);
}
}
@@ -152,7 +152,7 @@
@Override
public void accept(int t) {
- if (take = predicate.test(t)) {
+ if (take && (take = predicate.test(t))) {
downstream.accept(t);
}
}
@@ -209,7 +209,7 @@
@Override
public void accept(long t) {
- if (take = predicate.test(t)) {
+ if (take && (take = predicate.test(t))) {
downstream.accept(t);
}
}
@@ -266,7 +266,7 @@
@Override
public void accept(double t) {
- if (take = predicate.test(t)) {
+ if (take && (take = predicate.test(t))) {
downstream.accept(t);
}
}
--- a/src/java.base/share/classes/jdk/internal/loader/AbstractClassLoaderValue.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.base/share/classes/jdk/internal/loader/AbstractClassLoaderValue.java Mon Jan 08 08:53:14 2018 -0800
@@ -4,7 +4,9 @@
*
* 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.
+ * 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
--- a/src/java.base/share/classes/jdk/internal/loader/ClassLoaderValue.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.base/share/classes/jdk/internal/loader/ClassLoaderValue.java Mon Jan 08 08:53:14 2018 -0800
@@ -4,7 +4,9 @@
*
* 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.
+ * 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
--- a/src/java.base/share/classes/jdk/internal/module/ModuleInfo.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.base/share/classes/jdk/internal/module/ModuleInfo.java Mon Jan 08 08:53:14 2018 -0800
@@ -64,7 +64,7 @@
public final class ModuleInfo {
private final int JAVA_MIN_SUPPORTED_VERSION = 53;
- private final int JAVA_MAX_SUPPORTED_VERSION = 54;
+ private final int JAVA_MAX_SUPPORTED_VERSION = 55;
private static final JavaLangModuleAccess JLMA
= SharedSecrets.getJavaLangModuleAccess();
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassReader.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassReader.java Mon Jan 08 08:53:14 2018 -0800
@@ -185,7 +185,7 @@
public ClassReader(final byte[] b, final int off, final int len) {
this.b = b;
// checks the class version
- if (readShort(off + 6) > Opcodes.V10) {
+ if (readShort(off + 6) > Opcodes.V11) {
throw new IllegalArgumentException();
}
// parses the constant pool
--- a/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Opcodes.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Opcodes.java Mon Jan 08 08:53:14 2018 -0800
@@ -90,6 +90,7 @@
int V1_8 = 0 << 16 | 52;
int V9 = 0 << 16 | 53;
int V10 = 0 << 16 | 54;
+ int V11 = 0 << 16 | 55;
// access flags
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/java.base/share/classes/jdk/internal/util/ArraysSupport.java Mon Jan 08 08:53:14 2018 -0800
@@ -0,0 +1,545 @@
+/*
+ * Copyright (c) 2015, 2017 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. 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.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.
+ */
+public class ArraysSupport {
+ static final Unsafe U = Unsafe.getUnsafe();
+
+ private static final boolean BIG_ENDIAN = U.isBigEndian();
+
+ public static final int LOG2_ARRAY_BOOLEAN_INDEX_SCALE = exactLog2(Unsafe.ARRAY_BOOLEAN_INDEX_SCALE);
+ public static final int LOG2_ARRAY_BYTE_INDEX_SCALE = exactLog2(Unsafe.ARRAY_BYTE_INDEX_SCALE);
+ public static final int LOG2_ARRAY_CHAR_INDEX_SCALE = exactLog2(Unsafe.ARRAY_CHAR_INDEX_SCALE);
+ public static final int LOG2_ARRAY_SHORT_INDEX_SCALE = exactLog2(Unsafe.ARRAY_SHORT_INDEX_SCALE);
+ public static final int LOG2_ARRAY_INT_INDEX_SCALE = exactLog2(Unsafe.ARRAY_INT_INDEX_SCALE);
+ public static final int LOG2_ARRAY_LONG_INDEX_SCALE = exactLog2(Unsafe.ARRAY_LONG_INDEX_SCALE);
+ public static final int LOG2_ARRAY_FLOAT_INDEX_SCALE = exactLog2(Unsafe.ARRAY_FLOAT_INDEX_SCALE);
+ public 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
+ public 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
+
+ public 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;
+ }
+
+ public 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.
+ */
+ public 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.
+ */
+ public 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
+
+ public 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;
+ }
+
+ public 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
+
+ public 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;
+ }
+
+ public 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
+
+ public 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;
+ }
+
+ public 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
+
+ public static int mismatch(float[] a,
+ float[] b,
+ int length) {
+ return mismatch(a, 0, b, 0, length);
+ }
+
+ public 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
+
+ public 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;
+ }
+
+ public 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
+
+ public static int mismatch(double[] a,
+ double[] b,
+ int length) {
+ return mismatch(a, 0, b, 0, length);
+ }
+
+ public 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;
+ }
+}
--- a/src/java.base/share/classes/module-info.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.base/share/classes/module-info.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2018, 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
@@ -142,7 +142,7 @@
java.instrument,
java.logging;
exports jdk.internal.jmod to
- jdk.compiler, // reflective dependency
+ jdk.compiler,
jdk.jlink;
exports jdk.internal.logger to
java.logging;
@@ -172,7 +172,7 @@
java.xml,
jdk.attach,
jdk.charsets,
- jdk.compiler, // reflective dependency
+ jdk.compiler,
jdk.incubator.httpclient,
jdk.jdeps,
jdk.jlink,
--- a/src/java.base/share/classes/sun/security/ssl/ExtendedMasterSecretExtension.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.base/share/classes/sun/security/ssl/ExtendedMasterSecretExtension.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,11 +1,12 @@
/*
* Copyright (c) 2017, Red Hat, Inc. and/or its affiliates.
- *
* 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.
+ * 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
--- a/src/java.base/share/classes/sun/security/ssl/HandshakeHash.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.base/share/classes/sun/security/ssl/HandshakeHash.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -108,7 +108,29 @@
* a hash for the certificate verify message is required.
*/
HandshakeHash(boolean needCertificateVerify) {
- clonesNeeded = needCertificateVerify ? 4 : 3;
+ // We may rework the code later, but for now we use hard-coded number
+ // of clones if the underlying MessageDigests are not cloneable.
+ //
+ // The number used here is based on the current handshake protocols and
+ // implementation. It may be changed if the handshake processe gets
+ // changed in the future, for example adding a new extension that
+ // requires handshake hash. Please be careful about the number of
+ // clones if additional handshak hash is required in the future.
+ //
+ // For the current implementation, the handshake hash is required for
+ // the following items:
+ // . CertificateVerify handshake message (optional)
+ // . client Finished handshake message
+ // . server Finished Handshake message
+ // . the extended Master Secret extension [RFC 7627]
+ //
+ // Note that a late call to server setNeedClientAuth dose not update
+ // the number of clones. We may address the issue later.
+ //
+ // Note for safety, we allocate one more clone for the current
+ // implementation. We may consider it more carefully in the future
+ // for the exact number or rework the code in a different way.
+ clonesNeeded = needCertificateVerify ? 5 : 4;
}
void reserve(ByteBuffer input) {
@@ -335,7 +357,8 @@
if (finMD != null) return;
try {
- finMD = CloneableDigest.getDigest(normalizeAlgName(s), 2);
+ // See comment in the contructor.
+ finMD = CloneableDigest.getDigest(normalizeAlgName(s), 4);
} catch (NoSuchAlgorithmException e) {
throw new Error(e);
}
--- a/src/java.base/share/native/include/classfile_constants.h Tue Dec 26 13:38:31 2017 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,581 +0,0 @@
-/*
- * Copyright (c) 2004, 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.
- */
-
-#ifndef CLASSFILE_CONSTANTS_H
-#define CLASSFILE_CONSTANTS_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Classfile version number for this information */
-#define JVM_CLASSFILE_MAJOR_VERSION 54
-#define JVM_CLASSFILE_MINOR_VERSION 0
-
-/* Flags */
-
-enum {
- JVM_ACC_PUBLIC = 0x0001,
- JVM_ACC_PRIVATE = 0x0002,
- JVM_ACC_PROTECTED = 0x0004,
- JVM_ACC_STATIC = 0x0008,
- JVM_ACC_FINAL = 0x0010,
- JVM_ACC_SYNCHRONIZED = 0x0020,
- JVM_ACC_SUPER = 0x0020,
- JVM_ACC_VOLATILE = 0x0040,
- JVM_ACC_BRIDGE = 0x0040,
- JVM_ACC_TRANSIENT = 0x0080,
- JVM_ACC_VARARGS = 0x0080,
- JVM_ACC_NATIVE = 0x0100,
- JVM_ACC_INTERFACE = 0x0200,
- JVM_ACC_ABSTRACT = 0x0400,
- JVM_ACC_STRICT = 0x0800,
- JVM_ACC_SYNTHETIC = 0x1000,
- JVM_ACC_ANNOTATION = 0x2000,
- JVM_ACC_ENUM = 0x4000,
- JVM_ACC_MODULE = 0x8000
-};
-
-#define JVM_ACC_PUBLIC_BIT 0
-#define JVM_ACC_PRIVATE_BIT 1
-#define JVM_ACC_PROTECTED_BIT 2
-#define JVM_ACC_STATIC_BIT 3
-#define JVM_ACC_FINAL_BIT 4
-#define JVM_ACC_SYNCHRONIZED_BIT 5
-#define JVM_ACC_SUPER_BIT 5
-#define JVM_ACC_VOLATILE_BIT 6
-#define JVM_ACC_BRIDGE_BIT 6
-#define JVM_ACC_TRANSIENT_BIT 7
-#define JVM_ACC_VARARGS_BIT 7
-#define JVM_ACC_NATIVE_BIT 8
-#define JVM_ACC_INTERFACE_BIT 9
-#define JVM_ACC_ABSTRACT_BIT 10
-#define JVM_ACC_STRICT_BIT 11
-#define JVM_ACC_SYNTHETIC_BIT 12
-#define JVM_ACC_ANNOTATION_BIT 13
-#define JVM_ACC_ENUM_BIT 14
-
-/* Used in newarray instruction. */
-
-enum {
- JVM_T_BOOLEAN = 4,
- JVM_T_CHAR = 5,
- JVM_T_FLOAT = 6,
- JVM_T_DOUBLE = 7,
- JVM_T_BYTE = 8,
- JVM_T_SHORT = 9,
- JVM_T_INT = 10,
- JVM_T_LONG = 11
-};
-
-/* Constant Pool Entries */
-
-enum {
- JVM_CONSTANT_Utf8 = 1,
- JVM_CONSTANT_Unicode = 2, /* unused */
- JVM_CONSTANT_Integer = 3,
- JVM_CONSTANT_Float = 4,
- JVM_CONSTANT_Long = 5,
- JVM_CONSTANT_Double = 6,
- JVM_CONSTANT_Class = 7,
- JVM_CONSTANT_String = 8,
- JVM_CONSTANT_Fieldref = 9,
- JVM_CONSTANT_Methodref = 10,
- JVM_CONSTANT_InterfaceMethodref = 11,
- JVM_CONSTANT_NameAndType = 12,
- JVM_CONSTANT_MethodHandle = 15, // JSR 292
- JVM_CONSTANT_MethodType = 16, // JSR 292
- JVM_CONSTANT_InvokeDynamic = 18,
- JVM_CONSTANT_ExternalMax = 18
-};
-
-/* JVM_CONSTANT_MethodHandle subtypes */
-enum {
- JVM_REF_getField = 1,
- JVM_REF_getStatic = 2,
- JVM_REF_putField = 3,
- JVM_REF_putStatic = 4,
- JVM_REF_invokeVirtual = 5,
- JVM_REF_invokeStatic = 6,
- JVM_REF_invokeSpecial = 7,
- JVM_REF_newInvokeSpecial = 8,
- JVM_REF_invokeInterface = 9
-};
-
-/* StackMapTable type item numbers */
-
-enum {
- JVM_ITEM_Top = 0,
- JVM_ITEM_Integer = 1,
- JVM_ITEM_Float = 2,
- JVM_ITEM_Double = 3,
- JVM_ITEM_Long = 4,
- JVM_ITEM_Null = 5,
- JVM_ITEM_UninitializedThis = 6,
- JVM_ITEM_Object = 7,
- JVM_ITEM_Uninitialized = 8
-};
-
-/* Type signatures */
-
-enum {
- JVM_SIGNATURE_ARRAY = '[',
- JVM_SIGNATURE_BYTE = 'B',
- JVM_SIGNATURE_CHAR = 'C',
- JVM_SIGNATURE_CLASS = 'L',
- JVM_SIGNATURE_ENDCLASS = ';',
- JVM_SIGNATURE_ENUM = 'E',
- JVM_SIGNATURE_FLOAT = 'F',
- JVM_SIGNATURE_DOUBLE = 'D',
- JVM_SIGNATURE_FUNC = '(',
- JVM_SIGNATURE_ENDFUNC = ')',
- JVM_SIGNATURE_INT = 'I',
- JVM_SIGNATURE_LONG = 'J',
- JVM_SIGNATURE_SHORT = 'S',
- JVM_SIGNATURE_VOID = 'V',
- JVM_SIGNATURE_BOOLEAN = 'Z'
-};
-
-/* Opcodes */
-
-enum {
- JVM_OPC_nop = 0,
- JVM_OPC_aconst_null = 1,
- JVM_OPC_iconst_m1 = 2,
- JVM_OPC_iconst_0 = 3,
- JVM_OPC_iconst_1 = 4,
- JVM_OPC_iconst_2 = 5,
- JVM_OPC_iconst_3 = 6,
- JVM_OPC_iconst_4 = 7,
- JVM_OPC_iconst_5 = 8,
- JVM_OPC_lconst_0 = 9,
- JVM_OPC_lconst_1 = 10,
- JVM_OPC_fconst_0 = 11,
- JVM_OPC_fconst_1 = 12,
- JVM_OPC_fconst_2 = 13,
- JVM_OPC_dconst_0 = 14,
- JVM_OPC_dconst_1 = 15,
- JVM_OPC_bipush = 16,
- JVM_OPC_sipush = 17,
- JVM_OPC_ldc = 18,
- JVM_OPC_ldc_w = 19,
- JVM_OPC_ldc2_w = 20,
- JVM_OPC_iload = 21,
- JVM_OPC_lload = 22,
- JVM_OPC_fload = 23,
- JVM_OPC_dload = 24,
- JVM_OPC_aload = 25,
- JVM_OPC_iload_0 = 26,
- JVM_OPC_iload_1 = 27,
- JVM_OPC_iload_2 = 28,
- JVM_OPC_iload_3 = 29,
- JVM_OPC_lload_0 = 30,
- JVM_OPC_lload_1 = 31,
- JVM_OPC_lload_2 = 32,
- JVM_OPC_lload_3 = 33,
- JVM_OPC_fload_0 = 34,
- JVM_OPC_fload_1 = 35,
- JVM_OPC_fload_2 = 36,
- JVM_OPC_fload_3 = 37,
- JVM_OPC_dload_0 = 38,
- JVM_OPC_dload_1 = 39,
- JVM_OPC_dload_2 = 40,
- JVM_OPC_dload_3 = 41,
- JVM_OPC_aload_0 = 42,
- JVM_OPC_aload_1 = 43,
- JVM_OPC_aload_2 = 44,
- JVM_OPC_aload_3 = 45,
- JVM_OPC_iaload = 46,
- JVM_OPC_laload = 47,
- JVM_OPC_faload = 48,
- JVM_OPC_daload = 49,
- JVM_OPC_aaload = 50,
- JVM_OPC_baload = 51,
- JVM_OPC_caload = 52,
- JVM_OPC_saload = 53,
- JVM_OPC_istore = 54,
- JVM_OPC_lstore = 55,
- JVM_OPC_fstore = 56,
- JVM_OPC_dstore = 57,
- JVM_OPC_astore = 58,
- JVM_OPC_istore_0 = 59,
- JVM_OPC_istore_1 = 60,
- JVM_OPC_istore_2 = 61,
- JVM_OPC_istore_3 = 62,
- JVM_OPC_lstore_0 = 63,
- JVM_OPC_lstore_1 = 64,
- JVM_OPC_lstore_2 = 65,
- JVM_OPC_lstore_3 = 66,
- JVM_OPC_fstore_0 = 67,
- JVM_OPC_fstore_1 = 68,
- JVM_OPC_fstore_2 = 69,
- JVM_OPC_fstore_3 = 70,
- JVM_OPC_dstore_0 = 71,
- JVM_OPC_dstore_1 = 72,
- JVM_OPC_dstore_2 = 73,
- JVM_OPC_dstore_3 = 74,
- JVM_OPC_astore_0 = 75,
- JVM_OPC_astore_1 = 76,
- JVM_OPC_astore_2 = 77,
- JVM_OPC_astore_3 = 78,
- JVM_OPC_iastore = 79,
- JVM_OPC_lastore = 80,
- JVM_OPC_fastore = 81,
- JVM_OPC_dastore = 82,
- JVM_OPC_aastore = 83,
- JVM_OPC_bastore = 84,
- JVM_OPC_castore = 85,
- JVM_OPC_sastore = 86,
- JVM_OPC_pop = 87,
- JVM_OPC_pop2 = 88,
- JVM_OPC_dup = 89,
- JVM_OPC_dup_x1 = 90,
- JVM_OPC_dup_x2 = 91,
- JVM_OPC_dup2 = 92,
- JVM_OPC_dup2_x1 = 93,
- JVM_OPC_dup2_x2 = 94,
- JVM_OPC_swap = 95,
- JVM_OPC_iadd = 96,
- JVM_OPC_ladd = 97,
- JVM_OPC_fadd = 98,
- JVM_OPC_dadd = 99,
- JVM_OPC_isub = 100,
- JVM_OPC_lsub = 101,
- JVM_OPC_fsub = 102,
- JVM_OPC_dsub = 103,
- JVM_OPC_imul = 104,
- JVM_OPC_lmul = 105,
- JVM_OPC_fmul = 106,
- JVM_OPC_dmul = 107,
- JVM_OPC_idiv = 108,
- JVM_OPC_ldiv = 109,
- JVM_OPC_fdiv = 110,
- JVM_OPC_ddiv = 111,
- JVM_OPC_irem = 112,
- JVM_OPC_lrem = 113,
- JVM_OPC_frem = 114,
- JVM_OPC_drem = 115,
- JVM_OPC_ineg = 116,
- JVM_OPC_lneg = 117,
- JVM_OPC_fneg = 118,
- JVM_OPC_dneg = 119,
- JVM_OPC_ishl = 120,
- JVM_OPC_lshl = 121,
- JVM_OPC_ishr = 122,
- JVM_OPC_lshr = 123,
- JVM_OPC_iushr = 124,
- JVM_OPC_lushr = 125,
- JVM_OPC_iand = 126,
- JVM_OPC_land = 127,
- JVM_OPC_ior = 128,
- JVM_OPC_lor = 129,
- JVM_OPC_ixor = 130,
- JVM_OPC_lxor = 131,
- JVM_OPC_iinc = 132,
- JVM_OPC_i2l = 133,
- JVM_OPC_i2f = 134,
- JVM_OPC_i2d = 135,
- JVM_OPC_l2i = 136,
- JVM_OPC_l2f = 137,
- JVM_OPC_l2d = 138,
- JVM_OPC_f2i = 139,
- JVM_OPC_f2l = 140,
- JVM_OPC_f2d = 141,
- JVM_OPC_d2i = 142,
- JVM_OPC_d2l = 143,
- JVM_OPC_d2f = 144,
- JVM_OPC_i2b = 145,
- JVM_OPC_i2c = 146,
- JVM_OPC_i2s = 147,
- JVM_OPC_lcmp = 148,
- JVM_OPC_fcmpl = 149,
- JVM_OPC_fcmpg = 150,
- JVM_OPC_dcmpl = 151,
- JVM_OPC_dcmpg = 152,
- JVM_OPC_ifeq = 153,
- JVM_OPC_ifne = 154,
- JVM_OPC_iflt = 155,
- JVM_OPC_ifge = 156,
- JVM_OPC_ifgt = 157,
- JVM_OPC_ifle = 158,
- JVM_OPC_if_icmpeq = 159,
- JVM_OPC_if_icmpne = 160,
- JVM_OPC_if_icmplt = 161,
- JVM_OPC_if_icmpge = 162,
- JVM_OPC_if_icmpgt = 163,
- JVM_OPC_if_icmple = 164,
- JVM_OPC_if_acmpeq = 165,
- JVM_OPC_if_acmpne = 166,
- JVM_OPC_goto = 167,
- JVM_OPC_jsr = 168,
- JVM_OPC_ret = 169,
- JVM_OPC_tableswitch = 170,
- JVM_OPC_lookupswitch = 171,
- JVM_OPC_ireturn = 172,
- JVM_OPC_lreturn = 173,
- JVM_OPC_freturn = 174,
- JVM_OPC_dreturn = 175,
- JVM_OPC_areturn = 176,
- JVM_OPC_return = 177,
- JVM_OPC_getstatic = 178,
- JVM_OPC_putstatic = 179,
- JVM_OPC_getfield = 180,
- JVM_OPC_putfield = 181,
- JVM_OPC_invokevirtual = 182,
- JVM_OPC_invokespecial = 183,
- JVM_OPC_invokestatic = 184,
- JVM_OPC_invokeinterface = 185,
- JVM_OPC_invokedynamic = 186,
- JVM_OPC_new = 187,
- JVM_OPC_newarray = 188,
- JVM_OPC_anewarray = 189,
- JVM_OPC_arraylength = 190,
- JVM_OPC_athrow = 191,
- JVM_OPC_checkcast = 192,
- JVM_OPC_instanceof = 193,
- JVM_OPC_monitorenter = 194,
- JVM_OPC_monitorexit = 195,
- JVM_OPC_wide = 196,
- JVM_OPC_multianewarray = 197,
- JVM_OPC_ifnull = 198,
- JVM_OPC_ifnonnull = 199,
- JVM_OPC_goto_w = 200,
- JVM_OPC_jsr_w = 201,
- JVM_OPC_MAX = 201
-};
-
-/* Opcode length initializer, use with something like:
- * unsigned char opcode_length[JVM_OPC_MAX+1] = JVM_OPCODE_LENGTH_INITIALIZER;
- */
-#define JVM_OPCODE_LENGTH_INITIALIZER { \
- 1, /* nop */ \
- 1, /* aconst_null */ \
- 1, /* iconst_m1 */ \
- 1, /* iconst_0 */ \
- 1, /* iconst_1 */ \
- 1, /* iconst_2 */ \
- 1, /* iconst_3 */ \
- 1, /* iconst_4 */ \
- 1, /* iconst_5 */ \
- 1, /* lconst_0 */ \
- 1, /* lconst_1 */ \
- 1, /* fconst_0 */ \
- 1, /* fconst_1 */ \
- 1, /* fconst_2 */ \
- 1, /* dconst_0 */ \
- 1, /* dconst_1 */ \
- 2, /* bipush */ \
- 3, /* sipush */ \
- 2, /* ldc */ \
- 3, /* ldc_w */ \
- 3, /* ldc2_w */ \
- 2, /* iload */ \
- 2, /* lload */ \
- 2, /* fload */ \
- 2, /* dload */ \
- 2, /* aload */ \
- 1, /* iload_0 */ \
- 1, /* iload_1 */ \
- 1, /* iload_2 */ \
- 1, /* iload_3 */ \
- 1, /* lload_0 */ \
- 1, /* lload_1 */ \
- 1, /* lload_2 */ \
- 1, /* lload_3 */ \
- 1, /* fload_0 */ \
- 1, /* fload_1 */ \
- 1, /* fload_2 */ \
- 1, /* fload_3 */ \
- 1, /* dload_0 */ \
- 1, /* dload_1 */ \
- 1, /* dload_2 */ \
- 1, /* dload_3 */ \
- 1, /* aload_0 */ \
- 1, /* aload_1 */ \
- 1, /* aload_2 */ \
- 1, /* aload_3 */ \
- 1, /* iaload */ \
- 1, /* laload */ \
- 1, /* faload */ \
- 1, /* daload */ \
- 1, /* aaload */ \
- 1, /* baload */ \
- 1, /* caload */ \
- 1, /* saload */ \
- 2, /* istore */ \
- 2, /* lstore */ \
- 2, /* fstore */ \
- 2, /* dstore */ \
- 2, /* astore */ \
- 1, /* istore_0 */ \
- 1, /* istore_1 */ \
- 1, /* istore_2 */ \
- 1, /* istore_3 */ \
- 1, /* lstore_0 */ \
- 1, /* lstore_1 */ \
- 1, /* lstore_2 */ \
- 1, /* lstore_3 */ \
- 1, /* fstore_0 */ \
- 1, /* fstore_1 */ \
- 1, /* fstore_2 */ \
- 1, /* fstore_3 */ \
- 1, /* dstore_0 */ \
- 1, /* dstore_1 */ \
- 1, /* dstore_2 */ \
- 1, /* dstore_3 */ \
- 1, /* astore_0 */ \
- 1, /* astore_1 */ \
- 1, /* astore_2 */ \
- 1, /* astore_3 */ \
- 1, /* iastore */ \
- 1, /* lastore */ \
- 1, /* fastore */ \
- 1, /* dastore */ \
- 1, /* aastore */ \
- 1, /* bastore */ \
- 1, /* castore */ \
- 1, /* sastore */ \
- 1, /* pop */ \
- 1, /* pop2 */ \
- 1, /* dup */ \
- 1, /* dup_x1 */ \
- 1, /* dup_x2 */ \
- 1, /* dup2 */ \
- 1, /* dup2_x1 */ \
- 1, /* dup2_x2 */ \
- 1, /* swap */ \
- 1, /* iadd */ \
- 1, /* ladd */ \
- 1, /* fadd */ \
- 1, /* dadd */ \
- 1, /* isub */ \
- 1, /* lsub */ \
- 1, /* fsub */ \
- 1, /* dsub */ \
- 1, /* imul */ \
- 1, /* lmul */ \
- 1, /* fmul */ \
- 1, /* dmul */ \
- 1, /* idiv */ \
- 1, /* ldiv */ \
- 1, /* fdiv */ \
- 1, /* ddiv */ \
- 1, /* irem */ \
- 1, /* lrem */ \
- 1, /* frem */ \
- 1, /* drem */ \
- 1, /* ineg */ \
- 1, /* lneg */ \
- 1, /* fneg */ \
- 1, /* dneg */ \
- 1, /* ishl */ \
- 1, /* lshl */ \
- 1, /* ishr */ \
- 1, /* lshr */ \
- 1, /* iushr */ \
- 1, /* lushr */ \
- 1, /* iand */ \
- 1, /* land */ \
- 1, /* ior */ \
- 1, /* lor */ \
- 1, /* ixor */ \
- 1, /* lxor */ \
- 3, /* iinc */ \
- 1, /* i2l */ \
- 1, /* i2f */ \
- 1, /* i2d */ \
- 1, /* l2i */ \
- 1, /* l2f */ \
- 1, /* l2d */ \
- 1, /* f2i */ \
- 1, /* f2l */ \
- 1, /* f2d */ \
- 1, /* d2i */ \
- 1, /* d2l */ \
- 1, /* d2f */ \
- 1, /* i2b */ \
- 1, /* i2c */ \
- 1, /* i2s */ \
- 1, /* lcmp */ \
- 1, /* fcmpl */ \
- 1, /* fcmpg */ \
- 1, /* dcmpl */ \
- 1, /* dcmpg */ \
- 3, /* ifeq */ \
- 3, /* ifne */ \
- 3, /* iflt */ \
- 3, /* ifge */ \
- 3, /* ifgt */ \
- 3, /* ifle */ \
- 3, /* if_icmpeq */ \
- 3, /* if_icmpne */ \
- 3, /* if_icmplt */ \
- 3, /* if_icmpge */ \
- 3, /* if_icmpgt */ \
- 3, /* if_icmple */ \
- 3, /* if_acmpeq */ \
- 3, /* if_acmpne */ \
- 3, /* goto */ \
- 3, /* jsr */ \
- 2, /* ret */ \
- 99, /* tableswitch */ \
- 99, /* lookupswitch */ \
- 1, /* ireturn */ \
- 1, /* lreturn */ \
- 1, /* freturn */ \
- 1, /* dreturn */ \
- 1, /* areturn */ \
- 1, /* return */ \
- 3, /* getstatic */ \
- 3, /* putstatic */ \
- 3, /* getfield */ \
- 3, /* putfield */ \
- 3, /* invokevirtual */ \
- 3, /* invokespecial */ \
- 3, /* invokestatic */ \
- 5, /* invokeinterface */ \
- 5, /* invokedynamic */ \
- 3, /* new */ \
- 2, /* newarray */ \
- 3, /* anewarray */ \
- 1, /* arraylength */ \
- 1, /* athrow */ \
- 3, /* checkcast */ \
- 3, /* instanceof */ \
- 1, /* monitorenter */ \
- 1, /* monitorexit */ \
- 0, /* wide */ \
- 4, /* multianewarray */ \
- 3, /* ifnull */ \
- 3, /* ifnonnull */ \
- 5, /* goto_w */ \
- 5 /* jsr_w */ \
-}
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif /* __cplusplus */
-
-#endif /* CLASSFILE_CONSTANTS */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/java.base/share/native/include/classfile_constants.h.template Mon Jan 08 08:53:14 2018 -0800
@@ -0,0 +1,581 @@
+/*
+ * Copyright (c) 2004, 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. 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.
+ */
+
+#ifndef CLASSFILE_CONSTANTS_H
+#define CLASSFILE_CONSTANTS_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Classfile version number for this information */
+#define JVM_CLASSFILE_MAJOR_VERSION @@VERSION_CLASSFILE_MAJOR@@
+#define JVM_CLASSFILE_MINOR_VERSION @@VERSION_CLASSFILE_MINOR@@
+
+/* Flags */
+
+enum {
+ JVM_ACC_PUBLIC = 0x0001,
+ JVM_ACC_PRIVATE = 0x0002,
+ JVM_ACC_PROTECTED = 0x0004,
+ JVM_ACC_STATIC = 0x0008,
+ JVM_ACC_FINAL = 0x0010,
+ JVM_ACC_SYNCHRONIZED = 0x0020,
+ JVM_ACC_SUPER = 0x0020,
+ JVM_ACC_VOLATILE = 0x0040,
+ JVM_ACC_BRIDGE = 0x0040,
+ JVM_ACC_TRANSIENT = 0x0080,
+ JVM_ACC_VARARGS = 0x0080,
+ JVM_ACC_NATIVE = 0x0100,
+ JVM_ACC_INTERFACE = 0x0200,
+ JVM_ACC_ABSTRACT = 0x0400,
+ JVM_ACC_STRICT = 0x0800,
+ JVM_ACC_SYNTHETIC = 0x1000,
+ JVM_ACC_ANNOTATION = 0x2000,
+ JVM_ACC_ENUM = 0x4000,
+ JVM_ACC_MODULE = 0x8000
+};
+
+#define JVM_ACC_PUBLIC_BIT 0
+#define JVM_ACC_PRIVATE_BIT 1
+#define JVM_ACC_PROTECTED_BIT 2
+#define JVM_ACC_STATIC_BIT 3
+#define JVM_ACC_FINAL_BIT 4
+#define JVM_ACC_SYNCHRONIZED_BIT 5
+#define JVM_ACC_SUPER_BIT 5
+#define JVM_ACC_VOLATILE_BIT 6
+#define JVM_ACC_BRIDGE_BIT 6
+#define JVM_ACC_TRANSIENT_BIT 7
+#define JVM_ACC_VARARGS_BIT 7
+#define JVM_ACC_NATIVE_BIT 8
+#define JVM_ACC_INTERFACE_BIT 9
+#define JVM_ACC_ABSTRACT_BIT 10
+#define JVM_ACC_STRICT_BIT 11
+#define JVM_ACC_SYNTHETIC_BIT 12
+#define JVM_ACC_ANNOTATION_BIT 13
+#define JVM_ACC_ENUM_BIT 14
+
+/* Used in newarray instruction. */
+
+enum {
+ JVM_T_BOOLEAN = 4,
+ JVM_T_CHAR = 5,
+ JVM_T_FLOAT = 6,
+ JVM_T_DOUBLE = 7,
+ JVM_T_BYTE = 8,
+ JVM_T_SHORT = 9,
+ JVM_T_INT = 10,
+ JVM_T_LONG = 11
+};
+
+/* Constant Pool Entries */
+
+enum {
+ JVM_CONSTANT_Utf8 = 1,
+ JVM_CONSTANT_Unicode = 2, /* unused */
+ JVM_CONSTANT_Integer = 3,
+ JVM_CONSTANT_Float = 4,
+ JVM_CONSTANT_Long = 5,
+ JVM_CONSTANT_Double = 6,
+ JVM_CONSTANT_Class = 7,
+ JVM_CONSTANT_String = 8,
+ JVM_CONSTANT_Fieldref = 9,
+ JVM_CONSTANT_Methodref = 10,
+ JVM_CONSTANT_InterfaceMethodref = 11,
+ JVM_CONSTANT_NameAndType = 12,
+ JVM_CONSTANT_MethodHandle = 15, // JSR 292
+ JVM_CONSTANT_MethodType = 16, // JSR 292
+ JVM_CONSTANT_InvokeDynamic = 18,
+ JVM_CONSTANT_ExternalMax = 18
+};
+
+/* JVM_CONSTANT_MethodHandle subtypes */
+enum {
+ JVM_REF_getField = 1,
+ JVM_REF_getStatic = 2,
+ JVM_REF_putField = 3,
+ JVM_REF_putStatic = 4,
+ JVM_REF_invokeVirtual = 5,
+ JVM_REF_invokeStatic = 6,
+ JVM_REF_invokeSpecial = 7,
+ JVM_REF_newInvokeSpecial = 8,
+ JVM_REF_invokeInterface = 9
+};
+
+/* StackMapTable type item numbers */
+
+enum {
+ JVM_ITEM_Top = 0,
+ JVM_ITEM_Integer = 1,
+ JVM_ITEM_Float = 2,
+ JVM_ITEM_Double = 3,
+ JVM_ITEM_Long = 4,
+ JVM_ITEM_Null = 5,
+ JVM_ITEM_UninitializedThis = 6,
+ JVM_ITEM_Object = 7,
+ JVM_ITEM_Uninitialized = 8
+};
+
+/* Type signatures */
+
+enum {
+ JVM_SIGNATURE_ARRAY = '[',
+ JVM_SIGNATURE_BYTE = 'B',
+ JVM_SIGNATURE_CHAR = 'C',
+ JVM_SIGNATURE_CLASS = 'L',
+ JVM_SIGNATURE_ENDCLASS = ';',
+ JVM_SIGNATURE_ENUM = 'E',
+ JVM_SIGNATURE_FLOAT = 'F',
+ JVM_SIGNATURE_DOUBLE = 'D',
+ JVM_SIGNATURE_FUNC = '(',
+ JVM_SIGNATURE_ENDFUNC = ')',
+ JVM_SIGNATURE_INT = 'I',
+ JVM_SIGNATURE_LONG = 'J',
+ JVM_SIGNATURE_SHORT = 'S',
+ JVM_SIGNATURE_VOID = 'V',
+ JVM_SIGNATURE_BOOLEAN = 'Z'
+};
+
+/* Opcodes */
+
+enum {
+ JVM_OPC_nop = 0,
+ JVM_OPC_aconst_null = 1,
+ JVM_OPC_iconst_m1 = 2,
+ JVM_OPC_iconst_0 = 3,
+ JVM_OPC_iconst_1 = 4,
+ JVM_OPC_iconst_2 = 5,
+ JVM_OPC_iconst_3 = 6,
+ JVM_OPC_iconst_4 = 7,
+ JVM_OPC_iconst_5 = 8,
+ JVM_OPC_lconst_0 = 9,
+ JVM_OPC_lconst_1 = 10,
+ JVM_OPC_fconst_0 = 11,
+ JVM_OPC_fconst_1 = 12,
+ JVM_OPC_fconst_2 = 13,
+ JVM_OPC_dconst_0 = 14,
+ JVM_OPC_dconst_1 = 15,
+ JVM_OPC_bipush = 16,
+ JVM_OPC_sipush = 17,
+ JVM_OPC_ldc = 18,
+ JVM_OPC_ldc_w = 19,
+ JVM_OPC_ldc2_w = 20,
+ JVM_OPC_iload = 21,
+ JVM_OPC_lload = 22,
+ JVM_OPC_fload = 23,
+ JVM_OPC_dload = 24,
+ JVM_OPC_aload = 25,
+ JVM_OPC_iload_0 = 26,
+ JVM_OPC_iload_1 = 27,
+ JVM_OPC_iload_2 = 28,
+ JVM_OPC_iload_3 = 29,
+ JVM_OPC_lload_0 = 30,
+ JVM_OPC_lload_1 = 31,
+ JVM_OPC_lload_2 = 32,
+ JVM_OPC_lload_3 = 33,
+ JVM_OPC_fload_0 = 34,
+ JVM_OPC_fload_1 = 35,
+ JVM_OPC_fload_2 = 36,
+ JVM_OPC_fload_3 = 37,
+ JVM_OPC_dload_0 = 38,
+ JVM_OPC_dload_1 = 39,
+ JVM_OPC_dload_2 = 40,
+ JVM_OPC_dload_3 = 41,
+ JVM_OPC_aload_0 = 42,
+ JVM_OPC_aload_1 = 43,
+ JVM_OPC_aload_2 = 44,
+ JVM_OPC_aload_3 = 45,
+ JVM_OPC_iaload = 46,
+ JVM_OPC_laload = 47,
+ JVM_OPC_faload = 48,
+ JVM_OPC_daload = 49,
+ JVM_OPC_aaload = 50,
+ JVM_OPC_baload = 51,
+ JVM_OPC_caload = 52,
+ JVM_OPC_saload = 53,
+ JVM_OPC_istore = 54,
+ JVM_OPC_lstore = 55,
+ JVM_OPC_fstore = 56,
+ JVM_OPC_dstore = 57,
+ JVM_OPC_astore = 58,
+ JVM_OPC_istore_0 = 59,
+ JVM_OPC_istore_1 = 60,
+ JVM_OPC_istore_2 = 61,
+ JVM_OPC_istore_3 = 62,
+ JVM_OPC_lstore_0 = 63,
+ JVM_OPC_lstore_1 = 64,
+ JVM_OPC_lstore_2 = 65,
+ JVM_OPC_lstore_3 = 66,
+ JVM_OPC_fstore_0 = 67,
+ JVM_OPC_fstore_1 = 68,
+ JVM_OPC_fstore_2 = 69,
+ JVM_OPC_fstore_3 = 70,
+ JVM_OPC_dstore_0 = 71,
+ JVM_OPC_dstore_1 = 72,
+ JVM_OPC_dstore_2 = 73,
+ JVM_OPC_dstore_3 = 74,
+ JVM_OPC_astore_0 = 75,
+ JVM_OPC_astore_1 = 76,
+ JVM_OPC_astore_2 = 77,
+ JVM_OPC_astore_3 = 78,
+ JVM_OPC_iastore = 79,
+ JVM_OPC_lastore = 80,
+ JVM_OPC_fastore = 81,
+ JVM_OPC_dastore = 82,
+ JVM_OPC_aastore = 83,
+ JVM_OPC_bastore = 84,
+ JVM_OPC_castore = 85,
+ JVM_OPC_sastore = 86,
+ JVM_OPC_pop = 87,
+ JVM_OPC_pop2 = 88,
+ JVM_OPC_dup = 89,
+ JVM_OPC_dup_x1 = 90,
+ JVM_OPC_dup_x2 = 91,
+ JVM_OPC_dup2 = 92,
+ JVM_OPC_dup2_x1 = 93,
+ JVM_OPC_dup2_x2 = 94,
+ JVM_OPC_swap = 95,
+ JVM_OPC_iadd = 96,
+ JVM_OPC_ladd = 97,
+ JVM_OPC_fadd = 98,
+ JVM_OPC_dadd = 99,
+ JVM_OPC_isub = 100,
+ JVM_OPC_lsub = 101,
+ JVM_OPC_fsub = 102,
+ JVM_OPC_dsub = 103,
+ JVM_OPC_imul = 104,
+ JVM_OPC_lmul = 105,
+ JVM_OPC_fmul = 106,
+ JVM_OPC_dmul = 107,
+ JVM_OPC_idiv = 108,
+ JVM_OPC_ldiv = 109,
+ JVM_OPC_fdiv = 110,
+ JVM_OPC_ddiv = 111,
+ JVM_OPC_irem = 112,
+ JVM_OPC_lrem = 113,
+ JVM_OPC_frem = 114,
+ JVM_OPC_drem = 115,
+ JVM_OPC_ineg = 116,
+ JVM_OPC_lneg = 117,
+ JVM_OPC_fneg = 118,
+ JVM_OPC_dneg = 119,
+ JVM_OPC_ishl = 120,
+ JVM_OPC_lshl = 121,
+ JVM_OPC_ishr = 122,
+ JVM_OPC_lshr = 123,
+ JVM_OPC_iushr = 124,
+ JVM_OPC_lushr = 125,
+ JVM_OPC_iand = 126,
+ JVM_OPC_land = 127,
+ JVM_OPC_ior = 128,
+ JVM_OPC_lor = 129,
+ JVM_OPC_ixor = 130,
+ JVM_OPC_lxor = 131,
+ JVM_OPC_iinc = 132,
+ JVM_OPC_i2l = 133,
+ JVM_OPC_i2f = 134,
+ JVM_OPC_i2d = 135,
+ JVM_OPC_l2i = 136,
+ JVM_OPC_l2f = 137,
+ JVM_OPC_l2d = 138,
+ JVM_OPC_f2i = 139,
+ JVM_OPC_f2l = 140,
+ JVM_OPC_f2d = 141,
+ JVM_OPC_d2i = 142,
+ JVM_OPC_d2l = 143,
+ JVM_OPC_d2f = 144,
+ JVM_OPC_i2b = 145,
+ JVM_OPC_i2c = 146,
+ JVM_OPC_i2s = 147,
+ JVM_OPC_lcmp = 148,
+ JVM_OPC_fcmpl = 149,
+ JVM_OPC_fcmpg = 150,
+ JVM_OPC_dcmpl = 151,
+ JVM_OPC_dcmpg = 152,
+ JVM_OPC_ifeq = 153,
+ JVM_OPC_ifne = 154,
+ JVM_OPC_iflt = 155,
+ JVM_OPC_ifge = 156,
+ JVM_OPC_ifgt = 157,
+ JVM_OPC_ifle = 158,
+ JVM_OPC_if_icmpeq = 159,
+ JVM_OPC_if_icmpne = 160,
+ JVM_OPC_if_icmplt = 161,
+ JVM_OPC_if_icmpge = 162,
+ JVM_OPC_if_icmpgt = 163,
+ JVM_OPC_if_icmple = 164,
+ JVM_OPC_if_acmpeq = 165,
+ JVM_OPC_if_acmpne = 166,
+ JVM_OPC_goto = 167,
+ JVM_OPC_jsr = 168,
+ JVM_OPC_ret = 169,
+ JVM_OPC_tableswitch = 170,
+ JVM_OPC_lookupswitch = 171,
+ JVM_OPC_ireturn = 172,
+ JVM_OPC_lreturn = 173,
+ JVM_OPC_freturn = 174,
+ JVM_OPC_dreturn = 175,
+ JVM_OPC_areturn = 176,
+ JVM_OPC_return = 177,
+ JVM_OPC_getstatic = 178,
+ JVM_OPC_putstatic = 179,
+ JVM_OPC_getfield = 180,
+ JVM_OPC_putfield = 181,
+ JVM_OPC_invokevirtual = 182,
+ JVM_OPC_invokespecial = 183,
+ JVM_OPC_invokestatic = 184,
+ JVM_OPC_invokeinterface = 185,
+ JVM_OPC_invokedynamic = 186,
+ JVM_OPC_new = 187,
+ JVM_OPC_newarray = 188,
+ JVM_OPC_anewarray = 189,
+ JVM_OPC_arraylength = 190,
+ JVM_OPC_athrow = 191,
+ JVM_OPC_checkcast = 192,
+ JVM_OPC_instanceof = 193,
+ JVM_OPC_monitorenter = 194,
+ JVM_OPC_monitorexit = 195,
+ JVM_OPC_wide = 196,
+ JVM_OPC_multianewarray = 197,
+ JVM_OPC_ifnull = 198,
+ JVM_OPC_ifnonnull = 199,
+ JVM_OPC_goto_w = 200,
+ JVM_OPC_jsr_w = 201,
+ JVM_OPC_MAX = 201
+};
+
+/* Opcode length initializer, use with something like:
+ * unsigned char opcode_length[JVM_OPC_MAX+1] = JVM_OPCODE_LENGTH_INITIALIZER;
+ */
+#define JVM_OPCODE_LENGTH_INITIALIZER { \
+ 1, /* nop */ \
+ 1, /* aconst_null */ \
+ 1, /* iconst_m1 */ \
+ 1, /* iconst_0 */ \
+ 1, /* iconst_1 */ \
+ 1, /* iconst_2 */ \
+ 1, /* iconst_3 */ \
+ 1, /* iconst_4 */ \
+ 1, /* iconst_5 */ \
+ 1, /* lconst_0 */ \
+ 1, /* lconst_1 */ \
+ 1, /* fconst_0 */ \
+ 1, /* fconst_1 */ \
+ 1, /* fconst_2 */ \
+ 1, /* dconst_0 */ \
+ 1, /* dconst_1 */ \
+ 2, /* bipush */ \
+ 3, /* sipush */ \
+ 2, /* ldc */ \
+ 3, /* ldc_w */ \
+ 3, /* ldc2_w */ \
+ 2, /* iload */ \
+ 2, /* lload */ \
+ 2, /* fload */ \
+ 2, /* dload */ \
+ 2, /* aload */ \
+ 1, /* iload_0 */ \
+ 1, /* iload_1 */ \
+ 1, /* iload_2 */ \
+ 1, /* iload_3 */ \
+ 1, /* lload_0 */ \
+ 1, /* lload_1 */ \
+ 1, /* lload_2 */ \
+ 1, /* lload_3 */ \
+ 1, /* fload_0 */ \
+ 1, /* fload_1 */ \
+ 1, /* fload_2 */ \
+ 1, /* fload_3 */ \
+ 1, /* dload_0 */ \
+ 1, /* dload_1 */ \
+ 1, /* dload_2 */ \
+ 1, /* dload_3 */ \
+ 1, /* aload_0 */ \
+ 1, /* aload_1 */ \
+ 1, /* aload_2 */ \
+ 1, /* aload_3 */ \
+ 1, /* iaload */ \
+ 1, /* laload */ \
+ 1, /* faload */ \
+ 1, /* daload */ \
+ 1, /* aaload */ \
+ 1, /* baload */ \
+ 1, /* caload */ \
+ 1, /* saload */ \
+ 2, /* istore */ \
+ 2, /* lstore */ \
+ 2, /* fstore */ \
+ 2, /* dstore */ \
+ 2, /* astore */ \
+ 1, /* istore_0 */ \
+ 1, /* istore_1 */ \
+ 1, /* istore_2 */ \
+ 1, /* istore_3 */ \
+ 1, /* lstore_0 */ \
+ 1, /* lstore_1 */ \
+ 1, /* lstore_2 */ \
+ 1, /* lstore_3 */ \
+ 1, /* fstore_0 */ \
+ 1, /* fstore_1 */ \
+ 1, /* fstore_2 */ \
+ 1, /* fstore_3 */ \
+ 1, /* dstore_0 */ \
+ 1, /* dstore_1 */ \
+ 1, /* dstore_2 */ \
+ 1, /* dstore_3 */ \
+ 1, /* astore_0 */ \
+ 1, /* astore_1 */ \
+ 1, /* astore_2 */ \
+ 1, /* astore_3 */ \
+ 1, /* iastore */ \
+ 1, /* lastore */ \
+ 1, /* fastore */ \
+ 1, /* dastore */ \
+ 1, /* aastore */ \
+ 1, /* bastore */ \
+ 1, /* castore */ \
+ 1, /* sastore */ \
+ 1, /* pop */ \
+ 1, /* pop2 */ \
+ 1, /* dup */ \
+ 1, /* dup_x1 */ \
+ 1, /* dup_x2 */ \
+ 1, /* dup2 */ \
+ 1, /* dup2_x1 */ \
+ 1, /* dup2_x2 */ \
+ 1, /* swap */ \
+ 1, /* iadd */ \
+ 1, /* ladd */ \
+ 1, /* fadd */ \
+ 1, /* dadd */ \
+ 1, /* isub */ \
+ 1, /* lsub */ \
+ 1, /* fsub */ \
+ 1, /* dsub */ \
+ 1, /* imul */ \
+ 1, /* lmul */ \
+ 1, /* fmul */ \
+ 1, /* dmul */ \
+ 1, /* idiv */ \
+ 1, /* ldiv */ \
+ 1, /* fdiv */ \
+ 1, /* ddiv */ \
+ 1, /* irem */ \
+ 1, /* lrem */ \
+ 1, /* frem */ \
+ 1, /* drem */ \
+ 1, /* ineg */ \
+ 1, /* lneg */ \
+ 1, /* fneg */ \
+ 1, /* dneg */ \
+ 1, /* ishl */ \
+ 1, /* lshl */ \
+ 1, /* ishr */ \
+ 1, /* lshr */ \
+ 1, /* iushr */ \
+ 1, /* lushr */ \
+ 1, /* iand */ \
+ 1, /* land */ \
+ 1, /* ior */ \
+ 1, /* lor */ \
+ 1, /* ixor */ \
+ 1, /* lxor */ \
+ 3, /* iinc */ \
+ 1, /* i2l */ \
+ 1, /* i2f */ \
+ 1, /* i2d */ \
+ 1, /* l2i */ \
+ 1, /* l2f */ \
+ 1, /* l2d */ \
+ 1, /* f2i */ \
+ 1, /* f2l */ \
+ 1, /* f2d */ \
+ 1, /* d2i */ \
+ 1, /* d2l */ \
+ 1, /* d2f */ \
+ 1, /* i2b */ \
+ 1, /* i2c */ \
+ 1, /* i2s */ \
+ 1, /* lcmp */ \
+ 1, /* fcmpl */ \
+ 1, /* fcmpg */ \
+ 1, /* dcmpl */ \
+ 1, /* dcmpg */ \
+ 3, /* ifeq */ \
+ 3, /* ifne */ \
+ 3, /* iflt */ \
+ 3, /* ifge */ \
+ 3, /* ifgt */ \
+ 3, /* ifle */ \
+ 3, /* if_icmpeq */ \
+ 3, /* if_icmpne */ \
+ 3, /* if_icmplt */ \
+ 3, /* if_icmpge */ \
+ 3, /* if_icmpgt */ \
+ 3, /* if_icmple */ \
+ 3, /* if_acmpeq */ \
+ 3, /* if_acmpne */ \
+ 3, /* goto */ \
+ 3, /* jsr */ \
+ 2, /* ret */ \
+ 99, /* tableswitch */ \
+ 99, /* lookupswitch */ \
+ 1, /* ireturn */ \
+ 1, /* lreturn */ \
+ 1, /* freturn */ \
+ 1, /* dreturn */ \
+ 1, /* areturn */ \
+ 1, /* return */ \
+ 3, /* getstatic */ \
+ 3, /* putstatic */ \
+ 3, /* getfield */ \
+ 3, /* putfield */ \
+ 3, /* invokevirtual */ \
+ 3, /* invokespecial */ \
+ 3, /* invokestatic */ \
+ 5, /* invokeinterface */ \
+ 5, /* invokedynamic */ \
+ 3, /* new */ \
+ 2, /* newarray */ \
+ 3, /* anewarray */ \
+ 1, /* arraylength */ \
+ 1, /* athrow */ \
+ 3, /* checkcast */ \
+ 3, /* instanceof */ \
+ 1, /* monitorenter */ \
+ 1, /* monitorexit */ \
+ 0, /* wide */ \
+ 4, /* multianewarray */ \
+ 3, /* ifnull */ \
+ 3, /* ifnonnull */ \
+ 5, /* goto_w */ \
+ 5 /* jsr_w */ \
+}
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
+
+#endif /* CLASSFILE_CONSTANTS */
--- a/src/java.base/share/native/libjava/System.c Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.base/share/native/libjava/System.c Mon Jan 08 08:53:14 2018 -0800
@@ -114,9 +114,6 @@
#define VENDOR_URL_BUG "http://bugreport.java.com/bugreport/"
#endif
-#define JAVA_MAX_SUPPORTED_VERSION 54
-#define JAVA_MAX_SUPPORTED_MINOR_VERSION 0
-
#ifdef JAVA_SPECIFICATION_VENDOR /* Third party may NOT overwrite this. */
#error "ERROR: No override of JAVA_SPECIFICATION_VENDOR is allowed"
#else
@@ -186,6 +183,9 @@
jobject ret = NULL;
jstring jVMVal = NULL;
+ if ((*env)->EnsureLocalCapacity(env, 50) < 0) {
+ return NULL;
+ }
sprops = GetJavaProperties(env);
CHECK_NULL_RETURN(sprops, NULL);
@@ -219,8 +219,8 @@
PUTPROP(props, "java.vendor.url", VENDOR_URL);
PUTPROP(props, "java.vendor.url.bug", VENDOR_URL_BUG);
- jio_snprintf(buf, sizeof(buf), "%d.%d", JAVA_MAX_SUPPORTED_VERSION,
- JAVA_MAX_SUPPORTED_MINOR_VERSION);
+ jio_snprintf(buf, sizeof(buf), "%d.%d", JVM_CLASSFILE_MAJOR_VERSION,
+ JVM_CLASSFILE_MINOR_VERSION);
PUTPROP(props, "java.class.version", buf);
if (sprops->awt_toolkit) {
--- a/src/java.desktop/share/classes/sun/awt/SunToolkit.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.desktop/share/classes/sun/awt/SunToolkit.java Mon Jan 08 08:53:14 2018 -0800
@@ -868,25 +868,10 @@
java.security.Permission perm =
URLUtil.getConnectPermission(url);
if (perm != null) {
- try {
- sm.checkPermission(perm);
- } catch (SecurityException se) {
- // fallback to checkRead/checkConnect for pre 1.2
- // security managers
- if ((perm instanceof java.io.FilePermission) &&
- perm.getActions().indexOf("read") != -1) {
- sm.checkRead(perm.getName());
- } else if ((perm instanceof
- java.net.SocketPermission) &&
- perm.getActions().indexOf("connect") != -1) {
- sm.checkConnect(url.getHost(), url.getPort());
- } else {
- throw se;
- }
- }
+ sm.checkPermission(perm);
}
} catch (java.io.IOException ioe) {
- sm.checkConnect(url.getHost(), url.getPort());
+ sm.checkConnect(url.getHost(), url.getPort());
}
}
}
--- a/src/java.desktop/share/classes/sun/awt/image/URLImageSource.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.desktop/share/classes/sun/awt/image/URLImageSource.java Mon Jan 08 08:53:14 2018 -0800
@@ -46,25 +46,10 @@
java.security.Permission perm =
URLUtil.getConnectPermission(u);
if (perm != null) {
- try {
- sm.checkPermission(perm);
- } catch (SecurityException se) {
- // fallback to checkRead/checkConnect for pre 1.2
- // security managers
- if ((perm instanceof java.io.FilePermission) &&
- perm.getActions().indexOf("read") != -1) {
- sm.checkRead(perm.getName());
- } else if ((perm instanceof
- java.net.SocketPermission) &&
- perm.getActions().indexOf("connect") != -1) {
- sm.checkConnect(u.getHost(), u.getPort());
- } else {
- throw se;
- }
- }
+ sm.checkPermission(perm);
}
} catch (java.io.IOException ioe) {
- sm.checkConnect(u.getHost(), u.getPort());
+ sm.checkConnect(u.getHost(), u.getPort());
}
}
this.url = u;
--- a/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic-fallback.hh Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic-fallback.hh Mon Jan 08 08:53:14 2018 -0800
@@ -77,7 +77,13 @@
/* Bubble-sort or something equally good!
* May not be good-enough for presidential candidate interviews, but good-enough for us... */
+
+#if defined(_AIX)
+ /* Workaround AIX xlC 12 compilation problems caused by the overloaded versions of 'cmp' in IntType */
+ hb_stable_sort (&glyphs[0], num_glyphs, (int(*)(const OT::GlyphID*, const OT::GlyphID *)) OT::GlyphID::cmp, &substitutes[0]);
+#else
hb_stable_sort (&glyphs[0], num_glyphs, OT::GlyphID::cmp, &substitutes[0]);
+#endif
OT::Supplier<OT::GlyphID> glyphs_supplier (glyphs, num_glyphs);
OT::Supplier<OT::GlyphID> substitutes_supplier (substitutes, num_glyphs);
@@ -126,7 +132,13 @@
first_glyphs_indirection[num_first_glyphs] = first_glyph_idx;
num_first_glyphs++;
}
+
+#if defined(_AIX)
+ /* Workaround AIX xlC 12 compilation problems caused by the overloaded versions of 'cmp' in IntType */
+ hb_stable_sort (&first_glyphs[0], num_first_glyphs, (int(*)(const OT::GlyphID *, const OT::GlyphID *)) OT::GlyphID::cmp, &first_glyphs_indirection[0]);
+#else
hb_stable_sort (&first_glyphs[0], num_first_glyphs, OT::GlyphID::cmp, &first_glyphs_indirection[0]);
+#endif
/* Now that the first-glyphs are sorted, walk again, populate ligatures. */
for (unsigned int i = 0; i < num_first_glyphs; i++)
--- a/src/java.desktop/unix/native/common/awt/systemscale/systemScale.c Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.desktop/unix/native/common/awt/systemscale/systemScale.c Mon Jan 08 08:53:14 2018 -0800
@@ -1,25 +1,27 @@
/*
-* Copyright (c) 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.
-*
-* 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.
-*/
+ * Copyright (c) 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.
+ */
#include "systemScale.h"
#include "jni.h"
--- a/src/java.desktop/unix/native/common/awt/systemscale/systemScale.h Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.desktop/unix/native/common/awt/systemscale/systemScale.h Mon Jan 08 08:53:14 2018 -0800
@@ -1,25 +1,27 @@
/*
-* Copyright (c) 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.
-*
-* 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.
-*/
+ * Copyright (c) 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.
+ */
#ifndef _AWT_SYSTEMSCALE_H
#define _AWT_SYSTEMSCALE_H
--- a/src/java.desktop/windows/native/common/awt/systemscale/systemScale.cpp Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.desktop/windows/native/common/awt/systemscale/systemScale.cpp Mon Jan 08 08:53:14 2018 -0800
@@ -1,25 +1,27 @@
/*
-* Copyright (c) 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.
-*
-* 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.
-*/
+ * Copyright (c) 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.
+ */
#include "systemScale.h"
#include <d2d1.h>
#pragma comment(lib, "d2d1")
--- a/src/java.desktop/windows/native/common/awt/systemscale/systemScale.h Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.desktop/windows/native/common/awt/systemscale/systemScale.h Mon Jan 08 08:53:14 2018 -0800
@@ -1,25 +1,27 @@
/*
-* Copyright (c) 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.
-*
-* 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.
-*/
+ * Copyright (c) 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.
+ */
#ifndef _AWT_SYSTEM_SCALE_H
#define _AWT_SYSTEM_SCALE_H
#include <windows.h>
--- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/ExceptionConst.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/ExceptionConst.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -24,6 +23,7 @@
/**
* Exception constants.
* @since 6.0 (intended to replace the InstructionConstant interface)
+ * @LastModified: Oct 2017
*/
public final class ExceptionConst {
--- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Utility.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/classfile/Utility.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -44,6 +43,7 @@
* Utility functions that do not really belong to any class in particular.
*
* @version $Id: Utility.java 1751107 2016-07-03 02:41:18Z dbrosius $
+ * @LastModified: Oct 2017
*/
// @since 6.0 methods are no longer final
public abstract class Utility {
--- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ARRAYLENGTH.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ARRAYLENGTH.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -28,6 +27,7 @@
* <PRE>Stack: ..., arrayref -> ..., length</PRE>
*
* @version $Id: ARRAYLENGTH.java 1747278 2016-06-07 17:28:43Z britter $
+ * @LastModified: Oct 2017
*/
public class ARRAYLENGTH extends Instruction
implements ExceptionThrower, StackProducer, StackConsumer /* since 6.0 */ {
--- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ATHROW.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ATHROW.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -28,6 +27,7 @@
* <PRE>Stack: ..., objectref -> objectref</PRE>
*
* @version $Id: ATHROW.java 1747278 2016-06-07 17:28:43Z britter $
+ * @LastModified: Oct 2017
*/
public class ATHROW extends Instruction implements UnconditionalBranch, ExceptionThrower {
--- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IDIV.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IDIV.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -28,6 +27,7 @@
* <PRE>Stack: ..., value1, value2 -> result</PRE>
*
* @version $Id: IDIV.java 1747278 2016-06-07 17:28:43Z britter $
+ * @LastModified: Oct 2017
*/
public class IDIV extends ArithmeticInstruction implements ExceptionThrower {
--- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IREM.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/IREM.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -28,6 +27,7 @@
* <PRE>Stack: ..., value1, value2 -> result</PRE>
*
* @version $Id: IREM.java 1747278 2016-06-07 17:28:43Z britter $
+ * @LastModified: Oct 2017
*/
public class IREM extends ArithmeticInstruction implements ExceptionThrower {
--- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDIV.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LDIV.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -29,6 +28,7 @@
* ..., result.word1, result.word2
*
* @version $Id: LDIV.java 1747278 2016-06-07 17:28:43Z britter $
+ * @LastModified: Oct 2017
*/
public class LDIV extends ArithmeticInstruction implements ExceptionThrower {
--- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LREM.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/LREM.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -28,6 +27,7 @@
* <PRE>Stack: ..., value1, value2 -> result</PRE>
*
* @version $Id: LREM.java 1747278 2016-06-07 17:28:43Z britter $
+ * @LastModified: Oct 2017
*/
public class LREM extends ArithmeticInstruction implements ExceptionThrower {
--- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MONITORENTER.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MONITORENTER.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -28,6 +27,7 @@
* <PRE>Stack: ..., objectref -> ...</PRE>
*
* @version $Id: MONITORENTER.java 1747278 2016-06-07 17:28:43Z britter $
+ * @LastModified: Oct 2017
*/
public class MONITORENTER extends Instruction implements ExceptionThrower, StackConsumer {
--- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MONITOREXIT.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MONITOREXIT.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -28,6 +27,7 @@
* <PRE>Stack: ..., objectref -> ...</PRE>
*
* @version $Id: MONITOREXIT.java 1747278 2016-06-07 17:28:43Z britter $
+ * @LastModified: Oct 2017
*/
public class MONITOREXIT extends Instruction implements ExceptionThrower, StackConsumer {
--- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MethodGen.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/MethodGen.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -59,6 +58,7 @@
* @version $Id: MethodGen.java 1749603 2016-06-21 20:50:19Z ggregory $
* @see InstructionList
* @see Method
+ * @LastModified: Oct 2017
*/
public class MethodGen extends FieldGenOrMethodGen {
--- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/NEWARRAY.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/NEWARRAY.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -32,6 +31,7 @@
* type must be one of T_INT, T_SHORT, ...
*
* @version $Id: NEWARRAY.java 1747278 2016-06-07 17:28:43Z britter $
+ * @LastModified: Oct 2017
*/
public class NEWARRAY extends Instruction implements AllocationInstruction, ExceptionThrower,
StackProducer {
--- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ReturnInstruction.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/generic/ReturnInstruction.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -28,6 +27,7 @@
* Super class for the xRETURN family of instructions.
*
* @version $Id: ReturnInstruction.java 1747278 2016-06-07 17:28:43Z britter $
+ * @LastModified: Oct 2017
*/
public abstract class ReturnInstruction extends Instruction implements ExceptionThrower,
TypedInstruction, StackConsumer {
--- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/BCELFactory.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/BCELFactory.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -66,6 +65,7 @@
*
* @see BCELifier
* @version $Id: BCELFactory.java 1749603 2016-06-21 20:50:19Z ggregory $
+ * @LastModified: Oct 2017
*/
class BCELFactory extends EmptyVisitor {
--- a/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/InstructionFinder.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/bcel/internal/util/InstructionFinder.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -66,6 +65,7 @@
* @version $Id: InstructionFinder.java 1749603 2016-06-21 20:50:19Z ggregory $
* @see com.sun.org.apache.bcel.internal.generic.Instruction
* @see InstructionList
+ * @LastModified: Oct 2017
*/
public class InstructionFinder {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltDatetime.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltDatetime.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -45,6 +44,7 @@
*
* @see <a href="http://www.exslt.org/">EXSLT</a>
* @xsl.usage general
+ * @LastModified: Nov 2017
*/
public class ExsltDatetime
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLMessages.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/res/XSLMessages.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -30,6 +29,7 @@
* be called XalanMessages, or some such.
*
* @xsl.usage internal
+ * @LastModified: Sep 2017
*/
public class XSLMessages extends XPATHMessages {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/ConfigurationError.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/ConfigurationError.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -23,6 +22,8 @@
/**
* A configuration error. This was an internal class in ObjectFactory previously
+ *
+ * @LastModified: Oct 2017
*/
public final class ConfigurationError
extends Error {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/ObjectFactory.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/utils/ObjectFactory.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -33,6 +32,7 @@
* class and modified to be used as a general utility for creating objects
* dynamically.
*
+ * @LastModified: Oct 2017
*/
public class ObjectFactory {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/Translet.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/Translet.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -27,6 +26,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
public interface Translet {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ApplyTemplates.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ApplyTemplates.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -42,6 +41,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
final class ApplyTemplates extends Instruction {
private Expression _select;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeSet.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeSet.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -43,6 +42,7 @@
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
* @author Morten Jorgensen
+ * @LastModified: Nov 2017
*/
final class AttributeSet extends TopLevelElement {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeValueTemplate.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeValueTemplate.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -43,6 +42,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
final class AttributeValueTemplate extends AttributeValue {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/BinOpExpr.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/BinOpExpr.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -32,6 +31,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Nov 2017
*/
final class BinOpExpr extends Expression {
public static final int PLUS = 0;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/BooleanCall.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/BooleanCall.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -30,6 +29,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
final class BooleanCall extends FunctionCall {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CallTemplate.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CallTemplate.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -37,6 +36,7 @@
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
* @author Erwin Bolwidt <ejb@klomp.org>
+ * @LastModified: Oct 2017
*/
final class CallTemplate extends Instruction {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CastCall.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CastCall.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -34,6 +33,7 @@
/**
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
final class CastCall extends FunctionCall {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CeilingCall.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CeilingCall.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +30,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
final class CeilingCall extends FunctionCall {
public CeilingCall(QName fname, List<Expression> arguments) {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Choose.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Choose.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -45,6 +44,7 @@
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
* @author Morten Jorgensen
+ * @LastModified: Oct 2017
*/
final class Choose extends Instruction {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ConcatCall.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ConcatCall.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -37,6 +36,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
final class ConcatCall extends FunctionCall {
public ConcatCall(QName fname, List<Expression> arguments) {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ContainsCall.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ContainsCall.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
* @author Morten Jorgensen
+ * @LastModified: Oct 2017
*/
final class ContainsCall extends FunctionCall {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/DocumentCall.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/DocumentCall.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
/**
* @author Jacek Ambroziak
* @author Morten Jorgensen
+ * @LastModified: Oct 2017
*/
final class DocumentCall extends FunctionCall {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ElementAvailableCall.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ElementAvailableCall.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -33,6 +32,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
final class ElementAvailableCall extends FunctionCall {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Expression.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Expression.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -42,6 +41,7 @@
* @author Santiago Pericas-Geertsen
* @author Morten Jorgensen
* @author Erwin Bolwidt <ejb@klomp.org>
+ * @LastModified: Oct 2017
*/
abstract class Expression extends SyntaxTreeNode {
/**
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FilterExpr.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FilterExpr.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -43,6 +42,7 @@
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
* @author Morten Jorgensen
+ * @LastModified: Nov 2017
*/
class FilterExpr extends Expression {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FloorCall.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FloorCall.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -29,6 +28,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
final class FloorCall extends FunctionCall {
public FloorCall(QName fname, List<Expression> arguments) {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FlowList.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FlowList.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +30,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
public final class FlowList {
private List<InstructionHandle> _elements;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ForEach.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ForEach.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -48,6 +47,7 @@
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
* @author Morten Jorgensen
+ * @LastModified: Oct 2017
*/
final class ForEach extends Instruction {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FormatNumberCall.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FormatNumberCall.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -38,6 +37,7 @@
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
* @author Morten Jorgensen
+ * @LastModified: Oct 2017
*/
final class FormatNumberCall extends FunctionCall {
private Expression _value;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionAvailableCall.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionAvailableCall.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -37,6 +36,7 @@
/**
* @author G. Todd Miller
* @author Santiago Pericas-Geertsen
+ * @LastModified: Nov 2017
*/
final class FunctionAvailableCall extends FunctionCall {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -63,6 +62,7 @@
* @author Morten Jorgensen
* @author Erwin Bolwidt <ejb@klomp.org>
* @author Todd Miller
+ * @LastModified: Nov 2017
*/
class FunctionCall extends Expression {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/GenerateIdCall.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/GenerateIdCall.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +30,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
final class GenerateIdCall extends FunctionCall {
public GenerateIdCall(QName fname, List<Expression> arguments) {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Import.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Import.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -42,6 +41,7 @@
* @author Morten Jorgensen
* @author Erwin Bolwidt <ejb@klomp.org>
* @author Gunnlaugur Briem <gthb@dimon.is>
+ * @LastModified: Sep 2017
*/
final class Import extends TopLevelElement {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Include.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Include.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -42,6 +41,7 @@
* @author Morten Jorgensen
* @author Erwin Bolwidt <ejb@klomp.org>
* @author Gunnlaugur Briem <gthb@dimon.is>
+ * @LastModified: Sep 2017
*/
final class Include extends TopLevelElement {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Key.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Key.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -52,6 +51,7 @@
/**
* @author Morten Jorgensen
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
final class Key extends TopLevelElement {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/KeyCall.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/KeyCall.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -35,6 +34,7 @@
/**
* @author Morten Jorgensen
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
final class KeyCall extends FunctionCall {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LangCall.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LangCall.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -35,6 +34,7 @@
/**
* @author Morten Jorgensen
+ * @LastModified: Oct 2017
*/
final class LangCall extends FunctionCall {
private Expression _lang;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -43,6 +42,7 @@
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
* @author Morten Jorgensen
+ * @LastModified: Oct 2017
*/
final class LiteralElement extends Instruction {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LocalNameCall.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LocalNameCall.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +30,7 @@
/**
* @author Morten Jorgensen
+ * @LastModified: Oct 2017
*/
final class LocalNameCall extends NameBase {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LogicalExpr.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LogicalExpr.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -34,6 +33,7 @@
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
* @author Morten Jorgensen
+ * @LastModified: Nov 2017
*/
final class LogicalExpr extends Expression {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Message.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Message.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -37,6 +36,7 @@
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
* @author Morten Jorgensen
+ * @LastModified: Nov 2017
*/
final class Message extends Instruction {
private boolean _terminate = false;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -63,6 +62,7 @@
* @author Morten Jorgensen
* @author Erwin Bolwidt <ejb@klomp.org>
* @author G. Todd Miller
+ * @LastModified: Nov 2017
*/
final class Mode implements Constants {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NameBase.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NameBase.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -33,6 +32,7 @@
/**
* @author Morten Jorgensen
* @author Erwin Bolwidt <ejb@klomp.org>
+ * @LastModified: Oct 2017
*/
class NameBase extends FunctionCall {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NameCall.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NameCall.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -32,6 +31,7 @@
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
* @author Morten Jorgensen
+ * @LastModified: Oct 2017
*/
final class NameCall extends NameBase {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NamespaceUriCall.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NamespaceUriCall.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -30,6 +29,7 @@
/**
* @author Morten Jorgensen
+ * @LastModified: Oct 2017
*/
final class NamespaceUriCall extends NameBase {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NotCall.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NotCall.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +30,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
final class NotCall extends FunctionCall {
public NotCall(QName fname, List<Expression> arguments) {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Number.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Number.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -54,6 +53,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Nov 2017
*/
final class Number extends Instruction implements Closure {
private static final int LEVEL_SINGLE = 0;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NumberCall.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NumberCall.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +30,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
final class NumberCall extends FunctionCall {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -67,6 +66,7 @@
* @author G. Todd Miller
* @author Morten Jorgensen
* @author Erwin Bolwidt <ejb@klomp.org>
+ * @LastModified: Nov 2017
*/
public class Parser implements Constants, ContentHandler {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Predicate.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Predicate.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -52,6 +51,7 @@
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
* @author Morten Jorgensen
+ * @LastModified: Oct 2017
*/
final class Predicate extends Expression implements Closure {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ProcessingInstructionPattern.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ProcessingInstructionPattern.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -40,6 +39,7 @@
/**
* @author Morten Jorgensen
+ * @LastModified: Oct 2017
*/
final class ProcessingInstructionPattern extends StepPattern {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/RelationalExpr.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/RelationalExpr.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -44,6 +43,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
final class RelationalExpr extends Expression {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/RoundCall.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/RoundCall.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +30,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
final class RoundCall extends FunctionCall {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Sort.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Sort.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -59,6 +58,7 @@
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
* @author Morten Jorgensen
+ * @LastModified: Nov 2017
*/
final class Sort extends Instruction implements Closure {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StartsWithCall.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StartsWithCall.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -35,6 +34,7 @@
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
* @author Morten Jorgensen
+ * @LastModified: Oct 2017
*/
final class StartsWithCall extends FunctionCall {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Step.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Step.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -48,6 +47,7 @@
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
* @author Morten Jorgensen
+ * @LastModified: Oct 2017
*/
final class Step extends RelativeLocationPath {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StepPattern.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StepPattern.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -58,6 +57,7 @@
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
* @author Erwin Bolwidt <ejb@klomp.org>
+ * @LastModified: Oct 2017
*/
class StepPattern extends RelativePathPattern {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StringCall.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StringCall.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -32,6 +31,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
final class StringCall extends FunctionCall {
public StringCall(QName fname, List<Expression> arguments) {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StringLengthCall.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StringLengthCall.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -32,6 +31,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
final class StringLengthCall extends FunctionCall {
public StringLengthCall(QName fname, List<Expression> arguments) {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -66,6 +65,7 @@
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
* @author Morten Jorgensen
+ * @LastModified: Oct 2017
*/
public final class Stylesheet extends SyntaxTreeNode {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
* @author Morten Jorgensen
+ * @LastModified: Oct 2017
*/
final class SymbolTable {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -58,6 +57,7 @@
* @author Morten Jorensen
* @author Erwin Bolwidt <ejb@klomp.org>
* @author John Howard <JohnH@schemasoft.com>
+ * @LastModified: Nov 2017
*/
public abstract class SyntaxTreeNode implements Constants {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Template.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Template.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -42,6 +41,7 @@
* @author Santiago Pericas-Geertsen
* @author Morten Jorgensen
* @author Erwin Bolwidt <ejb@klomp.org>
+ * @LastModified: Oct 2017
*/
public final class Template extends TopLevelElement {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/TestSeq.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/TestSeq.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -47,7 +46,8 @@
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
* @author Erwin Bolwidt <ejb@klomp.org>
- * @author Morten Jorgensen <morten.jorgensen@sun.com>
+ * @author Morten Jorgensen
+ * @LastModified: Nov 2017
*/
final class TestSeq {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/TopLevelElement.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/TopLevelElement.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +30,9 @@
import java.util.ArrayList;
import java.util.List;
+/**
+ * @LastModified: Oct 2017
+ */
class TopLevelElement extends SyntaxTreeNode {
/*
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnaryOpExpr.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnaryOpExpr.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +30,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
final class UnaryOpExpr extends Expression {
private Expression _left;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnionPathExpr.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnionPathExpr.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -39,6 +38,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Nov 2017
*/
final class UnionPathExpr extends Expression {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnparsedEntityUriCall.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnparsedEntityUriCall.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -35,6 +34,7 @@
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
* @author Morten Jorgensen
+ * @LastModified: Oct 2017
*/
final class UnparsedEntityUriCall extends FunctionCall {
private Expression _entity;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnsupportedElement.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnsupportedElement.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -39,6 +38,7 @@
/**
* @author Morten Jorgensen
+ * @LastModified: Oct 2017
*/
final class UnsupportedElement extends SyntaxTreeNode {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UseAttributeSets.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UseAttributeSets.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -37,6 +36,7 @@
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
* @author Morten Jorgensen
+ * @LastModified: Oct 2017
*/
final class UseAttributeSets extends Instruction {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableBase.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableBase.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -48,6 +47,7 @@
* @author Morten Jorgensen
* @author Erwin Bolwidt <ejb@klomp.org>
* @author John Howard <JohnH@schemasoft.com>
+ * @LastModified: Oct 2017
*/
class VariableBase extends TopLevelElement {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Whitespace.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Whitespace.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -43,6 +42,7 @@
/**
* @author Morten Jorgensen
+ * @LastModified: Oct 2017
*/
final class Whitespace extends TopLevelElement {
// Three possible actions for the translet:
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XPathLexer.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XPathLexer.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -28,6 +27,9 @@
import com.sun.java_cup.internal.runtime.Symbol;
+/**
+ * @LastModified: Oct 2017
+ */
class XPathLexer implements com.sun.java_cup.internal.runtime.Scanner {
private final int YY_BUFFER_SIZE = 512;
private final int YY_F = -1;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -59,6 +58,7 @@
* @author G. Todd Miller
* @author Morten Jorgensen
* @author John Howard (johnh@schemasoft.com)
+ * @LastModified: Oct 2017
*/
public final class XSLTC {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XslAttribute.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XslAttribute.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -50,6 +49,7 @@
* @author Morten Jorgensen
* @author Erwin Bolwidt <ejb@klomp.org>
* @author Gunnlaugur Briem <gthb@dimon.is>
+ * @LastModified: Oct 2017
*/
final class XslAttribute extends Instruction {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/BooleanType.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/BooleanType.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -48,6 +47,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
public final class BooleanType extends Type {
protected BooleanType() {}
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMsg.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMsg.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -34,6 +33,7 @@
* @author G. Todd Miller
* @author Erwin Bolwidt <ejb@klomp.org>
* @author Morten Jorgensen
+ * @LastModified: Sep 2017
*/
public final class ErrorMsg {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/IntType.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/IntType.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -50,6 +49,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
public final class IntType extends NumberType {
protected IntType() {}
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/InternalError.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/InternalError.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -24,6 +23,8 @@
/**
* Marks a class of errors in which XSLTC has reached some incorrect internal
* state from which it cannot recover.
+ *
+ * @LastModified: Oct 2017
*/
public class InternalError extends Error {
private static final long serialVersionUID = -6690855975016554786L;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -76,6 +75,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Nov 2017
*/
public class MethodGenerator extends MethodGen
implements com.sun.org.apache.xalan.internal.xsltc.compiler.Constants {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodType.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodType.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -27,6 +26,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
public final class MethodType extends Type {
private final Type _resultType;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSetType.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSetType.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -38,6 +37,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
public final class NodeSetType extends Type {
protected NodeSetType() {}
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeType.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeType.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -42,6 +41,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
public final class NodeType extends Type {
private final int _type;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ObjectType.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ObjectType.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -37,6 +36,7 @@
/**
* @author Todd Miller
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
public final class ObjectType extends Type {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/RealType.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/RealType.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -43,6 +42,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
public final class RealType extends NumberType {
protected RealType() {}
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ReferenceType.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ReferenceType.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -39,6 +38,7 @@
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
* @author Erwin Bolwidt <ejb@klomp.org>
+ * @LastModified: Oct 2017
*/
public final class ReferenceType extends Type {
protected ReferenceType() {}
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ResultTreeType.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ResultTreeType.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -42,6 +41,7 @@
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
* @author Morten Jorgensen
+ * @LastModified: Oct 2017
*/
public final class ResultTreeType extends Type {
private final String _methodName;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/StringStack.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/StringStack.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -26,6 +25,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
public final class StringStack extends Stack<String> {
static final long serialVersionUID = -1506910875640317898L;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/StringType.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/StringType.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -39,6 +38,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
public class StringType extends Type {
protected StringType() {}
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/Type.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/Type.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +30,7 @@
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
* @author Morten Jorgensen
+ * @LastModified: Oct 2017
*/
public abstract class Type implements Constants {
public static final Type Int = new IntType();
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/Util.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/Util.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -30,6 +29,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Sep 2017
*/
public final class Util {
private static char filesep;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/VoidType.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/VoidType.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -29,6 +28,7 @@
/**
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
public final class VoidType extends Type {
protected VoidType() {}
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/KeyIndex.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/KeyIndex.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -42,6 +41,7 @@
* <b>deprecated.</b></em>
* @author Morten Jorgensen
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
public class KeyIndex extends DTMAxisIteratorBase {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/LoadDocument.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/LoadDocument.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -40,6 +39,7 @@
/**
* @author Morten Jorgensen
+ * @LastModified: Sep 2017
*/
public final class LoadDocument {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NodeCounter.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NodeCounter.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -32,6 +31,7 @@
* @author Jacek Ambroziak
* @author Santiago Pericas-Geertsen
* @author Morten Jorgensen
+ * @LastModified: Oct 2017
*/
public abstract class NodeCounter {
public static final int END = DTM.NULL;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecord.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecord.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -33,6 +32,8 @@
/**
* Base class for sort records containing application specific sort keys
+ *
+ * @LastModified: Oct 2017
*/
public abstract class NodeSortRecord {
public static final int COMPARE_STRING = 0;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecordFactory.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecordFactory.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +30,9 @@
import java.text.Collator;
import java.util.Locale;
+/**
+ * @LastModified: Oct 2017
+ */
public class NodeSortRecordFactory {
private static int DESCENDING = "descending".length();
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -69,6 +68,7 @@
* @author Santiago Pericas-Geertsen
* @author Morten Jorgensen
* @author Douglas Sellers <douglasjsellers@hotmail.com>
+ * @LastModified: Oct 2017
*/
public final class SAXImpl extends SAX2DTM2
implements DOMEnhancedForDTM, DOMBuilder
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -55,6 +54,7 @@
* @author Morten Jorgensen
* @author G. Todd Miller
* @author John Howard, JohnH@schemasoft.com
+ * @LastModified: Oct 2017
*/
public abstract class AbstractTranslet implements Translet {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -61,6 +60,8 @@
/**
* Standard XSLT functions. All standard functions expect the current node
* and the DOM as their last two arguments.
+ *
+ * @LastModified: Sep 2017
*/
public final class BasisLibrary {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/InternalRuntimeError.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/InternalRuntimeError.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -25,6 +24,8 @@
/**
* Class to express failed assertions and similar for the xsltc runtime.
* As java.lang.AssertionError was introduced in JDK 1.4 we can't use that yet.
+ *
+ * @LastModified: Oct 2017
*/
public class InternalRuntimeError extends Error {
private static final long serialVersionUID = 2802784919179095307L;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/output/TransletOutputHandlerFactory.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/output/TransletOutputHandlerFactory.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -49,6 +48,7 @@
/**
* @author Santiago Pericas-Geertsen
+ * @LastModified: Oct 2017
*/
public class TransletOutputHandlerFactory {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/output/WriterOutputBuffer.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/output/WriterOutputBuffer.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -28,6 +27,7 @@
/**
* @author Santiago Pericas-Geertsen
+ * @LastModified: Sep 2017
*/
class WriterOutputBuffer implements OutputBuffer {
private static final int KB = 1024;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2SAX.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2SAX.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -46,6 +45,7 @@
/**
* @author G. Todd Miller
+ * @LastModified: Oct 2017
*/
public class DOM2SAX implements XMLReader, Locator {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2DOM.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2DOM.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -46,6 +45,7 @@
* @author G. Todd Miller
* @author Sunitha Reddy
* @author Huizhe Wang
+ * @LastModified: Nov 2017
*/
public class SAX2DOM implements ContentHandler, LexicalHandler, Constants {
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -69,6 +68,7 @@
* @author G. Todd Millerj
* @author Jochen Cordes <Jochen.Cordes@t-online.de>
* @author Santiago Pericas-Geertsen
+ * @LastModified: Nov 2017
*/
public final class TemplatesImpl implements Templates, Serializable {
static final long serialVersionUID = 673094361519270707L;
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -89,6 +88,7 @@
* @author G. Todd Miller
* @author Morten Jorgensen
* @author Santiago Pericas-Geertsen
+ * @LastModified: Nov 2017
*/
@SuppressWarnings("deprecation") //org.xml.sax.helpers.XMLReaderFactory
public class TransformerFactoryImpl
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -95,6 +94,7 @@
* @author Morten Jorgensen
* @author G. Todd Miller
* @author Santiago Pericas-Geertsen
+ * @LastModified: Nov 2017
*/
public final class TransformerImpl extends Transformer
implements DOMCache, ErrorListener
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/XSLTCSource.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/XSLTCSource.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -35,6 +34,7 @@
/**
* @author Morten Jorgensen
+ * @LastModified: Nov 2017
*/
public final class XSLTCSource implements Source {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/AttributeMap.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/AttributeMap.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -40,6 +39,7 @@
*
* @xerces.internal
*
+ * @LastModified: Oct 2017
*/
public class AttributeMap extends NamedNodeMapImpl {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/CoreDocumentImpl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/CoreDocumentImpl.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -84,6 +83,7 @@
* @author Andy Clark, IBM
* @author Ralf Pfeiffer, IBM
* @since PR-DOM-Level-1-19980818.
+ * @LastModified: Nov 2017
*/
public class CoreDocumentImpl
extends ParentNode implements Document {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMConfigurationImpl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMConfigurationImpl.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -71,6 +70,7 @@
*
* @author Elena Litani, IBM
* @author Neeraj Bajaj, Sun Microsystems.
+ * @LastModified: Oct 2017
*/
public class DOMConfigurationImpl extends ParserConfigurationSettings
implements XMLParserConfiguration, DOMConfiguration {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMImplementationListImpl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMImplementationListImpl.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -33,6 +32,7 @@
*
* @author Neil Delima, IBM
* @since DOM Level 3 Core
+ * @LastModified: Oct 2017
*/
public class DOMImplementationListImpl implements DOMImplementationList {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMImplementationSourceImpl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMImplementationSourceImpl.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -40,6 +39,7 @@
*
* @xerces.internal
*
+ * @LastModified: Oct 2017
*/
public class DOMImplementationSourceImpl
implements DOMImplementationSource {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMMessageFormatter.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMMessageFormatter.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -32,6 +31,7 @@
* @xerces.internal
*
* @author Sandy Gao, IBM
+ * @LastModified: Sep 2017
*/
public class DOMMessageFormatter {
public static final String DOM_DOMAIN = "http://www.w3.org/dom/DOMTR";
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMNormalizer.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMNormalizer.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -97,6 +96,7 @@
*
* @author Elena Litani, IBM
* @author Neeraj Bajaj, Sun Microsystems, inc.
+ * @LastModified: Nov 2017
*/
public class DOMNormalizer implements XMLDocumentHandler {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMStringListImpl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMStringListImpl.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -33,6 +32,7 @@
* @xerces.internal
*
* @author Neil Delima, IBM
+ * @LastModified: Nov 2017
*/
public class DOMStringListImpl implements DOMStringList {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMXSImplementationSourceImpl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DOMXSImplementationSourceImpl.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -37,6 +36,7 @@
* @xerces.internal
*
* @author Elena Litani, IBM
+ * @LastModified: Oct 2017
*/
public class DOMXSImplementationSourceImpl
extends DOMImplementationSourceImpl {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeepNodeListImpl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeepNodeListImpl.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -72,6 +71,7 @@
* @xerces.internal
*
* @since PR-DOM-Level-1-19980818.
+ * @LastModified: Oct 2017
*/
public class DeepNodeListImpl
implements NodeList {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredDocumentImpl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredDocumentImpl.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -43,6 +42,7 @@
* @xerces.internal
*
* @since PR-DOM-Level-1-19980818.
+ * @LastModified: Oct 2017
*/
public class DeferredDocumentImpl
extends DocumentImpl
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredDocumentTypeImpl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredDocumentTypeImpl.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -43,6 +42,7 @@
* @xerces.internal
*
* @since PR-DOM-Level-1-19980818.
+ * @LastModified: Oct 2017
*/
public class DeferredDocumentTypeImpl
extends DocumentTypeImpl
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -85,6 +84,7 @@
* @author Andy Clark, IBM
* @author Ralf Pfeiffer, IBM
* @since PR-DOM-Level-1-19980818.
+ * @LastModified: Nov 2017
*/
public class DocumentImpl
extends CoreDocumentImpl
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/ElementImpl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/ElementImpl.java Mon Jan 08 08:53:14 2018 -0800
@@ -682,7 +682,6 @@
// If the new name has a different prefix, the list may become unsorted.
// Maybe it would be better to resort the list, but the simplest
// fix seems to be to remove the old attribute and re-insert it.
- // -- Norman.Walsh@Sun.COM, 2 Feb 2007
newAttr = (Attr) attributes.removeItem(newAttr, false);
attributes.addItem(newAttr);
}
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/NamedNodeMapImpl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/NamedNodeMapImpl.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -57,6 +56,7 @@
* @xerces.internal
*
* @since PR-DOM-Level-1-19980818.
+ * @LastModified: Oct 2017
*/
public class NamedNodeMapImpl
implements NamedNodeMap, Serializable {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/RangeImpl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/RangeImpl.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -37,6 +36,7 @@
*
* @xerces.internal
*
+ * @LastModified: Oct 2017
*/
public class RangeImpl implements Range {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/Constants.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/Constants.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +30,7 @@
*
* @author Andy Clark, IBM
*
+ * @LastModified: Oct 2017
*/
public final class Constants {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/PropertyManager.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/PropertyManager.java Mon Jan 08 08:53:14 2018 -0800
@@ -37,13 +37,13 @@
import jdk.xml.internal.JdkXmlUtils;
/**
- * This class manages different properties related to Stax specification and its implementation.
+ * This class manages different properties related to Stax specification and its implementation.
* This class constructor also takes itself (PropertyManager object) as parameter and initializes the
* object with the property taken from the object passed.
*
- * @author Neeraj Bajaj, neeraj.bajaj@sun.com
- * @author K.Venugopal@sun.com
- * @author Sunitha Reddy, sunitha.reddy@sun.com
+ * @author Neeraj Bajaj
+ * @author K Venugopal
+ * @author Sunitha Reddy
*/
public class PropertyManager {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XML11NSDocumentScannerImpl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XML11NSDocumentScannerImpl.java Mon Jan 08 08:53:14 2018 -0800
@@ -741,7 +741,7 @@
// Take advantage of the fact that next string _should_ be "fElementQName.rawName",
//In scanners most of the time is consumed on checks done for XML characters, we can
// optimize on it and avoid the checks done for endElement,
- //we will also avoid symbol table lookup - neeraj.bajaj@sun.com
+ //we will also avoid symbol table lookup.
// this should work both for namespace processing true or false...
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -64,6 +63,7 @@
* @author Glenn Marcy, IBM
* @author Eric Ye, IBM
*
+ * @LastModified: Nov 2017
*/
public class XMLDTDScannerImpl
extends XMLScanner
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
@@ -72,6 +71,7 @@
* @author Eric Ye, IBM
* @author Sunitha Reddy, SUN Microsystems
*
+ * @LastModified: Sep 2017
*/
public class XMLDocumentFragmentScannerImpl
extends XMLScanner
@@ -1670,7 +1670,7 @@
// Take advantage of the fact that next string _should_ be "fElementQName.rawName",
//In scanners most of the time is consumed on checks done for XML characters, we can
// optimize on it and avoid the checks done for endElement,
- //we will also avoid symbol table lookup - neeraj.bajaj@sun.com
+ //we will also avoid symbol table lookup.
// this should work both for namespace processing true or false...
@@ -2461,7 +2461,6 @@
* we dont need to set the value for every end element encouterd.
* For Well formedness checks we can have the same QName object that was pushed.
* the values will be set only if application need to know about the endElement
- * -- neeraj.bajaj@sun.com
*/
public QName getLastPoppedElement(){
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
@@ -65,6 +64,7 @@
* Refer to the table in unit-test javax.xml.stream.XMLStreamReaderTest.SupportDTD for changes
* related to property SupportDTD.
* @author Joe Wang, Sun Microsystems
+ * @LastModified: Sep 2017
*/
public class XMLDocumentScannerImpl
extends XMLDocumentFragmentScannerImpl{
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -90,6 +89,7 @@
* @author K.Venugopal SUN Microsystems
* @author Neeraj Bajaj SUN Microsystems
* @author Sunitha Reddy SUN Microsystems
+ * @LastModified: Oct 2017
*/
public class XMLEntityManager implements XMLComponent, XMLEntityResolver {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLErrorReporter.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLErrorReporter.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -71,6 +70,7 @@
* @author Eric Ye, IBM
* @author Andy Clark, IBM
*
+ * @LastModified: Nov 2017
*/
public class XMLErrorReporter
implements XMLComponent {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLNamespaceBinder.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLNamespaceBinder.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -57,6 +56,7 @@
*
* @author Andy Clark, IBM
*
+ * @LastModified: Nov 2017
*/
public class XMLNamespaceBinder
implements XMLComponent, XMLDocumentFilter {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLScanner.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLScanner.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -68,6 +67,7 @@
* @author Eric Ye, IBM
* @author K.Venugopal SUN Microsystems
* @author Sunitha Reddy, SUN Microsystems
+ * @LastModified: Nov 2017
*/
public abstract class XMLScanner
implements XMLComponent {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammar.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammar.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -63,6 +62,7 @@
* @author Andy Clark, IBM
* @author Neil Graham, IBM
*
+ * @LastModified: Oct 2017
*/
public class DTDGrammar
implements XMLDTDHandler, XMLDTDContentModelHandler, EntityState, Grammar {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDDescription.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDDescription.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -33,6 +32,7 @@
* @xerces.internal
*
* @author Neil Graham, IBM
+ * @LastModified: Oct 2017
*/
public class XMLDTDDescription extends XMLResourceIdentifierImpl
implements com.sun.org.apache.xerces.internal.xni.grammars.XMLDTDDescription {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDLoader.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDLoader.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -68,6 +67,7 @@
* @author Neil Graham, IBM
* @author Michael Glavassevich, IBM
*
+ * @LastModified: Nov 2017
*/
public class XMLDTDLoader
extends XMLDTDProcessor
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDProcessor.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDProcessor.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -72,6 +71,7 @@
*
* @author Neil Graham, IBM
*
+ * @LastModified: Nov 2017
*/
public class XMLDTDProcessor
implements XMLComponent, XMLDTDFilter, XMLDTDContentModelFilter {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDValidator.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDValidator.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -85,6 +84,7 @@
* @author Jeffrey Rodriguez IBM
* @author Neil Graham, IBM
*
+ * @LastModified: Nov 2017
*/
public class XMLDTDValidator
implements XMLComponent, XMLDocumentFilter, XMLDTDValidatorFilter, RevalidationHandler {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/DFAContentModel.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/DFAContentModel.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -41,6 +40,7 @@
*
* @xerces.internal
*
+ * @LastModified: Oct 2017
*/
public class DFAContentModel
implements ContentModelValidator {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/DatatypeException.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/DatatypeException.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
*
* @author Sandy Gao, IBM
*
+ * @LastModified: Sep 2017
*/
public class DatatypeException extends Exception {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/XSFacets.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/XSFacets.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -34,6 +33,7 @@
*
* @author Sandy Gao, IBM
*
+ * @LastModified: Oct 2017
*/
public class XSFacets {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/util/Base64.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/util/Base64.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -37,6 +36,7 @@
*
* @author Jeffrey Rodriguez
* @author Sandy Gao
+ * @LastModified: Nov 2017
*/
public final class Base64 {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/util/ByteListImpl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/util/ByteListImpl.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -32,6 +31,7 @@
*
* @author Ankit Pasricha, IBM
*
+ * @LastModified: Oct 2017
*/
public class ByteListImpl extends AbstractList<Byte> implements ByteList {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/BaseDVFactory.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/BaseDVFactory.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
* @author Neeraj Bajaj, Sun Microsystems, inc.
* @author Sandy Gao, IBM
*
+ * @LastModified: Nov 2017
*/
public class BaseDVFactory extends SchemaDVFactory {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/ExtendedSchemaDVFactoryImpl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/ExtendedSchemaDVFactoryImpl.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -32,6 +31,7 @@
*
* @author Khaled Noaman, IBM
*
+ * @LastModified: Nov 2017
*/
public class ExtendedSchemaDVFactoryImpl extends BaseSchemaDVFactory {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/FullDVFactory.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/FullDVFactory.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -34,6 +33,7 @@
* @author Neeraj Bajaj, Sun Microsystems, inc.
* @author Sandy Gao, IBM
*
+ * @LastModified: Nov 2017
*/
public class FullDVFactory extends BaseDVFactory {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/ListDV.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/ListDV.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -34,6 +33,7 @@
* @author Neeraj Bajaj, Sun Microsystems, inc.
* @author Sandy Gao, IBM
*
+ * @LastModified: Oct 2017
*/
public class ListDV extends TypeValidator{
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/SchemaDVFactoryImpl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/SchemaDVFactoryImpl.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -33,6 +32,7 @@
* @author Neeraj Bajaj, Sun Microsystems, inc.
* @author Sandy Gao, IBM
*
+ * @LastModified: Nov 2017
*/
public class SchemaDVFactoryImpl extends BaseSchemaDVFactory {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/XSSimpleTypeDecl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/XSSimpleTypeDecl.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -64,6 +63,7 @@
* @author Sandy Gao, IBM
* @author Neeraj Bajaj, Sun Microsystems, inc.
*
+ * @LastModified: Nov 2017
*/
public class XSSimpleTypeDecl implements XSSimpleType, TypeInfo {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -35,6 +34,7 @@
*
* @author Eric Ye, IBM
*
+ * @LastModified: Sep 2017
*/
public class XMLMessageFormatter implements MessageFormatter {
/**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_de.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_de.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
*
* @author Eric Ye, IBM
*
+ * @LastModified: Sep 2017
*/
public class XMLMessageFormatter_de implements MessageFormatter {
/**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_es.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_es.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
*
* @author Eric Ye, IBM
*
+ * @LastModified: Sep 2017
*/
public class XMLMessageFormatter_es implements MessageFormatter {
/**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_fr.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_fr.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
*
* @author Eric Ye, IBM
*
+ * @LastModified: Sep 2017
*/
public class XMLMessageFormatter_fr implements MessageFormatter {
/**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_it.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_it.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
*
* @author Eric Ye, IBM
*
+ * @LastModified: Sep 2017
*/
public class XMLMessageFormatter_it implements MessageFormatter {
/**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ja.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ja.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
*
* @author Eric Ye, IBM
*
+ * @LastModified: Sep 2017
*/
public class XMLMessageFormatter_ja implements MessageFormatter {
/**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ko.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ko.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
*
* @author Eric Ye, IBM
*
+ * @LastModified: Sep 2017
*/
public class XMLMessageFormatter_ko implements MessageFormatter {
/**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_pt_BR.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_pt_BR.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
*
* @author Eric Ye, IBM
*
+ * @LastModified: Sep 2017
*/
public class XMLMessageFormatter_pt_BR implements MessageFormatter {
/**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_sv.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_sv.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
*
* @author Eric Ye, IBM
*
+ * @LastModified: Sep 2017
*/
public class XMLMessageFormatter_sv implements MessageFormatter {
/**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_CN.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_CN.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
*
* @author Eric Ye, IBM
*
+ * @LastModified: Sep 2017
*/
public class XMLMessageFormatter_zh_CN implements MessageFormatter {
/**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_TW.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_TW.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
*
* @author Eric Ye, IBM
*
+ * @LastModified: Sep 2017
*/
public class XMLMessageFormatter_zh_TW implements MessageFormatter {
/**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/validation/ConfigurableValidationState.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/validation/ConfigurableValidationState.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -30,6 +29,7 @@
* @xerces.internal
*
* @author Peter McCracken, IBM
+ * @LastModified: Oct 2017
*/
public final class ConfigurableValidationState extends ValidationState {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/validation/ValidationManager.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/validation/ValidationManager.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -34,6 +33,7 @@
* @xerces.internal
*
* @author Elena Litani, IBM
+ * @LastModified: Oct 2017
*/
public class ValidationManager {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/validation/ValidationState.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/validation/ValidationState.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -37,6 +36,7 @@
* @xerces.internal
*
* @author Elena Litani, IBM
+ * @LastModified: Oct 2017
*/
public class ValidationState implements ValidationContext {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegexParser.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegexParser.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -32,6 +31,7 @@
*
* @xerces.internal
*
+ * @LastModified: Sep 2017
*/
class RegexParser {
static final int T_CHAR = 0;
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/AttributePSVImpl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/AttributePSVImpl.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -40,6 +39,7 @@
* @xerces.internal
*
* @author Elena Litani IBM
+ * @LastModified: Nov 2017
*/
public class AttributePSVImpl implements AttributePSVI {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/ElementPSVImpl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/ElementPSVImpl.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -47,6 +46,7 @@
* @xerces.internal
*
* @author Elena Litani IBM
+ * @LastModified: Nov 2017
*/
public class ElementPSVImpl implements ElementPSVI {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/PSVIErrorList.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/PSVIErrorList.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +30,7 @@
*
* @author Michael Glavassevich, IBM
*
+ * @LastModified: Oct 2017
*/
final class PSVIErrorList extends AbstractList<String> implements StringList {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/SchemaGrammar.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/SchemaGrammar.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -78,6 +77,7 @@
* @author Sandy Gao, IBM
* @author Elena Litani, IBM
*
+ * @LastModified: Oct 2017
*/
public class SchemaGrammar implements XSGrammar, XSNamespaceItem {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/SubstitutionGroupHandler.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/SubstitutionGroupHandler.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -39,6 +38,7 @@
*
* @author Sandy Gao, IBM
*
+ * @LastModified: Nov 2017
*/
public class SubstitutionGroupHandler {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaLoader.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaLoader.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -102,6 +101,7 @@
* @xerces.internal
*
* @author Neil Graham, IBM
+ * @LastModified: Sep 2017
*/
public class XMLSchemaLoader implements XMLGrammarLoader, XMLComponent, XSElementDeclHelper,
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaValidator.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaValidator.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -112,6 +111,7 @@
* @author Elena Litani IBM
* @author Andy Clark IBM
* @author Neeraj Bajaj, Sun Microsystems, inc.
+ * @LastModified: Nov 2017
*/
public class XMLSchemaValidator
implements XMLComponent, XMLDocumentFilter, FieldActivator, RevalidationHandler, XSElementDeclHelper {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSComplexTypeDecl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSComplexTypeDecl.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -37,6 +36,7 @@
*
* @author Elena Litani, IBM
* @author Sandy Gao, IBM
+ * @LastModified: Nov 2017
*/
public class XSComplexTypeDecl implements XSComplexTypeDefinition, TypeInfo {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSConstraints.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSConstraints.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -46,6 +45,7 @@
*
* @author Sandy Gao, IBM
*
+ * @LastModified: Nov 2017
*/
public class XSConstraints {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSGrammarBucket.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSGrammarBucket.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -32,6 +31,7 @@
* @xerces.internal
*
* @author Sandy Gao, IBM
+ * @LastModified: Nov 2017
*/
public class XSGrammarBucket {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSMessageFormatter.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSMessageFormatter.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -35,6 +34,7 @@
* @xerces.internal
*
* @author Elena Litani, IBM
+ * @LastModified: Sep 2017
*/
public class XSMessageFormatter implements MessageFormatter {
/**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSModelImpl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSModelImpl.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -58,6 +57,7 @@
*
* @author Sandy Gao, IBM
*
+ * @LastModified: Oct 2017
*/
@SuppressWarnings("unchecked") // method <T>toArray(T[])
public final class XSModelImpl extends AbstractList<XSNamespaceItem> implements XSModel, XSNamespaceItemList {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/CMBuilder.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/CMBuilder.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -37,6 +36,7 @@
* @author Elena Litani, IBM
* @author Sandy Gao, IBM
*
+ * @LastModified: Nov 2017
*/
public class CMBuilder {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSAllCM.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSAllCM.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -35,6 +34,7 @@
* @xerces.internal
*
* @author Pavani Mukthipudi, Sun Microsystems Inc.
+ * @LastModified: Oct 2017
*/
public class XSAllCM implements XSCMValidator {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMValidator.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMValidator.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -33,6 +32,7 @@
*
* @author Sandy Gao, IBM
* @author Elena Litani, IBM
+ * @LastModified: Oct 2017
*/
public interface XSCMValidator {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSDFACM.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSDFACM.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -46,6 +45,7 @@
* @xerces.internal
*
* @author Neil Graham, IBM
+ * @LastModified: Oct 2017
*/
public class XSDFACM
implements XSCMValidator {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSEmptyCM.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSEmptyCM.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -38,6 +37,7 @@
*
* @author Elena Litani, Lisa Martin
* @author IBM
+ * @LastModified: Oct 2017
*/
public class XSEmptyCM implements XSCMValidator {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOM.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOM.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -41,6 +40,7 @@
* @author Rahul Srivastava, Sun Microsystems Inc.
* @author Sandy Gao, IBM
*
+ * @LastModified: Oct 2017
*/
public class SchemaDOM extends DefaultDocument {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaParsingConfig.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaParsingConfig.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -59,6 +58,7 @@
*
* @author Rahul Srivastava, Sun Microsystems Inc.
*
+ * @LastModified: Sep 2017
*/
public class SchemaParsingConfig extends BasicParserConfiguration
implements XMLPullParserConfiguration {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/StAXSchemaParser.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/StAXSchemaParser.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -53,6 +52,7 @@
*
* @xerces.internal
*
+ * @LastModified: Oct 2017
*/
final class StAXSchemaParser {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAttributeChecker.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAttributeChecker.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -68,6 +67,7 @@
* @xerces.internal
*
* @author Sandy Gao, IBM
+ * @LastModified: Nov 2017
*/
public class XSAttributeChecker {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractTraverser.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractTraverser.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -60,6 +59,7 @@
* @author Rahul Srivastava, Sun Microsystems Inc.
* @author Neeraj Bajaj, Sun Microsystems Inc.
*
+ * @LastModified: Oct 2017
*/
abstract class XSDAbstractTraverser {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDElementTraverser.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDElementTraverser.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -70,6 +69,7 @@
*
* @author Sandy Gao, IBM
*
+ * @LastModified: Oct 2017
*/
class XSDElementTraverser extends XSDAbstractTraverser {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -131,6 +130,7 @@
* @author Neil Graham, IBM
* @author Pavani Mukthipudi, Sun Microsystems
*
+ * @LastModified: Nov 2017
*/
@SuppressWarnings("deprecation") //org.xml.sax.helpers.XMLReaderFactory
public class XSDHandler {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDSimpleTypeTraverser.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDSimpleTypeTraverser.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -77,6 +76,7 @@
* @author Neeraj Bajaj, Sun Microsystems, Inc.
* @author Sandy Gao, IBM
*
+ * @LastModified: Nov 2017
*/
class XSDSimpleTypeTraverser extends XSDAbstractTraverser {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDUniqueOrKeyTraverser.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDUniqueOrKeyTraverser.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
* @xerces.internal
*
* @author Neil Graham, IBM
+ * @LastModified: Nov 2017
*/
class XSDUniqueOrKeyTraverser extends XSDAbstractIDConstraintTraverser {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDocumentInfo.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDocumentInfo.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -44,6 +43,7 @@
* @xerces.internal
*
* @author Neil Graham, IBM
+ * @LastModified: Oct 2017
*/
class XSDocumentInfo {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/LSInputListImpl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/LSInputListImpl.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -33,6 +32,7 @@
*
* @author Michael Glavassevich, IBM
*
+ * @LastModified: Oct 2017
*/
@SuppressWarnings("unchecked") // method <T>toArray(T[])
public final class LSInputListImpl extends AbstractList<LSInput> implements LSInputList {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/ObjectListImpl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/ObjectListImpl.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -30,6 +29,7 @@
*
* @xerces.internal
*
+ * @LastModified: Oct 2017
*/
@SuppressWarnings("unchecked") // method <T>toArray(T[])
public final class ObjectListImpl extends AbstractList<Object> implements ObjectList {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/ShortListImpl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/ShortListImpl.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -32,6 +31,7 @@
*
* @author Sandy Gao, IBM
*
+ * @LastModified: Oct 2017
*/
public final class ShortListImpl extends AbstractList<Short> implements ShortList {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/StringListImpl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/StringListImpl.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -33,6 +32,7 @@
*
* @author Sandy Gao, IBM
*
+ * @LastModified: Oct 2017
*/
@SuppressWarnings("unchecked") // method <T>toArray(T[])
public final class StringListImpl extends AbstractList<String> implements StringList {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSGrammarPool.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSGrammarPool.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -38,6 +37,7 @@
*
* @xerces.internal
*
+ * @LastModified: Nov 2017
*/
public class XSGrammarPool extends XMLGrammarPoolImpl {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSNamedMapImpl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSNamedMapImpl.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -40,6 +39,7 @@
*
* @author Sandy Gao, IBM
*
+ * @LastModified: Oct 2017
*/
public class XSNamedMapImpl extends AbstractMap<QName, XSObject> implements XSNamedMap {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSObjectListImpl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSObjectListImpl.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
*
* @author Sandy Gao, IBM
*
+ * @LastModified: Oct 2017
*/
@SuppressWarnings("unchecked") // method <T>toArray(T[])
public class XSObjectListImpl extends AbstractList<XSObject> implements XSObjectList {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/JAXPValidatorComponent.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/JAXPValidatorComponent.java Mon Jan 08 08:53:14 2018 -0800
@@ -82,7 +82,7 @@
* only those events that need to go through Validator will go the 1st route,
* and other events go the 2nd direct route.
*
- * @author Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ * @author Kohsuke Kawaguchi
*/
final class JAXPValidatorComponent
extends TeeXMLDocumentFilterImpl implements XMLComponent {
@@ -344,7 +344,7 @@
* to reuse its default {@link com.sun.org.apache.xerces.internal.xni.XMLDocumentHandler}
* implementation.
*
- * @author Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ * @author Kohsuke Kawaguchi
*/
private final class XNI2SAX extends DefaultXMLDocumentHandler {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -62,6 +61,7 @@
* @author Rajiv Mordani
* @author Edwin Goei
*
+ * @LastModified: Oct 2017
*/
@SuppressWarnings("deprecation")
public class SAXParserImpl extends javax.xml.parsers.SAXParser
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/TeeXMLDocumentFilterImpl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/TeeXMLDocumentFilterImpl.java Mon Jan 08 08:53:14 2018 -0800
@@ -36,7 +36,7 @@
/**
* <p>XMLDocumentHandler which forks the pipeline to two other components.</p>
*
- * @author Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ * @author Kohsuke Kawaguchi
*/
class TeeXMLDocumentFilterImpl implements XMLDocumentFilter {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/UnparsedEntityHandler.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/UnparsedEntityHandler.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -40,6 +39,7 @@
* Events are forwarded to the registered XMLDTDHandler without modification.</p>
*
* @author Michael Glavassevich, IBM
+ * @LastModified: Oct 2017
*/
final class UnparsedEntityHandler implements XMLDTDFilter, EntityState {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DatatypeFactoryImpl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DatatypeFactoryImpl.java Mon Jan 08 08:53:14 2018 -0800
@@ -57,8 +57,8 @@
* </li>
* </ol>
*
- * @author <a href="mailto:Joseph.Fialli@Sun.COM">Joseph Fialli</a>
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Joseph Fialli
+ * @author Jeff Suttor
*/
public class DatatypeFactoryImpl
extends DatatypeFactory {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationDayTimeImpl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationDayTimeImpl.java Mon Jan 08 08:53:14 2018 -0800
@@ -41,9 +41,7 @@
* </p>
*
*
- * @author <a href="mailto:Vikram.Aroskar@Sun.COM">Vikram Aroskar</a>
- * @author <a href="mailto:Huizhe.wang@oracle.com">Joe Wang</a>
-
+ * @author Vikram Aroskar
* @see XMLGregorianCalendar#add(Duration)
*/
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationImpl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationImpl.java Mon Jan 08 08:53:14 2018 -0800
@@ -95,9 +95,8 @@
* The impacted methods document their dependency on {@link Calendar}.
*
*
- * @author <a href="mailto:Kohsuke.Kawaguchi@Sun.com">Kohsuke Kawaguchi</a>
- * @author <a href="mailto:Joseph.Fialli@Sun.com">Joseph Fialli</a>
-
+ * @author Kohsuke Kawaguchi
+ * @author Joseph Fialli
* @see XMLGregorianCalendar#add(Duration)
*/
class DurationImpl
@@ -1863,7 +1862,7 @@
/**
* Representation of {@link Duration} in the object stream.
*
- * @author Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ * @author Kohsuke Kawaguchi
*/
private static class DurationStream implements Serializable {
private final String lexical;
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationYearMonthImpl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationYearMonthImpl.java Mon Jan 08 08:53:14 2018 -0800
@@ -40,9 +40,7 @@
* </p>
*
*
- * @author <a href="mailto:Vikram.Aroskar@Sun.COM">Vikram Aroskar</a>
- * @author <a href="mailto:Huizhe.wang@oracle.com">Joe Wang</a>
-
+ * @author Vikram Aroskar
* @see XMLGregorianCalendar#add(Duration)
*/
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/XMLGregorianCalendarImpl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/XMLGregorianCalendarImpl.java Mon Jan 08 08:53:14 2018 -0800
@@ -185,9 +185,9 @@
* </ul>
* </p>
*
- * @author <a href="mailto:Kohsuke.Kawaguchi@Sun.com">Kohsuke Kawaguchi</a>
- * @author <a href="mailto:Joseph.Fialli@Sun.com">Joseph Fialli</a>
- * @author <a href="mailto:Sunitha.Reddy@Sun.com">Sunitha Reddy</a>
+ * @author Kohsuke Kawaguchi
+ * @author Joseph Fialli
+ * @author Sunitha Reddy
* @see javax.xml.datatype.Duration
* @since 1.5
*/
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/AbstractXMLSchema.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/AbstractXMLSchema.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +30,7 @@
* <p>Abstract implementation of Schema for W3C XML Schemas.</p>
*
* @author Michael Glavassevich, IBM
+ * @LastModified: Oct 2017
*/
abstract class AbstractXMLSchema extends Schema implements
XSGrammarPoolContainer {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DOMResultBuilder.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DOMResultBuilder.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -66,6 +65,7 @@
* <p>DOM result builder.</p>
*
* @author Michael Glavassevich, IBM
+ * @LastModified: Oct 2017
*/
final class DOMResultBuilder implements DOMDocumentHandler {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DOMValidatorHelper.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DOMValidatorHelper.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -62,6 +61,7 @@
* <p>A validator helper for <code>DOMSource</code>s.</p>
*
* @author Michael Glavassevich, IBM
+ * @LastModified: Oct 2017
*/
final class DOMValidatorHelper implements ValidatorHelper, EntityState {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DraconianErrorHandler.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DraconianErrorHandler.java Mon Jan 08 08:53:14 2018 -0800
@@ -28,7 +28,7 @@
/**
* {@link ErrorHandler} that throws all errors and fatal errors.
*
- * @author Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ * @author Kohsuke Kawaguchi
*/
final class DraconianErrorHandler implements ErrorHandler {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ErrorHandlerAdaptor.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ErrorHandlerAdaptor.java Mon Jan 08 08:53:14 2018 -0800
@@ -31,7 +31,7 @@
* and pass them down to SAX {@link ErrorHandler}.
*
* @author
- * Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ * Kohsuke Kawaguchi
*/
public abstract class ErrorHandlerAdaptor implements XMLErrorHandler
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/JAXPValidationMessageFormatter.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/JAXPValidationMessageFormatter.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -30,6 +29,7 @@
* <p>Used to format JAXP Validation API error messages using a specified locale.</p>
*
* @author Michael Glavassevich, IBM
+ * @LastModified: Sep 2017
*/
final class JAXPValidationMessageFormatter {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ReadOnlyGrammarPool.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ReadOnlyGrammarPool.java Mon Jan 08 08:53:14 2018 -0800
@@ -29,7 +29,7 @@
* <p>Filter {@link XMLGrammarPool} that exposes a
* read-only view of the underlying pool.</p>
*
- * @author Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ * @author Kohsuke Kawaguchi
*/
final class ReadOnlyGrammarPool implements XMLGrammarPool {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/SimpleXMLSchema.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/SimpleXMLSchema.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -30,6 +29,7 @@
* contains schema components from one target namespace.</p>
*
* @author Michael Glavassevich, IBM
+ * @LastModified: Nov 2017
*/
final class SimpleXMLSchema extends AbstractXMLSchema implements XMLGrammarPool {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/SoftReferenceGrammarPool.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/SoftReferenceGrammarPool.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -38,6 +37,7 @@
* the target namespace for the schema and schema location.</p>
*
* @author Michael Glavassevich, IBM
+ * @LastModified: Nov 2017
*/
final class SoftReferenceGrammarPool implements XMLGrammarPool {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/StAXValidatorHelper.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/StAXValidatorHelper.java Mon Jan 08 08:53:14 2018 -0800
@@ -47,7 +47,7 @@
/**
* <p>A validator helper for <code>StAXSource</code>s.</p>
*
- * @author <a href="mailto:Sunitha.Reddy@Sun.com">Sunitha Reddy</a>
+ * @author Sunitha Reddy
*/
public final class StAXValidatorHelper implements ValidatorHelper {
private static final String DEFAULT_TRANSFORMER_IMPL = "com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl";
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/StreamValidatorHelper.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/StreamValidatorHelper.java Mon Jan 08 08:53:14 2018 -0800
@@ -50,7 +50,7 @@
* A validator helper for <code>StreamSource</code>s.</p>
*
* @author Michael Glavassevich, IBM
- * @author <a href="mailto:Sunitha.Reddy@Sun.com">Sunitha Reddy</a>
+ * @author Sunitha Reddy
*/
final class StreamValidatorHelper implements ValidatorHelper {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/Util.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/Util.java Mon Jan 08 08:53:14 2018 -0800
@@ -32,7 +32,7 @@
/**
* <p>Static utility methods for the Validation API implementation.</p>
*
- * @author Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ * @author Kohsuke Kawaguchi
*/
final class Util {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHandlerImpl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHandlerImpl.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -92,9 +91,10 @@
* <p>Implementation of ValidatorHandler for W3C XML Schemas and
* also a validator helper for <code>SAXSource</code>s.</p>
*
- * @author Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ * @author Kohsuke Kawaguchi
* @author Michael Glavassevich, IBM
*
+ * @LastModified: Oct 2017
*/
final class ValidatorHandlerImpl extends ValidatorHandler implements
DTDHandler, EntityState, PSVIProvider, ValidatorHelper, XMLDocumentHandler {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorImpl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorImpl.java Mon Jan 08 08:53:14 2018 -0800
@@ -46,9 +46,9 @@
/**
* <p>Implementation of Validator for W3C XML Schemas.</p>
*
- * @author <a href="mailto:Kohsuke.Kawaguchi@Sun.com">Kohsuke Kawaguchi</a>
+ * @author Kohsuke Kawaguchi
* @author Michael Glavassevich, IBM
- * @author <a href="mailto:Sunitha.Reddy@Sun.com">Sunitha Reddy</a>
+ * @author Sunitha Reddy
*/
final class ValidatorImpl extends Validator implements PSVIProvider {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/WeakReferenceXMLSchema.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/WeakReferenceXMLSchema.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -33,6 +32,7 @@
* its memory.</p>
*
* @author Michael Glavassevich, IBM
+ * @LastModified: Oct 2017
*/
final class WeakReferenceXMLSchema extends AbstractXMLSchema {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/WrappedSAXException.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/WrappedSAXException.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -37,7 +36,9 @@
* kind of SAXException tunneling.
*
* @author
- * Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ * Kohsuke Kawaguchi
+ *
+ * @LastModified: Oct 2017
*/
public class WrappedSAXException extends RuntimeException {
private static final long serialVersionUID = -3201986204982729962L;
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java Mon Jan 08 08:53:14 2018 -0800
@@ -64,7 +64,7 @@
/**
* {@link SchemaFactory} for XML Schema.
*
- * @author Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ * @author Kohsuke Kawaguchi
*/
public final class XMLSchemaFactory extends SchemaFactory {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/AbstractDOMParser.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/AbstractDOMParser.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -85,6 +84,7 @@
* @author Andy Clark, IBM
* @author Elena Litani, IBM
*
+ * @LastModified: Nov 2017
*/
public class AbstractDOMParser extends AbstractXMLDocumentParser {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/BasicParserConfiguration.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/BasicParserConfiguration.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -95,6 +94,7 @@
* @author Arnaud Le Hors, IBM
* @author Andy Clark, IBM
*
+ * @LastModified: Oct 2017
*/
public abstract class BasicParserConfiguration
extends ParserConfigurationSettings
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/DOMParserImpl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/DOMParserImpl.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -79,6 +78,7 @@
* @author Pavani Mukthipudi, Sun Microsystems Inc.
* @author Elena Litani, IBM
* @author Rahul Srivastava, Sun Microsystems Inc.
+ * @LastModified: Oct 2017
*/
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XML11Configuration.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XML11Configuration.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -78,6 +77,7 @@
* @author Neil Graham, IBM
* @author Michael Glavassevich, IBM
*
+ * @LastModified: Oct 2017
*/
public class XML11Configuration extends ParserConfigurationSettings
implements XMLPullParserConfiguration, XML11Configurable {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XML11DTDConfiguration.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XML11DTDConfiguration.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -104,6 +103,7 @@
* @author Michael Glavassevich, IBM
* @author John Kim, IBM
*
+ * @LastModified: Oct 2017
*/
public class XML11DTDConfiguration extends ParserConfigurationSettings
implements XMLPullParserConfiguration, XML11Configurable {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XML11NonValidatingConfiguration.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XML11NonValidatingConfiguration.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -77,6 +76,7 @@
* @author John Kim, IBM
* @author Michael Glavassevich, IBM
*
+ * @LastModified: Oct 2017
*/
public class XML11NonValidatingConfiguration extends ParserConfigurationSettings
implements XMLPullParserConfiguration, XML11Configurable {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XMLGrammarPreparser.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/parsers/XMLGrammarPreparser.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -50,6 +49,7 @@
*
* @author Neil Graham, IBM
*
+ * @LastModified: Oct 2017
*/
public class XMLGrammarPreparser {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/AugmentationsImpl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/AugmentationsImpl.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
* <p>
*
* @author Elena Litani, IBM
+ * @LastModified: Oct 2017
*/
public class AugmentationsImpl implements Augmentations{
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DOMEntityResolverWrapper.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DOMEntityResolverWrapper.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -45,6 +44,7 @@
* @author Gopal Sharma, SUN MicroSystems Inc.
* @author Elena Litani, IBM
* @author Ramesh Mandava, Sun Microsystems
+ * @LastModified: Nov 2017
*/
public class DOMEntityResolverWrapper
implements XMLEntityResolver {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DatatypeMessageFormatter.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DatatypeMessageFormatter.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -30,6 +29,7 @@
* <p>Used to format JAXP 1.3 Datatype API error messages using a specified locale.</p>
*
* @author Neeraj Bajaj, Sun Microsystems
+ * @LastModified: Sep 2017
*/
public class DatatypeMessageFormatter {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DraconianErrorHandler.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/DraconianErrorHandler.java Mon Jan 08 08:53:14 2018 -0800
@@ -29,7 +29,7 @@
* {@link ErrorHandler} that throws all errors and fatal errors.
*
* @author
- * Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ * Kohsuke Kawaguchi
*/
public class DraconianErrorHandler implements ErrorHandler {
/**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/ErrorHandlerProxy.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/ErrorHandlerProxy.java Mon Jan 08 08:53:14 2018 -0800
@@ -40,7 +40,7 @@
* rather than copying it into every component that needs an error handler
* and update all of them whenever it is changed, IMO.
*
- * @author Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ * @author Kohsuke Kawaguchi
*
*/
public abstract class ErrorHandlerProxy implements ErrorHandler {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/JAXPNamespaceContextWrapper.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/JAXPNamespaceContextWrapper.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -35,6 +34,7 @@
*
* @author Michael Glavassevich, IBM
*
+ * @LastModified: Oct 2017
*/
public final class JAXPNamespaceContextWrapper implements NamespaceContext {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/LocatorWrapper.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/LocatorWrapper.java Mon Jan 08 08:53:14 2018 -0800
@@ -28,7 +28,7 @@
* Wraps SAX {@link Locator} into Xerces {@link XMLLocator}.
*
* @author
- * Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ * Kohsuke Kawaguchi
*/
public class LocatorWrapper implements XMLLocator {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/NamespaceContextWrapper.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/NamespaceContextWrapper.java Mon Jan 08 08:53:14 2018 -0800
@@ -39,8 +39,8 @@
* can be exposed to the application, we must intern all Strings before
* calling NamespaceSupport methods.
*
- * @author Neeraj Bajaj, Sun Microsystems, inc.
- * @author Santiago.PericasGeertsen@sun.com
+ * @author Neeraj Bajaj
+ * @author Santiago PericasGeertsen
*
*/
public class NamespaceContextWrapper implements NamespaceContext {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/NamespaceSupport.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/NamespaceSupport.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
*
* @author Andy Clark, IBM
*
+ * @LastModified: Oct 2017
*/
public class NamespaceSupport implements NamespaceContext {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SAX2XNI.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SAX2XNI.java Mon Jan 08 08:53:14 2018 -0800
@@ -39,7 +39,7 @@
* and produces the equivalent {@link XMLDocumentHandler} events.
*
* @author
- * Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ * Kohsuke Kawaguchi
*/
public class SAX2XNI implements ContentHandler, XMLDocumentSource {
public SAX2XNI( XMLDocumentHandler core ) {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SAXMessageFormatter.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SAXMessageFormatter.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +30,7 @@
*
* @author Michael Glavassevich, IBM
*
+ * @LastModified: Sep 2017
*/
public class SAXMessageFormatter {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SymbolHash.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/SymbolHash.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -29,6 +28,7 @@
* The hash code uses the same algorithm as SymbolTable class.
*
* @author Elena Litani
+ * @LastModified: Nov 2017
*/
public class SymbolHash {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/TeeXMLDocumentFilterImpl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/TeeXMLDocumentFilterImpl.java Mon Jan 08 08:53:14 2018 -0800
@@ -37,7 +37,7 @@
*
*
* @author
- * Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ * Kohsuke Kawaguchi
*/
public class TeeXMLDocumentFilterImpl implements XMLDocumentFilter {
/**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLDocumentFilterImpl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLDocumentFilterImpl.java Mon Jan 08 08:53:14 2018 -0800
@@ -42,7 +42,7 @@
* {@link XMLDocumentFilter}s.
*
* @author
- * Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ * Kohsuke Kawaguchi
*/
public class XMLDocumentFilterImpl implements XMLDocumentFilter {
private XMLDocumentHandler next;
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLInputSourceAdaptor.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLInputSourceAdaptor.java Mon Jan 08 08:53:14 2018 -0800
@@ -41,7 +41,7 @@
* get rid of this awkward adaptor class.
*
* @author
- * Kohsuke Kawaguchi (kohsuke.kawaguchi@sun.com)
+ * Kohsuke Kawaguchi
*/
public final class XMLInputSourceAdaptor implements Source {
/**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/ConfigurationError.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/ConfigurationError.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -23,6 +22,8 @@
/**
* A configuration error. This was an internal class in ObjectFactory previously
+ *
+ * @LastModified: Oct 2017
*/
public final class ConfigurationError extends Error {
private static final long serialVersionUID = 8095902236393167968L;
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/ObjectFactory.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/utils/ObjectFactory.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
* when bundled as part of the JDK.
* <p>
*
+ * @LastModified: Oct 2017
*/
public final class ObjectFactory {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/MultipleScopeNamespaceSupport.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/MultipleScopeNamespaceSupport.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -38,6 +37,7 @@
*
* @author Peter McCracken, IBM
*
+ * @LastModified: Oct 2017
*/
public class MultipleScopeNamespaceSupport extends NamespaceSupport {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeHandler.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeHandler.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -128,6 +127,7 @@
*
*
* @see XIncludeNamespaceSupport
+ * @LastModified: Nov 2017
*/
public class XIncludeHandler
implements XMLComponent, XMLDocumentFilter, XMLDTDFilter {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeMessageFormatter.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeMessageFormatter.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -33,6 +32,7 @@
*
* @author Peter McCracken, IBM
*
+ * @LastModified: Sep 2017
*/
public class XIncludeMessageFormatter implements MessageFormatter {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeTextReader.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeTextReader.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -63,6 +62,7 @@
*
*
* @see XIncludeHandler
+ * @LastModified: Oct 2017
*/
public class XIncludeTextReader {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/Augmentations.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/Augmentations.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -37,6 +36,7 @@
* should not save any reference to the structure.
*
* @author Elena Litani, IBM
+ * @LastModified: Oct 2017
*/
public interface Augmentations {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/NamespaceContext.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/NamespaceContext.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -35,6 +34,7 @@
*
* @author Andy Clark, IBM
*
+ * @LastModified: Oct 2017
*/
public interface NamespaceContext {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/XPointerMessageFormatter.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xpointer/XPointerMessageFormatter.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -34,6 +33,7 @@
*
* @xerces.internal
*
+ * @LastModified: Sep 2017
*/
final class XPointerMessageFormatter implements MessageFormatter {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/LSInputList.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/LSInputList.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -28,6 +27,8 @@
* The <code>LSInputList</code> interface provides the abstraction of an
* ordered collection of <code>LSInput</code>s, without defining or
* constraining how this collection is implemented.
+ *
+ * @LastModified: Oct 2017
*/
public interface LSInputList extends List<LSInput> {
/**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/ShortList.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/ShortList.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -26,6 +25,8 @@
/**
* The <code>ShortList</code> is an immutable ordered collection of
* <code>unsigned short</code>.
+ *
+ * @LastModified: Oct 2017
*/
public interface ShortList extends List<Short> {
/**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/StringList.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/StringList.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -26,6 +25,8 @@
/**
* The <code>StringList</code> is an immutable ordered collection of
* <code>GenericString</code>.
+ *
+ * @LastModified: Oct 2017
*/
public interface StringList extends List<String> {
/**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSNamedMap.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSNamedMap.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -30,6 +29,8 @@
* accessed by name. Note that <code>XSNamedMap</code> does not inherit from
* <code>XSObjectList</code>. The <code>XSObject</code>s in
* <code>XSNamedMap</code>s are not maintained in any particular order.
+ *
+ * @LastModified: Oct 2017
*/
public interface XSNamedMap extends Map<QName, XSObject> {
/**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSNamespaceItemList.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSNamespaceItemList.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -27,6 +26,8 @@
* The <code>XSNamesaceItemList</code> interface provides the abstraction of
* an immutable ordered collection of <code>XSNamespaceItem</code>s, without
* defining or constraining how this collection is implemented.
+ *
+ * @LastModified: Oct 2017
*/
public interface XSNamespaceItemList extends List<XSNamespaceItem> {
/**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSObjectList.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/XSObjectList.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -27,6 +26,8 @@
* The <code>XSObjectList</code> interface provides the abstraction of an
* immutable ordered collection of <code>XSObject</code>s, without defining
* or constraining how this collection is implemented.
+ *
+ * @LastModified: Oct 2017
*/
public interface XSObjectList extends List<XSObject> {
/**
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/ByteList.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/ByteList.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -30,6 +29,7 @@
*
* @author Ankit Pasricha, IBM
*
+ * @LastModified: Oct 2017
*/
public interface ByteList extends List<Byte> {
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/ObjectList.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/ObjectList.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -29,6 +28,7 @@
*
* @author Ankit Pasricha, IBM
*
+ * @LastModified: Oct 2017
*/
public interface ObjectList extends List<Object> {
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/CustomStringPool.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/CustomStringPool.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -45,6 +44,7 @@
* <p>
* Status: In progress, under discussion.
*
+ * @LastModified: Oct 2017
*/
public class CustomStringPool extends DTMStringPool {
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBase.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBase.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,8 @@
* The <code>DTMDefaultBase</code> class serves as a helper base for DTMs.
* It sets up structures for navigation and type, while leaving data
* management and construction to the derived classes.
+ *
+ * @LastModified: Oct 2017
*/
public abstract class DTMDefaultBase implements DTM
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMDocumentImpl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMDocumentImpl.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -60,6 +59,8 @@
*
* <p>Origin: the implemention is a composite logic based on the DTM of XalanJ1 and
* DocImpl, DocumentImpl, ElementImpl, TextImpl, etc. of XalanJ2</p>
+ *
+ * @LastModified: Oct 2017
*/
public class DTMDocumentImpl
implements DTM, org.xml.sax.ContentHandler, org.xml.sax.ext.LexicalHandler
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMManagerDefault.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMManagerDefault.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -71,7 +70,9 @@
* activity (eg, when getDTM() is invoked). The downside of that solution
* would be a greater delay before the DTM's storage is actually released
* for reuse.
- * */
+ *
+ * @LastModified: Nov 2017
+ */
public class DTMManagerDefault extends DTMManager
{
//static final boolean JKESS_XNI_EXPERIMENT=true;
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeList.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeList.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -53,7 +52,9 @@
* </ul>
*
* <p>State: In progress!!</p>
- * */
+ *
+ * @LastModified: Nov 2017
+ */
public class DTMNodeList extends DTMNodeListBase {
private DTMIterator m_iter;
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -61,6 +60,7 @@
* DTMNodeProxy may be subclassed further to present specific DOM node types.
*
* @see org.w3c.dom
+ * @LastModified: Nov 2017
*/
public class DTMNodeProxy
implements Node, Document, Text, Element, Attr,
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMStringPool.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMStringPool.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -53,7 +52,9 @@
* ObjectPool if one was needed.</p>
*
* <p>Status: Passed basic test in main().</p>
- * */
+ *
+ * @LastModified: Oct 2017
+ */
public class DTMStringPool
{
List<String> m_intToString;
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource_Xerces.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource_Xerces.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -40,7 +39,9 @@
* <p>Usage example: See main().</p>
*
* <p>Status: Passes simple main() unit-test. NEEDS JAVADOC.</p>
- * */
+ *
+ * @LastModified: Oct 2017
+ */
public class IncrementalSAXSource_Xerces
implements IncrementalSAXSource
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/dom2dtm/DOM2DTM.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/dom2dtm/DOM2DTM.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -62,7 +61,9 @@
* Note too that we do not currently attempt to track document
* mutation. If you alter the DOM after wrapping DOM2DTM around it,
* all bets are off.
- * */
+ *
+ * @LastModified: Oct 2017
+ */
public class DOM2DTM extends DTMDefaultBaseIterators
{
static final boolean JJK_DEBUG=false;
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -63,6 +62,8 @@
/**
* This class implements a DTM that tends to be optimized more for speed than
* for compactness, that is constructed via SAX2 ContentHandler events.
+ *
+ * @LastModified: Oct 2017
*/
public class SAX2DTM extends DTMDefaultBaseIterators
implements EntityResolver, DTDHandler, ContentHandler, ErrorHandler,
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -62,6 +61,8 @@
* <p>
* %MK% The code in this class is critical to the XSLTC_DTM performance. Be very careful
* when making changes here!
+ *
+ * @LastModified: Oct 2017
*/
public class SAX2DTM2 extends SAX2DTM
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2RTFDTM.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2RTFDTM.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -58,7 +57,9 @@
* %REVIEW% In fact, since the differences are so minor, I think it
* may be possible/practical to fold them back into the base
* SAX2DTM. Consider that as a future code-size optimization.
- * */
+ *
+ * @LastModified: Oct 2017
+ */
public class SAX2RTFDTM extends SAX2DTM
{
/** Set true to monitor SAX events and similar diagnostic info. */
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLMessages.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res/XMLMessages.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -28,6 +27,7 @@
/**
* A utility class for issuing XML error messages.
* @xsl.usage internal
+ * @LastModified: Sep 2017
*/
public class XMLMessages
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/BaseMarkupSerializer.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/BaseMarkupSerializer.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -119,9 +118,9 @@
*
*
* @author <a href="mailto:arkin@intalio.com">Assaf Arkin</a>
- * @author <a href="mailto:rahul.srivastava@sun.com">Rahul Srivastava</a>
+ * @author Rahul Srivastava
* @author Elena Litani, IBM
- * @author Sunitha Reddy, Sun Microsystems
+ * @author Sunitha Reddy
* @see Serializer
* @see org.w3c.dom.ls.LSSerializer
*
@@ -129,6 +128,8 @@
* is replaced by that of Xalan. Main class
* {@link com.sun.org.apache.xml.internal.serialize.DOMSerializerImpl} is replaced
* by {@link com.sun.org.apache.xml.internal.serializer.dom3.LSSerializerImpl}.
+ *
+ * @LastModified: Nov 2017
*/
@Deprecated
public abstract class BaseMarkupSerializer
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/DOMSerializerImpl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/DOMSerializerImpl.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -75,6 +74,8 @@
*
* @deprecated As of JDK 9, Xerces 2.9.0, replaced by
* {@link com.sun.org.apache.xml.internal.serializer.dom3.LSSerializerImpl}
+ *
+ * @LastModified: Oct 2017
*/
@Deprecated
public class DOMSerializerImpl implements LSSerializer, DOMConfiguration {
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/Encodings.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/Encodings.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -42,6 +41,8 @@
* is replaced by that of Xalan. Main class
* {@link com.sun.org.apache.xml.internal.serialize.DOMSerializerImpl} is replaced
* by {@link com.sun.org.apache.xml.internal.serializer.dom3.LSSerializerImpl}.
+ *
+ * @LastModified: Oct 2017
*/
@Deprecated
class Encodings
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/SerializerFactory.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/SerializerFactory.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017 Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -42,6 +41,8 @@
* is replaced by that of Xalan. Main class
* {@link com.sun.org.apache.xml.internal.serialize.DOMSerializerImpl} is replaced
* by {@link com.sun.org.apache.xml.internal.serializer.dom3.LSSerializerImpl}.
+ *
+ * @LastModified: Oct 2017
*/
@Deprecated
public abstract class SerializerFactory
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/XML11Serializer.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/XML11Serializer.java Mon Jan 08 08:53:14 2018 -0800
@@ -74,7 +74,7 @@
* spaces at beginning of line will be stripped.
*
* @author <a href="mailto:arkin@intalio.com">Assaf Arkin</a>
- * @author <a href="mailto:rahul.srivastava@sun.com">Rahul Srivastava</a>
+ * @author Rahul Srivastava
* @author Elena Litani IBM
* @see Serializer
*
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/XMLSerializer.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize/XMLSerializer.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -84,7 +83,7 @@
* spaces at beginning of line will be stripped.
*
* @author <a href="mailto:arkin@intalio.com">Assaf Arkin</a>
- * @author <a href="mailto:rahul.srivastava@sun.com">Rahul Srivastava</a>
+ * @author Rahul Srivastava
* @author Elena Litani IBM
* @see Serializer
*
@@ -92,6 +91,8 @@
* is replaced by that of Xalan. Main class
* {@link com.sun.org.apache.xml.internal.serialize.DOMSerializerImpl} is replaced
* by {@link com.sun.org.apache.xml.internal.serializer.dom3.LSSerializerImpl}.
+ *
+ * @LastModified: Oct 2017
*/
@Deprecated
public class XMLSerializer
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/CharInfo.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/CharInfo.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -48,6 +47,7 @@
* DEVELOPERS: See Known Issue in the constructor.
*
* @xsl.usage internal
+ * @LastModified: Oct 2017
*/
final class CharInfo
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/EmptySerializer.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/EmptySerializer.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -43,6 +42,7 @@
* across package boundaries.
*
* @xsl.usage internal
+ * @LastModified: Oct 2017
*/
public class EmptySerializer implements SerializationHandler
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/Encodings.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/Encodings.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -49,6 +48,7 @@
* for each encoding.
*
* @author <a href="mailto:arkin@intalio.com">Assaf Arkin</a>
+ * @LastModified: Oct 2017
*/
public final class Encodings extends Object
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/NamespaceMappings.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/NamespaceMappings.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -61,6 +60,7 @@
* This class is public only because it is used by Xalan. It is not a public API
*
* @xsl.usage internal
+ * @LastModified: Nov 2017
*/
public class NamespaceMappings
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/OutputPropertiesFactory.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/OutputPropertiesFactory.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -80,6 +79,7 @@
* @see SerializerFactory
* @see Method
* @see Serializer
+ * @LastModified: Oct 2017
*/
public final class OutputPropertiesFactory
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/SerializerFactory.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/SerializerFactory.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -56,6 +55,7 @@
* @see OutputPropertiesFactory
* @see Method
* @see Serializer
+ * @LastModified: Oct 2017
*/
public final class SerializerFactory
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToSAXHandler.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToSAXHandler.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
* This class is not a public API.
*
* @xsl.usage internal
+ * @LastModified: Oct 2017
*/
public abstract class ToSAXHandler extends SerializerBase {
public ToSAXHandler() { }
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToStream.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToStream.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -53,6 +52,7 @@
* serializers (xml, html, text ...) that write output to a stream.
*
* @xsl.usage internal
+ * @LastModified: Nov 2017
*/
abstract public class ToStream extends SerializerBase {
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToUnknownStream.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/ToUnknownStream.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -49,6 +48,7 @@
*
* This class is not a public API, it is public because it is used within Xalan.
* @xsl.usage internal
+ * @LastModified: Oct 2017
*/
public final class ToUnknownStream extends SerializerBase
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/XSLOutputAttributes.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/XSLOutputAttributes.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -51,6 +50,7 @@
* This interface is only used internally within Xalan.
*
* @xsl.usage internal
+ * @LastModified: Oct 2017
*/
interface XSLOutputAttributes {
/**
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOM3TreeWalker.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOM3TreeWalker.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -63,6 +62,7 @@
* parameters and filters if any during serialization.
*
* @xsl.usage internal
+ * @LastModified: Oct 2017
*/
final class DOM3TreeWalker {
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOMStringListImpl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/DOMStringListImpl.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -31,6 +30,7 @@
* This class implemets the DOM Level 3 Core interface DOMStringList.
*
* @xsl.usage internal
+ * @LastModified: Oct 2017
*/
final class DOMStringListImpl implements DOMStringList {
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/NamespaceSupport.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/dom3/NamespaceSupport.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -36,6 +35,7 @@
* @author Andy Clark, IBM
*
* @version $Id: Exp $
+ * @LastModified: Oct 2017
*/
public class NamespaceSupport {
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/Messages.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/Messages.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -90,6 +89,7 @@
* used in com.sun.org.apache.xml.internal.serializer.
*
* @xsl.usage internal
+ * @LastModified: Sep 2017
*/
public final class Messages
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/URI.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/URI.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -62,6 +61,7 @@
* the class is no longer "public".
*
* @xsl.usage internal
+ * @LastModified: Oct 2017
*/
final class URI
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/DOMBuilder.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/DOMBuilder.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -40,6 +39,7 @@
* that SAX doesn't handle yet) and adds the result to a document
* or document fragment.
* @xsl.usage general
+ * @LastModified: Oct 2017
*/
public class DOMBuilder
implements ContentHandler, LexicalHandler
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/ObjectPool.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/ObjectPool.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -32,6 +31,7 @@
/**
* Pool of object of a given type to pick from to help memory usage
* @xsl.usage internal
+ * @LastModified: Oct 2017
*/
public class ObjectPool implements java.io.Serializable
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/QName.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/QName.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -39,6 +38,7 @@
* is used as the name of the object. The default namespace is not used for
* unprefixed names."
* @xsl.usage general
+ * @LastModified: Oct 2017
*/
public class QName implements java.io.Serializable
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StringComparable.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StringComparable.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -30,6 +29,7 @@
/**
* International friendly string comparison with case-order
* @author Igor Hersht, igorh@ca.ibm.com
+ * @LastModified: Oct 2017
*/
public class StringComparable implements Comparable<StringComparable> {
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StylesheetPIHandler.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/StylesheetPIHandler.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,8 @@
* Search for the xml-stylesheet processing instructions in an XML document.
* @see <a href="http://www.w3.org/TR/xml-stylesheet/">
* Associating Style Sheets with XML documents, Version 1.0</a>
+ *
+ * @LastModified: Oct 2017
*/
public class StylesheetPIHandler extends DefaultHandler
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/URI.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/URI.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -58,6 +57,7 @@
* grammar and basic set of operations that can be applied to a URI.
*
*
+ * @LastModified: Oct 2017
*/
public class URI implements Serializable
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLReaderManager.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/XMLReaderManager.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -42,6 +41,8 @@
/**
* Creates XMLReader objects and caches them for re-use.
* This class follows the singleton pattern.
+ *
+ * @LastModified: Sep 2017
*/
@SuppressWarnings("deprecation") //org.xml.sax.helpers.XMLReaderFactory
public class XMLReaderManager {
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/Expression.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/Expression.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -42,6 +41,8 @@
* construction has completed. An exception to the immutibility rule is iterators
* and walkers, which must be cloned in order to be used -- the original must
* still be immutable.
+ *
+ * @LastModified: Oct 2017
*/
public abstract class Expression implements java.io.Serializable, ExpressionNode, XPathVisitable
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/ExtensionsProvider.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/ExtensionsProvider.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -29,6 +28,7 @@
* Interface that XPath objects can call to obtain access to an
* ExtensionsTable.
*
+ * @LastModified: Oct 2017
*/
public interface ExtensionsProvider
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/NodeSet.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/NodeSet.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -56,6 +55,7 @@
* to the same calls; the disadvantage is that some of them may return
* less-than-enlightening results when you do so.</p>
* @xsl.usage advanced
+ * @LastModified: Nov 2017
*/
public class NodeSet
implements NodeList, NodeIterator, Cloneable, ContextNodeList
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/SourceTreeManager.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/SourceTreeManager.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -39,6 +38,8 @@
* This class bottlenecks all management of source trees. The methods
* in this class should allow easy garbage collection of source
* trees (not yet!), and should centralize parsing for those source trees.
+ *
+ * @LastModified: Oct 2017
*/
@SuppressWarnings("deprecation")
public class SourceTreeManager
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/VariableStack.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/VariableStack.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -34,6 +33,7 @@
* <p>This has been changed from the previous incarnations of this
* class to be fairly low level.</p>
* @xsl.usage internal
+ * @LastModified: Nov 2017
*/
public class VariableStack implements Cloneable
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPath.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPath.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -41,6 +40,7 @@
* The XPath class wraps an expression object and provides general services
* for execution of that expression.
* @xsl.usage advanced
+ * @LastModified: Oct 2017
*/
public class XPath implements Serializable, ExpressionOwner
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathContext.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathContext.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -57,6 +56,7 @@
*
* <p>This class extends DTMManager but does not directly implement it.</p>
* @xsl.usage advanced
+ * @LastModified: Oct 2017
*/
public class XPathContext extends DTMManager // implements ExpressionContext
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathException.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/XPathException.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -32,6 +31,7 @@
* all the traces of the nested exceptions, not just the trace
* of this object.
* @xsl.usage general
+ * @LastModified: Oct 2017
*/
public class XPathException extends TransformerException
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/AxesWalker.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/AxesWalker.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,8 @@
/**
* Serves as common interface for axes Walkers, and stores common
* state variables.
+ *
+ * @LastModified: Oct 2017
*/
public class AxesWalker extends PredicatedNodeTest
implements Cloneable, PathComponent, ExpressionOwner
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/FilterExprIterator.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/FilterExprIterator.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -29,6 +28,9 @@
import com.sun.org.apache.xpath.internal.objects.XNodeSet;
import java.util.List;
+/**
+ * @LastModified: Oct 2017
+ */
public class FilterExprIterator extends BasicTestIterator
{
static final long serialVersionUID = 2552176105165737614L;
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/FilterExprIteratorSimple.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/FilterExprIteratorSimple.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,8 @@
/**
* Class to use for one-step iteration that doesn't have a predicate, and
* doesn't need to set the context.
+ *
+ * @LastModified: Oct 2017
*/
public class FilterExprIteratorSimple extends LocPathIterator
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/FilterExprWalker.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/FilterExprWalker.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -38,6 +37,7 @@
* Walker for the OP_VARIABLE, or OP_EXTFUNCTION, or OP_FUNCTION, or OP_GROUP,
* op codes.
* @see <a href="http://www.w3.org/TR/xpath#NT-FilterExpr">XPath FilterExpr descriptions</a>
+ * @LastModified: Oct 2017
*/
public class FilterExprWalker extends AxesWalker
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/IteratorPool.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/IteratorPool.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -29,6 +28,7 @@
/**
* Pool of object of a given type to pick from to help memory usage
* @xsl.usage internal
+ * @LastModified: Oct 2017
*/
public final class IteratorPool implements java.io.Serializable
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/LocPathIterator.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/LocPathIterator.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -46,6 +45,7 @@
* the case where the LocPathIterator is "owned" by a UnionPathIterator,
* in which case the UnionPathIterator will cache the nodes.</p>
* @xsl.usage advanced
+ * @LastModified: Nov 2017
*/
public abstract class LocPathIterator extends PredicatedNodeTest
implements Cloneable, DTMIterator, java.io.Serializable, PathComponent
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/MatchPatternIterator.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/MatchPatternIterator.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -39,6 +38,8 @@
* traversal against the LocationPath interpreted as a match pattern. This
* class is useful to find nodes in document order that are complex paths
* whose steps probably criss-cross each other.
+ *
+ * @LastModified: Oct 2017
*/
public class MatchPatternIterator extends LocPathIterator
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/NodeSequence.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/NodeSequence.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -35,6 +34,8 @@
/**
* This class is the dynamic wrapper for a Xalan DTMIterator instance, and
* provides random access capabilities.
+ *
+ * @LastModified: Oct 2017
*/
public class NodeSequence extends XObject
implements DTMIterator, Cloneable, PathComponent
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/PredicatedNodeTest.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/PredicatedNodeTest.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -34,6 +33,9 @@
import com.sun.org.apache.xpath.internal.patterns.NodeTest;
import java.util.List;
+/**
+ * @LastModified: Oct 2017
+ */
public abstract class PredicatedNodeTest extends NodeTest implements SubContextList
{
static final long serialVersionUID = -6193530757296377351L;
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/UnionChildIterator.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/UnionChildIterator.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -32,6 +31,8 @@
* This class defines a simplified type of union iterator that only
* tests along the child axes. If the conditions are right, it is
* much faster than using a UnionPathIterator.
+ *
+ * @LastModified: Oct 2017
*/
public class UnionChildIterator extends ChildTestIterator
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/UnionPathIterator.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/UnionPathIterator.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -40,6 +39,7 @@
* As each node is iterated via nextNode(), the node is also stored
* in the NodeVector, so that previousNode() can easily be done.
* @xsl.usage advanced
+ * @LastModified: Oct 2017
*/
public class UnionPathIterator extends LocPathIterator
implements Cloneable, DTMIterator, java.io.Serializable, PathComponent
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/WalkerFactory.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/WalkerFactory.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -41,6 +40,8 @@
* This class is both a factory for XPath location path expressions,
* which are built from the opcode map output, and an analysis engine
* for the location path expressions in order to provide optimization hints.
+ *
+ * @LastModified: Oct 2017
*/
public class WalkerFactory
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/WalkingIterator.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/WalkingIterator.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -34,6 +33,8 @@
/**
* Location path iterator that uses Walkers.
+ *
+ * @LastModified: Oct 2017
*/
public class WalkingIterator extends LocPathIterator implements ExpressionOwner
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/WalkingIteratorSorted.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/axes/WalkingIteratorSorted.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -30,6 +29,7 @@
/**
* This class iterates over set of nodes that needs to be sorted.
* @xsl.usage internal
+ * @LastModified: Oct 2017
*/
public class WalkingIteratorSorted extends WalkingIterator
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/FunctionTable.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/FunctionTable.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/**
* Licensed to the Apache Software Foundation (ASF) under one
@@ -31,6 +30,8 @@
/**
* The function table for XPath.
+ *
+ * @LastModified: Oct 2017
*/
public class FunctionTable
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/Lexer.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/Lexer.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -28,6 +27,8 @@
/**
* This class is in charge of lexical processing of the XPath
* expression into tokens.
+ *
+ * @LastModified: Nov 2017
*/
class Lexer
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/OpMap.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/OpMap.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -29,6 +28,8 @@
/**
* This class represents the data structure basics of the XPath
* object.
+ *
+ * @LastModified: Nov 2017
*/
public class OpMap
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncCurrent.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncCurrent.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -38,6 +37,7 @@
/**
* Execute the current() function.
* @xsl.usage advanced
+ * @LastModified: Oct 2017
*/
public class FuncCurrent extends Function
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncExtFunction.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncExtFunction.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -41,6 +40,7 @@
* the expression executes, it calls ExtensionsTable#extFunction, and then
* converts the result to the appropriate XObject.
* @xsl.usage advanced
+ * @LastModified: Oct 2017
*/
public class FuncExtFunction extends Function
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncFalse.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncFalse.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -30,6 +29,7 @@
/**
* Execute the False() function.
* @xsl.usage advanced
+ * @LastModified: Oct 2017
*/
public class FuncFalse extends Function
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncHere.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncHere.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/**
* Licensed to the Apache Software Foundation (ASF) under one
@@ -36,6 +35,8 @@
/**
* Execute the XML Signature here() function.
+ *
+ * @LastModified: Oct 2017
*/
public final class FuncHere extends Function {
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncLast.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncLast.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -34,6 +33,7 @@
/**
* Execute the Last() function.
* @xsl.usage advanced
+ * @LastModified: Oct 2017
*/
public class FuncLast extends Function
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncPosition.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncPosition.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -34,6 +33,7 @@
/**
* Execute the Position() function.
* @xsl.usage advanced
+ * @LastModified: Oct 2017
*/
public class FuncPosition extends Function
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncSystemProperty.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncSystemProperty.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Sep 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -33,6 +32,7 @@
/**
* Execute the SystemProperty() function.
* @xsl.usage advanced
+ * @LastModified: Sep 2017
*/
public class FuncSystemProperty extends FunctionOneArg
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncTrue.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncTrue.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -30,6 +29,7 @@
/**
* Execute the True() function.
* @xsl.usage advanced
+ * @LastModified: Oct 2017
*/
public class FuncTrue extends Function
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/Function2Args.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/Function2Args.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +30,7 @@
/**
* Base class for functions that accept two arguments.
* @xsl.usage advanced
+ * @LastModified: Oct 2017
*/
public class Function2Args extends FunctionOneArg
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/Function3Args.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/Function3Args.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +30,7 @@
/**
* Base class for functions that accept three arguments.
* @xsl.usage advanced
+ * @LastModified: Oct 2017
*/
public class Function3Args extends Function2Args
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FunctionMultiArgs.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FunctionMultiArgs.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -33,6 +32,7 @@
* Base class for functions that accept an undetermined number of multiple
* arguments.
* @xsl.usage advanced
+ * @LastModified: Oct 2017
*/
public class FunctionMultiArgs extends Function3Args
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FunctionOneArg.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FunctionOneArg.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +30,7 @@
/**
* Base class for functions that accept one argument.
* @xsl.usage advanced
+ * @LastModified: Oct 2017
*/
public class FunctionOneArg extends Function implements ExpressionOwner
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/JAXPExtensionsProvider.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/JAXPExtensionsProvider.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Nov 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -37,7 +36,8 @@
/**
*
- * @author Ramesh Mandava ( ramesh.mandava@sun.com )
+ * @author Ramesh Mandava
+ * @LastModified: Nov 2017
*/
public class JAXPExtensionsProvider implements ExtensionsProvider {
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/JAXPVariableStack.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/jaxp/JAXPVariableStack.java Mon Jan 08 08:53:14 2018 -0800
@@ -37,7 +37,7 @@
* Overrides {@link VariableStack} and delegates the call to
* {@link javax.xml.xpath.XPathVariableResolver}.
*
- * @author Ramesh Mandava ( ramesh.mandava@sun.com )
+ * @author Ramesh Mandava
*/
public class JAXPVariableStack extends VariableStack {
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XNodeSet.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XNodeSet.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -36,6 +35,7 @@
* This class represents an XPath nodeset object, and is capable of
* converting the nodeset to other types, such as a string.
* @xsl.usage general
+ * @LastModified: Oct 2017
*/
public class XNodeSet extends NodeSequence
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XObject.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XObject.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -45,6 +44,7 @@
* This class acts as the base class to other XPath type objects,
* such as XString, and provides polymorphic casting capabilities.
* @xsl.usage general
+ * @LastModified: Oct 2017
*/
public class XObject extends Expression implements Serializable, Cloneable
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XRTreeFragSelectWrapper.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/objects/XRTreeFragSelectWrapper.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -32,6 +31,8 @@
/**
* This class makes an select statement act like an result tree fragment.
+ *
+ * @LastModified: Oct 2017
*/
public class XRTreeFragSelectWrapper extends XRTreeFrag implements Cloneable
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Operation.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Operation.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +30,8 @@
/**
* The baseclass for a binary operation.
+ *
+ * @LastModified: Oct 2017
*/
public class Operation extends Expression implements ExpressionOwner
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/UnaryOperation.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/UnaryOperation.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +30,8 @@
/**
* The unary operation base class.
+ *
+ * @LastModified: Oct 2017
*/
public abstract class UnaryOperation extends Expression implements ExpressionOwner
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Variable.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/operations/Variable.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -38,6 +37,8 @@
/**
* The variable reference expression executer.
+ *
+ * @LastModified: Oct 2017
*/
public class Variable extends Expression implements PathComponent
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/ContextMatchStepPattern.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/ContextMatchStepPattern.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -30,6 +29,8 @@
import com.sun.org.apache.xpath.internal.objects.XObject;
/**
* Special context node pattern matcher.
+ *
+ * @LastModified: Oct 2017
*/
public class ContextMatchStepPattern extends StepPattern
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/FunctionPattern.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/FunctionPattern.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -35,6 +34,7 @@
/**
* Match pattern step that contains a function.
* @xsl.usage advanced
+ * @LastModified: Oct 2017
*/
public class FunctionPattern extends StepPattern
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/NodeTest.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/NodeTest.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -38,6 +37,7 @@
* This is the basic node test class for both match patterns and location path
* steps.
* @xsl.usage advanced
+ * @LastModified: Oct 2017
*/
public class NodeTest extends Expression
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/StepPattern.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/StepPattern.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -38,6 +37,7 @@
/**
* This class represents a single pattern match step.
* @xsl.usage advanced
+ * @LastModified: Oct 2017
*/
public class StepPattern extends NodeTest implements SubContextList, ExpressionOwner
{
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/UnionPattern.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/patterns/UnionPattern.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * @LastModified: Oct 2017
*/
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -33,6 +32,7 @@
* This class represents a union pattern, which can have multiple individual
* StepPattern patterns.
* @xsl.usage advanced
+ * @LastModified: Oct 2017
*/
public class UnionPattern extends Expression
{
--- a/src/java.xml/share/classes/com/sun/xml/internal/stream/XMLBufferListener.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/xml/internal/stream/XMLBufferListener.java Mon Jan 08 08:53:14 2018 -0800
@@ -29,8 +29,8 @@
* XMLBufferListerner should be implemented by classes which wish to receive
* call backs from XMLEntityReader.
*
- * @author k.venugopal@sun.com,
- * @author Neeraj.bajaj@sun.com
+ * @author k venugopal,
+ * @author Neeraj bajaj
*/
public interface XMLBufferListener {
--- a/src/java.xml/share/classes/com/sun/xml/internal/stream/XMLOutputFactoryImpl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/xml/internal/stream/XMLOutputFactoryImpl.java Mon Jan 08 08:53:14 2018 -0800
@@ -48,7 +48,7 @@
* This class provides the implementation of XMLOutputFactory.
*
* @author Neeraj Bajaj,
- * @author k.venugopal@sun.com
+ * @author k venugopal
*/
public class XMLOutputFactoryImpl extends XMLOutputFactory {
--- a/src/java.xml/share/classes/com/sun/xml/internal/stream/events/LocationImpl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/xml/internal/stream/events/LocationImpl.java Mon Jan 08 08:53:14 2018 -0800
@@ -30,7 +30,7 @@
/**
*Implementation of Location interface to be used by
*event readers.
- *@author Neeraj.bajaj@sun.com,k.venugopal@sun.com
+ *@author Neeraj bajaj,k venugopal
*/
public class LocationImpl implements Location{
String systemId;
--- a/src/java.xml/share/classes/com/sun/xml/internal/stream/events/NamespaceImpl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/xml/internal/stream/events/NamespaceImpl.java Mon Jan 08 08:53:14 2018 -0800
@@ -32,7 +32,7 @@
import javax.xml.XMLConstants;
/**
*
- * @author Neeraj Bajaj,K.Venugopal@sun.com Sun Microsystems.
+ * @author Neeraj Bajaj,K Venugopal
*/
public class NamespaceImpl extends AttributeImpl implements Namespace{
--- a/src/java.xml/share/classes/com/sun/xml/internal/stream/events/NotationDeclarationImpl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/xml/internal/stream/events/NotationDeclarationImpl.java Mon Jan 08 08:53:14 2018 -0800
@@ -32,7 +32,7 @@
/**
* Implementation of NotationDeclaration event.
*
- * @author k.venugopal@sun.com
+ * @author k venugopal
*/
public class NotationDeclarationImpl extends DummyEvent implements NotationDeclaration {
--- a/src/java.xml/share/classes/com/sun/xml/internal/stream/events/XMLEventAllocatorImpl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/xml/internal/stream/events/XMLEventAllocatorImpl.java Mon Jan 08 08:53:14 2018 -0800
@@ -38,7 +38,7 @@
/**
* Implementation of XMLEvent Allocator.
*
- * @author Neeraj.bajaj@sun.com, k.venugopal@sun.com
+ * @author Neeraj bajaj, k venugopal
*/
public class XMLEventAllocatorImpl implements XMLEventAllocator {
--- a/src/java.xml/share/classes/com/sun/xml/internal/stream/events/XMLEventFactoryImpl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/xml/internal/stream/events/XMLEventFactoryImpl.java Mon Jan 08 08:53:14 2018 -0800
@@ -42,7 +42,7 @@
/**
*
- * @author Neeraj Bajaj, k.venugopal@sun.com
+ * @author Neeraj Bajaj, k venugopal
*/
public class XMLEventFactoryImpl extends XMLEventFactory {
--- a/src/java.xml/share/classes/com/sun/xml/internal/stream/util/BufferAllocator.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/xml/internal/stream/util/BufferAllocator.java Mon Jan 08 08:53:14 2018 -0800
@@ -31,8 +31,8 @@
* Buffer allocator for buffers of sizes 128 B, 2 KB and 8 KB. Includes
* methods for allocating and freeing buffers.
*
- * @author Binu.John@sun.com
- * @author Santiago.PericasGeertsen@sun.com
+ * @author Binu John
+ * @author Santiago PericasGeertsen
*/
public class BufferAllocator {
private static final int SMALL_SIZE_LIMIT = 128;
--- a/src/java.xml/share/classes/com/sun/xml/internal/stream/util/ThreadLocalBufferAllocator.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/xml/internal/stream/util/ThreadLocalBufferAllocator.java Mon Jan 08 08:53:14 2018 -0800
@@ -35,8 +35,8 @@
* The local storage is activated on the return of the buffer.
* The buffer returns null if it is already allocated.
*
- * @author Binu.John@sun.com
- * @author Santiago.PericasGeertsen@sun.com
+ * @author Binu John
+ * @author Santiago PericasGeertsen
*/
public class ThreadLocalBufferAllocator {
private static ThreadLocal<SoftReference<BufferAllocator>> tlba = new ThreadLocal<>();
--- a/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/UTF8OutputStreamWriter.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/UTF8OutputStreamWriter.java Mon Jan 08 08:53:14 2018 -0800
@@ -42,7 +42,7 @@
* of <code>java.io.BufferedWriter</code> has been shown to be very
* expensive in JAX-WS.</p>
*
- * @author Santiago.PericasGeertsen@sun.com
+ * @author Santiago PericasGeertsen
*/
public final class UTF8OutputStreamWriter extends Writer {
--- a/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLDOMWriterImpl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLDOMWriterImpl.java Mon Jan 08 08:53:14 2018 -0800
@@ -47,7 +47,7 @@
/**
* This class provides support to build a DOM tree using XMLStreamWriter API's.
- * @author K.Venugopal@sun.com
+ * @author K Venugopal
*/
/*
--- a/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLStreamWriterImpl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/com/sun/xml/internal/stream/writers/XMLStreamWriterImpl.java Mon Jan 08 08:53:14 2018 -0800
@@ -64,8 +64,8 @@
*
* @author Neeraj Bajaj
* @author K.Venugopal
- * @author Santiago.Pericas-Geertsen@sun.com
- * @author Sunitha.Reddy@sun.com
+ * @author Santiago Pericas-Geertsen
+ * @author Sunitha Reddy
*/
public final class XMLStreamWriterImpl extends AbstractMap<Object, Object>
implements XMLStreamWriterBase {
@@ -2041,7 +2041,6 @@
* we dont need to set the value for every end element we encouter.
* For Well formedness checks we can have the same QName object that was pushed.
* the values will be set only if application need to know about the endElement
- * -- neeraj.bajaj@sun.com
*/
public ElementState peek() {
return fElements[fDepth - 1];
--- a/src/java.xml/share/classes/javax/xml/XMLConstants.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/javax/xml/XMLConstants.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, 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
@@ -28,13 +28,12 @@
/**
* <p>Utility class to contain basic XML values as constants.
*
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Jeff Suttor
* @see <a href="http://www.w3.org/TR/xml11/">Extensible Markup Language (XML) 1.1</a>
* @see <a href="http://www.w3.org/TR/REC-xml">Extensible Markup Language (XML) 1.0 (Second Edition)</a>
* @see <a href="http://www.w3.org/XML/xml-V10-2e-errata">XML 1.0 Second Edition Specification Errata</a>
* @see <a href="http://www.w3.org/TR/xml-names11/">Namespaces in XML 1.1</a>
* @see <a href="http://www.w3.org/TR/REC-xml-names">Namespaces in XML</a>
- * @see <a href="http://www.w3.org/XML/xml-names-19990114-errata">Namespaces in XML Errata</a>
* @see <a href="http://www.w3.org/TR/xmlschema-1/">XML Schema Part 1: Structures</a>
* @since 1.5
**/
@@ -103,9 +102,6 @@
* @see <a
* href="http://www.w3.org/TR/REC-xml-names/#ns-qualnames">
* Namespaces in XML, 3. Qualified Names</a>
- * @see <a
- * href="http://www.w3.org/XML/xml-names-19990114-errata">
- * Namespaces in XML Errata</a>
*/
public static final String XMLNS_ATTRIBUTE_NS_URI =
"http://www.w3.org/2000/xmlns/";
--- a/src/java.xml/share/classes/javax/xml/datatype/DatatypeConfigurationException.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/javax/xml/datatype/DatatypeConfigurationException.java Mon Jan 08 08:53:14 2018 -0800
@@ -28,7 +28,7 @@
/**
* <p>Indicates a serious configuration error.</p>
*
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Jeff Suttor
* @since 1.5
*/
--- a/src/java.xml/share/classes/javax/xml/datatype/DatatypeConstants.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/javax/xml/datatype/DatatypeConstants.java Mon Jan 08 08:53:14 2018 -0800
@@ -31,7 +31,7 @@
/**
* <p>Utility class to contain basic Datatype values as constants.</p>
*
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Jeff Suttor
* @since 1.5
*/
--- a/src/java.xml/share/classes/javax/xml/datatype/DatatypeFactory.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/javax/xml/datatype/DatatypeFactory.java Mon Jan 08 08:53:14 2018 -0800
@@ -80,9 +80,9 @@
* </li>
* </ol>
*
- * @author <a href="mailto:Joseph.Fialli@Sun.COM">Joseph Fialli</a>
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
- * @author <a href="mailto:Neeraj.Bajaj@sun.com">Neeraj Bajaj</a>
+ * @author Joseph Fialli
+ * @author Jeff Suttor
+ * @author Neeraj Bajaj
*
* @since 1.5
*/
--- a/src/java.xml/share/classes/javax/xml/datatype/Duration.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/javax/xml/datatype/Duration.java Mon Jan 08 08:53:14 2018 -0800
@@ -89,10 +89,10 @@
* some of the methods may not work correctly on such {@code Duration}s.
* The impacted methods document their dependency on {@link Calendar}.
*
- * @author <a href="mailto:Joseph.Fialli@Sun.COM">Joseph Fialli</a>
- * @author <a href="mailto:Kohsuke.Kawaguchi@Sun.com">Kohsuke Kawaguchi</a>
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
- * @author <a href="mailto:Sunitha.Reddy@Sun.com">Sunitha Reddy</a>
+ * @author Joseph Fialli
+ * @author Kohsuke Kawaguchi
+ * @author Jeff Suttor
+ * @author Sunitha Reddy
* @see XMLGregorianCalendar#add(Duration)
* @since 1.5
*/
--- a/src/java.xml/share/classes/javax/xml/datatype/FactoryFinder.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/javax/xml/datatype/FactoryFinder.java Mon Jan 08 08:53:14 2018 -0800
@@ -41,7 +41,7 @@
* <p>This class is duplicated for each JAXP subpackage so keep it in
* sync. It is package private for secure class loading.</p>
*
- * @author Santiago.PericasGeertsen@sun.com
+ * @author Santiago PericasGeertsen
*/
class FactoryFinder {
private static final String DEFAULT_PACKAGE = "com.sun.org.apache.xerces.internal";
--- a/src/java.xml/share/classes/javax/xml/datatype/XMLGregorianCalendar.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/javax/xml/datatype/XMLGregorianCalendar.java Mon Jan 08 08:53:14 2018 -0800
@@ -165,10 +165,10 @@
* </li>
* </ul>
*
- * @author <a href="mailto:Joseph.Fialli@Sun.com">Joseph Fialli</a>
- * @author <a href="mailto:Kohsuke.Kawaguchi@Sun.com">Kohsuke Kawaguchi</a>
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
- * @author <a href="mailto:Sunitha.Reddy@Sun.com">Sunitha Reddy</a>
+ * @author Joseph Fialli
+ * @author Kohsuke Kawaguchi
+ * @author Jeff Suttor
+ * @author Sunitha Reddy
* @see Duration
* @see DatatypeFactory
* @since 1.5
--- a/src/java.xml/share/classes/javax/xml/datatype/package-info.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/javax/xml/datatype/package-info.java Mon Jan 08 08:53:14 2018 -0800
@@ -149,7 +149,7 @@
* <li>xs:unsignedShort</li>
* </ul>
*
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Jeff Suttor
* @see <a href="http://www.w3.org/TR/xmlschema-2/#dateTime">
* W3C XML Schema 1.0 Part 2, Section 3.2.7-14</a>
* @see <a href="http://www.w3.org/TR/xpath-datamodel#dt-dayTimeDuration">
--- a/src/java.xml/share/classes/javax/xml/namespace/NamespaceContext.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/javax/xml/namespace/NamespaceContext.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, 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
@@ -67,15 +67,13 @@
* <p>A prefix can only be bound to a <strong>single</strong>
* Namespace URI in the current scope.
*
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Jeff Suttor
* @see javax.xml.XMLConstants
* javax.xml.XMLConstants for declarations of common XML values
* @see <a href="http://www.w3.org/TR/xmlschema-2/#QName">
* XML Schema Part2: Datatypes</a>
- * @see <a href="http://www.w3.org/TR/REC-xml-names/#ns-qualnames">
+ * @see <a href="http://www.w3.org/TR/REC-xml-names/">
* Namespaces in XML</a>
- * @see <a href="http://www.w3.org/XML/xml-names-19990114-errata">
- * Namespaces in XML Errata</a>
* @since 1.5
*/
--- a/src/java.xml/share/classes/javax/xml/namespace/QName.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/javax/xml/namespace/QName.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, 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
@@ -35,9 +35,7 @@
* href="http://www.w3.org/TR/xmlschema-2/#QName">XML Schema Part2:
* Datatypes specification</a>, <a
* href="http://www.w3.org/TR/REC-xml-names/#ns-qualnames">Namespaces
- * in XML</a>, <a
- * href="http://www.w3.org/XML/xml-names-19990114-errata">Namespaces
- * in XML Errata</a>.</p>
+ * in XML</a>.
*
* <p>The value of a <code>QName</code> contains a <strong>Namespace
* URI</strong>, <strong>local part</strong> and
@@ -59,13 +57,11 @@
*
* <p><code>QName</code> is immutable.</p>
*
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Jeff Suttor
* @see <a href="http://www.w3.org/TR/xmlschema-2/#QName">
* XML Schema Part2: Datatypes specification</a>
* @see <a href="http://www.w3.org/TR/REC-xml-names/#ns-qualnames">
* Namespaces in XML</a>
- * @see <a href="http://www.w3.org/XML/xml-names-19990114-errata">
- * Namespaces in XML Errata</a>
* @since 1.5
*/
--- a/src/java.xml/share/classes/javax/xml/parsers/DocumentBuilder.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/javax/xml/parsers/DocumentBuilder.java Mon Jan 08 08:53:14 2018 -0800
@@ -56,7 +56,7 @@
* <code>Document</code>. It merely requires that the implementation
* communicate with the application using these existing APIs.
*
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Jeff Suttor
* @since 1.4
*/
--- a/src/java.xml/share/classes/javax/xml/parsers/DocumentBuilderFactory.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/javax/xml/parsers/DocumentBuilderFactory.java Mon Jan 08 08:53:14 2018 -0800
@@ -32,8 +32,8 @@
* Defines a factory API that enables applications to obtain a
* parser that produces DOM object trees from XML documents.
*
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
- * @author <a href="mailto:Neeraj.Bajaj@sun.com">Neeraj Bajaj</a>
+ * @author Jeff Suttor
+ * @author Neeraj Bajaj
*
* @since 1.4
*/
--- a/src/java.xml/share/classes/javax/xml/parsers/FactoryConfigurationError.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/javax/xml/parsers/FactoryConfigurationError.java Mon Jan 08 08:53:14 2018 -0800
@@ -31,7 +31,7 @@
* parser factory specified in the system properties cannot be found
* or instantiated.
*
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Jeff Suttor
* @since 1.4
*/
--- a/src/java.xml/share/classes/javax/xml/parsers/FactoryFinder.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/javax/xml/parsers/FactoryFinder.java Mon Jan 08 08:53:14 2018 -0800
@@ -41,8 +41,7 @@
* <p>This class is duplicated for each JAXP subpackage so keep it in
* sync. It is package private for secure class loading.</p>
*
- * @author Santiago.PericasGeertsen@sun.com
- * @author Huizhe.Wang@oracle.com
+ * @author Santiago PericasGeertsen
*/
class FactoryFinder {
private static final String DEFAULT_PACKAGE = "com.sun.org.apache.xerces.internal";
--- a/src/java.xml/share/classes/javax/xml/parsers/ParserConfigurationException.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/javax/xml/parsers/ParserConfigurationException.java Mon Jan 08 08:53:14 2018 -0800
@@ -28,7 +28,7 @@
/**
* Indicates a serious configuration error.
*
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Jeff Suttor
* @since 1.4
*/
--- a/src/java.xml/share/classes/javax/xml/parsers/SAXParser.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/javax/xml/parsers/SAXParser.java Mon Jan 08 08:53:14 2018 -0800
@@ -74,7 +74,7 @@
* class to initially adapt their SAX1 implementation to work under
* this revised class.
*
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Jeff Suttor
* @since 1.4
*/
@SuppressWarnings("deprecation")
--- a/src/java.xml/share/classes/javax/xml/parsers/SAXParserFactory.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/javax/xml/parsers/SAXParserFactory.java Mon Jan 08 08:53:14 2018 -0800
@@ -35,8 +35,8 @@
* Defines a factory API that enables applications to configure and
* obtain a SAX based parser to parse XML documents.
*
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
- * @author <a href="mailto:Neeraj.Bajaj@sun.com">Neeraj Bajaj</a>
+ * @author Jeff Suttor
+ * @author Neeraj Bajaj
*
* @since 1.4
*/
--- a/src/java.xml/share/classes/javax/xml/stream/FactoryFinder.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/javax/xml/stream/FactoryFinder.java Mon Jan 08 08:53:14 2018 -0800
@@ -41,7 +41,7 @@
* <p>This class is duplicated for each JAXP subpackage so keep it in
* sync. It is package private for secure class loading.</p>
*
- * @author Santiago.PericasGeertsen@sun.com
+ * @author Santiago PericasGeertsen
*/
class FactoryFinder {
// Check we have access to package.
--- a/src/java.xml/share/classes/javax/xml/transform/FactoryFinder.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/javax/xml/transform/FactoryFinder.java Mon Jan 08 08:53:14 2018 -0800
@@ -43,8 +43,7 @@
* <p>This class is duplicated for each JAXP subpackage so keep it in
* sync. It is package private for secure class loading.</p>
*
- * @author Santiago.PericasGeertsen@sun.com
- * @author Huizhe.Wang@oracle.com
+ * @author Santiago PericasGeertsen
*/
class FactoryFinder {
private static final String DEFAULT_PACKAGE = "com.sun.org.apache.xalan.internal.";
--- a/src/java.xml/share/classes/javax/xml/transform/Result.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/javax/xml/transform/Result.java Mon Jan 08 08:53:14 2018 -0800
@@ -29,7 +29,7 @@
* <p>An object that implements this interface contains the information
* needed to build a transformation result tree.
*
- * @author <a href="Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Jeff Suttor
* @since 1.4
*/
public interface Result {
--- a/src/java.xml/share/classes/javax/xml/transform/Transformer.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/javax/xml/transform/Transformer.java Mon Jan 08 08:53:14 2018 -0800
@@ -44,7 +44,7 @@
* <p>A <code>Transformer</code> may be used multiple times. Parameters and
* output properties are preserved across transformations.</p>
*
- * @author <a href="Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Jeff Suttor
* @since 1.4
*/
public abstract class Transformer {
--- a/src/java.xml/share/classes/javax/xml/transform/TransformerFactory.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/javax/xml/transform/TransformerFactory.java Mon Jan 08 08:53:14 2018 -0800
@@ -38,8 +38,8 @@
* {@code TransformerFactory} abstract class. If the property is not
* defined, a platform default is be used.
*
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
- * @author <a href="mailto:Neeraj.Bajaj@sun.com">Neeraj Bajaj</a>
+ * @author Jeff Suttor
+ * @author Neeraj Bajaj
*
* @since 1.5
*/
--- a/src/java.xml/share/classes/javax/xml/transform/dom/DOMResult.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/javax/xml/transform/dom/DOMResult.java Mon Jan 08 08:53:14 2018 -0800
@@ -36,7 +36,7 @@
* a Document node as the holder for the result of the transformation,
* which may be retrieved with {@link #getNode()}.
*
- * @author <a href="Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Jeff Suttor
* @since 1.4
*/
public class DOMResult implements Result {
--- a/src/java.xml/share/classes/javax/xml/transform/dom/DOMSource.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/javax/xml/transform/dom/DOMSource.java Mon Jan 08 08:53:14 2018 -0800
@@ -38,7 +38,7 @@
* Parsers can be made namespace aware by calling
* {@link javax.xml.parsers.DocumentBuilderFactory#setNamespaceAware(boolean awareness)}.</p>
*
- * @author <a href="Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Jeff Suttor
* @see <a href="http://www.w3.org/TR/DOM-Level-2">Document Object Model (DOM) Level 2 Specification</a>
* @since 1.4
*/
--- a/src/java.xml/share/classes/javax/xml/transform/overview.html Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/javax/xml/transform/overview.html Mon Jan 08 08:53:14 2018 -0800
@@ -36,7 +36,7 @@
<meta name="CVS"
content="$Id: overview.html,v 1.2 2005/06/10 03:50:39 jeffsuttor Exp $" />
<meta name="AUTHOR"
- content="Jeff.Suttor@Sun.com" />
+ content="Jeff Suttor" />
</head>
<body>
--- a/src/java.xml/share/classes/javax/xml/transform/sax/SAXResult.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/javax/xml/transform/sax/SAXResult.java Mon Jan 08 08:53:14 2018 -0800
@@ -33,7 +33,7 @@
/**
* <p>Acts as an holder for a transformation Result.</p>
*
- * @author <a href="Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Jeff Suttor
* @since 1.4
*/
public class SAXResult implements Result {
--- a/src/java.xml/share/classes/javax/xml/transform/sax/SAXSource.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/javax/xml/transform/sax/SAXSource.java Mon Jan 08 08:53:14 2018 -0800
@@ -40,7 +40,7 @@
* Parsers can be made namespace aware by calling the
* {@link javax.xml.parsers.SAXParserFactory#setNamespaceAware(boolean awareness)} method.</p>
*
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Jeff Suttor
* @since 1.4
*/
public class SAXSource implements Source {
--- a/src/java.xml/share/classes/javax/xml/transform/stax/StAXResult.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/javax/xml/transform/stax/StAXResult.java Mon Jan 08 08:53:14 2018 -0800
@@ -38,8 +38,8 @@
* {@link javax.xml.validation.Validator} which accept
* <code>Result</code> as input.
*
- * @author <a href="mailto:Neeraj.Bajaj@Sun.com">Neeraj Bajaj</a>
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Neeraj Bajaj
+ * @author Jeff Suttor
*
* @see <a href="http://jcp.org/en/jsr/detail?id=173">
* JSR 173: Streaming API for XML</a>
--- a/src/java.xml/share/classes/javax/xml/transform/stax/StAXSource.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/javax/xml/transform/stax/StAXSource.java Mon Jan 08 08:53:14 2018 -0800
@@ -44,8 +44,8 @@
* <p><code>StAXSource</code>s are consumed during processing
* and are not reusable.</p>
*
- * @author <a href="mailto:Neeraj.Bajaj@Sun.com">Neeraj Bajaj</a>
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Neeraj Bajaj
+ * @author Jeff Suttor
*
* @see <a href="http://jcp.org/en/jsr/detail?id=173">
* JSR 173: Streaming API for XML</a>
--- a/src/java.xml/share/classes/javax/xml/transform/stream/StreamResult.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/javax/xml/transform/stream/StreamResult.java Mon Jan 08 08:53:14 2018 -0800
@@ -36,7 +36,7 @@
* <p>Acts as an holder for a transformation result,
* which may be XML, plain Text, HTML, or some other form of markup.</p>
*
- * @author <a href="Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Jeff Suttor
* @since 1.4
*/
public class StreamResult implements Result {
--- a/src/java.xml/share/classes/javax/xml/transform/stream/StreamSource.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/javax/xml/transform/stream/StreamSource.java Mon Jan 08 08:53:14 2018 -0800
@@ -40,7 +40,7 @@
* <p><em>Note:</em> Due to their internal use of either a {@link Reader} or {@link InputStream} instance,
* <code>StreamSource</code> instances may only be used once.</p>
*
- * @author <a href="Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Jeff Suttor
* @since 1.4
*/
public class StreamSource implements Source {
--- a/src/java.xml/share/classes/javax/xml/validation/Schema.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/javax/xml/validation/Schema.java Mon Jan 08 08:53:14 2018 -0800
@@ -58,7 +58,7 @@
* In other words, if you parse the same schema twice, you may
* still get <code>!schemaA.equals(schemaB)</code>.
*
- * @author <a href="mailto:Kohsuke.Kawaguchi@Sun.com">Kohsuke Kawaguchi</a>
+ * @author Kohsuke Kawaguchi
* @see <a href="http://www.w3.org/TR/xmlschema-1/">XML Schema Part 1: Structures</a>
* @see <a href="http://www.w3.org/TR/xml11/">Extensible Markup Language (XML) 1.1</a>
* @see <a href="http://www.w3.org/TR/REC-xml">Extensible Markup Language (XML) 1.0 (Second Edition)</a>
--- a/src/java.xml/share/classes/javax/xml/validation/SchemaFactory.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/javax/xml/validation/SchemaFactory.java Mon Jan 08 08:53:14 2018 -0800
@@ -105,8 +105,8 @@
* </tbody>
* </table>
*
- * @author <a href="mailto:Kohsuke.Kawaguchi@Sun.com">Kohsuke Kawaguchi</a>
- * @author <a href="mailto:Neeraj.Bajaj@sun.com">Neeraj Bajaj</a>
+ * @author Kohsuke Kawaguchi
+ * @author Neeraj Bajaj
*
* @since 1.5
*/
--- a/src/java.xml/share/classes/javax/xml/validation/SchemaFactoryFinder.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/javax/xml/validation/SchemaFactoryFinder.java Mon Jan 08 08:53:14 2018 -0800
@@ -41,7 +41,7 @@
/**
* Implementation of {@link SchemaFactory#newInstance(String)}.
*
- * @author <a href="Kohsuke.Kawaguchi@Sun.com">Kohsuke Kawaguchi</a>
+ * @author Kohsuke Kawaguchi
* @since 1.5
*/
class SchemaFactoryFinder {
--- a/src/java.xml/share/classes/javax/xml/validation/SchemaFactoryLoader.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/javax/xml/validation/SchemaFactoryLoader.java Mon Jan 08 08:53:14 2018 -0800
@@ -40,7 +40,7 @@
* It must not be used by users or JAXP implementations.
* </p>
*
- * @author <a href="Kohsuke.Kawaguchi@Sun.com">Kohsuke Kawaguchi</a>
+ * @author Kohsuke Kawaguchi
* @since 1.5
*/
public abstract class SchemaFactoryLoader {
--- a/src/java.xml/share/classes/javax/xml/validation/TypeInfoProvider.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/javax/xml/validation/TypeInfoProvider.java Mon Jan 08 08:53:14 2018 -0800
@@ -41,7 +41,7 @@
* Implementation of this "interface" can be obtained through the
* {@link ValidatorHandler#getTypeInfoProvider()} method.
*
- * @author <a href="mailto:Kohsuke.Kawaguchi@Sun.com">Kohsuke Kawaguchi</a>
+ * @author Kohsuke Kawaguchi
* @see org.w3c.dom.TypeInfo
* @since 1.5
*/
--- a/src/java.xml/share/classes/javax/xml/validation/Validator.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/javax/xml/validation/Validator.java Mon Jan 08 08:53:14 2018 -0800
@@ -48,7 +48,7 @@
* the {@code validate} method.
*
*
- * @author <a href="mailto:Kohsuke.Kawaguchi@Sun.com">Kohsuke Kawaguchi</a>
+ * @author Kohsuke Kawaguchi
* @since 1.5
*/
public abstract class Validator {
--- a/src/java.xml/share/classes/javax/xml/validation/ValidatorHandler.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/javax/xml/validation/ValidatorHandler.java Mon Jan 08 08:53:14 2018 -0800
@@ -107,7 +107,7 @@
*
* <p>This feature is set to <code>false</code> by default.</p>
*
- * @author <a href="mailto:Kohsuke.Kawaguchi@Sun.com">Kohsuke Kawaguchi</a>
+ * @author Kohsuke Kawaguchi
* @since 1.5
*/
public abstract class ValidatorHandler implements ContentHandler {
--- a/src/java.xml/share/classes/javax/xml/xpath/XPath.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/javax/xml/xpath/XPath.java Mon Jan 08 08:53:14 2018 -0800
@@ -98,8 +98,8 @@
* method is invoked, applications may not recursively call
* the {@code evaluate} method.
*
- * @author <a href="Norman.Walsh@Sun.com">Norman Walsh</a>
- * @author <a href="Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Norman Walsh
+ * @author Jeff Suttor
* @see <a href="http://www.w3.org/TR/xpath">XML Path Language (XPath) Version 1.0</a>
* @since 1.5
*/
--- a/src/java.xml/share/classes/javax/xml/xpath/XPathConstants.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/javax/xml/xpath/XPathConstants.java Mon Jan 08 08:53:14 2018 -0800
@@ -30,8 +30,8 @@
/**
* <p>XPath constants.</p>
*
- * @author <a href="mailto:Norman.Walsh@Sun.COM">Norman Walsh</a>
- * @author <a href="mailto:Jeff.Suttor@Sun.COM">Jeff Suttor</a>
+ * @author Norman Walsh
+ * @author Jeff Suttor
* @see <a href="http://www.w3.org/TR/xpath">XML Path Language (XPath) Version 1.0</a>
* @since 1.5
*/
--- a/src/java.xml/share/classes/javax/xml/xpath/XPathException.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/javax/xml/xpath/XPathException.java Mon Jan 08 08:53:14 2018 -0800
@@ -35,8 +35,8 @@
/**
* {@code XPathException} represents a generic XPath exception.
*
- * @author <a href="Norman.Walsh@Sun.com">Norman Walsh</a>
- * @author <a href="mailto:Jeff.Suttor@Sun.COM">Jeff Suttor</a>
+ * @author Norman Walsh
+ * @author Jeff Suttor
* @since 1.5
*/
public class XPathException extends Exception {
--- a/src/java.xml/share/classes/javax/xml/xpath/XPathExpression.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/javax/xml/xpath/XPathExpression.java Mon Jan 08 08:53:14 2018 -0800
@@ -94,8 +94,8 @@
* method is invoked, applications may not recursively call
* the {@code evaluate} method.
*
- * @author <a href="mailto:Norman.Walsh@Sun.com">Norman Walsh</a>
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Norman Walsh
+ * @author Jeff Suttor
* @see <a href="http://www.w3.org/TR/xpath#section-Expressions">XML Path Language (XPath) Version 1.0, Expressions</a>
* @since 1.5
*/
--- a/src/java.xml/share/classes/javax/xml/xpath/XPathExpressionException.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/javax/xml/xpath/XPathExpressionException.java Mon Jan 08 08:53:14 2018 -0800
@@ -28,8 +28,8 @@
/**
* {@code XPathExpressionException} represents an error in an XPath expression.
*
- * @author <a href="mailto:Norman.Walsh@Sun.com">Norman Walsh</a>
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Norman Walsh
+ * @author Jeff Suttor
* @since 1.5
*/
public class XPathExpressionException extends XPathException {
--- a/src/java.xml/share/classes/javax/xml/xpath/XPathFactory.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/javax/xml/xpath/XPathFactory.java Mon Jan 08 08:53:14 2018 -0800
@@ -45,8 +45,8 @@
* may not attempt to recursively invoke a <code>newInstance</code> method,
* even from the same thread.
*
- * @author <a href="mailto:Norman.Walsh@Sun.com">Norman Walsh</a>
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Norman Walsh
+ * @author Jeff Suttor
*
* @since 1.5
*/
--- a/src/java.xml/share/classes/javax/xml/xpath/XPathFactoryConfigurationException.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/javax/xml/xpath/XPathFactoryConfigurationException.java Mon Jan 08 08:53:14 2018 -0800
@@ -29,8 +29,8 @@
* {@code XPathFactoryConfigurationException} represents
* a configuration error in a {@code XPathFactory} environment.
*
- * @author <a href="mailto:Norman.Walsh@Sun.com">Norman Walsh</a>
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Norman Walsh
+ * @author Jeff Suttor
* @since 1.5
*/
public class XPathFactoryConfigurationException extends XPathException {
--- a/src/java.xml/share/classes/javax/xml/xpath/XPathFactoryFinder.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/javax/xml/xpath/XPathFactoryFinder.java Mon Jan 08 08:53:14 2018 -0800
@@ -41,7 +41,7 @@
/**
* Implementation of {@link XPathFactory#newInstance(String)}.
*
- * @author <a href="Kohsuke.Kawaguchi@Sun.com">Kohsuke Kawaguchi</a>
+ * @author Kohsuke Kawaguchi
* @since 1.5
*/
class XPathFactoryFinder {
--- a/src/java.xml/share/classes/javax/xml/xpath/XPathFunction.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/javax/xml/xpath/XPathFunction.java Mon Jan 08 08:53:14 2018 -0800
@@ -32,8 +32,8 @@
*
* <p>Functions are identified by QName and arity in XPath.</p>
*
- * @author <a href="mailto:Norman.Walsh@Sun.com">Norman Walsh</a>
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Norman Walsh
+ * @author Jeff Suttor
* @since 1.5
*/
public interface XPathFunction {
--- a/src/java.xml/share/classes/javax/xml/xpath/XPathFunctionException.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/javax/xml/xpath/XPathFunctionException.java Mon Jan 08 08:53:14 2018 -0800
@@ -28,8 +28,8 @@
/**
* {@code XPathFunctionException} represents an error with an XPath function.
*
- * @author <a href="mailto:Norman.Walsh@Sun.com">Norman Walsh</a>
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Norman Walsh
+ * @author Jeff Suttor
* @since 1.5
*/
public class XPathFunctionException extends XPathExpressionException {
--- a/src/java.xml/share/classes/javax/xml/xpath/XPathFunctionResolver.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/javax/xml/xpath/XPathFunctionResolver.java Mon Jan 08 08:53:14 2018 -0800
@@ -44,8 +44,8 @@
* <p>If you wish to implement additional built-in functions, you will have to
* extend the underlying implementation directly.</p>
*
- * @author <a href="mailto:Norman.Walsh@Sun.com">Norman Walsh</a>
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Norman Walsh
+ * @author Jeff Suttor
* @see <a href="http://www.w3.org/TR/xpath#corelib">XML Path Language (XPath) Version 1.0, Core Function Library</a>
* @since 1.5
*/
--- a/src/java.xml/share/classes/javax/xml/xpath/XPathVariableResolver.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/java.xml/share/classes/javax/xml/xpath/XPathVariableResolver.java Mon Jan 08 08:53:14 2018 -0800
@@ -37,8 +37,8 @@
* single XPath expression, a variable's value <strong><em>must</em></strong>
* not change.</p>
*
- * @author <a href="mailto:Norman.Walsh@Sun.com">Norman Walsh</a>
- * @author <a href="mailto:Jeff.Suttor@Sun.com">Jeff Suttor</a>
+ * @author Norman Walsh
+ * @author Jeff Suttor
* @since 1.5
*/
public interface XPathVariableResolver {
--- a/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/AOTBackend.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/AOTBackend.java Mon Jan 08 08:53:14 2018 -0800
@@ -166,7 +166,7 @@
void printCompiledMethod(HotSpotResolvedJavaMethod resolvedMethod, CompilationResult compResult) {
// This is really not installing the method.
- InstalledCode installedCode = codeCache.addCode(resolvedMethod, HotSpotCompiledCodeBuilder.createCompiledCode(codeCache, null, null, compResult), null, null);
+ InstalledCode installedCode = codeCache.addCode(resolvedMethod, HotSpotCompiledCodeBuilder.createCompiledCode(codeCache, resolvedMethod, null, compResult), null, null);
String disassembly = codeCache.disassemble(installedCode);
if (disassembly != null) {
main.printer.printlnDebug(disassembly);
--- a/src/jdk.compiler/share/classes/com/sun/tools/doclint/DocLint.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.compiler/share/classes/com/sun/tools/doclint/DocLint.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, 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
@@ -37,8 +37,10 @@
import javax.tools.StandardLocation;
import com.sun.source.doctree.DocCommentTree;
+import com.sun.source.tree.BlockTree;
import com.sun.source.tree.ClassTree;
import com.sun.source.tree.CompilationUnitTree;
+import com.sun.source.tree.LambdaExpressionTree;
import com.sun.source.tree.ModuleTree;
import com.sun.source.tree.PackageTree;
import com.sun.source.tree.MethodTree;
@@ -398,6 +400,7 @@
visitDecl(tree, null);
return super.visitPackage(tree, ignore);
}
+
@Override @DefinedBy(Api.COMPILER_TREE)
public Void visitClass(ClassTree tree, Void ignore) {
visitDecl(tree, tree.getSimpleName());
@@ -407,7 +410,6 @@
@Override @DefinedBy(Api.COMPILER_TREE)
public Void visitMethod(MethodTree tree, Void ignore) {
visitDecl(tree, tree.getName());
- //return super.visitMethod(tree, ignore);
return null;
}
@@ -431,6 +433,16 @@
return super.visitCompilationUnit(node, p);
}
+ @Override @DefinedBy(Api.COMPILER_TREE)
+ public Void visitBlock(BlockTree tree, Void ignore) {
+ return null;
+ }
+
+ @Override @DefinedBy(Api.COMPILER_TREE)
+ public Void visitLambdaExpression(LambdaExpressionTree tree, Void ignore) {
+ return null;
+ }
+
}
// </editor-fold>
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTaskPool.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTaskPool.java Mon Jan 08 08:53:14 2018 -0800
@@ -4,7 +4,9 @@
*
* 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.
+ * 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
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Directive.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Directive.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2018, 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
@@ -27,11 +27,13 @@
import java.util.Collections;
import java.util.EnumSet;
+import java.util.Locale;
import java.util.Set;
import javax.lang.model.element.ModuleElement;
import javax.lang.model.element.ModuleElement.DirectiveVisitor;
+import com.sun.tools.javac.api.Messages;
import com.sun.tools.javac.code.Symbol.ClassSymbol;
import com.sun.tools.javac.code.Symbol.ModuleSymbol;
import com.sun.tools.javac.code.Symbol.PackageSymbol;
@@ -71,6 +73,11 @@
}
public final int value;
+
+ @Override
+ public String toString() {
+ return String.format("ACC_%s (0x%04x", name(), value);
+ }
}
/** Flags for ExportsDirective. */
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, 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
@@ -4743,9 +4743,8 @@
// Check for proper use of serialVersionUID
if (env.info.lint.isEnabled(LintCategory.SERIAL)
&& isSerializable(c.type)
- && (c.flags() & Flags.ENUM) == 0
- && !c.isAnonymous()
- && checkForSerial(c)) {
+ && (c.flags() & (Flags.ENUM | Flags.INTERFACE)) == 0
+ && !c.isAnonymous()) {
checkSerialVersionUID(tree, c);
}
if (allowTypeAnnos) {
@@ -4757,17 +4756,6 @@
}
}
// where
- boolean checkForSerial(ClassSymbol c) {
- if ((c.flags() & ABSTRACT) == 0) {
- return true;
- } else {
- return c.members().anyMatch(anyNonAbstractOrDefaultMethod);
- }
- }
-
- public static final Filter<Symbol> anyNonAbstractOrDefaultMethod = s ->
- s.kind == MTH && (s.flags() & (DEFAULT | ABSTRACT)) != ABSTRACT;
-
/** get a diagnostic position for an attribute of Type t, or null if attribute missing */
private DiagnosticPosition getDiagnosticPosition(JCClassDecl tree, Type t) {
for(List<JCAnnotation> al = tree.mods.annotations; !al.isEmpty(); al = al.tail) {
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java Mon Jan 08 08:53:14 2018 -0800
@@ -1976,8 +1976,8 @@
types.covariantReturnType(rt2, rt1, types.noWarnings)) ||
checkCommonOverriderIn(s1,s2,site);
if (!compat) {
- log.error(pos, Errors.TypesIncompatibleDiffRet(t1, t2, s2.name +
- "(" + types.memberType(t2, s2).getParameterTypes() + ")"));
+ log.error(pos, Errors.TypesIncompatible(t1, t2,
+ Fragments.IncompatibleDiffRet(s2.name, types.memberType(t2, s2).getParameterTypes())));
return s2;
}
} else if (checkNameClash((ClassSymbol)site.tsym, s1, s2) &&
@@ -2563,20 +2563,22 @@
//strong semantics - issue an error if two sibling interfaces
//have two override-equivalent defaults - or if one is abstract
//and the other is default
- String errKey;
+ Fragment diagKey;
Symbol s1 = defaults.first();
Symbol s2;
if (defaults.size() > 1) {
- errKey = "types.incompatible.unrelated.defaults";
s2 = defaults.toList().tail.head;
+ diagKey = Fragments.IncompatibleUnrelatedDefaults(Kinds.kindName(site.tsym), site,
+ m.name, types.memberType(site, m).getParameterTypes(),
+ s1.location(), s2.location());
+
} else {
- errKey = "types.incompatible.abstract.default";
s2 = abstracts.first();
+ diagKey = Fragments.IncompatibleAbstractDefault(Kinds.kindName(site.tsym), site,
+ m.name, types.memberType(site, m).getParameterTypes(),
+ s1.location(), s2.location());
}
- log.error(pos, errKey,
- Kinds.kindName(site.tsym), site,
- m.name, types.memberType(site, m).getParameterTypes(),
- s1.location(), s2.location());
+ log.error(pos, Errors.TypesIncompatible(s1.location().type, s2.location().type, diagKey));
break;
}
}
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Enter.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Enter.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, 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
@@ -421,6 +421,12 @@
// We are seeing a member class.
c = syms.enterClass(env.toplevel.modle, tree.name, (TypeSymbol)owner);
if (c.owner != owner) {
+ if (c.name != tree.name) {
+ log.error(tree.pos(), Errors.SameBinaryName(c.name, tree.name));
+ result = types.createErrorType(tree.name, (TypeSymbol)owner, Type.noType);
+ tree.sym = (ClassSymbol)result.tsym;
+ return;
+ }
//anonymous class loaded from a classfile may be recreated from source (see below)
//if this class is a member of such an anonymous class, fix the owner:
Assert.check(owner.owner.kind != TYP, owner::toString);
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2018, 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
@@ -63,6 +63,7 @@
import com.sun.tools.javac.code.Directive.RequiresFlag;
import com.sun.tools.javac.code.Directive.UsesDirective;
import com.sun.tools.javac.code.Flags;
+import com.sun.tools.javac.code.Flags.Flag;
import com.sun.tools.javac.code.Lint.LintCategory;
import com.sun.tools.javac.code.ModuleFinder;
import com.sun.tools.javac.code.Source;
@@ -109,11 +110,15 @@
import static com.sun.tools.javac.code.Flags.ENUM;
import static com.sun.tools.javac.code.Flags.PUBLIC;
import static com.sun.tools.javac.code.Flags.UNATTRIBUTED;
+
import com.sun.tools.javac.code.Kinds;
+
import static com.sun.tools.javac.code.Kinds.Kind.ERR;
import static com.sun.tools.javac.code.Kinds.Kind.MDL;
import static com.sun.tools.javac.code.Kinds.Kind.MTH;
+
import com.sun.tools.javac.code.Symbol.ModuleResolutionFlags;
+
import static com.sun.tools.javac.code.TypeTag.CLASS;
/**
@@ -775,10 +780,20 @@
} else {
allRequires.add(msym);
Set<RequiresFlag> flags = EnumSet.noneOf(RequiresFlag.class);
- if (tree.isTransitive)
- flags.add(RequiresFlag.TRANSITIVE);
- if (tree.isStaticPhase)
- flags.add(RequiresFlag.STATIC_PHASE);
+ if (tree.isTransitive) {
+ if (msym == syms.java_base && source.compareTo(Source.JDK10) >= 0) {
+ log.error(tree.pos(), Errors.ModifierNotAllowedHere(names.transitive));
+ } else {
+ flags.add(RequiresFlag.TRANSITIVE);
+ }
+ }
+ if (tree.isStaticPhase) {
+ if (msym == syms.java_base && source.compareTo(Source.JDK10) >= 0) {
+ log.error(tree.pos(), Errors.ModNotAllowedHere(EnumSet.of(Flag.STATIC)));
+ } else {
+ flags.add(RequiresFlag.STATIC_PHASE);
+ }
+ }
RequiresDirective d = new RequiresDirective(msym, flags);
tree.directive = d;
sym.requires = sym.requires.prepend(d);
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/file/JavacFileManager.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/file/JavacFileManager.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, 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
@@ -27,6 +27,8 @@
import java.io.File;
import java.io.IOException;
+import java.lang.module.Configuration;
+import java.lang.module.ModuleFinder;
import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
@@ -77,11 +79,6 @@
import com.sun.tools.javac.util.DefinedBy.Api;
import com.sun.tools.javac.util.List;
import com.sun.tools.javac.util.ListBuffer;
-import com.sun.tools.javac.util.JDK9Wrappers.Configuration;
-import com.sun.tools.javac.util.JDK9Wrappers.Layer;
-import com.sun.tools.javac.util.JDK9Wrappers.ModuleFinder;
-import com.sun.tools.javac.util.JDK9Wrappers.Module;
-import com.sun.tools.javac.util.JDK9Wrappers.ServiceLoaderHelper;
import static java.nio.file.FileVisitOption.FOLLOW_LINKS;
@@ -980,14 +977,14 @@
public <S> ServiceLoader<S> getServiceLoader(Location location, Class<S> service) throws IOException {
nullCheck(location);
nullCheck(service);
- Module.getModule(getClass()).addUses(service);
+ getClass().getModule().addUses(service);
if (location.isModuleOrientedLocation()) {
Collection<Path> paths = locations.getLocation(location);
ModuleFinder finder = ModuleFinder.of(paths.toArray(new Path[paths.size()]));
- Layer bootLayer = Layer.boot();
+ ModuleLayer bootLayer = ModuleLayer.boot();
Configuration cf = bootLayer.configuration().resolveAndBind(ModuleFinder.of(), finder, Collections.emptySet());
- Layer layer = bootLayer.defineModulesWithOneLoader(cf, ClassLoader.getSystemClassLoader());
- return ServiceLoaderHelper.load(layer, service);
+ ModuleLayer layer = bootLayer.defineModulesWithOneLoader(cf, ClassLoader.getSystemClassLoader());
+ return ServiceLoader.load(layer, service);
} else {
return ServiceLoader.load(service, getClassLoader(location));
}
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/file/Locations.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/file/Locations.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, 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
@@ -77,6 +77,8 @@
import javax.tools.StandardJavaFileManager.PathFactory;
import javax.tools.StandardLocation;
+import jdk.internal.jmod.JmodFile;
+
import com.sun.tools.javac.code.Lint;
import com.sun.tools.javac.code.Lint.LintCategory;
import com.sun.tools.javac.main.Option;
@@ -84,7 +86,6 @@
import com.sun.tools.javac.resources.CompilerProperties.Warnings;
import com.sun.tools.javac.util.DefinedBy;
import com.sun.tools.javac.util.DefinedBy.Api;
-import com.sun.tools.javac.util.JDK9Wrappers;
import com.sun.tools.javac.util.ListBuffer;
import com.sun.tools.javac.util.Log;
import com.sun.tools.javac.jvm.ModuleNameReader;
@@ -1451,7 +1452,7 @@
if (p.getFileName().toString().endsWith(".jmod")) {
try {
// check if the JMOD file is valid
- JDK9Wrappers.JmodFile.checkMagic(p);
+ JmodFile.checkMagic(p);
// No JMOD file system. Use JarFileSystem to
// workaround for now
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassFile.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassFile.java Mon Jan 08 08:53:14 2018 -0800
@@ -111,7 +111,8 @@
V51(51, 0), // JDK 1.7
V52(52, 0), // JDK 1.8: lambda, type annos, param names
V53(53, 0), // JDK 1.9: modules, indy string concat
- V54(54, 0); // JDK 10
+ V54(54, 0), // JDK 10
+ V55(55, 0); // JDK 11: constant dynamic
Version(int major, int minor) {
this.major = major;
this.minor = minor;
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, 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
@@ -1339,7 +1339,8 @@
throw badClassFile("module.name.mismatch", moduleName, currentModule.name);
}
- msym.flags.addAll(readModuleFlags(nextChar()));
+ Set<ModuleFlags> moduleFlags = readModuleFlags(nextChar());
+ msym.flags.addAll(moduleFlags);
msym.version = readName(nextChar());
ListBuffer<RequiresDirective> requires = new ListBuffer<>();
@@ -1347,6 +1348,14 @@
for (int i = 0; i < nrequires; i++) {
ModuleSymbol rsym = syms.enterModule(readModuleName(nextChar()));
Set<RequiresFlag> flags = readRequiresFlags(nextChar());
+ if (rsym == syms.java_base && majorVersion >= V54.major) {
+ if (flags.contains(RequiresFlag.TRANSITIVE)) {
+ throw badClassFile("bad.requires.flag", RequiresFlag.TRANSITIVE);
+ }
+ if (flags.contains(RequiresFlag.STATIC_PHASE)) {
+ throw badClassFile("bad.requires.flag", RequiresFlag.STATIC_PHASE);
+ }
+ }
nextChar(); // skip compiled version
requires.add(new RequiresDirective(rsym, flags));
}
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Target.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Target.java Mon Jan 08 08:53:14 2018 -0800
@@ -67,7 +67,7 @@
JDK1_10("1.10", 54, 0),
/** JDK 11. */
- JDK1_11("11", 54, 0); // Initially an alias for JDK_10
+ JDK1_11("11", 55, 0);
private static final Context.Key<Target> targetKey = new Context.Key<>();
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2018, 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
@@ -27,6 +27,7 @@
import java.io.FileWriter;
import java.io.PrintWriter;
+import java.lang.module.ModuleDescriptor;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
@@ -47,6 +48,8 @@
import javax.lang.model.SourceVersion;
+import jdk.internal.misc.VM;
+
import com.sun.tools.doclint.DocLint;
import com.sun.tools.javac.code.Lint;
import com.sun.tools.javac.code.Lint.LintCategory;
@@ -57,7 +60,6 @@
import com.sun.tools.javac.platform.PlatformProvider;
import com.sun.tools.javac.processing.JavacProcessingEnvironment;
import com.sun.tools.javac.util.Assert;
-import com.sun.tools.javac.util.JDK9Wrappers;
import com.sun.tools.javac.util.Log;
import com.sun.tools.javac.util.Log.PrefixKind;
import com.sun.tools.javac.util.Log.WriterKind;
@@ -650,21 +652,11 @@
if (arg.isEmpty()) {
throw helper.newInvalidValueException("err.no.value.for.option", option);
} else {
+ // use official parser if available
try {
- Class.forName(JDK9Wrappers.ModuleDescriptor.Version.CLASSNAME);
- // use official parser if available
- try {
- JDK9Wrappers.ModuleDescriptor.Version.parse(arg);
- } catch (IllegalArgumentException e) {
- throw helper.newInvalidValueException("err.bad.value.for.option", option, arg);
- }
- } catch (ClassNotFoundException ex) {
- // fall-back to simplistic rules when running on older platform
- if (!(arg.charAt(0) >= '0' && arg.charAt(0) <= '9') ||
- arg.endsWith("-") ||
- arg.endsWith("+")) {
- throw helper.newInvalidValueException("err.bad.value.for.option", option, arg);
- }
+ ModuleDescriptor.Version.parse(arg);
+ } catch (IllegalArgumentException e) {
+ throw helper.newInvalidValueException("err.bad.value.for.option", option, arg);
}
}
super.process(helper, option, arg);
@@ -717,41 +709,36 @@
HIDDEN, BASIC) {
@Override
public void process(OptionHelper helper, String option) throws InvalidValueException {
- try {
- Class.forName(JDK9Wrappers.VMHelper.CLASSNAME);
- String[] runtimeArgs = JDK9Wrappers.VMHelper.getRuntimeArguments();
- for (String arg : runtimeArgs) {
- // Handle any supported runtime options; ignore all others.
- // The runtime arguments always use the single token form, e.g. "--name=value".
- for (Option o : getSupportedRuntimeOptions()) {
- if (o.matches(arg)) {
- switch (o) {
- case ADD_MODULES:
- int eq = arg.indexOf('=');
- Assert.check(eq > 0, () -> ("invalid runtime option:" + arg));
- // --add-modules=ALL-DEFAULT is not supported at compile-time
- // so remove it from list, and only process the rest
- // if the set is non-empty.
- // Note that --add-modules=ALL-DEFAULT is automatically added
- // by the standard javac launcher.
- String mods = Arrays.stream(arg.substring(eq + 1).split(","))
- .filter(s -> !s.isEmpty() && !s.equals("ALL-DEFAULT"))
- .collect(Collectors.joining(","));
- if (!mods.isEmpty()) {
- String updatedArg = arg.substring(0, eq + 1) + mods;
- o.handleOption(helper, updatedArg, Collections.emptyIterator());
- }
- break;
- default:
- o.handleOption(helper, arg, Collections.emptyIterator());
- break;
- }
- break;
+ String[] runtimeArgs = VM.getRuntimeArguments();
+ for (String arg : runtimeArgs) {
+ // Handle any supported runtime options; ignore all others.
+ // The runtime arguments always use the single token form, e.g. "--name=value".
+ for (Option o : getSupportedRuntimeOptions()) {
+ if (o.matches(arg)) {
+ switch (o) {
+ case ADD_MODULES:
+ int eq = arg.indexOf('=');
+ Assert.check(eq > 0, () -> ("invalid runtime option:" + arg));
+ // --add-modules=ALL-DEFAULT is not supported at compile-time
+ // so remove it from list, and only process the rest
+ // if the set is non-empty.
+ // Note that --add-modules=ALL-DEFAULT is automatically added
+ // by the standard javac launcher.
+ String mods = Arrays.stream(arg.substring(eq + 1).split(","))
+ .filter(s -> !s.isEmpty() && !s.equals("ALL-DEFAULT"))
+ .collect(Collectors.joining(","));
+ if (!mods.isEmpty()) {
+ String updatedArg = arg.substring(0, eq + 1) + mods;
+ o.handleOption(helper, updatedArg, Collections.emptyIterator());
+ }
+ break;
+ default:
+ o.handleOption(helper, arg, Collections.emptyIterator());
+ break;
}
+ break;
}
}
- } catch (ClassNotFoundException | SecurityException e) {
- throw helper.newInvalidValueException("err.cannot.access.runtime.env");
}
}
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavadocTokenizer.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavadocTokenizer.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2018, 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
@@ -394,6 +394,7 @@
comment_reader.putChar('\\', false);
}
comment_reader.scanCommentChar();
+ break;
case ' ':
case '\t':
comment_reader.putChar(comment_reader.ch, false);
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacFiler.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacFiler.java Mon Jan 08 08:53:14 2018 -0800
@@ -712,20 +712,20 @@
}
private void checkNameAndExistence(ModuleSymbol mod, String typename, boolean allowUnnamedPackageInfo) throws FilerException {
- // TODO: Check if type already exists on source or class path?
- // If so, use warning message key proc.type.already.exists
checkName(typename, allowUnnamedPackageInfo);
- ClassSymbol existing;
+ ClassSymbol existing = elementUtils.getTypeElement(typename);
boolean alreadySeen = aggregateGeneratedSourceNames.contains(Pair.of(mod, typename)) ||
aggregateGeneratedClassNames.contains(Pair.of(mod, typename)) ||
initialClassNames.contains(typename) ||
- ((existing = elementUtils.getTypeElement(typename)) != null &&
- initialInputs.contains(existing.sourcefile));
+ (existing != null && initialInputs.contains(existing.sourcefile));
if (alreadySeen) {
if (lint)
log.warning(Warnings.ProcTypeRecreate(typename));
throw new FilerException("Attempt to recreate a file for type " + typename);
}
+ if (lint && existing != null) {
+ log.warning("proc.type.already.exists", typename);
+ }
if (!mod.isUnnamed() && !typename.contains(".")) {
throw new FilerException("Attempt to create a type in unnamed package of a named module: " + typename);
}
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, 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
@@ -82,7 +82,6 @@
import com.sun.tools.javac.util.DefinedBy.Api;
import com.sun.tools.javac.util.Iterators;
import com.sun.tools.javac.util.JCDiagnostic;
-import com.sun.tools.javac.util.JDK9Wrappers.Module;
import com.sun.tools.javac.util.JavacMessages;
import com.sun.tools.javac.util.List;
import com.sun.tools.javac.util.Log;
@@ -267,7 +266,7 @@
: fileManager.getClassLoader(CLASS_PATH);
if (options.isSet("accessInternalAPI"))
- ModuleHelper.addExports(Module.getModule(getClass()), Module.getUnnamedModule(processorClassLoader));
+ ModuleHelper.addExports(getClass().getModule(), processorClassLoader.getUnnamedModule());
if (processorClassLoader != null && processorClassLoader instanceof Closeable) {
compiler.closeables = compiler.closeables.prepend((Closeable) processorClassLoader);
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties Mon Jan 08 08:53:14 2018 -0800
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2018, 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
@@ -443,6 +443,10 @@
compiler.err.duplicate.class=\
duplicate class: {0}
+# 0: name, 1: name
+compiler.err.same.binary.name=\
+ classes: {0} and {1} have the same binary name
+
compiler.err.duplicate.case.label=\
duplicate case label
@@ -753,6 +757,10 @@
compiler.err.mod.not.allowed.here=\
modifier {0} not allowed here
+# 0: name
+compiler.err.modifier.not.allowed.here=\
+ modifier {0} not allowed here
+
compiler.err.intf.not.allowed.here=\
interface not allowed here
@@ -1136,16 +1144,21 @@
compiler.err.type.var.more.than.once.in.result=\
type variable {0} occurs more than once in type of {1}; cannot be left uninstantiated
-# 0: type, 1: type, 2: string
-compiler.err.types.incompatible.diff.ret=\
- types {0} and {1} are incompatible; both define {2}, but with unrelated return types
+# 0: type, 1: type, 2: fragment
+compiler.err.types.incompatible=\
+ types {0} and {1} are incompatible;\n\
+ {2}
+
+# 0: name, 1: list of type
+compiler.misc.incompatible.diff.ret=\
+ both define {0}({1}), but with unrelated return types
# 0: kind name, 1: type, 2: name, 3: list of type, 4: symbol, 5: symbol
-compiler.err.types.incompatible.unrelated.defaults=\
+compiler.misc.incompatible.unrelated.defaults=\
{0} {1} inherits unrelated defaults for {2}({3}) from types {4} and {5}
# 0: kind name, 1: type, 2: name, 3: list of type, 4: symbol, 5: symbol
-compiler.err.types.incompatible.abstract.default=\
+compiler.misc.incompatible.abstract.default=\
{0} {1} inherits abstract and default for {2}({3}) from types {4} and {5}
# 0: name, 1: kind name, 2: symbol
@@ -3131,6 +3144,9 @@
compiler.misc.cant.resolve.modules=\
cannot resolve modules
+compiler.misc.bad.requires.flag=\
+ bad requires flag: {0}
+
# 0: string
compiler.err.invalid.module.specifier=\
module specifier not allowed: {0}
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties Mon Jan 08 08:53:14 2018 -0800
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2018, 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
@@ -374,8 +374,6 @@
not a directory: {0}
javac.err.file.not.file=\
not a file: {0}
-javac.err.cannot.access.runtime.env=\
- cannot access runtime environment
javac.err.two.class.loaders.1=\
javac is split between multiple class loaders: check your configuration
javac.err.two.class.loaders.2=\
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/JDK9Wrappers.java Tue Dec 26 13:38:31 2017 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,460 +0,0 @@
-/*
- * 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 com.sun.tools.javac.util;
-
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.nio.file.Path;
-import java.util.Collection;
-import java.util.ServiceLoader;
-
-/**
- * This class provides wrappers for classes and methods that are new in JDK 9, and which are not
- * available on older versions of the platform on which javac may be compiled and run.
- * In future releases, when javac is always compiled on JDK 9 or later, the use of these wrappers
- * can be replaced by use of the real underlying classes.
- *
- * <p>Wrapper classes provide a subset of the API of the wrapped classes, as needed for use
- * in javac. Wrapper objects contain an {@code Object} reference to the underlying runtime object,
- * and {@code Class} and {@code Method} objects for obtaining or using such instances via
- * runtime reflection. The {@code Class} and {@code Method} objects are set up on a per-class
- * basis, by an {@code init} method, which is called from static methods on the wrapper class,
- * or in the constructor, when instances are created.
- * <p>
- *
- * <p><b>This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own risk.
- * This code and its internal interfaces are subject to change or
- * deletion without notice.</b>
- */
-public class JDK9Wrappers {
-
- /**
- * Helper class for new method in java.util.ServiceLoader.
- */
- public static final class ServiceLoaderHelper {
- @SuppressWarnings("unchecked")
- public static <S> ServiceLoader<S> load(Layer layer, Class<S> service) {
- try {
- init();
- Object result = loadMethod.invoke(null, layer.theRealLayer, service);
- return (ServiceLoader<S>)result;
- } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException
- | SecurityException ex) {
- throw new Abort(ex);
- }
- }
-
- // -----------------------------------------------------------------------------------------
-
- private static Method loadMethod = null;
-
- private static void init() {
- if (loadMethod == null) {
- try {
- Class<?> layerClass = Layer.layerClass;
- loadMethod = ServiceLoader.class.getDeclaredMethod("load", layerClass, Class.class);
- } catch (NoSuchMethodException | SecurityException ex) {
- throw new Abort(ex);
- }
- }
- }
- }
-
- /**
- * Wrapper class for java.lang.module.ModuleDescriptor and ModuleDescriptor.Version.
- */
- public static class ModuleDescriptor {
- public static class Version {
- public static final String CLASSNAME = "java.lang.module.ModuleDescriptor$Version";
- private final Object theRealVersion;
-
- private Version(Object version) {
- this.theRealVersion = version;
- }
-
- public static Version parse(String v) {
- try {
- init();
- Object result = parseMethod.invoke(null, v);
- Version version = new Version(result);
- return version;
- } catch (InvocationTargetException ex) {
- if (ex.getCause() instanceof IllegalArgumentException) {
- throw (IllegalArgumentException) ex.getCause();
- } else {
- throw new Abort(ex);
- }
- } catch (IllegalAccessException | IllegalArgumentException | SecurityException ex) {
- throw new Abort(ex);
- }
- }
-
- @Override
- public String toString() {
- return theRealVersion.toString();
- }
-
- // -----------------------------------------------------------------------------------------
-
- private static Class<?> versionClass = null;
- private static Method parseMethod = null;
-
- private static void init() {
- if (versionClass == null) {
- try {
- versionClass = Class.forName(CLASSNAME, false, null);
- parseMethod = versionClass.getDeclaredMethod("parse", String.class);
- } catch (ClassNotFoundException | NoSuchMethodException | SecurityException ex) {
- throw new Abort(ex);
- }
- }
- }
- }
- }
-
- /**
- * Wrapper class for java.lang.module.ModuleFinder.
- */
- public static class ModuleFinder {
- private final Object theRealModuleFinder;
-
- private ModuleFinder(Object moduleFinder) {
- this.theRealModuleFinder = moduleFinder;
- init();
- }
-
- public static ModuleFinder of(Path... dirs) {
- try {
- init();
- Object result = ofMethod.invoke(null, (Object)dirs);
- ModuleFinder mFinder = new ModuleFinder(result);
- return mFinder;
- } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException
- | SecurityException ex) {
- throw new Abort(ex);
- }
- }
-
- // -----------------------------------------------------------------------------------------
-
- private static Class<?> moduleFinderClass = null;
- private static Method ofMethod;
-
- static final Class<?> getModuleFinderClass() {
- init();
- return moduleFinderClass;
- }
-
- private static void init() {
- if (moduleFinderClass == null) {
- try {
- moduleFinderClass = Class.forName("java.lang.module.ModuleFinder", false, null);
- ofMethod = moduleFinderClass.getDeclaredMethod("of", Path[].class);
- } catch (ClassNotFoundException | NoSuchMethodException | SecurityException ex) {
- throw new Abort(ex);
- }
- }
- }
- }
-
- /**
- * Wrapper class for java.lang.Module. To materialize a handle use the static factory
- * methods Module#getModule(Class<?>) or Module#getUnnamedModule(ClassLoader).
- */
- public static class Module {
-
- private final Object theRealModule;
-
- private Module(Object module) {
- this.theRealModule = module;
- init();
- }
-
- public static Module getModule(Class<?> clazz) {
- try {
- init();
- Object result = getModuleMethod.invoke(clazz, new Object[0]);
- return new Module(result);
- } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException
- | SecurityException ex) {
- throw new Abort(ex);
- }
- }
-
- public static Module getUnnamedModule(ClassLoader classLoader) {
- try {
- init();
- Object result = getUnnamedModuleMethod.invoke(classLoader, new Object[0]);
- return new Module(result);
- } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException
- | SecurityException ex) {
- throw new Abort(ex);
- }
- }
-
- public Module addExports(String pn, Module other) {
- try {
- addExportsMethod.invoke(theRealModule, new Object[] { pn, other.theRealModule});
- } catch (IllegalAccessException | InvocationTargetException ex) {
- throw new Abort(ex);
- }
- return this;
- }
-
- public Module addUses(Class<?> st) {
- try {
- addUsesMethod.invoke(theRealModule, new Object[] { st });
- } catch (IllegalAccessException | InvocationTargetException ex) {
- throw new Abort(ex);
- }
- return this;
- }
-
- // -----------------------------------------------------------------------------------------
- // on java.lang.Module
- private static Method addExportsMethod = null;
- // on java.lang.Module
- private static Method addUsesMethod = null;
- // on java.lang.Class
- private static Method getModuleMethod;
- // on java.lang.ClassLoader
- private static Method getUnnamedModuleMethod;
-
- private static void init() {
- if (addExportsMethod == null) {
- try {
- Class<?> moduleClass = Class.forName("java.lang.Module", false, null);
- addUsesMethod = moduleClass.getDeclaredMethod("addUses", new Class<?>[] { Class.class });
- addExportsMethod = moduleClass.getDeclaredMethod("addExports",
- new Class<?>[] { String.class, moduleClass });
- getModuleMethod = Class.class.getDeclaredMethod("getModule", new Class<?>[0]);
- getUnnamedModuleMethod = ClassLoader.class.getDeclaredMethod("getUnnamedModule", new Class<?>[0]);
- } catch (ClassNotFoundException | NoSuchMethodException | SecurityException ex) {
- throw new Abort(ex);
- }
- }
- }
- }
-
- /**
- * Wrapper class for java.lang.module.Configuration.
- */
- public static final class Configuration {
- private final Object theRealConfiguration;
-
- private Configuration(Object configuration) {
- this.theRealConfiguration = configuration;
- init();
- }
-
- public Configuration resolveAndBind(
- ModuleFinder beforeFinder,
- ModuleFinder afterFinder,
- Collection<String> roots) {
- try {
- Object result = resolveAndBindMethod.invoke(theRealConfiguration,
- beforeFinder.theRealModuleFinder,
- afterFinder.theRealModuleFinder,
- roots
- );
- Configuration configuration = new Configuration(result);
- return configuration;
- } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException
- | SecurityException ex) {
- throw new Abort(ex);
- }
- }
-
- // -----------------------------------------------------------------------------------------
-
- private static Class<?> configurationClass = null;
- private static Method resolveAndBindMethod;
-
- static final Class<?> getConfigurationClass() {
- init();
- return configurationClass;
- }
-
- private static void init() {
- if (configurationClass == null) {
- try {
- configurationClass = Class.forName("java.lang.module.Configuration", false, null);
- Class<?> moduleFinderInterface = ModuleFinder.getModuleFinderClass();
- resolveAndBindMethod = configurationClass.getDeclaredMethod("resolveAndBind",
- moduleFinderInterface,
- moduleFinderInterface,
- Collection.class
- );
- } catch (ClassNotFoundException | NoSuchMethodException | SecurityException ex) {
- throw new Abort(ex);
- }
- }
- }
- }
-
- /**
- * Wrapper class for java.lang.ModuleLayer.
- */
- public static final class Layer {
- private final Object theRealLayer;
-
- private Layer(Object layer) {
- this.theRealLayer = layer;
- }
-
- public static Layer boot() {
- try {
- init();
- Object result = bootMethod.invoke(null);
- Layer layer = new Layer(result);
- return layer;
- } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException
- | SecurityException ex) {
- throw new Abort(ex);
- }
- }
-
- public Configuration configuration() {
- try {
- Object result = configurationMethod.invoke(theRealLayer);
- Configuration configuration = new Configuration(result);
- return configuration;
- } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException
- | SecurityException ex) {
- throw new Abort(ex);
- }
- }
-
- public Layer defineModulesWithOneLoader(Configuration configuration, ClassLoader parentClassLoader) {
- try {
- Object result = defineModulesWithOneLoaderMethod.invoke(
- theRealLayer, configuration.theRealConfiguration, parentClassLoader);
- Layer layer = new Layer(result);
- return layer;
- } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException
- | SecurityException ex) {
- throw new Abort(ex);
- }
- }
-
- // -----------------------------------------------------------------------------------------
-
- private static Class<?> layerClass = null;
- private static Method bootMethod;
- private static Method defineModulesWithOneLoaderMethod;
- private static Method configurationMethod;
-
- private static void init() {
- if (layerClass == null) {
- try {
- layerClass = Class.forName("java.lang.ModuleLayer", false, null);
- bootMethod = layerClass.getDeclaredMethod("boot");
- defineModulesWithOneLoaderMethod = layerClass.getDeclaredMethod("defineModulesWithOneLoader",
- Configuration.getConfigurationClass(),
- ClassLoader.class);
- configurationMethod = layerClass.getDeclaredMethod("configuration");
- } catch (ClassNotFoundException | NoSuchMethodException | SecurityException ex) {
- throw new Abort(ex);
- }
- }
- }
- }
-
-
- /**
- * Helper class for new method in jdk.internal.misc.VM.
- */
- public static final class VMHelper {
- public static final String CLASSNAME = "jdk.internal.misc.VM";
-
- @SuppressWarnings("unchecked")
- public static String[] getRuntimeArguments() {
- try {
- init();
- Object result = getRuntimeArgumentsMethod.invoke(null);
- return (String[])result;
- } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException
- | SecurityException ex) {
- throw new Abort(ex);
- }
- }
-
- // -----------------------------------------------------------------------------------------
-
- private static Class<?> vmClass = null;
- private static Method getRuntimeArgumentsMethod = null;
-
- private static void init() {
- if (vmClass == null) {
- try {
- vmClass = Class.forName(CLASSNAME, false, null);
- getRuntimeArgumentsMethod = vmClass.getDeclaredMethod("getRuntimeArguments");
- } catch (ClassNotFoundException | NoSuchMethodException | SecurityException ex) {
- throw new Abort(ex);
- }
- }
- }
- }
-
- /**
- * Helper class for new method in jdk.internal.jmod.JmodFile
- */
- public static final class JmodFile {
- public static final String JMOD_FILE_CLASSNAME = "jdk.internal.jmod.JmodFile";
-
- public static void checkMagic(Path file) throws IOException {
- try {
- init();
- checkMagicMethod.invoke(null, file);
- } catch (InvocationTargetException ex) {
- if (ex.getCause() instanceof IOException) {
- throw IOException.class.cast(ex.getCause());
- }
- throw new Abort(ex);
- } catch (IllegalAccessException | IllegalArgumentException | SecurityException ex) {
- throw new Abort(ex);
- }
- }
-
- // -----------------------------------------------------------------------------------------
-
- private static Class<?> jmodFileClass = null;
- private static Method checkMagicMethod = null;
-
- private static void init() {
- if (jmodFileClass == null) {
- try {
- jmodFileClass = Class.forName(JMOD_FILE_CLASSNAME, false, null);
- checkMagicMethod = jmodFileClass.getDeclaredMethod("checkMagic", Path.class);
- } catch (ClassNotFoundException | NoSuchMethodException | SecurityException ex) {
- throw new Abort(ex);
- }
- }
- }
- }
-}
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/ModuleHelper.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/ModuleHelper.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,6 @@
package com.sun.tools.javac.util;
-import com.sun.tools.javac.util.JDK9Wrappers.Module;
-
public class ModuleHelper {
private static final String[] javacInternalPackages = new String[] {
--- a/src/jdk.dynalink/share/classes/jdk/dynalink/beans/AbstractJavaLinker.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.dynalink/share/classes/jdk/dynalink/beans/AbstractJavaLinker.java Mon Jan 08 08:53:14 2018 -0800
@@ -414,20 +414,21 @@
protected GuardedInvocationComponent getGuardedInvocationComponent(final ComponentLinkRequest req)
throws Exception {
- if (!req.namespaces.isEmpty()) {
- final Namespace ns = req.namespaces.get(0);
- final Operation op = req.baseOperation;
- if (op == StandardOperation.GET) {
- if (ns == StandardNamespace.PROPERTY) {
- return getPropertyGetter(req.popNamespace());
- } else if (ns == StandardNamespace.METHOD) {
- return getMethodGetter(req.popNamespace());
- }
- } else if (op == StandardOperation.SET && ns == StandardNamespace.PROPERTY) {
- return getPropertySetter(req.popNamespace());
+ if (req.namespaces.isEmpty()) {
+ return null;
+ }
+ final Namespace ns = req.namespaces.get(0);
+ final Operation op = req.baseOperation;
+ if (op == StandardOperation.GET) {
+ if (ns == StandardNamespace.PROPERTY) {
+ return getPropertyGetter(req.popNamespace());
+ } else if (ns == StandardNamespace.METHOD) {
+ return getMethodGetter(req.popNamespace());
}
+ } else if (op == StandardOperation.SET && ns == StandardNamespace.PROPERTY) {
+ return getPropertySetter(req.popNamespace());
}
- return null;
+ return getNextComponent(req.popNamespace());
}
GuardedInvocationComponent getNextComponent(final ComponentLinkRequest req) throws Exception {
--- a/src/jdk.dynalink/share/classes/jdk/dynalink/beans/BeanLinker.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.dynalink/share/classes/jdk/dynalink/beans/BeanLinker.java Mon Jan 08 08:53:14 2018 -0800
@@ -136,24 +136,21 @@
@Override
protected GuardedInvocationComponent getGuardedInvocationComponent(final ComponentLinkRequest req) throws Exception {
- final GuardedInvocationComponent superGic = super.getGuardedInvocationComponent(req);
- if(superGic != null) {
- return superGic;
+ if (req.namespaces.isEmpty()) {
+ return null;
}
- if (!req.namespaces.isEmpty()) {
+ final Namespace ns = req.namespaces.get(0);
+ if (ns == StandardNamespace.ELEMENT) {
final Operation op = req.baseOperation;
- final Namespace ns = req.namespaces.get(0);
- if (ns == StandardNamespace.ELEMENT) {
- if (op == StandardOperation.GET) {
- return getElementGetter(req.popNamespace());
- } else if (op == StandardOperation.SET) {
- return getElementSetter(req.popNamespace());
- } else if (op == StandardOperation.REMOVE) {
- return getElementRemover(req.popNamespace());
- }
+ if (op == StandardOperation.GET) {
+ return getElementGetter(req.popNamespace());
+ } else if (op == StandardOperation.SET) {
+ return getElementSetter(req.popNamespace());
+ } else if (op == StandardOperation.REMOVE) {
+ return getElementRemover(req.popNamespace());
}
}
- return null;
+ return super.getGuardedInvocationComponent(req);
}
@Override
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/BufferingSubscriber.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/BufferingSubscriber.java Mon Jan 08 08:53:14 2018 -0800
@@ -80,7 +80,7 @@
BufferingSubscriber(HttpResponse.BodySubscriber<T> downstreamSubscriber,
int bufferSize) {
- this.downstreamSubscriber = downstreamSubscriber;
+ this.downstreamSubscriber = Objects.requireNonNull(downstreamSubscriber);
this.bufferSize = bufferSize;
synchronized (buffersLock) {
internalBuffers = new ArrayList<>();
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Exchange.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Exchange.java Mon Jan 08 08:53:14 2018 -0800
@@ -373,13 +373,16 @@
client.client2(),
this, e::drainLeftOverBytes)
.thenCompose((Http2Connection c) -> {
- c.putConnection();
+ boolean cached = c.offerConnection();
Stream<T> s = c.getStream(1);
+
if (s == null) {
// s can be null if an exception occurred
// asynchronously while sending the preface.
Throwable t = c.getRecordedCause();
if (t != null) {
+ if (!cached)
+ c.close();
return MinimalFuture.failedFuture(
new IOException("Can't get stream 1: " + t, t));
}
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ExchangeImpl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ExchangeImpl.java Mon Jan 08 08:53:14 2018 -0800
@@ -98,6 +98,7 @@
HttpConnection connection)
{
DEBUG_LOGGER.log(Level.DEBUG, "handling HTTP/2 connection creation result");
+ boolean secure = exchange.request().secure();
if (t != null) {
DEBUG_LOGGER.log(Level.DEBUG,
"handling HTTP/2 connection creation failed: %s",
@@ -116,6 +117,12 @@
return CompletableFuture.failedFuture(t);
}
}
+ if (secure && c== null) {
+ DEBUG_LOGGER.log(Level.DEBUG, "downgrading to HTTP/1.1 ");
+ CompletableFuture<? extends ExchangeImpl<U>> ex =
+ createHttp1Exchange(exchange, null);
+ return ex;
+ }
if (c == null) {
// no existing connection. Send request with HTTP 1 and then
// upgrade if successful
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http2ClientImpl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http2ClientImpl.java Mon Jan 08 08:53:14 2018 -0800
@@ -65,96 +65,78 @@
/* Map key is "scheme:host:port" */
private final Map<String,Http2Connection> connections = new ConcurrentHashMap<>();
- private final Set<String> opening = Collections.synchronizedSet(new HashSet<>());
- private final Map<String,Set<CompletableFuture<Http2Connection>>> waiting =
- Collections.synchronizedMap(new HashMap<>());
-
- private void addToWaiting(String key, CompletableFuture<Http2Connection> cf) {
- synchronized (waiting) {
- Set<CompletableFuture<Http2Connection>> waiters = waiting.get(key);
- if (waiters == null) {
- waiters = new HashSet<>();
- waiting.put(key, waiters);
- }
- waiters.add(cf);
- }
- }
+ private final Set<String> failures = Collections.synchronizedSet(new HashSet<>());
/**
- * If a https request then async waits until a connection is opened.
- * Returns null if the request is 'http' as a different (upgrade)
- * mechanism is used.
+ * When HTTP/2 requested only. The following describes the aggregate behavior including the
+ * calling code. In all cases, the HTTP2 connection cache
+ * is checked first for a suitable connection and that is returned if available.
+ * If not, a new connection is opened, except in https case when a previous negotiate failed.
+ * In that case, we want to continue using http/1.1. When a connection is to be opened and
+ * if multiple requests are sent in parallel then each will open a new connection.
+ *
+ * If negotiation/upgrade succeeds then
+ * one connection will be put in the cache and the others will be closed
+ * after the initial request completes (not strictly necessary for h2, only for h2c)
*
- * Only one connection per destination is created. Blocks when opening
- * connection, or when waiting for connection to be opened.
- * First thread opens the connection and notifies the others when done.
+ * If negotiate/upgrade fails, then any opened connections remain open (as http/1.1)
+ * and will be used and cached in the http/1 cache. Note, this method handles the
+ * https failure case only (by completing the CF with an ALPN exception, handled externally)
+ * The h2c upgrade is handled externally also.
*
- * If the request is secure (https) then we open the connection here.
- * If not, then the more complicated upgrade from 1.1 to 2 happens (not here)
- * In latter case, when the Http2Connection is connected, putConnection() must
- * be called to store it.
+ * Specific CF behavior of this method.
+ * 1. completes with ALPN exception: h2 negotiate failed for first time. failure recorded.
+ * 2. completes with other exception: failure not recorded. Caller must handle
+ * 3. completes normally with null: no connection in cache for h2c or h2 failed previously
+ * 4. completes normally with connection: h2 or h2c connection in cache. Use it.
*/
CompletableFuture<Http2Connection> getConnectionFor(HttpRequestImpl req) {
URI uri = req.uri();
InetSocketAddress proxy = req.proxy();
String key = Http2Connection.keyFor(uri, proxy);
- synchronized (opening) {
+ synchronized (this) {
Http2Connection connection = connections.get(key);
if (connection != null) { // fast path if connection already exists
return CompletableFuture.completedFuture(connection);
}
- if (!req.secure()) {
+ if (!req.secure() || failures.contains(key)) {
+ // secure: negotiate failed before. Use http/1.1
+ // !secure: no connection available in cache. Attempt upgrade
return MinimalFuture.completedFuture(null);
}
-
- if (!opening.contains(key)) {
- debug.log(Level.DEBUG, "Opening: %s", key);
- opening.add(key);
- } else {
- CompletableFuture<Http2Connection> cf = new MinimalFuture<>();
- addToWaiting(key, cf);
- return cf;
- }
}
return Http2Connection
.createAsync(req, this)
.whenComplete((conn, t) -> {
- debug.log(Level.DEBUG,
- "waking up dependents with created connection");
- synchronized (opening) {
- Set<CompletableFuture<Http2Connection>> waiters = waiting.remove(key);
- debug.log(Level.DEBUG, "Opening completed: %s", key);
- opening.remove(key);
- if (t == null && conn != null)
- putConnection(conn);
- final Throwable cause = Utils.getCompletionCause(t);
- if (waiters == null) {
- debug.log(Level.DEBUG, "no dependent to wake up");
- return;
- } else if (cause instanceof Http2Connection.ALPNException) {
- waiters.forEach((cf1) -> cf1.completeAsync(() -> null,
- client.theExecutor()));
- } else if (cause != null) {
- debug.log(Level.DEBUG,
- () -> "waking up dependants: failed: " + cause);
- waiters.forEach((cf1) -> cf1.completeExceptionally(cause));
- } else {
- debug.log(Level.DEBUG, "waking up dependants: succeeded");
- waiters.forEach((cf1) -> cf1.completeAsync(() -> conn,
- client.theExecutor()));
+ synchronized (Http2ClientImpl.this) {
+ if (conn != null) {
+ offerConnection(conn);
+ } else {
+ Throwable cause = Utils.getCompletionCause(t);
+ if (cause instanceof Http2Connection.ALPNException)
+ failures.add(key);
}
}
});
}
/*
- * TODO: If there isn't a connection to the same destination, then
- * store it. If there is already a connection, then close it
+ * Cache the given connection, if no connection to the same
+ * destination exists. If one exists, then we let the initial stream
+ * complete but allow it to close itself upon completion.
+ * This situation should not arise with https because the request
+ * has not been sent as part of the initial alpn negotiation
*/
- void putConnection(Http2Connection c) {
- connections.put(c.key(), c);
+ boolean offerConnection(Http2Connection c) {
+ String key = c.key();
+ Http2Connection c1 = connections.putIfAbsent(key, c);
+ if (c1 != null) {
+ c.setSingleStream(true);
+ return false;
+ }
+ return true;
}
void deleteConnection(Http2Connection c) {
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http2Connection.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/Http2Connection.java Mon Jan 08 08:53:14 2018 -0800
@@ -116,6 +116,8 @@
Utils.getHpackLogger(this::dbgString, DEBUG_HPACK);
static final ByteBuffer EMPTY_TRIGGER = ByteBuffer.allocate(0);
+ private boolean singleStream; // used only for stream 1, then closed
+
/*
* ByteBuffer pooling strategy for HTTP/2 protocol:
*
@@ -202,7 +204,6 @@
prefaceSent = true;
}
}
-
}
volatile boolean closed;
@@ -397,6 +398,14 @@
return aconn.getALPN().thenCompose(checkAlpnCF);
}
+ synchronized boolean singleStream() {
+ return singleStream;
+ }
+
+ synchronized void setSingleStream(boolean use) {
+ singleStream = use;
+ }
+
static String keyFor(HttpConnection connection) {
boolean isProxy = connection.isProxied();
boolean isSecure = connection.isSecure();
@@ -429,6 +438,10 @@
// P indicates proxy
// Eg: "S:H:foo.com:80"
static String keyString(boolean secure, boolean proxy, String host, int port) {
+ if (secure && port == -1)
+ port = 443;
+ else if (!secure && port == -1)
+ port = 80;
return (secure ? "S:" : "C:") + (proxy ? "P:" : "H:") + host + ":" + port;
}
@@ -436,8 +449,8 @@
return this.key;
}
- void putConnection() {
- client2.putConnection(this);
+ boolean offerConnection() {
+ return client2.offerConnection(this);
}
private HttpPublisher publisher() {
@@ -464,6 +477,7 @@
}
void close() {
+ Log.logTrace("Closing HTTP/2 connection: to {0}", connection.address());
GoAwayFrame f = new GoAwayFrame(0, ErrorFrame.NO_ERROR, "Requested by user".getBytes());
// TODO: set last stream. For now zero ok.
sendFrame(f);
@@ -680,7 +694,12 @@
// corresponding entry in the window controller.
windowController.removeStream(streamid);
}
+ if (singleStream() && streams.isEmpty()) {
+ // should be only 1 stream, but there might be more if server push
+ close();
+ }
}
+
/**
* Increments this connection's send Window by the amount in the given frame.
*/
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpRequest.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpRequest.java Mon Jan 08 08:53:14 2018 -0800
@@ -622,6 +622,49 @@
public interface BodyPublisher extends Flow.Publisher<ByteBuffer> {
/**
+ * Returns a request body publisher whose body is retrieved from the
+ * given {@code Flow.Publisher}. The returned request body publisher
+ * has an unknown content length.
+ *
+ * @apiNote This method can be used as an adapter between {@code
+ * BodyPublisher} and {@code Flow.Publisher}, where the amount of
+ * request body that the publisher will publish is unknown.
+ *
+ * @param publisher the publisher responsible for publishing the body
+ * @return a BodyPublisher
+ */
+ static BodyPublisher fromPublisher(Flow.Publisher<? extends ByteBuffer> publisher) {
+ return new RequestPublishers.PublisherAdapter(publisher, -1L);
+ }
+
+ /**
+ * Returns a request body publisher whose body is retrieved from the
+ * given {@code Flow.Publisher}. The returned request body publisher
+ * has the given content length.
+ *
+ * <p> The given {@code contentLength} is a positive number, that
+ * represents the exact amount of bytes the {@code publisher} must
+ * publish.
+ *
+ * @apiNote This method can be used as an adapter between {@code
+ * BodyPublisher} and {@code Flow.Publisher}, where the amount of
+ * request body that the publisher will publish is known.
+ *
+ * @param publisher the publisher responsible for publishing the body
+ * @param contentLength a positive number representing the exact
+ * amount of bytes the publisher will publish
+ * @throws IllegalArgumentException if the content length is
+ * non-positive
+ * @return a BodyPublisher
+ */
+ static BodyPublisher fromPublisher(Flow.Publisher<? extends ByteBuffer> publisher,
+ long contentLength) {
+ if (contentLength < 1)
+ throw new IllegalArgumentException("non-positive contentLength: " + contentLength);
+ return new RequestPublishers.PublisherAdapter(publisher, contentLength);
+ }
+
+ /**
* Returns a request body publisher whose body is the given {@code
* String}, converted using the {@link StandardCharsets#UTF_8 UTF_8}
* character set.
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpResponse.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpResponse.java Mon Jan 08 08:53:14 2018 -0800
@@ -46,6 +46,7 @@
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionStage;
import java.util.concurrent.Flow;
+import java.util.concurrent.Flow.Subscriber;
import java.util.function.Consumer;
import java.util.function.Function;
import javax.net.ssl.SSLParameters;
@@ -329,6 +330,75 @@
public BodySubscriber<T> apply(int statusCode, HttpHeaders responseHeaders);
/**
+ * Returns a response body handler that returns a {@link BodySubscriber
+ * BodySubscriber}{@code <Void>} obtained from {@linkplain
+ * BodySubscriber#fromSubscriber(Subscriber)}, with the given
+ * {@code subscriber}.
+ *
+ * <p> The response body is not available through this, or the {@code
+ * HttpResponse} API, but instead all response body is forwarded to the
+ * given {@code subscriber}, which should make it available, if
+ * appropriate, through some other mechanism, e.g. an entry in a
+ * database, etc.
+ *
+ * @apiNote This method can be used as an adapter between {@code
+ * BodySubscriber} and {@code Flow.Subscriber}.
+ *
+ * <p> For example:
+ * <pre> {@code
+ * TextSubscriber subscriber = new TextSubscriber();
+ * HttpResponse<Void> response = client.sendAsync(request,
+ * BodyHandler.fromSubscriber(subscriber)).join();
+ * System.out.println(response.statusCode());
+ * }</pre>
+ *
+ * @param subscriber the subscriber
+ * @return a response body handler
+ */
+ public static BodyHandler<Void>
+ fromSubscriber(Subscriber<? super List<ByteBuffer>> subscriber) {
+ Objects.requireNonNull(subscriber);
+ return (status, headers) -> BodySubscriber.fromSubscriber(subscriber,
+ s -> null);
+ }
+
+ /**
+ * Returns a response body handler that returns a {@link BodySubscriber
+ * BodySubscriber}{@code <T>} obtained from {@link
+ * BodySubscriber#fromSubscriber(Subscriber, Function)}, with the
+ * given {@code subscriber} and {@code finisher} function.
+ *
+ * <p> The given {@code finisher} function is applied after the given
+ * subscriber's {@code onComplete} has been invoked. The {@code finisher}
+ * function is invoked with the given subscriber, and returns a value
+ * that is set as the response's body.
+ *
+ * @apiNote This method can be used as an adapter between {@code
+ * BodySubscriber} and {@code Flow.Subscriber}.
+ *
+ * <p> For example:
+ * <pre> {@code
+ * TextSubscriber subscriber = ...; // accumulates bytes and transforms them into a String
+ * HttpResponse<String> response = client.sendAsync(request,
+ * BodyHandler.fromSubscriber(subscriber, TextSubscriber::getTextResult)).join();
+ * String text = response.body();
+ * }</pre>
+ *
+ * @param <S> the type of the Subscriber
+ * @param <T> the type of the response body
+ * @param subscriber the subscriber
+ * @param finisher a function to be applied after the subscriber has completed
+ * @return a response body handler
+ */
+ public static <S extends Subscriber<? super List<ByteBuffer>>,T> BodyHandler<T>
+ fromSubscriber(S subscriber, Function<S,T> finisher) {
+ Objects.requireNonNull(subscriber);
+ Objects.requireNonNull(finisher);
+ return (status, headers) -> BodySubscriber.fromSubscriber(subscriber,
+ finisher);
+ }
+
+ /**
* Returns a response body handler which discards the response body and
* uses the given value as a replacement for it.
*
@@ -344,24 +414,14 @@
* Returns a {@code BodyHandler<String>} that returns a
* {@link BodySubscriber BodySubscriber}{@code <String>} obtained from
* {@link BodySubscriber#asString(Charset) BodySubscriber.asString(Charset)}.
- * If a charset is provided, the body is decoded using it. If charset is
- * {@code null} then the handler tries to determine the character set
- * from the {@code Content-encoding} header. If that charset is not
- * supported then {@link java.nio.charset.StandardCharsets#UTF_8 UTF_8}
- * is used.
+ * The body is decoded using the given character set.
*
- * @param charset The name of the charset to interpret the body as. If
- * {@code null} then the charset is determined from the
- * <i>Content-encoding</i> header.
+ * @param charset the character set to convert the body with
* @return a response body handler
*/
public static BodyHandler<String> asString(Charset charset) {
- return (status, headers) -> {
- if (charset != null) {
- return BodySubscriber.asString(charset);
- }
- return BodySubscriber.asString(charsetFrom(headers));
- };
+ Objects.requireNonNull(charset);
+ return (status, headers) -> BodySubscriber.asString(charset);
}
/**
@@ -386,11 +446,11 @@
*/
public static BodyHandler<Path> asFile(Path file, OpenOption... openOptions) {
Objects.requireNonNull(file);
+ List<OpenOption> opts = List.of(openOptions);
SecurityManager sm = System.getSecurityManager();
if (sm != null) {
String fn = pathForSecurityCheck(file);
sm.checkWrite(fn);
- List<OpenOption> opts = Arrays.asList(openOptions);
if (opts.contains(StandardOpenOption.DELETE_ON_CLOSE))
sm.checkDelete(fn);
if (opts.contains(StandardOpenOption.READ))
@@ -450,11 +510,11 @@
public static BodyHandler<Path> asFileDownload(Path directory,
OpenOption... openOptions) {
Objects.requireNonNull(directory);
+ List<OpenOption> opts = List.of(openOptions);
SecurityManager sm = System.getSecurityManager();
if (sm != null) {
String fn = pathForSecurityCheck(directory);
sm.checkWrite(fn);
- List<OpenOption> opts = Arrays.asList(openOptions);
if (opts.contains(StandardOpenOption.DELETE_ON_CLOSE))
sm.checkDelete(fn);
if (opts.contains(StandardOpenOption.READ))
@@ -494,6 +554,7 @@
* @return a response body handler
*/
public static BodyHandler<Void> asByteArrayConsumer(Consumer<Optional<byte[]>> consumer) {
+ Objects.requireNonNull(consumer);
return (status, headers) -> BodySubscriber.asByteArrayConsumer(consumer);
}
@@ -547,6 +608,7 @@
*/
public static <T> BodyHandler<T> buffering(BodyHandler<T> downstreamHandler,
int bufferSize) {
+ Objects.requireNonNull(downstreamHandler);
if (bufferSize <= 0)
throw new IllegalArgumentException("must be greater than 0");
return (status, headers) -> BodySubscriber
@@ -603,6 +665,53 @@
public CompletionStage<T> getBody();
/**
+ * Returns a body subscriber that forwards all response body to the
+ * given {@code Flow.Subscriber}. The {@linkplain #getBody()} completion
+ * stage} of the returned body subscriber completes after one of the
+ * given subscribers {@code onComplete} or {@code onError} has been
+ * invoked.
+ *
+ * @apiNote This method can be used as an adapter between {@code
+ * BodySubscriber} and {@code Flow.Subscriber}.
+ *
+ * @param <S> the type of the Subscriber
+ * @param subscriber the subscriber
+ * @return a body subscriber
+ */
+ public static <S extends Subscriber<? super List<ByteBuffer>>> BodySubscriber<Void>
+ fromSubscriber(S subscriber) {
+ return new ResponseSubscribers.SubscriberAdapter<S,Void>(subscriber, s -> null);
+ }
+
+ /**
+ * Returns a body subscriber that forwards all response body to the
+ * given {@code Flow.Subscriber}. The {@linkplain #getBody()} completion
+ * stage} of the returned body subscriber completes after one of the
+ * given subscribers {@code onComplete} or {@code onError} has been
+ * invoked.
+ *
+ * <p> The given {@code finisher} function is applied after the given
+ * subscriber's {@code onComplete} has been invoked. The {@code finisher}
+ * function is invoked with the given subscriber, and returns a value
+ * that is set as the response's body.
+ *
+ * @apiNote This method can be used as an adapter between {@code
+ * BodySubscriber} and {@code Flow.Subscriber}.
+ *
+ * @param <S> the type of the Subscriber
+ * @param <T> the type of the response body
+ * @param subscriber the subscriber
+ * @param finisher a function to be applied after the subscriber has
+ * completed
+ * @return a body subscriber
+ */
+ public static <S extends Subscriber<? super List<ByteBuffer>>,T> BodySubscriber<T>
+ fromSubscriber(S subscriber,
+ Function<S,T> finisher) {
+ return new ResponseSubscribers.SubscriberAdapter<S,T>(subscriber, finisher);
+ }
+
+ /**
* Returns a body subscriber which stores the response body as a {@code
* String} converted using the given {@code Charset}.
*
@@ -613,6 +722,7 @@
* @return a body subscriber
*/
public static BodySubscriber<String> asString(Charset charset) {
+ Objects.requireNonNull(charset);
return new ResponseSubscribers.ByteArraySubscriber<>(
bytes -> new String(bytes, charset)
);
@@ -662,11 +772,11 @@
*/
public static BodySubscriber<Path> asFile(Path file, OpenOption... openOptions) {
Objects.requireNonNull(file);
+ List<OpenOption> opts = List.of(openOptions);
SecurityManager sm = System.getSecurityManager();
if (sm != null) {
String fn = pathForSecurityCheck(file);
sm.checkWrite(fn);
- List<OpenOption> opts = Arrays.asList(openOptions);
if (opts.contains(StandardOpenOption.DELETE_ON_CLOSE))
sm.checkDelete(fn);
if (opts.contains(StandardOpenOption.READ))
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PlainHttpConnection.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/PlainHttpConnection.java Mon Jan 08 08:53:14 2018 -0800
@@ -84,7 +84,7 @@
boolean finished = chan.finishConnect();
assert finished : "Expected channel to be connected";
debug.log(Level.DEBUG,
- "ConnectEvent: connect finished: %s", finished);
+ "ConnectEvent: connect finished: %s Local addr: %s", finished, chan.getLocalAddress());
connected = true;
// complete async since the event runs on the SelectorManager thread
cf.completeAsync(() -> null, client().theExecutor());
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/RequestPublishers.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/RequestPublishers.java Mon Jan 08 08:53:14 2018 -0800
@@ -43,8 +43,10 @@
import java.util.Iterator;
import java.util.List;
import java.util.NoSuchElementException;
+import java.util.Objects;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.Flow;
+import java.util.concurrent.Flow.Publisher;
import java.util.function.Supplier;
import jdk.incubator.http.HttpRequest.BodyPublisher;
import jdk.incubator.http.internal.common.Utils;
@@ -109,7 +111,7 @@
private volatile long contentLength;
IterablePublisher(Iterable<byte[]> content) {
- this.content = content;
+ this.content = Objects.requireNonNull(content);
}
// The ByteBufferIterator will iterate over the byte[] arrays in
@@ -323,7 +325,7 @@
private final Supplier<? extends InputStream> streamSupplier;
InputStreamPublisher(Supplier<? extends InputStream> streamSupplier) {
- this.streamSupplier = streamSupplier;
+ this.streamSupplier = Objects.requireNonNull(streamSupplier);
}
@Override
@@ -348,4 +350,26 @@
return -1;
}
}
+
+ static final class PublisherAdapter implements BodyPublisher {
+
+ private final Publisher<? extends ByteBuffer> publisher;
+ private final long contentLength;
+
+ PublisherAdapter(Publisher<? extends ByteBuffer> publisher,
+ long contentLength) {
+ this.publisher = Objects.requireNonNull(publisher);
+ this.contentLength = contentLength;
+ }
+
+ @Override
+ public final long contentLength() {
+ return contentLength;
+ }
+
+ @Override
+ public final void subscribe(Flow.Subscriber<? super ByteBuffer> subscriber) {
+ publisher.subscribe(subscriber);
+ }
+ }
}
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ResponseContent.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ResponseContent.java Mon Jan 08 08:53:14 2018 -0800
@@ -401,8 +401,8 @@
pusher.onSubscribe(this.sub = sub);
try {
if (contentLength == 0) {
+ onFinished.run();
pusher.onComplete();
- onFinished.run();
onComplete.accept(null);
}
} catch (Throwable t) {
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ResponseSubscribers.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/ResponseSubscribers.java Mon Jan 08 08:53:14 2018 -0800
@@ -47,6 +47,8 @@
import java.util.concurrent.CompletionStage;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.Flow;
+import java.util.concurrent.Flow.Subscriber;
+import java.util.concurrent.Flow.Subscription;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Consumer;
import java.util.function.Function;
@@ -62,7 +64,7 @@
private final AtomicBoolean subscribed = new AtomicBoolean();
ConsumerSubscriber(Consumer<Optional<byte[]>> consumer) {
- this.consumer = consumer;
+ this.consumer = Objects.requireNonNull(consumer);
}
@Override
@@ -558,4 +560,69 @@
return cf;
}
}
+
+ /** An adapter between {@code BodySubscriber} and {@code Flow.Subscriber}. */
+ static final class SubscriberAdapter<S extends Subscriber<? super List<ByteBuffer>>,R>
+ implements HttpResponse.BodySubscriber<R>
+ {
+ private final CompletableFuture<R> cf = new MinimalFuture<>();
+ private final S subscriber;
+ private final Function<S,R> finisher;
+ private volatile Subscription subscription;
+
+ SubscriberAdapter(S subscriber, Function<S,R> finisher) {
+ this.subscriber = Objects.requireNonNull(subscriber);
+ this.finisher = Objects.requireNonNull(finisher);
+ }
+
+ @Override
+ public void onSubscribe(Subscription subscription) {
+ Objects.requireNonNull(subscription);
+ if (this.subscription != null) {
+ subscription.cancel();
+ } else {
+ this.subscription = subscription;
+ subscriber.onSubscribe(subscription);
+ }
+ }
+
+ @Override
+ public void onNext(List<ByteBuffer> item) {
+ Objects.requireNonNull(item);
+ try {
+ subscriber.onNext(item);
+ } catch (Throwable throwable) {
+ subscription.cancel();
+ onError(throwable);
+ }
+ }
+
+ @Override
+ public void onError(Throwable throwable) {
+ Objects.requireNonNull(throwable);
+ try {
+ subscriber.onError(throwable);
+ } finally {
+ cf.completeExceptionally(throwable);
+ }
+ }
+
+ @Override
+ public void onComplete() {
+ try {
+ subscriber.onComplete();
+ } finally {
+ try {
+ cf.complete(finisher.apply(subscriber));
+ } catch (Throwable throwable) {
+ cf.completeExceptionally(throwable);
+ }
+ }
+ }
+
+ @Override
+ public CompletionStage<R> getBody() {
+ return cf;
+ }
+ }
}
--- a/src/jdk.internal.vm.compiler/.mx.graal/suite.py Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.internal.vm.compiler/.mx.graal/suite.py Mon Jan 08 08:53:14 2018 -0800
@@ -107,7 +107,6 @@
"subDir" : "share/classes",
"dependencies" : ["JVMCI_SERVICES", "JVMCI_API", "org.graalvm.util"],
"sourceDirs" : ["src"],
- "dependencies" : ["org.graalvm.util"],
"checkstyle" : "org.graalvm.compiler.graph",
"uses" : ["org.graalvm.compiler.options.OptionDescriptors"],
"javaCompliance" : "1.8",
@@ -148,6 +147,7 @@
"dependencies" : [
"JVMCI_API",
"org.graalvm.compiler.serviceprovider",
+ "org.graalvm.graphio",
"org.graalvm.compiler.options"
],
"annotationProcessors" : ["GRAAL_OPTIONS_PROCESSOR"],
@@ -291,7 +291,6 @@
"subDir" : "share/classes",
"sourceDirs" : ["src"],
"dependencies" : [
- "org.graalvm.compiler.core.aarch64",
"org.graalvm.compiler.hotspot",
"org.graalvm.compiler.replacements.aarch64",
],
@@ -435,6 +434,7 @@
"mx:JUNIT",
"org.graalvm.compiler.api.test",
"org.graalvm.compiler.graph",
+ "org.graalvm.graphio",
],
"annotationProcessors" : ["GRAAL_NODEINFO_PROCESSOR"],
"javaCompliance" : "1.8",
@@ -945,6 +945,7 @@
"dependencies" : [
"org.graalvm.compiler.lir.jtt",
"org.graalvm.compiler.lir.amd64",
+ "org.graalvm.compiler.core.amd64",
"JVMCI_HOTSPOT"
],
"checkstyle" : "org.graalvm.compiler.graph",
@@ -1019,7 +1020,6 @@
"subDir" : "share/classes",
"sourceDirs" : ["src"],
"dependencies" : [
- "org.graalvm.graphio",
"org.graalvm.compiler.core",
"org.graalvm.compiler.java",
],
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64LIRKindTool.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.aarch64/src/org/graalvm/compiler/core/aarch64/AArch64LIRKindTool.java Mon Jan 08 08:53:14 2018 -0800
@@ -68,7 +68,7 @@
@Override
public LIRKind getNarrowOopKind() {
- return LIRKind.reference(AArch64Kind.DWORD);
+ return LIRKind.compressedReference(AArch64Kind.DWORD);
}
@Override
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/LIRKind.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/LIRKind.java Mon Jan 08 08:53:14 2018 -0800
@@ -33,8 +33,9 @@
/**
* Represents the type of values in the LIR. It is composed of a {@link PlatformKind} that gives the
- * low level representation of the value, and a {@link #referenceMask} that describes the location
- * of object references in the value, and optionally a {@link #derivedReferenceBase}.
+ * low level representation of the value, a {@link #referenceMask} that describes the location of
+ * object references in the value, a {@link #referenceCompressionMask} that indicates which of these
+ * references are compressed references, and for derived references a {@link #derivedReferenceBase}.
*
* <h2>Constructing {@link LIRKind} instances</h2>
*
@@ -52,7 +53,7 @@
* compare-and-swap. For convert operations, {@link LIRKind#combine} should be used.
* <p>
* If it is known that the result will be a reference (e.g. pointer arithmetic where the end result
- * is a valid oop), {@link LIRKind#reference} should be used.
+ * is a valid oop), {@link #reference} or {@link LIRKind#compressedReference} should be used.
* <p>
* If it is known that the result will neither be a reference nor be derived from a reference,
* {@link LIRKind#value} can be used. If the operation producing this value has inputs, this is very
@@ -64,19 +65,28 @@
*/
public final class LIRKind extends ValueKind<LIRKind> {
+ /**
+ * The location of object references in the value. If the value is a vector type, each bit
+ * represents one component of the vector.
+ */
private final int referenceMask;
+ /** Mask with 1-bits indicating which references in {@link #referenceMask} are compressed. */
+ private final int referenceCompressionMask;
+
private AllocatableValue derivedReferenceBase;
private static final int UNKNOWN_REFERENCE = -1;
public static final LIRKind Illegal = unknownReference(ValueKind.Illegal.getPlatformKind());
- private LIRKind(PlatformKind platformKind, int referenceMask, AllocatableValue derivedReferenceBase) {
+ private LIRKind(PlatformKind platformKind, int referenceMask, int referenceCompressionMask, AllocatableValue derivedReferenceBase) {
super(platformKind);
this.referenceMask = referenceMask;
+ this.referenceCompressionMask = referenceCompressionMask;
this.derivedReferenceBase = derivedReferenceBase;
+ assert this.referenceCompressionMask == 0 || this.referenceMask == this.referenceCompressionMask : "mixing compressed and uncompressed references is untested";
assert derivedReferenceBase == null || !derivedReferenceBase.getValueKind(LIRKind.class).isDerivedReference() : "derived reference can't have another derived reference as base";
}
@@ -86,15 +96,23 @@
* reference. Otherwise, {@link #combine(Value...)} should be used instead.
*/
public static LIRKind value(PlatformKind platformKind) {
- return new LIRKind(platformKind, 0, null);
+ return new LIRKind(platformKind, 0, 0, null);
}
/**
- * Create a {@link LIRKind} of type {@code platformKind} that contains a single tracked oop
- * reference.
+ * Create a {@link LIRKind} of type {@code platformKind} that contains a single, tracked,
+ * uncompressed oop reference.
*/
public static LIRKind reference(PlatformKind platformKind) {
- return derivedReference(platformKind, null);
+ return derivedReference(platformKind, null, false);
+ }
+
+ /**
+ * Create a {@link LIRKind} of type {@code platformKind} that contains a single, tracked,
+ * compressed oop reference.
+ */
+ public static LIRKind compressedReference(PlatformKind platformKind) {
+ return derivedReference(platformKind, null, true);
}
/**
@@ -112,10 +130,12 @@
/**
* Create a {@link LIRKind} of type {@code platformKind} that contains a derived reference.
*/
- public static LIRKind derivedReference(PlatformKind platformKind, AllocatableValue base) {
+ public static LIRKind derivedReference(PlatformKind platformKind, AllocatableValue base, boolean compressed) {
int length = platformKind.getVectorLength();
assert 0 < length && length < 32 : "vector of " + length + " references not supported";
- return new LIRKind(platformKind, (1 << length) - 1, base);
+ int referenceMask = (1 << length) - 1;
+ int referenceCompressionMask = (compressed ? referenceMask : 0);
+ return new LIRKind(platformKind, referenceMask, referenceCompressionMask, base);
}
/**
@@ -125,7 +145,7 @@
* used instead to automatically propagate this information.
*/
public static LIRKind unknownReference(PlatformKind platformKind) {
- return new LIRKind(platformKind, UNKNOWN_REFERENCE, null);
+ return new LIRKind(platformKind, UNKNOWN_REFERENCE, UNKNOWN_REFERENCE, null);
}
/**
@@ -139,9 +159,9 @@
return makeUnknownReference();
} else {
if (isValue()) {
- return derivedReference(getPlatformKind(), base);
+ return derivedReference(getPlatformKind(), base, false);
} else {
- return new LIRKind(getPlatformKind(), referenceMask, base);
+ return new LIRKind(getPlatformKind(), referenceMask, referenceCompressionMask, base);
}
}
}
@@ -240,7 +260,7 @@
return mergeKind;
}
/* {@code mergeKind} is a reference. */
- if (mergeKind.referenceMask != inputKind.referenceMask) {
+ if (mergeKind.referenceMask != inputKind.referenceMask || mergeKind.referenceCompressionMask != inputKind.referenceCompressionMask) {
/*
* Reference masks do not match so the result can only be an unknown reference.
*/
@@ -284,9 +304,11 @@
} else {
// reference type
int newLength = Math.min(32, newPlatformKind.getVectorLength());
- int newReferenceMask = referenceMask & (0xFFFFFFFF >>> (32 - newLength));
+ int lengthMask = 0xFFFFFFFF >>> (32 - newLength);
+ int newReferenceMask = referenceMask & lengthMask;
+ int newReferenceCompressionMask = referenceCompressionMask & lengthMask;
assert newReferenceMask != UNKNOWN_REFERENCE;
- return new LIRKind(newPlatformKind, newReferenceMask, derivedReferenceBase);
+ return new LIRKind(newPlatformKind, newReferenceMask, newReferenceCompressionMask, derivedReferenceBase);
}
}
@@ -308,12 +330,14 @@
// repeat reference mask to fill new kind
int newReferenceMask = 0;
+ int newReferenceCompressionMask = 0;
for (int i = 0; i < newLength; i += getPlatformKind().getVectorLength()) {
newReferenceMask |= referenceMask << i;
+ newReferenceCompressionMask |= referenceCompressionMask << i;
}
assert newReferenceMask != UNKNOWN_REFERENCE;
- return new LIRKind(newPlatformKind, newReferenceMask, derivedReferenceBase);
+ return new LIRKind(newPlatformKind, newReferenceMask, newReferenceCompressionMask, derivedReferenceBase);
}
}
@@ -322,7 +346,7 @@
* {@link LIRKind#unknownReference}.
*/
public LIRKind makeUnknownReference() {
- return new LIRKind(getPlatformKind(), UNKNOWN_REFERENCE, null);
+ return new LIRKind(getPlatformKind(), UNKNOWN_REFERENCE, UNKNOWN_REFERENCE, null);
}
/**
@@ -385,6 +409,17 @@
}
/**
+ * Check whether the {@code idx}th part of this value is a <b>compressed</b> reference.
+ *
+ * @param idx The index into the vector if this is a vector kind. Must be 0 if this is a scalar
+ * kind.
+ */
+ public boolean isCompressedReference(int idx) {
+ assert 0 <= idx && idx < getPlatformKind().getVectorLength() : "invalid index " + idx + " in " + this;
+ return !isUnknownReference() && (referenceCompressionMask & (1 << idx)) != 0;
+ }
+
+ /**
* Check whether this kind is a value type that doesn't need to be tracked at safepoints.
*/
public boolean isValue() {
@@ -432,6 +467,7 @@
result = prime * result + ((getPlatformKind() == null) ? 0 : getPlatformKind().hashCode());
result = prime * result + ((getDerivedReferenceBase() == null) ? 0 : getDerivedReferenceBase().hashCode());
result = prime * result + referenceMask;
+ result = prime * result + referenceCompressionMask;
return result;
}
@@ -445,7 +481,7 @@
}
LIRKind other = (LIRKind) obj;
- if (getPlatformKind() != other.getPlatformKind() || referenceMask != other.referenceMask) {
+ if (getPlatformKind() != other.getPlatformKind() || referenceMask != other.referenceMask || referenceCompressionMask != other.referenceCompressionMask) {
return false;
}
if (isDerivedReference()) {
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/CompilationAlarm.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/util/CompilationAlarm.java Mon Jan 08 08:53:14 2018 -0800
@@ -22,6 +22,7 @@
*/
package org.graalvm.compiler.core.common.util;
+import org.graalvm.compiler.debug.Assertions;
import org.graalvm.compiler.options.Option;
import org.graalvm.compiler.options.OptionKey;
import org.graalvm.compiler.options.OptionType;
@@ -34,7 +35,8 @@
public static class Options {
// @formatter:off
- @Option(help = "Time limit in seconds before a compilation expires (0 to disable the limit).", type = OptionType.Debug)
+ @Option(help = "Time limit in seconds before a compilation expires (0 to disable the limit). " +
+ "The compilation alarm will be implicitly disabled if assertions are enabled.", type = OptionType.Debug)
public static final OptionKey<Integer> CompilationExpirationPeriod = new OptionKey<>(300);
// @formatter:on
}
@@ -85,15 +87,16 @@
/**
* Starts an alarm for setting a time limit on a compilation if there isn't already an active
- * alarm and {@link CompilationAlarm.Options#CompilationExpirationPeriod}{@code > 0}. The
- * returned value can be used in a try-with-resource statement to disable the alarm once the
- * compilation is finished.
+ * alarm, if assertions are disabled and
+ * {@link CompilationAlarm.Options#CompilationExpirationPeriod}{@code > 0}. The returned value
+ * can be used in a try-with-resource statement to disable the alarm once the compilation is
+ * finished.
*
* @return a {@link CompilationAlarm} if there was no current alarm for the calling thread
* before this call otherwise {@code null}
*/
public static CompilationAlarm trackCompilationPeriod(OptionValues options) {
- int period = Options.CompilationExpirationPeriod.getValue(options);
+ int period = Assertions.assertionsEnabled() ? 0 : Options.CompilationExpirationPeriod.getValue(options);
if (period > 0) {
CompilationAlarm current = currentAlarm.get();
if (current == null) {
@@ -105,4 +108,5 @@
}
return null;
}
+
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.sparc/src/org/graalvm/compiler/core/sparc/SPARCLIRKindTool.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.sparc/src/org/graalvm/compiler/core/sparc/SPARCLIRKindTool.java Mon Jan 08 08:53:14 2018 -0800
@@ -68,7 +68,7 @@
@Override
public LIRKind getNarrowOopKind() {
- return LIRKind.reference(SPARCKind.WORD);
+ return LIRKind.compressedReference(SPARCKind.WORD);
}
@Override
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CooperativePhaseTest.java Tue Dec 26 13:38:31 2017 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,149 +0,0 @@
-/*
- * Copyright (c) 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.
- *
- * 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 org.graalvm.compiler.core.test;
-
-import static org.graalvm.compiler.core.common.util.CompilationAlarm.Options.CompilationExpirationPeriod;
-
-import org.graalvm.compiler.core.common.RetryableBailoutException;
-import org.graalvm.compiler.core.common.util.CompilationAlarm;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.Phase;
-import org.junit.Test;
-
-public class CooperativePhaseTest extends GraalCompilerTest {
-
- public static void snippet() {
- // dummy snippet
- }
-
- private static class CooperativePhase extends Phase {
-
- @Override
- protected void run(StructuredGraph graph) {
- CompilationAlarm compilationAlarm = CompilationAlarm.current();
- while (true) {
- sleep(200);
- if (compilationAlarm.hasExpired()) {
- return;
- }
- }
- }
-
- }
-
- private static class UnCooperativePhase extends Phase {
-
- @Override
- protected void run(StructuredGraph graph) {
- CompilationAlarm compilationAlarm = CompilationAlarm.current();
- while (true) {
- sleep(200);
- if (compilationAlarm.hasExpired()) {
- throw new RetryableBailoutException("Expiring...");
- }
- }
- }
-
- }
-
- private static class PartiallyCooperativePhase extends Phase {
-
- @Override
- protected void run(StructuredGraph graph) {
- CompilationAlarm compilationAlarm = CompilationAlarm.current();
- for (int i = 0; i < 10; i++) {
- sleep(200);
- if (compilationAlarm.hasExpired()) {
- throw new RuntimeException("Phase must not exit in the timeout path");
- }
- }
- }
- }
-
- private static class CooperativePhaseWithoutAlarm extends Phase {
-
- @Override
- protected void run(StructuredGraph graph) {
- CompilationAlarm compilationAlarm = CompilationAlarm.current();
- if (compilationAlarm.hasExpired()) {
- throw new RuntimeException("Phase must not exit in the timeout path");
- }
- }
- }
-
- private static void sleep(long millis) {
- try {
- Thread.sleep(millis);
- } catch (InterruptedException e) {
- GraalError.shouldNotReachHere(e.getCause());
- }
- }
-
- @Test(timeout = 60_000)
- @SuppressWarnings("try")
- public void test01() {
- initializeForTimeout();
- OptionValues initialOptions = getInitialOptions();
- OptionValues options = new OptionValues(initialOptions, CompilationExpirationPeriod, 1/* sec */);
- try (CompilationAlarm c1 = CompilationAlarm.trackCompilationPeriod(options)) {
- StructuredGraph g = parseEager("snippet", AllowAssumptions.NO, options);
- new CooperativePhase().apply(g);
- }
- }
-
- @Test(expected = RetryableBailoutException.class, timeout = 60_000)
- @SuppressWarnings("try")
- public void test02() {
- initializeForTimeout();
- OptionValues initialOptions = getInitialOptions();
- OptionValues options = new OptionValues(initialOptions, CompilationExpirationPeriod, 1/* sec */);
- try (CompilationAlarm c1 = CompilationAlarm.trackCompilationPeriod(options)) {
- StructuredGraph g = parseEager("snippet", AllowAssumptions.NO, options);
- new UnCooperativePhase().apply(g);
- }
- }
-
- @Test(timeout = 60_000)
- @SuppressWarnings("try")
- public void test03() {
- initializeForTimeout();
- // 0 disables alarm utility
- OptionValues initialOptions = getInitialOptions();
- OptionValues options = new OptionValues(initialOptions, CompilationExpirationPeriod, 0);
- try (CompilationAlarm c1 = CompilationAlarm.trackCompilationPeriod(options)) {
- StructuredGraph g = parseEager("snippet", AllowAssumptions.NO, options);
- new PartiallyCooperativePhase().apply(g);
- }
- }
-
- @Test(timeout = 60_000)
- @SuppressWarnings("try")
- public void test04() {
- initializeForTimeout();
- StructuredGraph g = parseEager("snippet", AllowAssumptions.NO);
- new CooperativePhaseWithoutAlarm().apply(g);
- }
-}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CountedLoopTest.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/CountedLoopTest.java Mon Jan 08 08:53:14 2018 -0800
@@ -264,7 +264,7 @@
}
@Override
- protected boolean checkMidTierGraph(StructuredGraph graph) {
+ protected boolean checkHighTierGraph(StructuredGraph graph) {
LoopsData loops = new LoopsData(graph);
loops.detectedCountedLoops();
for (IVPropertyNode node : graph.getNodes().filter(IVPropertyNode.class)) {
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/Assertions.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/Assertions.java Mon Jan 08 08:53:14 2018 -0800
@@ -54,8 +54,8 @@
// @formatter:off
public static class Options {
- @Option(help = "Enable expensive assertions. (Require normal assertions enabled)", type = OptionType.Debug)
- public static final OptionKey<Boolean> DetailedAsserts = new OptionKey<>(true);
+ @Option(help = "Enable expensive assertions if normal assertions (i.e. -ea or -esa) are enabled.", type = OptionType.Debug)
+ public static final OptionKey<Boolean> DetailedAsserts = new OptionKey<>(false);
}
// @formatter:on
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Graph.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Graph.java Mon Jan 08 08:53:14 2018 -0800
@@ -472,6 +472,11 @@
}
}
+ public <T extends Node> T addWithoutUniqueWithInputs(T node) {
+ addInputs(node);
+ return addHelper(node);
+ }
+
private final class AddInputsFilter extends Node.EdgeVisitor {
@Override
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotForeignCallsProvider.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotForeignCallsProvider.java Mon Jan 08 08:53:14 2018 -0800
@@ -30,6 +30,7 @@
import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.RegisterEffect.PRESERVES_REGISTERS;
import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.Transition.LEAF;
import static org.graalvm.compiler.hotspot.replacements.CRC32Substitutions.UPDATE_BYTES_CRC32;
+import static org.graalvm.compiler.hotspot.replacements.CRC32CSubstitutions.UPDATE_BYTES_CRC32C;
import static org.graalvm.word.LocationIdentity.any;
import org.graalvm.compiler.core.common.LIRKind;
@@ -79,6 +80,9 @@
if (config.useCRC32Intrinsics) {
registerForeignCall(UPDATE_BYTES_CRC32, config.updateBytesCRC32Stub, NativeCall, PRESERVES_REGISTERS, LEAF, NOT_REEXECUTABLE, any());
}
+ if (config.useCRC32CIntrinsics) {
+ registerForeignCall(UPDATE_BYTES_CRC32C, config.updateBytesCRC32C, NativeCall, PRESERVES_REGISTERS, LEAF, NOT_REEXECUTABLE, any());
+ }
super.initialize(providers, options);
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLIRGenerator.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLIRGenerator.java Mon Jan 08 08:53:14 2018 -0800
@@ -30,8 +30,8 @@
import org.graalvm.compiler.asm.Label;
import org.graalvm.compiler.asm.aarch64.AArch64Address.AddressingMode;
+import org.graalvm.compiler.asm.aarch64.AArch64Assembler.ConditionFlag;
import org.graalvm.compiler.asm.aarch64.AArch64Assembler.PrefetchMode;
-import org.graalvm.compiler.asm.aarch64.AArch64Assembler.ConditionFlag;
import org.graalvm.compiler.core.aarch64.AArch64ArithmeticLIRGenerator;
import org.graalvm.compiler.core.aarch64.AArch64LIRGenerator;
import org.graalvm.compiler.core.aarch64.AArch64LIRKindTool;
@@ -202,7 +202,7 @@
assert inputKind.getPlatformKind() == AArch64Kind.QWORD;
if (inputKind.isReference(0)) {
// oop
- Variable result = newVariable(LIRKind.reference(AArch64Kind.DWORD));
+ Variable result = newVariable(LIRKind.compressedReference(AArch64Kind.DWORD));
append(new AArch64HotSpotMove.CompressPointer(result, asAllocatable(pointer), getProviders().getRegisters().getHeapBaseRegister().asValue(), encoding, nonNull));
return result;
} else {
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotForeignCallsProvider.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotForeignCallsProvider.java Mon Jan 08 08:53:14 2018 -0800
@@ -33,6 +33,7 @@
import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.Transition.LEAF;
import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.Transition.LEAF_NOFP;
import static org.graalvm.compiler.hotspot.replacements.CRC32Substitutions.UPDATE_BYTES_CRC32;
+import static org.graalvm.compiler.hotspot.replacements.CRC32CSubstitutions.UPDATE_BYTES_CRC32C;
import static org.graalvm.word.LocationIdentity.any;
import org.graalvm.compiler.core.common.LIRKind;
@@ -99,6 +100,9 @@
// This stub does callee saving
registerForeignCall(UPDATE_BYTES_CRC32, config.updateBytesCRC32Stub, NativeCall, PRESERVES_REGISTERS, LEAF_NOFP, NOT_REEXECUTABLE, any());
}
+ if (config.useCRC32CIntrinsics) {
+ registerForeignCall(UPDATE_BYTES_CRC32C, config.updateBytesCRC32C, NativeCall, PRESERVES_REGISTERS, LEAF_NOFP, NOT_REEXECUTABLE, any());
+ }
super.initialize(providers, options);
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLIRKindTool.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.amd64/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLIRKindTool.java Mon Jan 08 08:53:14 2018 -0800
@@ -22,14 +22,15 @@
*/
package org.graalvm.compiler.hotspot.amd64;
-import jdk.vm.ci.amd64.AMD64Kind;
import org.graalvm.compiler.core.amd64.AMD64LIRKindTool;
import org.graalvm.compiler.core.common.LIRKind;
+import jdk.vm.ci.amd64.AMD64Kind;
+
public class AMD64HotSpotLIRKindTool extends AMD64LIRKindTool {
@Override
public LIRKind getNarrowOopKind() {
- return LIRKind.reference(AMD64Kind.DWORD);
+ return LIRKind.compressedReference(AMD64Kind.DWORD);
}
@Override
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotForeignCallsProvider.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotForeignCallsProvider.java Mon Jan 08 08:53:14 2018 -0800
@@ -34,6 +34,7 @@
import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.RegisterEffect.PRESERVES_REGISTERS;
import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.Transition.LEAF_NOFP;
import static org.graalvm.compiler.hotspot.replacements.CRC32Substitutions.UPDATE_BYTES_CRC32;
+import static org.graalvm.compiler.hotspot.replacements.CRC32CSubstitutions.UPDATE_BYTES_CRC32C;
import static org.graalvm.word.LocationIdentity.any;
import org.graalvm.compiler.core.common.LIRKind;
@@ -87,6 +88,9 @@
// This stub does callee saving
registerForeignCall(UPDATE_BYTES_CRC32, config.updateBytesCRC32Stub, NativeCall, PRESERVES_REGISTERS, LEAF_NOFP, NOT_REEXECUTABLE, any());
}
+ if (config.useCRC32CIntrinsics) {
+ registerForeignCall(UPDATE_BYTES_CRC32C, config.updateBytesCRC32C, NativeCall, PRESERVES_REGISTERS, LEAF_NOFP, NOT_REEXECUTABLE, any());
+ }
super.initialize(providers, options);
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotLIRGenerator.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc/src/org/graalvm/compiler/hotspot/sparc/SPARCHotSpotLIRGenerator.java Mon Jan 08 08:53:14 2018 -0800
@@ -307,7 +307,7 @@
assert inputKind.getPlatformKind() == XWORD : inputKind;
if (inputKind.isReference(0)) {
// oop
- Variable result = newVariable(LIRKind.reference(WORD));
+ Variable result = newVariable(LIRKind.compressedReference(WORD));
append(new SPARCHotSpotMove.CompressPointer(result, asAllocatable(pointer), getProviders().getRegisters().getHeapBaseRegister().asValue(), encoding, nonNull));
return result;
} else {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CRC32CSubstitutionsTest.java Mon Jan 08 08:53:14 2018 -0800
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.graalvm.compiler.hotspot.test;
+
+import java.io.DataInputStream;
+import java.io.InputStream;
+import java.nio.ByteBuffer;
+import java.util.zip.Checksum;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+
+import org.graalvm.compiler.test.GraalTest;
+import org.graalvm.compiler.core.test.GraalCompilerTest;
+
+import org.junit.Test;
+
+import static org.junit.Assume.assumeFalse;
+
+/**
+ * Tests compiled calls to {@link java.util.zip.CRC32C}.
+ */
+@SuppressWarnings("javadoc")
+public class CRC32CSubstitutionsTest extends GraalCompilerTest {
+
+ public static long updateBytes(byte[] input, int offset, int end) throws Throwable {
+ Class<?> crcClass = Class.forName("java.util.zip.CRC32C");
+ MethodHandle newMH = MethodHandles.publicLookup().findConstructor(crcClass, MethodType.methodType(void.class));
+ Checksum crc = (Checksum) newMH.invoke();
+ crc.update(input, offset, end);
+ return crc.getValue();
+ }
+
+ @Test
+ public void test1() throws Throwable {
+ assumeFalse(GraalTest.Java8OrEarlier);
+ String classfileName = CRC32CSubstitutionsTest.class.getSimpleName().replace('.', '/') + ".class";
+ InputStream s = CRC32CSubstitutionsTest.class.getResourceAsStream(classfileName);
+ byte[] buf = new byte[s.available()];
+ new DataInputStream(s).readFully(buf);
+ int end = buf.length;
+ for (int offset = 0; offset < buf.length; offset++) {
+ test("updateBytes", buf, offset, end);
+ }
+ }
+
+ public static long updateByteBuffer(ByteBuffer buffer) throws Throwable {
+ Class<?> crcClass = Class.forName("java.util.zip.CRC32C");
+ MethodHandle newMH = MethodHandles.publicLookup().findConstructor(crcClass, MethodType.methodType(void.class));
+ MethodHandle updateMH = MethodHandles.publicLookup().findVirtual(crcClass, "update", MethodType.methodType(void.class, ByteBuffer.class));
+ Checksum crc = (Checksum) newMH.invoke();
+ buffer.rewind();
+ updateMH.invokeExact(crc, buffer); // Checksum.update(ByteBuffer) is also available since 9
+ return crc.getValue();
+ }
+
+ @Test
+ public void test2() throws Throwable {
+ assumeFalse(GraalTest.Java8OrEarlier);
+ String classfileName = CRC32CSubstitutionsTest.class.getSimpleName().replace('.', '/') + ".class";
+ InputStream s = CRC32CSubstitutionsTest.class.getResourceAsStream(classfileName);
+ byte[] buf = new byte[s.available()];
+ new DataInputStream(s).readFully(buf);
+
+ ByteBuffer directBuf = ByteBuffer.allocateDirect(buf.length);
+ directBuf.put(buf);
+ ByteBuffer heapBuf = ByteBuffer.wrap(buf);
+
+ test("updateByteBuffer", directBuf);
+ test("updateByteBuffer", heapBuf);
+ }
+
+}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CheckGraalIntrinsics.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/CheckGraalIntrinsics.java Mon Jan 08 08:53:14 2018 -0800
@@ -466,6 +466,13 @@
}
}
+ // CRC32C intrinsics
+ if (!config.useCRC32CIntrinsics) {
+ add(IGNORE,
+ "java/util/zip/CRC32C.updateBytes(I[BII)I",
+ "java/util/zip/CRC32C.updateDirectByteBuffer(IJII)I");
+ }
+
// AES intrinsics
if (!config.useAESIntrinsics) {
if (isJDK9OrHigher()) {
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/JVMCIInfopointErrorTest.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.test/src/org/graalvm/compiler/hotspot/test/JVMCIInfopointErrorTest.java Mon Jan 08 08:53:14 2018 -0800
@@ -33,9 +33,9 @@
import org.graalvm.compiler.core.common.LIRKind;
import org.graalvm.compiler.core.common.type.StampFactory;
import org.graalvm.compiler.core.test.GraalCompilerTest;
-import org.graalvm.compiler.debug.DebugHandlersFactory;
import org.graalvm.compiler.debug.DebugContext;
import org.graalvm.compiler.debug.DebugContext.Scope;
+import org.graalvm.compiler.debug.DebugHandlersFactory;
import org.graalvm.compiler.graph.NodeClass;
import org.graalvm.compiler.hotspot.HotSpotCompiledCodeBuilder;
import org.graalvm.compiler.lir.FullInfopointOp;
@@ -150,7 +150,7 @@
codeCache.addCode(method, compiledCode, null, null);
}
- @Test(expected = JVMCIError.class)
+ @Test(expected = Error.class)
public void testInvalidShortOop() {
test((tool, state, safepoint) -> {
PlatformKind kind = tool.target().arch.getPlatformKind(JavaKind.Short);
@@ -163,14 +163,14 @@
});
}
- @Test(expected = JVMCIError.class)
+ @Test(expected = Error.class)
public void testInvalidShortDerivedOop() {
test((tool, state, safepoint) -> {
Variable baseOop = tool.newVariable(LIRKind.fromJavaKind(tool.target().arch, JavaKind.Object));
tool.append(new ValueDef(baseOop));
PlatformKind kind = tool.target().arch.getPlatformKind(JavaKind.Short);
- LIRKind lirKind = LIRKind.derivedReference(kind, baseOop);
+ LIRKind lirKind = LIRKind.derivedReference(kind, baseOop, false);
Variable var = tool.newVariable(lirKind);
tool.append(new ValueDef(var));
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfig.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfig.java Mon Jan 08 08:53:14 2018 -0800
@@ -165,6 +165,7 @@
public final boolean usePopCountInstruction = getFlag("UsePopCountInstruction", Boolean.class);
public final boolean useAESIntrinsics = getFlag("UseAESIntrinsics", Boolean.class);
public final boolean useCRC32Intrinsics = getFlag("UseCRC32Intrinsics", Boolean.class);
+ public final boolean useCRC32CIntrinsics = isJDK8 ? false : getFlag("UseCRC32CIntrinsics", Boolean.class);
public final boolean threadLocalHandshakes = getFlag("ThreadLocalHandshakes", Boolean.class, false);
private final boolean useMultiplyToLenIntrinsic = getFlag("UseMultiplyToLenIntrinsic", Boolean.class);
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotHostBackend.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotHostBackend.java Mon Jan 08 08:53:14 2018 -0800
@@ -45,6 +45,7 @@
import jdk.vm.ci.common.InitTimer;
import jdk.vm.ci.hotspot.HotSpotCallingConventionType;
import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime;
+import jdk.vm.ci.meta.JavaKind;
import jdk.vm.ci.meta.JavaType;
import jdk.vm.ci.runtime.JVMCICompiler;
@@ -142,7 +143,8 @@
@Override
public ReferenceMapBuilder newReferenceMapBuilder(int totalFrameSize) {
- return new HotSpotReferenceMapBuilder(totalFrameSize, config.maxOopMapStackOffset);
+ int uncompressedReferenceSize = getTarget().arch.getPlatformKind(JavaKind.Object).getSizeInBytes();
+ return new HotSpotReferenceMapBuilder(totalFrameSize, config.maxOopMapStackOffset, uncompressedReferenceSize);
}
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotReferenceMapBuilder.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotReferenceMapBuilder.java Mon Jan 08 08:53:14 2018 -0800
@@ -22,15 +22,15 @@
*/
package org.graalvm.compiler.hotspot;
-import static org.graalvm.compiler.lir.LIRValueUtil.isJavaConstant;
import static jdk.vm.ci.code.ValueUtil.asRegister;
import static jdk.vm.ci.code.ValueUtil.asStackSlot;
import static jdk.vm.ci.code.ValueUtil.isRegister;
+import static org.graalvm.compiler.lir.LIRValueUtil.isJavaConstant;
import java.util.ArrayList;
+import org.graalvm.compiler.core.common.LIRKind;
import org.graalvm.compiler.core.common.PermanentBailoutException;
-import org.graalvm.compiler.core.common.LIRKind;
import org.graalvm.compiler.debug.GraalError;
import org.graalvm.compiler.lir.LIRFrameState;
import org.graalvm.compiler.lir.Variable;
@@ -52,8 +52,10 @@
private final int totalFrameSize;
private final int maxOopMapStackOffset;
+ private final int uncompressedReferenceSize;
- public HotSpotReferenceMapBuilder(int totalFrameSize, int maxOopMapStackOffset) {
+ public HotSpotReferenceMapBuilder(int totalFrameSize, int maxOopMapStackOffset, int uncompressedReferenceSize) {
+ this.uncompressedReferenceSize = uncompressedReferenceSize;
this.objectValues = new ArrayList<>();
this.objectCount = 0;
this.maxOopMapStackOffset = maxOopMapStackOffset;
@@ -116,6 +118,7 @@
for (int i = 0; i < kind.getPlatformKind().getVectorLength(); i++) {
if (kind.isReference(i)) {
+ assert kind.isCompressedReference(i) ? (bytes < uncompressedReferenceSize) : (bytes == uncompressedReferenceSize);
objects[idx] = toLocation(obj, i * bytes);
derivedBase[idx] = base;
sizeInBytes[idx] = bytes;
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java Mon Jan 08 08:53:14 2018 -0800
@@ -46,6 +46,7 @@
import org.graalvm.compiler.hotspot.replacements.AESCryptSubstitutions;
import org.graalvm.compiler.hotspot.replacements.BigIntegerSubstitutions;
import org.graalvm.compiler.hotspot.replacements.CRC32Substitutions;
+import org.graalvm.compiler.hotspot.replacements.CRC32CSubstitutions;
import org.graalvm.compiler.hotspot.replacements.CallSiteTargetNode;
import org.graalvm.compiler.hotspot.replacements.CipherBlockChainingSubstitutions;
import org.graalvm.compiler.hotspot.replacements.ClassGetHubNode;
@@ -165,6 +166,7 @@
registerConstantPoolPlugins(invocationPlugins, wordTypes, config, replacementBytecodeProvider);
registerAESPlugins(invocationPlugins, config, replacementBytecodeProvider);
registerCRC32Plugins(invocationPlugins, config, replacementBytecodeProvider);
+ registerCRC32CPlugins(invocationPlugins, config, replacementBytecodeProvider);
registerBigIntegerPlugins(invocationPlugins, config, replacementBytecodeProvider);
registerSHAPlugins(invocationPlugins, config, replacementBytecodeProvider);
registerUnsafePlugins(invocationPlugins, replacementBytecodeProvider);
@@ -530,4 +532,12 @@
}
}
}
+
+ private static void registerCRC32CPlugins(InvocationPlugins plugins, GraalHotSpotVMConfig config, BytecodeProvider bytecodeProvider) {
+ if (config.useCRC32CIntrinsics) {
+ Registration r = new Registration(plugins, "java.util.zip.CRC32C", bytecodeProvider);
+ r.registerMethodSubstitution(CRC32CSubstitutions.class, "updateBytes", int.class, byte[].class, int.class, int.class);
+ r.registerMethodSubstitution(CRC32CSubstitutions.class, "updateDirectByteBuffer", int.class, long.class, int.class, int.class);
+ }
+ }
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/replacements/CRC32CSubstitutions.java Mon Jan 08 08:53:14 2018 -0800
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.graalvm.compiler.hotspot.replacements;
+
+import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.arrayBaseOffset;
+
+import org.graalvm.compiler.api.replacements.ClassSubstitution;
+import org.graalvm.compiler.api.replacements.MethodSubstitution;
+import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
+import org.graalvm.compiler.graph.Node.ConstantNodeParameter;
+import org.graalvm.compiler.graph.Node.NodeIntrinsic;
+import org.graalvm.compiler.hotspot.nodes.ComputeObjectAddressNode;
+import org.graalvm.compiler.nodes.extended.ForeignCallNode;
+import org.graalvm.compiler.word.Word;
+import org.graalvm.word.WordBase;
+import org.graalvm.word.WordFactory;
+
+import jdk.vm.ci.meta.JavaKind;
+
+// JaCoCo Exclude
+
+/**
+ * Substitutions for java.util.zip.CRC32C.
+ */
+@ClassSubstitution(className = "java.util.zip.CRC32C", optional = true)
+public class CRC32CSubstitutions {
+
+ @MethodSubstitution
+ static int updateBytes(int crc, byte[] b, int off, int end) {
+ Word bufAddr = WordFactory.unsigned(ComputeObjectAddressNode.get(b, arrayBaseOffset(JavaKind.Byte) + off));
+ return updateBytesCRC32(UPDATE_BYTES_CRC32C, crc, bufAddr, end - off);
+ }
+
+ @MethodSubstitution
+ static int updateDirectByteBuffer(int crc, long addr, int off, int end) {
+ WordBase bufAddr = WordFactory.unsigned(addr).add(off);
+ return updateBytesCRC32(UPDATE_BYTES_CRC32C, crc, bufAddr, end - off);
+ }
+
+ public static final ForeignCallDescriptor UPDATE_BYTES_CRC32C = new ForeignCallDescriptor("updateBytesCRC32C", int.class, int.class, WordBase.class, int.class);
+
+ @NodeIntrinsic(ForeignCallNode.class)
+ public static native int updateBytesCRC32(@ConstantNodeParameter ForeignCallDescriptor descriptor, int crc, WordBase buf, int length);
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_idiv_overflow.java Mon Jan 08 08:53:14 2018 -0800
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.graalvm.compiler.jtt.bytecode;
+
+import org.junit.Test;
+
+import org.graalvm.compiler.jtt.JTTTest;
+
+/*
+ */
+public class BC_idiv_overflow extends JTTTest {
+
+ public static int test(int a, int b) {
+ return a / (b | 1);
+ }
+
+ @Test
+ public void run0() throws Throwable {
+ runTest("test", Integer.MIN_VALUE, -1);
+ }
+
+ @Test
+ public void run1() throws Throwable {
+ runTest("test", Integer.MIN_VALUE, 1);
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.jtt/src/org/graalvm/compiler/jtt/bytecode/BC_ldiv_overflow.java Mon Jan 08 08:53:14 2018 -0800
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.graalvm.compiler.jtt.bytecode;
+
+import org.junit.Test;
+
+import org.graalvm.compiler.jtt.JTTTest;
+
+/*
+ */
+public class BC_ldiv_overflow extends JTTTest {
+
+ public static long test(long a, long b) {
+ return a / (b | 1);
+ }
+
+ @Test
+ public void run0() throws Throwable {
+ runTest("test", Long.MIN_VALUE, -1L);
+ }
+
+ @Test
+ public void run1() throws Throwable {
+ runTest("test", Long.MIN_VALUE, 1L);
+ }
+
+}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/IfNode.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/IfNode.java Mon Jan 08 08:53:14 2018 -0800
@@ -30,8 +30,6 @@
import java.util.Iterator;
import java.util.List;
-import jdk.vm.ci.meta.MetaAccessProvider;
-import jdk.vm.ci.meta.ResolvedJavaType;
import org.graalvm.compiler.core.common.calc.Condition;
import org.graalvm.compiler.core.common.type.IntegerStamp;
import org.graalvm.compiler.core.common.type.Stamp;
@@ -67,7 +65,9 @@
import jdk.vm.ci.meta.Constant;
import jdk.vm.ci.meta.JavaConstant;
import jdk.vm.ci.meta.JavaKind;
+import jdk.vm.ci.meta.MetaAccessProvider;
import jdk.vm.ci.meta.PrimitiveConstant;
+import jdk.vm.ci.meta.ResolvedJavaType;
/**
* The {@code IfNode} represents a branch that can go one of two directions depending on the outcome
@@ -416,6 +416,7 @@
if (result.graph() == null) {
result = graph().addOrUniqueWithInputs(result);
}
+ result = proxyReplacement(result);
/*
* This optimization can be performed even if multiple values merge at this phi
* since the two inputs get simplified into one.
@@ -698,6 +699,7 @@
ValueNode falseValue = singlePhi.valueAt(falseEnd);
ValueNode conditional = canonicalizeConditionalCascade(tool, trueValue, falseValue);
if (conditional != null) {
+ conditional = proxyReplacement(conditional);
singlePhi.setValueAt(trueEnd, conditional);
removeThroughFalseBranch(tool, merge);
return true;
@@ -729,6 +731,36 @@
return false;
}
+ private ValueNode proxyReplacement(ValueNode replacement) {
+ /*
+ * Special case: Every empty diamond we collapse to a conditional node can potentially
+ * contain loop exit nodes on both branches. See the graph below: The two loop exits
+ * (instanceof begin node) exit the same loop. The resulting phi is defined outside the
+ * loop, but the resulting conditional node will be inside the loop, so we need to proxy the
+ * resulting conditional node. Callers of this method ensure that true and false successor
+ * have no usages, therefore a and b in the graph below can never be proxies themselves.
+ */
+ // @formatter:off
+ // +--+
+ // |If|
+ // +--+ +-----+ +-----+
+ // +----+ +----+ | a | | b |
+ // |Lex | |Lex | +----^+ +^----+
+ // +----+ +----+ | |
+ // +-------+ +---+
+ // | Merge +---------+Phi|
+ // +-------+ +---+
+ // @formatter:on
+ if (this.graph().hasValueProxies()) {
+ if (trueSuccessor instanceof LoopExitNode && falseSuccessor instanceof LoopExitNode) {
+ assert ((LoopExitNode) trueSuccessor).loopBegin() == ((LoopExitNode) falseSuccessor).loopBegin();
+ assert trueSuccessor.usages().isEmpty() && falseSuccessor.usages().isEmpty();
+ return this.graph().addOrUnique(new ValueProxyNode(replacement, (LoopExitNode) trueSuccessor));
+ }
+ }
+ return replacement;
+ }
+
protected void removeThroughFalseBranch(SimplifierTool tool, AbstractMergeNode merge) {
AbstractBeginNode trueBegin = trueSuccessor();
LogicNode conditionNode = condition();
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IntegerDivRemNode.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/IntegerDivRemNode.java Mon Jan 08 08:53:14 2018 -0800
@@ -60,7 +60,8 @@
// Assigning canDeopt during constructor, because it must never change during lifetime of
// the node.
- this.canDeopt = ((IntegerStamp) getY().stamp(NodeView.DEFAULT)).contains(0);
+ IntegerStamp yStamp = (IntegerStamp) getY().stamp(NodeView.DEFAULT);
+ this.canDeopt = yStamp.contains(0) || yStamp.contains(-1);
}
public final Op getOp() {
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/ProfileCompiledMethodsPhase.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/ProfileCompiledMethodsPhase.java Mon Jan 08 08:53:14 2018 -0800
@@ -121,7 +121,7 @@
private static void addSectionCounters(FixedWithNextNode start, Collection<Block> sectionBlocks, Collection<Loop<Block>> childLoops, ScheduleResult schedule, ControlFlowGraph cfg) {
HashSet<Block> blocks = new HashSet<>(sectionBlocks);
- for (Loop<?> loop : childLoops) {
+ for (Loop<Block> loop : childLoops) {
blocks.removeAll(loop.getBlocks());
}
double weight = getSectionWeight(schedule, blocks) / cfg.blockFor(start).probability();
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/GraphPrinter.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.printer/src/org/graalvm/compiler/printer/GraphPrinter.java Mon Jan 08 08:53:14 2018 -0800
@@ -194,15 +194,26 @@
static String constantToString(Object value) {
Class<?> c = value.getClass();
+ String suffix = "";
if (c.isArray()) {
return constantArrayToString(value);
} else if (value instanceof Enum) {
return ((Enum<?>) value).name();
} else if (isToStringTrusted(c)) {
- return value.toString();
+ try {
+ return value.toString();
+ } catch (Throwable t) {
+ suffix = "[toString error: " + t.getClass().getName() + "]";
+ if (isToStringTrusted(t.getClass())) {
+ try {
+ suffix = "[toString error: " + t + "]";
+ } catch (Throwable t2) {
+ // No point in going further
+ }
+ }
+ }
}
- return MetaUtil.getSimpleName(c, true) + "@" + Integer.toHexString(System.identityHashCode(value));
-
+ return MetaUtil.getSimpleName(c, true) + "@" + Integer.toHexString(System.identityHashCode(value)) + suffix;
}
static String constantArrayToString(Object array) {
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StandardGraphBuilderPlugins.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/StandardGraphBuilderPlugins.java Mon Jan 08 08:53:14 2018 -0800
@@ -141,6 +141,7 @@
registerJMHBlackholePlugins(plugins, bytecodeProvider);
registerJFRThrowablePlugins(plugins, bytecodeProvider);
registerMethodHandleImplPlugins(plugins, snippetReflection, bytecodeProvider);
+ registerJcovCollectPlugins(plugins, bytecodeProvider);
}
private static final Field STRING_VALUE_FIELD;
@@ -910,4 +911,21 @@
}
});
}
+
+ /**
+ * Registers a plugin to ignore {@code com.sun.tdk.jcov.runtime.Collect.hit} within an
+ * intrinsic.
+ */
+ private static void registerJcovCollectPlugins(InvocationPlugins plugins, BytecodeProvider bytecodeProvider) {
+ Registration r = new Registration(plugins, "com.sun.tdk.jcov.runtime.Collect", bytecodeProvider);
+ r.register1("hit", int.class, new InvocationPlugin() {
+ @Override
+ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode object) {
+ if (b.parsingIntrinsic()) {
+ return true;
+ }
+ return false;
+ }
+ });
+ }
}
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/classfile/Classfile.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements/src/org/graalvm/compiler/replacements/classfile/Classfile.java Mon Jan 08 08:53:14 2018 -0800
@@ -47,7 +47,7 @@
private final List<ClassfileBytecode> codeAttributes;
private static final int MAJOR_VERSION_JAVA_MIN = 51;
- private static final int MAJOR_VERSION_JAVA_MAX = 54;
+ private static final int MAJOR_VERSION_JAVA_MAX = 55;
private static final int MAGIC = 0xCAFEBABE;
/**
--- a/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/GraphEffectList.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.virtual/src/org/graalvm/compiler/virtual/phases/ea/GraphEffectList.java Mon Jan 08 08:53:14 2018 -0800
@@ -34,7 +34,6 @@
import org.graalvm.compiler.nodes.NodeView;
import org.graalvm.compiler.nodes.PhiNode;
import org.graalvm.compiler.nodes.PiNode;
-import org.graalvm.compiler.nodes.ProxyNode;
import org.graalvm.compiler.nodes.StructuredGraph;
import org.graalvm.compiler.nodes.ValueNode;
import org.graalvm.compiler.nodes.debug.DynamicCounterNode;
@@ -116,14 +115,7 @@
*/
public void addFloatingNode(ValueNode node, @SuppressWarnings("unused") String cause) {
add("add floating node", graph -> {
- if (node instanceof ProxyNode) {
- ProxyNode proxyNode = (ProxyNode) node;
- ValueNode value = proxyNode.value();
- if (!value.isAlive()) {
- graph.addWithoutUnique(value);
- }
- }
- graph.addWithoutUnique(node);
+ graph.addWithoutUniqueWithInputs(node);
});
}
--- a/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ToolOption.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ToolOption.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, 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
@@ -159,6 +159,7 @@
public void process(Helper helper, String arg) {
helper.encoding = arg;
helper.setCompilerOpt(opt, arg);
+ helper.setFileManagerOpt(Option.ENCODING, arg);
}
},
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MethodWriterImpl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MethodWriterImpl.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, 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
@@ -264,8 +264,7 @@
.addTab(resources.getText("doclet.Abstract_Methods"), utils::isAbstract)
.addTab(resources.getText("doclet.Concrete_Methods"),
e -> !utils.isAbstract(e) && !utils.isInterface(e.getEnclosingElement()))
- .addTab(resources.getText("doclet.Default_Methods"),
- e -> !utils.isAbstract(e) && utils.isInterface(e.getEnclosingElement()))
+ .addTab(resources.getText("doclet.Default_Methods"), utils::isDefault)
.addTab(resources.getText("doclet.Deprecated_Methods"),
e -> utils.isDeprecated(e) || utils.isDeprecated(typeElement))
.setTabScriptVariable("methods")
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java Mon Jan 08 08:53:14 2018 -0800
@@ -820,11 +820,14 @@
Content summary = new ContentBuilder();
if (display(usesTrees)) {
description = usesTrees.get(t);
- if (description != null) {
- summary.addContent(description);
+ if (description != null && !description.isEmpty()) {
+ summary.addContent(HtmlTree.DIV(HtmlStyle.block, description));
+ } else {
+ addSummaryComment(t, summary);
}
+ } else {
+ summary.addContent(Contents.SPACE);
}
- addSummaryComment(t, summary);
table.addRow(typeLinkContent, summary);
}
}
@@ -847,11 +850,12 @@
Content desc = new ContentBuilder();
if (display(providesTrees)) {
description = providesTrees.get(srv);
- if (description != null) {
- desc.addContent(description);
+ desc.addContent((description != null && !description.isEmpty())
+ ? HtmlTree.DIV(HtmlStyle.block, description)
+ : Contents.SPACE);
+ } else {
+ desc.addContent(Contents.SPACE);
}
- }
- addSummaryComment(srv, desc);
// Only display the implementation details in the "all" mode.
if (moduleMode == ModuleMode.ALL && !implSet.isEmpty()) {
desc.addContent(new HtmlTree(HtmlTag.BR));
--- a/src/jdk.jshell/share/classes/jdk/internal/jshell/debug/InternalDebugControl.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.jshell/share/classes/jdk/internal/jshell/debug/InternalDebugControl.java Mon Jan 08 08:53:14 2018 -0800
@@ -4,7 +4,9 @@
*
* 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.
+ * 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
--- a/src/jdk.rmic/share/classes/sun/tools/java/RuntimeConstants.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.rmic/share/classes/sun/tools/java/RuntimeConstants.java Mon Jan 08 08:53:14 2018 -0800
@@ -67,7 +67,7 @@
/* Class File Constants */
int JAVA_MAGIC = 0xcafebabe;
int JAVA_MIN_SUPPORTED_VERSION = 45;
- int JAVA_MAX_SUPPORTED_VERSION = 54;
+ int JAVA_MAX_SUPPORTED_VERSION = 55;
int JAVA_MAX_SUPPORTED_MINOR_VERSION = 0;
/* Generate class file version for 1.1 by default */
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/AssignSymbols.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/AssignSymbols.java Mon Jan 08 08:53:14 2018 -0800
@@ -59,6 +59,7 @@
import java.util.Map;
import java.util.Set;
import jdk.nashorn.internal.ir.AccessNode;
+import jdk.nashorn.internal.ir.BaseNode;
import jdk.nashorn.internal.ir.BinaryNode;
import jdk.nashorn.internal.ir.Block;
import jdk.nashorn.internal.ir.CatchNode;
@@ -735,72 +736,13 @@
@Override
public Node leaveUnaryNode(final UnaryNode unaryNode) {
- switch (unaryNode.tokenType()) {
- case DELETE:
- return leaveDELETE(unaryNode);
- case TYPEOF:
+ if (unaryNode.tokenType() == TokenType.TYPEOF) {
return leaveTYPEOF(unaryNode);
- default:
+ } else {
return super.leaveUnaryNode(unaryNode);
}
}
- private Node leaveDELETE(final UnaryNode unaryNode) {
- final FunctionNode currentFunctionNode = lc.getCurrentFunction();
- final boolean strictMode = currentFunctionNode.isStrict();
- final Expression rhs = unaryNode.getExpression();
- final Expression strictFlagNode = (Expression)LiteralNode.newInstance(unaryNode, strictMode).accept(this);
-
- Request request = Request.DELETE;
- final List<Expression> args = new ArrayList<>();
-
- if (rhs instanceof IdentNode) {
- final IdentNode ident = (IdentNode)rhs;
- // If this is a declared variable or a function parameter, delete always fails (except for globals).
- final String name = ident.getName();
- final Symbol symbol = ident.getSymbol();
-
- if (symbol.isThis()) {
- // Can't delete "this", ignore and return true
- return LiteralNode.newInstance(unaryNode, true);
- }
- final Expression literalNode = LiteralNode.newInstance(unaryNode, name);
- final boolean failDelete = strictMode || (!symbol.isScope() && (symbol.isParam() || (symbol.isVar() && !symbol.isProgramLevel())));
-
- if (!failDelete) {
- args.add(compilerConstantIdentifier(SCOPE));
- }
- args.add(literalNode);
- args.add(strictFlagNode);
-
- if (failDelete) {
- request = Request.FAIL_DELETE;
- } else if ((symbol.isGlobal() && !symbol.isFunctionDeclaration()) || symbol.isProgramLevel()) {
- request = Request.SLOW_DELETE;
- }
- } else if (rhs instanceof AccessNode) {
- final Expression base = ((AccessNode)rhs).getBase();
- final String property = ((AccessNode)rhs).getProperty();
-
- args.add(base);
- args.add(LiteralNode.newInstance(unaryNode, property));
- args.add(strictFlagNode);
-
- } else if (rhs instanceof IndexNode) {
- final IndexNode indexNode = (IndexNode)rhs;
- final Expression base = indexNode.getBase();
- final Expression index = indexNode.getIndex();
-
- args.add(base);
- args.add(index);
- args.add(strictFlagNode);
-
- } else {
- throw new AssertionError("Unexpected delete with " + rhs.getClass().getName() + " expression");
- }
- return new RuntimeNode(unaryNode, request, args);
- }
-
@Override
public Node leaveForNode(final ForNode forNode) {
if (forNode.isForInOrOf()) {
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CodeGenerator.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CodeGenerator.java Mon Jan 08 08:53:14 2018 -0800
@@ -151,6 +151,7 @@
import jdk.nashorn.internal.runtime.UnwarrantedOptimismException;
import jdk.nashorn.internal.runtime.arrays.ArrayData;
import jdk.nashorn.internal.runtime.linker.LinkerCallSite;
+import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
import jdk.nashorn.internal.runtime.logging.DebugLogger;
import jdk.nashorn.internal.runtime.logging.Loggable;
import jdk.nashorn.internal.runtime.logging.Logger;
@@ -1142,6 +1143,12 @@
}
@Override
+ public boolean enterDELETE(final UnaryNode unaryNode) {
+ loadDELETE(unaryNode);
+ return false;
+ }
+
+ @Override
public boolean enterEQ(final BinaryNode binaryNode) {
loadCmp(binaryNode, Condition.EQ);
return false;
@@ -1279,7 +1286,7 @@
}
boolean useOptimisticTypes() {
- return !lc.inSplitNode() && compiler.useOptimisticTypes();
+ return !lc.inSplitLiteral() && compiler.useOptimisticTypes();
}
@Override
@@ -2917,12 +2924,12 @@
// to synthetic functions, and FunctionNode.needsCallee() will no longer need to test for isSplit().
final int literalSlot = fixScopeSlot(currentFunction, 3);
- lc.enterSplitNode();
+ lc.enterSplitLiteral();
creator.populateRange(method, literalType, literalSlot, splitRange.getLow(), splitRange.getHigh());
method._return();
- lc.exitSplitNode();
+ lc.exitSplitLiteral();
method.end();
lc.releaseSlots();
popMethodEmitter();
@@ -3791,6 +3798,53 @@
}
}
+ public void loadDELETE(final UnaryNode unaryNode) {
+ final Expression expression = unaryNode.getExpression();
+ if (expression instanceof IdentNode) {
+ final IdentNode ident = (IdentNode)expression;
+ final Symbol symbol = ident.getSymbol();
+ final String name = ident.getName();
+
+ if (symbol.isThis()) {
+ // Can't delete "this", ignore and return true
+ if (!lc.popDiscardIfCurrent(unaryNode)) {
+ method.load(true);
+ }
+ } else if (lc.getCurrentFunction().isStrict()) {
+ // All other scope identifier delete attempts fail for strict mode
+ method.load(name);
+ method.invoke(ScriptRuntime.STRICT_FAIL_DELETE);
+ } else if (!symbol.isScope() && (symbol.isParam() || (symbol.isVar() && !symbol.isProgramLevel()))) {
+ // If symbol is a function parameter, or a declared non-global variable, delete is a no-op and returns false.
+ if (!lc.popDiscardIfCurrent(unaryNode)) {
+ method.load(false);
+ }
+ } else {
+ method.loadCompilerConstant(SCOPE);
+ method.load(name);
+ if ((symbol.isGlobal() && !symbol.isFunctionDeclaration()) || symbol.isProgramLevel()) {
+ method.invoke(ScriptRuntime.SLOW_DELETE);
+ } else {
+ method.load(false); // never strict here; that was handled with STRICT_FAIL_DELETE above.
+ method.invoke(ScriptObject.DELETE);
+ }
+ }
+ } else if (expression instanceof BaseNode) {
+ loadExpressionAsObject(((BaseNode)expression).getBase());
+ if (expression instanceof AccessNode) {
+ final AccessNode accessNode = (AccessNode) expression;
+ method.dynamicRemove(accessNode.getProperty(), getCallSiteFlags(), accessNode.isIndex());
+ } else if (expression instanceof IndexNode) {
+ loadExpressionAsObject(((IndexNode) expression).getIndex());
+ method.dynamicRemoveIndex(getCallSiteFlags());
+ } else {
+ throw new AssertionError(expression.getClass().getName());
+ }
+ } else {
+ throw new AssertionError(expression.getClass().getName());
+ }
+ }
+
public void loadADD(final BinaryNode binaryNode, final TypeBounds resultBounds) {
new OptimisticOperation(binaryNode, resultBounds) {
@Override
@@ -4654,10 +4708,12 @@
this.optimistic = optimistic;
this.expression = (Expression)optimistic;
this.resultBounds = resultBounds;
- this.isOptimistic = isOptimistic(optimistic) && useOptimisticTypes() &&
+ this.isOptimistic = isOptimistic(optimistic)
// Operation is only effectively optimistic if its type, after being coerced into the result bounds
// is narrower than the upper bound.
- resultBounds.within(Type.generic(((Expression)optimistic).getType())).narrowerThan(resultBounds.widest);
+ && resultBounds.within(Type.generic(((Expression)optimistic).getType())).narrowerThan(resultBounds.widest);
+ // Optimistic operations need to be executed in optimistic context, else unwarranted optimism will go unnoticed
+ assert !this.isOptimistic || useOptimisticTypes();
}
MethodEmitter emit() {
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CodeGeneratorLexicalContext.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CodeGeneratorLexicalContext.java Mon Jan 08 08:53:14 2018 -0800
@@ -68,7 +68,7 @@
private final Deque<Map<String, Collection<Label>>> unwarrantedOptimismHandlers = new ArrayDeque<>();
private final Deque<StringBuilder> slotTypesDescriptors = new ArrayDeque<>();
- private final IntDeque splitNodes = new IntDeque();
+ private final IntDeque splitLiterals = new IntDeque();
/** A stack tracking the next free local variable slot in the blocks. There's one entry for every block
* currently on the lexical context stack. */
@@ -89,18 +89,18 @@
if (((FunctionNode)node).inDynamicContext()) {
dynamicScopeCount++;
}
- splitNodes.push(0);
+ splitLiterals.push(0);
}
return super.push(node);
}
- void enterSplitNode() {
- splitNodes.getAndIncrement();
+ void enterSplitLiteral() {
+ splitLiterals.getAndIncrement();
pushFreeSlots(methodEmitters.peek().getUsedSlotsWithLiveTemporaries());
}
- void exitSplitNode() {
- final int count = splitNodes.decrementAndGet();
+ void exitSplitLiteral() {
+ final int count = splitLiterals.decrementAndGet();
assert count >= 0;
}
@@ -115,8 +115,8 @@
dynamicScopeCount--;
assert dynamicScopeCount >= 0;
}
- assert splitNodes.peek() == 0;
- splitNodes.pop();
+ assert splitLiterals.peek() == 0;
+ splitLiterals.pop();
}
return popped;
}
@@ -125,8 +125,8 @@
return dynamicScopeCount > 0;
}
- boolean inSplitNode() {
- return !splitNodes.isEmpty() && splitNodes.peek() > 0;
+ boolean inSplitLiteral() {
+ return !splitLiterals.isEmpty() && splitLiterals.peek() > 0;
}
MethodEmitter pushMethodEmitter(final MethodEmitter newMethod) {
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/LocalVariableTypesCalculator.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/LocalVariableTypesCalculator.java Mon Jan 08 08:53:14 2018 -0800
@@ -43,6 +43,7 @@
import java.util.Set;
import jdk.nashorn.internal.codegen.types.Type;
import jdk.nashorn.internal.ir.AccessNode;
+import jdk.nashorn.internal.ir.BaseNode;
import jdk.nashorn.internal.ir.BinaryNode;
import jdk.nashorn.internal.ir.Block;
import jdk.nashorn.internal.ir.BreakNode;
@@ -1093,9 +1094,15 @@
@Override
public boolean enterUnaryNode(final UnaryNode unaryNode) {
final Expression expr = unaryNode.getExpression();
- final LvarType unaryType = toLvarType(unaryNode.setExpression(visitExpression(expr).typeExpression).getType());
- if(unaryNode.isSelfModifying() && expr instanceof IdentNode) {
- onSelfAssignment((IdentNode)expr, unaryType);
+ final LvarType unaryType;
+ if (unaryNode.tokenType() == TokenType.DELETE && expr instanceof IdentNode) {
+ // not visiting deleted identifiers; they don't count as use
+ unaryType = toLvarType(unaryNode.getType());
+ } else {
+ unaryType = toLvarType(unaryNode.setExpression(visitExpression(expr).typeExpression).getType());
+ if (unaryNode.isSelfModifying() && expr instanceof IdentNode) {
+ onSelfAssignment((IdentNode) expr, unaryType);
+ }
}
typeStack.push(unaryType);
return false;
@@ -1348,6 +1355,12 @@
return true;
}
+ @Override
+ public boolean enterUnaryNode(final UnaryNode unaryNode) {
+ // not visiting deleted identifiers; they don't count as use
+ return !(unaryNode.tokenType() == TokenType.DELETE && unaryNode.getExpression() instanceof IdentNode);
+ }
+
@SuppressWarnings("fallthrough")
@Override
public Node leaveBinaryNode(final BinaryNode binaryNode) {
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/MethodEmitter.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/MethodEmitter.java Mon Jan 08 08:53:14 2018 -0800
@@ -2203,7 +2203,7 @@
}
/**
- * Generate dynamic getter. Pop scope from stack. Push result
+ * Generate dynamic getter. Pop object from stack. Push result.
*
* @param valueType type of the value to set
* @param name name of property
@@ -2224,7 +2224,7 @@
type = Type.OBJECT; //promote e.g strings to object generic setter
}
- popType(Type.SCOPE);
+ popType(Type.OBJECT);
method.visitInvokeDynamicInsn(NameCodec.encode(name),
Type.getMethodDescriptor(type, Type.OBJECT), LINKERBOOTSTRAP, flags | dynGetOperation(isMethod, isIndex));
@@ -2256,13 +2256,38 @@
convert(Type.OBJECT); //TODO bad- until we specialize boolean setters,
}
popType(type);
- popType(Type.SCOPE);
+ popType(Type.OBJECT);
method.visitInvokeDynamicInsn(NameCodec.encode(name),
methodDescriptor(void.class, Object.class, type.getTypeClass()), LINKERBOOTSTRAP, flags | dynSetOperation(isIndex));
}
- /**
+ /**
+ * Generate dynamic remover. Pop object from stack. Push result.
+ *
+ * @param name name of property
+ * @param flags call site flags
+ * @return the method emitter
+ */
+ MethodEmitter dynamicRemove(final String name, final int flags, final boolean isIndex) {
+ if (name.length() > LARGE_STRING_THRESHOLD) { // use removeIndex for extremely long names
+ return load(name).dynamicRemoveIndex(flags);
+ }
+
+ debug("dynamic_remove", name, Type.BOOLEAN, getProgramPoint(flags));
+
+ popType(Type.OBJECT);
+ // Type is widened to OBJECT then coerced back to BOOLEAN
+ method.visitInvokeDynamicInsn(NameCodec.encode(name),
+ Type.getMethodDescriptor(Type.OBJECT, Type.OBJECT), LINKERBOOTSTRAP, flags | dynRemoveOperation(isIndex));
+
+ pushType(Type.OBJECT);
+ convert(Type.BOOLEAN); //most probably a nop
+
+ return this;
+ }
+
+ /**
* Dynamic getter for indexed structures. Pop index and receiver from stack,
* generate appropriate signatures based on types
*
@@ -2342,6 +2367,35 @@
}
/**
+ * Dynamic remover for indexed structures. Pop index and receiver from stack,
+ * generate appropriate signatures based on types
+ *
+ * @param flags call site flags for getter
+ *
+ * @return the method emitter
+ */
+ MethodEmitter dynamicRemoveIndex(final int flags) {
+ debug("dynamic_remove_index", peekType(1), "[", peekType(), "]", getProgramPoint(flags));
+
+ Type index = peekType();
+ if (index.isObject() || index.isBoolean()) {
+ index = Type.OBJECT; //e.g. string->object
+ convert(Type.OBJECT);
+ }
+ popType();
+
+ popType(Type.OBJECT);
+
+ final String signature = Type.getMethodDescriptor(Type.OBJECT, Type.OBJECT /*e.g STRING->OBJECT*/, index);
+
+ method.visitInvokeDynamicInsn(EMPTY_NAME, signature, LINKERBOOTSTRAP, flags | dynRemoveOperation(true));
+ pushType(Type.OBJECT);
+ convert(Type.BOOLEAN);
+
+ return this;
+ }
+
+ /**
* Load a key value in the proper form.
*
* @param key
@@ -2520,6 +2574,10 @@
return isIndex ? NashornCallSiteDescriptor.SET_ELEMENT : NashornCallSiteDescriptor.SET_PROPERTY;
}
+ private static int dynRemoveOperation(final boolean isIndex) {
+ return isIndex ? NashornCallSiteDescriptor.REMOVE_ELEMENT : NashornCallSiteDescriptor.REMOVE_PROPERTY;
+ }
+
private Type emitLocalVariableConversion(final LocalVariableConversion conversion, final boolean onlySymbolLiveValue) {
final Type from = conversion.getFrom();
final Type to = conversion.getTo();
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/OptimisticTypesCalculator.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/OptimisticTypesCalculator.java Mon Jan 08 08:53:14 2018 -0800
@@ -42,8 +42,10 @@
import jdk.nashorn.internal.ir.IfNode;
import jdk.nashorn.internal.ir.IndexNode;
import jdk.nashorn.internal.ir.JoinPredecessorExpression;
+import jdk.nashorn.internal.ir.LiteralNode;
import jdk.nashorn.internal.ir.LoopNode;
import jdk.nashorn.internal.ir.Node;
+import jdk.nashorn.internal.ir.ObjectNode;
import jdk.nashorn.internal.ir.Optimistic;
import jdk.nashorn.internal.ir.PropertyNode;
import jdk.nashorn.internal.ir.Symbol;
@@ -190,6 +192,23 @@
}
@Override
+ public boolean enterObjectNode(ObjectNode objectNode) {
+ if (objectNode.getSplitRanges() != null) {
+ return false;
+ }
+ return super.enterObjectNode(objectNode);
+ }
+
+ @Override
+ public boolean enterLiteralNode(LiteralNode<?> literalNode) {
+ if (literalNode.isArray() && ((LiteralNode.ArrayLiteralNode) literalNode).getSplitRanges() != null) {
+ return false;
+ }
+
+ return super.enterLiteralNode(literalNode);
+ }
+
+ @Override
public boolean enterWhileNode(final WhileNode whileNode) {
// Test is never optimistic (always coerced to boolean).
tagNeverOptimisticLoopTest(whileNode);
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Splitter.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/Splitter.java Mon Jan 08 08:53:14 2018 -0800
@@ -112,7 +112,7 @@
assert lc.isEmpty() : "LexicalContext not empty";
if (weight >= SPLIT_THRESHOLD) {
- log.info("Splitting '", functionNode.getName(), "' as its weight ", weight, " exceeds split threshold ", SPLIT_THRESHOLD);
+ log.info("Splitting function '", functionNode.getName(), "' as its weight ", weight, " exceeds split threshold ", SPLIT_THRESHOLD);
functionNode = (FunctionNode)functionNode.accept(this);
if (functionNode.isSplit()) {
@@ -287,7 +287,7 @@
@SuppressWarnings("rawtypes")
@Override
public Node leaveLiteralNode(final LiteralNode literal) {
- long weight = WeighNodes.weigh(literal);
+ final long weight = WeighNodes.weigh(literal);
if (weight < SPLIT_THRESHOLD) {
return literal;
@@ -310,14 +310,14 @@
final int postset = postsets[i];
final Node element = value[postset];
- weight = WeighNodes.weigh(element);
- totalWeight += WeighNodes.AASTORE_WEIGHT + weight;
+ final long elementWeight = WeighNodes.weigh(element);
+ totalWeight += WeighNodes.AASTORE_WEIGHT + elementWeight;
if (totalWeight >= SPLIT_THRESHOLD) {
- final CompileUnit unit = compiler.findUnit(totalWeight - weight);
+ final CompileUnit unit = compiler.findUnit(totalWeight - elementWeight);
ranges.add(new Splittable.SplitRange(unit, lo, i));
lo = i;
- totalWeight = weight;
+ totalWeight = elementWeight;
}
}
@@ -326,6 +326,8 @@
ranges.add(new Splittable.SplitRange(unit, lo, postsets.length));
}
+ log.info("Splitting array literal in '", functionNode.getName(), "' as its weight ", weight, " exceeds split threshold ", SPLIT_THRESHOLD);
+
return arrayLiteralNode.setSplitRanges(lc, ranges);
}
@@ -334,7 +336,7 @@
@Override
public Node leaveObjectNode(final ObjectNode objectNode) {
- long weight = WeighNodes.weigh(objectNode);
+ final long weight = WeighNodes.weigh(objectNode);
if (weight < SPLIT_THRESHOLD) {
return objectNode;
@@ -355,14 +357,14 @@
final boolean isConstant = LiteralNode.isConstant(property.getValue());
if (!isConstant || !isSpillObject) {
- weight = isConstant ? 0 : WeighNodes.weigh(property.getValue());
- totalWeight += WeighNodes.AASTORE_WEIGHT + weight;
+ final long propertyWeight = isConstant ? 0 : WeighNodes.weigh(property.getValue());
+ totalWeight += WeighNodes.AASTORE_WEIGHT + propertyWeight;
if (totalWeight >= SPLIT_THRESHOLD) {
- final CompileUnit unit = compiler.findUnit(totalWeight - weight);
+ final CompileUnit unit = compiler.findUnit(totalWeight - propertyWeight);
ranges.add(new Splittable.SplitRange(unit, lo, i));
lo = i;
- totalWeight = weight;
+ totalWeight = propertyWeight;
}
}
}
@@ -372,6 +374,8 @@
ranges.add(new Splittable.SplitRange(unit, lo, properties.size()));
}
+ log.info("Splitting object node in '", functionNode.getName(), "' as its weight ", weight, " exceeds split threshold ", SPLIT_THRESHOLD);
+
return objectNode.setSplitRanges(lc, ranges);
}
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/GetSplitState.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/GetSplitState.java Mon Jan 08 08:53:14 2018 -0800
@@ -27,6 +27,7 @@
import jdk.nashorn.internal.codegen.CompilerConstants;
import jdk.nashorn.internal.codegen.types.Type;
+import jdk.nashorn.internal.ir.annotations.Ignore;
import jdk.nashorn.internal.ir.visitor.NodeVisitor;
import jdk.nashorn.internal.runtime.Scope;
@@ -39,6 +40,7 @@
private static final long serialVersionUID = 1L;
/** The sole instance of this AST node. */
+ @Ignore
public final static GetSplitState INSTANCE = new GetSplitState();
private GetSplitState() {
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LiteralNode.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LiteralNode.java Mon Jan 08 08:53:14 2018 -0800
@@ -30,6 +30,7 @@
import java.util.List;
import jdk.nashorn.internal.codegen.types.ArrayType;
import jdk.nashorn.internal.codegen.types.Type;
+import jdk.nashorn.internal.ir.annotations.Ignore;
import jdk.nashorn.internal.ir.annotations.Immutable;
import jdk.nashorn.internal.ir.visitor.NodeVisitor;
import jdk.nashorn.internal.objects.NativeArray;
@@ -633,6 +634,7 @@
private final int[] postsets;
/** Ranges for splitting up large literals in code generation */
+ @Ignore
private final List<Splittable.SplitRange> splitRanges;
/** Does this array literal have a spread element? */
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ObjectNode.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/ObjectNode.java Mon Jan 08 08:53:14 2018 -0800
@@ -29,6 +29,7 @@
import java.util.List;
import java.util.RandomAccess;
import jdk.nashorn.internal.codegen.types.Type;
+import jdk.nashorn.internal.ir.annotations.Ignore;
import jdk.nashorn.internal.ir.annotations.Immutable;
import jdk.nashorn.internal.ir.visitor.NodeVisitor;
@@ -43,6 +44,7 @@
private final List<PropertyNode> elements;
/** Ranges for splitting large literals over multiple compile units in codegen. */
+ @Ignore
private final List<Splittable.SplitRange> splitRanges;
/**
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/RuntimeNode.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/RuntimeNode.java Mon Jan 08 08:53:14 2018 -0800
@@ -54,12 +54,6 @@
TYPEOF,
/** Reference error type */
REFERENCE_ERROR,
- /** Delete operator */
- DELETE(TokenType.DELETE, Type.BOOLEAN, 1),
- /** Delete operator for slow scopes */
- SLOW_DELETE(TokenType.DELETE, Type.BOOLEAN, 1, false),
- /** Delete operator that always fails -- see Lower */
- FAIL_DELETE(TokenType.DELETE, Type.BOOLEAN, 1, false),
/** === operator with at least one object */
EQ_STRICT(TokenType.EQ_STRICT, Type.BOOLEAN, 2, true),
/** == operator with at least one object */
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeJavaImporter.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeJavaImporter.java Mon Jan 08 08:53:14 2018 -0800
@@ -25,26 +25,14 @@
package jdk.nashorn.internal.objects;
-import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
-import static jdk.nashorn.internal.runtime.UnwarrantedOptimismException.isValid;
-
-import jdk.dynalink.CallSiteDescriptor;
import jdk.dynalink.beans.StaticClass;
-import jdk.dynalink.linker.GuardedInvocation;
-import jdk.dynalink.linker.LinkRequest;
-import jdk.nashorn.internal.objects.annotations.Attribute;
import jdk.nashorn.internal.objects.annotations.Constructor;
-import jdk.nashorn.internal.objects.annotations.Function;
import jdk.nashorn.internal.objects.annotations.ScriptClass;
import jdk.nashorn.internal.runtime.Context;
-import jdk.nashorn.internal.runtime.JSType;
+import jdk.nashorn.internal.runtime.FindProperty;
import jdk.nashorn.internal.runtime.NativeJavaPackage;
import jdk.nashorn.internal.runtime.PropertyMap;
import jdk.nashorn.internal.runtime.ScriptObject;
-import jdk.nashorn.internal.runtime.ScriptRuntime;
-import jdk.nashorn.internal.runtime.UnwarrantedOptimismException;
-import jdk.nashorn.internal.runtime.WithObject;
-import jdk.nashorn.internal.runtime.linker.NashornCallSiteDescriptor;
/**
* This is "JavaImporter" constructor. This constructor allows you to use Java types omitting explicit package names.
@@ -98,88 +86,19 @@
return new NativeJavaImporter(args);
}
- /**
- * "No such property" handler.
- *
- * @param self self reference
- * @param name property name
- * @return value of the missing property
- */
- @Function(attributes = Attribute.NOT_ENUMERABLE)
- public static Object __noSuchProperty__(final Object self, final Object name) {
- final NativeJavaImporter javaImporter = getJavaImporter(self);
- if (javaImporter != null) {
- return javaImporter.createProperty(JSType.toString(name));
- }
- throw typeError("not.a.java.importer", ScriptRuntime.safeToString(self));
- }
-
- private static NativeJavaImporter getJavaImporter(Object self) {
- final NativeJavaImporter expression;
- if (self instanceof NativeJavaImporter) {
- expression = (NativeJavaImporter)self;
- } else if (self instanceof ScriptObject) {
- expression = getJavaImporterInScope((ScriptObject)self);
- } else {
- expression = null;
- }
- return expression;
- }
-
- private static NativeJavaImporter getJavaImporterInScope(ScriptObject self) {
- for (ScriptObject obj = self; obj != null; obj = obj.getProto()) {
- if (obj instanceof WithObject) {
- final ScriptObject expression = ((WithObject)obj).getExpression();
- if (expression instanceof NativeJavaImporter) {
- return (NativeJavaImporter)expression;
- }
+ @Override
+ protected FindProperty findProperty(final Object key, final boolean deep, final boolean isScope, final ScriptObject start) {
+ final FindProperty find = super.findProperty(key, deep, isScope, start);
+ if (find == null && key instanceof String) {
+ final String name = (String) key;
+ final Object value = createProperty(name);
+ if(value != null) {
+ // We must avoid calling findProperty recursively, so we pass null as first argument
+ setObject(null, 0, key, value);
+ return super.findProperty(key, deep, isScope, start);
}
}
- return null;
- }
-
- /**
- * "No such method call" handler
- *
- * @param self self reference
- * @param args arguments to method
- * @return never returns always throw TypeError
- */
- @Function(attributes = Attribute.NOT_ENUMERABLE)
- public static Object __noSuchMethod__(final Object self, final Object... args) {
- throw typeError("not.a.function", ScriptRuntime.safeToString(args[0]));
- }
-
- @Override
- public GuardedInvocation noSuchProperty(final CallSiteDescriptor desc, final LinkRequest request) {
- return createAndSetProperty(desc) ? super.lookup(desc, request) : super.noSuchProperty(desc, request);
- }
-
- @Override
- public GuardedInvocation noSuchMethod(final CallSiteDescriptor desc, final LinkRequest request) {
- return createAndSetProperty(desc) ? super.lookup(desc, request) : super.noSuchMethod(desc, request);
- }
-
- @Override
- protected Object invokeNoSuchProperty(final Object key, final boolean isScope, final int programPoint) {
- if (!(key instanceof String)) {
- return super.invokeNoSuchProperty(key, isScope, programPoint);
- }
- final Object retval = createProperty((String) key);
- if (isValid(programPoint)) {
- throw new UnwarrantedOptimismException(retval, programPoint);
- }
- return retval;
- }
-
- private boolean createAndSetProperty(final CallSiteDescriptor desc) {
- final String name = NashornCallSiteDescriptor.getOperand(desc);
- final Object value = createProperty(name);
- if(value != null) {
- set(name, value, 0);
- return true;
- }
- return false;
+ return find;
}
private Object createProperty(final String name) {
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptObject.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptObject.java Mon Jan 08 08:53:14 2018 -0800
@@ -189,6 +189,8 @@
/** Method handle for generic property setter */
public static final Call GENERIC_SET = virtualCallNoLookup(ScriptObject.class, "set", void.class, Object.class, Object.class, int.class);
+ public static final Call DELETE = virtualCall(MethodHandles.lookup(), ScriptObject.class, "delete", boolean.class, Object.class, boolean.class);
+
static final MethodHandle[] SET_SLOW = new MethodHandle[] {
findOwnMH_V("set", void.class, Object.class, int.class, int.class),
findOwnMH_V("set", void.class, Object.class, double.class, int.class),
@@ -202,6 +204,9 @@
static final MethodHandle EXTENSION_CHECK = findOwnMH_V("extensionCheck", boolean.class, boolean.class, String.class);
static final MethodHandle ENSURE_SPILL_SIZE = findOwnMH_V("ensureSpillSize", Object.class, int.class);
+ private static final GuardedInvocation DELETE_GUARDED = new GuardedInvocation(MH.insertArguments(DELETE.methodHandle(), 2, false), NashornGuards.getScriptObjectGuard());
+ private static final GuardedInvocation DELETE_GUARDED_STRICT = new GuardedInvocation(MH.insertArguments(DELETE.methodHandle(), 2, true), NashornGuards.getScriptObjectGuard());
+
/**
* Constructor
*/
@@ -1869,6 +1874,13 @@
return desc.getOperation() instanceof NamedOperation
? findSetMethod(desc, request)
: findSetIndexMethod(desc, request);
+ case REMOVE:
+ final GuardedInvocation inv = NashornCallSiteDescriptor.isStrict(desc) ? DELETE_GUARDED_STRICT : DELETE_GUARDED;
+ final Object name = NamedOperation.getName(desc.getOperation());
+ if (name != null) {
+ return inv.replaceMethods(MH.insertArguments(inv.getInvocation(), 1, name), inv.getGuard());
+ }
+ return inv;
case CALL:
return findCallMethod(desc, request);
case NEW:
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptRuntime.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptRuntime.java Mon Jan 08 08:53:14 2018 -0800
@@ -136,6 +136,16 @@
public static final Call INVALIDATE_RESERVED_BUILTIN_NAME = staticCallNoLookup(ScriptRuntime.class, "invalidateReservedBuiltinName", void.class, String.class);
/**
+ * Used to perform failed delete under strict mode
+ */
+ public static final Call STRICT_FAIL_DELETE = staticCallNoLookup(ScriptRuntime.class, "strictFailDelete", boolean.class, String.class);
+
+ /**
+ * Used to find the scope for slow delete
+ */
+ public static final Call SLOW_DELETE = staticCallNoLookup(ScriptRuntime.class, "slowDelete", boolean.class, ScriptObject.class, String.class);
+
+ /**
* Converts a switch tag value to a simple integer. deflt value if it can't.
*
* @param tag Switch statement tag value.
@@ -780,87 +790,40 @@
}
/**
- * ECMA 11.4.1 - delete operation, generic implementation
+ * ECMA 11.4.1 - delete operator, implementation for slow scopes
*
- * @param obj object with property to delete
+ * This implementation of 'delete' walks the scope chain to find the scope that contains the
+ * property to be deleted, then invokes delete on it. Always used on scopes, never strict.
+ *
+ * @param obj top scope object
* @param property property to delete
- * @param strict are we in strict mode
*
* @return true if property was successfully found and deleted
*/
- public static boolean DELETE(final Object obj, final Object property, final Object strict) {
- if (obj instanceof ScriptObject) {
- return ((ScriptObject)obj).delete(property, Boolean.TRUE.equals(strict));
- }
-
- if (obj instanceof Undefined) {
- return ((Undefined)obj).delete(property, false);
- }
-
- if (obj == null) {
- throw typeError("cant.delete.property", safeToString(property), "null");
- }
-
- if (obj instanceof ScriptObjectMirror) {
- return ((ScriptObjectMirror)obj).delete(property);
- }
-
- if (JSType.isPrimitive(obj)) {
- return ((ScriptObject) JSType.toScriptObject(obj)).delete(property, Boolean.TRUE.equals(strict));
- }
-
- if (obj instanceof JSObject) {
- ((JSObject)obj).removeMember(Objects.toString(property));
- return true;
+ public static boolean slowDelete(final ScriptObject obj, final String property) {
+ ScriptObject sobj = obj;
+ while (sobj != null && sobj.isScope()) {
+ final FindProperty find = sobj.findProperty(property, false);
+ if (find != null) {
+ return sobj.delete(property, false);
+ }
+ sobj = sobj.getProto();
}
-
- // if object is not reference type, vacuously delete is successful.
- return true;
- }
-
- /**
- * ECMA 11.4.1 - delete operator, implementation for slow scopes
- *
- * This implementation of 'delete' walks the scope chain to find the scope that contains the
- * property to be deleted, then invokes delete on it.
- *
- * @param obj top scope object
- * @param property property to delete
- * @param strict are we in strict mode
- *
- * @return true if property was successfully found and deleted
- */
- public static boolean SLOW_DELETE(final Object obj, final Object property, final Object strict) {
- if (obj instanceof ScriptObject) {
- ScriptObject sobj = (ScriptObject) obj;
- final String key = property.toString();
- while (sobj != null && sobj.isScope()) {
- final FindProperty find = sobj.findProperty(key, false);
- if (find != null) {
- return sobj.delete(key, Boolean.TRUE.equals(strict));
- }
- sobj = sobj.getProto();
- }
- }
- return DELETE(obj, property, strict);
+ return obj.delete(property, false);
}
/**
* ECMA 11.4.1 - delete operator, special case
*
- * This is 'delete' that always fails. We have to check strict mode and throw error.
- * That is why this is a runtime function. Or else we could have inlined 'false'.
+ * This is 'delete' on a scope; it always fails under strict mode.
+ * It always throws an exception, but is declared to return a boolean
+ * to be compatible with the delete operator type.
*
* @param property property to delete
- * @param strict are we in strict mode
- *
- * @return false always
+ * @return nothing, always throws an exception.
*/
- public static boolean FAIL_DELETE(final Object property, final Object strict) {
- if (Boolean.TRUE.equals(strict)) {
- throw syntaxError("strict.cant.delete", safeToString(property));
- }
- return false;
+ public static boolean strictFailDelete(final String property) {
+ throw syntaxError("strict.cant.delete", property);
}
/**
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Undefined.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Undefined.java Mon Jan 08 08:53:14 2018 -0800
@@ -112,6 +112,11 @@
return findSetIndexMethod(desc);
}
return findSetMethod(desc);
+ case REMOVE:
+ if (!(desc.getOperation() instanceof NamedOperation)) {
+ return findDeleteIndexMethod(desc);
+ }
+ return findDeleteMethod(desc);
default:
}
return null;
@@ -124,6 +129,7 @@
private static final MethodHandle GET_METHOD = findOwnMH("get", Object.class, Object.class);
private static final MethodHandle SET_METHOD = MH.insertArguments(findOwnMH("set", void.class, Object.class, Object.class, int.class), 3, NashornCallSiteDescriptor.CALLSITE_STRICT);
+ private static final MethodHandle DELETE_METHOD = MH.insertArguments(findOwnMH("delete", boolean.class, Object.class, boolean.class), 2, false);
private static GuardedInvocation findGetMethod(final CallSiteDescriptor desc) {
return new GuardedInvocation(MH.insertArguments(GET_METHOD, 1, NashornCallSiteDescriptor.getOperand(desc)), UNDEFINED_GUARD).asType(desc);
@@ -141,6 +147,15 @@
return new GuardedInvocation(SET_METHOD, UNDEFINED_GUARD).asType(desc);
}
+ private static GuardedInvocation findDeleteMethod(final CallSiteDescriptor desc) {
+ return new GuardedInvocation(MH.insertArguments(DELETE_METHOD, 1, NashornCallSiteDescriptor.getOperand(desc)), UNDEFINED_GUARD).asType(desc);
+ }
+
+ private static GuardedInvocation findDeleteIndexMethod(final CallSiteDescriptor desc) {
+ return new GuardedInvocation(DELETE_METHOD, UNDEFINED_GUARD).asType(desc);
+ }
+
+
@Override
public Object get(final Object key) {
throw typeError("cant.read.property.of.undefined", ScriptRuntime.safeToString(key));
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JSObjectLinker.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/JSObjectLinker.java Mon Jan 08 08:53:14 2018 -0800
@@ -31,7 +31,7 @@
import java.lang.invoke.MethodHandles;
import java.lang.invoke.MethodType;
import java.util.Map;
-import javax.script.Bindings;
+import java.util.Objects;
import jdk.dynalink.CallSiteDescriptor;
import jdk.dynalink.Operation;
import jdk.dynalink.StandardOperation;
@@ -64,11 +64,10 @@
return canLinkTypeStatic(type);
}
- static boolean canLinkTypeStatic(final Class<?> type) {
- // can link JSObject also handles Map, Bindings to make
+ private static boolean canLinkTypeStatic(final Class<?> type) {
+ // can link JSObject also handles Map (this includes Bindings) to make
// sure those are not JSObjects.
return Map.class.isAssignableFrom(type) ||
- Bindings.class.isAssignableFrom(type) ||
JSObject.class.isAssignableFrom(type);
}
@@ -84,7 +83,7 @@
if (self instanceof JSObject) {
inv = lookup(desc, request, linkerServices);
inv = inv.replaceMethods(linkerServices.filterInternalObjects(inv.getInvocation()), inv.getGuard());
- } else if (self instanceof Map || self instanceof Bindings) {
+ } else if (self instanceof Map) {
// guard to make sure the Map or Bindings does not turn into JSObject later!
final GuardedInvocation beanInv = nashornBeansLinker.getGuardedInvocation(request, linkerServices);
inv = new GuardedInvocation(beanInv.getInvocation(),
@@ -116,6 +115,13 @@
return name != null ? findSetMethod(name) : findSetIndexMethod();
}
break;
+ case REMOVE:
+ if (NashornCallSiteDescriptor.hasStandardNamespace(desc)) {
+ return new GuardedInvocation(
+ name == null ? JSOBJECTLINKER_DEL : MH.insertArguments(JSOBJECTLINKER_DEL, 1, name),
+ IS_JSOBJECT_GUARD);
+ }
+ break;
case CALL:
return findCallMethod(desc);
case NEW:
@@ -206,6 +212,15 @@
}
}
+ @SuppressWarnings("unused")
+ private static boolean del(final Object jsobj, final Object key) {
+ if (jsobj instanceof ScriptObjectMirror) {
+ return ((ScriptObjectMirror)jsobj).delete(key);
+ }
+ ((JSObject) jsobj).removeMember(Objects.toString(key));
+ return true;
+ }
+
private static int getIndex(final Number n) {
final double value = n.doubleValue();
return JSType.isRepresentableAsInt(value) ? (int)value : -1;
@@ -245,6 +260,7 @@
private static final MethodHandle IS_JSOBJECT_GUARD = findOwnMH_S("isJSObject", boolean.class, Object.class);
private static final MethodHandle JSOBJECTLINKER_GET = findOwnMH_S("get", Object.class, MethodHandle.class, Object.class, Object.class);
private static final MethodHandle JSOBJECTLINKER_PUT = findOwnMH_S("put", Void.TYPE, Object.class, Object.class, Object.class);
+ private static final MethodHandle JSOBJECTLINKER_DEL = findOwnMH_S("del", boolean.class, Object.class, Object.class);
// method handles of JSObject class
private static final MethodHandle JSOBJECT_GETMEMBER = findJSObjectMH_V("getMember", Object.class, String.class);
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornBottomLinker.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornBottomLinker.java Mon Jan 08 08:53:14 2018 -0800
@@ -39,11 +39,13 @@
import jdk.dynalink.NamedOperation;
import jdk.dynalink.Operation;
import jdk.dynalink.beans.BeansLinker;
+import jdk.dynalink.beans.StaticClass;
import jdk.dynalink.linker.GuardedInvocation;
import jdk.dynalink.linker.GuardingDynamicLinker;
import jdk.dynalink.linker.GuardingTypeConverterFactory;
import jdk.dynalink.linker.LinkRequest;
import jdk.dynalink.linker.LinkerServices;
+import jdk.dynalink.linker.support.Guards;
import jdk.dynalink.linker.support.Lookup;
import jdk.nashorn.internal.codegen.types.Type;
import jdk.nashorn.internal.runtime.ECMAException;
@@ -86,12 +88,16 @@
MH.dropArguments(EMPTY_PROP_SETTER, 0, Object.class);
private static final MethodHandle THROW_STRICT_PROPERTY_SETTER;
+ private static final MethodHandle THROW_STRICT_PROPERTY_REMOVER;
private static final MethodHandle THROW_OPTIMISTIC_UNDEFINED;
+ private static final MethodHandle MISSING_PROPERTY_REMOVER;
static {
final Lookup lookup = new Lookup(MethodHandles.lookup());
THROW_STRICT_PROPERTY_SETTER = lookup.findOwnStatic("throwStrictPropertySetter", void.class, Object.class, Object.class);
+ THROW_STRICT_PROPERTY_REMOVER = lookup.findOwnStatic("throwStrictPropertyRemover", boolean.class, Object.class, Object.class);
THROW_OPTIMISTIC_UNDEFINED = lookup.findOwnStatic("throwOptimisticUndefined", Object.class, int.class);
+ MISSING_PROPERTY_REMOVER = lookup.findOwnStatic("missingPropertyRemover", boolean.class, Object.class, Object.class);
}
private static GuardedInvocation linkBean(final LinkRequest linkRequest) throws Exception {
@@ -124,6 +130,7 @@
static MethodHandle linkMissingBeanMember(final LinkRequest linkRequest, final LinkerServices linkerServices) throws Exception {
final CallSiteDescriptor desc = linkRequest.getCallSiteDescriptor();
final String operand = NashornCallSiteDescriptor.getOperand(desc);
+ final boolean strict = NashornCallSiteDescriptor.isStrict(desc);
switch (NashornCallSiteDescriptor.getStandardOperation(desc)) {
case GET:
if (NashornCallSiteDescriptor.isOptimistic(desc)) {
@@ -133,13 +140,17 @@
}
return getInvocation(EMPTY_ELEM_GETTER, linkerServices, desc);
case SET:
- final boolean strict = NashornCallSiteDescriptor.isStrict(desc);
if (strict) {
return adaptThrower(bindOperand(THROW_STRICT_PROPERTY_SETTER, operand), desc);
} else if (operand != null) {
return getInvocation(EMPTY_PROP_SETTER, linkerServices, desc);
}
return getInvocation(EMPTY_ELEM_SETTER, linkerServices, desc);
+ case REMOVE:
+ if (strict) {
+ return adaptThrower(bindOperand(THROW_STRICT_PROPERTY_REMOVER, operand), desc);
+ }
+ return getInvocation(bindOperand(MISSING_PROPERTY_REMOVER, operand), linkerServices, desc);
default:
throw new AssertionError("unknown call type " + desc);
}
@@ -162,6 +173,33 @@
throw createTypeError(self, name, "cant.set.property");
}
+ @SuppressWarnings("unused")
+ private static boolean throwStrictPropertyRemover(final Object self, final Object name) {
+ if (isNonConfigurableProperty(self, name)) {
+ throw createTypeError(self, name, "cant.delete.property");
+ }
+ return true;
+ }
+
+ @SuppressWarnings("unused")
+ private static boolean missingPropertyRemover(final Object self, final Object name) {
+ return !isNonConfigurableProperty(self, name);
+ }
+
+ // Corresponds to ECMAScript 5.1 8.12.7 [[Delete]] point 3 check for "isConfigurable" (but negated)
+ private static boolean isNonConfigurableProperty(final Object self, final Object name) {
+ if (self instanceof StaticClass) {
+ final Class<?> clazz = ((StaticClass)self).getRepresentedClass();
+ return BeansLinker.getReadableStaticPropertyNames(clazz).contains(name) ||
+ BeansLinker.getWritableStaticPropertyNames(clazz).contains(name) ||
+ BeansLinker.getStaticMethodNames(clazz).contains(name);
+ }
+ final Class<?> clazz = self.getClass();
+ return BeansLinker.getReadableInstancePropertyNames(clazz).contains(name) ||
+ BeansLinker.getWritableInstancePropertyNames(clazz).contains(name) ||
+ BeansLinker.getInstanceMethodNames(clazz).contains(name);
+ }
+
private static ECMAException createTypeError(final Object self, final Object name, final String msg) {
return typeError(msg, String.valueOf(name), ScriptRuntime.safeToString(self));
}
@@ -215,6 +253,8 @@
throw typeError(NashornCallSiteDescriptor.isMethodFirstOperation(desc) ? "no.such.function" : "cant.get.property", getArgument(linkRequest), "null");
case SET:
throw typeError("cant.set.property", getArgument(linkRequest), "null");
+ case REMOVE:
+ throw typeError("cant.delete.property", getArgument(linkRequest), "null");
default:
throw new AssertionError("unknown call type " + desc);
}
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornCallSiteDescriptor.java Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/linker/NashornCallSiteDescriptor.java Mon Jan 08 08:53:14 2018 -0800
@@ -29,6 +29,7 @@
import static jdk.dynalink.StandardNamespace.METHOD;
import static jdk.dynalink.StandardNamespace.PROPERTY;
import static jdk.dynalink.StandardOperation.GET;
+import static jdk.dynalink.StandardOperation.REMOVE;
import static jdk.dynalink.StandardOperation.SET;
import java.lang.invoke.MethodHandles;
@@ -63,7 +64,7 @@
* form of static methods.
*/
public final class NashornCallSiteDescriptor extends CallSiteDescriptor {
- // Lowest three bits describe the operation
+ // Lowest four bits describe the operation
/** Property getter operation {@code obj.prop} */
public static final int GET_PROPERTY = 0;
/** Element getter operation {@code obj[index]} */
@@ -76,12 +77,16 @@
public static final int SET_PROPERTY = 4;
/** Element setter operation {@code obj[index] = value} */
public static final int SET_ELEMENT = 5;
+ /** Property remove operation {@code delete obj.prop} */
+ public static final int REMOVE_PROPERTY = 6;
+ /** Element remove operation {@code delete obj[index]} */
+ public static final int REMOVE_ELEMENT = 7;
/** Call operation {@code fn(args...)} */
- public static final int CALL = 6;
+ public static final int CALL = 8;
/** New operation {@code new Constructor(args...)} */
- public static final int NEW = 7;
+ public static final int NEW = 9;
- private static final int OPERATION_MASK = 7;
+ private static final int OPERATION_MASK = 15;
// Correspond to the operation indices above.
private static final Operation[] OPERATIONS = new Operation[] {
@@ -91,42 +96,44 @@
GET.withNamespaces(METHOD, ELEMENT, PROPERTY),
SET.withNamespaces(PROPERTY, ELEMENT),
SET.withNamespaces(ELEMENT, PROPERTY),
+ REMOVE.withNamespaces(PROPERTY, ELEMENT),
+ REMOVE.withNamespaces(ELEMENT, PROPERTY),
StandardOperation.CALL,
StandardOperation.NEW
};
/** Flags that the call site references a scope variable (it's an identifier reference or a var declaration, not a
* property access expression. */
- public static final int CALLSITE_SCOPE = 1 << 3;
+ public static final int CALLSITE_SCOPE = 1 << 4;
/** Flags that the call site is in code that uses ECMAScript strict mode. */
- public static final int CALLSITE_STRICT = 1 << 4;
+ public static final int CALLSITE_STRICT = 1 << 5;
/** Flags that a property getter or setter call site references a scope variable that is located at a known distance
* in the scope chain. Such getters and setters can often be linked more optimally using these assumptions. */
- public static final int CALLSITE_FAST_SCOPE = 1 << 5;
+ public static final int CALLSITE_FAST_SCOPE = 1 << 6;
/** Flags that a callsite type is optimistic, i.e. we might get back a wider return value than encoded in the
* descriptor, and in that case we have to throw an UnwarrantedOptimismException */
- public static final int CALLSITE_OPTIMISTIC = 1 << 6;
+ public static final int CALLSITE_OPTIMISTIC = 1 << 7;
/** Is this really an apply that we try to call as a call? */
- public static final int CALLSITE_APPLY_TO_CALL = 1 << 7;
+ public static final int CALLSITE_APPLY_TO_CALL = 1 << 8;
/** Does this a callsite for a variable declaration? */
- public static final int CALLSITE_DECLARE = 1 << 8;
+ public static final int CALLSITE_DECLARE = 1 << 9;
/** Flags that the call site is profiled; Contexts that have {@code "profile.callsites"} boolean property set emit
* code where call sites have this flag set. */
- public static final int CALLSITE_PROFILE = 1 << 9;
+ public static final int CALLSITE_PROFILE = 1 << 10;
/** Flags that the call site is traced; Contexts that have {@code "trace.callsites"} property set emit code where
* call sites have this flag set. */
- public static final int CALLSITE_TRACE = 1 << 10;
+ public static final int CALLSITE_TRACE = 1 << 11;
/** Flags that the call site linkage miss (and thus, relinking) is traced; Contexts that have the keyword
* {@code "miss"} in their {@code "trace.callsites"} property emit code where call sites have this flag set. */
- public static final int CALLSITE_TRACE_MISSES = 1 << 11;
+ public static final int CALLSITE_TRACE_MISSES = 1 << 12;
/** Flags that entry/exit to/from the method linked at call site are traced; Contexts that have the keyword
* {@code "enterexit"} in their {@code "trace.callsites"} property emit code where call sites have this flag set. */
- public static final int CALLSITE_TRACE_ENTEREXIT = 1 << 12;
+ public static final int CALLSITE_TRACE_ENTEREXIT = 1 << 13;
/** Flags that values passed as arguments to and returned from the method linked at call site are traced; Contexts
* that have the keyword {@code "values"} in their {@code "trace.callsites"} property emit code where call sites
* have this flag set. */
- public static final int CALLSITE_TRACE_VALUES = 1 << 13;
+ public static final int CALLSITE_TRACE_VALUES = 1 << 14;
//we could have more tracing flags here, for example CALLSITE_TRACE_SCOPE, but bits are a bit precious
//right now given the program points
@@ -138,10 +145,10 @@
* TODO: rethink if we need the various profile/trace flags or the linker can use the Context instead to query its
* trace/profile settings.
*/
- public static final int CALLSITE_PROGRAM_POINT_SHIFT = 14;
+ public static final int CALLSITE_PROGRAM_POINT_SHIFT = 15;
/**
- * Maximum program point value. We have 18 bits left over after flags, and
+ * Maximum program point value. We have 17 bits left over after flags, and
* it should be plenty. Program points are local to a single function. Every
* function maps to a single JVM bytecode method that can have at most 65535
* bytes. (Large functions are synthetically split into smaller functions.)
@@ -222,8 +229,10 @@
case 3: return "GET_METHOD_ELEMENT";
case 4: return "SET_PROPERTY";
case 5: return "SET_ELEMENT";
- case 6: return "CALL";
- case 7: return "NEW";
+ case 6: return "REMOVE_PROPERTY";
+ case 7: return "REMOVE_ELEMENT";
+ case 8: return "CALL";
+ case 9: return "NEW";
default: throw new AssertionError();
}
}
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/mozilla_compat.js Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/mozilla_compat.js Mon Jan 08 08:53:14 2018 -0800
@@ -4,7 +4,9 @@
*
* 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.
+ * 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
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/parser.js Tue Dec 26 13:38:31 2017 +0530
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/parser.js Mon Jan 08 08:53:14 2018 -0800
@@ -4,7 +4,9 @@
*
* 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.
+ * 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
--- a/test/hotspot/jtreg/ProblemList.txt Tue Dec 26 13:38:31 2017 +0530
+++ b/test/hotspot/jtreg/ProblemList.txt Mon Jan 08 08:53:14 2018 -0800
@@ -42,6 +42,7 @@
compiler/ciReplay/TestSAServer.java 8029528 generic-all
compiler/codecache/stress/OverloadCompileQueueTest.java 8166554 generic-all
+compiler/codegen/Test6896617.java 8193479 generic-all
compiler/compilercontrol/jcmd/ClearDirectivesFileStackTest.java 8140405 generic-all
compiler/jvmci/compilerToVM/GetResolvedJavaTypeTest.java 8158860 generic-all
compiler/jvmci/compilerToVM/InvalidateInstalledCodeTest.java 8163894 generic-all
@@ -50,6 +51,7 @@
compiler/tiered/LevelTransitionTest.java 8067651 generic-all
compiler/types/correctness/CorrectnessTest.java 8066173 generic-all
compiler/types/correctness/OffTest.java 8066173 generic-all
+compiler/c2/Test8007294.java 8192992 generic-all
# aot test intermittently failing in jprt 8175791
compiler/aot/DeoptimizationTest.java 8175791 windows-all
@@ -77,7 +79,6 @@
# This test is disabled since it will stress NMT and timeout during normal testing
runtime/NMT/MallocStressTest.java 8166548 generic-all
runtime/SharedArchiveFile/DefaultUseWithClient.java 8154204 generic-all
-runtime/AppCDS/UseAppCDS.java 8165603 windows-all
#############################################################################
--- a/test/hotspot/jtreg/TEST.ROOT Tue Dec 26 13:38:31 2017 +0530
+++ b/test/hotspot/jtreg/TEST.ROOT Mon Jan 08 08:53:14 2018 -0800
@@ -58,7 +58,7 @@
docker.support
# Minimum jtreg version
-requiredVersion=4.2 b08
+requiredVersion=4.2 b11
# Path to libraries in the topmost test directory. This is needed so @library
# does not need ../../../ notation to reach them
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/compiler/aot/cli/jaotc/CompileClassWithDebugTest.java Mon Jan 08 08:53:14 2018 -0800
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @requires vm.aot
+ * @library / /test/lib /testlibrary
+ * @modules java.base/jdk.internal.misc
+ * @build compiler.aot.cli.jaotc.CompileClassWithDebugTest
+ * @run driver ClassFileInstaller compiler.aot.cli.jaotc.data.HelloWorldOne
+ * @run driver compiler.aot.cli.jaotc.CompileClassWithDebugTest
+ * @summary check that jaotc can compile a class with a --debug flag
+ */
+
+package compiler.aot.cli.jaotc;
+
+import compiler.aot.cli.jaotc.data.HelloWorldOne;
+import java.io.File;
+import jdk.test.lib.Asserts;
+import jdk.test.lib.process.OutputAnalyzer;
+
+public class CompileClassWithDebugTest {
+ public static void main(String[] args) {
+ OutputAnalyzer oa = JaotcTestHelper.compileLibrary("--debug", "--class-name", JaotcTestHelper
+ .getClassAotCompilationName(HelloWorldOne.class));
+ oa.shouldHaveExitValue(0);
+ File compiledLibrary = new File(JaotcTestHelper.DEFAULT_LIB_PATH);
+ Asserts.assertTrue(compiledLibrary.exists(), "Compiled library file missing");
+ Asserts.assertGT(compiledLibrary.length(), 0L, "Unexpected compiled library size");
+ JaotcTestHelper.checkLibraryUsage(HelloWorldOne.class.getName());
+ }
+}
--- a/test/hotspot/jtreg/compiler/ciReplay/TestDumpReplay.java Tue Dec 26 13:38:31 2017 +0530
+++ b/test/hotspot/jtreg/compiler/ciReplay/TestDumpReplay.java Mon Jan 08 08:53:14 2018 -0800
@@ -27,7 +27,8 @@
* @modules java.base/jdk.internal.misc:+open
* @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
+ * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+IgnoreUnrecognizedVMOptions
+ * -Xbootclasspath/a:. -XX:+WhiteBoxAPI
* -Xbatch -XX:-TieredCompilation -XX:+AlwaysIncrementalInline
* -XX:CompileCommand=compileonly,compiler.ciReplay.TestDumpReplay::*
* compiler.ciReplay.TestDumpReplay
--- a/test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java Tue Dec 26 13:38:31 2017 +0530
+++ b/test/hotspot/jtreg/runtime/CommandLine/VMDeprecatedOptions.java Mon Jan 08 08:53:14 2018 -0800
@@ -47,10 +47,6 @@
{"InitialRAMFraction", "64"},
{"AssumeMP", "false"},
{"UseMembar", "true"},
- {"FastTLABRefill", "false"},
- {"DeferPollingPageLoopCount", "-1"},
- {"SafepointSpinBeforeYield", "2000"},
- {"DeferThrSuspendLoopCount", "4000"},
// deprecated alias flags (see also aliased_jvm_flags):
{"DefaultMaxRAMFraction", "4"},
@@ -110,6 +106,5 @@
testDeprecated(DEPRECATED_OPTIONS); // Make sure that each deprecated option is mentioned in the output.
testDeprecatedDiagnostic("UnsyncloadClass", "false");
testDeprecatedDiagnostic("IgnoreUnverifiableClassesDuringDump", "false");
- testDeprecatedExperimental("UseCGroupMemoryLimitForHeap", "true");
}
}
--- a/test/hotspot/jtreg/runtime/ErrorHandling/NestedThreadsListHandleInErrorHandlingTest.java Tue Dec 26 13:38:31 2017 +0530
+++ b/test/hotspot/jtreg/runtime/ErrorHandling/NestedThreadsListHandleInErrorHandlingTest.java Mon Jan 08 08:53:14 2018 -0800
@@ -89,7 +89,7 @@
// We should have a section of Threads class SMR info:
Pattern.compile("Threads class SMR info:"),
// We should have one nested ThreadsListHandle:
- Pattern.compile(".*, _smr_nested_thread_list_max=1"),
+ Pattern.compile(".*, _nested_thread_list_max=1"),
// The current thread (marked with '=>') in the threads list
// should show a hazard ptr:
Pattern.compile("=>.* JavaThread \"main\" .*_threads_hazard_ptr=0x[0-9A-Fa-f][0-9A-Fa-f]*, _nested_threads_hazard_ptr_cnt=1, _nested_threads_hazard_ptrs=0x.*"),
--- a/test/hotspot/jtreg/runtime/SharedArchiveFile/BootAppendTests.java Tue Dec 26 13:38:31 2017 +0530
+++ b/test/hotspot/jtreg/runtime/SharedArchiveFile/BootAppendTests.java Mon Jan 08 08:53:14 2018 -0800
@@ -23,7 +23,7 @@
/**
* @test
- * @requires vm.cds
+ * @requires vm.cds & !vm.graal.enabled
* @summary Testing -Xbootclasspath/a support for CDS
* @requires (vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)
* @library /test/lib
--- a/test/hotspot/jtreg/runtime/Thread/TestThreadDumpSMRInfo.java Tue Dec 26 13:38:31 2017 +0530
+++ b/test/hotspot/jtreg/runtime/Thread/TestThreadDumpSMRInfo.java Mon Jan 08 08:53:14 2018 -0800
@@ -45,7 +45,7 @@
// Here's a sample "Threads class SMR info" section:
//
// Threads class SMR info:
- // _smr_java_thread_list=0x0000000000ce8da0, length=23, elements={
+ // _java_thread_list=0x0000000000ce8da0, length=23, elements={
// 0x000000000043a800, 0x0000000000aee800, 0x0000000000b06800, 0x0000000000b26000,
// 0x0000000000b28800, 0x0000000000b2b000, 0x0000000000b2e000, 0x0000000000b30000,
// 0x0000000000b32800, 0x0000000000b35000, 0x0000000000b3f000, 0x0000000000b41800,
@@ -53,9 +53,9 @@
// 0x0000000000b55800, 0x0000000000b57800, 0x0000000000b5a000, 0x0000000000b5c800,
// 0x0000000000cc8800, 0x0000000000fd9800, 0x0000000000ef4800
// }
- // _smr_java_thread_list_alloc_cnt=24, _smr_java_thread_list_free_cnt=23, _smr_java_thread_list_max=23, _smr_nested_thread_list_max=0
- // _smr_delete_lock_wait_cnt=0, _smr_delete_lock_wait_max=0
- // _smr_to_delete_list_cnt=0, _smr_to_delete_list_max=1
+ // _java_thread_list_alloc_cnt=24, _java_thread_list_free_cnt=23, _java_thread_list_max=23, _nested_thread_list_max=0
+ // _delete_lock_wait_cnt=0, _delete_lock_wait_max=0
+ // _to_delete_list_cnt=0, _to_delete_list_max=1
final static String HEADER_STR = "Threads class SMR info:";
--- a/test/hotspot/jtreg/runtime/appcds/MultiReleaseJars.java Tue Dec 26 13:38:31 2017 +0530
+++ b/test/hotspot/jtreg/runtime/appcds/MultiReleaseJars.java Mon Jan 08 08:53:14 2018 -0800
@@ -72,13 +72,14 @@
if (contents == null) {
throw new java.lang.RuntimeException("No input for writing to file" + file);
}
- FileOutputStream fos = new FileOutputStream(file);
- PrintStream ps = new PrintStream(fos);
- for (String str : contents) {
- ps.println(str);
+ try (
+ FileOutputStream fos = new FileOutputStream(file);
+ PrintStream ps = new PrintStream(fos)
+ ) {
+ for (String str : contents) {
+ ps.println(str);
+ }
}
- ps.close();
- fos.close();
}
/* version.jar entries and files:
--- a/test/hotspot/jtreg/runtime/appcds/SharedArchiveConsistency.java Tue Dec 26 13:38:31 2017 +0530
+++ b/test/hotspot/jtreg/runtime/appcds/SharedArchiveConsistency.java Mon Jan 08 08:53:14 2018 -0800
@@ -245,11 +245,10 @@
// Copy file with bytes deleted or inserted
// del -- true, deleted, false, inserted
public static void copyFile(File from, File to, boolean del) throws Exception {
- FileChannel inputChannel = null;
- FileChannel outputChannel = null;
- try {
- inputChannel = new FileInputStream(from).getChannel();
- outputChannel = new FileOutputStream(to).getChannel();
+ try (
+ FileChannel inputChannel = new FileInputStream(from).getChannel();
+ FileChannel outputChannel = new FileOutputStream(to).getChannel()
+ ) {
long size = inputChannel.size();
int init_size = getFileHeaderSize(inputChannel);
outputChannel.transferFrom(inputChannel, 0, init_size);
@@ -264,9 +263,6 @@
outputChannel.write(ByteBuffer.wrap(new byte[n]));
outputChannel.transferFrom(inputChannel, init_size + n , size - init_size);
}
- } finally {
- inputChannel.close();
- outputChannel.close();
}
}
--- a/test/hotspot/jtreg/runtime/appcds/UseAppCDS.java Tue Dec 26 13:38:31 2017 +0530
+++ b/test/hotspot/jtreg/runtime/appcds/UseAppCDS.java Mon Jan 08 08:53:14 2018 -0800
@@ -108,12 +108,14 @@
public static List<String> toClassNames(String filename) throws IOException {
ArrayList<String> classes = new ArrayList<>();
- BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(filename)));
- for (; ; ) {
- String line = br.readLine();
- if (line == null)
- break;
- classes.add(line.replaceAll("/", "."));
+ try (BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(filename)))) {
+ for (; ; ) {
+ String line = br.readLine();
+ if (line == null) {
+ break;
+ }
+ classes.add(line.replaceAll("/", "."));
+ }
}
return classes;
}
--- a/test/hotspot/jtreg/runtime/appcds/cacheObject/RedefineClassTest.java Tue Dec 26 13:38:31 2017 +0530
+++ b/test/hotspot/jtreg/runtime/appcds/cacheObject/RedefineClassTest.java Mon Jan 08 08:53:14 2018 -0800
@@ -43,7 +43,6 @@
import com.sun.tools.attach.VirtualMachine;
import com.sun.tools.attach.VirtualMachineDescriptor;
import java.io.File;
-import java.io.FileOutputStream;
import java.util.List;
import jdk.test.lib.Asserts;
import jdk.test.lib.cds.CDSOptions;
--- a/test/hotspot/jtreg/runtime/appcds/javaldr/ArrayTest.java Tue Dec 26 13:38:31 2017 +0530
+++ b/test/hotspot/jtreg/runtime/appcds/javaldr/ArrayTest.java Mon Jan 08 08:53:14 2018 -0800
@@ -44,7 +44,9 @@
static String arrayClasses[] = {
"ArrayTestHelper",
"[Ljava/lang/Comparable;",
- "[I"
+ "[I",
+ "[[[Ljava/lang/Object;",
+ "[[B"
};
public static void main(String[] args) throws Exception {
@@ -56,7 +58,12 @@
String bootClassPath = "-Xbootclasspath/a:" + whiteBoxJar;
// create an archive containing array classes
- TestCommon.dump(appJar, TestCommon.list(arrayClasses), bootClassPath, "-verbose:class");
+ OutputAnalyzer output = TestCommon.dump(appJar, TestCommon.list(arrayClasses), bootClassPath, "-verbose:class");
+ // we currently don't support array classes during CDS dump
+ output.shouldContain("Preload Warning: Cannot find [Ljava/lang/Comparable;")
+ .shouldContain("Preload Warning: Cannot find [I")
+ .shouldContain("Preload Warning: Cannot find [[[Ljava/lang/Object;")
+ .shouldContain("Preload Warning: Cannot find [[B");
List<String> argsList = new ArrayList<String>();
argsList.add("-XX:+UnlockDiagnosticVMOptions");
@@ -67,12 +74,13 @@
argsList.add("-verbose:class");
argsList.add("ArrayTestHelper");
// the following are input args to the ArrayTestHelper.
- for (int i = 0; i < arrayClasses.length; i++) {
+ // skip checking array classes during run time
+ for (int i = 0; i < 1; i++) {
argsList.add(arrayClasses[i]);
}
String[] opts = new String[argsList.size()];
opts = argsList.toArray(opts);
- OutputAnalyzer output = TestCommon.execCommon(opts);
+ output = TestCommon.execCommon(opts);
TestCommon.checkExec(output);
}
}
--- a/test/hotspot/jtreg/runtime/appcds/jigsaw/JigsawOptionsCombo.java Tue Dec 26 13:38:31 2017 +0530
+++ b/test/hotspot/jtreg/runtime/appcds/jigsaw/JigsawOptionsCombo.java Mon Jan 08 08:53:14 2018 -0800
@@ -27,7 +27,7 @@
* @summary Test combinations of jigsaw options that affect the use of AppCDS
*
* AppCDS does not support uncompressed oops
- * @requires (vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)
+ * @requires ((vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)) & !vm.graal.enabled
* @library /test/lib ..
* @modules java.base/jdk.internal.misc
* java.management
--- a/test/hotspot/jtreg/runtime/appcds/jigsaw/classpathtests/BootAppendTests.java Tue Dec 26 13:38:31 2017 +0530
+++ b/test/hotspot/jtreg/runtime/appcds/jigsaw/classpathtests/BootAppendTests.java Mon Jan 08 08:53:14 2018 -0800
@@ -25,7 +25,7 @@
/**
* @test
* @summary AppCDS tests for testing -Xbootclasspath/a
- * @requires (vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)
+ * @requires ((vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)) & !vm.graal.enabled
* @library /test/lib /test/hotspot/jtreg/runtime/appcds
* @modules java.base/jdk.internal.misc
* java.management
--- a/test/hotspot/jtreg/runtime/appcds/jigsaw/classpathtests/ClassPathTests.java Tue Dec 26 13:38:31 2017 +0530
+++ b/test/hotspot/jtreg/runtime/appcds/jigsaw/classpathtests/ClassPathTests.java Mon Jan 08 08:53:14 2018 -0800
@@ -24,7 +24,7 @@
/**
* @test
- * @requires (vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)
+ * @requires ((vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)) & !vm.graal.enabled
* @library ../..
* @library /test/lib
* @modules java.base/jdk.internal.misc
--- a/test/hotspot/jtreg/runtime/appcds/jigsaw/classpathtests/EmptyClassInBootClassPath.java Tue Dec 26 13:38:31 2017 +0530
+++ b/test/hotspot/jtreg/runtime/appcds/jigsaw/classpathtests/EmptyClassInBootClassPath.java Mon Jan 08 08:53:14 2018 -0800
@@ -29,7 +29,7 @@
* 2) app loader will load the class from the jimage by default;
* app loader will load the class from the bootclasspath if the
* "--limit-modules java.base" option is specified
- * @requires (vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)
+ * @requires ((vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)) & !vm.graal.enabled
* @library /test/lib /test/hotspot/jtreg/runtime/appcds
* @modules java.base/jdk.internal.misc
* java.management
--- a/test/hotspot/jtreg/runtime/appcds/jigsaw/limitmods/LimitModsTests.java Tue Dec 26 13:38:31 2017 +0530
+++ b/test/hotspot/jtreg/runtime/appcds/jigsaw/limitmods/LimitModsTests.java Mon Jan 08 08:53:14 2018 -0800
@@ -24,7 +24,7 @@
/**
* @test
- * @requires (vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)
+ * @requires ((vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)) & !vm.graal.enabled
* @library ../..
* @library /test/lib
* @modules java.base/jdk.internal.misc
--- a/test/hotspot/jtreg/runtime/appcds/jvmti/InstrumentationTest.java Tue Dec 26 13:38:31 2017 +0530
+++ b/test/hotspot/jtreg/runtime/appcds/jvmti/InstrumentationTest.java Mon Jan 08 08:53:14 2018 -0800
@@ -182,9 +182,9 @@
// We use the flagFile to prevent the child process to make progress, until we have
// attached to it.
File f = new File(flagFile);
- FileOutputStream o = new FileOutputStream(f);
- o.write(1);
- o.close();
+ try (FileOutputStream o = new FileOutputStream(f)) {
+ o.write(1);
+ }
if (!f.exists()) {
throw new RuntimeException("Failed to create " + f);
}
--- a/test/hotspot/jtreg/runtime/appcds/test-classes/Util.java Tue Dec 26 13:38:31 2017 +0530
+++ b/test/hotspot/jtreg/runtime/appcds/test-classes/Util.java Mon Jan 08 08:53:14 2018 -0800
@@ -39,7 +39,7 @@
throws FileNotFoundException, IOException, NoSuchMethodException, IllegalAccessException,
InvocationTargetException
{
- DataInputStream dis = new DataInputStream(new FileInputStream(clsFile));
+ try (DataInputStream dis = new DataInputStream(new FileInputStream(clsFile))) {
byte[] buff = new byte[(int)clsFile.length()];
dis.readFully(buff);
replace(buff, fromString, toString);
@@ -57,6 +57,7 @@
System.out.println("Loaded : " + cls);
return cls;
+ }
}
/**
@@ -146,11 +147,10 @@
JarFile jf = new JarFile(jarFile);
JarEntry ent = jf.getJarEntry(className.replace('.', '/') + ".class");
- DataInputStream dis = new DataInputStream(jf.getInputStream(ent));
- byte[] buff = new byte[(int)ent.getSize()];
- dis.readFully(buff);
- dis.close();
-
- return buff;
+ try (DataInputStream dis = new DataInputStream(jf.getInputStream(ent))) {
+ byte[] buff = new byte[(int)ent.getSize()];
+ dis.readFully(buff);
+ return buff;
+ }
}
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/runtime/classFileParserBug/Class55.jasm Mon Jan 08 08:53:14 2018 -0800
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8173382
+ * @summary Check that the JVM accepts class files with version 55
+ * @run main Class55
+ */
+
+super public class Class55 version 55:0 {
+
+ public Method "<init>":"()V" stack 1 locals 1 {
+ aload_0;
+ invokespecial Method java/lang/Object."<init>":"()V";
+ return;
+ }
+
+ public static Method main:"([Ljava/lang/String;)V" stack 0 locals 1 {
+ return;
+ }
+
+} // end Class Class55
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/runtime/jni/checked/TestCheckedEnsureLocalCapacity.java Mon Jan 08 08:53:14 2018 -0800
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ * @bug 8193222
+ * @summary Check EnsureLocalCapacity doesn't shrink unexpectedly
+ * @library /test/lib
+ * @run main/othervm/native TestCheckedEnsureLocalCapacity launch
+ */
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+
+public class TestCheckedEnsureLocalCapacity {
+
+ static {
+ System.loadLibrary("TestCheckedEnsureLocalCapacity");
+ }
+
+ // Calls EnsureLocalCapacity(capacity) and then creates "copies" number
+ // of LocalRefs to "o".
+ // If capacity > copies no warning should ensue (with the bug fixed).
+ // If copies > capacity + warning-threshold then we still get a warning.
+ private static native void ensureCapacity(Object o, int capacity, int copies);
+
+ private static int[][] testArgs = {
+ { 60, 45 }, // good: capacity > copies
+ { 1, 45 } // bad: copies >> capacity
+ };
+
+ private static final String EXCEED_WARNING =
+ "^WARNING: JNI local refs: \\d++, exceeds capacity:";
+
+ private static final String WARNING = "^WARNING: ";
+
+ public static void main(String[] args) throws Throwable {
+ if (args.length == 2) {
+ ensureCapacity(new Object(),
+ Integer.parseInt(args[0]),
+ Integer.parseInt(args[1]));
+ return;
+ }
+
+ // No warning
+ ProcessTools.executeTestJvm("-Xcheck:jni",
+ "TestCheckedEnsureLocalCapacity",
+ Integer.toString(testArgs[0][0]),
+ Integer.toString(testArgs[0][1])).
+ shouldHaveExitValue(0).
+ // check no capacity warning
+ stdoutShouldNotMatch(EXCEED_WARNING).
+ // check no other warning
+ stdoutShouldNotMatch(WARNING).
+ reportDiagnosticSummary();
+
+ // Warning
+ ProcessTools.executeTestJvm("-Xcheck:jni",
+ "TestCheckedEnsureLocalCapacity",
+ Integer.toString(testArgs[1][0]),
+ Integer.toString(testArgs[1][1])).
+ shouldHaveExitValue(0).
+ // check for capacity warning
+ stdoutShouldMatch(EXCEED_WARNING).
+ reportDiagnosticSummary();
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/runtime/jni/checked/libTestCheckedEnsureLocalCapacity.c Mon Jan 08 08:53:14 2018 -0800
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+#include <jni.h>
+#include <stdio.h>
+
+void reduceLocalCapacity(JNIEnv* env) {
+ puts("reduceLocalCapacity: setting to 1");
+ (*env)->EnsureLocalCapacity(env,1);
+}
+
+JNIEXPORT void JNICALL
+Java_TestCheckedEnsureLocalCapacity_ensureCapacity(JNIEnv *env,
+ jobject unused,
+ jobject target,
+ jint capacity,
+ jint copies) {
+ int i;
+ printf("ensureCapacity: setting to %d\n", capacity);
+ (*env)->EnsureLocalCapacity(env, capacity); // set high
+ reduceLocalCapacity(env); // sets low
+
+ printf("ensureCapacity: creating %d LocalRefs\n", copies);
+ for (i = 0; i < copies; i++) {
+ target = (*env)->NewLocalRef(env, target);
+ }
+
+ puts("ensureCapacity: done");
+}
--- a/test/hotspot/jtreg/serviceability/jvmti/GetOwnedMonitorInfo/libGetOwnedMonitorInfoTest.c Tue Dec 26 13:38:31 2017 +0530
+++ b/test/hotspot/jtreg/serviceability/jvmti/GetOwnedMonitorInfo/libGetOwnedMonitorInfoTest.c Mon Jan 08 08:53:14 2018 -0800
@@ -49,6 +49,7 @@
static volatile jboolean event_has_posted = JNI_FALSE;
static volatile jint status = PASSED;
+static volatile jclass testClass = NULL;
static jint Agent_Initialize(JavaVM *jvm, char *options, void *reserved);
@@ -66,16 +67,10 @@
}
static jboolean CheckLockObject(JNIEnv *env, jobject monitor) {
- jclass testClass;
-
- testClass = (*env)->FindClass(env, TEST_CLASS);
if (testClass == NULL) {
- fprintf(stderr, "MonitorContendedEnter: " TEST_CLASS " not found\n");
- status = FAILED;
- event_has_posted = JNI_TRUE;
+ // JNI_OnLoad has not been called yet, so can't possibly be an instance of TEST_CLASS.
return JNI_FALSE;
}
-
return (*env)->IsInstanceOf(env, monitor, testClass);
}
@@ -171,7 +166,26 @@
JNIEXPORT jint JNICALL
JNI_OnLoad(JavaVM *jvm, void *reserved) {
- return JNI_VERSION_1_8;
+ jint res;
+ JNIEnv *env;
+
+ res = JNI_ENV_PTR(jvm)->GetEnv(JNI_ENV_ARG(jvm, (void **) &env),
+ JNI_VERSION_9);
+ if (res != JNI_OK || env == NULL) {
+ fprintf(stderr, "Error: GetEnv call failed(%d)!\n", res);
+ return JNI_ERR;
+ }
+
+ testClass = (*env)->FindClass(env, TEST_CLASS);
+ if (testClass != NULL) {
+ testClass = (*env)->NewGlobalRef(env, testClass);
+ }
+ if (testClass == NULL) {
+ fprintf(stderr, "Error: Could not load class %s!\n", TEST_CLASS);
+ return JNI_ERR;
+ }
+
+ return JNI_VERSION_9;
}
static
@@ -185,7 +199,7 @@
printf("Agent_OnLoad started\n");
res = JNI_ENV_PTR(jvm)->GetEnv(JNI_ENV_ARG(jvm, (void **) &jvmti),
- JVMTI_VERSION_1);
+ JVMTI_VERSION_9);
if (res != JNI_OK || jvmti == NULL) {
fprintf(stderr, "Error: wrong result of a valid call to GetEnv!\n");
return JNI_ERR;
@@ -221,6 +235,7 @@
return JNI_ERR;
}
+ memset(&callbacks, 0, sizeof(callbacks));
callbacks.MonitorContendedEnter = &MonitorContendedEnter;
callbacks.MonitorContendedEntered = &MonitorContendedEntered;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbFindPC.java Mon Jan 08 08:53:14 2018 -0800
@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.ArrayList;
+
+import jdk.test.lib.apps.LingeredApp;
+
+/*
+ * @test
+ * @bug 8193124
+ * @summary Test the clhsdb 'findpc' command
+ * @library /test/lib
+ * @run main/othervm ClhsdbFindPC
+ */
+
+public class ClhsdbFindPC {
+
+ private static void testFindPC(boolean withXcomp) throws Exception {
+ LingeredApp theApp = null;
+ try {
+ ClhsdbLauncher test = new ClhsdbLauncher();
+ theApp = withXcomp ? LingeredApp.startApp(List.of("-Xcomp"))
+ : LingeredApp.startApp(List.of("-Xint"));
+ System.out.print("Started LingeredApp ");
+ if (withXcomp) {
+ System.out.print("(-Xcomp) ");
+ } else {
+ System.out.print("(-Xint) ");
+ }
+ System.out.println("with pid " + theApp.getPid());
+
+ // Run 'jstack -v' command to get the pc
+ List<String> cmds = List.of("jstack -v");
+ String output = test.run(theApp.getPid(), cmds, null, null);
+
+ // Test the 'findpc' command passing in the pc obtained from
+ // the 'jstack -v' command
+ cmds = new ArrayList<String>();
+
+ // Output could be null if the test was skipped due to
+ // attach permission issues.
+ if (output != null) {
+ String cmdStr = null;
+ String[] parts = output.split("LingeredApp.main");
+ String[] tokens = parts[1].split(" ");
+ for (String token : tokens) {
+ if (token.contains("pc")) {
+ String[] address = token.split("=");
+ // address[1] represents the address of the Method
+ cmdStr = "findpc " + address[1].replace(",","");
+ cmds.add(cmdStr);
+ break;
+ }
+ }
+
+ Map<String, List<String>> expStrMap = new HashMap<>();
+ if (withXcomp) {
+ expStrMap.put(cmdStr, List.of(
+ "In code in NMethod for jdk/test/lib/apps/LingeredApp.main",
+ "content:",
+ "oops:",
+ "frame size:"));
+ } else {
+ expStrMap.put(cmdStr, List.of(
+ "In interpreter codelet",
+ "invoke return entry points"));
+ }
+
+ test.run(theApp.getPid(), cmds, expStrMap, null);
+ }
+ } catch (Exception ex) {
+ throw new RuntimeException("Test ERROR " + ex, ex);
+ } finally {
+ LingeredApp.stopApp(theApp);
+ }
+ }
+
+ public static void main(String[] args) throws Exception {
+ System.out.println("Starting the ClhsdbFindPC test");
+ testFindPC(true);
+ testFindPC(false);
+ System.out.println("Test PASSED");
+ }
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbInspect.java Mon Jan 08 08:53:14 2018 -0800
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.ArrayList;
+import jdk.test.lib.apps.LingeredApp;
+
+/*
+ * @test
+ * @bug 8192985
+ * @summary Test the clhsdb 'inspect' command
+ * @library /test/lib
+ * @run main/othervm ClhsdbInspect
+ */
+
+public class ClhsdbInspect {
+
+ public static void main(String[] args) throws Exception {
+ System.out.println("Starting the ClhsdbInspect test");
+
+ LingeredAppWithLock theApp = null;
+ try {
+ ClhsdbLauncher test = new ClhsdbLauncher();
+
+ theApp = new LingeredAppWithLock();
+ LingeredApp.startApp(null, theApp);
+ System.out.println("Started LingeredApp with pid " + theApp.getPid());
+
+ // Run the 'jstack -v' command to get the address of a Method*
+ // and the oop address of a java.lang.ref.ReferenceQueue$Lock
+ // object
+ List<String> cmds = List.of("jstack -v");
+
+ String jstackOutput = test.run(theApp.getPid(), cmds, null, null);
+
+ if (jstackOutput == null) {
+ // Output could be null due to attach permission issues
+ // and if we are skipping this.
+ LingeredApp.stopApp(theApp);
+ return;
+ }
+
+ String addressString = null;
+ Map<String, String> tokensMap = new HashMap<>();
+ tokensMap.put("waiting to lock",
+ "instance of Oop for java/lang/Class");
+ tokensMap.put("Method\\*=", "Type is Method");
+ tokensMap.put("waiting to re-lock in wait",
+ "instance of Oop for java/lang/ref/ReferenceQueue$Lock");
+
+ for (String key: tokensMap.keySet()) {
+ cmds = new ArrayList<String>();
+ Map<String, List<String>> expStrMap = new HashMap<>();
+
+ String[] snippets = jstackOutput.split(key);
+ String[] tokens = snippets[1].split(" ");
+ for (String token: tokens) {
+ if (token.contains("0x")) {
+ addressString = token.replace("<", "").replace(">", "");
+ break;
+ }
+ }
+
+ String cmd = "inspect " + addressString;
+ cmds.add(cmd);
+ expStrMap.put(cmd, List.of(tokensMap.get(key)));
+ test.run(theApp.getPid(), cmds, expStrMap, null);
+ }
+ } catch (Exception ex) {
+ throw new RuntimeException("Test ERROR " + ex, ex);
+ } finally {
+ LingeredApp.stopApp(theApp);
+ }
+ System.out.println("Test PASSED");
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbJdis.java Mon Jan 08 08:53:14 2018 -0800
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.ArrayList;
+
+import jdk.test.lib.apps.LingeredApp;
+
+/*
+ * @test
+ * @bug 8193124
+ * @summary Test the clhsdb 'jdis' command
+ * @library /test/lib
+ * @run main/othervm ClhsdbJdis
+ */
+
+public class ClhsdbJdis {
+
+ public static void main(String[] args) throws Exception {
+ LingeredApp theApp = null;
+ System.out.println("Starting the ClhsdbJdis test");
+
+ try {
+ ClhsdbLauncher test = new ClhsdbLauncher();
+ theApp = LingeredApp.startApp();
+ System.out.println("Started LingeredApp with pid " + theApp.getPid());
+
+ // Run 'jstack -v' command to get the Method Address
+ List<String> cmds = List.of("jstack -v");
+ String output = test.run(theApp.getPid(), cmds, null, null);
+
+ // Test the 'jdis' command passing in the address obtained from
+ // the 'jstack -v' command
+ cmds = new ArrayList<String>();
+
+ // Output could be null if the test was skipped due to
+ // attach permission issues.
+ if (output != null) {
+ String cmdStr = null;
+ String[] parts = output.split("LingeredApp.main");
+ String[] tokens = parts[1].split(" ");
+ for (String token : tokens) {
+ if (token.contains("Method")) {
+ String[] address = token.split("=");
+ // address[1] represents the address of the Method
+ cmdStr = "jdis " + address[1];
+ cmds.add(cmdStr);
+ break;
+ }
+ }
+
+ Map<String, List<String>> expStrMap = new HashMap<>();
+ expStrMap.put(cmdStr, List.of(
+ "public static void main(java.lang.String[])",
+ "Holder Class",
+ "public class jdk.test.lib.apps.LingeredApp @",
+ "Bytecode",
+ "line bci bytecode",
+ "Exception Table",
+ "start bci end bci handler bci catch type",
+ "Constant Pool of [public class jdk.test.lib.apps.LingeredApp @"));
+
+ test.run(theApp.getPid(), cmds, expStrMap, null);
+ }
+ } catch (Exception ex) {
+ throw new RuntimeException("Test ERROR " + ex, ex);
+ } finally {
+ LingeredApp.stopApp(theApp);
+ }
+ System.out.println("Test PASSED");
+ }
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbPrintAs.java Mon Jan 08 08:53:14 2018 -0800
@@ -0,0 +1,127 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.ArrayList;
+import jdk.test.lib.apps.LingeredApp;
+
+/*
+ * @test
+ * @bug 8192985
+ * @summary Test the clhsdb 'printas' command
+ * @library /test/lib
+ * @run main/othervm ClhsdbPrintAs
+ */
+
+public class ClhsdbPrintAs {
+
+ public static void main(String[] args) throws Exception {
+ System.out.println("Starting the ClhsdbPrintAs test");
+
+ LingeredApp theApp = null;
+ try {
+ ClhsdbLauncher test = new ClhsdbLauncher();
+ theApp = LingeredApp.startApp();
+ System.out.println("Started LingeredApp with pid " + theApp.getPid());
+
+ // Run the 'jstack -v' command to get the address of a the Method*
+ // representing LingeredApp.main
+ List<String> cmds = List.of("jstack -v");
+ Map<String, List<String>> expStrMap;
+
+ String jstackOutput = test.run(theApp.getPid(), cmds, null, null);
+
+ if (jstackOutput == null) {
+ // Output could be null due to attach permission issues
+ // and if we are skipping this.
+ LingeredApp.stopApp(theApp);
+ return;
+ }
+
+ String[] snippets = jstackOutput.split("LingeredApp.main");
+ String addressString = null;
+
+ String[] tokens = snippets[1].split("Method\\*=");
+ String[] words = tokens[1].split(" ");
+ addressString = words[0];
+
+ cmds = new ArrayList<String>();
+ expStrMap = new HashMap<>();
+
+ String cmd = "printas Method " + addressString;
+ cmds.add(cmd);
+ expStrMap.put(cmd, List.of
+ ("ConstMethod", "MethodCounters", "Method::_access_flags"));
+
+ // Run the printas Method <addr> command to obtain the address
+ // of ConstMethod*
+ String methodDetailsOutput = test.run(theApp.getPid(), cmds, expStrMap, null);
+ snippets = methodDetailsOutput.split("ConstMethod*");
+
+ tokens = snippets[1].split(" ");
+ for (String token : tokens) {
+ if (token.contains("0x")) {
+ addressString = token.replace("\n", "");
+ break;
+ }
+ }
+
+ cmds = new ArrayList<String>();
+ expStrMap = new HashMap<>();
+
+ cmd = "printas ConstMethod " + addressString;
+ cmds.add(cmd);
+ expStrMap.put(cmd, List.of
+ ("ConstantPool", "_max_locals", "_flags"));
+
+ // Run the printas constMethod <addr> command to obtain the address
+ // of ConstantPool*
+ String constMethodDetailsOutput = test.run(theApp.getPid(), cmds, expStrMap, null);
+ snippets = constMethodDetailsOutput.split("ConstantPool*");
+
+ tokens = snippets[1].split(" ");
+ for (String token : tokens) {
+ if (token.contains("0x")) {
+ addressString = token.replace("\n", "");
+ break;
+ }
+ }
+
+ cmds = new ArrayList<String>();
+ expStrMap = new HashMap<>();
+
+ cmd = "printas ConstantPool " + addressString;
+ cmds.add(cmd);
+ expStrMap.put(cmd, List.of
+ ("ConstantPoolCache", "_pool_holder", "InstanceKlass*"));
+ test.run(theApp.getPid(), cmds, expStrMap, null);
+ } catch (Exception ex) {
+ throw new RuntimeException("Test ERROR " + ex, ex);
+ } finally {
+ LingeredApp.stopApp(theApp);
+ }
+ System.out.println("Test PASSED");
+ }
+}
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbPrintStatics.java Tue Dec 26 13:38:31 2017 +0530
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbPrintStatics.java Mon Jan 08 08:53:14 2018 -0800
@@ -58,7 +58,7 @@
"Abstract_VM_Version::_vm_major_version",
"ClassLoaderDataGraph::_head", "SymbolTable::_the_table",
"JNIHandles::_weak_global_handles", "PerfMemory::_top",
- "_jfr_checkpoints", "ObjectSynchronizer::gBlockList",
+ "ObjectSynchronizer::gBlockList",
"java_lang_Class::_oop_size_offset",
"CodeCache::_scavenge_root_nmethods"));
expStrMap.put("printstatics SystemDictionary", List.of(
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbScanOops.java Mon Jan 08 08:53:14 2018 -0800
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.ArrayList;
+import jdk.test.lib.Utils;
+import jdk.test.lib.apps.LingeredApp;
+
+/*
+ * @test
+ * @bug 8192985
+ * @summary Test the clhsdb 'scanoops' command
+ * @library /test/lib
+ * @run main/othervm/timeout=1200 ClhsdbScanOops
+ */
+
+public class ClhsdbScanOops {
+
+ private static void testWithGcType(String gc) throws Exception {
+
+ LingeredApp theApp = null;
+
+ try {
+ ClhsdbLauncher test = new ClhsdbLauncher();
+ List<String> vmArgs = new ArrayList<String>();
+ vmArgs.add(gc);
+ theApp = LingeredApp.startApp(vmArgs);
+
+ System.out.println ("Started LingeredApp with the GC option " + gc +
+ " and pid " + theApp.getPid());
+
+ // Run the 'universe' command to get the address ranges
+ List<String> cmds = List.of("universe");
+
+ String universeOutput = test.run(theApp.getPid(), cmds, null, null);
+
+ if (universeOutput == null) {
+ // Output could be null due to attach permission issues
+ // and if we are skipping this.
+ LingeredApp.stopApp(theApp);
+ return;
+ }
+
+ cmds = new ArrayList<String>();
+ Map<String, List<String>> expStrMap = new HashMap<>();
+ Map<String, List<String>> unExpStrMap = new HashMap<>();
+
+ String startAddress = null;
+ String endAddress = null;
+ String[] snippets = null;
+
+ if (gc.contains("UseParallelGC")) {
+ snippets = universeOutput.split("eden = ");
+ } else {
+ snippets = universeOutput.split("eden \\[");
+ }
+ String[] words = snippets[1].split(",");
+ // Get the addresses from Eden
+ startAddress = words[0].replace("[", "");
+ endAddress = words[1];
+ String cmd = "scanoops " + startAddress + " " + endAddress;
+ cmds.add(cmd);
+
+ expStrMap.put(cmd, List.of
+ ("java/lang/Object", "java/lang/Class", "java/lang/Thread",
+ "java/lang/String", "[B", "[I"));
+
+ // Test the 'type' option also
+ // scanoops <start addr> <end addr> java/lang/String
+ // Ensure that only the java/lang/String oops are printed.
+ cmd = cmd + " java/lang/String";
+ cmds.add(cmd);
+ expStrMap.put(cmd, List.of("java/lang/String"));
+ unExpStrMap.put(cmd, List.of("java/lang/Thread"));
+
+ test.run(theApp.getPid(), cmds, expStrMap, unExpStrMap);
+ } catch (Exception ex) {
+ throw new RuntimeException("Test ERROR " + ex, ex);
+ } finally {
+ LingeredApp.stopApp(theApp);
+ }
+ }
+
+ public static void main(String[] args) throws Exception {
+ System.out.println("Starting the ClhsdbScanOops test");
+ try {
+ testWithGcType("-XX:+UseParallelGC");
+ testWithGcType("-XX:+UseSerialGC");
+ } catch (Exception e) {
+ throw new Error("Test failed with " + e);
+ }
+ System.out.println("Test PASSED");
+ }
+}
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbSymbol.java Tue Dec 26 13:38:31 2017 +0530
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbSymbol.java Mon Jan 08 08:53:14 2018 -0800
@@ -51,7 +51,7 @@
Map<String, List<String>> expStrMap = new HashMap<>();
expStrMap.put("symboldump", List.of(
- "java/lang/String", "java/util/HashMap", "UsageTracker",
+ "java/lang/String", "java/util/HashMap",
"Ljava/io/InputStream", "LambdaMetafactory", "PerfCounter",
"isAnonymousClass", "JVMTI_THREAD_STATE_TERMINATED", "jdi",
"checkGetClassLoaderPermission", "lockCreationTime",
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbWhere.java Tue Dec 26 13:38:31 2017 +0530
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbWhere.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, 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
@@ -60,7 +60,7 @@
"private static void processPendingReferences",
"private static native void waitForReferencePendingList",
"Java Stack Trace for main",
- "public static native void sleep"));
+ "public static void main"));
test.run(theApp.getPid(), cmds, expStrMap, null);
} catch (Exception ex) {
--- a/test/hotspot/jtreg/serviceability/sa/TestClassDump.java Tue Dec 26 13:38:31 2017 +0530
+++ b/test/hotspot/jtreg/serviceability/sa/TestClassDump.java Mon Jan 08 08:53:14 2018 -0800
@@ -76,8 +76,8 @@
if (Files.notExists(Paths.get("jtreg_classes2", "sun", "util", "calendar", "BaseCalendar.class"))) {
throw new RuntimeException("jtreg_classes2/sun/util/calendar/BaseCalendar.class not found");
}
- if (Files.notExists(Paths.get("jtreg_classes2", "jdk", "internal", "vm", "PostVMInitHook.class"))) {
- throw new RuntimeException("jtreg_classes2/jdk/internal/vm/PostVMInitHook.class not found");
+ if (Files.notExists(Paths.get("jtreg_classes2", "jdk", "internal", "loader", "BootLoader.class"))) {
+ throw new RuntimeException("jtreg_classes2/jdk/internal/loader/BootLoader.class not found");
}
}
--- a/test/jaxp/TEST.ROOT Tue Dec 26 13:38:31 2017 +0530
+++ b/test/jaxp/TEST.ROOT Mon Jan 08 08:53:14 2018 -0800
@@ -23,7 +23,7 @@
groups=TEST.groups
# Minimum jtreg version
-requiredVersion=4.2 b08
+requiredVersion=4.2 b11
# Path to libraries in the topmost test directory. This is needed so @library
# does not need ../../ notation to reach them
--- a/test/jdk/ProblemList.txt Tue Dec 26 13:38:31 2017 +0530
+++ b/test/jdk/ProblemList.txt Mon Jan 08 08:53:14 2018 -0800
@@ -218,6 +218,8 @@
java/net/DatagramSocket/SendDatagramToBadAddress.java 7143960 macosx-all
+java/net/httpclient/SplitResponseSSL.java 8194151 windows-all
+
############################################################################
# jdk_nio
--- a/test/jdk/TEST.ROOT Tue Dec 26 13:38:31 2017 +0530
+++ b/test/jdk/TEST.ROOT Mon Jan 08 08:53:14 2018 -0800
@@ -36,10 +36,11 @@
requires.properties= \
sun.arch.data.model \
java.runtime.name \
+ vm.graal.enabled \
vm.cds
# Minimum jtreg version
-requiredVersion=4.2 b09
+requiredVersion=4.2 b11
# Path to libraries in the topmost test directory. This is needed so @library
# does not need ../../ notation to reach them
--- a/test/jdk/com/sun/tools/attach/modules/Driver.java Tue Dec 26 13:38:31 2017 +0530
+++ b/test/jdk/com/sun/tools/attach/modules/Driver.java Mon Jan 08 08:53:14 2018 -0800
@@ -23,6 +23,7 @@
/**
* @test
+ * @requires !vm.graal.enabled
* @modules jdk.attach
* @build m/* Agent
* @run main/othervm -Djdk.attach.allowAttachSelf m/p.Main jmx javaagent
--- a/test/jdk/java/awt/FileDialog/MoveToTrashTest.java Tue Dec 26 13:38:31 2017 +0530
+++ b/test/jdk/java/awt/FileDialog/MoveToTrashTest.java Mon Jan 08 08:53:14 2018 -0800
@@ -23,7 +23,7 @@
/*
@test
- @bug 8190515
+ @bug 8190515 8193468
@summary java.awt.Desktop.moveToTrash(File) prompts on Windows 7 but not on Mac.
@run main MoveToTrashTest
*/
@@ -39,18 +39,23 @@
private static boolean fileStatus = false;
public static void main(String[] args) {
- try {
- file = File.createTempFile("TestFile","txt");
- } catch (IOException ex) {
- throw new RuntimeException("Test failed. Exception thrown: ", ex);
- }
+ if (!Desktop.getDesktop().isSupported(Desktop.Action.MOVE_TO_TRASH)) {
+ System.out.println("Move to trash action is not supported on the"+
+ " platform under test. Marking the test passed");
+ } else {
+ try {
+ file = File.createTempFile("TestFile","txt");
+ } catch (IOException ex) {
+ throw new RuntimeException("Test failed. Exception thrown: ", ex);
+ }
- // In case any UI that may pop up while deleting the file would
- // block this thread until the user actions them. Hence do file
- // check in a different thread and we assume it takes about sometime
- // till it deletes the file(or popup) on the main thread.
- new Thread(null, MoveToTrashTest::checkFileExistence, "FileCheck", 0, false).start();
- fileStatus = Desktop.getDesktop().moveToTrash(file);
+ // In case any UI that may pop up while deleting the file would
+ // block this thread until the user actions them. Hence do file
+ // check in a different thread and we assume it takes about sometime
+ // till it deletes the file(or popup) on the main thread.
+ new Thread(null, MoveToTrashTest::checkFileExistence, "FileCheck", 0, false).start();
+ fileStatus = Desktop.getDesktop().moveToTrash(file);
+ }
}
private static void checkFileExistence() {
@@ -63,10 +68,10 @@
robot.delay(1500);
- if(!fileStatus) {
+ if (!fileStatus) {
throw new RuntimeException("Test failed due to error while deleting the file");
} else {
- if(file.exists()) {
+ if (file.exists()) {
throw new RuntimeException("Test failed");
} else {
System.out.println("Test passed");
--- a/test/jdk/java/io/InputStream/ReadAllBytes.java Tue Dec 26 13:38:31 2017 +0530
+++ b/test/jdk/java/io/InputStream/ReadAllBytes.java Mon Jan 08 08:53:14 2018 -0800
@@ -31,7 +31,7 @@
/*
* @test
- * @bug 8080835
+ * @bug 8080835 8193832
* @library /test/lib
* @build jdk.test.lib.RandomFactory
* @run main ReadAllBytes
@@ -47,15 +47,11 @@
test(new byte[]{});
test(new byte[]{1, 2, 3});
test(createRandomBytes(1024));
- test(createRandomBytes((1 << 13) - 1));
- test(createRandomBytes((1 << 13)));
- test(createRandomBytes((1 << 13) + 1));
- test(createRandomBytes((1 << 15) - 1));
- test(createRandomBytes((1 << 15)));
- test(createRandomBytes((1 << 15) + 1));
- test(createRandomBytes((1 << 17) - 1));
- test(createRandomBytes((1 << 17)));
- test(createRandomBytes((1 << 17) + 1));
+ for (int shift : new int[] {13, 14, 15, 17}) {
+ for (int offset : new int[] {-1, 0, 1}) {
+ test(createRandomBytes((1 << shift) + offset));
+ }
+ }
}
static void test(byte[] expectedBytes) throws IOException {
--- a/test/jdk/java/lang/String/concat/WithSecurityManager.java Tue Dec 26 13:38:31 2017 +0530
+++ b/test/jdk/java/lang/String/concat/WithSecurityManager.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
* @test
* @summary String concatenation fails with a custom SecurityManager that uses concatenation
* @bug 8155090 8158851
+ * @requires !vm.graal.enabled
*
* @compile WithSecurityManager.java
*
--- a/test/jdk/java/lang/System/LoggerFinder/LoggerFinderAPI/LoggerFinderAPI.java Tue Dec 26 13:38:31 2017 +0530
+++ b/test/jdk/java/lang/System/LoggerFinder/LoggerFinderAPI/LoggerFinderAPI.java Mon Jan 08 08:53:14 2018 -0800
@@ -46,6 +46,7 @@
* throwing NullPointerException. The test uses --limit-module
* to force the selection of one or the other.
* @author danielfuchs
+ * @requires !vm.graal.enabled
* @build LoggerFinderAPI
* @run main/othervm --limit-modules java.base,java.logging
* -Djava.util.logging.SimpleFormatter.format=LOG-%4$s:-[%2$s]-%5$s%6$s%n
--- a/test/jdk/java/lang/instrument/TestAgentWithLimitMods.java Tue Dec 26 13:38:31 2017 +0530
+++ b/test/jdk/java/lang/instrument/TestAgentWithLimitMods.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
/**
*
* @test
+ * @requires !vm.graal.enabled
* @summary Tests that the -javaagent option adds the java.instrument into
* the module graph
*
--- a/test/jdk/java/lang/management/ManagementFactory/DefaultManagementProviderTest.java Tue Dec 26 13:38:31 2017 +0530
+++ b/test/jdk/java/lang/management/ManagementFactory/DefaultManagementProviderTest.java Mon Jan 08 08:53:14 2018 -0800
@@ -26,6 +26,7 @@
* @bug 8151099
* @summary Verify platform MXBeans initialized properly with java.management
* module only. No other management provider
+ * @requires !vm.graal.enabled
* @modules java.management
* @run main/othervm --limit-modules=java.management DefaultManagementProviderTest
*/
--- a/test/jdk/java/lang/module/ClassFileVersionsTest.java Tue Dec 26 13:38:31 2017 +0530
+++ b/test/jdk/java/lang/module/ClassFileVersionsTest.java Mon Jan 08 08:53:14 2018 -0800
@@ -54,6 +54,8 @@
{ 53, 0, Set.of(STATIC, TRANSITIVE) },
{ 54, 0, Set.of() }, // JDK 10
+
+ { 55, 0, Set.of()}, // JDK 11
};
}
@@ -69,7 +71,11 @@
{ 54, 0, Set.of(TRANSITIVE) },
{ 54, 0, Set.of(STATIC, TRANSITIVE) },
- { 55, 0, Set.of()}, // JDK 11
+ { 55, 0, Set.of(STATIC) }, // JDK 11
+ { 55, 0, Set.of(TRANSITIVE) },
+ { 55, 0, Set.of(STATIC, TRANSITIVE) },
+
+ { 56, 0, Set.of()}, // JDK 12
};
}
--- a/test/jdk/java/lang/ref/ReferenceEnqueue.java Tue Dec 26 13:38:31 2017 +0530
+++ b/test/jdk/java/lang/ref/ReferenceEnqueue.java Mon Jan 08 08:53:14 2018 -0800
@@ -25,7 +25,6 @@
* @bug 4268317 8132306 8175797
* @summary Test if Reference.enqueue() works properly with GC
* @run main ReferenceEnqueue
- * @run main/othervm -Djdk.lang.ref.disableClearBeforeEnqueue=true ReferenceEnqueue
*/
import java.lang.ref.*;
@@ -87,8 +86,6 @@
final ReferenceQueue<Object> queue = new ReferenceQueue<>();
final List<Reference<Object>> refs = new ArrayList<>();
final int iterations = 1000;
- final boolean disableClearBeforeEnqueue =
- Boolean.getBoolean("jdk.lang.ref.disableClearBeforeEnqueue");
ExplicitEnqueue() {
this.refs.add(new SoftReference<>(new Object(), queue));
@@ -101,10 +98,7 @@
if (ref.enqueue() == false) {
throw new RuntimeException("Error: enqueue failed");
}
- if (disableClearBeforeEnqueue && ref.get() == null) {
- throw new RuntimeException("Error: clearing should be disabled");
- }
- if (!disableClearBeforeEnqueue && ref.get() != null) {
+ if (ref.get() != null) {
throw new RuntimeException("Error: referent must be cleared");
}
}
--- a/test/jdk/java/net/SocketOption/OptionsTest.java Tue Dec 26 13:38:31 2017 +0530
+++ b/test/jdk/java/net/SocketOption/OptionsTest.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
/*
* @test
* @bug 8036979 8072384 8044773
+ * @requires !vm.graal.enabled
* @run main/othervm -Xcheck:jni OptionsTest
* @run main/othervm -Xcheck:jni -Djava.net.preferIPv4Stack=true OptionsTest
* @run main/othervm --limit-modules=java.base OptionsTest
--- a/test/jdk/java/net/SocketOption/UnsupportedOptionsTest.java Tue Dec 26 13:38:31 2017 +0530
+++ b/test/jdk/java/net/SocketOption/UnsupportedOptionsTest.java Mon Jan 08 08:53:14 2018 -0800
@@ -32,6 +32,7 @@
* @bug 8143554 8044773
* @summary Test checks that UnsupportedOperationException for unsupported
* SOCKET_OPTIONS is thrown by both getOption() and setOption() methods.
+ * @requires !vm.graal.enabled
* @run main UnsupportedOptionsTest
* @run main/othervm --limit-modules=java.base UnsupportedOptionsTest
*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/net/httpclient/FlowAdapterPublisherTest.java Mon Jan 08 08:53:14 2018 -0800
@@ -0,0 +1,394 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.InetSocketAddress;
+import java.net.URI;
+import java.nio.ByteBuffer;
+import java.nio.MappedByteBuffer;
+import java.util.Arrays;
+import java.util.concurrent.Flow;
+import java.util.concurrent.Flow.Publisher;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+import com.sun.net.httpserver.HttpExchange;
+import com.sun.net.httpserver.HttpHandler;
+import com.sun.net.httpserver.HttpServer;
+import com.sun.net.httpserver.HttpsConfigurator;
+import com.sun.net.httpserver.HttpsServer;
+import jdk.incubator.http.HttpClient;
+import jdk.incubator.http.HttpRequest;
+import jdk.incubator.http.HttpResponse;
+import jdk.testlibrary.SimpleSSLContext;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+import javax.net.ssl.SSLContext;
+import static java.util.stream.Collectors.joining;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static jdk.incubator.http.HttpRequest.BodyPublisher.fromPublisher;
+import static jdk.incubator.http.HttpResponse.BodyHandler.asString;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertThrows;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
+
+/*
+ * @test
+ * @summary Basic tests for Flow adapter Publishers
+ * @modules java.base/sun.net.www.http
+ * jdk.incubator.httpclient/jdk.incubator.http.internal.common
+ * jdk.incubator.httpclient/jdk.incubator.http.internal.frame
+ * jdk.incubator.httpclient/jdk.incubator.http.internal.hpack
+ * java.logging
+ * jdk.httpserver
+ * @library /lib/testlibrary http2/server
+ * @build Http2TestServer
+ * @build jdk.testlibrary.SimpleSSLContext
+ * @run testng/othervm FlowAdapterPublisherTest
+ */
+
+public class FlowAdapterPublisherTest {
+
+ SSLContext sslContext;
+ HttpServer httpTestServer; // HTTP/1.1 [ 4 servers ]
+ HttpsServer httpsTestServer; // HTTPS/1.1
+ Http2TestServer http2TestServer; // HTTP/2 ( h2c )
+ Http2TestServer https2TestServer; // HTTP/2 ( h2 )
+ String httpURI;
+ String httpsURI;
+ String http2URI;
+ String https2URI;
+
+ @DataProvider(name = "uris")
+ public Object[][] variants() {
+ return new Object[][]{
+ { httpURI },
+ { httpsURI },
+ { http2URI },
+ { https2URI },
+ };
+ }
+
+ static final Class<NullPointerException> NPE = NullPointerException.class;
+ static final Class<IllegalArgumentException> IAE = IllegalArgumentException.class;
+
+ @Test
+ public void testAPIExceptions() {
+ assertThrows(NPE, () -> fromPublisher(null));
+ assertThrows(NPE, () -> fromPublisher(null, 1));
+ assertThrows(IAE, () -> fromPublisher(new BBPublisher(), 0));
+ assertThrows(IAE, () -> fromPublisher(new BBPublisher(), -1));
+ assertThrows(IAE, () -> fromPublisher(new BBPublisher(), Long.MIN_VALUE));
+
+ Publisher publisher = fromPublisher(new BBPublisher());
+ assertThrows(NPE, () -> publisher.subscribe(null));
+ }
+
+ // Flow.Publisher<ByteBuffer>
+
+ @Test(dataProvider = "uris")
+ void testByteBufferPublisherUnknownLength(String url) {
+ String[] body = new String[] { "You know ", "it's summer ", "in Ireland ",
+ "when the ", "rain gets ", "warmer." };
+ HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
+ HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+ .POST(fromPublisher(new BBPublisher(body))).build();
+
+ HttpResponse<String> response = client.sendAsync(request, asString(UTF_8)).join();
+ String text = response.body();
+ System.out.println(text);
+ assertEquals(response.statusCode(), 200);
+ assertEquals(text, Arrays.stream(body).collect(joining()));
+ }
+
+ @Test(dataProvider = "uris")
+ void testByteBufferPublisherFixedLength(String url) {
+ String[] body = new String[] { "You know ", "it's summer ", "in Ireland ",
+ "when the ", "rain gets ", "warmer." };
+ int cl = Arrays.stream(body).mapToInt(String::length).sum();
+ HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
+ HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+ .POST(fromPublisher(new BBPublisher(body), cl)).build();
+
+ HttpResponse<String> response = client.sendAsync(request, asString(UTF_8)).join();
+ String text = response.body();
+ System.out.println(text);
+ assertEquals(response.statusCode(), 200);
+ assertEquals(text, Arrays.stream(body).collect(joining()));
+ }
+
+ // Flow.Publisher<MappedByteBuffer>
+
+ @Test(dataProvider = "uris")
+ void testMappedByteBufferPublisherUnknownLength(String url) {
+ String[] body = new String[] { "God invented ", "whiskey to ", "keep the ",
+ "Irish from ", "ruling the ", "world." };
+ HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
+ HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+ .POST(fromPublisher(new MBBPublisher(body))).build();
+
+ HttpResponse<String> response = client.sendAsync(request, asString(UTF_8)).join();
+ String text = response.body();
+ System.out.println(text);
+ assertEquals(response.statusCode(), 200);
+ assertEquals(text, Arrays.stream(body).collect(joining()));
+ }
+
+ @Test(dataProvider = "uris")
+ void testMappedByteBufferPublisherFixedLength(String url) {
+ String[] body = new String[] { "God invented ", "whiskey to ", "keep the ",
+ "Irish from ", "ruling the ", "world." };
+ int cl = Arrays.stream(body).mapToInt(String::length).sum();
+ HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
+ HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+ .POST(fromPublisher(new MBBPublisher(body), cl)).build();
+
+ HttpResponse<String> response = client.sendAsync(request, asString(UTF_8)).join();
+ String text = response.body();
+ System.out.println(text);
+ assertEquals(response.statusCode(), 200);
+ assertEquals(text, Arrays.stream(body).collect(joining()));
+ }
+
+ // The following two tests depend on Exception detail messages, which is
+ // not ideal, but necessary to discern correct behavior. They should be
+ // updated if the exception message is updated.
+
+ @Test(dataProvider = "uris")
+ void testPublishTooFew(String url) throws InterruptedException {
+ String[] body = new String[] { "You know ", "it's summer ", "in Ireland ",
+ "when the ", "rain gets ", "warmer." };
+ int cl = Arrays.stream(body).mapToInt(String::length).sum() + 1; // length + 1
+ HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
+ HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+ .POST(fromPublisher(new BBPublisher(body), cl)).build();
+
+ try {
+ HttpResponse<String> response = client.send(request, asString(UTF_8));
+ fail("Unexpected response: " + response);
+ } catch (IOException expected) {
+ assertTrue(expected.getMessage().contains("Too few bytes returned"),
+ "Exception message:[" + expected.toString() + "]");
+ }
+ }
+
+ @Test(dataProvider = "uris")
+ void testPublishTooMany(String url) throws InterruptedException {
+ String[] body = new String[] { "You know ", "it's summer ", "in Ireland ",
+ "when the ", "rain gets ", "warmer." };
+ int cl = Arrays.stream(body).mapToInt(String::length).sum() - 1; // length - 1
+ HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
+ HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+ .POST(fromPublisher(new BBPublisher(body), cl)).build();
+
+ try {
+ HttpResponse<String> response = client.send(request, asString(UTF_8));
+ fail("Unexpected response: " + response);
+ } catch (IOException expected) {
+ assertTrue(expected.getMessage().contains("Too many bytes in request body"),
+ "Exception message:[" + expected.toString() + "]");
+ }
+ }
+
+ static class BBPublisher extends AbstractPublisher
+ implements Flow.Publisher<ByteBuffer>
+ {
+ BBPublisher(String... bodyParts) { super(bodyParts); }
+
+ @Override
+ public void subscribe(Flow.Subscriber<? super ByteBuffer> subscriber) {
+ this.subscriber = subscriber;
+ subscriber.onSubscribe(new InternalSubscription());
+ }
+ }
+
+ static class MBBPublisher extends AbstractPublisher
+ implements Flow.Publisher<MappedByteBuffer>
+ {
+ MBBPublisher(String... bodyParts) { super(bodyParts); }
+
+ @Override
+ public void subscribe(Flow.Subscriber<? super MappedByteBuffer> subscriber) {
+ this.subscriber = subscriber;
+ subscriber.onSubscribe(new InternalSubscription());
+ }
+ }
+
+ static abstract class AbstractPublisher {
+ private final String[] bodyParts;
+ protected volatile Flow.Subscriber subscriber;
+
+ AbstractPublisher(String... bodyParts) {
+ this.bodyParts = bodyParts;
+ }
+
+ class InternalSubscription implements Flow.Subscription {
+
+ private final AtomicLong demand = new AtomicLong();
+ private final AtomicBoolean cancelled = new AtomicBoolean();
+ private volatile int position;
+
+ private static final int IDLE = 1;
+ private static final int PUSHING = 2;
+ private static final int AGAIN = 4;
+ private final AtomicInteger state = new AtomicInteger(IDLE);
+
+ @Override
+ public void request(long n) {
+ if (n <= 0L) {
+ subscriber.onError(new IllegalArgumentException(
+ "non-positive subscription request"));
+ return;
+ }
+ if (cancelled.get()) {
+ return;
+ }
+
+ while (true) {
+ long prev = demand.get(), d;
+ if ((d = prev + n) < prev) // saturate
+ d = Long.MAX_VALUE;
+ if (demand.compareAndSet(prev, d))
+ break;
+ }
+
+ while (true) {
+ int s = state.get();
+ if (s == IDLE) {
+ if (state.compareAndSet(IDLE, PUSHING)) {
+ while (true) {
+ push();
+ if (state.compareAndSet(PUSHING, IDLE))
+ return;
+ else if (state.compareAndSet(AGAIN, PUSHING))
+ continue;
+ }
+ }
+ } else if (s == PUSHING) {
+ if (state.compareAndSet(PUSHING, AGAIN))
+ return;
+ } else if (s == AGAIN){
+ // do nothing, the pusher will already rerun
+ return;
+ } else {
+ throw new AssertionError("Unknown state:" + s);
+ }
+ }
+ }
+
+ private void push() {
+ long prev;
+ while ((prev = demand.get()) > 0) {
+ if (!demand.compareAndSet(prev, prev -1))
+ continue;
+
+ int index = position;
+ if (index < bodyParts.length) {
+ position++;
+ subscriber.onNext(ByteBuffer.wrap(bodyParts[index].getBytes(UTF_8)));
+ }
+ }
+
+ if (position == bodyParts.length && !cancelled.get()) {
+ cancelled.set(true);
+ subscriber.onComplete();
+ }
+ }
+
+ @Override
+ public void cancel() {
+ if (cancelled.compareAndExchange(false, true))
+ return; // already cancelled
+ }
+ }
+ }
+
+ @BeforeTest
+ public void setup() throws Exception {
+ sslContext = new SimpleSSLContext().get();
+ if (sslContext == null)
+ throw new AssertionError("Unexpected null sslContext");
+
+ InetSocketAddress sa = new InetSocketAddress("localhost", 0);
+ httpTestServer = HttpServer.create(sa, 0);
+ httpTestServer.createContext("/http1/echo", new Http1EchoHandler());
+ httpURI = "http://127.0.0.1:" + httpTestServer.getAddress().getPort() + "/http1/echo";
+
+ httpsTestServer = HttpsServer.create(sa, 0);
+ httpsTestServer.setHttpsConfigurator(new HttpsConfigurator(sslContext));
+ httpsTestServer.createContext("/https1/echo", new Http1EchoHandler());
+ httpsURI = "https://127.0.0.1:" + httpsTestServer.getAddress().getPort() + "/https1/echo";
+
+ http2TestServer = new Http2TestServer("127.0.0.1", false, 0);
+ http2TestServer.addHandler(new Http2EchoHandler(), "/http2/echo");
+ int port = http2TestServer.getAddress().getPort();
+ http2URI = "http://127.0.0.1:" + port + "/http2/echo";
+
+ https2TestServer = new Http2TestServer("127.0.0.1", true, 0);
+ https2TestServer.addHandler(new Http2EchoHandler(), "/https2/echo");
+ port = https2TestServer.getAddress().getPort();
+ https2URI = "https://127.0.0.1:" + port + "/https2/echo";
+
+ httpTestServer.start();
+ httpsTestServer.start();
+ http2TestServer.start();
+ https2TestServer.start();
+ }
+
+ @AfterTest
+ public void teardown() throws Exception {
+ httpTestServer.stop(0);
+ httpsTestServer.stop(0);
+ http2TestServer.stop();
+ https2TestServer.stop();
+ }
+
+ static class Http1EchoHandler implements HttpHandler {
+ @Override
+ public void handle(HttpExchange t) throws IOException {
+ try (InputStream is = t.getRequestBody();
+ OutputStream os = t.getResponseBody()) {
+ byte[] bytes = is.readAllBytes();
+ t.sendResponseHeaders(200, bytes.length);
+ os.write(bytes);
+ }
+ }
+ }
+
+ static class Http2EchoHandler implements Http2Handler {
+ @Override
+ public void handle(Http2TestExchange t) throws IOException {
+ try (InputStream is = t.getRequestBody();
+ OutputStream os = t.getResponseBody()) {
+ byte[] bytes = is.readAllBytes();
+ t.sendResponseHeaders(200, bytes.length);
+ os.write(bytes);
+ }
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/net/httpclient/FlowAdapterSubscriberTest.java Mon Jan 08 08:53:14 2018 -0800
@@ -0,0 +1,500 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.UncheckedIOException;
+import java.net.InetSocketAddress;
+import java.net.URI;
+import java.nio.ByteBuffer;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.Flow;
+import java.util.concurrent.Flow.Subscriber;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import com.sun.net.httpserver.HttpExchange;
+import com.sun.net.httpserver.HttpHandler;
+import com.sun.net.httpserver.HttpServer;
+import com.sun.net.httpserver.HttpsConfigurator;
+import com.sun.net.httpserver.HttpsServer;
+import jdk.incubator.http.HttpClient;
+import jdk.incubator.http.HttpRequest;
+import jdk.incubator.http.HttpResponse;
+import jdk.incubator.http.HttpResponse.BodyHandler;
+import jdk.incubator.http.HttpResponse.BodySubscriber;
+import jdk.testlibrary.SimpleSSLContext;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+import javax.net.ssl.SSLContext;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static jdk.incubator.http.HttpRequest.BodyPublisher.fromString;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertThrows;
+import static org.testng.Assert.assertTrue;
+
+/*
+ * @test
+ * @summary Basic tests for Flow adapter Subscribers
+ * @modules java.base/sun.net.www.http
+ * jdk.incubator.httpclient/jdk.incubator.http.internal.common
+ * jdk.incubator.httpclient/jdk.incubator.http.internal.frame
+ * jdk.incubator.httpclient/jdk.incubator.http.internal.hpack
+ * java.logging
+ * jdk.httpserver
+ * @library /lib/testlibrary http2/server
+ * @build Http2TestServer
+ * @build jdk.testlibrary.SimpleSSLContext
+ * @run testng/othervm FlowAdapterSubscriberTest
+ */
+
+public class FlowAdapterSubscriberTest {
+
+ SSLContext sslContext;
+ HttpServer httpTestServer; // HTTP/1.1 [ 4 servers ]
+ HttpsServer httpsTestServer; // HTTPS/1.1
+ Http2TestServer http2TestServer; // HTTP/2 ( h2c )
+ Http2TestServer https2TestServer; // HTTP/2 ( h2 )
+ String httpURI;
+ String httpsURI;
+ String http2URI;
+ String https2URI;
+
+ @DataProvider(name = "uris")
+ public Object[][] variants() {
+ return new Object[][]{
+ { httpURI },
+ { httpsURI },
+ { http2URI },
+ { https2URI },
+ };
+ }
+
+ static final Class<NullPointerException> NPE = NullPointerException.class;
+
+ @Test
+ public void testNull() {
+ assertThrows(NPE, () -> BodyHandler.fromSubscriber(null));
+ assertThrows(NPE, () -> BodyHandler.fromSubscriber(null, Function.identity()));
+ assertThrows(NPE, () -> BodyHandler.fromSubscriber(new ListSubscriber(), null));
+ assertThrows(NPE, () -> BodyHandler.fromSubscriber(null, null));
+
+ assertThrows(NPE, () -> BodySubscriber.fromSubscriber(null));
+ assertThrows(NPE, () -> BodySubscriber.fromSubscriber(null, Function.identity()));
+ assertThrows(NPE, () -> BodySubscriber.fromSubscriber(new ListSubscriber(), null));
+ assertThrows(NPE, () -> BodySubscriber.fromSubscriber(null, null));
+
+ Subscriber subscriber = BodySubscriber.fromSubscriber(new ListSubscriber());
+ assertThrows(NPE, () -> subscriber.onSubscribe(null));
+ assertThrows(NPE, () -> subscriber.onNext(null));
+ assertThrows(NPE, () -> subscriber.onError(null));
+ }
+
+ // List<ByteBuffer>
+
+ @Test(dataProvider = "uris")
+ void testListWithFinisher(String url) {
+ HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
+ HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+ .POST(fromString("May the luck of the Irish be with you!")).build();
+
+ ListSubscriber subscriber = new ListSubscriber();
+ HttpResponse<String> response = client.sendAsync(request,
+ BodyHandler.fromSubscriber(subscriber, Supplier::get)).join();
+ String text = response.body();
+ System.out.println(text);
+ assertEquals(response.statusCode(), 200);
+ assertEquals(text, "May the luck of the Irish be with you!");
+ }
+
+ @Test(dataProvider = "uris")
+ void testListWithoutFinisher(String url) {
+ HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
+ HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+ .POST(fromString("May the luck of the Irish be with you!")).build();
+
+ ListSubscriber subscriber = new ListSubscriber();
+ HttpResponse<Void> response = client.sendAsync(request,
+ BodyHandler.fromSubscriber(subscriber)).join();
+ String text = subscriber.get();
+ System.out.println(text);
+ assertEquals(response.statusCode(), 200);
+ assertEquals(text, "May the luck of the Irish be with you!");
+ }
+
+ @Test(dataProvider = "uris")
+ void testListWithFinisherBlocking(String url) throws Exception {
+ HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
+ HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+ .POST(fromString("May the luck of the Irish be with you!")).build();
+
+ ListSubscriber subscriber = new ListSubscriber();
+ HttpResponse<String> response = client.send(request,
+ BodyHandler.fromSubscriber(subscriber, Supplier::get));
+ String text = response.body();
+ System.out.println(text);
+ assertEquals(response.statusCode(), 200);
+ assertEquals(text, "May the luck of the Irish be with you!");
+ }
+
+ @Test(dataProvider = "uris")
+ void testListWithoutFinisherBlocking(String url) throws Exception {
+ HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
+ HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+ .POST(fromString("May the luck of the Irish be with you!")).build();
+
+ ListSubscriber subscriber = new ListSubscriber();
+ HttpResponse<Void> response = client.send(request,
+ BodyHandler.fromSubscriber(subscriber));
+ String text = subscriber.get();
+ System.out.println(text);
+ assertEquals(response.statusCode(), 200);
+ assertEquals(text, "May the luck of the Irish be with you!");
+ }
+
+ // Collection<ByteBuffer>
+
+ @Test(dataProvider = "uris")
+ void testCollectionWithFinisher(String url) {
+ HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
+ HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+ .POST(fromString("What's the craic?")).build();
+
+ CollectionSubscriber subscriber = new CollectionSubscriber();
+ HttpResponse<String> response = client.sendAsync(request,
+ BodyHandler.fromSubscriber(subscriber, CollectionSubscriber::get)).join();
+ String text = response.body();
+ System.out.println(text);
+ assertEquals(response.statusCode(), 200);
+ assertEquals(text, "What's the craic?");
+ }
+
+ @Test(dataProvider = "uris")
+ void testCollectionWithoutFinisher(String url) {
+ HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
+ HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+ .POST(fromString("What's the craic?")).build();
+
+ CollectionSubscriber subscriber = new CollectionSubscriber();
+ HttpResponse<Void> response = client.sendAsync(request,
+ BodyHandler.fromSubscriber(subscriber)).join();
+ String text = subscriber.get();
+ System.out.println(text);
+ assertEquals(response.statusCode(), 200);
+ assertEquals(text, "What's the craic?");
+ }
+
+ @Test(dataProvider = "uris")
+ void testCollectionWithFinisherBlocking(String url) throws Exception {
+ HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
+ HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+ .POST(fromString("What's the craic?")).build();
+
+ CollectionSubscriber subscriber = new CollectionSubscriber();
+ HttpResponse<String> response = client.send(request,
+ BodyHandler.fromSubscriber(subscriber, CollectionSubscriber::get));
+ String text = response.body();
+ System.out.println(text);
+ assertEquals(response.statusCode(), 200);
+ assertEquals(text, "What's the craic?");
+ }
+
+ @Test(dataProvider = "uris")
+ void testCollectionWithoutFinisheBlocking(String url) throws Exception {
+ HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
+ HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+ .POST(fromString("What's the craic?")).build();
+
+ CollectionSubscriber subscriber = new CollectionSubscriber();
+ HttpResponse<Void> response = client.send(request,
+ BodyHandler.fromSubscriber(subscriber));
+ String text = subscriber.get();
+ System.out.println(text);
+ assertEquals(response.statusCode(), 200);
+ assertEquals(text, "What's the craic?");
+ }
+
+ // Iterable<ByteBuffer>
+
+ @Test(dataProvider = "uris")
+ void testIterableWithFinisher(String url) {
+ HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
+ HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+ .POST(fromString("We're sucking diesel now!")).build();
+
+ IterableSubscriber subscriber = new IterableSubscriber();
+ HttpResponse<String> response = client.sendAsync(request,
+ BodyHandler.fromSubscriber(subscriber, Supplier::get)).join();
+ String text = response.body();
+ System.out.println(text);
+ assertEquals(response.statusCode(), 200);
+ assertEquals(text, "We're sucking diesel now!");
+ }
+
+ @Test(dataProvider = "uris")
+ void testIterableWithoutFinisher(String url) {
+ HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
+ HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+ .POST(fromString("We're sucking diesel now!")).build();
+
+ IterableSubscriber subscriber = new IterableSubscriber();
+ HttpResponse<Void> response = client.sendAsync(request,
+ BodyHandler.fromSubscriber(subscriber)).join();
+ String text = subscriber.get();
+ System.out.println(text);
+ assertEquals(response.statusCode(), 200);
+ assertEquals(text, "We're sucking diesel now!");
+ }
+
+ @Test(dataProvider = "uris")
+ void testIterableWithFinisherBlocking(String url) throws Exception {
+ HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
+ HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+ .POST(fromString("We're sucking diesel now!")).build();
+
+ IterableSubscriber subscriber = new IterableSubscriber();
+ HttpResponse<String> response = client.send(request,
+ BodyHandler.fromSubscriber(subscriber, Supplier::get));
+ String text = response.body();
+ System.out.println(text);
+ assertEquals(response.statusCode(), 200);
+ assertEquals(text, "We're sucking diesel now!");
+ }
+
+ @Test(dataProvider = "uris")
+ void testIterableWithoutFinisherBlocking(String url) throws Exception{
+ HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
+ HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+ .POST(fromString("We're sucking diesel now!")).build();
+
+ IterableSubscriber subscriber = new IterableSubscriber();
+ HttpResponse<Void> response = client.send(request,
+ BodyHandler.fromSubscriber(subscriber));
+ String text = subscriber.get();
+ System.out.println(text);
+ assertEquals(response.statusCode(), 200);
+ assertEquals(text, "We're sucking diesel now!");
+ }
+
+ // Subscriber<Object>
+
+ @Test(dataProvider = "uris")
+ void testObjectWithFinisher(String url) {
+ HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
+ HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+ .POST(fromString("May the wind always be at your back.")).build();
+
+ ObjectSubscriber subscriber = new ObjectSubscriber();
+ HttpResponse<String> response = client.sendAsync(request,
+ BodyHandler.fromSubscriber(subscriber, ObjectSubscriber::get)).join();
+ String text = response.body();
+ System.out.println(text);
+ assertEquals(response.statusCode(), 200);
+ assertTrue(text.length() != 0); // what else can be asserted!
+ }
+
+ @Test(dataProvider = "uris")
+ void testObjectWithoutFinisher(String url) {
+ HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
+ HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+ .POST(fromString("May the wind always be at your back.")).build();
+
+ ObjectSubscriber subscriber = new ObjectSubscriber();
+ HttpResponse<Void> response = client.sendAsync(request,
+ BodyHandler.fromSubscriber(subscriber)).join();
+ String text = subscriber.get();
+ System.out.println(text);
+ assertEquals(response.statusCode(), 200);
+ assertTrue(text.length() != 0); // what else can be asserted!
+ }
+
+ @Test(dataProvider = "uris")
+ void testObjectWithFinisherBlocking(String url) throws Exception {
+ HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
+ HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+ .POST(fromString("May the wind always be at your back.")).build();
+
+ ObjectSubscriber subscriber = new ObjectSubscriber();
+ HttpResponse<String> response = client.send(request,
+ BodyHandler.fromSubscriber(subscriber, ObjectSubscriber::get));
+ String text = response.body();
+ System.out.println(text);
+ assertEquals(response.statusCode(), 200);
+ assertTrue(text.length() != 0); // what else can be asserted!
+ }
+
+ @Test(dataProvider = "uris")
+ void testObjectWithoutFinisherBlocking(String url) throws Exception {
+ HttpClient client = HttpClient.newBuilder().sslContext(sslContext).build();
+ HttpRequest request = HttpRequest.newBuilder(URI.create(url))
+ .POST(fromString("May the wind always be at your back.")).build();
+
+ ObjectSubscriber subscriber = new ObjectSubscriber();
+ HttpResponse<Void> response = client.send(request,
+ BodyHandler.fromSubscriber(subscriber));
+ String text = subscriber.get();
+ System.out.println(text);
+ assertEquals(response.statusCode(), 200);
+ assertTrue(text.length() != 0); // what else can be asserted!
+ }
+
+ /** An abstract Subscriber that converts all received data into a String. */
+ static abstract class AbstractSubscriber implements Supplier<String> {
+ protected volatile Flow.Subscription subscription;
+ protected volatile ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ protected volatile String text;
+
+ public void onSubscribe(Flow.Subscription subscription) {
+ this.subscription = subscription;
+ subscription.request(Long.MAX_VALUE);
+ }
+ public void onError(Throwable throwable) {
+ throw new RuntimeException(throwable);
+ }
+ public void onComplete() {
+ text = new String(baos.toByteArray(), UTF_8);
+ }
+ @Override public String get() { return text; }
+ }
+
+ static class ListSubscriber extends AbstractSubscriber
+ implements Flow.Subscriber<List<ByteBuffer>>, Supplier<String>
+ {
+ @Override public void onNext(List<ByteBuffer> item) {
+ for (ByteBuffer bb : item) {
+ byte[] ba = new byte[bb.remaining()];
+ bb.get(ba);
+ uncheckedWrite(baos, ba);
+ }
+ }
+ }
+
+ static class CollectionSubscriber extends AbstractSubscriber
+ implements Flow.Subscriber<Collection<ByteBuffer>>, Supplier<String>
+ {
+ @Override public void onNext(Collection<ByteBuffer> item) {
+ for (ByteBuffer bb : item) {
+ byte[] ba = new byte[bb.remaining()];
+ bb.get(ba);
+ uncheckedWrite(baos, ba);
+ }
+ }
+ }
+
+ static class IterableSubscriber extends AbstractSubscriber
+ implements Flow.Subscriber<Iterable<ByteBuffer>>, Supplier<String>
+ {
+ @Override public void onNext(Iterable<ByteBuffer> item) {
+ for (ByteBuffer bb : item) {
+ byte[] ba = new byte[bb.remaining()];
+ bb.get(ba);
+ uncheckedWrite(baos, ba);
+ }
+ }
+ }
+
+ static class ObjectSubscriber extends AbstractSubscriber
+ implements Flow.Subscriber<Object>, Supplier<String>
+ {
+ @Override public void onNext(Object item) {
+ // What can anyone do with Object, cast or toString it ?
+ uncheckedWrite(baos, item.toString().getBytes(UTF_8));
+ }
+ }
+
+ static void uncheckedWrite(ByteArrayOutputStream baos, byte[] ba) {
+ try {
+ baos.write(ba);
+ } catch (IOException e) {
+ throw new UncheckedIOException(e);
+ }
+ }
+
+ @BeforeTest
+ public void setup() throws Exception {
+ sslContext = new SimpleSSLContext().get();
+ if (sslContext == null)
+ throw new AssertionError("Unexpected null sslContext");
+
+ InetSocketAddress sa = new InetSocketAddress("localhost", 0);
+ httpTestServer = HttpServer.create(sa, 0);
+ httpTestServer.createContext("/http1/echo", new Http1EchoHandler());
+ httpURI = "http://127.0.0.1:" + httpTestServer.getAddress().getPort() + "/http1/echo";
+
+ httpsTestServer = HttpsServer.create(sa, 0);
+ httpsTestServer.setHttpsConfigurator(new HttpsConfigurator(sslContext));
+ httpsTestServer.createContext("/https1/echo", new Http1EchoHandler());
+ httpsURI = "https://127.0.0.1:" + httpsTestServer.getAddress().getPort() + "/https1/echo";
+
+ http2TestServer = new Http2TestServer("127.0.0.1", false, 0);
+ http2TestServer.addHandler(new Http2EchoHandler(), "/http2/echo");
+ int port = http2TestServer.getAddress().getPort();
+ http2URI = "http://127.0.0.1:" + port + "/http2/echo";
+
+ https2TestServer = new Http2TestServer("127.0.0.1", true, 0);
+ https2TestServer.addHandler(new Http2EchoHandler(), "/https2/echo");
+ port = https2TestServer.getAddress().getPort();
+ https2URI = "https://127.0.0.1:" + port + "/https2/echo";
+
+ httpTestServer.start();
+ httpsTestServer.start();
+ http2TestServer.start();
+ https2TestServer.start();
+ }
+
+ @AfterTest
+ public void teardown() throws Exception {
+ httpTestServer.stop(0);
+ httpsTestServer.stop(0);
+ http2TestServer.stop();
+ https2TestServer.stop();
+ }
+
+ static class Http1EchoHandler implements HttpHandler {
+ @Override
+ public void handle(HttpExchange t) throws IOException {
+ try (InputStream is = t.getRequestBody();
+ OutputStream os = t.getResponseBody()) {
+ byte[] bytes = is.readAllBytes();
+ t.sendResponseHeaders(200, bytes.length);
+ os.write(bytes);
+ }
+ }
+ }
+
+ static class Http2EchoHandler implements Http2Handler {
+ @Override
+ public void handle(Http2TestExchange t) throws IOException {
+ try (InputStream is = t.getRequestBody();
+ OutputStream os = t.getResponseBody()) {
+ byte[] bytes = is.readAllBytes();
+ t.sendResponseHeaders(200, bytes.length);
+ os.write(bytes);
+ }
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/net/httpclient/FlowAdaptersCompileOnly.java Mon Jan 08 08:53:14 2018 -0800
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.nio.ByteBuffer;
+import java.nio.MappedByteBuffer;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.Flow;
+import java.util.function.Function;
+import jdk.incubator.http.HttpRequest.BodyPublisher;
+import jdk.incubator.http.HttpResponse.BodyHandler;
+import jdk.incubator.http.HttpResponse.BodySubscriber;
+
+/*
+ * @test
+ * @summary Basic test for Flow adapters with generic type parameters
+ * @compile FlowAdaptersCompileOnly.java
+ */
+
+public class FlowAdaptersCompileOnly {
+
+ static void makesSureDifferentGenericSignaturesCompile() {
+ BodyPublisher.fromPublisher(new BBPublisher());
+ BodyPublisher.fromPublisher(new MBBPublisher());
+
+ BodyHandler.fromSubscriber(new ListSubscriber());
+ BodyHandler.fromSubscriber(new CollectionSubscriber());
+ BodyHandler.fromSubscriber(new IterableSubscriber());
+ BodyHandler.fromSubscriber(new ObjectSubscriber());
+
+ BodySubscriber.fromSubscriber(new ListSubscriber());
+ BodySubscriber.fromSubscriber(new CollectionSubscriber());
+ BodySubscriber.fromSubscriber(new IterableSubscriber());
+ BodySubscriber.fromSubscriber(new ObjectSubscriber());
+
+ BodyPublisher.fromPublisher(new BBPublisher(), 1);
+ BodyPublisher.fromPublisher(new MBBPublisher(), 1);
+
+ BodyHandler.fromSubscriber(new ListSubscriber(), Function.identity());
+ BodyHandler.fromSubscriber(new CollectionSubscriber(), Function.identity());
+ BodyHandler.fromSubscriber(new IterableSubscriber(), Function.identity());
+ BodyHandler.fromSubscriber(new ObjectSubscriber(), Function.identity());
+
+ BodySubscriber.fromSubscriber(new ListSubscriber(), Function.identity());
+ BodySubscriber.fromSubscriber(new CollectionSubscriber(), Function.identity());
+ BodySubscriber.fromSubscriber(new IterableSubscriber(), Function.identity());
+ BodySubscriber.fromSubscriber(new ObjectSubscriber(), Function.identity());
+ }
+
+ static class BBPublisher implements Flow.Publisher<ByteBuffer> {
+ @Override
+ public void subscribe(Flow.Subscriber<? super ByteBuffer> subscriber) { }
+ }
+
+ static class MBBPublisher implements Flow.Publisher<MappedByteBuffer> {
+ @Override
+ public void subscribe(Flow.Subscriber<? super MappedByteBuffer> subscriber) { }
+ }
+
+ static class ListSubscriber implements Flow.Subscriber<List<ByteBuffer>> {
+ @Override public void onSubscribe(Flow.Subscription subscription) { }
+ @Override public void onNext(List<ByteBuffer> item) { }
+ @Override public void onError(Throwable throwable) { }
+ @Override public void onComplete() { }
+ }
+
+ static class CollectionSubscriber implements Flow.Subscriber<Collection<ByteBuffer>> {
+ @Override public void onSubscribe(Flow.Subscription subscription) { }
+ @Override public void onNext(Collection<ByteBuffer> item) { }
+ @Override public void onError(Throwable throwable) { }
+ @Override public void onComplete() { }
+ }
+
+ static class IterableSubscriber implements Flow.Subscriber<Iterable<ByteBuffer>> {
+ @Override public void onSubscribe(Flow.Subscription subscription) { }
+ @Override public void onNext(Iterable<ByteBuffer> item) { }
+ @Override public void onError(Throwable throwable) { }
+ @Override public void onComplete() { }
+ }
+
+ static class ObjectSubscriber implements Flow.Subscriber<Object> {
+ @Override public void onSubscribe(Flow.Subscription subscription) { }
+ @Override public void onNext(Object item) { }
+ @Override public void onError(Throwable throwable) { }
+ @Override public void onComplete() { }
+ }
+}
--- a/test/jdk/java/net/httpclient/RequestProcessorExceptions.java Tue Dec 26 13:38:31 2017 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,91 +0,0 @@
-/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @run testng RequestProcessorExceptions
- */
-
-import java.io.FileNotFoundException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.List;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-import static jdk.incubator.http.HttpRequest.BodyPublisher.fromByteArray;
-import static jdk.incubator.http.HttpRequest.BodyPublisher.fromFile;
-
-public class RequestProcessorExceptions {
-
- @DataProvider(name = "byteArrayOOBs")
- public Object[][] byteArrayOOBs() {
- return new Object[][] {
- { new byte[100], 1, 100 },
- { new byte[100], -1, 10 },
- { new byte[100], 99, 2 },
- { new byte[1], -100, 1 } };
- }
-
- @Test(dataProvider = "byteArrayOOBs", expectedExceptions = IndexOutOfBoundsException.class)
- public void fromByteArrayCheck(byte[] buf, int offset, int length) {
- fromByteArray(buf, offset, length);
- }
-
- @DataProvider(name = "nonExistentFiles")
- public Object[][] nonExistentFiles() {
- List<Path> paths = List.of(Paths.get("doesNotExist"),
- Paths.get("tsixEtoNseod"),
- Paths.get("doesNotExist2"));
- paths.forEach(p -> {
- if (Files.exists(p))
- throw new AssertionError("Unexpected " + p);
- });
-
- return paths.stream().map(p -> new Object[] { p }).toArray(Object[][]::new);
- }
-
- @Test(dataProvider = "nonExistentFiles", expectedExceptions = FileNotFoundException.class)
- public void fromFileCheck(Path path) throws Exception {
- fromFile(path);
- }
-
- // ---
-
- /* Main entry point for standalone testing of the main functional test. */
- public static void main(String... args) throws Exception {
- RequestProcessorExceptions t = new RequestProcessorExceptions();
- for (Object[] objs : t.byteArrayOOBs()) {
- try {
- t.fromByteArrayCheck((byte[]) objs[0], (int) objs[1], (int) objs[2]);
- throw new RuntimeException("fromByteArrayCheck failed");
- } catch (IndexOutOfBoundsException expected) { /* Ok */ }
- }
- for (Object[] objs : t.nonExistentFiles()) {
- try {
- t.fromFileCheck((Path) objs[0]);
- throw new RuntimeException("fromFileCheck failed");
- } catch (FileNotFoundException expected) { /* Ok */ }
- }
- }
-}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/net/httpclient/SubscriberPublisherAPIExceptions.java Mon Jan 08 08:53:14 2018 -0800
@@ -0,0 +1,146 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.FileNotFoundException;
+import java.nio.ByteBuffer;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.OpenOption;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Flow;
+import jdk.incubator.http.HttpHeaders;
+import jdk.incubator.http.HttpRequest.BodyPublisher;
+import jdk.incubator.http.HttpResponse.BodyHandler;
+import jdk.incubator.http.HttpResponse.BodySubscriber;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.nio.file.StandardOpenOption.CREATE;
+import static java.nio.file.StandardOpenOption.WRITE;
+import static org.testng.Assert.assertThrows;
+
+/*
+ * @test
+ * @summary Basic tests for API specified exceptions from Publisher, Handler,
+ * and Subscriber convenience static factory methods.
+ * @run testng SubscriberPublisherAPIExceptions
+ */
+
+public class SubscriberPublisherAPIExceptions {
+
+ static final Class<NullPointerException> NPE = NullPointerException.class;
+ static final Class<IllegalArgumentException> IAE = IllegalArgumentException.class;
+ static final Class<IndexOutOfBoundsException> IOB = IndexOutOfBoundsException.class;
+
+ @Test
+ public void publisherAPIExceptions() {
+ assertThrows(NPE, () -> BodyPublisher.fromByteArray(null));
+ assertThrows(NPE, () -> BodyPublisher.fromByteArray(null, 0, 1));
+ assertThrows(IOB, () -> BodyPublisher.fromByteArray(new byte[100], 0, 101));
+ assertThrows(IOB, () -> BodyPublisher.fromByteArray(new byte[100], 1, 100));
+ assertThrows(IOB, () -> BodyPublisher.fromByteArray(new byte[100], -1, 10));
+ assertThrows(IOB, () -> BodyPublisher.fromByteArray(new byte[100], 99, 2));
+ assertThrows(IOB, () -> BodyPublisher.fromByteArray(new byte[1], -100, 1));
+ assertThrows(NPE, () -> BodyPublisher.fromByteArrays(null));
+ assertThrows(NPE, () -> BodyPublisher.fromFile(null));
+ assertThrows(NPE, () -> BodyPublisher.fromInputStream(null));
+ assertThrows(NPE, () -> BodyPublisher.fromString(null));
+ assertThrows(NPE, () -> BodyPublisher.fromString("A", null));
+ assertThrows(NPE, () -> BodyPublisher.fromString(null, UTF_8));
+ assertThrows(NPE, () -> BodyPublisher.fromString(null, null));
+ }
+
+ @DataProvider(name = "nonExistentFiles")
+ public Object[][] nonExistentFiles() {
+ List<Path> paths = List.of(Paths.get("doesNotExist"),
+ Paths.get("tsixEtoNseod"),
+ Paths.get("doesNotExist2"));
+ paths.forEach(p -> {
+ if (Files.exists(p))
+ throw new AssertionError("Unexpected " + p);
+ });
+
+ return paths.stream().map(p -> new Object[] { p }).toArray(Object[][]::new);
+ }
+
+ @Test(dataProvider = "nonExistentFiles", expectedExceptions = FileNotFoundException.class)
+ public void fromFileCheck(Path path) throws Exception {
+ BodyPublisher.fromFile(path);
+ }
+
+ @Test
+ public void handlerAPIExceptions() {
+ Path path = Paths.get(".").resolve("tt");
+ assertThrows(NPE, () -> BodyHandler.asByteArrayConsumer(null));
+ assertThrows(NPE, () -> BodyHandler.asFile(null));
+ assertThrows(NPE, () -> BodyHandler.asFile(null, CREATE, WRITE));
+ assertThrows(NPE, () -> BodyHandler.asFile(path, (OpenOption[])null));
+ assertThrows(NPE, () -> BodyHandler.asFile(path, new OpenOption[] {null}));
+ assertThrows(NPE, () -> BodyHandler.asFile(path, new OpenOption[] {CREATE, null}));
+ assertThrows(NPE, () -> BodyHandler.asFile(path, new OpenOption[] {null, CREATE}));
+ assertThrows(NPE, () -> BodyHandler.asFile(null, (OpenOption[])null));
+ assertThrows(NPE, () -> BodyHandler.asFileDownload(null, CREATE, WRITE));
+ assertThrows(NPE, () -> BodyHandler.asFileDownload(path, (OpenOption[])null));
+ assertThrows(NPE, () -> BodyHandler.asFileDownload(path, new OpenOption[] {null}));
+ assertThrows(NPE, () -> BodyHandler.asFileDownload(path, new OpenOption[] {CREATE, null}));
+ assertThrows(NPE, () -> BodyHandler.asFileDownload(path, new OpenOption[] {null, CREATE}));
+ assertThrows(NPE, () -> BodyHandler.asFileDownload(null, (OpenOption[])null));
+ assertThrows(NPE, () -> BodyHandler.asString(null));
+ assertThrows(NPE, () -> BodyHandler.buffering(null, 1));
+ assertThrows(IAE, () -> BodyHandler.buffering(new NoOpHandler(), 0));
+ assertThrows(IAE, () -> BodyHandler.buffering(new NoOpHandler(), -1));
+ assertThrows(IAE, () -> BodyHandler.buffering(new NoOpHandler(), Integer.MIN_VALUE));
+ }
+
+ @Test
+ public void subscriberAPIExceptions() {
+ Path path = Paths.get(".").resolve("tt");
+ assertThrows(NPE, () -> BodySubscriber.asByteArrayConsumer(null));
+ assertThrows(NPE, () -> BodySubscriber.asFile(null));
+ assertThrows(NPE, () -> BodySubscriber.asFile(null, CREATE, WRITE));
+ assertThrows(NPE, () -> BodySubscriber.asFile(path, (OpenOption[])null));
+ assertThrows(NPE, () -> BodySubscriber.asFile(path, new OpenOption[] {null}));
+ assertThrows(NPE, () -> BodySubscriber.asFile(path, new OpenOption[] {CREATE, null}));
+ assertThrows(NPE, () -> BodySubscriber.asFile(path, new OpenOption[] {null, CREATE}));
+ assertThrows(NPE, () -> BodySubscriber.asFile(null, (OpenOption[])null));
+ assertThrows(NPE, () -> BodySubscriber.asString(null));
+ assertThrows(NPE, () -> BodySubscriber.buffering(null, 1));
+ assertThrows(IAE, () -> BodySubscriber.buffering(new NoOpSubscriber(), 0));
+ assertThrows(IAE, () -> BodySubscriber.buffering(new NoOpSubscriber(), -1));
+ assertThrows(IAE, () -> BodySubscriber.buffering(new NoOpSubscriber(), Integer.MIN_VALUE));
+ }
+
+ static class NoOpHandler implements BodyHandler<Void> {
+ @Override public BodySubscriber<Void> apply(int code, HttpHeaders hrds) { return null; }
+ }
+
+ static class NoOpSubscriber implements BodySubscriber<Void> {
+ @Override public void onSubscribe(Flow.Subscription subscription) { }
+ @Override public void onNext(List<ByteBuffer> item) { }
+ @Override public void onError(Throwable throwable) { }
+ @Override public void onComplete() { }
+ @Override public CompletableFuture<Void> getBody() { return null; }
+ }
+}
--- a/test/jdk/java/net/httpclient/http2/server/Http2TestServer.java Tue Dec 26 13:38:31 2017 +0530
+++ b/test/jdk/java/net/httpclient/http2/server/Http2TestServer.java Mon Jan 08 08:53:14 2018 -0800
@@ -170,7 +170,7 @@
return new ServerSocket(port);
}
- public void stop() {
+ public synchronized void stop() {
// TODO: clean shutdown GoAway
stopping = true;
System.err.printf("Server stopping %d connections\n", connections.size());
@@ -205,6 +205,15 @@
return serverName;
}
+ private synchronized void putConnection(InetSocketAddress addr, Http2TestServerConnection c) {
+ if (!stopping)
+ connections.put(addr, c);
+ }
+
+ private synchronized void removeConnection(InetSocketAddress addr, Http2TestServerConnection c) {
+ connections.remove(addr, c);
+ }
+
/**
* Starts a thread which waits for incoming connections.
*/
@@ -216,7 +225,7 @@
InetSocketAddress addr = (InetSocketAddress) socket.getRemoteSocketAddress();
Http2TestServerConnection c =
new Http2TestServerConnection(this, socket, exchangeSupplier);
- connections.put(addr, c);
+ putConnection(addr, c);
try {
c.run();
} catch (Throwable e) {
@@ -224,7 +233,7 @@
// the connection might not have been closed
// and if so then the client might wait
// forever.
- connections.remove(addr, c);
+ removeConnection(addr, c);
c.close(ErrorFrame.PROTOCOL_ERROR);
System.err.println("TestServer: start exception: " + e);
//throw e;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/nio/Buffer/EqualsCompareTest.java Mon Jan 08 08:53:14 2018 -0800
@@ -0,0 +1,686 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import org.testng.Assert;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import java.nio.Buffer;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.CharBuffer;
+import java.nio.DoubleBuffer;
+import java.nio.FloatBuffer;
+import java.nio.IntBuffer;
+import java.nio.LongBuffer;
+import java.nio.ShortBuffer;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.BiFunction;
+import java.util.function.LongFunction;
+import java.util.stream.IntStream;
+
+/*
+ * @test
+ * @bug 8193085
+ * @summary tests for buffer equals and compare
+ * @run testng EqualsCompareTest
+ */
+
+public class EqualsCompareTest {
+
+ // Maximum width in bits
+ static final int MAX_WIDTH = 512;
+
+ static final Map<Class, Integer> typeToWidth;
+
+ static {
+ typeToWidth = new HashMap<>();
+ typeToWidth.put(byte.class, Byte.SIZE);
+ typeToWidth.put(short.class, Short.SIZE);
+ typeToWidth.put(char.class, Character.SIZE);
+ typeToWidth.put(int.class, Integer.SIZE);
+ typeToWidth.put(long.class, Long.SIZE);
+ typeToWidth.put(float.class, Float.SIZE);
+ typeToWidth.put(double.class, Double.SIZE);
+ }
+
+ static int arraySizeFor(Class<?> type) {
+ assert type.isPrimitive();
+ return 4 * MAX_WIDTH / typeToWidth.get(type);
+ }
+
+ enum BufferKind {
+ HEAP,
+ HEAP_VIEW,
+ DIRECT;
+ }
+
+ static abstract class BufferType<T extends Buffer, E> {
+ final BufferKind k;
+ final Class<?> bufferType;
+ final Class<?> elementType;
+
+ final MethodHandle eq;
+ final MethodHandle cmp;
+
+ final MethodHandle getter;
+ final MethodHandle setter;
+
+ BufferType(BufferKind k, Class<T> bufferType, Class<?> elementType) {
+ this.k = k;
+ this.bufferType = bufferType;
+ this.elementType = elementType;
+
+ var lookup = MethodHandles.lookup();
+ try {
+ eq = lookup.findVirtual(bufferType, "equals", MethodType.methodType(boolean.class, Object.class));
+ cmp = lookup.findVirtual(bufferType, "compareTo", MethodType.methodType(int.class, bufferType));
+
+ getter = lookup.findVirtual(bufferType, "get", MethodType.methodType(elementType, int.class));
+ setter = lookup.findVirtual(bufferType, "put", MethodType.methodType(bufferType, int.class, elementType));
+ }
+ catch (Exception e) {
+ throw new AssertionError(e);
+ }
+ }
+
+ @Override
+ public String toString() {
+ return bufferType.getName() + " " + k;
+ }
+
+ T construct(int length) {
+ return construct(length, ByteOrder.BIG_ENDIAN);
+ }
+
+ abstract T construct(int length, ByteOrder bo);
+
+ @SuppressWarnings("unchecked")
+ T slice(T a, int from, int to) {
+ return (T) a.position(from).limit(to).slice();
+ }
+
+ @SuppressWarnings("unchecked")
+ E get(T a, int i) {
+ try {
+ return (E) getter.invoke(a, i);
+ }
+ catch (RuntimeException | Error e) {
+ throw e;
+ }
+ catch (Throwable t) {
+ throw new Error(t);
+ }
+ }
+
+ void set(T a, int i, Object v) {
+ try {
+ setter.invoke(a, i, convert(v));
+ }
+ catch (RuntimeException | Error e) {
+ throw e;
+ }
+ catch (Throwable t) {
+ throw new Error(t);
+ }
+ }
+
+ abstract Object convert(Object o);
+
+ boolean equals(T a, T b) {
+ try {
+ return (boolean) eq.invoke(a, b);
+ }
+ catch (RuntimeException | Error e) {
+ throw e;
+ }
+ catch (Throwable t) {
+ throw new Error(t);
+ }
+ }
+
+ int compare(T a, T b) {
+ try {
+ return (int) cmp.invoke(a, b);
+ }
+ catch (RuntimeException | Error e) {
+ throw e;
+ }
+ catch (Throwable t) {
+ throw new Error(t);
+ }
+ }
+
+ boolean pairWiseEquals(T a, T b) {
+ if (a.remaining() != b.remaining())
+ return false;
+ int p = a.position();
+ for (int i = a.limit() - 1, j = b.limit() - 1; i >= p; i--, j--)
+ if (!get(a, i).equals(get(b, j)))
+ return false;
+ return true;
+ }
+
+ static class Bytes extends BufferType<ByteBuffer, Byte> {
+ Bytes(BufferKind k) {
+ super(k, ByteBuffer.class, byte.class);
+ }
+
+ @Override
+ ByteBuffer construct(int length, ByteOrder bo) {
+ switch (k) {
+ case DIRECT:
+ return ByteBuffer.allocateDirect(length).order(bo);
+ default:
+ case HEAP_VIEW:
+ case HEAP:
+ return ByteBuffer.allocate(length).order(bo);
+ }
+ }
+
+ @Override
+ Object convert(Object o) {
+ return o instanceof Integer
+ ? ((Integer) o).byteValue()
+ : o;
+ }
+ }
+
+ static class Chars extends BufferType<CharBuffer, Character> {
+ Chars(BufferKind k) {
+ super(k, CharBuffer.class, char.class);
+ }
+
+ @Override
+ CharBuffer construct(int length, ByteOrder bo) {
+ switch (k) {
+ case DIRECT:
+ return ByteBuffer.allocateDirect(length * Character.BYTES).
+ order(bo).
+ asCharBuffer();
+ case HEAP_VIEW:
+ return ByteBuffer.allocate(length * Character.BYTES).
+ order(bo).
+ asCharBuffer();
+ default:
+ case HEAP:
+ return CharBuffer.allocate(length);
+ }
+ }
+
+ @Override
+ Object convert(Object o) {
+ return o instanceof Integer
+ ? (char) ((Integer) o).intValue()
+ : o;
+ }
+
+ CharBuffer transformToStringBuffer(CharBuffer c) {
+ char[] chars = new char[c.remaining()];
+ c.get(chars);
+ return CharBuffer.wrap(new String(chars));
+ }
+ }
+
+ static class Shorts extends BufferType<ShortBuffer, Short> {
+ Shorts(BufferKind k) {
+ super(k, ShortBuffer.class, short.class);
+ }
+
+ @Override
+ ShortBuffer construct(int length, ByteOrder bo) {
+ switch (k) {
+ case DIRECT:
+ return ByteBuffer.allocateDirect(length * Short.BYTES).
+ order(bo).
+ asShortBuffer();
+ case HEAP_VIEW:
+ return ByteBuffer.allocate(length * Short.BYTES).
+ order(bo).
+ asShortBuffer();
+ default:
+ case HEAP:
+ return ShortBuffer.allocate(length);
+ }
+ }
+
+ @Override
+ Object convert(Object o) {
+ return o instanceof Integer
+ ? ((Integer) o).shortValue()
+ : o;
+ }
+ }
+
+ static class Ints extends BufferType<IntBuffer, Integer> {
+ Ints(BufferKind k) {
+ super(k, IntBuffer.class, int.class);
+ }
+
+ @Override
+ IntBuffer construct(int length, ByteOrder bo) {
+ switch (k) {
+ case DIRECT:
+ return ByteBuffer.allocateDirect(length * Integer.BYTES).
+ order(bo).
+ asIntBuffer();
+ case HEAP_VIEW:
+ return ByteBuffer.allocate(length * Integer.BYTES).
+ order(bo).
+ asIntBuffer();
+ default:
+ case HEAP:
+ return IntBuffer.allocate(length);
+ }
+ }
+
+ Object convert(Object o) {
+ return o;
+ }
+ }
+
+ static class Floats extends BufferType<FloatBuffer, Float> {
+ Floats(BufferKind k) {
+ super(k, FloatBuffer.class, float.class);
+ }
+
+ @Override
+ FloatBuffer construct(int length, ByteOrder bo) {
+ switch (k) {
+ case DIRECT:
+ return ByteBuffer.allocateDirect(length * Float.BYTES).
+ order(bo).
+ asFloatBuffer();
+ case HEAP_VIEW:
+ return ByteBuffer.allocate(length * Float.BYTES).
+ order(bo).
+ asFloatBuffer();
+ default:
+ case HEAP:
+ return FloatBuffer.allocate(length);
+ }
+ }
+
+ @Override
+ Object convert(Object o) {
+ return o instanceof Integer
+ ? ((Integer) o).floatValue()
+ : o;
+ }
+
+ @Override
+ boolean pairWiseEquals(FloatBuffer a, FloatBuffer b) {
+ if (a.remaining() != b.remaining())
+ return false;
+ int p = a.position();
+ for (int i = a.limit() - 1, j = b.limit() - 1; i >= p; i--, j--) {
+ float av = a.get(i);
+ float bv = b.get(j);
+ if (av != bv && (!Float.isNaN(av) || !Float.isNaN(bv)))
+ return false;
+ }
+ return true;
+ }
+ }
+
+ static class Longs extends BufferType<LongBuffer, Long> {
+ Longs(BufferKind k) {
+ super(k, LongBuffer.class, long.class);
+ }
+
+ @Override
+ LongBuffer construct(int length, ByteOrder bo) {
+ switch (k) {
+ case DIRECT:
+ return ByteBuffer.allocateDirect(length * Long.BYTES).
+ order(bo).
+ asLongBuffer();
+ case HEAP_VIEW:
+ return ByteBuffer.allocate(length * Long.BYTES).
+ order(bo).
+ asLongBuffer();
+ default:
+ case HEAP:
+ return LongBuffer.allocate(length);
+ }
+ }
+
+ @Override
+ Object convert(Object o) {
+ return o instanceof Integer
+ ? ((Integer) o).longValue()
+ : o;
+ }
+ }
+
+ static class Doubles extends BufferType<DoubleBuffer, Double> {
+ Doubles(BufferKind k) {
+ super(k, DoubleBuffer.class, double.class);
+ }
+
+ @Override
+ DoubleBuffer construct(int length, ByteOrder bo) {
+ switch (k) {
+ case DIRECT:
+ return ByteBuffer.allocateDirect(length * Double.BYTES).
+ order(bo).
+ asDoubleBuffer();
+ case HEAP_VIEW:
+ return ByteBuffer.allocate(length * Double.BYTES).
+ order(bo).
+ asDoubleBuffer();
+ default:
+ case HEAP:
+ return DoubleBuffer.allocate(length);
+ }
+ }
+
+ @Override
+ Object convert(Object o) {
+ return o instanceof Integer
+ ? ((Integer) o).doubleValue()
+ : o;
+ }
+
+ @Override
+ boolean pairWiseEquals(DoubleBuffer a, DoubleBuffer b) {
+ if (a.remaining() != b.remaining())
+ return false;
+ int p = a.position();
+ for (int i = a.limit() - 1, j = b.limit() - 1; i >= p; i--, j--) {
+ double av = a.get(i);
+ double bv = b.get(j);
+ if (av != bv && (!Double.isNaN(av) || !Double.isNaN(bv)))
+ return false;
+ }
+ return true;
+ }
+ }
+ }
+
+
+ static Object[][] bufferTypes;
+
+ @DataProvider
+ public static Object[][] bufferTypesProvider() {
+ if (bufferTypes == null) {
+ bufferTypes = new Object[][]{
+ {new BufferType.Bytes(BufferKind.HEAP)},
+ {new BufferType.Bytes(BufferKind.DIRECT)},
+ {new BufferType.Chars(BufferKind.HEAP)},
+ {new BufferType.Chars(BufferKind.HEAP_VIEW)},
+ {new BufferType.Chars(BufferKind.DIRECT)},
+ {new BufferType.Shorts(BufferKind.HEAP)},
+ {new BufferType.Shorts(BufferKind.HEAP_VIEW)},
+ {new BufferType.Shorts(BufferKind.DIRECT)},
+ {new BufferType.Ints(BufferKind.HEAP)},
+ {new BufferType.Ints(BufferKind.HEAP_VIEW)},
+ {new BufferType.Ints(BufferKind.DIRECT)},
+ {new BufferType.Floats(BufferKind.HEAP)},
+ {new BufferType.Floats(BufferKind.HEAP_VIEW)},
+ {new BufferType.Floats(BufferKind.DIRECT)},
+ {new BufferType.Longs(BufferKind.HEAP)},
+ {new BufferType.Longs(BufferKind.HEAP_VIEW)},
+ {new BufferType.Longs(BufferKind.DIRECT)},
+ {new BufferType.Doubles(BufferKind.HEAP)},
+ {new BufferType.Doubles(BufferKind.HEAP_VIEW)},
+ {new BufferType.Doubles(BufferKind.DIRECT)},
+ };
+ }
+ return bufferTypes;
+ }
+
+
+ static Object[][] floatbufferTypes;
+
+ @DataProvider
+ public static Object[][] floatBufferTypesProvider() {
+ if (floatbufferTypes == null) {
+ LongFunction<Object> bTof = rb -> Float.intBitsToFloat((int) rb);
+ LongFunction<Object> bToD = Double::longBitsToDouble;
+
+ floatbufferTypes = new Object[][]{
+ // canonical and non-canonical NaNs
+ // If conversion is a signalling NaN it may be subject to conversion to a
+ // quiet NaN on some processors, even if a copy is performed
+ // The tests assume that if conversion occurs it does not convert to the
+ // canonical NaN
+ new Object[]{new BufferType.Floats(BufferKind.HEAP), 0x7fc00000L, 0x7f800001L, bTof},
+ new Object[]{new BufferType.Floats(BufferKind.HEAP_VIEW), 0x7fc00000L, 0x7f800001L, bTof},
+ new Object[]{new BufferType.Floats(BufferKind.DIRECT), 0x7fc00000L, 0x7f800001L, bTof},
+ new Object[]{new BufferType.Doubles(BufferKind.HEAP), 0x7ff8000000000000L, 0x7ff0000000000001L, bToD},
+ new Object[]{new BufferType.Doubles(BufferKind.HEAP_VIEW), 0x7ff8000000000000L, 0x7ff0000000000001L, bToD},
+ new Object[]{new BufferType.Doubles(BufferKind.DIRECT), 0x7ff8000000000000L, 0x7ff0000000000001L, bToD},
+
+ // +0.0 and -0.0
+ new Object[]{new BufferType.Floats(BufferKind.HEAP), 0x0L, 0x80000000L, bTof},
+ new Object[]{new BufferType.Floats(BufferKind.HEAP_VIEW), 0x0L, 0x80000000L, bTof},
+ new Object[]{new BufferType.Floats(BufferKind.DIRECT), 0x0L, 0x80000000L, bTof},
+ new Object[]{new BufferType.Doubles(BufferKind.HEAP), 0x0L, 0x8000000000000000L, bToD},
+ new Object[]{new BufferType.Doubles(BufferKind.HEAP_VIEW), 0x0L, 0x8000000000000000L, bToD},
+ new Object[]{new BufferType.Doubles(BufferKind.DIRECT), 0x0L, 0x8000000000000000L, bToD},
+ };
+ }
+ return floatbufferTypes;
+ }
+
+
+ static Object[][] charBufferTypes;
+
+ @DataProvider
+ public static Object[][] charBufferTypesProvider() {
+ if (charBufferTypes == null) {
+ charBufferTypes = new Object[][]{
+ {new BufferType.Chars(BufferKind.HEAP)},
+ {new BufferType.Chars(BufferKind.HEAP_VIEW)},
+ {new BufferType.Chars(BufferKind.DIRECT)},
+ };
+ }
+ return charBufferTypes;
+ }
+
+
+ // Tests all primitive buffers
+ @Test(dataProvider = "bufferTypesProvider")
+ <E>
+ void testBuffers(BufferType<Buffer, E> bufferType) {
+ // Test with buffers of the same byte order (BE)
+ BiFunction<BufferType<Buffer, E>, Integer, Buffer> constructor = (at, s) -> {
+ Buffer a = at.construct(s);
+ for (int x = 0; x < s; x++) {
+ at.set(a, x, x % 8);
+ }
+ return a;
+ };
+
+ testBufferType(bufferType, constructor, constructor);
+
+ // Test with buffers of different byte order
+ if (bufferType.elementType != byte.class &&
+ (bufferType.k == BufferKind.HEAP_VIEW ||
+ bufferType.k == BufferKind.DIRECT)) {
+
+ BiFunction<BufferType<Buffer, E>, Integer, Buffer> leConstructor = (at, s) -> {
+ Buffer a = at.construct(s, ByteOrder.LITTLE_ENDIAN);
+ for (int x = 0; x < s; x++) {
+ at.set(a, x, x % 8);
+ }
+ return a;
+ };
+ testBufferType(bufferType, constructor, leConstructor);
+ }
+ }
+
+ // Tests float and double buffers with edge-case values (NaN, -0.0, +0.0)
+ @Test(dataProvider = "floatBufferTypesProvider")
+ public void testFloatBuffers(
+ BufferType<Buffer, Float> bufferType,
+ long rawBitsA, long rawBitsB,
+ LongFunction<Object> bitsToFloat) {
+ Object av = bitsToFloat.apply(rawBitsA);
+ Object bv = bitsToFloat.apply(rawBitsB);
+
+ BiFunction<BufferType<Buffer, Float>, Integer, Buffer> allAs = (at, s) -> {
+ Buffer b = at.construct(s);
+ for (int x = 0; x < s; x++) {
+ at.set(b, x, av);
+ }
+ return b;
+ };
+
+ BiFunction<BufferType<Buffer, Float>, Integer, Buffer> allBs = (at, s) -> {
+ Buffer b = at.construct(s);
+ for (int x = 0; x < s; x++) {
+ at.set(b, x, bv);
+ }
+ return b;
+ };
+
+ BiFunction<BufferType<Buffer, Float>, Integer, Buffer> halfBs = (at, s) -> {
+ Buffer b = at.construct(s);
+ for (int x = 0; x < s / 2; x++) {
+ at.set(b, x, bv);
+ }
+ for (int x = s / 2; x < s; x++) {
+ at.set(b, x, 1);
+ }
+ return b;
+ };
+
+ // Sanity check
+ int size = arraySizeFor(bufferType.elementType);
+ Assert.assertTrue(bufferType.pairWiseEquals(allAs.apply(bufferType, size),
+ allBs.apply(bufferType, size)));
+ Assert.assertTrue(bufferType.equals(allAs.apply(bufferType, size),
+ allBs.apply(bufferType, size)));
+
+ testBufferType(bufferType, allAs, allBs);
+ testBufferType(bufferType, allAs, halfBs);
+ }
+
+ // Tests CharBuffer for region sources and CharSequence sources
+ @Test(dataProvider = "charBufferTypesProvider")
+ public void testCharBuffers(BufferType.Chars charBufferType) {
+
+ BiFunction<BufferType.Chars, Integer, CharBuffer> constructor = (at, s) -> {
+ CharBuffer a = at.construct(s);
+ for (int x = 0; x < s; x++) {
+ at.set(a, x, x % 8);
+ }
+ return a;
+ };
+
+ BiFunction<BufferType.Chars, Integer, CharBuffer> constructorX = constructor.
+ andThen(charBufferType::transformToStringBuffer);
+
+ testBufferType(charBufferType, constructor, constructorX);
+ }
+
+
+ <B extends Buffer, E, BT extends BufferType<B, E>>
+ void testBufferType(BT bt,
+ BiFunction<BT, Integer, B> aConstructor,
+ BiFunction<BT, Integer, B> bConstructor) {
+ int n = arraySizeFor(bt.elementType);
+
+ for (int s : ranges(0, n)) {
+ B a = aConstructor.apply(bt, s);
+ B b = bConstructor.apply(bt, s);
+
+ for (int aFrom : ranges(0, s)) {
+ for (int aTo : ranges(aFrom, s)) {
+ int aLength = aTo - aFrom;
+
+ B as = aLength != s
+ ? bt.slice(a, aFrom, aTo)
+ : a;
+
+ for (int bFrom : ranges(0, s)) {
+ for (int bTo : ranges(bFrom, s)) {
+ int bLength = bTo - bFrom;
+
+ B bs = bLength != s
+ ? bt.slice(b, bFrom, bTo)
+ : b;
+
+ boolean eq = bt.pairWiseEquals(as, bs);
+ Assert.assertEquals(bt.equals(as, bs), eq);
+ Assert.assertEquals(bt.equals(bs, as), eq);
+ if (eq) {
+ Assert.assertEquals(bt.compare(as, bs), 0);
+ Assert.assertEquals(bt.compare(bs, as), 0);
+ }
+ else {
+ int aCb = bt.compare(as, bs);
+ int bCa = bt.compare(bs, as);
+ int v = Integer.signum(aCb) * Integer.signum(bCa);
+ Assert.assertTrue(v == -1);
+ }
+ }
+ }
+
+ if (aLength > 0 && !a.isReadOnly()) {
+ for (int i = aFrom; i < aTo; i++) {
+ B c = aConstructor.apply(bt, a.capacity());
+ B cs = aLength != s
+ ? bt.slice(c, aFrom, aTo)
+ : c;
+
+ // Create common prefix with a length of i - aFrom
+ bt.set(c, i, -1);
+
+ Assert.assertFalse(bt.equals(c, a));
+
+ int cCa = bt.compare(cs, as);
+ int aCc = bt.compare(as, cs);
+ int v = Integer.signum(cCa) * Integer.signum(aCc);
+ Assert.assertTrue(v == -1);
+ }
+ }
+ }
+ }
+ }
+ }
+
+ static int[] ranges(int from, int to) {
+ int width = to - from;
+ switch (width) {
+ case 0:
+ return new int[]{};
+ case 1:
+ return new int[]{from, to};
+ case 2:
+ return new int[]{from, from + 1, to};
+ case 3:
+ return new int[]{from, from + 1, from + 2, to};
+ default:
+ return IntStream.of(from, from + 1, from + 2, to / 2 - 1, to / 2, to / 2 + 1, to - 2, to - 1, to)
+ .filter(i -> i >= from && i <= to)
+ .distinct().toArray();
+ }
+ }
+}
--- a/test/jdk/java/nio/channels/DatagramChannel/SocketOptionTests.java Tue Dec 26 13:38:31 2017 +0530
+++ b/test/jdk/java/nio/channels/DatagramChannel/SocketOptionTests.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
/* @test
* @bug 4640544 8044773
* @summary Unit test for setOption/getOption/options methods
+ * @requires !vm.graal.enabled
* @run main SocketOptionTests
* @run main/othervm --limit-modules=java.base SocketOptionTests
*/
--- a/test/jdk/java/nio/channels/ServerSocketChannel/SocketOptionTests.java Tue Dec 26 13:38:31 2017 +0530
+++ b/test/jdk/java/nio/channels/ServerSocketChannel/SocketOptionTests.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
* @bug 4640544 8044773
* @summary Unit test for ServerSocketChannel setOption/getOption/options
* methods.
+ * @requires !vm.graal.enabled
* @run main SocketOptionTests
* @run main/othervm --limit-modules=java.base SocketOptionTests
*/
--- a/test/jdk/java/nio/channels/SocketChannel/SocketOptionTests.java Tue Dec 26 13:38:31 2017 +0530
+++ b/test/jdk/java/nio/channels/SocketChannel/SocketOptionTests.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
* @bug 4640544 8044773
* @summary Unit test to check SocketChannel setOption/getOption/options
* methods.
+ * @requires !vm.graal.enabled
* @run main SocketOptionTests
* @run main/othervm --limit-modules=java.base SocketOptionTests
*/
--- a/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/WhileOpTest.java Tue Dec 26 13:38:31 2017 +0530
+++ b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/WhileOpTest.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -46,7 +46,7 @@
/*
* @test
- * @bug 8071597
+ * @bug 8071597 8193856
*/
@Test
public class WhileOpTest extends OpTestCase {
@@ -361,4 +361,33 @@
}
assertTrue(isClosed.get());
}
+
+ @Test(groups = { "serialization-hostile" })
+ public void testFlatMapThenTake() {
+ TestData.OfRef<Integer> range = TestData.Factory.ofSupplier(
+ "range", () -> IntStream.range(0, 100).boxed());
+
+ exerciseOpsMulti(range,
+ // Reference result
+ s -> s.takeWhile(e -> e != 50),
+ // For other results collect into array,
+ // stream the single array (not the elements),
+ // then flat map to stream the array elements
+ s -> Stream.<Integer[]>of(s.toArray(Integer[]::new)).
+ flatMap(Stream::of).
+ takeWhile(e -> e != 50),
+ s -> Stream.of(s.mapToInt(e -> e).toArray()).
+ flatMapToInt(IntStream::of).
+ takeWhile(e -> e != 50).
+ mapToObj(e -> e),
+ s -> Stream.of(s.mapToLong(e -> e).toArray()).
+ flatMapToLong(LongStream::of).
+ takeWhile(e -> e != 50L).
+ mapToObj(e -> (int) e),
+ s -> Stream.of(s.mapToDouble(e -> e).toArray()).
+ flatMapToDouble(DoubleStream::of).
+ takeWhile(e -> e != 50.0).
+ mapToObj(e -> (int) e)
+ );
+ }
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/sanity/releaseFile/NegativeSOURCETest.java Mon Jan 08 08:53:14 2018 -0800
@@ -0,0 +1,106 @@
+
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8192837
+ * @summary Test to verify release file does not contain closed repo info if it's open bundle
+ * @run main NegativeSOURCETest
+ */
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+
+public class NegativeSOURCETest {
+
+ NegativeSOURCETest(String dataFile) {
+ // Read data files
+ readFile(dataFile);
+ }
+
+ private void readFile(String fileName) {
+ String fishForSOURCE = null;
+
+ File file = new File(fileName);
+
+ // open the stream to read in for Entries
+ try (BufferedReader buffRead =
+ new BufferedReader(new FileReader(fileName))) {
+
+ // this is the string read
+ String readIn;
+
+ // let's read some strings!
+ while ((readIn = buffRead.readLine()) != null) {
+ readIn = readIn.trim();
+
+ // throw out blank lines
+ if (readIn.length() == 0)
+ continue;
+
+ // grab SOURCE line
+ if (readIn.startsWith("SOURCE=")) {
+ fishForSOURCE = readIn;
+ break;
+ }
+ }
+ } catch (FileNotFoundException fileExcept) {
+ throw new RuntimeException("File " + fileName +
+ " not found reading data!", fileExcept);
+ } catch (IOException ioExcept) {
+ throw new RuntimeException("Unexpected problem reading data!",
+ ioExcept);
+ }
+
+ // was SOURCE even found?
+ if (fishForSOURCE == null) {
+ throw new RuntimeException("SOURCE line was not found!");
+ } else {
+ // OK it was found, did it have closed/open in it?
+ if (fishForSOURCE.contains("closed") || fishForSOURCE.contains("open")) {
+ System.out.println("The offending string: " + fishForSOURCE);
+ throw new RuntimeException("The test failed, closed/open found!");
+ }
+ }
+
+ // Everything was fine
+ System.out.println("The test passed!");
+ }
+
+ public static void main(String args[]) {
+ String jdkPath = System.getProperty("test.jdk");
+ String runtime = System.getProperty("java.runtime.name");
+
+ System.out.println("JDK Path : " + jdkPath);
+ System.out.println("Runtime Name : " + runtime);
+
+ if (runtime.contains("OpenJDK"))
+ new NegativeSOURCETest(jdkPath + "/release");
+ else
+ System.out.println("Test skipped: not an OpenJDK build.");
+ }
+}
--- a/test/jdk/sun/security/ssl/CertPathRestrictions/JSSEServer.java Tue Dec 26 13:38:31 2017 +0530
+++ b/test/jdk/sun/security/ssl/CertPathRestrictions/JSSEServer.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, 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
@@ -36,8 +36,6 @@
private SSLServerSocket server = null;
- private Exception exception = null;
-
public JSSEServer(SSLContext context, String constraint,
boolean needClientAuth) throws Exception {
TLSRestrictions.setConstraint("Server", constraint);
@@ -49,35 +47,28 @@
System.out.println("Server: port=" + getPort());
}
- public void start() {
- new Thread(new Runnable() {
+ public Exception start() {
+ System.out.println("Server: started");
+ Exception exception = null;
+ try (SSLSocket socket = (SSLSocket) server.accept()) {
+ System.out.println("Server: accepted connection");
+ socket.setSoTimeout(TLSRestrictions.TIMEOUT);
+ InputStream sslIS = socket.getInputStream();
+ OutputStream sslOS = socket.getOutputStream();
+ sslIS.read();
+ sslOS.write('S');
+ sslOS.flush();
+ System.out.println("Server: finished");
+ } catch (Exception e) {
+ exception = e;
+ e.printStackTrace(System.out);
+ System.out.println("Server: failed");
+ }
- @Override
- public void run() {
- try {
- System.out.println("Server: started");
- try (SSLSocket socket = (SSLSocket) server.accept()) {
- socket.setSoTimeout(TLSRestrictions.TIMEOUT);
- InputStream sslIS = socket.getInputStream();
- OutputStream sslOS = socket.getOutputStream();
- sslIS.read();
- sslOS.write('S');
- sslOS.flush();
- System.out.println("Server: finished");
- }
- } catch (Exception e) {
- e.printStackTrace(System.out);
- exception = e;
- }
- }
- }).start();
+ return exception;
}
public int getPort() {
return server.getLocalPort();
}
-
- public Exception getException() {
- return exception;
- }
}
--- a/test/jdk/sun/security/ssl/CertPathRestrictions/TLSRestrictions.java Tue Dec 26 13:38:31 2017 +0530
+++ b/test/jdk/sun/security/ssl/CertPathRestrictions/TLSRestrictions.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, 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
@@ -36,6 +36,10 @@
import java.security.cert.CertificateFactory;
import java.security.spec.PKCS8EncodedKeySpec;
import java.util.Base64;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import javax.net.ssl.KeyManagerFactory;
@@ -216,59 +220,59 @@
needClientAuth,
pass);
- JSSEServer server = new JSSEServer(
- createSSLContext(trustNames, certNames),
- serverConstraint,
- needClientAuth);
- int port = server.getPort();
- server.start();
-
- // Run client on another JVM so that its properties cannot be in conflict
- // with server's.
- OutputAnalyzer outputAnalyzer = ProcessTools.executeTestJvm(
- "-Dcert.dir=" + CERT_DIR,
- "-Djava.security.debug=certpath",
- "-classpath",
- TEST_CLASSES,
- "JSSEClient",
- port + "",
- trustNameStr,
- certNameStr,
- clientConstraint);
- int exitValue = outputAnalyzer.getExitValue();
- String clientOut = outputAnalyzer.getOutput();
+ ExecutorService executor = Executors.newFixedThreadPool(1);
+ try {
+ JSSEServer server = new JSSEServer(
+ createSSLContext(trustNames, certNames),
+ serverConstraint,
+ needClientAuth);
+ int port = server.getPort();
+ Future<Exception> serverFuture = executor.submit(() -> server.start());
- Exception serverException = server.getException();
- if (serverException != null) {
- System.out.println("Server: failed");
- }
-
- System.out.println("---------- Client output start ----------");
- System.out.println(clientOut);
- System.out.println("---------- Client output end ----------");
+ // Run client on another JVM so that its properties cannot be in conflict
+ // with server's.
+ OutputAnalyzer outputAnalyzer = ProcessTools.executeTestJvm(
+ "-Dcert.dir=" + CERT_DIR,
+ "-Djava.security.debug=certpath",
+ "-classpath",
+ TEST_CLASSES,
+ "JSSEClient",
+ port + "",
+ trustNameStr,
+ certNameStr,
+ clientConstraint);
+ int clientExitValue = outputAnalyzer.getExitValue();
+ String clientOut = outputAnalyzer.getOutput();
+ System.out.println("---------- Client output start ----------");
+ System.out.println(clientOut);
+ System.out.println("---------- Client output end ----------");
- if (serverException instanceof SocketTimeoutException
- || clientOut.contains("SocketTimeoutException")) {
- System.out.println("The communication gets timeout and skips the test.");
- return;
- }
-
- if (pass) {
- if (serverException != null || exitValue != 0) {
- throw new RuntimeException(
- "Unexpected failure. Operation was blocked.");
- }
- } else {
- if (serverException == null && exitValue == 0) {
- throw new RuntimeException(
- "Unexpected pass. Operation was allowed.");
+ Exception serverException = serverFuture.get(TIMEOUT, TimeUnit.MILLISECONDS);
+ if (serverException instanceof SocketTimeoutException
+ || clientOut.contains("SocketTimeoutException")) {
+ System.out.println("The communication gets timeout and skips the test.");
+ return;
}
- // The test may encounter non-SSL issues, like network problem.
- if (!(serverException instanceof SSLHandshakeException
- || clientOut.contains("SSLHandshakeException"))) {
- throw new RuntimeException("Failure with unexpected exception.");
+ if (pass) {
+ if (serverException != null || clientExitValue != 0) {
+ throw new RuntimeException(
+ "Unexpected failure. Operation was blocked.");
+ }
+ } else {
+ if (serverException == null && clientExitValue == 0) {
+ throw new RuntimeException(
+ "Unexpected pass. Operation was allowed.");
+ }
+
+ // The test may encounter non-SSL issues, like network problem.
+ if (!(serverException instanceof SSLHandshakeException
+ || clientOut.contains("SSLHandshakeException"))) {
+ throw new RuntimeException("Failure with unexpected exception.");
+ }
}
+ } finally {
+ executor.shutdown();
}
}
@@ -520,7 +524,6 @@
true);
break;
}
-
System.out.println("Case passed");
System.out.println("========================================");
}
--- a/test/jdk/tools/launcher/modules/limitmods/LimitModsTest.java Tue Dec 26 13:38:31 2017 +0530
+++ b/test/jdk/tools/launcher/modules/limitmods/LimitModsTest.java Mon Jan 08 08:53:14 2018 -0800
@@ -23,6 +23,7 @@
/**
* @test
+ * @requires !vm.graal.enabled
* @library /lib/testlibrary /test/lib
* @modules java.desktop java.logging jdk.compiler
* @build LimitModsTest jdk.test.lib.compiler.CompilerUtils jdk.testlibrary.*
--- a/test/jdk/tools/launcher/modules/listmods/ListModsTest.java Tue Dec 26 13:38:31 2017 +0530
+++ b/test/jdk/tools/launcher/modules/listmods/ListModsTest.java Mon Jan 08 08:53:14 2018 -0800
@@ -23,6 +23,7 @@
/**
* @test
+ * @requires !vm.graal.enabled
* @library /lib/testlibrary /test/lib
* @modules java.se
* @build ListModsTest jdk.test.lib.compiler.CompilerUtils jdk.testlibrary.*
--- a/test/jdk/tools/launcher/modules/showmoduleresolution/ShowModuleResolutionTest.java Tue Dec 26 13:38:31 2017 +0530
+++ b/test/jdk/tools/launcher/modules/showmoduleresolution/ShowModuleResolutionTest.java Mon Jan 08 08:53:14 2018 -0800
@@ -23,6 +23,7 @@
/**
* @test
+ * @requires !vm.graal.enabled
* @modules jdk.jdeps jdk.zipfs
* @library /lib/testlibrary
* @build ShowModuleResolutionTest jdk.testlibrary.*
--- a/test/langtools/TEST.ROOT Tue Dec 26 13:38:31 2017 +0530
+++ b/test/langtools/TEST.ROOT Mon Jan 08 08:53:14 2018 -0800
@@ -15,7 +15,7 @@
groups=TEST.groups
# Minimum jtreg version
-requiredVersion=4.2 b08
+requiredVersion=4.2 b11
# Use new module options
useNewOptions=true
--- a/test/langtools/jdk/javadoc/doclet/testMethodTypes/TestMethodTypes.java Tue Dec 26 13:38:31 2017 +0530
+++ b/test/langtools/jdk/javadoc/doclet/testMethodTypes/TestMethodTypes.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, 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
@@ -23,8 +23,8 @@
/*
* @test
- * @bug 8002304 8024096
- * @summary Test for various method types in the method summary table
+ * @bug 8002304 8024096 8193671
+ * @summary Test for various method type tabs in the method summary table
* @author Bhavesh Patel
* @library ../lib
* @modules jdk.javadoc/jdk.javadoc.internal.tool
@@ -62,13 +62,18 @@
"<tr id=\"i0\" class=\"altColor\">");
checkOutput("pkg1/B.html", true,
- "<caption><span id=\"t0\" class=\"activeTableTab\"><span>All "
- + "Methods</span><span class=\"tabEnd\"> </span></span>"
- + "<span id=\"t2\" class=\"tableTab\"><span><a href=\"javascript:show(2);\">"
- + "Instance Methods</a></span><span class=\"tabEnd\"> </span></span>"
- + "<span id=\"t3\" class=\"tableTab\"><span><a href=\"javascript:show(4);\">"
- + "Abstract Methods</a></span><span class=\"tabEnd\"> </span></span>"
- + "</caption>");
+ "var methods = {\"i0\":6,\"i1\":18,\"i2\":18,\"i3\":1,\"i4\":1,"
+ + "\"i5\":6,\"i6\":6,\"i7\":6,\"i8\":6};\n",
+ "<caption><span id=\"t0\" class=\"activeTableTab\"><span>All Methods</span>"
+ + "<span class=\"tabEnd\"> </span></span><span id=\"t1\" class=\"tableTab\">"
+ + "<span><a href=\"javascript:show(1);\">Static Methods</a></span>"
+ + "<span class=\"tabEnd\"> </span></span><span id=\"t2\" class=\"tableTab\">"
+ + "<span><a href=\"javascript:show(2);\">Instance Methods</a></span>"
+ + "<span class=\"tabEnd\"> </span></span><span id=\"t3\" class=\"tableTab\">"
+ + "<span><a href=\"javascript:show(4);\">Abstract Methods</a></span>"
+ + "<span class=\"tabEnd\"> </span></span><span id=\"t5\" class=\"tableTab\">"
+ + "<span><a href=\"javascript:show(16);\">Default Methods</a></span>"
+ + "<span class=\"tabEnd\"> </span></span></caption>\n");
checkOutput("pkg1/D.html", true,
"var methods = {",
--- a/test/langtools/jdk/javadoc/doclet/testMethodTypes/pkg1/A.java Tue Dec 26 13:38:31 2017 +0530
+++ b/test/langtools/jdk/javadoc/doclet/testMethodTypes/pkg1/A.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, 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
@@ -44,6 +44,7 @@
/**
* This is the third concrete instance method.
+ * @return a string
*/
public String getParameter() {
return "test";
--- a/test/langtools/jdk/javadoc/doclet/testMethodTypes/pkg1/B.java Tue Dec 26 13:38:31 2017 +0530
+++ b/test/langtools/jdk/javadoc/doclet/testMethodTypes/pkg1/B.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, 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
@@ -24,8 +24,8 @@
package pkg1;
/**
- * This interface has different types of methods such as "Instance Methods" and
- * "Abstract Methods". All the tabs will display same list of methods.
+ * This interface has different types of methods such as "Static Methods",
+ * "Instance Methods", "Abstract Methods", "Default Methods".
*/
public interface B {
@@ -36,21 +36,45 @@
/**
* This is the second abstract instance method.
+ * @return a string
*/
public String getName();
/**
* This is the third abstract instance method.
+ * @return a boolean value
*/
public boolean addEntry();
/**
* This is the fourth abstract instance method.
+ * @return a boolean value
*/
public boolean removeEntry();
/**
* This is the fifth abstract instance method.
+ * @return a string
*/
public String getPermissions();
+
+ /**
+ * A static interface method.
+ */
+ public static void aStaticMethod() {}
+
+ /**
+ * Another static interface method.
+ */
+ public static void anotherStaticMethod() {}
+
+ /**
+ * A default method.
+ */
+ public default void aDefaultMethod() {}
+
+ /**
+ * Another default method.
+ */
+ public default void anotherDefaultMethod() {}
}
--- a/test/langtools/jdk/javadoc/doclet/testMethodTypes/pkg1/D.java Tue Dec 26 13:38:31 2017 +0530
+++ b/test/langtools/jdk/javadoc/doclet/testMethodTypes/pkg1/D.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, 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
@@ -46,6 +46,7 @@
/**
* This is the second concrete instance method.
+ * @return a string
*/
public String getParameter() {
return "test";
--- a/test/langtools/jdk/javadoc/doclet/testModules/TestModuleServices.java Tue Dec 26 13:38:31 2017 +0530
+++ b/test/langtools/jdk/javadoc/doclet/testModules/TestModuleServices.java Mon Jan 08 08:53:14 2018 -0800
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 8178067
+ * @bug 8178067 8192007
* @summary tests the module's services, such as provides and uses
* @modules jdk.javadoc/jdk.javadoc.internal.api
* jdk.javadoc/jdk.javadoc.internal.tool
@@ -34,6 +34,7 @@
* @run main TestModuleServices
*/
+import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
@@ -52,6 +53,106 @@
}
@Test
+ public void checkModuleServicesDescription(Path base) throws Exception {
+ Path src = Files.createDirectories(base.resolve("src"));
+ ModuleBuilder mb = new ModuleBuilder(tb, "moduleService")
+ .comment("This module exports a package containing the declaration of a service type.")
+ .exports("pkgService")
+ .classes("/**A Package that has a service.*/ package pkgService;")
+ .classes("package pkgService; /**A service Interface for service providers.*/ "
+ + "public interface Service {\n"
+ + " /**\n"
+ + " * A test method for the service.\n"
+ + " */\n"
+ + " void testMethod1();\n"
+ + " /**\n"
+ + " * Another test method for the service.\n"
+ + " */\n"
+ + " void testMethod2();\n"
+ + "}");
+ mb.write(src);
+ mb = new ModuleBuilder(tb, "moduleServiceProvider")
+ .comment("This module provides an implementation of a service.\n" +
+ "@provides pkgService.Service Provides a service whose name is ServiceProvider.")
+ .requires("moduleService")
+ .provides("pkgService.Service", "pkgServiceProvider.ServiceProvider")
+ .classes("/**A Package that has a service provider.*/ package pkgServiceProvider;")
+ .classes("package pkgServiceProvider;\n"
+ + "public class ServiceProvider implements pkgService.Service {\n"
+ + " /**\n"
+ + " * {@inheritDoc}\n"
+ + " */\n"
+ + " public void testMethod1() {}\n"
+ + " /**\n"
+ + " * This is an internal implementation so the documentation will not be seen.\n"
+ + " */\n"
+ + " public void testMethod2() {}\n"
+ + "}");
+ mb.write(src);
+ mb = new ModuleBuilder(tb, "moduleServiceUser")
+ .comment("This module uses a service defined in another module.\n"
+ + "@uses pkgService.Service If no other provider is found, a default internal implementation will be used.")
+ .requires("moduleService")
+ .uses("pkgService.Service")
+ .classes("/**A Package that has a service user.*/ package pkgServiceUser;")
+ .classes("package pkgServiceUser;\n"
+ + "/**\n"
+ + " * A service user class.\n"
+ + " */\n"
+ + "public class ServiceUser {\n"
+ + "}");
+ mb.write(src);
+ mb = new ModuleBuilder(tb, "moduleServiceUserNoDescription")
+ .comment("This is another module that uses a service defined in another module.\n"
+ + "@uses pkgService.Service")
+ .requires("moduleService")
+ .uses("pkgService.Service")
+ .classes("/**A Package that has a service user with no description.*/ package pkgServiceUserNoDescription;")
+ .classes("package pkgServiceUserNoDescription;\n"
+ + "/**\n"
+ + " * A service user class.\n"
+ + " */\n"
+ + "public class ServiceUserNoDescription {\n"
+ + "}");
+ mb.write(src);
+
+ javadoc("-d", base.resolve("out").toString(),
+ "-quiet", "-noindex",
+ "--module-source-path", src.toString(),
+ "--module", "moduleService,moduleServiceProvider,moduleServiceUser,moduleServiceUserNoDescription",
+ "pkgService", "moduleServiceProvider/pkgServiceProvider", "moduleServiceUser/pkgServiceUser",
+ "moduleServiceUserNoDescription/pkgServiceUserNoDescription");
+ checkExit(Exit.OK);
+
+ checkOutput("moduleServiceProvider-summary.html", true,
+ "<tr class=\"altColor\">\n"
+ + "<th class=\"colFirst\" scope=\"row\"><a href=\"pkgService/Service.html\" "
+ + "title=\"interface in pkgService\">Service</a></th>\n"
+ + "<td class=\"colLast\">\n"
+ + "<div class=\"block\">Provides a service whose name is ServiceProvider.</div>\n"
+ + "</td>\n"
+ + "</tr>");
+ checkOutput("moduleServiceUser-summary.html", true,
+ "<tr class=\"altColor\">\n"
+ + "<th class=\"colFirst\" scope=\"row\"><a href=\"pkgService/Service.html\" title=\"interface in pkgService\">Service</a></th>\n"
+ + "<td class=\"colLast\">\n"
+ + "<div class=\"block\">If no other provider is found, a default internal implementation will be used.</div>\n"
+ + "</td>\n"
+ + "</tr>");
+ checkOutput("moduleServiceUserNoDescription-summary.html", true,
+ "<tr class=\"altColor\">\n"
+ + "<th class=\"colFirst\" scope=\"row\"><a href=\"pkgService/Service.html\" title=\"interface in pkgService\">Service</a></th>\n"
+ + "<td class=\"colLast\">\n"
+ + "<div class=\"block\">A service Interface for service providers.</div>\n"
+ + "</td>\n"
+ + "</tr>");
+ checkOutput("moduleServiceProvider-summary.html", false,
+ "A service Interface for service providers.");
+ checkOutput("moduleServiceUser-summary.html", false,
+ "A service Interface for service providers.");
+ }
+
+ @Test
public void checkUsesNoApiTagModuleModeDefault(Path base) throws Exception {
ModuleBuilder mb = new ModuleBuilder(tb, "m")
.comment("module m.\n@provides p1.A abc") // bogus tag
@@ -251,7 +352,8 @@
"<tbody>\n" +
"<tr class=\"altColor\">\n" +
"<th class=\"colFirst\" scope=\"row\"><a href=\"p1/A.html\" title=\"interface in p1\">A</a></th>\n" +
- "<td class=\"colLast\">abc </td>\n" +
+ "<td class=\"colLast\">\n" +
+ "<div class=\"block\">abc</div>\n</td>\n" +
"</tr>\n" +
"</tbody>\n" +
"</table>\n");
@@ -292,7 +394,8 @@
"<tbody>\n" +
"<tr class=\"altColor\">\n" +
"<th class=\"colFirst\" scope=\"row\"><a href=\"p1/A.html\" title=\"interface in p1\">A</a></th>\n" +
- "<td class=\"colLast\">abc </td>\n" +
+ "<td class=\"colLast\">\n" +
+ "<div class=\"block\">abc</div>\n</td>\n" +
"</tr>\n" +
"</tbody>\n" +
"</table>",
@@ -305,7 +408,8 @@
"<tbody>\n" +
"<tr class=\"altColor\">\n" +
"<th class=\"colFirst\" scope=\"row\"><a href=\"p2/B.html\" title=\"class in p2\">B</a></th>\n" +
- "<td class=\"colLast\">def </td>\n" +
+ "<td class=\"colLast\">\n" +
+ "<div class=\"block\">def</div>\n</td>\n" +
"</tr>\n" +
"</tbody>\n" +
"</table>\n");
--- a/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java Tue Dec 26 13:38:31 2017 +0530
+++ b/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java Mon Jan 08 08:53:14 2018 -0800
@@ -26,7 +26,7 @@
* @bug 8154119 8154262 8156077 8157987 8154261 8154817 8135291 8155995 8162363
* 8168766 8168688 8162674 8160196 8175799 8174974 8176778 8177562 8175218
* 8175823 8166306 8178043 8181622 8183511 8169819 8074407 8183037 8191464
- 8164407
+ 8164407 8192007
* @summary Test modules support in javadoc.
* @author bpatel
* @library ../lib
@@ -764,7 +764,8 @@
+ "</a>",
"<tr class=\"altColor\">\n"
+ "<th class=\"colFirst\" scope=\"row\"><a href=\"testpkgmdlB/TestClassInModuleB.html\" title=\"class in testpkgmdlB\">TestClassInModuleB</a></th>\n"
- + "<td class=\"colLast\">With a test description for uses. </td>\n"
+ + "<td class=\"colLast\">\n"
+ + "<div class=\"block\">With a test description for uses.</div>\n</td>\n"
+ "</tr>",
"<caption><span>Opens</span><span class=\"tabEnd\"> </span></caption>\n"
+ "<tr>\n"
@@ -931,7 +932,8 @@
+ "<td class=\"colLast\"><a href=\"testpkgmdlB/package-summary.html\">testpkgmdlB</a></td>\n");
checkOutput("moduleB-summary.html", true,
"<th class=\"colFirst\" scope=\"row\"><a href=\"testpkgmdlB/TestClassInModuleB.html\" title=\"class in testpkgmdlB\">TestClassInModuleB</a></th>\n"
- + "<td class=\"colLast\">With a test description for uses. </td>");
+ + "<td class=\"colLast\">\n"
+ + "<div class=\"block\">With a test description for uses.</div>\n</td>\n");
checkOutput("moduletags-summary.html", true,
"<li><a href=\"#module.description\">Description</a> | <a href=\"#modules.summary\">Modules"
+ "</a> | <a href=\"#packages.summary\">Packages</a> | Services</li>",
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/jdk/javadoc/tool/EncodingTest.java Mon Jan 08 08:53:14 2018 -0800
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8188649
+ * @summary ensure javadoc -encoding is not ignored
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ * @modules jdk.compiler/com.sun.tools.javac.main
+ * @modules jdk.javadoc/jdk.javadoc.internal.api
+ * @modules jdk.javadoc/jdk.javadoc.internal.tool
+ * @library /tools/lib /tools/javadoc/lib
+ * @build toolbox.JavacTask toolbox.JavadocTask toolbox.TestRunner toolbox.ToolBox
+ * @run main EncodingTest
+ */
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import toolbox.JavadocTask;
+import toolbox.Task;
+import toolbox.TestRunner;
+import toolbox.ToolBox;
+
+public class EncodingTest extends TestRunner {
+ public static void main(String... args) throws Exception {
+ EncodingTest t = new EncodingTest();
+ t.runTests();
+ }
+
+ private final ToolBox tb = new ToolBox();
+ private final Path src = Paths.get("src");
+ private final Path api = Paths.get("api");
+
+ EncodingTest() throws Exception {
+ super(System.err);
+ init();
+ }
+
+ void init() throws IOException {
+ Files.createDirectories(src);
+ Files.write(src.resolve("C.java"),
+ "/** \u03b1\u03b2\u03b3 */ public class C { }".getBytes(StandardCharsets.UTF_8));
+ }
+
+ @Test
+ public void testEncoding() {
+ Task.Result result = new JavadocTask(tb, Task.Mode.EXEC)
+ .outdir(api)
+ .options("-J-Dfile.encoding=ASCII",
+ "-encoding", "UTF-8",
+ "-docencoding", "UTF-8")
+ .files(src.resolve("C.java"))
+ .run(Task.Expect.SUCCESS)
+ .writeAll();
+ }
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/doclint/LambdaTest.java Mon Jan 08 08:53:14 2018 -0800
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8194069
+ * @summary ignore declarations in lambda expressions
+ * @modules jdk.compiler/com.sun.tools.doclint
+ * @build DocLintTester
+ * @run main DocLintTester -Xmsgs:all SyntheticTest.java
+ */
+
+package acme;
+
+import java.util.Arrays;
+import java.util.Set;
+import java.util.function.Function;
+
+/**
+ * The class has docs.
+ */
+public final class LambdaTest
+{
+ /**
+ * The field itself has docs.
+ */
+ // Ensure no warning for lambda parameter, at 'string ->'
+ static final Function<String, String> someFunction = string -> {
+ // Ensure no warning for 'localVariable'
+ int localVariable = 3;
+ return Integer.toString(localVariable);
+ };
+}
+
--- a/test/langtools/tools/javac/6330997/T6330997.java Tue Dec 26 13:38:31 2017 +0530
+++ b/test/langtools/tools/javac/6330997/T6330997.java Mon Jan 08 08:53:14 2018 -0800
@@ -32,8 +32,8 @@
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.javac.util
* @clean T1 T2
- * @compile -source 10 -target 10 T1.java
- * @compile -source 10 -target 10 T2.java
+ * @compile -source 10 -target 11 T1.java
+ * @compile -source 10 -target 11 T2.java
* @run main/othervm T6330997
*/
--- a/test/langtools/tools/javac/BadCovar.out Tue Dec 26 13:38:31 2017 +0530
+++ b/test/langtools/tools/javac/BadCovar.out Mon Jan 08 08:53:14 2018 -0800
@@ -1,2 +1,2 @@
-BadCovar.java:22:10: compiler.err.types.incompatible.diff.ret: bad.covar.B, bad.covar.A, f()
+BadCovar.java:22:10: compiler.err.types.incompatible: bad.covar.B, bad.covar.A, (compiler.misc.incompatible.diff.ret: f, )
1 error
--- a/test/langtools/tools/javac/InconsistentInheritedSignature.out Tue Dec 26 13:38:31 2017 +0530
+++ b/test/langtools/tools/javac/InconsistentInheritedSignature.out Mon Jan 08 08:53:14 2018 -0800
@@ -1,2 +1,2 @@
-InconsistentInheritedSignature.java:17:1: compiler.err.types.incompatible.diff.ret: I2, I1, f()
+InconsistentInheritedSignature.java:17:1: compiler.err.types.incompatible: I2, I1, (compiler.misc.incompatible.diff.ret: f, )
1 error
--- a/test/langtools/tools/javac/NestedInnerClassNames.out Tue Dec 26 13:38:31 2017 +0530
+++ b/test/langtools/tools/javac/NestedInnerClassNames.out Mon Jan 08 08:53:14 2018 -0800
@@ -6,7 +6,7 @@
NestedInnerClassNames.java:59:9: compiler.err.already.defined: kindname.class, NestedInnerClassNames.foo$bar, kindname.class, NestedInnerClassNames
NestedInnerClassNames.java:76:13: compiler.err.already.defined: kindname.class, NestedInnerClassNames.$bar, kindname.class, NestedInnerClassNames
NestedInnerClassNames.java:90:13: compiler.err.already.defined: kindname.class, NestedInnerClassNames.bar$bar.bar, kindname.class, NestedInnerClassNames.bar$bar
-NestedInnerClassNames.java:109:5: compiler.err.duplicate.class: NestedInnerClassNames.foo.foo
+NestedInnerClassNames.java:109:5: compiler.err.same.binary.name: foo, foo$foo
NestedInnerClassNames.java:19:9: compiler.err.already.defined: kindname.class, NestedInnerClassNames, kindname.package, compiler.misc.unnamed.package
NestedInnerClassNames.java:28:13: compiler.err.already.defined: kindname.class, foo, kindname.method, m2()
NestedInnerClassNames.java:40:13: compiler.err.already.defined: kindname.class, NestedInnerClassNames, kindname.package, compiler.misc.unnamed.package
--- a/test/langtools/tools/javac/OverrideChecks/InconsistentReturn.out Tue Dec 26 13:38:31 2017 +0530
+++ b/test/langtools/tools/javac/OverrideChecks/InconsistentReturn.out Mon Jan 08 08:53:14 2018 -0800
@@ -1,2 +1,2 @@
-InconsistentReturn.java:17:1: compiler.err.types.incompatible.diff.ret: I2, I1, f()
+InconsistentReturn.java:17:1: compiler.err.types.incompatible: I2, I1, (compiler.misc.incompatible.diff.ret: f, )
1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/T6356530/SerializableAbstractClassTest.java Mon Jan 08 08:53:14 2018 -0800
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 6356530 8191637
+ * @summary -Xlint:serial does not flag abstract classes with persisent fields
+ * @compile/fail/ref=SerializableAbstractClassTest.out -XDrawDiagnostics -Werror -Xlint:serial SerializableAbstractClassTest.java
+ */
+
+abstract class SerializableAbstractClassTest implements java.io.Serializable {
+ // no serialVersionUID; error
+ abstract void m2();
+
+ static abstract class AWithUID implements java.io.Serializable {
+ private static final long serialVersionUID = 0;
+ void m(){}
+ }
+
+ interface I extends java.io.Serializable {
+ // no need for serialVersionUID
+ }
+
+ interface IDefault extends java.io.Serializable {
+ // no need for serialVersionUID
+ default int m() { return 1; }
+ }
+
+ interface IUID extends java.io.Serializable {
+ // no need for serialVersionUID, but not wrong
+ static final long serialVersionUID = 0;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/T6356530/SerializableAbstractClassTest.out Mon Jan 08 08:53:14 2018 -0800
@@ -0,0 +1,4 @@
+SerializableAbstractClassTest.java:31:10: compiler.warn.missing.SVUID: SerializableAbstractClassTest
+- compiler.err.warnings.and.werror
+1 error
+1 warning
--- a/test/langtools/tools/javac/T6356530/SerializableAbstractClassWithNonAbstractMethodsTest.java Tue Dec 26 13:38:31 2017 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 6356530
- * @summary -Xlint:serial does not flag abstract classes with concrete methods/members
- * @compile/fail/ref=SerializableAbstractClassWithNonAbstractMethodsTest.out -XDrawDiagnostics -Werror -Xlint:serial SerializableAbstractClassWithNonAbstractMethodsTest.java
- */
-
-abstract class SerializableAbstractClassWithNonAbstractMethodsTest implements java.io.Serializable {
- void m1() {}
- abstract void m2();
-
- abstract class AWithUID implements java.io.Serializable {
- private static final long serialVersionUID = 0;
- void m(){}
- }
-
- interface IDefault extends java.io.Serializable {
- default int m() { return 1; }
- }
-
- interface IDefaultAndUID extends java.io.Serializable {
- static final long serialVersionUID = 0;
- default int m() { return 1; }
- }
-}
--- a/test/langtools/tools/javac/T6356530/SerializableAbstractClassWithNonAbstractMethodsTest.out Tue Dec 26 13:38:31 2017 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-SerializableAbstractClassWithNonAbstractMethodsTest.java:40:5: compiler.warn.missing.SVUID: SerializableAbstractClassWithNonAbstractMethodsTest.IDefault
-SerializableAbstractClassWithNonAbstractMethodsTest.java:31:10: compiler.warn.missing.SVUID: SerializableAbstractClassWithNonAbstractMethodsTest
-- compiler.err.warnings.and.werror
-1 error
-2 warnings
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/T8187487/CrashWithDuplicateClassNamesTest.java Mon Jan 08 08:53:14 2018 -0800
@@ -0,0 +1,20 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8187487
+ * @summary crash with duplicate class name
+ * @compile/fail/ref=CrashWithDuplicateClassNamesTest.out -XDrawDiagnostics CrashWithDuplicateClassNamesTest.java
+ */
+
+class CrashWithDuplicateClassNamesTest {
+ static class C1$C2 {}
+
+ static class C1 {
+ static class C2 {}
+ }
+
+ static class C3 {
+ static class C4 {}
+ }
+
+ static class C3$C4 {}
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/T8187487/CrashWithDuplicateClassNamesTest.out Mon Jan 08 08:53:14 2018 -0800
@@ -0,0 +1,3 @@
+CrashWithDuplicateClassNamesTest.java:12:16: compiler.err.same.binary.name: C1$C2, C2
+CrashWithDuplicateClassNamesTest.java:19:12: compiler.err.same.binary.name: C4, C3$C4
+2 errors
--- a/test/langtools/tools/javac/classfiles/ClassVersionChecker.java Tue Dec 26 13:38:31 2017 +0530
+++ b/test/langtools/tools/javac/classfiles/ClassVersionChecker.java Mon Jan 08 08:53:14 2018 -0800
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 7157626 8001112 8188870
+ * @bug 7157626 8001112 8188870 8173382
* @summary Test major version for all legal combinations for -source and -target
* @author sgoel
*
@@ -38,7 +38,7 @@
public class ClassVersionChecker {
int errors;
- String[] jdk = {"", "1.6", "1.7", "1.8", "1.9", "1.10"};
+ String[] jdk = {"", "1.6", "1.7", "1.8", "1.9", "1.10", "11"};
File javaFile = null;
public static void main(String[] args) throws Throwable {
@@ -58,11 +58,12 @@
* -1 => invalid combinations
*/
int[][] ver =
- {{54, -1, -1, -1, -1, -1},
- {54, 50, 51, 52, 53, 54},
- {54, -1, 51, 52, 53, 54},
- {54, -1, -1, 52, 53, 54},
- {54, -1, -1, -1, 53, 54}};
+ {{55, -1, -1, -1, -1, -1, -1},
+ {55, 50, 51, 52, 53, 54, 55},
+ {55, -1, 51, 52, 53, 54, 55},
+ {55, -1, -1, 52, 53, 54, 55},
+ {55, -1, -1, -1, 53, 54, 55},
+ {55, -1, -1, -1, -1, 54, 55}};
// Loop to run all possible combinations of source/target values
for (int i = 0; i< ver.length; i++) {
--- a/test/langtools/tools/javac/defaultMethods/Neg01.out Tue Dec 26 13:38:31 2017 +0530
+++ b/test/langtools/tools/javac/defaultMethods/Neg01.out Mon Jan 08 08:53:14 2018 -0800
@@ -1,2 +1,2 @@
-Neg01.java:14:12: compiler.err.types.incompatible.unrelated.defaults: kindname.class, Neg01.AB, m, , Neg01.IA, Neg01.IB
+Neg01.java:14:12: compiler.err.types.incompatible: Neg01.IA, Neg01.IB, (compiler.misc.incompatible.unrelated.defaults: kindname.class, Neg01.AB, m, , Neg01.IA, Neg01.IB)
1 error
--- a/test/langtools/tools/javac/defaultMethods/Neg02.out Tue Dec 26 13:38:31 2017 +0530
+++ b/test/langtools/tools/javac/defaultMethods/Neg02.out Mon Jan 08 08:53:14 2018 -0800
@@ -1,2 +1,2 @@
-Neg02.java:16:13: compiler.err.types.incompatible.unrelated.defaults: kindname.class, Neg02.X, m, , Neg02.A, Neg02.B
+Neg02.java:16:13: compiler.err.types.incompatible: Neg02.A, Neg02.B, (compiler.misc.incompatible.unrelated.defaults: kindname.class, Neg02.X, m, , Neg02.A, Neg02.B)
1 error
--- a/test/langtools/tools/javac/defaultMethods/Neg14.out Tue Dec 26 13:38:31 2017 +0530
+++ b/test/langtools/tools/javac/defaultMethods/Neg14.out Mon Jan 08 08:53:14 2018 -0800
@@ -1,2 +1,2 @@
-Neg14.java:10:14: compiler.err.types.incompatible.abstract.default: kindname.class, Neg14.AB, m, , Neg14.IB, Neg14.IA
+Neg14.java:10:14: compiler.err.types.incompatible: Neg14.IB, Neg14.IA, (compiler.misc.incompatible.abstract.default: kindname.class, Neg14.AB, m, , Neg14.IB, Neg14.IA)
1 error
--- a/test/langtools/tools/javac/diags/examples.not-yet.txt Tue Dec 26 13:38:31 2017 +0530
+++ b/test/langtools/tools/javac/diags/examples.not-yet.txt Mon Jan 08 08:53:14 2018 -0800
@@ -52,6 +52,7 @@
compiler.misc.bad.enclosing.method # bad class file
compiler.misc.bad.runtime.invisible.param.annotations # bad class file
compiler.misc.bad.signature # bad class file
+compiler.misc.bad.requires.flag # bad class file
compiler.misc.bad.type.annotation.value
compiler.misc.base.membership # UNUSED
compiler.misc.class.file.not.found # ClassReader
--- a/test/langtools/tools/javac/diags/examples/IncompatibleDescsInFunctionalIntf.java Tue Dec 26 13:38:31 2017 +0530
+++ b/test/langtools/tools/javac/diags/examples/IncompatibleDescsInFunctionalIntf.java Mon Jan 08 08:53:14 2018 -0800
@@ -21,7 +21,8 @@
* questions.
*/
-// key: compiler.err.types.incompatible.diff.ret
+// key: compiler.err.types.incompatible
+// key: compiler.misc.incompatible.diff.ret
// key: compiler.err.prob.found.req
// key: compiler.misc.incompatible.descs.in.functional.intf
// key: compiler.misc.descriptor
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/diags/examples/ModifierNotAllowed/module-info.java Mon Jan 08 08:53:14 2018 -0800
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+// key: compiler.err.modifier.not.allowed.here
+
+module m {
+ requires transitive java.base;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/diags/examples/SameBinaryName.java Mon Jan 08 08:53:14 2018 -0800
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+// key: compiler.err.same.binary.name
+
+class SameBinaryName {
+ private static final class Foo$Bar {}
+
+ private static final class Foo {
+ private static final class Bar {}
+ }
+}
--- a/test/langtools/tools/javac/diags/examples/TypesIncompatible.java Tue Dec 26 13:38:31 2017 +0530
+++ b/test/langtools/tools/javac/diags/examples/TypesIncompatible.java Mon Jan 08 08:53:14 2018 -0800
@@ -21,7 +21,8 @@
* questions.
*/
-// key: compiler.err.types.incompatible.diff.ret
+// key: compiler.err.types.incompatible
+// key: compiler.misc.incompatible.diff.ret
interface A {
int m();
--- a/test/langtools/tools/javac/diags/examples/TypesIncompatibleAbstractDefault.java Tue Dec 26 13:38:31 2017 +0530
+++ b/test/langtools/tools/javac/diags/examples/TypesIncompatibleAbstractDefault.java Mon Jan 08 08:53:14 2018 -0800
@@ -21,7 +21,8 @@
* questions.
*/
-// key: compiler.err.types.incompatible.abstract.default
+// key: compiler.err.types.incompatible
+// key: compiler.misc.incompatible.abstract.default
class TypesIncompatibleAbstractDefault {
interface A {
--- a/test/langtools/tools/javac/diags/examples/TypesIncompatibleUnrelatedDefaults.java Tue Dec 26 13:38:31 2017 +0530
+++ b/test/langtools/tools/javac/diags/examples/TypesIncompatibleUnrelatedDefaults.java Mon Jan 08 08:53:14 2018 -0800
@@ -21,7 +21,8 @@
* questions.
*/
-// key: compiler.err.types.incompatible.unrelated.defaults
+// key: compiler.err.types.incompatible
+// key: compiler.misc.incompatible.unrelated.defaults
class TypesIncompatibleUnrelatedDefaults {
interface A {
--- a/test/langtools/tools/javac/generics/6294779/T6294779c.out Tue Dec 26 13:38:31 2017 +0530
+++ b/test/langtools/tools/javac/generics/6294779/T6294779c.out Mon Jan 08 08:53:14 2018 -0800
@@ -1,2 +1,2 @@
-T6294779c.java:29:5: compiler.err.types.incompatible.diff.ret: T6294779c.I2, T6294779c.I1, get()
+T6294779c.java:29:5: compiler.err.types.incompatible: T6294779c.I2, T6294779c.I1, (compiler.misc.incompatible.diff.ret: get, )
1 error
--- a/test/langtools/tools/javac/generics/abstract/T4717181c.out Tue Dec 26 13:38:31 2017 +0530
+++ b/test/langtools/tools/javac/generics/abstract/T4717181c.out Mon Jan 08 08:53:14 2018 -0800
@@ -1,2 +1,2 @@
-T4717181c.java:15:21: compiler.err.types.incompatible.diff.ret: T4717181c.A<java.lang.Integer>, T4717181c.A<java.lang.Integer>, f(java.lang.Integer)
+T4717181c.java:15:21: compiler.err.types.incompatible: T4717181c.A<java.lang.Integer>, T4717181c.A<java.lang.Integer>, (compiler.misc.incompatible.diff.ret: f, java.lang.Integer)
1 error
--- a/test/langtools/tools/javac/generics/rawOverride/7157798/Test3.out Tue Dec 26 13:38:31 2017 +0530
+++ b/test/langtools/tools/javac/generics/rawOverride/7157798/Test3.out Mon Jan 08 08:53:14 2018 -0800
@@ -1,6 +1,6 @@
-Test3.java:14:1: compiler.err.types.incompatible.diff.ret: B, A, m()
-Test3.java:19:1: compiler.err.types.incompatible.diff.ret: D, C, m()
-Test3.java:27:1: compiler.err.types.incompatible.diff.ret: E<T>, B, m()
-Test3.java:33:1: compiler.err.types.incompatible.diff.ret: F<V>, E<U>, m()
-Test3.java:37:1: compiler.err.types.incompatible.diff.ret: F<V>, E<U>, m()
+Test3.java:14:1: compiler.err.types.incompatible: B, A, (compiler.misc.incompatible.diff.ret: m, )
+Test3.java:19:1: compiler.err.types.incompatible: D, C, (compiler.misc.incompatible.diff.ret: m, )
+Test3.java:27:1: compiler.err.types.incompatible: E<T>, B, (compiler.misc.incompatible.diff.ret: m, )
+Test3.java:33:1: compiler.err.types.incompatible: F<V>, E<U>, (compiler.misc.incompatible.diff.ret: m, )
+Test3.java:37:1: compiler.err.types.incompatible: F<V>, E<U>, (compiler.misc.incompatible.diff.ret: m, )
5 errors
--- a/test/langtools/tools/javac/generics/typevars/4856983/T4856983a.out Tue Dec 26 13:38:31 2017 +0530
+++ b/test/langtools/tools/javac/generics/typevars/4856983/T4856983a.out Mon Jan 08 08:53:14 2018 -0800
@@ -1,2 +1,2 @@
-T4856983a.java:13:6: compiler.err.types.incompatible.diff.ret: I2, I1, m()
+T4856983a.java:13:6: compiler.err.types.incompatible: I2, I1, (compiler.misc.incompatible.diff.ret: m, )
1 error
--- a/test/langtools/tools/javac/generics/typevars/4856983/T4856983b.out Tue Dec 26 13:38:31 2017 +0530
+++ b/test/langtools/tools/javac/generics/typevars/4856983/T4856983b.out Mon Jan 08 08:53:14 2018 -0800
@@ -1,2 +1,2 @@
-T4856983b.java:12:24: compiler.err.types.incompatible.diff.ret: I2, I1, m()
+T4856983b.java:12:24: compiler.err.types.incompatible: I2, I1, (compiler.misc.incompatible.diff.ret: m, )
1 error
--- a/test/langtools/tools/javac/generics/typevars/6199146/T6199146.out Tue Dec 26 13:38:31 2017 +0530
+++ b/test/langtools/tools/javac/generics/typevars/6199146/T6199146.out Mon Jan 08 08:53:14 2018 -0800
@@ -1,2 +1,2 @@
-T6199146.java:9:25: compiler.err.types.incompatible.diff.ret: T6199146.I2, T6199146.I1, getFoo()
+T6199146.java:9:25: compiler.err.types.incompatible: T6199146.I2, T6199146.I1, (compiler.misc.incompatible.diff.ret: getFoo, )
1 error
--- a/test/langtools/tools/javac/generics/wildcards/7034495/T7034495.out Tue Dec 26 13:38:31 2017 +0530
+++ b/test/langtools/tools/javac/generics/wildcards/7034495/T7034495.out Mon Jan 08 08:53:14 2018 -0800
@@ -1,2 +1,2 @@
-T7034495.java:40:17: compiler.err.types.incompatible.diff.ret: T7034495.B<compiler.misc.type.captureof: 1, ?>, T7034495.A<compiler.misc.type.captureof: 2, ?>, foo()
+T7034495.java:40:17: compiler.err.types.incompatible: T7034495.B<compiler.misc.type.captureof: 1, ?>, T7034495.A<compiler.misc.type.captureof: 2, ?>, (compiler.misc.incompatible.diff.ret: foo, )
1 error
--- a/test/langtools/tools/javac/lambda/BadConv04.out Tue Dec 26 13:38:31 2017 +0530
+++ b/test/langtools/tools/javac/lambda/BadConv04.out Mon Jan 08 08:53:14 2018 -0800
@@ -1,3 +1,3 @@
-BadConv04.java:19:5: compiler.err.types.incompatible.diff.ret: BadConv04.I2, BadConv04.I1, m()
+BadConv04.java:19:5: compiler.err.types.incompatible: BadConv04.I2, BadConv04.I1, (compiler.misc.incompatible.diff.ret: m, )
BadConv04.java:21:13: compiler.err.prob.found.req: (compiler.misc.incompatible.descs.in.functional.intf: kindname.interface, BadConv04.SAM,{(compiler.misc.descriptor: m, , long, ),(compiler.misc.descriptor: m, , int, )})
2 errors
--- a/test/langtools/tools/javac/lambda/bridge/template_tests/BridgeMethodsTemplateTest.java Tue Dec 26 13:38:31 2017 +0530
+++ b/test/langtools/tools/javac/lambda/bridge/template_tests/BridgeMethodsTemplateTest.java Mon Jan 08 08:53:14 2018 -0800
@@ -1001,18 +1001,18 @@
public void testA5() throws IOException, ReflectiveOperationException {
compileSpec("C(A(Id0),Jd0)",
- "compiler.err.types.incompatible.unrelated.defaults");
+ "compiler.err.types.incompatible");
}
public void testA6() throws IOException, ReflectiveOperationException {
compileSpec("C(A(Ia0,Jd0))",
"compiler.err.does.not.override.abstract",
- "compiler.err.types.incompatible.abstract.default");
+ "compiler.err.types.incompatible");
}
public void testA7() throws IOException, ReflectiveOperationException {
compileSpec("C(A(Id0,Jd0))",
- "compiler.err.types.incompatible.unrelated.defaults");
+ "compiler.err.types.incompatible");
}
public void testA8() throws IOException, ReflectiveOperationException {
--- a/test/langtools/tools/javac/lambda/funcInterfaces/NonSAM2.out Tue Dec 26 13:38:31 2017 +0530
+++ b/test/langtools/tools/javac/lambda/funcInterfaces/NonSAM2.out Mon Jan 08 08:53:14 2018 -0800
@@ -1,4 +1,4 @@
-NonSAM2.java:13:1: compiler.err.types.incompatible.diff.ret: Bar1, Foo1, getAge(java.lang.String)
+NonSAM2.java:13:1: compiler.err.types.incompatible: Bar1, Foo1, (compiler.misc.incompatible.diff.ret: getAge, java.lang.String)
NonSAM2.java:15:1: compiler.err.name.clash.same.erasure.no.override: getOldest, java.util.List<?>, C, getOldest, java.util.List<java.lang.Number>, A
NonSAM2.java:17:1: compiler.err.name.clash.same.erasure.no.override: getOldest, java.util.List<java.lang.Integer>, D, getOldest, java.util.List<java.lang.Number>, A
NonSAM2.java:21:1: compiler.err.name.clash.same.erasure.no.override: m, T2, Bar2, m, T1, Foo2
--- a/test/langtools/tools/javac/miranda/4711056/T1.out Tue Dec 26 13:38:31 2017 +0530
+++ b/test/langtools/tools/javac/miranda/4711056/T1.out Mon Jan 08 08:53:14 2018 -0800
@@ -1,2 +1,2 @@
-T4.java:3:10: compiler.err.types.incompatible.diff.ret: iclss01004_2, iclss01004_1, foo(int)
+T4.java:3:10: compiler.err.types.incompatible: iclss01004_2, iclss01004_1, (compiler.misc.incompatible.diff.ret: foo, int)
1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/modules/JavaBaseTest.java Mon Jan 08 08:53:14 2018 -0800
@@ -0,0 +1,257 @@
+/*
+ * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8193125
+ * @summary test modifiers with java.base
+ * @library /tools/lib
+ * @modules
+ * jdk.compiler/com.sun.tools.javac.api
+ * jdk.compiler/com.sun.tools.javac.main
+ * jdk.jdeps/com.sun.tools.classfile
+ * @build toolbox.ToolBox toolbox.JavacTask
+ * @run main JavaBaseTest
+ */
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.sun.tools.classfile.Attribute;
+import com.sun.tools.classfile.Attributes;
+import com.sun.tools.classfile.ClassFile;
+import com.sun.tools.classfile.ClassWriter;
+import com.sun.tools.classfile.Module_attribute;
+
+import toolbox.JavacTask;
+import toolbox.Task;
+import toolbox.Task.Expect;
+import toolbox.ToolBox;
+
+public class JavaBaseTest {
+
+ public static void main(String... args) throws Exception {
+ JavaBaseTest t = new JavaBaseTest();
+ t.run();
+ }
+
+ final List<List<String>> modifiers = List.of(
+ List.of("static"),
+ List.of("transitive"),
+ List.of("static", "transitive")
+ );
+
+ final String specVersion = System.getProperty("java.specification.version");
+ final List<String> targets = specVersion.equals("10")
+ ? List.of("9", "10")
+ : List.of("9", "10", specVersion);
+
+ enum Mode { SOURCE, CLASS };
+
+ ToolBox tb = new ToolBox();
+ int testCount = 0;
+ int errorCount = 0;
+
+ void run() throws Exception {
+ for (List<String> mods : modifiers) {
+ for (String target : targets) {
+ for (Mode mode : Mode.values()) {
+ test(mods, target, mode);
+ }
+ }
+ }
+
+ System.err.println(testCount + " tests");
+ if (errorCount > 0) {
+ throw new Exception(errorCount + " errors found");
+ }
+ }
+
+ void test(List<String> mods, String target, Mode mode) {
+ System.err.println("Test " + mods + " " + target + " " + mode);
+ testCount++;
+ try {
+ Path base = Paths.get(String.join("-", mods))
+ .resolve(target).resolve(mode.name().toLowerCase());
+ Files.createDirectories(base);
+ switch (mode) {
+ case SOURCE:
+ testSource(base, mods, target);
+ break;
+ case CLASS:
+ testClass(base, mods, target);
+ break;
+ }
+ } catch (Exception e) {
+ error("Exception: " + e);
+ e.printStackTrace();
+ }
+ System.err.println();
+ }
+
+ void testSource(Path base, List<String> mods, String target) throws Exception {
+ Path src = base.resolve("src");
+ tb.writeJavaFiles(src,
+ "module m { requires " + String.join(" ", mods) + " java.base; }");
+ Path modules = Files.createDirectories(base.resolve("modules"));
+ boolean expectOK = target.equals("9");
+
+ String log = new JavacTask(tb)
+ .outdir(modules)
+ .options("-XDrawDiagnostics", "--release", target)
+ .files(tb.findJavaFiles(src))
+ .run(expectOK ? Task.Expect.SUCCESS : Task.Expect.FAIL)
+ .writeAll()
+ .getOutput(Task.OutputKind.DIRECT);
+
+ if (!expectOK) {
+ boolean foundErrorMessage = false;
+ for (String mod : mods) {
+ String key = mod.equals("static")
+ ? "compiler.err.mod.not.allowed.here"
+ : "compiler.err.modifier.not.allowed.here";
+ String message = "module-info.java:1:12: " + key + ": " + mod;
+ if (log.contains(message)) {
+ foundErrorMessage = true;
+ }
+ }
+ if (!foundErrorMessage) {
+ throw new Exception("expected error message not found");
+ }
+ }
+ }
+
+ void testClass(Path base, List<String> mods, String target) throws Exception {
+ createClass(base, mods, target);
+
+ Path src = base.resolve("src");
+ tb.writeJavaFiles(src,
+ "module mx { requires m; }");
+ Path modules = Files.createDirectories(base.resolve("modules"));
+
+ boolean expectOK = target.equals("9");
+ String log = new JavacTask(tb)
+ .outdir(modules)
+ .options("-XDrawDiagnostics",
+ "--module-path", base.resolve("test-modules").toString())
+ .files(tb.findJavaFiles(src))
+ .run(expectOK ? Task.Expect.SUCCESS : Task.Expect.FAIL)
+ .writeAll()
+ .getOutput(Task.OutputKind.DIRECT);
+
+ if (!expectOK) {
+ boolean foundErrorMessage = false;
+ for (String mod : mods) {
+ String flag = mod.equals("static")
+ ? "ACC_STATIC_PHASE (0x0040)"
+ : "ACC_TRANSITIVE (0x0020)";
+ String message = "- compiler.err.cant.access: m.module-info,"
+ + " (compiler.misc.bad.class.file.header: module-info.class,"
+ + " (compiler.misc.bad.requires.flag: " + flag + ")";
+ if (log.contains(message)) {
+ foundErrorMessage = true;
+ }
+ }
+ if (!foundErrorMessage) {
+ throw new Exception("expected error message not found");
+ }
+ }
+ }
+
+ void createClass(Path base, List<String> mods, String target) throws Exception {
+ Path src1 = base.resolve("interim-src");
+ tb.writeJavaFiles(src1,
+ "module m { requires java.base; }");
+ Path modules1 = Files.createDirectories(base.resolve("interim-modules"));
+
+ new JavacTask(tb)
+ .outdir(modules1)
+ .options("--release", target)
+ .files(tb.findJavaFiles(src1))
+ .run(Task.Expect.SUCCESS)
+ .writeAll();
+
+ ClassFile cf1 = ClassFile.read(modules1.resolve("module-info.class"));
+
+ Map<String,Attribute> attrMap = new LinkedHashMap<>(cf1.attributes.map);
+ Module_attribute modAttr1 = (Module_attribute) attrMap.get("Module");
+ Module_attribute.RequiresEntry[] requires =
+ new Module_attribute.RequiresEntry[modAttr1.requires_count];
+ for (int i = 0; i < modAttr1.requires_count; i++) {
+ Module_attribute.RequiresEntry e1 = modAttr1.requires[i];
+ int flags = e1.requires_flags;
+ Module_attribute.RequiresEntry e2;
+ if (e1.getRequires(cf1.constant_pool).equals("java.base")) {
+ for (String mod : mods) {
+ switch (mod) {
+ case "static":
+ flags |= Module_attribute.ACC_STATIC_PHASE;
+ break;
+ case "transitive":
+ flags |= Module_attribute.ACC_TRANSITIVE;
+ break;
+ }
+ }
+ e2 = new Module_attribute.RequiresEntry(
+ e1.requires_index,
+ flags,
+ e1.requires_version_index);
+ } else {
+ e2 = e1;
+ }
+ requires[i] = e2;
+ }
+ Module_attribute modAttr2 = new Module_attribute(
+ modAttr1.attribute_name_index,
+ modAttr1.module_name,
+ modAttr1.module_flags,
+ modAttr1.module_version_index,
+ requires,
+ modAttr1.exports,
+ modAttr1.opens,
+ modAttr1.uses_index,
+ modAttr1.provides);
+ attrMap.put("Module", modAttr2);
+ Attributes attributes = new Attributes(attrMap);
+
+ ClassFile cf2 = new ClassFile(
+ cf1.magic, cf1.minor_version, cf1.major_version,
+ cf1.constant_pool, cf1.access_flags,
+ cf1.this_class, cf1.super_class, cf1.interfaces,
+ cf1.fields, cf1.methods, attributes);
+ Path modInfo = base.resolve("test-modules").resolve("module-info.class");
+ Files.createDirectories(modInfo.getParent());
+ new ClassWriter().write(cf2, modInfo.toFile());
+ }
+
+ private void error(String message) {
+ System.err.println("Error: " + message);
+ errorCount++;
+ }
+}
+
--- a/test/langtools/tools/javac/parser/T4910483.java Tue Dec 26 13:38:31 2017 +0530
+++ b/test/langtools/tools/javac/parser/T4910483.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2018, 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
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 4910483
+ * @bug 4910483 8183961
* @summary Javadoc renders the string ".*\\.pdf" as ".\*\.pdf"
* @modules jdk.compiler/com.sun.tools.javac.file
* jdk.compiler/com.sun.tools.javac.main
@@ -41,7 +41,12 @@
import javax.tools.JavaFileObject;
-/**Test comment abc*\\def*/
+// Test the original issue ("\\") as well as other appearances of '\',
+// including a vanilla Unicode escape (U+0021, '!'), and a sequence
+// which is not a Unicode escape
+
+/**Test comment abc*\\def\
+ *xyz\u0021\\u0021*/
public class T4910483 {
public static void main(String... args) {
JavaCompiler compiler = JavaCompiler.instance(new Context());
@@ -55,7 +60,7 @@
JCTree classDef = cu.getTypeDecls().head;
String commentText = cu.docComments.getCommentText(classDef);
- String expected = "Test comment abc*\\\\def"; // 4 '\' escapes to 2 in a string literal
+ String expected = "Test comment abc*\\\\def\\\nxyz!\\\\u0021"; // 4 '\' escapes to 2 in a string literal
if (!expected.equals(commentText)) {
throw new AssertionError("Incorrect comment text: [" + commentText + "], expected [" + expected + "]");
}
--- a/test/langtools/tools/javac/processing/model/util/printing/module-info.java Tue Dec 26 13:38:31 2017 +0530
+++ b/test/langtools/tools/javac/processing/model/util/printing/module-info.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,3 +1,26 @@
+/*
+ * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
/*
* @test
* @bug 8173609
@@ -10,7 +33,7 @@
*/
@Deprecated
module printing {
- requires static transitive java.base;
+ requires static transitive java.compiler;
exports p to m.m1, m.m2;
opens p to m.m1, m.m2;
uses p.P;
--- a/test/langtools/tools/javac/processing/model/util/printing/module-info.out Tue Dec 26 13:38:31 2017 +0530
+++ b/test/langtools/tools/javac/processing/model/util/printing/module-info.out Mon Jan 08 08:53:14 2018 -0800
@@ -19,7 +19,8 @@
*/
@java.lang.Deprecated
module printing {
- requires static transitive java.base;
+ requires java.base;
+ requires static transitive java.compiler;
exports p to m.m1, m.m2;
opens p to m.m1, m.m2;
uses p.P;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/processing/warnings/TypeAlreadyExists/A.java Mon Jan 08 08:53:14 2018 -0800
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2017, Google Inc. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+public class A {}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/processing/warnings/TypeAlreadyExists/B.java Mon Jan 08 08:53:14 2018 -0800
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2017, Google Inc. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+class B {
+ A a;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/processing/warnings/TypeAlreadyExists/TestProcTypeAlreadyExistsWarning.java Mon Jan 08 08:53:14 2018 -0800
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2017, Google Inc. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8193216
+ * @summary Filer should warn if processors redefine symbols from the classpath or sourcepath
+ * @library /tools/javac/lib
+ * @modules java.compiler
+ * jdk.compiler
+ * @build JavacTestingAbstractProcessor TestProcTypeAlreadyExistsWarning
+ * @compile A.java
+ * @compile/ref=warn.out -XDrawDiagnostics -Xlint:processing -processor TestProcTypeAlreadyExistsWarning B.java
+ */
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+
+import java.io.IOError;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Set;
+import javax.annotation.processing.RoundEnvironment;
+import javax.annotation.processing.SupportedAnnotationTypes;
+import javax.lang.model.element.TypeElement;
+
+@SupportedAnnotationTypes("*")
+public class TestProcTypeAlreadyExistsWarning extends JavacTestingAbstractProcessor {
+
+ int round = 0;
+
+ @Override
+ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
+ round++;
+
+ if (round == 1) {
+ try (OutputStream os =
+ processingEnv.getFiler().createSourceFile("A").openOutputStream()) {
+ os.write("class A {}".getBytes(UTF_8));
+ } catch (IOException e) {
+ throw new IOError(e);
+ }
+ }
+
+ return false;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/processing/warnings/TypeAlreadyExists/warn.out Mon Jan 08 08:53:14 2018 -0800
@@ -0,0 +1,2 @@
+- compiler.warn.proc.type.already.exists: A
+1 warning
--- a/test/langtools/tools/javac/versions/Versions.java Tue Dec 26 13:38:31 2017 +0530
+++ b/test/langtools/tools/javac/versions/Versions.java Mon Jan 08 08:53:14 2018 -0800
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 4981566 5028634 5094412 6304984 7025786 7025789 8001112 8028545 8000961 8030610 8028546 8188870 8173382
+ * @bug 4981566 5028634 5094412 6304984 7025786 7025789 8001112 8028545 8000961 8030610 8028546 8188870 8173382 8173382
* @summary Check interpretation of -target and -source options
* @modules java.compiler
* jdk.compiler
@@ -64,13 +64,13 @@
String TC = "";
System.out.println("Version.java: Starting");
- check("54.0");
- check("54.0", "-source 1.6");
- check("54.0", "-source 1.7");
- check("54.0", "-source 1.8");
- check("54.0", "-source 1.9");
- check("54.0", "-source 1.10");
- check("54.0", "-source 11");
+ check("55.0");
+ check("55.0", "-source 1.6");
+ check("55.0", "-source 1.7");
+ check("55.0", "-source 1.8");
+ check("55.0", "-source 1.9");
+ check("55.0", "-source 1.10");
+ check("55.0", "-source 11");
check_source_target(true, "50.0", "6", "6");
check_source_target(true, "51.0", "6", "7");
@@ -87,7 +87,12 @@
check_source_target(true, "54.0", "8", "10");
check_source_target(true, "54.0", "9", "10");
check_source_target(true, "54.0", "10", "10");
- check_source_target(false, "54.0", "11", "11");
+ check_source_target(false, "55.0", "6", "11");
+ check_source_target(false, "55.0", "7", "11");
+ check_source_target(false, "55.0", "8", "11");
+ check_source_target(false, "55.0", "9", "11");
+ check_source_target(false, "55.0", "10", "11");
+ check_source_target(false, "55.0", "11", "11");
checksrc16("-source 1.6");
checksrc16("-source 6");
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javadoc/EncodingTest.java Mon Jan 08 08:53:14 2018 -0800
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8188649
+ * @summary javadoc -encoding doesn't work when using the old doclet API
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ * @modules jdk.compiler/com.sun.tools.javac.main
+ * @modules jdk.javadoc/jdk.javadoc.internal.api
+ * @modules jdk.javadoc/jdk.javadoc.internal.tool
+ * @library /tools/lib /tools/javadoc/lib
+ * @build toolbox.JavacTask toolbox.JavadocTask toolbox.TestRunner toolbox.ToolBox ToyDoclet
+ * @run main EncodingTest
+ */
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import toolbox.JavadocTask;
+import toolbox.Task;
+import toolbox.TestRunner;
+import toolbox.ToolBox;
+
+public class EncodingTest extends TestRunner {
+ public static void main(String... args) throws Exception {
+ EncodingTest t = new EncodingTest();
+ t.runTests();
+ }
+
+ private final ToolBox tb = new ToolBox();
+ private final Path src = Paths.get("src");
+
+ EncodingTest() throws Exception {
+ super(System.err);
+ init();
+ }
+
+ void init() throws IOException {
+ Files.createDirectories(src);
+ Files.write(src.resolve("C.java"),
+ "/** \u03b1\u03b2\u03b3 */ public class C { }".getBytes(StandardCharsets.UTF_8));
+ }
+
+ @Test
+ public void testEncoding() {
+ Task.Result result = new JavadocTask(tb, Task.Mode.EXEC)
+ .options("-docletpath", System.getProperty("test.class.path"),
+ "-doclet", "ToyDoclet",
+ "-J-Dfile.encoding=ASCII",
+ "-encoding", "UTF-8")
+ .files(src.resolve("C.java"))
+ .run(Task.Expect.SUCCESS)
+ .writeAll();
+ }
+}
+
--- a/test/langtools/tools/jdeps/listdeps/ListModuleDeps.java Tue Dec 26 13:38:31 2017 +0530
+++ b/test/langtools/tools/jdeps/listdeps/ListModuleDeps.java Mon Jan 08 08:53:14 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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
@@ -88,6 +88,8 @@
public Object[][] jdkModules() {
return new Object[][]{
{"jdk.compiler", new String[]{
+ "java.base/jdk.internal.jmod",
+ "java.base/jdk.internal.misc",
"java.base/sun.reflect.annotation",
"java.compiler",
}
--- a/test/nashorn/TEST.ROOT Tue Dec 26 13:38:31 2017 +0530
+++ b/test/nashorn/TEST.ROOT Mon Jan 08 08:53:14 2018 -0800
@@ -8,7 +8,7 @@
groups=TEST.groups
# Minimum jtreg version
-requiredVersion=4.2 b08
+requiredVersion=4.2 b11
# Use new module options
useNewOptions=true
--- a/test/nashorn/script/basic/JDK-8011555.js.EXPECTED Tue Dec 26 13:38:31 2017 +0530
+++ b/test/nashorn/script/basic/JDK-8011555.js.EXPECTED Mon Jan 08 08:53:14 2018 -0800
@@ -1,1 +1,1 @@
-TypeError: function __noSuchMethod__() { [native code] } is not a constructor function
+ReferenceError: "X" is not defined
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/nashorn/script/basic/JDK-8193371.js Mon Jan 08 08:53:14 2018 -0800
@@ -0,0 +1,215 @@
+/*
+ * Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * JDK-8193371: Use Dynalink REMOVE operation in Nashorn
+ *
+ * @test
+ * @run
+ */
+
+// This test exercises new functionality enabled by the issue, namely removal of elements from Java lists and maps.
+
+var ArrayList = java.util.ArrayList;
+var HashMap = java.util.HashMap;
+var listOf = java.util.List.of;
+var mapOf = java.util.Map.of;
+
+// Remove from a list
+(function() {
+ var a = new ArrayList(listOf("foo", "bar", "baz"));
+ Assert.assertFalse(delete a.add);
+
+ // Delete actual element
+ Assert.assertTrue(delete a[1]);
+ Assert.assertEquals(a, listOf("foo", "baz"));
+
+ // Gracefully ignore silly indices
+ Assert.assertTrue(delete a[5]);
+ Assert.assertTrue(delete a[-1]);
+ Assert.assertTrue(delete a["whatever"]);
+ Assert.assertTrue(delete a.whatever);
+
+ // Gracefully ignore attempts at deleting methods and properties
+ Assert.assertFalse(delete a.add);
+ Assert.assertFalse(delete a.class);
+
+ Assert.assertEquals(a, listOf("foo", "baz"));
+
+ print("List passed.")
+})();
+
+// Remove from a list, strict
+(function() {
+ "use strict";
+
+ var a = new ArrayList(listOf("foo", "bar", "baz"));
+
+ // Delete actual element
+ Assert.assertTrue(delete a[1]);
+ Assert.assertEquals(a, listOf("foo", "baz"));
+
+ // Gracefully ignore silly indices
+ Assert.assertTrue(delete a[5]);
+ Assert.assertTrue(delete a[-1]);
+ Assert.assertTrue(delete a["whatever"]);
+ Assert.assertTrue(delete a.whatever);
+
+ // Fail deleting methods and properties
+ try { delete a.add; Assert.fail(); } catch (e) { Assert.assertTrue(e instanceof TypeError) }
+ try { delete a.class; Assert.fail(); } catch (e) { Assert.assertTrue(e instanceof TypeError) }
+
+ Assert.assertEquals(a, listOf("foo", "baz"));
+
+ print("Strict list passed.")
+})();
+
+// Remove from a map
+(function() {
+ var m = new HashMap(mapOf("a", 1, "b", 2, "c", 3));
+
+ // Delete actual elements
+ Assert.assertTrue(delete m.a);
+ Assert.assertEquals(m, mapOf("b", 2, "c", 3));
+ var key = "b"
+ Assert.assertTrue(delete m[key]);
+ Assert.assertEquals(m, mapOf("c", 3));
+
+ // Gracefully ignore silly indices
+ Assert.assertTrue(delete m.x);
+ Assert.assertTrue(delete m[5]);
+ Assert.assertTrue(delete m[-1]);
+ Assert.assertTrue(delete m["whatever"]);
+
+ // Gracefully ignore attempts at deleting methods and properties
+ Assert.assertFalse(delete m.put);
+ Assert.assertFalse(delete m.class);
+
+ Assert.assertEquals(m, mapOf("c", 3));
+ print("Map passed.")
+})();
+
+// Remove from a map, strict
+(function() {
+ "use strict";
+
+ var m = new HashMap(mapOf("a", 1, "b", 2, "c", 3));
+
+ // Delete actual elements
+ Assert.assertTrue(delete m.a);
+ Assert.assertEquals(m, mapOf("b", 2, "c", 3));
+ var key = "b"
+ Assert.assertTrue(delete m[key]);
+ Assert.assertEquals(m, mapOf("c", 3));
+
+ // Gracefully ignore silly indices
+ Assert.assertTrue(delete m.x);
+ Assert.assertTrue(delete m[5]);
+ Assert.assertTrue(delete m[-1]);
+ Assert.assertTrue(delete m["whatever"]);
+
+ // Fail deleting methods and properties
+ try { delete m.size; Assert.fail(); } catch (e) { Assert.assertTrue(e instanceof TypeError) }
+ try { delete m.class; Assert.fail(); } catch (e) { Assert.assertTrue(e instanceof TypeError) }
+
+ // Somewhat counterintuitive, but if we define an element of a map, we can
+ // delete it, however then the method surfaces, and we can't delete that.
+ m.size = 4
+ Assert.assertTrue(delete m.size)
+ try { delete m.size; Assert.fail(); } catch (e) { Assert.assertTrue(e instanceof TypeError) }
+
+ Assert.assertEquals(m, mapOf("c", 3));
+
+ print("Strict map passed.")
+})();
+
+// Remove from arrays and beans
+(function() {
+ var a = new (Java.type("int[]"))(2)
+ a[0] = 42
+ a[1] = 13
+
+ // Huh, Dynalink doesn't expose .clone() on Java arrays?
+ var c = new (Java.type("int[]"))(2)
+ c[0] = 42
+ c[1] = 13
+
+ // passes vacuously, but does nothing
+ Assert.assertTrue(delete a[0])
+ Assert.assertEquals(a, c);
+
+ var b = new java.util.BitSet()
+ b.set(2)
+ // does nothing
+ Assert.assertFalse(delete b.get)
+ // Method is still there and operational
+ Assert.assertTrue(b.get(2))
+
+ // passes vacuously for non-existant property
+ Assert.assertTrue(delete b.foo)
+
+ // statics
+ var Calendar = java.util.Calendar
+ Assert.assertFalse(delete Calendar.UNDECIMBER) // field
+ Assert.assertFalse(delete Calendar.availableLocales) // property
+ Assert.assertFalse(delete Calendar.getInstance) // method
+ Assert.assertTrue(delete Calendar.BLAH) // no such thing
+
+ print("Beans passed.")
+})();
+
+// Remove from arrays and beans, strict
+(function() {
+ "use strict";
+
+ var a = new (Java.type("int[]"))(2)
+ a[0] = 42
+ a[1] = 13
+
+ var c = new (Java.type("int[]"))(2)
+ c[0] = 42
+ c[1] = 13
+
+ // passes vacuously, but does nothing
+ Assert.assertTrue(delete a[0])
+ Assert.assertEquals(a, c);
+
+ var b = new java.util.BitSet()
+ b.set(2)
+ // fails to delete a method
+ try { delete b.get; Assert.fail(); } catch (e) { Assert.assertTrue(e instanceof TypeError) }
+ // Method is still there and operational
+ Assert.assertTrue(b.get(2))
+
+ // passes vacuously for non-existant property
+ Assert.assertTrue(delete b.foo)
+
+ // statics
+ var Calendar = java.util.Calendar
+ try { delete Calendar.UNDECIMBER; Assert.fail(); } catch (e) { Assert.assertTrue(e instanceof TypeError) }
+ try { delete Calendar.availableLocales; Assert.fail(); } catch (e) { Assert.assertTrue(e instanceof TypeError) }
+ try { delete Calendar.getInstance; Assert.fail(); } catch (e) { Assert.assertTrue(e instanceof TypeError) }
+ Assert.assertTrue(delete Calendar.BLAH) // no such thing
+
+ print("Strict beans passed.")
+})();
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/nashorn/script/basic/JDK-8193371.js.EXPECTED Mon Jan 08 08:53:14 2018 -0800
@@ -0,0 +1,6 @@
+List passed.
+Strict list passed.
+Map passed.
+Strict map passed.
+Beans passed.
+Strict beans passed.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/nashorn/script/basic/JDK-8193491.js Mon Jan 08 08:53:14 2018 -0800
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. 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.
+ */
+
+/**
+ * JDK-8193491 : JavaImporter fails to resolve method elements within functions, that contain too many statements
+ *
+ * @test
+ * @run
+ * @option -Dnashorn.compiler.splitter.threshold=200
+ * @fork
+ */
+
+var imports = new JavaImporter(java.lang, java.util, java.io);
+with (imports) {
+ function func() {
+ var m = new HashMap();
+ var f = new File(".");
+ var i = new Integer(2);
+ System.out.println(i);
+ System.out.println('a');
+ };
+ func();
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/nashorn/script/basic/JDK-8193491.js.EXPECTED Mon Jan 08 08:53:14 2018 -0800
@@ -0,0 +1,2 @@
+2
+a
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/nashorn/script/basic/JDK-8193508.js Mon Jan 08 08:53:14 2018 -0800
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * JDK-8193508: Expressions in split literals must never be optimistic
+ *
+ * @test
+ * @run
+ * @option -Dnashorn.compiler.splitter.threshold=100
+ * @fork
+ */
+
+function f() {
+ return 'a';
+}
+
+var o = {
+ a: f(),
+ b: 1,
+ c: 2,
+ d: 3,
+ e: 4,
+ f: 5,
+ g: f(),
+ h: 1,
+ i: 2,
+ j: 3,
+ k: 4,
+ l: 5,
+ m: f(),
+ n: 1,
+ o: 2,
+ p: 3,
+ q: 4,
+ r: 5,
+ s: f(),
+ t: 1,
+ u: 2,
+ v: 3,
+ w: 4,
+ x: 5,
+ y: f(),
+ z: 1,
+ A: 2,
+ B: 3,
+ C: 4,
+ D: 5,
+ E: f(),
+ F: 1,
+ G: 2,
+ H: 3,
+ I: 4,
+ J: 5,
+ K: f(),
+ L: 1,
+ M: 2,
+ N: 3,
+ O: 4,
+ P: 5,
+ Q: f(),
+ R: 1,
+ S: 2,
+ T: 3,
+ U: 4,
+ V: 5,
+ W: f(),
+ X: 1,
+ Y: 2,
+ Z: 3
+};
+
+Assert.assertTrue(o.a === 'a');
+
--- a/test/nashorn/script/nosecurity/JDK-8165198.js Tue Dec 26 13:38:31 2017 +0530
+++ b/test/nashorn/script/nosecurity/JDK-8165198.js Mon Jan 08 08:53:14 2018 -0800
@@ -30,8 +30,11 @@
var NashornScriptEngineFactory = Java.type("jdk.nashorn.api.scripting.NashornScriptEngineFactory");
var e = new NashornScriptEngineFactory().getScriptEngine("-ot=false");
-var output = e.eval("with(new JavaImporter(java.util)){x}");
-print(output);
+try {
+ e.eval("with(new JavaImporter(java.util)){x}");
+} catch (e) {
+ print(e);
+}
e.eval("with(new JavaImporter(java.util)){x=1}");
var output2 = e.eval("with(new JavaImporter(java.util)){x}");
print(output2);
--- a/test/nashorn/script/nosecurity/JDK-8165198.js.EXPECTED Tue Dec 26 13:38:31 2017 +0530
+++ b/test/nashorn/script/nosecurity/JDK-8165198.js.EXPECTED Mon Jan 08 08:53:14 2018 -0800
@@ -1,2 +1,2 @@
-null
+javax.script.ScriptException: ReferenceError: "x" is not defined in <eval> at line number 1
1
--- a/test/nashorn/script/trusted/classfilter_mozilla_compat.js.EXPECTED Tue Dec 26 13:38:31 2017 +0530
+++ b/test/nashorn/script/trusted/classfilter_mozilla_compat.js.EXPECTED Mon Jan 08 08:53:14 2018 -0800
@@ -1,12 +1,12 @@
class jdk.nashorn.javaadapters.javax_script_ScriptContext
-TypeError: Java.extend needs at least one type argument. in nashorn:mozilla_compat.js at line number 39
+TypeError: Java.extend needs at least one type argument. in nashorn:mozilla_compat.js at line number 41
class jdk.nashorn.javaadapters.java_util_ArrayList
class jdk.nashorn.javaadapters.java_util_ArrayList
[JavaClass java.lang.Integer]
-TypeError: [object JavaPackage] is not a Java class in nashorn:mozilla_compat.js at line number 373 at column number 16
+TypeError: [object JavaPackage] is not a Java class in nashorn:mozilla_compat.js at line number 375 at column number 16
[JavaClass java.util.HashSet]
[JavaClass java.util.HashSet]
[JavaClass java.lang.Integer]
-ReferenceError: "Integer" is not defined in nashorn:mozilla_compat.js at line number 67
+ReferenceError: "Integer" is not defined in nashorn:mozilla_compat.js at line number 69
[JavaClass java.util.HashMap]
[JavaClass java.util.HashMap]