diff --git a/.github/workflows/submit.yml b/.github/workflows/submit.yml index 9d19715a9862a7aed3803170feef90cd35ba527e..acf46c615ce6e9f392bc929f8a4260a3eefcee8e 100644 --- a/.github/workflows/submit.yml +++ b/.github/workflows/submit.yml @@ -341,6 +341,7 @@ jobs: run: > if ! grep --include=test-summary.txt -lqr build/*/test-results -e "TEST SUCCESS" ; then cat build/*/test-results/*/text/newfailures.txt ; + cat build/*/test-results/*/text/other_errors.txt ; exit 1 ; fi @@ -807,6 +808,7 @@ jobs: run: > if ! grep --include=test-summary.txt -lqr build/*/test-results -e "TEST SUCCESS" ; then cat build/*/test-results/*/text/newfailures.txt ; + cat build/*/test-results/*/text/other_errors.txt ; exit 1 ; fi @@ -1218,6 +1220,7 @@ jobs: run: > if ((Get-ChildItem -Path build\*\test-results\test-summary.txt -Recurse | Select-String -Pattern "TEST SUCCESS" ).Count -eq 0) { Get-Content -Path build\*\test-results\*\*\newfailures.txt ; + Get-Content -Path build\*\test-results\*\*\other_errors.txt ; exit 1 } @@ -1611,6 +1614,7 @@ jobs: run: > if ! grep --include=test-summary.txt -lqr build/*/test-results -e "TEST SUCCESS" ; then cat build/*/test-results/*/text/newfailures.txt ; + cat build/*/test-results/*/text/other_errors.txt ; exit 1 ; fi diff --git a/doc/building.html b/doc/building.html index 97c9b2a4bb693d81a2a523047d65fbca18088497..9cb1807345c905e42be6d1b7969d3b3b32e374d2 100644 --- a/doc/building.html +++ b/doc/building.html @@ -196,7 +196,7 @@

Windows

Windows XP is not a supported platform, but all newer Windows should be able to build the JDK.

On Windows, it is important that you pay attention to the instructions in the Special Considerations.

-

Windows is the only non-POSIX OS supported by the JDK, and as such, requires some extra care. A POSIX support layer is required to build on Windows. Currently, the only supported such layers are Cygwin and Windows Subsystem for Linux (WSL). (Msys is no longer supported due to a too old bash; msys2 would likely be possible to support in a future version but that would require effort to implement.)

+

Windows is the only non-POSIX OS supported by the JDK, and as such, requires some extra care. A POSIX support layer is required to build on Windows. Currently, the only supported such layers are Cygwin, Windows Subsystem for Linux (WSL), and MSYS2. (MSYS is no longer supported due to an outdated bash; While OpenJDK can be built with MSYS2, support for it is still experimental, so build failures and unusual errors are not uncommon.)

Internally in the build system, all paths are represented as Unix-style paths, e.g. /cygdrive/c/git/jdk/Makefile rather than C:\git\jdk\Makefile. This rule also applies to input to the build system, e.g. in arguments to configure. So, use --with-msvcr-dll=/cygdrive/c/msvcr100.dll rather than --with-msvcr-dll=c:\msvcr100.dll. For details on this conversion, see the section on Fixpath.

Cygwin

A functioning Cygwin environment is required for building the JDK on Windows. If you have a 64-bit OS, we strongly recommend using the 64-bit version of Cygwin.

@@ -298,7 +298,7 @@

It is advisable to keep an older version of Xcode for building the JDK when updating Xcode. This blog page has good suggestions on managing multiple Xcode versions. To use a specific version of Xcode, use xcode-select -s before running configure, or use --with-toolchain-path to point to the version of Xcode to use, e.g. configure --with-toolchain-path=/Applications/Xcode8.app/Contents/Developer/usr/bin

If you have recently (inadvertently) updated your OS and/or Xcode version, and the JDK can no longer be built, please see the section on Problems with the Build Environment, and Getting Help to find out if there are any recent, non-merged patches available for this update.

Microsoft Visual Studio

-

The minimum accepted version of Visual Studio is 2017. Older versions will not be accepted by configure and will not work. The maximum accepted version of Visual Studio is 2019.

+

For aarch64 machines running Windows the minimum accepted version is Visual Studio 2019 (16.8 or higher). For all other platforms the minimum accepted version of Visual Studio is 2017. Older versions will not be accepted by configure and will not work. For all platforms the maximum accepted version of Visual Studio is 2022.

If you have multiple versions of Visual Studio installed, configure will by default pick the latest. You can request a specific version to be used by setting --with-toolchain-version, e.g. --with-toolchain-version=2017.

If you have Visual Studio installed but configure fails to detect it, it may be because of spaces in path.

IBM XL C/C++

diff --git a/doc/building.md b/doc/building.md index 033f99d3f5a8bc92970864728030e6c372984b02..459dbaa4c410109f14246746a217a8a33027284b 100644 --- a/doc/building.md +++ b/doc/building.md @@ -179,10 +179,10 @@ On Windows, it is important that you pay attention to the instructions in the Windows is the only non-POSIX OS supported by the JDK, and as such, requires some extra care. A POSIX support layer is required to build on Windows. -Currently, the only supported such layers are Cygwin and Windows Subsystem for -Linux (WSL). (Msys is no longer supported due to a too old bash; msys2 would -likely be possible to support in a future version but that would require effort -to implement.) +Currently, the only supported such layers are Cygwin, Windows Subsystem for +Linux (WSL), and MSYS2. (MSYS is no longer supported due to an outdated bash; +While OpenJDK can be built with MSYS2, support for it is still experimental, so +build failures and unusual errors are not uncommon.) Internally in the build system, all paths are represented as Unix-style paths, e.g. `/cygdrive/c/git/jdk/Makefile` rather than `C:\git\jdk\Makefile`. This @@ -374,9 +374,10 @@ available for this update. ### Microsoft Visual Studio -The minimum accepted version of Visual Studio is 2017. Older versions will not -be accepted by `configure` and will not work. The maximum accepted -version of Visual Studio is 2019. +For aarch64 machines running Windows the minimum accepted version is Visual Studio 2019 +(16.8 or higher). For all other platforms the minimum accepted version of +Visual Studio is 2017. Older versions will not be accepted by `configure` and will +not work. For all platforms the maximum accepted version of Visual Studio is 2022. If you have multiple versions of Visual Studio installed, `configure` will by default pick the latest. You can request a specific version to be used by diff --git a/doc/hotspot-style.html b/doc/hotspot-style.html index fe72cbbdf80c1cca160571c8e4b9cd51e122c9f1..5e8f0e9e174a10af5c203e2c18c8ec1610d58254 100644 --- a/doc/hotspot-style.html +++ b/doc/hotspot-style.html @@ -195,7 +195,7 @@ while ( test_foo(args...) ) { // No, excess spaces around controlSimilar discussions for some other projects:

diff --git a/doc/hotspot-style.md b/doc/hotspot-style.md index 6d167cad9d6c20a2c7e6713aca40994de6da9a3f..57c0c38e2b013fab3d8d0e9e0209a6ab4ad9718f 100644 --- a/doc/hotspot-style.md +++ b/doc/hotspot-style.md @@ -409,7 +409,7 @@ Similar discussions for some other projects: * [Google C++ Style Guide](https://google.github.io/styleguide/cppguide.html) — Currently (2020) targeting C++17. -* [C++11 and C++14 use in Chromium](https://chromium.googlesource.com/chromium/src/+/main/styleguide/c++/c++11.md) — +* [C++11 and C++14 use in Chromium](https://chromium.googlesource.com/chromium/src/+/main/styleguide/c++/c++-features.md) — Categorizes features as allowed, banned, or to be discussed. * [llvm Coding Standards](https://llvm.org/docs/CodingStandards.html) — diff --git a/doc/ide.html b/doc/ide.html index 1730eb0bef5b5bb1e6d18aed43b61ee4155a5aaa..288a477e538f80f3c3f7c01cfcafa2e32b18b627 100644 --- a/doc/ide.html +++ b/doc/ide.html @@ -41,14 +41,20 @@ 
make vscode-project-clangd

Additional instructions for configuring the given indexer will be displayed after the workspace has been generated.

Visual Studio

-

This section is a work in progress.

-
make ide-project
+

The make system can generate a Visual Studio project for the Hotspot native source. After configuring, the project is generated using:

+
make hotspot-ide-project
+

This creates a file named jvm.vcxproj in ide\hotspot-visualstudio subfolder of the build output folder. The file can be opened in Visual Studio via File -> Open -> Project/Solution.

Compilation Database

The make system can generate generic native code indexing support in the form of a Compilation Database that can be used by many different IDEs and source code indexers.

make compile-commands

It's also possible to generate the Compilation Database for the HotSpot source code only, which is a bit faster as it includes less information.

make compile-commands-hotspot

IDE support for Java code

-

This section is a work in progress.

+

IntelliJ IDEA

+

The JDK project has a script that can be used for indexing the project with IntelliJ. After configuring and building the JDK, an IntelliJ workspace can be generated by running the following command in the top-level folder of the cloned repository:

+
bash bin/idea.sh
+

To use it, choose File -> Open... in IntelliJ and select the folder where you ran the above script.

+

Next, configure the project SDK in IntelliJ. Open File -> Project Structure -> Project and select build/<config>/images/jdk as the SDK to use.

+

In order to run the tests from the IDE, you can use the JTReg plugin. Instructions for building and using the plugin can be found here.

diff --git a/doc/ide.md b/doc/ide.md index 4a692efd22f03f9dd6f14eec95387002598c4d19..f0a419c948ba98683f00d43c890f07375a2debf9 100644 --- a/doc/ide.md +++ b/doc/ide.md @@ -45,12 +45,17 @@ after the workspace has been generated. #### Visual Studio -This section is a work in progress. +The make system can generate a Visual Studio project for the Hotspot +native source. After configuring, the project is generated using: ```shell -make ide-project +make hotspot-ide-project ``` +This creates a file named `jvm.vcxproj` in `ide\hotspot-visualstudio` +subfolder of the build output folder. The file can be opened in Visual Studio +via `File -> Open -> Project/Solution`. + #### Compilation Database The make system can generate generic native code indexing support in the form of @@ -70,4 +75,24 @@ make compile-commands-hotspot ### IDE support for Java code -This section is a work in progress. \ No newline at end of file +#### IntelliJ IDEA + +The JDK project has a script that can be used for indexing the project +with IntelliJ. After configuring and building the JDK, an IntelliJ workspace +can be generated by running the following command in the top-level folder +of the cloned repository: + +```shell +bash bin/idea.sh +``` + +To use it, choose `File -> Open...` in IntelliJ and select the folder where +you ran the above script. + +Next, configure the project SDK in IntelliJ. Open +`File -> Project Structure -> Project` and select `build//images/jdk` +as the SDK to use. + +In order to run the tests from the IDE, you can use the JTReg plugin. +Instructions for building and using the plugin can be found +[here](https://github.com/openjdk/jtreg/tree/master/plugins/idea). diff --git a/doc/testing.html b/doc/testing.html index f647af91934b90e51739309a1bc9fb1729d2b87c..213e23664c37c9afadfd3be808e8d5388a9d9a57 100644 --- a/doc/testing.html +++ b/doc/testing.html @@ -193,9 +193,9 @@ TEST FAILURE

AOT_MODULES

Generate AOT modules before testing for the specified module, or set of modules. If multiple modules are specified, they should be separated by space (or, to help avoid quoting issues, the special value %20).

RETRY_COUNT

-

Retry failed tests up to a set number of times. Defaults to 0.

+

Retry failed tests up to a set number of times, until they pass. This allows to pass the tests with intermittent failures. Defaults to 0.

REPEAT_COUNT

-

Repeat the tests for a set number of times. Defaults to 0.

+

Repeat the tests up to a set number of times, stopping at first failure. This helps to reproduce intermittent test failures. Defaults to 0.

Gtest keywords

REPEAT

The number of times to repeat the tests (--gtest_repeat).

diff --git a/doc/testing.md b/doc/testing.md index bba5ae0941c7a808d9677045ba8f4434ae6a0d02..3ab7079ea07f7a681354cafea7a593a67dbe0e06 100644 --- a/doc/testing.md +++ b/doc/testing.md @@ -419,11 +419,15 @@ modules. If multiple modules are specified, they should be separated by space #### RETRY_COUNT -Retry failed tests up to a set number of times. Defaults to 0. +Retry failed tests up to a set number of times, until they pass. +This allows to pass the tests with intermittent failures. +Defaults to 0. #### REPEAT_COUNT -Repeat the tests for a set number of times. Defaults to 0. +Repeat the tests up to a set number of times, stopping at first failure. +This helps to reproduce intermittent test failures. +Defaults to 0. ### Gtest keywords diff --git a/make/autoconf/basic.m4 b/make/autoconf/basic.m4 index e7fdab53050710b5ae499bab9fed5b720e6d62de..65558e83c7209feefbce5914b468a897044c3137 100644 --- a/make/autoconf/basic.m4 +++ b/make/autoconf/basic.m4 @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2022, 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 @@ -438,7 +438,9 @@ AC_DEFUN([BASIC_CHECK_DIR_ON_LOCAL_DISK], AC_DEFUN_ONCE([BASIC_CHECK_SRC_PERMS], [ if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then - file_to_test="$TOPDIR/LICENSE" + # The choice of file here is somewhat arbitrary, it just needs to be there + # in the source tree when configure runs + file_to_test="$TOPDIR/Makefile" if test `$STAT -c '%a' "$file_to_test"` -lt 400; then AC_MSG_ERROR([Bad file permissions on src files. This is usually caused by cloning the repositories with a non cygwin hg in a directory not created in cygwin.]) fi diff --git a/make/autoconf/basic_tools.m4 b/make/autoconf/basic_tools.m4 index c87c26fe10b75e45c243aa3e9266bb541ed1f768..9ce90303d452d5f9705d9e195b0f5e6d59fff808 100644 --- a/make/autoconf/basic_tools.m4 +++ b/make/autoconf/basic_tools.m4 @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2022, 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 @@ -356,9 +356,9 @@ AC_DEFUN_ONCE([BASIC_SETUP_COMPLEX_TOOLS], fi AC_SUBST(IS_GNU_TIME) - # Check if it's GNU date - AC_MSG_CHECKING([if date is the GNU version]) - check_date=`$DATE --version 2>&1 | $GREP GNU` + # Check if it's a GNU date compatible version + AC_MSG_CHECKING([if date is a GNU compatible version]) + check_date=`$DATE --version 2>&1 | $GREP "GNU\|BusyBox"` if test "x$check_date" != x; then AC_MSG_RESULT([yes]) IS_GNU_DATE=yes diff --git a/make/autoconf/help.m4 b/make/autoconf/help.m4 index f36aa2819dfcc943e80509ec32113bf14eb7908a..09e82e36c94cd3ba3e1391e3b3703ca3cacb445a 100644 --- a/make/autoconf/help.m4 +++ b/make/autoconf/help.m4 @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2022, 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,7 +25,7 @@ AC_DEFUN_ONCE([HELP_SETUP_DEPENDENCY_HELP], [ - UTIL_LOOKUP_PROGS(PKGHANDLER, zypper apt-get yum brew port pkgutil pkgadd pacman) + UTIL_LOOKUP_PROGS(PKGHANDLER, zypper apt-get yum brew port pkgutil pkgadd pacman apk) ]) AC_DEFUN([HELP_MSG_MISSING_DEPENDENCY], @@ -58,6 +58,8 @@ AC_DEFUN([HELP_MSG_MISSING_DEPENDENCY], zypper_help $MISSING_DEPENDENCY ;; *pacman) pacman_help $MISSING_DEPENDENCY ;; + *apk) + apk_help $MISSING_DEPENDENCY ;; esac if test "x$PKGHANDLER_COMMAND" != x; then @@ -192,6 +194,27 @@ pkgadd_help() { PKGHANDLER_COMMAND="" } +apk_help() { + case $1 in + devkit) + PKGHANDLER_COMMAND="sudo apk add alpine-sdk linux-headers" ;; + alsa) + PKGHANDLER_COMMAND="sudo apk add alsa-lib-dev" ;; + cups) + PKGHANDLER_COMMAND="sudo apk add cups-dev" ;; + fontconfig) + PKGHANDLER_COMMAND="sudo apk add fontconfig-dev" ;; + freetype) + PKGHANDLER_COMMAND="sudo apk add freetype-dev" ;; + harfbuzz) + PKGHANDLER_COMMAND="sudo apk add harfbuzz-dev" ;; + x11) + PKGHANDLER_COMMAND="sudo apk add libxtst-dev libxt-dev libxrender-dev libxrandr-dev" ;; + ccache) + PKGHANDLER_COMMAND="sudo apk add ccache" ;; + esac +} + # This function will check if we're called from the "configure" wrapper while # printing --help. If so, we will print out additional information that can # only be extracted within the autoconf script, and then exit. This must be diff --git a/make/autoconf/jdk-options.m4 b/make/autoconf/jdk-options.m4 index cc4a44d39c96a872117af81095983daffc25f5ca..0a7145c9116a4f4d90f1e9f354c7b78aef25a7b6 100644 --- a/make/autoconf/jdk-options.m4 +++ b/make/autoconf/jdk-options.m4 @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2022, 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 @@ -847,6 +847,7 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_HSDIS], AC_CHECK_LIB(opcodes, disassembler, [ HSDIS_LIBS="$HSDIS_LIBS -lopcodes" ], [ binutils_system_error="libopcodes not found" ]) AC_CHECK_LIB(iberty, xmalloc, [ HSDIS_LIBS="$HSDIS_LIBS -liberty" ], [ binutils_system_error="libiberty not found" ]) AC_CHECK_LIB(z, deflate, [ HSDIS_LIBS="$HSDIS_LIBS -lz" ], [ binutils_system_error="libz not found" ]) + HSDIS_CFLAGS="-DLIBARCH_$OPENJDK_TARGET_CPU_LEGACY_LIB" elif test "x$BINUTILS_DIR" != x; then if test -e $BINUTILS_DIR/bfd/libbfd.a && \ test -e $BINUTILS_DIR/opcodes/libopcodes.a && \ @@ -864,7 +865,7 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_HSDIS], AC_MSG_ERROR([binutils on system is supported for Linux only]) elif test "x$binutils_system_error" = x; then AC_MSG_RESULT([system]) - HSDIS_CFLAGS="-DSYSTEM_BINUTILS" + HSDIS_CFLAGS="$HSDIS_CFLAGS -DSYSTEM_BINUTILS" else AC_MSG_RESULT([invalid]) AC_MSG_ERROR([$binutils_system_error]) diff --git a/make/autoconf/jvm-features.m4 b/make/autoconf/jvm-features.m4 index 906a2857877216e7fdc80d406230105fbba07fe2..70457149edcb0fd053dd71f7d8c773ed44f12ce2 100644 --- a/make/autoconf/jvm-features.m4 +++ b/make/autoconf/jvm-features.m4 @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2022, 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 @@ -45,7 +45,7 @@ m4_define(jvm_features_valid, m4_normalize( \ ifdef([custom_jvm_features_valid], custom_jvm_features_valid) \ \ cds compiler1 compiler2 dtrace epsilongc g1gc jfr jni-check \ - jvmci jvmti link-time-opt management minimal nmt opt-size parallelgc \ + jvmci jvmti link-time-opt management minimal opt-size parallelgc \ serialgc services shenandoahgc static-build vm-structs zero zgc \ )) @@ -68,7 +68,6 @@ m4_define(jvm_feature_desc_jvmti, [enable Java Virtual Machine Tool Interface (J m4_define(jvm_feature_desc_link_time_opt, [enable link time optimization]) m4_define(jvm_feature_desc_management, [enable java.lang.management API support]) m4_define(jvm_feature_desc_minimal, [support building variant 'minimal']) -m4_define(jvm_feature_desc_nmt, [include native memory tracking (NMT)]) m4_define(jvm_feature_desc_opt_size, [optimize the JVM library for size]) m4_define(jvm_feature_desc_parallelgc, [include the parallel garbage collector]) m4_define(jvm_feature_desc_serialgc, [include the serial garbage collector]) @@ -443,7 +442,7 @@ AC_DEFUN([JVM_FEATURES_PREPARE_VARIANT], JVM_FEATURES_VARIANT_FILTER="compiler2 jvmci link-time-opt opt-size" elif test "x$variant" = "xminimal"; then JVM_FEATURES_VARIANT_FILTER="cds compiler2 dtrace epsilongc g1gc \ - jfr jni-check jvmci jvmti management nmt parallelgc services \ + jfr jni-check jvmci jvmti management parallelgc services \ shenandoahgc vm-structs zgc" if test "x$OPENJDK_TARGET_CPU" = xarm ; then JVM_FEATURES_VARIANT_FILTER="$JVM_FEATURES_VARIANT_FILTER opt-size" @@ -538,10 +537,6 @@ AC_DEFUN([JVM_FEATURES_VERIFY], AC_MSG_ERROR([Specified JVM feature 'jvmti' requires feature 'services' for variant '$variant']) fi - if JVM_FEATURES_IS_ACTIVE(management) && ! JVM_FEATURES_IS_ACTIVE(nmt); then - AC_MSG_ERROR([Specified JVM feature 'management' requires feature 'nmt' for variant '$variant']) - fi - # For backwards compatibility, disable a feature "globally" if one variant # is missing the feature. if ! JVM_FEATURES_IS_ACTIVE(cds); then diff --git a/make/autoconf/toolchain.m4 b/make/autoconf/toolchain.m4 index 9666d9a6d9dd6c0d360fc89f5a89a25d7e011e93..5280520b78bf18dad743c1d03e70deb4c7d52b9a 100644 --- a/make/autoconf/toolchain.m4 +++ b/make/autoconf/toolchain.m4 @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2022, 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 @@ -234,7 +234,7 @@ AC_DEFUN_ONCE([TOOLCHAIN_DETERMINE_TOOLCHAIN_TYPE], if test "x$OPENJDK_TARGET_OS" = xmacosx; then if test -n "$XCODEBUILD"; then # On Mac OS X, default toolchain to clang after Xcode 5 - XCODE_VERSION_OUTPUT=`"$XCODEBUILD" -version 2>&1 | $HEAD -n 1` + XCODE_VERSION_OUTPUT=`"$XCODEBUILD" -version | $HEAD -n 1` $ECHO "$XCODE_VERSION_OUTPUT" | $GREP "Xcode " > /dev/null if test $? -ne 0; then AC_MSG_NOTICE([xcodebuild output: $XCODE_VERSION_OUTPUT]) diff --git a/make/autoconf/toolchain_microsoft.m4 b/make/autoconf/toolchain_microsoft.m4 index 2600b431cfb79143b00c2cd6b24f4009e2d1942a..2e02c531da7818f41327803802b0891fec8cf02c 100644 --- a/make/autoconf/toolchain_microsoft.m4 +++ b/make/autoconf/toolchain_microsoft.m4 @@ -103,6 +103,7 @@ AC_DEFUN([TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT], vc/auxiliary/build/vcvarsx86_amd64.bat vc/auxiliary/build/vcvars64.bat" elif test "x$TARGET_CPU" = xaarch64; then # for host x86-64, target aarch64 + # aarch64 requires Visual Studio 16.8 or higher VCVARSFILES="vc/auxiliary/build/vcvarsamd64_arm64.bat \ vc/auxiliary/build/vcvarsx86_arm64.bat" fi diff --git a/make/conf/jib-profiles.js b/make/conf/jib-profiles.js index 24aeea9893df63d5dd918c5ad5eed3b6764881c8..e0041e9185130fb591ae6577c61ae9fe2bc9cc47 100644 --- a/make/conf/jib-profiles.js +++ b/make/conf/jib-profiles.js @@ -1165,19 +1165,12 @@ var getJibProfilesDependencies = function (input, common) { jmh: { organization: common.organization, ext: "tar.gz", - revision: "1.33+1.0" + revision: "1.34+1.0" }, jcov: { - // Use custom build of JCov - // See CODETOOLS-7902734 for more info. - // server: "jpg", - // product: "jcov", - // version: "3.0", - // build_number: "b07", - // file: "bundles/jcov-3_0.zip", organization: common.organization, - revision: "3.0-9-jdk-asm+1.0", + revision: "3.0-12-jdk-asm+1.0", ext: "zip", environment_name: "JCOV_HOME", }, diff --git a/make/data/symbols/java.base-I.sym.txt b/make/data/symbols/java.base-I.sym.txt index 4657f5cfcfe5de77dda6bfd95159bf520300a05e..bb60a7a3070701327458c42ee66c6f60b2e2c0b5 100644 --- a/make/data/symbols/java.base-I.sym.txt +++ b/make/data/symbols/java.base-I.sym.txt @@ -1,5 +1,5 @@ # -# Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2021, 2022, 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 @@ -284,6 +284,10 @@ innerclass innerClass java/security/KeyStore$Entry outerClass java/security/KeyS innerclass innerClass java/security/KeyStore$Entry$Attribute outerClass java/security/KeyStore$Entry innerClassName Attribute flags 609 method name engineGetAttributes descriptor (Ljava/lang/String;)Ljava/util/Set; flags 1 signature (Ljava/lang/String;)Ljava/util/Set; +class name java/security/Provider +-method name getServices descriptor ()Ljava/util/Set; +method name getServices descriptor ()Ljava/util/Set; flags 1 signature ()Ljava/util/Set; + class name java/security/SecureRandomParameters header extends java/lang/Object flags 601 @@ -389,6 +393,16 @@ header extends java/util/AbstractSet implements java/util/Set,java/lang/Cloneabl innerclass innerClass java/io/ObjectInputStream$GetField outerClass java/io/ObjectInputStream innerClassName GetField flags 409 innerclass innerClass java/util/Map$Entry outerClass java/util/Map innerClassName Entry flags 609 +class name java/util/Hashtable +header extends java/util/Dictionary implements java/util/Map,java/lang/Cloneable,java/io/Serializable flags 21 signature Ljava/util/Dictionary;Ljava/util/Map;Ljava/lang/Cloneable;Ljava/io/Serializable; +innerclass innerClass java/util/Map$Entry outerClass java/util/Map innerClassName Entry flags 609 +innerclass innerClass java/io/ObjectInputStream$GetField outerClass java/io/ObjectInputStream innerClassName GetField flags 409 + +class name java/util/IdentityHashMap +header extends java/util/AbstractMap implements java/util/Map,java/io/Serializable,java/lang/Cloneable flags 21 signature Ljava/util/AbstractMap;Ljava/util/Map;Ljava/io/Serializable;Ljava/lang/Cloneable; +innerclass innerClass java/util/Map$Entry outerClass java/util/Map innerClassName Entry flags 609 +innerclass innerClass java/io/ObjectInputStream$GetField outerClass java/io/ObjectInputStream innerClassName GetField flags 409 + class name java/util/Locale$IsoCountryCode header extends java/lang/Enum nestHost java/util/Locale sealed true flags 4421 signature Ljava/lang/Enum; innerclass innerClass java/util/Locale$IsoCountryCode outerClass java/util/Locale innerClassName IsoCountryCode flags 4409 diff --git a/make/data/unicodedata/Blocks.txt b/make/data/unicodedata/Blocks.txt index b20570e06767f77dfe81d5d4787e12eed0f0e29b..d3c73191e76536281298300c2a8db56b114faf78 100644 --- a/make/data/unicodedata/Blocks.txt +++ b/make/data/unicodedata/Blocks.txt @@ -1,6 +1,6 @@ -# Blocks-13.0.0.txt -# Date: 2019-07-10, 19:06:00 GMT [KW] -# Copyright (c) 2019 Unicode, Inc. +# Blocks-14.0.0.txt +# Date: 2021-01-22, 23:29:00 GMT [KW] +# Copyright (c) 2021 Unicode, Inc. # For terms of use, see http://www.unicode.org/terms_of_use.html # # Unicode Character Database @@ -52,6 +52,7 @@ 0800..083F; Samaritan 0840..085F; Mandaic 0860..086F; Syriac Supplement +0870..089F; Arabic Extended-B 08A0..08FF; Arabic Extended-A 0900..097F; Devanagari 0980..09FF; Bengali @@ -215,7 +216,9 @@ FFF0..FFFF; Specials 104B0..104FF; Osage 10500..1052F; Elbasan 10530..1056F; Caucasian Albanian +10570..105BF; Vithkuqi 10600..1077F; Linear A +10780..107BF; Latin Extended-F 10800..1083F; Cypriot Syllabary 10840..1085F; Imperial Aramaic 10860..1087F; Palmyrene @@ -240,6 +243,7 @@ FFF0..FFFF; Specials 10E80..10EBF; Yezidi 10F00..10F2F; Old Sogdian 10F30..10F6F; Sogdian +10F70..10FAF; Old Uyghur 10FB0..10FDF; Chorasmian 10FE0..10FFF; Elymaic 11000..1107F; Brahmi @@ -259,13 +263,14 @@ FFF0..FFFF; Specials 11600..1165F; Modi 11660..1167F; Mongolian Supplement 11680..116CF; Takri -11700..1173F; Ahom +11700..1174F; Ahom 11800..1184F; Dogra 118A0..118FF; Warang Citi 11900..1195F; Dives Akuru 119A0..119FF; Nandinagari 11A00..11A4F; Zanabazar Square 11A50..11AAF; Soyombo +11AB0..11ABF; Unified Canadian Aboriginal Syllabics Extended-A 11AC0..11AFF; Pau Cin Hau 11C00..11C6F; Bhaiksuki 11C70..11CBF; Marchen @@ -277,11 +282,13 @@ FFF0..FFFF; Specials 12000..123FF; Cuneiform 12400..1247F; Cuneiform Numbers and Punctuation 12480..1254F; Early Dynastic Cuneiform +12F90..12FFF; Cypro-Minoan 13000..1342F; Egyptian Hieroglyphs 13430..1343F; Egyptian Hieroglyph Format Controls 14400..1467F; Anatolian Hieroglyphs 16800..16A3F; Bamum Supplement 16A40..16A6F; Mro +16A70..16ACF; Tangsa 16AD0..16AFF; Bassa Vah 16B00..16B8F; Pahawh Hmong 16E40..16E9F; Medefaidrin @@ -290,13 +297,15 @@ FFF0..FFFF; Specials 17000..187FF; Tangut 18800..18AFF; Tangut Components 18B00..18CFF; Khitan Small Script -18D00..18D8F; Tangut Supplement +18D00..18D7F; Tangut Supplement +1AFF0..1AFFF; Kana Extended-B 1B000..1B0FF; Kana Supplement 1B100..1B12F; Kana Extended-A 1B130..1B16F; Small Kana Extension 1B170..1B2FF; Nushu 1BC00..1BC9F; Duployan 1BCA0..1BCAF; Shorthand Format Controls +1CF00..1CFCF; Znamenny Musical Notation 1D000..1D0FF; Byzantine Musical Symbols 1D100..1D1FF; Musical Symbols 1D200..1D24F; Ancient Greek Musical Notation @@ -305,9 +314,12 @@ FFF0..FFFF; Specials 1D360..1D37F; Counting Rod Numerals 1D400..1D7FF; Mathematical Alphanumeric Symbols 1D800..1DAAF; Sutton SignWriting +1DF00..1DFFF; Latin Extended-G 1E000..1E02F; Glagolitic Supplement 1E100..1E14F; Nyiakeng Puachue Hmong +1E290..1E2BF; Toto 1E2C0..1E2FF; Wancho +1E7E0..1E7FF; Ethiopic Extended-B 1E800..1E8DF; Mende Kikakui 1E900..1E95F; Adlam 1EC70..1ECBF; Indic Siyaq Numbers diff --git a/make/data/unicodedata/DerivedCoreProperties.txt b/make/data/unicodedata/DerivedCoreProperties.txt index cbaa2d46ce1a68f40d08fe7591f7e87d7428c9ff..2fb971d7ff58a720e1cab9d0f17513baf9582bc7 100644 --- a/make/data/unicodedata/DerivedCoreProperties.txt +++ b/make/data/unicodedata/DerivedCoreProperties.txt @@ -1,6 +1,6 @@ -# DerivedCoreProperties-13.0.0.txt -# Date: 2020-01-22, 00:07:19 GMT -# Copyright (c) 2020 Unicode, Inc. +# DerivedCoreProperties-14.0.0.txt +# Date: 2021-08-12, 23:12:53 GMT +# Copyright (c) 2021 Unicode, Inc. # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries. # For terms of use, see http://www.unicode.org/terms_of_use.html # @@ -341,8 +341,10 @@ FFE9..FFEC ; Math # Sm [4] HALFWIDTH LEFTWARDS ARROW..HALFWIDTH DOWNWARDS A 0829..082C ; Alphabetic # Mn [4] SAMARITAN VOWEL SIGN LONG I..SAMARITAN VOWEL SIGN SUKUN 0840..0858 ; Alphabetic # Lo [25] MANDAIC LETTER HALQA..MANDAIC LETTER AIN 0860..086A ; Alphabetic # Lo [11] SYRIAC LETTER MALAYALAM NGA..SYRIAC LETTER MALAYALAM SSA -08A0..08B4 ; Alphabetic # Lo [21] ARABIC LETTER BEH WITH SMALL V BELOW..ARABIC LETTER KAF WITH DOT BELOW -08B6..08C7 ; Alphabetic # Lo [18] ARABIC LETTER BEH WITH SMALL MEEM ABOVE..ARABIC LETTER LAM WITH SMALL ARABIC LETTER TAH ABOVE +0870..0887 ; Alphabetic # Lo [24] ARABIC LETTER ALEF WITH ATTACHED FATHA..ARABIC BASELINE ROUND DOT +0889..088E ; Alphabetic # Lo [6] ARABIC LETTER NOON WITH INVERTED SMALL V..ARABIC VERTICAL TAIL +08A0..08C8 ; Alphabetic # Lo [41] ARABIC LETTER BEH WITH SMALL V BELOW..ARABIC LETTER GRAF +08C9 ; Alphabetic # Lm ARABIC SMALL FARSI YEH 08D4..08DF ; Alphabetic # Mn [12] ARABIC SMALL HIGH WORD AR-RUB..ARABIC SMALL HIGH WORD WAQFA 08E3..08E9 ; Alphabetic # Mn [7] ARABIC TURNED DAMMA BELOW..ARABIC CURLY KASRATAN 08F0..0902 ; Alphabetic # Mn [19] ARABIC OPEN FATHATAN..DEVANAGARI SIGN ANUSVARA @@ -471,6 +473,7 @@ FFE9..FFEC ; Math # Sm [4] HALFWIDTH LEFTWARDS ARROW..HALFWIDTH DOWNWARDS A 0C4A..0C4C ; Alphabetic # Mn [3] TELUGU VOWEL SIGN O..TELUGU VOWEL SIGN AU 0C55..0C56 ; Alphabetic # Mn [2] TELUGU LENGTH MARK..TELUGU AI LENGTH MARK 0C58..0C5A ; Alphabetic # Lo [3] TELUGU LETTER TSA..TELUGU LETTER RRRA +0C5D ; Alphabetic # Lo TELUGU LETTER NAKAARA POLLU 0C60..0C61 ; Alphabetic # Lo [2] TELUGU LETTER VOCALIC RR..TELUGU LETTER VOCALIC LL 0C62..0C63 ; Alphabetic # Mn [2] TELUGU VOWEL SIGN VOCALIC L..TELUGU VOWEL SIGN VOCALIC LL 0C80 ; Alphabetic # Lo KANNADA SIGN SPACING CANDRABINDU @@ -490,7 +493,7 @@ FFE9..FFEC ; Math # Sm [4] HALFWIDTH LEFTWARDS ARROW..HALFWIDTH DOWNWARDS A 0CCA..0CCB ; Alphabetic # Mc [2] KANNADA VOWEL SIGN O..KANNADA VOWEL SIGN OO 0CCC ; Alphabetic # Mn KANNADA VOWEL SIGN AU 0CD5..0CD6 ; Alphabetic # Mc [2] KANNADA LENGTH MARK..KANNADA AI LENGTH MARK -0CDE ; Alphabetic # Lo KANNADA LETTER FA +0CDD..0CDE ; Alphabetic # Lo [2] KANNADA LETTER NAKAARA POLLU..KANNADA LETTER FA 0CE0..0CE1 ; Alphabetic # Lo [2] KANNADA LETTER VOCALIC RR..KANNADA LETTER VOCALIC LL 0CE2..0CE3 ; Alphabetic # Mn [2] KANNADA VOWEL SIGN VOCALIC L..KANNADA VOWEL SIGN VOCALIC LL 0CF1..0CF2 ; Alphabetic # Lo [2] KANNADA SIGN JIHVAMULIYA..KANNADA SIGN UPADHMANIYA @@ -614,10 +617,9 @@ FFE9..FFEC ; Math # Sm [4] HALFWIDTH LEFTWARDS ARROW..HALFWIDTH DOWNWARDS A 16A0..16EA ; Alphabetic # Lo [75] RUNIC LETTER FEHU FEOH FE F..RUNIC LETTER X 16EE..16F0 ; Alphabetic # Nl [3] RUNIC ARLAUG SYMBOL..RUNIC BELGTHOR SYMBOL 16F1..16F8 ; Alphabetic # Lo [8] RUNIC LETTER K..RUNIC LETTER FRANKS CASKET AESC -1700..170C ; Alphabetic # Lo [13] TAGALOG LETTER A..TAGALOG LETTER YA -170E..1711 ; Alphabetic # Lo [4] TAGALOG LETTER LA..TAGALOG LETTER HA +1700..1711 ; Alphabetic # Lo [18] TAGALOG LETTER A..TAGALOG LETTER HA 1712..1713 ; Alphabetic # Mn [2] TAGALOG VOWEL SIGN I..TAGALOG VOWEL SIGN U -1720..1731 ; Alphabetic # Lo [18] HANUNOO LETTER A..HANUNOO LETTER HA +171F..1731 ; Alphabetic # Lo [19] TAGALOG LETTER ARCHAIC RA..HANUNOO LETTER HA 1732..1733 ; Alphabetic # Mn [2] HANUNOO VOWEL SIGN I..HANUNOO VOWEL SIGN U 1740..1751 ; Alphabetic # Lo [18] BUHID LETTER A..BUHID LETTER HA 1752..1753 ; Alphabetic # Mn [2] BUHID VOWEL SIGN I..BUHID VOWEL SIGN U @@ -670,6 +672,7 @@ FFE9..FFEC ; Math # Sm [4] HALFWIDTH LEFTWARDS ARROW..HALFWIDTH DOWNWARDS A 1A73..1A74 ; Alphabetic # Mn [2] TAI THAM VOWEL SIGN OA ABOVE..TAI THAM SIGN MAI KANG 1AA7 ; Alphabetic # Lm TAI THAM SIGN MAI YAMOK 1ABF..1AC0 ; Alphabetic # Mn [2] COMBINING LATIN SMALL LETTER W BELOW..COMBINING LATIN SMALL LETTER TURNED W BELOW +1ACC..1ACE ; Alphabetic # Mn [3] COMBINING LATIN SMALL LETTER INSULAR G..COMBINING LATIN SMALL LETTER INSULAR T 1B00..1B03 ; Alphabetic # Mn [4] BALINESE SIGN ULU RICEM..BALINESE SIGN SURANG 1B04 ; Alphabetic # Mc BALINESE SIGN BISAH 1B05..1B33 ; Alphabetic # Lo [47] BALINESE LETTER AKARA..BALINESE LETTER HA @@ -680,7 +683,7 @@ FFE9..FFEC ; Math # Sm [4] HALFWIDTH LEFTWARDS ARROW..HALFWIDTH DOWNWARDS A 1B3D..1B41 ; Alphabetic # Mc [5] BALINESE VOWEL SIGN LA LENGA TEDUNG..BALINESE VOWEL SIGN TALING REPA TEDUNG 1B42 ; Alphabetic # Mn BALINESE VOWEL SIGN PEPET 1B43 ; Alphabetic # Mc BALINESE VOWEL SIGN PEPET TEDUNG -1B45..1B4B ; Alphabetic # Lo [7] BALINESE LETTER KAF SASAK..BALINESE LETTER ASYURA SASAK +1B45..1B4C ; Alphabetic # Lo [8] BALINESE LETTER KAF SASAK..BALINESE LETTER ARCHAIC JNYA 1B80..1B81 ; Alphabetic # Mn [2] SUNDANESE SIGN PANYECEK..SUNDANESE SIGN PANGLAYAR 1B82 ; Alphabetic # Mc SUNDANESE SIGN PANGWISAD 1B83..1BA0 ; Alphabetic # Lo [30] SUNDANESE LETTER A..SUNDANESE LETTER HA @@ -760,9 +763,7 @@ FFE9..FFEC ; Math # Sm [4] HALFWIDTH LEFTWARDS ARROW..HALFWIDTH DOWNWARDS A 2183..2184 ; Alphabetic # L& [2] ROMAN NUMERAL REVERSED ONE HUNDRED..LATIN SMALL LETTER REVERSED C 2185..2188 ; Alphabetic # Nl [4] ROMAN NUMERAL SIX LATE FORM..ROMAN NUMERAL ONE HUNDRED THOUSAND 24B6..24E9 ; Alphabetic # So [52] CIRCLED LATIN CAPITAL LETTER A..CIRCLED LATIN SMALL LETTER Z -2C00..2C2E ; Alphabetic # L& [47] GLAGOLITIC CAPITAL LETTER AZU..GLAGOLITIC CAPITAL LETTER LATINATE MYSLITE -2C30..2C5E ; Alphabetic # L& [47] GLAGOLITIC SMALL LETTER AZU..GLAGOLITIC SMALL LETTER LATINATE MYSLITE -2C60..2C7B ; Alphabetic # L& [28] LATIN CAPITAL LETTER L WITH DOUBLE BAR..LATIN LETTER SMALL CAPITAL TURNED E +2C00..2C7B ; Alphabetic # L& [124] GLAGOLITIC CAPITAL LETTER AZU..LATIN LETTER SMALL CAPITAL TURNED E 2C7C..2C7D ; Alphabetic # Lm [2] LATIN SUBSCRIPT SMALL LETTER J..MODIFIER LETTER CAPITAL V 2C7E..2CE4 ; Alphabetic # L& [103] LATIN CAPITAL LETTER S WITH SWASH TAIL..COPTIC SYMBOL KAI 2CEB..2CEE ; Alphabetic # L& [4] COPTIC CAPITAL LETTER CRYPTOGRAMMIC SHEI..COPTIC SMALL LETTER CRYPTOGRAMMIC GANGIA @@ -802,8 +803,7 @@ FFE9..FFEC ; Math # Sm [4] HALFWIDTH LEFTWARDS ARROW..HALFWIDTH DOWNWARDS A 31A0..31BF ; Alphabetic # Lo [32] BOPOMOFO LETTER BU..BOPOMOFO LETTER AH 31F0..31FF ; Alphabetic # Lo [16] KATAKANA LETTER SMALL KU..KATAKANA LETTER SMALL RO 3400..4DBF ; Alphabetic # Lo [6592] CJK UNIFIED IDEOGRAPH-3400..CJK UNIFIED IDEOGRAPH-4DBF -4E00..9FFC ; Alphabetic # Lo [20989] CJK UNIFIED IDEOGRAPH-4E00..CJK UNIFIED IDEOGRAPH-9FFC -A000..A014 ; Alphabetic # Lo [21] YI SYLLABLE IT..YI SYLLABLE E +4E00..A014 ; Alphabetic # Lo [21013] CJK UNIFIED IDEOGRAPH-4E00..YI SYLLABLE E A015 ; Alphabetic # Lm YI SYLLABLE WU A016..A48C ; Alphabetic # Lo [1143] YI SYLLABLE BIT..YI SYLLABLE YYR A4D0..A4F7 ; Alphabetic # Lo [40] LISU LETTER BA..LISU LETTER OE @@ -828,8 +828,11 @@ A771..A787 ; Alphabetic # L& [23] LATIN SMALL LETTER DUM..LATIN SMALL LETTER A788 ; Alphabetic # Lm MODIFIER LETTER LOW CIRCUMFLEX ACCENT A78B..A78E ; Alphabetic # L& [4] LATIN CAPITAL LETTER SALTILLO..LATIN SMALL LETTER L WITH RETROFLEX HOOK AND BELT A78F ; Alphabetic # Lo LATIN LETTER SINOLOGICAL DOT -A790..A7BF ; Alphabetic # L& [48] LATIN CAPITAL LETTER N WITH DESCENDER..LATIN SMALL LETTER GLOTTAL U -A7C2..A7CA ; Alphabetic # L& [9] LATIN CAPITAL LETTER ANGLICANA W..LATIN SMALL LETTER S WITH SHORT STROKE OVERLAY +A790..A7CA ; Alphabetic # L& [59] LATIN CAPITAL LETTER N WITH DESCENDER..LATIN SMALL LETTER S WITH SHORT STROKE OVERLAY +A7D0..A7D1 ; Alphabetic # L& [2] LATIN CAPITAL LETTER CLOSED INSULAR G..LATIN SMALL LETTER CLOSED INSULAR G +A7D3 ; Alphabetic # L& LATIN SMALL LETTER DOUBLE THORN +A7D5..A7D9 ; Alphabetic # L& [5] LATIN SMALL LETTER DOUBLE WYNN..LATIN SMALL LETTER SIGMOID S +A7F2..A7F4 ; Alphabetic # Lm [3] MODIFIER LETTER CAPITAL C..MODIFIER LETTER CAPITAL Q A7F5..A7F6 ; Alphabetic # L& [2] LATIN CAPITAL LETTER REVERSED HALF H..LATIN SMALL LETTER REVERSED HALF H A7F7 ; Alphabetic # Lo LATIN EPIGRAPHIC LETTER SIDEWAYS I A7F8..A7F9 ; Alphabetic # Lm [2] MODIFIER LETTER CAPITAL H WITH STROKE..MODIFIER LETTER SMALL LIGATURE OE @@ -985,9 +988,20 @@ FFDA..FFDC ; Alphabetic # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANG 104D8..104FB ; Alphabetic # L& [36] OSAGE SMALL LETTER A..OSAGE SMALL LETTER ZHA 10500..10527 ; Alphabetic # Lo [40] ELBASAN LETTER A..ELBASAN LETTER KHE 10530..10563 ; Alphabetic # Lo [52] CAUCASIAN ALBANIAN LETTER ALT..CAUCASIAN ALBANIAN LETTER KIW +10570..1057A ; Alphabetic # L& [11] VITHKUQI CAPITAL LETTER A..VITHKUQI CAPITAL LETTER GA +1057C..1058A ; Alphabetic # L& [15] VITHKUQI CAPITAL LETTER HA..VITHKUQI CAPITAL LETTER RE +1058C..10592 ; Alphabetic # L& [7] VITHKUQI CAPITAL LETTER SE..VITHKUQI CAPITAL LETTER XE +10594..10595 ; Alphabetic # L& [2] VITHKUQI CAPITAL LETTER Y..VITHKUQI CAPITAL LETTER ZE +10597..105A1 ; Alphabetic # L& [11] VITHKUQI SMALL LETTER A..VITHKUQI SMALL LETTER GA +105A3..105B1 ; Alphabetic # L& [15] VITHKUQI SMALL LETTER HA..VITHKUQI SMALL LETTER RE +105B3..105B9 ; Alphabetic # L& [7] VITHKUQI SMALL LETTER SE..VITHKUQI SMALL LETTER XE +105BB..105BC ; Alphabetic # L& [2] VITHKUQI SMALL LETTER Y..VITHKUQI SMALL LETTER ZE 10600..10736 ; Alphabetic # Lo [311] LINEAR A SIGN AB001..LINEAR A SIGN A664 10740..10755 ; Alphabetic # Lo [22] LINEAR A SIGN A701 A..LINEAR A SIGN A732 JE 10760..10767 ; Alphabetic # Lo [8] LINEAR A SIGN A800..LINEAR A SIGN A807 +10780..10785 ; Alphabetic # Lm [6] MODIFIER LETTER SMALL CAPITAL AA..MODIFIER LETTER SMALL B WITH HOOK +10787..107B0 ; Alphabetic # Lm [42] MODIFIER LETTER SMALL DZ DIGRAPH..MODIFIER LETTER SMALL V WITH RIGHT HOOK +107B2..107BA ; Alphabetic # Lm [9] MODIFIER LETTER SMALL CAPITAL Y..MODIFIER LETTER SMALL S WITH CURL 10800..10805 ; Alphabetic # Lo [6] CYPRIOT SYLLABLE A..CYPRIOT SYLLABLE JA 10808 ; Alphabetic # Lo CYPRIOT SYLLABLE JO 1080A..10835 ; Alphabetic # Lo [44] CYPRIOT SYLLABLE KA..CYPRIOT SYLLABLE WO @@ -1028,6 +1042,7 @@ FFDA..FFDC ; Alphabetic # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANG 10F00..10F1C ; Alphabetic # Lo [29] OLD SOGDIAN LETTER ALEPH..OLD SOGDIAN LETTER FINAL TAW WITH VERTICAL TAIL 10F27 ; Alphabetic # Lo OLD SOGDIAN LIGATURE AYIN-DALETH 10F30..10F45 ; Alphabetic # Lo [22] SOGDIAN LETTER ALEPH..SOGDIAN INDEPENDENT SHIN +10F70..10F81 ; Alphabetic # Lo [18] OLD UYGHUR LETTER ALEPH..OLD UYGHUR LETTER LESH 10FB0..10FC4 ; Alphabetic # Lo [21] CHORASMIAN LETTER ALEPH..CHORASMIAN LETTER TAW 10FE0..10FF6 ; Alphabetic # Lo [23] ELYMAIC LETTER ALEPH..ELYMAIC LIGATURE ZAYIN-YODH 11000 ; Alphabetic # Mc BRAHMI SIGN CANDRABINDU @@ -1035,11 +1050,15 @@ FFDA..FFDC ; Alphabetic # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANG 11002 ; Alphabetic # Mc BRAHMI SIGN VISARGA 11003..11037 ; Alphabetic # Lo [53] BRAHMI SIGN JIHVAMULIYA..BRAHMI LETTER OLD TAMIL NNNA 11038..11045 ; Alphabetic # Mn [14] BRAHMI VOWEL SIGN AA..BRAHMI VOWEL SIGN AU +11071..11072 ; Alphabetic # Lo [2] BRAHMI LETTER OLD TAMIL SHORT E..BRAHMI LETTER OLD TAMIL SHORT O +11073..11074 ; Alphabetic # Mn [2] BRAHMI VOWEL SIGN OLD TAMIL SHORT E..BRAHMI VOWEL SIGN OLD TAMIL SHORT O +11075 ; Alphabetic # Lo BRAHMI LETTER OLD TAMIL LLA 11082 ; Alphabetic # Mc KAITHI SIGN VISARGA 11083..110AF ; Alphabetic # Lo [45] KAITHI LETTER A..KAITHI LETTER HA 110B0..110B2 ; Alphabetic # Mc [3] KAITHI VOWEL SIGN AA..KAITHI VOWEL SIGN II 110B3..110B6 ; Alphabetic # Mn [4] KAITHI VOWEL SIGN U..KAITHI VOWEL SIGN AI 110B7..110B8 ; Alphabetic # Mc [2] KAITHI VOWEL SIGN O..KAITHI VOWEL SIGN AU +110C2 ; Alphabetic # Mn KAITHI VOWEL SIGN VOCALIC R 110D0..110E8 ; Alphabetic # Lo [25] SORA SOMPENG LETTER SAH..SORA SOMPENG LETTER MAE 11100..11102 ; Alphabetic # Mn [3] CHAKMA SIGN CANDRABINDU..CHAKMA SIGN VISARGA 11103..11126 ; Alphabetic # Lo [36] CHAKMA LETTER AA..CHAKMA LETTER HAA @@ -1144,6 +1163,7 @@ FFDA..FFDC ; Alphabetic # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANG 11722..11725 ; Alphabetic # Mn [4] AHOM VOWEL SIGN I..AHOM VOWEL SIGN UU 11726 ; Alphabetic # Mc AHOM VOWEL SIGN E 11727..1172A ; Alphabetic # Mn [4] AHOM VOWEL SIGN AW..AHOM VOWEL SIGN AM +11740..11746 ; Alphabetic # Lo [7] AHOM LETTER CA..AHOM LETTER LLA 11800..1182B ; Alphabetic # Lo [44] DOGRA LETTER A..DOGRA LETTER RRA 1182C..1182E ; Alphabetic # Mc [3] DOGRA VOWEL SIGN AA..DOGRA VOWEL SIGN II 1182F..11837 ; Alphabetic # Mn [9] DOGRA VOWEL SIGN U..DOGRA SIGN ANUSVARA @@ -1185,7 +1205,7 @@ FFDA..FFDC ; Alphabetic # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANG 11A8A..11A96 ; Alphabetic # Mn [13] SOYOMBO FINAL CONSONANT SIGN G..SOYOMBO SIGN ANUSVARA 11A97 ; Alphabetic # Mc SOYOMBO SIGN VISARGA 11A9D ; Alphabetic # Lo SOYOMBO MARK PLUTA -11AC0..11AF8 ; Alphabetic # Lo [57] PAU CIN HAU LETTER PA..PAU CIN HAU GLOTTAL STOP FINAL +11AB0..11AF8 ; Alphabetic # Lo [73] CANADIAN SYLLABICS NATTILIK HI..PAU CIN HAU GLOTTAL STOP FINAL 11C00..11C08 ; Alphabetic # Lo [9] BHAIKSUKI LETTER A..BHAIKSUKI LETTER VOCALIC L 11C0A..11C2E ; Alphabetic # Lo [37] BHAIKSUKI LETTER E..BHAIKSUKI LETTER HA 11C2F ; Alphabetic # Mc BHAIKSUKI VOWEL SIGN AA @@ -1227,10 +1247,12 @@ FFDA..FFDC ; Alphabetic # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANG 12000..12399 ; Alphabetic # Lo [922] CUNEIFORM SIGN A..CUNEIFORM SIGN U U 12400..1246E ; Alphabetic # Nl [111] CUNEIFORM NUMERIC SIGN TWO ASH..CUNEIFORM NUMERIC SIGN NINE U VARIANT FORM 12480..12543 ; Alphabetic # Lo [196] CUNEIFORM SIGN AB TIMES NUN TENU..CUNEIFORM SIGN ZU5 TIMES THREE DISH TENU +12F90..12FF0 ; Alphabetic # Lo [97] CYPRO-MINOAN SIGN CM001..CYPRO-MINOAN SIGN CM114 13000..1342E ; Alphabetic # Lo [1071] EGYPTIAN HIEROGLYPH A001..EGYPTIAN HIEROGLYPH AA032 14400..14646 ; Alphabetic # Lo [583] ANATOLIAN HIEROGLYPH A001..ANATOLIAN HIEROGLYPH A530 16800..16A38 ; Alphabetic # Lo [569] BAMUM LETTER PHASE-A NGKUE MFON..BAMUM LETTER PHASE-F VUEQ 16A40..16A5E ; Alphabetic # Lo [31] MRO LETTER TA..MRO LETTER TEK +16A70..16ABE ; Alphabetic # Lo [79] TANGSA LETTER OZ..TANGSA LETTER ZA 16AD0..16AED ; Alphabetic # Lo [30] BASSA VAH LETTER ENNI..BASSA VAH LETTER I 16B00..16B2F ; Alphabetic # Lo [48] PAHAWH HMONG VOWEL KEEB..PAHAWH HMONG CONSONANT CAU 16B40..16B43 ; Alphabetic # Lm [4] PAHAWH HMONG SIGN VOS SEEV..PAHAWH HMONG SIGN IB YAM @@ -1249,7 +1271,10 @@ FFDA..FFDC ; Alphabetic # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANG 17000..187F7 ; Alphabetic # Lo [6136] TANGUT IDEOGRAPH-17000..TANGUT IDEOGRAPH-187F7 18800..18CD5 ; Alphabetic # Lo [1238] TANGUT COMPONENT-001..KHITAN SMALL SCRIPT CHARACTER-18CD5 18D00..18D08 ; Alphabetic # Lo [9] TANGUT IDEOGRAPH-18D00..TANGUT IDEOGRAPH-18D08 -1B000..1B11E ; Alphabetic # Lo [287] KATAKANA LETTER ARCHAIC E..HENTAIGANA LETTER N-MU-MO-2 +1AFF0..1AFF3 ; Alphabetic # Lm [4] KATAKANA LETTER MINNAN TONE-2..KATAKANA LETTER MINNAN TONE-5 +1AFF5..1AFFB ; Alphabetic # Lm [7] KATAKANA LETTER MINNAN TONE-7..KATAKANA LETTER MINNAN NASALIZED TONE-5 +1AFFD..1AFFE ; Alphabetic # Lm [2] KATAKANA LETTER MINNAN NASALIZED TONE-7..KATAKANA LETTER MINNAN NASALIZED TONE-8 +1B000..1B122 ; Alphabetic # Lo [291] KATAKANA LETTER ARCHAIC E..KATAKANA LETTER ARCHAIC WU 1B150..1B152 ; Alphabetic # Lo [3] HIRAGANA LETTER SMALL WI..HIRAGANA LETTER SMALL WO 1B164..1B167 ; Alphabetic # Lo [4] KATAKANA LETTER SMALL WI..KATAKANA LETTER SMALL N 1B170..1B2FB ; Alphabetic # Lo [396] NUSHU CHARACTER-1B170..NUSHU CHARACTER-1B2FB @@ -1288,6 +1313,9 @@ FFDA..FFDC ; Alphabetic # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANG 1D78A..1D7A8 ; Alphabetic # L& [31] MATHEMATICAL SANS-SERIF BOLD EPSILON SYMBOL..MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL OMEGA 1D7AA..1D7C2 ; Alphabetic # L& [25] MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL ALPHA..MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL OMEGA 1D7C4..1D7CB ; Alphabetic # L& [8] MATHEMATICAL SANS-SERIF BOLD ITALIC EPSILON SYMBOL..MATHEMATICAL BOLD SMALL DIGAMMA +1DF00..1DF09 ; Alphabetic # L& [10] LATIN SMALL LETTER FENG DIGRAPH WITH TRILL..LATIN SMALL LETTER T WITH HOOK AND RETROFLEX HOOK +1DF0A ; Alphabetic # Lo LATIN LETTER RETROFLEX CLICK WITH RETROFLEX HOOK +1DF0B..1DF1E ; Alphabetic # L& [20] LATIN SMALL LETTER ESH WITH DOUBLE BAR..LATIN SMALL LETTER S WITH CURL 1E000..1E006 ; Alphabetic # Mn [7] COMBINING GLAGOLITIC LETTER AZU..COMBINING GLAGOLITIC LETTER ZHIVETE 1E008..1E018 ; Alphabetic # Mn [17] COMBINING GLAGOLITIC LETTER ZEMLJA..COMBINING GLAGOLITIC LETTER HERU 1E01B..1E021 ; Alphabetic # Mn [7] COMBINING GLAGOLITIC LETTER SHTA..COMBINING GLAGOLITIC LETTER YATI @@ -1296,7 +1324,12 @@ FFDA..FFDC ; Alphabetic # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANG 1E100..1E12C ; Alphabetic # Lo [45] NYIAKENG PUACHUE HMONG LETTER MA..NYIAKENG PUACHUE HMONG LETTER W 1E137..1E13D ; Alphabetic # Lm [7] NYIAKENG PUACHUE HMONG SIGN FOR PERSON..NYIAKENG PUACHUE HMONG SYLLABLE LENGTHENER 1E14E ; Alphabetic # Lo NYIAKENG PUACHUE HMONG LOGOGRAM NYAJ +1E290..1E2AD ; Alphabetic # Lo [30] TOTO LETTER PA..TOTO LETTER A 1E2C0..1E2EB ; Alphabetic # Lo [44] WANCHO LETTER AA..WANCHO LETTER YIH +1E7E0..1E7E6 ; Alphabetic # Lo [7] ETHIOPIC SYLLABLE HHYA..ETHIOPIC SYLLABLE HHYO +1E7E8..1E7EB ; Alphabetic # Lo [4] ETHIOPIC SYLLABLE GURAGE HHWA..ETHIOPIC SYLLABLE HHWE +1E7ED..1E7EE ; Alphabetic # Lo [2] ETHIOPIC SYLLABLE GURAGE MWI..ETHIOPIC SYLLABLE GURAGE MWEE +1E7F0..1E7FE ; Alphabetic # Lo [15] ETHIOPIC SYLLABLE GURAGE QWI..ETHIOPIC SYLLABLE GURAGE PWEE 1E800..1E8C4 ; Alphabetic # Lo [197] MENDE KIKAKUI SYLLABLE M001 KI..MENDE KIKAKUI SYLLABLE M060 NYON 1E900..1E943 ; Alphabetic # L& [68] ADLAM CAPITAL LETTER ALIF..ADLAM SMALL LETTER SHA 1E947 ; Alphabetic # Mn ADLAM HAMZA @@ -1337,15 +1370,15 @@ FFDA..FFDC ; Alphabetic # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANG 1F130..1F149 ; Alphabetic # So [26] SQUARED LATIN CAPITAL LETTER A..SQUARED LATIN CAPITAL LETTER Z 1F150..1F169 ; Alphabetic # So [26] NEGATIVE CIRCLED LATIN CAPITAL LETTER A..NEGATIVE CIRCLED LATIN CAPITAL LETTER Z 1F170..1F189 ; Alphabetic # So [26] NEGATIVE SQUARED LATIN CAPITAL LETTER A..NEGATIVE SQUARED LATIN CAPITAL LETTER Z -20000..2A6DD ; Alphabetic # Lo [42718] CJK UNIFIED IDEOGRAPH-20000..CJK UNIFIED IDEOGRAPH-2A6DD -2A700..2B734 ; Alphabetic # Lo [4149] CJK UNIFIED IDEOGRAPH-2A700..CJK UNIFIED IDEOGRAPH-2B734 +20000..2A6DF ; Alphabetic # Lo [42720] CJK UNIFIED IDEOGRAPH-20000..CJK UNIFIED IDEOGRAPH-2A6DF +2A700..2B738 ; Alphabetic # Lo [4153] CJK UNIFIED IDEOGRAPH-2A700..CJK UNIFIED IDEOGRAPH-2B738 2B740..2B81D ; Alphabetic # Lo [222] CJK UNIFIED IDEOGRAPH-2B740..CJK UNIFIED IDEOGRAPH-2B81D 2B820..2CEA1 ; Alphabetic # Lo [5762] CJK UNIFIED IDEOGRAPH-2B820..CJK UNIFIED IDEOGRAPH-2CEA1 2CEB0..2EBE0 ; Alphabetic # Lo [7473] CJK UNIFIED IDEOGRAPH-2CEB0..CJK UNIFIED IDEOGRAPH-2EBE0 2F800..2FA1D ; Alphabetic # Lo [542] CJK COMPATIBILITY IDEOGRAPH-2F800..CJK COMPATIBILITY IDEOGRAPH-2FA1D 30000..3134A ; Alphabetic # Lo [4939] CJK UNIFIED IDEOGRAPH-30000..CJK UNIFIED IDEOGRAPH-3134A -# Total code points: 132875 +# Total code points: 133396 # ================================================ @@ -1798,7 +1831,7 @@ FFDA..FFDC ; Alphabetic # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANG 2170..217F ; Lowercase # Nl [16] SMALL ROMAN NUMERAL ONE..SMALL ROMAN NUMERAL ONE THOUSAND 2184 ; Lowercase # L& LATIN SMALL LETTER REVERSED C 24D0..24E9 ; Lowercase # So [26] CIRCLED LATIN SMALL LETTER A..CIRCLED LATIN SMALL LETTER Z -2C30..2C5E ; Lowercase # L& [47] GLAGOLITIC SMALL LETTER AZU..GLAGOLITIC SMALL LETTER LATINATE MYSLITE +2C30..2C5F ; Lowercase # L& [48] GLAGOLITIC SMALL LETTER AZU..GLAGOLITIC SMALL LETTER CAUDATE CHRIVI 2C61 ; Lowercase # L& LATIN SMALL LETTER L WITH DOUBLE BAR 2C65..2C66 ; Lowercase # L& [2] LATIN SMALL LETTER A WITH STROKE..LATIN SMALL LETTER T WITH DIAGONAL STROKE 2C68 ; Lowercase # L& LATIN SMALL LETTER H WITH DESCENDER @@ -1970,9 +2003,15 @@ A7B9 ; Lowercase # L& LATIN SMALL LETTER U WITH STROKE A7BB ; Lowercase # L& LATIN SMALL LETTER GLOTTAL A A7BD ; Lowercase # L& LATIN SMALL LETTER GLOTTAL I A7BF ; Lowercase # L& LATIN SMALL LETTER GLOTTAL U +A7C1 ; Lowercase # L& LATIN SMALL LETTER OLD POLISH O A7C3 ; Lowercase # L& LATIN SMALL LETTER ANGLICANA W A7C8 ; Lowercase # L& LATIN SMALL LETTER D WITH SHORT STROKE OVERLAY A7CA ; Lowercase # L& LATIN SMALL LETTER S WITH SHORT STROKE OVERLAY +A7D1 ; Lowercase # L& LATIN SMALL LETTER CLOSED INSULAR G +A7D3 ; Lowercase # L& LATIN SMALL LETTER DOUBLE THORN +A7D5 ; Lowercase # L& LATIN SMALL LETTER DOUBLE WYNN +A7D7 ; Lowercase # L& LATIN SMALL LETTER MIDDLE SCOTS S +A7D9 ; Lowercase # L& LATIN SMALL LETTER SIGMOID S A7F6 ; Lowercase # L& LATIN SMALL LETTER REVERSED HALF H A7F8..A7F9 ; Lowercase # Lm [2] MODIFIER LETTER CAPITAL H WITH STROKE..MODIFIER LETTER SMALL LIGATURE OE A7FA ; Lowercase # L& LATIN LETTER SMALL CAPITAL TURNED M @@ -1985,6 +2024,14 @@ FB13..FB17 ; Lowercase # L& [5] ARMENIAN SMALL LIGATURE MEN NOW..ARMENIAN S FF41..FF5A ; Lowercase # L& [26] FULLWIDTH LATIN SMALL LETTER A..FULLWIDTH LATIN SMALL LETTER Z 10428..1044F ; Lowercase # L& [40] DESERET SMALL LETTER LONG I..DESERET SMALL LETTER EW 104D8..104FB ; Lowercase # L& [36] OSAGE SMALL LETTER A..OSAGE SMALL LETTER ZHA +10597..105A1 ; Lowercase # L& [11] VITHKUQI SMALL LETTER A..VITHKUQI SMALL LETTER GA +105A3..105B1 ; Lowercase # L& [15] VITHKUQI SMALL LETTER HA..VITHKUQI SMALL LETTER RE +105B3..105B9 ; Lowercase # L& [7] VITHKUQI SMALL LETTER SE..VITHKUQI SMALL LETTER XE +105BB..105BC ; Lowercase # L& [2] VITHKUQI SMALL LETTER Y..VITHKUQI SMALL LETTER ZE +10780 ; Lowercase # Lm MODIFIER LETTER SMALL CAPITAL AA +10783..10785 ; Lowercase # Lm [3] MODIFIER LETTER SMALL AE..MODIFIER LETTER SMALL B WITH HOOK +10787..107B0 ; Lowercase # Lm [42] MODIFIER LETTER SMALL DZ DIGRAPH..MODIFIER LETTER SMALL V WITH RIGHT HOOK +107B2..107BA ; Lowercase # Lm [9] MODIFIER LETTER SMALL CAPITAL Y..MODIFIER LETTER SMALL S WITH CURL 10CC0..10CF2 ; Lowercase # L& [51] OLD HUNGARIAN SMALL LETTER A..OLD HUNGARIAN SMALL LETTER US 118C0..118DF ; Lowercase # L& [32] WARANG CITI SMALL LETTER NGAA..WARANG CITI SMALL LETTER VIYO 16E60..16E7F ; Lowercase # L& [32] MEDEFAIDRIN SMALL LETTER M..MEDEFAIDRIN SMALL LETTER Y @@ -2016,9 +2063,11 @@ FF41..FF5A ; Lowercase # L& [26] FULLWIDTH LATIN SMALL LETTER A..FULLWIDTH L 1D7AA..1D7C2 ; Lowercase # L& [25] MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL ALPHA..MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL OMEGA 1D7C4..1D7C9 ; Lowercase # L& [6] MATHEMATICAL SANS-SERIF BOLD ITALIC EPSILON SYMBOL..MATHEMATICAL SANS-SERIF BOLD ITALIC PI SYMBOL 1D7CB ; Lowercase # L& MATHEMATICAL BOLD SMALL DIGAMMA +1DF00..1DF09 ; Lowercase # L& [10] LATIN SMALL LETTER FENG DIGRAPH WITH TRILL..LATIN SMALL LETTER T WITH HOOK AND RETROFLEX HOOK +1DF0B..1DF1E ; Lowercase # L& [20] LATIN SMALL LETTER ESH WITH DOUBLE BAR..LATIN SMALL LETTER S WITH CURL 1E922..1E943 ; Lowercase # L& [34] ADLAM SMALL LETTER ALIF..ADLAM SMALL LETTER SHA -# Total code points: 2344 +# Total code points: 2471 # ================================================ @@ -2458,7 +2507,7 @@ FF41..FF5A ; Lowercase # L& [26] FULLWIDTH LATIN SMALL LETTER A..FULLWIDTH L 2160..216F ; Uppercase # Nl [16] ROMAN NUMERAL ONE..ROMAN NUMERAL ONE THOUSAND 2183 ; Uppercase # L& ROMAN NUMERAL REVERSED ONE HUNDRED 24B6..24CF ; Uppercase # So [26] CIRCLED LATIN CAPITAL LETTER A..CIRCLED LATIN CAPITAL LETTER Z -2C00..2C2E ; Uppercase # L& [47] GLAGOLITIC CAPITAL LETTER AZU..GLAGOLITIC CAPITAL LETTER LATINATE MYSLITE +2C00..2C2F ; Uppercase # L& [48] GLAGOLITIC CAPITAL LETTER AZU..GLAGOLITIC CAPITAL LETTER CAUDATE CHRIVI 2C60 ; Uppercase # L& LATIN CAPITAL LETTER L WITH DOUBLE BAR 2C62..2C64 ; Uppercase # L& [3] LATIN CAPITAL LETTER L WITH MIDDLE TILDE..LATIN CAPITAL LETTER R WITH TAIL 2C67 ; Uppercase # L& LATIN CAPITAL LETTER H WITH DESCENDER @@ -2623,13 +2672,21 @@ A7B8 ; Uppercase # L& LATIN CAPITAL LETTER U WITH STROKE A7BA ; Uppercase # L& LATIN CAPITAL LETTER GLOTTAL A A7BC ; Uppercase # L& LATIN CAPITAL LETTER GLOTTAL I A7BE ; Uppercase # L& LATIN CAPITAL LETTER GLOTTAL U +A7C0 ; Uppercase # L& LATIN CAPITAL LETTER OLD POLISH O A7C2 ; Uppercase # L& LATIN CAPITAL LETTER ANGLICANA W A7C4..A7C7 ; Uppercase # L& [4] LATIN CAPITAL LETTER C WITH PALATAL HOOK..LATIN CAPITAL LETTER D WITH SHORT STROKE OVERLAY A7C9 ; Uppercase # L& LATIN CAPITAL LETTER S WITH SHORT STROKE OVERLAY +A7D0 ; Uppercase # L& LATIN CAPITAL LETTER CLOSED INSULAR G +A7D6 ; Uppercase # L& LATIN CAPITAL LETTER MIDDLE SCOTS S +A7D8 ; Uppercase # L& LATIN CAPITAL LETTER SIGMOID S A7F5 ; Uppercase # L& LATIN CAPITAL LETTER REVERSED HALF H FF21..FF3A ; Uppercase # L& [26] FULLWIDTH LATIN CAPITAL LETTER A..FULLWIDTH LATIN CAPITAL LETTER Z 10400..10427 ; Uppercase # L& [40] DESERET CAPITAL LETTER LONG I..DESERET CAPITAL LETTER EW 104B0..104D3 ; Uppercase # L& [36] OSAGE CAPITAL LETTER A..OSAGE CAPITAL LETTER ZHA +10570..1057A ; Uppercase # L& [11] VITHKUQI CAPITAL LETTER A..VITHKUQI CAPITAL LETTER GA +1057C..1058A ; Uppercase # L& [15] VITHKUQI CAPITAL LETTER HA..VITHKUQI CAPITAL LETTER RE +1058C..10592 ; Uppercase # L& [7] VITHKUQI CAPITAL LETTER SE..VITHKUQI CAPITAL LETTER XE +10594..10595 ; Uppercase # L& [2] VITHKUQI CAPITAL LETTER Y..VITHKUQI CAPITAL LETTER ZE 10C80..10CB2 ; Uppercase # L& [51] OLD HUNGARIAN CAPITAL LETTER A..OLD HUNGARIAN CAPITAL LETTER US 118A0..118BF ; Uppercase # L& [32] WARANG CITI CAPITAL LETTER NGAA..WARANG CITI CAPITAL LETTER VIYO 16E40..16E5F ; Uppercase # L& [32] MEDEFAIDRIN CAPITAL LETTER M..MEDEFAIDRIN CAPITAL LETTER Y @@ -2669,7 +2726,7 @@ FF21..FF3A ; Uppercase # L& [26] FULLWIDTH LATIN CAPITAL LETTER A..FULLWIDTH 1F150..1F169 ; Uppercase # So [26] NEGATIVE CIRCLED LATIN CAPITAL LETTER A..NEGATIVE CIRCLED LATIN CAPITAL LETTER Z 1F170..1F189 ; Uppercase # So [26] NEGATIVE SQUARED LATIN CAPITAL LETTER A..NEGATIVE SQUARED LATIN CAPITAL LETTER Z -# Total code points: 1911 +# Total code points: 1951 # ================================================ @@ -2761,9 +2818,7 @@ FF21..FF3A ; Uppercase # L& [26] FULLWIDTH LATIN CAPITAL LETTER A..FULLWIDTH 2160..217F ; Cased # Nl [32] ROMAN NUMERAL ONE..SMALL ROMAN NUMERAL ONE THOUSAND 2183..2184 ; Cased # L& [2] ROMAN NUMERAL REVERSED ONE HUNDRED..LATIN SMALL LETTER REVERSED C 24B6..24E9 ; Cased # So [52] CIRCLED LATIN CAPITAL LETTER A..CIRCLED LATIN SMALL LETTER Z -2C00..2C2E ; Cased # L& [47] GLAGOLITIC CAPITAL LETTER AZU..GLAGOLITIC CAPITAL LETTER LATINATE MYSLITE -2C30..2C5E ; Cased # L& [47] GLAGOLITIC SMALL LETTER AZU..GLAGOLITIC SMALL LETTER LATINATE MYSLITE -2C60..2C7B ; Cased # L& [28] LATIN CAPITAL LETTER L WITH DOUBLE BAR..LATIN LETTER SMALL CAPITAL TURNED E +2C00..2C7B ; Cased # L& [124] GLAGOLITIC CAPITAL LETTER AZU..LATIN LETTER SMALL CAPITAL TURNED E 2C7C..2C7D ; Cased # Lm [2] LATIN SUBSCRIPT SMALL LETTER J..MODIFIER LETTER CAPITAL V 2C7E..2CE4 ; Cased # L& [103] LATIN CAPITAL LETTER S WITH SWASH TAIL..COPTIC SYMBOL KAI 2CEB..2CEE ; Cased # L& [4] COPTIC CAPITAL LETTER CRYPTOGRAMMIC SHEI..COPTIC SMALL LETTER CRYPTOGRAMMIC GANGIA @@ -2778,8 +2833,10 @@ A722..A76F ; Cased # L& [78] LATIN CAPITAL LETTER EGYPTOLOGICAL ALEF..LATIN A770 ; Cased # Lm MODIFIER LETTER US A771..A787 ; Cased # L& [23] LATIN SMALL LETTER DUM..LATIN SMALL LETTER INSULAR T A78B..A78E ; Cased # L& [4] LATIN CAPITAL LETTER SALTILLO..LATIN SMALL LETTER L WITH RETROFLEX HOOK AND BELT -A790..A7BF ; Cased # L& [48] LATIN CAPITAL LETTER N WITH DESCENDER..LATIN SMALL LETTER GLOTTAL U -A7C2..A7CA ; Cased # L& [9] LATIN CAPITAL LETTER ANGLICANA W..LATIN SMALL LETTER S WITH SHORT STROKE OVERLAY +A790..A7CA ; Cased # L& [59] LATIN CAPITAL LETTER N WITH DESCENDER..LATIN SMALL LETTER S WITH SHORT STROKE OVERLAY +A7D0..A7D1 ; Cased # L& [2] LATIN CAPITAL LETTER CLOSED INSULAR G..LATIN SMALL LETTER CLOSED INSULAR G +A7D3 ; Cased # L& LATIN SMALL LETTER DOUBLE THORN +A7D5..A7D9 ; Cased # L& [5] LATIN SMALL LETTER DOUBLE WYNN..LATIN SMALL LETTER SIGMOID S A7F5..A7F6 ; Cased # L& [2] LATIN CAPITAL LETTER REVERSED HALF H..LATIN SMALL LETTER REVERSED HALF H A7F8..A7F9 ; Cased # Lm [2] MODIFIER LETTER CAPITAL H WITH STROKE..MODIFIER LETTER SMALL LIGATURE OE A7FA ; Cased # L& LATIN LETTER SMALL CAPITAL TURNED M @@ -2794,6 +2851,18 @@ FF41..FF5A ; Cased # L& [26] FULLWIDTH LATIN SMALL LETTER A..FULLWIDTH LATIN 10400..1044F ; Cased # L& [80] DESERET CAPITAL LETTER LONG I..DESERET SMALL LETTER EW 104B0..104D3 ; Cased # L& [36] OSAGE CAPITAL LETTER A..OSAGE CAPITAL LETTER ZHA 104D8..104FB ; Cased # L& [36] OSAGE SMALL LETTER A..OSAGE SMALL LETTER ZHA +10570..1057A ; Cased # L& [11] VITHKUQI CAPITAL LETTER A..VITHKUQI CAPITAL LETTER GA +1057C..1058A ; Cased # L& [15] VITHKUQI CAPITAL LETTER HA..VITHKUQI CAPITAL LETTER RE +1058C..10592 ; Cased # L& [7] VITHKUQI CAPITAL LETTER SE..VITHKUQI CAPITAL LETTER XE +10594..10595 ; Cased # L& [2] VITHKUQI CAPITAL LETTER Y..VITHKUQI CAPITAL LETTER ZE +10597..105A1 ; Cased # L& [11] VITHKUQI SMALL LETTER A..VITHKUQI SMALL LETTER GA +105A3..105B1 ; Cased # L& [15] VITHKUQI SMALL LETTER HA..VITHKUQI SMALL LETTER RE +105B3..105B9 ; Cased # L& [7] VITHKUQI SMALL LETTER SE..VITHKUQI SMALL LETTER XE +105BB..105BC ; Cased # L& [2] VITHKUQI SMALL LETTER Y..VITHKUQI SMALL LETTER ZE +10780 ; Cased # Lm MODIFIER LETTER SMALL CAPITAL AA +10783..10785 ; Cased # Lm [3] MODIFIER LETTER SMALL AE..MODIFIER LETTER SMALL B WITH HOOK +10787..107B0 ; Cased # Lm [42] MODIFIER LETTER SMALL DZ DIGRAPH..MODIFIER LETTER SMALL V WITH RIGHT HOOK +107B2..107BA ; Cased # Lm [9] MODIFIER LETTER SMALL CAPITAL Y..MODIFIER LETTER SMALL S WITH CURL 10C80..10CB2 ; Cased # L& [51] OLD HUNGARIAN CAPITAL LETTER A..OLD HUNGARIAN CAPITAL LETTER US 10CC0..10CF2 ; Cased # L& [51] OLD HUNGARIAN SMALL LETTER A..OLD HUNGARIAN SMALL LETTER US 118A0..118DF ; Cased # L& [64] WARANG CITI CAPITAL LETTER NGAA..WARANG CITI SMALL LETTER VIYO @@ -2828,12 +2897,14 @@ FF41..FF5A ; Cased # L& [26] FULLWIDTH LATIN SMALL LETTER A..FULLWIDTH LATIN 1D78A..1D7A8 ; Cased # L& [31] MATHEMATICAL SANS-SERIF BOLD EPSILON SYMBOL..MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL OMEGA 1D7AA..1D7C2 ; Cased # L& [25] MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL ALPHA..MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL OMEGA 1D7C4..1D7CB ; Cased # L& [8] MATHEMATICAL SANS-SERIF BOLD ITALIC EPSILON SYMBOL..MATHEMATICAL BOLD SMALL DIGAMMA +1DF00..1DF09 ; Cased # L& [10] LATIN SMALL LETTER FENG DIGRAPH WITH TRILL..LATIN SMALL LETTER T WITH HOOK AND RETROFLEX HOOK +1DF0B..1DF1E ; Cased # L& [20] LATIN SMALL LETTER ESH WITH DOUBLE BAR..LATIN SMALL LETTER S WITH CURL 1E900..1E943 ; Cased # L& [68] ADLAM CAPITAL LETTER ALIF..ADLAM SMALL LETTER SHA 1F130..1F149 ; Cased # So [26] SQUARED LATIN CAPITAL LETTER A..SQUARED LATIN CAPITAL LETTER Z 1F150..1F169 ; Cased # So [26] NEGATIVE CIRCLED LATIN CAPITAL LETTER A..NEGATIVE CIRCLED LATIN CAPITAL LETTER Z 1F170..1F189 ; Cased # So [26] NEGATIVE SQUARED LATIN CAPITAL LETTER A..NEGATIVE SQUARED LATIN CAPITAL LETTER Z -# Total code points: 4286 +# Total code points: 4453 # ================================================ @@ -2908,7 +2979,11 @@ FF41..FF5A ; Cased # L& [26] FULLWIDTH LATIN SMALL LETTER A..FULLWIDTH LATIN 0828 ; Case_Ignorable # Lm SAMARITAN MODIFIER LETTER I 0829..082D ; Case_Ignorable # Mn [5] SAMARITAN VOWEL SIGN LONG I..SAMARITAN MARK NEQUDAA 0859..085B ; Case_Ignorable # Mn [3] MANDAIC AFFRICATION MARK..MANDAIC GEMINATION MARK -08D3..08E1 ; Case_Ignorable # Mn [15] ARABIC SMALL LOW WAW..ARABIC SMALL HIGH SIGN SAFHA +0888 ; Case_Ignorable # Sk ARABIC RAISED ROUND DOT +0890..0891 ; Case_Ignorable # Cf [2] ARABIC POUND MARK ABOVE..ARABIC PIASTRE MARK ABOVE +0898..089F ; Case_Ignorable # Mn [8] ARABIC SMALL HIGH WORD AL-JUZ..ARABIC HALF MADDA OVER MADDA +08C9 ; Case_Ignorable # Lm ARABIC SMALL FARSI YEH +08CA..08E1 ; Case_Ignorable # Mn [24] ARABIC SMALL HIGH FARSI YEH..ARABIC SMALL HIGH SIGN SAFHA 08E2 ; Case_Ignorable # Cf ARABIC DISPUTED END OF AYAH 08E3..0902 ; Case_Ignorable # Mn [32] ARABIC TURNED DAMMA BELOW..DEVANAGARI SIGN ANUSVARA 093A ; Case_Ignorable # Mn DEVANAGARI VOWEL SIGN OE @@ -2951,6 +3026,7 @@ FF41..FF5A ; Cased # L& [26] FULLWIDTH LATIN SMALL LETTER A..FULLWIDTH LATIN 0BCD ; Case_Ignorable # Mn TAMIL SIGN VIRAMA 0C00 ; Case_Ignorable # Mn TELUGU SIGN COMBINING CANDRABINDU ABOVE 0C04 ; Case_Ignorable # Mn TELUGU SIGN COMBINING ANUSVARA ABOVE +0C3C ; Case_Ignorable # Mn TELUGU SIGN NUKTA 0C3E..0C40 ; Case_Ignorable # Mn [3] TELUGU VOWEL SIGN AA..TELUGU VOWEL SIGN II 0C46..0C48 ; Case_Ignorable # Mn [3] TELUGU VOWEL SIGN E..TELUGU VOWEL SIGN AI 0C4A..0C4D ; Case_Ignorable # Mn [4] TELUGU VOWEL SIGN O..TELUGU SIGN VIRAMA @@ -3003,7 +3079,7 @@ FF41..FF5A ; Cased # L& [26] FULLWIDTH LATIN SMALL LETTER A..FULLWIDTH LATIN 10FC ; Case_Ignorable # Lm MODIFIER LETTER GEORGIAN NAR 135D..135F ; Case_Ignorable # Mn [3] ETHIOPIC COMBINING GEMINATION AND VOWEL LENGTH MARK..ETHIOPIC COMBINING GEMINATION MARK 1712..1714 ; Case_Ignorable # Mn [3] TAGALOG VOWEL SIGN I..TAGALOG SIGN VIRAMA -1732..1734 ; Case_Ignorable # Mn [3] HANUNOO VOWEL SIGN I..HANUNOO SIGN PAMUDPOD +1732..1733 ; Case_Ignorable # Mn [2] HANUNOO VOWEL SIGN I..HANUNOO VOWEL SIGN U 1752..1753 ; Case_Ignorable # Mn [2] BUHID VOWEL SIGN I..BUHID VOWEL SIGN U 1772..1773 ; Case_Ignorable # Mn [2] TAGBANWA VOWEL SIGN I..TAGBANWA VOWEL SIGN U 17B4..17B5 ; Case_Ignorable # Mn [2] KHMER VOWEL INHERENT AQ..KHMER VOWEL INHERENT AA @@ -3014,6 +3090,7 @@ FF41..FF5A ; Cased # L& [26] FULLWIDTH LATIN SMALL LETTER A..FULLWIDTH LATIN 17DD ; Case_Ignorable # Mn KHMER SIGN ATTHACAN 180B..180D ; Case_Ignorable # Mn [3] MONGOLIAN FREE VARIATION SELECTOR ONE..MONGOLIAN FREE VARIATION SELECTOR THREE 180E ; Case_Ignorable # Cf MONGOLIAN VOWEL SEPARATOR +180F ; Case_Ignorable # Mn MONGOLIAN FREE VARIATION SELECTOR FOUR 1843 ; Case_Ignorable # Lm MONGOLIAN LETTER TODO LONG VOWEL SIGN 1885..1886 ; Case_Ignorable # Mn [2] MONGOLIAN LETTER ALI GALI BALUDA..MONGOLIAN LETTER ALI GALI THREE BALUDA 18A9 ; Case_Ignorable # Mn MONGOLIAN LETTER ALI GALI DAGALGA @@ -3033,7 +3110,7 @@ FF41..FF5A ; Cased # L& [26] FULLWIDTH LATIN SMALL LETTER A..FULLWIDTH LATIN 1AA7 ; Case_Ignorable # Lm TAI THAM SIGN MAI YAMOK 1AB0..1ABD ; Case_Ignorable # Mn [14] COMBINING DOUBLED CIRCUMFLEX ACCENT..COMBINING PARENTHESES BELOW 1ABE ; Case_Ignorable # Me COMBINING PARENTHESES OVERLAY -1ABF..1AC0 ; Case_Ignorable # Mn [2] COMBINING LATIN SMALL LETTER W BELOW..COMBINING LATIN SMALL LETTER TURNED W BELOW +1ABF..1ACE ; Case_Ignorable # Mn [16] COMBINING LATIN SMALL LETTER W BELOW..COMBINING LATIN SMALL LETTER INSULAR T 1B00..1B03 ; Case_Ignorable # Mn [4] BALINESE SIGN ULU RICEM..BALINESE SIGN SURANG 1B34 ; Case_Ignorable # Mn BALINESE SIGN REREKAN 1B36..1B3A ; Case_Ignorable # Mn [5] BALINESE VOWEL SIGN ULU..BALINESE VOWEL SIGN RA REPA @@ -3060,8 +3137,7 @@ FF41..FF5A ; Cased # L& [26] FULLWIDTH LATIN SMALL LETTER A..FULLWIDTH LATIN 1D2C..1D6A ; Case_Ignorable # Lm [63] MODIFIER LETTER CAPITAL A..GREEK SUBSCRIPT SMALL LETTER CHI 1D78 ; Case_Ignorable # Lm MODIFIER LETTER CYRILLIC EN 1D9B..1DBF ; Case_Ignorable # Lm [37] MODIFIER LETTER SMALL TURNED ALPHA..MODIFIER LETTER SMALL THETA -1DC0..1DF9 ; Case_Ignorable # Mn [58] COMBINING DOTTED GRAVE ACCENT..COMBINING WIDE INVERTED BRIDGE BELOW -1DFB..1DFF ; Case_Ignorable # Mn [5] COMBINING DELETION MARK..COMBINING RIGHT ARROWHEAD AND DOWN ARROWHEAD BELOW +1DC0..1DFF ; Case_Ignorable # Mn [64] COMBINING DOTTED GRAVE ACCENT..COMBINING RIGHT ARROWHEAD AND DOWN ARROWHEAD BELOW 1FBD ; Case_Ignorable # Sk GREEK KORONIS 1FBF..1FC1 ; Case_Ignorable # Sk [3] GREEK PSILI..GREEK DIALYTIKA AND PERISPOMENI 1FCD..1FCF ; Case_Ignorable # Sk [3] GREEK PSILI AND VARIA..GREEK PSILI AND PERISPOMENI @@ -3114,6 +3190,7 @@ A720..A721 ; Case_Ignorable # Sk [2] MODIFIER LETTER STRESS AND HIGH TONE.. A770 ; Case_Ignorable # Lm MODIFIER LETTER US A788 ; Case_Ignorable # Lm MODIFIER LETTER LOW CIRCUMFLEX ACCENT A789..A78A ; Case_Ignorable # Sk [2] MODIFIER LETTER COLON..MODIFIER LETTER SHORT EQUALS SIGN +A7F2..A7F4 ; Case_Ignorable # Lm [3] MODIFIER LETTER CAPITAL C..MODIFIER LETTER CAPITAL Q A7F8..A7F9 ; Case_Ignorable # Lm [2] MODIFIER LETTER CAPITAL H WITH STROKE..MODIFIER LETTER SMALL LIGATURE OE A802 ; Case_Ignorable # Mn SYLOTI NAGRI SIGN DVISVARA A806 ; Case_Ignorable # Mn SYLOTI NAGRI SIGN HASANTA @@ -3156,7 +3233,7 @@ ABE5 ; Case_Ignorable # Mn MEETEI MAYEK VOWEL SIGN ANAP ABE8 ; Case_Ignorable # Mn MEETEI MAYEK VOWEL SIGN UNAP ABED ; Case_Ignorable # Mn MEETEI MAYEK APUN IYEK FB1E ; Case_Ignorable # Mn HEBREW POINT JUDEO-SPANISH VARIKA -FBB2..FBC1 ; Case_Ignorable # Sk [16] ARABIC SYMBOL DOT ABOVE..ARABIC SYMBOL SMALL TAH BELOW +FBB2..FBC2 ; Case_Ignorable # Sk [17] ARABIC SYMBOL DOT ABOVE..ARABIC SYMBOL WASLA ABOVE FE00..FE0F ; Case_Ignorable # Mn [16] VARIATION SELECTOR-1..VARIATION SELECTOR-16 FE13 ; Case_Ignorable # Po PRESENTATION FORM FOR VERTICAL COLON FE20..FE2F ; Case_Ignorable # Mn [16] COMBINING LIGATURE LEFT HALF..COMBINING CYRILLIC TITLO RIGHT HALF @@ -3175,6 +3252,9 @@ FFF9..FFFB ; Case_Ignorable # Cf [3] INTERLINEAR ANNOTATION ANCHOR..INTERLI 101FD ; Case_Ignorable # Mn PHAISTOS DISC SIGN COMBINING OBLIQUE STROKE 102E0 ; Case_Ignorable # Mn COPTIC EPACT THOUSANDS MARK 10376..1037A ; Case_Ignorable # Mn [5] COMBINING OLD PERMIC LETTER AN..COMBINING OLD PERMIC LETTER SII +10780..10785 ; Case_Ignorable # Lm [6] MODIFIER LETTER SMALL CAPITAL AA..MODIFIER LETTER SMALL B WITH HOOK +10787..107B0 ; Case_Ignorable # Lm [42] MODIFIER LETTER SMALL DZ DIGRAPH..MODIFIER LETTER SMALL V WITH RIGHT HOOK +107B2..107BA ; Case_Ignorable # Lm [9] MODIFIER LETTER SMALL CAPITAL Y..MODIFIER LETTER SMALL S WITH CURL 10A01..10A03 ; Case_Ignorable # Mn [3] KHAROSHTHI VOWEL SIGN I..KHAROSHTHI VOWEL SIGN VOCALIC R 10A05..10A06 ; Case_Ignorable # Mn [2] KHAROSHTHI VOWEL SIGN E..KHAROSHTHI VOWEL SIGN O 10A0C..10A0F ; Case_Ignorable # Mn [4] KHAROSHTHI VOWEL LENGTH MARK..KHAROSHTHI SIGN VISARGA @@ -3184,12 +3264,16 @@ FFF9..FFFB ; Case_Ignorable # Cf [3] INTERLINEAR ANNOTATION ANCHOR..INTERLI 10D24..10D27 ; Case_Ignorable # Mn [4] HANIFI ROHINGYA SIGN HARBAHAY..HANIFI ROHINGYA SIGN TASSI 10EAB..10EAC ; Case_Ignorable # Mn [2] YEZIDI COMBINING HAMZA MARK..YEZIDI COMBINING MADDA MARK 10F46..10F50 ; Case_Ignorable # Mn [11] SOGDIAN COMBINING DOT BELOW..SOGDIAN COMBINING STROKE BELOW +10F82..10F85 ; Case_Ignorable # Mn [4] OLD UYGHUR COMBINING DOT ABOVE..OLD UYGHUR COMBINING TWO DOTS BELOW 11001 ; Case_Ignorable # Mn BRAHMI SIGN ANUSVARA 11038..11046 ; Case_Ignorable # Mn [15] BRAHMI VOWEL SIGN AA..BRAHMI VIRAMA +11070 ; Case_Ignorable # Mn BRAHMI SIGN OLD TAMIL VIRAMA +11073..11074 ; Case_Ignorable # Mn [2] BRAHMI VOWEL SIGN OLD TAMIL SHORT E..BRAHMI VOWEL SIGN OLD TAMIL SHORT O 1107F..11081 ; Case_Ignorable # Mn [3] BRAHMI NUMBER JOINER..KAITHI SIGN ANUSVARA 110B3..110B6 ; Case_Ignorable # Mn [4] KAITHI VOWEL SIGN U..KAITHI VOWEL SIGN AI 110B9..110BA ; Case_Ignorable # Mn [2] KAITHI SIGN VIRAMA..KAITHI SIGN NUKTA 110BD ; Case_Ignorable # Cf KAITHI NUMBER SIGN +110C2 ; Case_Ignorable # Mn KAITHI VOWEL SIGN VOCALIC R 110CD ; Case_Ignorable # Cf KAITHI NUMBER SIGN ABOVE 11100..11102 ; Case_Ignorable # Mn [3] CHAKMA SIGN CANDRABINDU..CHAKMA SIGN VISARGA 11127..1112B ; Case_Ignorable # Mn [5] CHAKMA VOWEL SIGN A..CHAKMA VOWEL SIGN UU @@ -3274,8 +3358,13 @@ FFF9..FFFB ; Case_Ignorable # Cf [3] INTERLINEAR ANNOTATION ANCHOR..INTERLI 16FE0..16FE1 ; Case_Ignorable # Lm [2] TANGUT ITERATION MARK..NUSHU ITERATION MARK 16FE3 ; Case_Ignorable # Lm OLD CHINESE ITERATION MARK 16FE4 ; Case_Ignorable # Mn KHITAN SMALL SCRIPT FILLER +1AFF0..1AFF3 ; Case_Ignorable # Lm [4] KATAKANA LETTER MINNAN TONE-2..KATAKANA LETTER MINNAN TONE-5 +1AFF5..1AFFB ; Case_Ignorable # Lm [7] KATAKANA LETTER MINNAN TONE-7..KATAKANA LETTER MINNAN NASALIZED TONE-5 +1AFFD..1AFFE ; Case_Ignorable # Lm [2] KATAKANA LETTER MINNAN NASALIZED TONE-7..KATAKANA LETTER MINNAN NASALIZED TONE-8 1BC9D..1BC9E ; Case_Ignorable # Mn [2] DUPLOYAN THICK LETTER SELECTOR..DUPLOYAN DOUBLE MARK 1BCA0..1BCA3 ; Case_Ignorable # Cf [4] SHORTHAND FORMAT LETTER OVERLAP..SHORTHAND FORMAT UP STEP +1CF00..1CF2D ; Case_Ignorable # Mn [46] ZNAMENNY COMBINING MARK GORAZDO NIZKO S KRYZHEM ON LEFT..ZNAMENNY COMBINING MARK KRYZH ON LEFT +1CF30..1CF46 ; Case_Ignorable # Mn [23] ZNAMENNY COMBINING TONAL RANGE MARK MRACHNO..ZNAMENNY PRIZNAK MODIFIER ROG 1D167..1D169 ; Case_Ignorable # Mn [3] MUSICAL SYMBOL COMBINING TREMOLO-1..MUSICAL SYMBOL COMBINING TREMOLO-3 1D173..1D17A ; Case_Ignorable # Cf [8] MUSICAL SYMBOL BEGIN BEAM..MUSICAL SYMBOL END PHRASE 1D17B..1D182 ; Case_Ignorable # Mn [8] MUSICAL SYMBOL COMBINING ACCENT..MUSICAL SYMBOL COMBINING LOURE @@ -3295,6 +3384,7 @@ FFF9..FFFB ; Case_Ignorable # Cf [3] INTERLINEAR ANNOTATION ANCHOR..INTERLI 1E026..1E02A ; Case_Ignorable # Mn [5] COMBINING GLAGOLITIC LETTER YO..COMBINING GLAGOLITIC LETTER FITA 1E130..1E136 ; Case_Ignorable # Mn [7] NYIAKENG PUACHUE HMONG TONE-B..NYIAKENG PUACHUE HMONG TONE-D 1E137..1E13D ; Case_Ignorable # Lm [7] NYIAKENG PUACHUE HMONG SIGN FOR PERSON..NYIAKENG PUACHUE HMONG SYLLABLE LENGTHENER +1E2AE ; Case_Ignorable # Mn TOTO SIGN RISING TONE 1E2EC..1E2EF ; Case_Ignorable # Mn [4] WANCHO TONE TUP..WANCHO TONE KOINI 1E8D0..1E8D6 ; Case_Ignorable # Mn [7] MENDE KIKAKUI COMBINING NUMBER TEENS..MENDE KIKAKUI COMBINING NUMBER MILLIONS 1E944..1E94A ; Case_Ignorable # Mn [7] ADLAM ALIF LENGTHENER..ADLAM NUKTA @@ -3304,7 +3394,7 @@ E0001 ; Case_Ignorable # Cf LANGUAGE TAG E0020..E007F ; Case_Ignorable # Cf [96] TAG SPACE..CANCEL TAG E0100..E01EF ; Case_Ignorable # Mn [240] VARIATION SELECTOR-17..VARIATION SELECTOR-256 -# Total code points: 2413 +# Total code points: 2602 # ================================================ @@ -3738,7 +3828,7 @@ E0100..E01EF ; Case_Ignorable # Mn [240] VARIATION SELECTOR-17..VARIATION SELEC 2160..216F ; Changes_When_Lowercased # Nl [16] ROMAN NUMERAL ONE..ROMAN NUMERAL ONE THOUSAND 2183 ; Changes_When_Lowercased # L& ROMAN NUMERAL REVERSED ONE HUNDRED 24B6..24CF ; Changes_When_Lowercased # So [26] CIRCLED LATIN CAPITAL LETTER A..CIRCLED LATIN CAPITAL LETTER Z -2C00..2C2E ; Changes_When_Lowercased # L& [47] GLAGOLITIC CAPITAL LETTER AZU..GLAGOLITIC CAPITAL LETTER LATINATE MYSLITE +2C00..2C2F ; Changes_When_Lowercased # L& [48] GLAGOLITIC CAPITAL LETTER AZU..GLAGOLITIC CAPITAL LETTER CAUDATE CHRIVI 2C60 ; Changes_When_Lowercased # L& LATIN CAPITAL LETTER L WITH DOUBLE BAR 2C62..2C64 ; Changes_When_Lowercased # L& [3] LATIN CAPITAL LETTER L WITH MIDDLE TILDE..LATIN CAPITAL LETTER R WITH TAIL 2C67 ; Changes_When_Lowercased # L& LATIN CAPITAL LETTER H WITH DESCENDER @@ -3903,19 +3993,27 @@ A7B8 ; Changes_When_Lowercased # L& LATIN CAPITAL LETTER U WITH S A7BA ; Changes_When_Lowercased # L& LATIN CAPITAL LETTER GLOTTAL A A7BC ; Changes_When_Lowercased # L& LATIN CAPITAL LETTER GLOTTAL I A7BE ; Changes_When_Lowercased # L& LATIN CAPITAL LETTER GLOTTAL U +A7C0 ; Changes_When_Lowercased # L& LATIN CAPITAL LETTER OLD POLISH O A7C2 ; Changes_When_Lowercased # L& LATIN CAPITAL LETTER ANGLICANA W A7C4..A7C7 ; Changes_When_Lowercased # L& [4] LATIN CAPITAL LETTER C WITH PALATAL HOOK..LATIN CAPITAL LETTER D WITH SHORT STROKE OVERLAY A7C9 ; Changes_When_Lowercased # L& LATIN CAPITAL LETTER S WITH SHORT STROKE OVERLAY +A7D0 ; Changes_When_Lowercased # L& LATIN CAPITAL LETTER CLOSED INSULAR G +A7D6 ; Changes_When_Lowercased # L& LATIN CAPITAL LETTER MIDDLE SCOTS S +A7D8 ; Changes_When_Lowercased # L& LATIN CAPITAL LETTER SIGMOID S A7F5 ; Changes_When_Lowercased # L& LATIN CAPITAL LETTER REVERSED HALF H FF21..FF3A ; Changes_When_Lowercased # L& [26] FULLWIDTH LATIN CAPITAL LETTER A..FULLWIDTH LATIN CAPITAL LETTER Z 10400..10427 ; Changes_When_Lowercased # L& [40] DESERET CAPITAL LETTER LONG I..DESERET CAPITAL LETTER EW 104B0..104D3 ; Changes_When_Lowercased # L& [36] OSAGE CAPITAL LETTER A..OSAGE CAPITAL LETTER ZHA +10570..1057A ; Changes_When_Lowercased # L& [11] VITHKUQI CAPITAL LETTER A..VITHKUQI CAPITAL LETTER GA +1057C..1058A ; Changes_When_Lowercased # L& [15] VITHKUQI CAPITAL LETTER HA..VITHKUQI CAPITAL LETTER RE +1058C..10592 ; Changes_When_Lowercased # L& [7] VITHKUQI CAPITAL LETTER SE..VITHKUQI CAPITAL LETTER XE +10594..10595 ; Changes_When_Lowercased # L& [2] VITHKUQI CAPITAL LETTER Y..VITHKUQI CAPITAL LETTER ZE 10C80..10CB2 ; Changes_When_Lowercased # L& [51] OLD HUNGARIAN CAPITAL LETTER A..OLD HUNGARIAN CAPITAL LETTER US 118A0..118BF ; Changes_When_Lowercased # L& [32] WARANG CITI CAPITAL LETTER NGAA..WARANG CITI CAPITAL LETTER VIYO 16E40..16E5F ; Changes_When_Lowercased # L& [32] MEDEFAIDRIN CAPITAL LETTER M..MEDEFAIDRIN CAPITAL LETTER Y 1E900..1E921 ; Changes_When_Lowercased # L& [34] ADLAM CAPITAL LETTER ALIF..ADLAM CAPITAL LETTER SHA -# Total code points: 1393 +# Total code points: 1433 # ================================================ @@ -4363,7 +4461,7 @@ FF21..FF3A ; Changes_When_Lowercased # L& [26] FULLWIDTH LATIN CAPITAL LETTE 2170..217F ; Changes_When_Uppercased # Nl [16] SMALL ROMAN NUMERAL ONE..SMALL ROMAN NUMERAL ONE THOUSAND 2184 ; Changes_When_Uppercased # L& LATIN SMALL LETTER REVERSED C 24D0..24E9 ; Changes_When_Uppercased # So [26] CIRCLED LATIN SMALL LETTER A..CIRCLED LATIN SMALL LETTER Z -2C30..2C5E ; Changes_When_Uppercased # L& [47] GLAGOLITIC SMALL LETTER AZU..GLAGOLITIC SMALL LETTER LATINATE MYSLITE +2C30..2C5F ; Changes_When_Uppercased # L& [48] GLAGOLITIC SMALL LETTER AZU..GLAGOLITIC SMALL LETTER CAUDATE CHRIVI 2C61 ; Changes_When_Uppercased # L& LATIN SMALL LETTER L WITH DOUBLE BAR 2C65..2C66 ; Changes_When_Uppercased # L& [2] LATIN SMALL LETTER A WITH STROKE..LATIN SMALL LETTER T WITH DIAGONAL STROKE 2C68 ; Changes_When_Uppercased # L& LATIN SMALL LETTER H WITH DESCENDER @@ -4528,9 +4626,13 @@ A7B9 ; Changes_When_Uppercased # L& LATIN SMALL LETTER U WITH STR A7BB ; Changes_When_Uppercased # L& LATIN SMALL LETTER GLOTTAL A A7BD ; Changes_When_Uppercased # L& LATIN SMALL LETTER GLOTTAL I A7BF ; Changes_When_Uppercased # L& LATIN SMALL LETTER GLOTTAL U +A7C1 ; Changes_When_Uppercased # L& LATIN SMALL LETTER OLD POLISH O A7C3 ; Changes_When_Uppercased # L& LATIN SMALL LETTER ANGLICANA W A7C8 ; Changes_When_Uppercased # L& LATIN SMALL LETTER D WITH SHORT STROKE OVERLAY A7CA ; Changes_When_Uppercased # L& LATIN SMALL LETTER S WITH SHORT STROKE OVERLAY +A7D1 ; Changes_When_Uppercased # L& LATIN SMALL LETTER CLOSED INSULAR G +A7D7 ; Changes_When_Uppercased # L& LATIN SMALL LETTER MIDDLE SCOTS S +A7D9 ; Changes_When_Uppercased # L& LATIN SMALL LETTER SIGMOID S A7F6 ; Changes_When_Uppercased # L& LATIN SMALL LETTER REVERSED HALF H AB53 ; Changes_When_Uppercased # L& LATIN SMALL LETTER CHI AB70..ABBF ; Changes_When_Uppercased # L& [80] CHEROKEE SMALL LETTER A..CHEROKEE SMALL LETTER YA @@ -4539,12 +4641,16 @@ FB13..FB17 ; Changes_When_Uppercased # L& [5] ARMENIAN SMALL LIGATURE MEN N FF41..FF5A ; Changes_When_Uppercased # L& [26] FULLWIDTH LATIN SMALL LETTER A..FULLWIDTH LATIN SMALL LETTER Z 10428..1044F ; Changes_When_Uppercased # L& [40] DESERET SMALL LETTER LONG I..DESERET SMALL LETTER EW 104D8..104FB ; Changes_When_Uppercased # L& [36] OSAGE SMALL LETTER A..OSAGE SMALL LETTER ZHA +10597..105A1 ; Changes_When_Uppercased # L& [11] VITHKUQI SMALL LETTER A..VITHKUQI SMALL LETTER GA +105A3..105B1 ; Changes_When_Uppercased # L& [15] VITHKUQI SMALL LETTER HA..VITHKUQI SMALL LETTER RE +105B3..105B9 ; Changes_When_Uppercased # L& [7] VITHKUQI SMALL LETTER SE..VITHKUQI SMALL LETTER XE +105BB..105BC ; Changes_When_Uppercased # L& [2] VITHKUQI SMALL LETTER Y..VITHKUQI SMALL LETTER ZE 10CC0..10CF2 ; Changes_When_Uppercased # L& [51] OLD HUNGARIAN SMALL LETTER A..OLD HUNGARIAN SMALL LETTER US 118C0..118DF ; Changes_When_Uppercased # L& [32] WARANG CITI SMALL LETTER NGAA..WARANG CITI SMALL LETTER VIYO 16E60..16E7F ; Changes_When_Uppercased # L& [32] MEDEFAIDRIN SMALL LETTER M..MEDEFAIDRIN SMALL LETTER Y 1E922..1E943 ; Changes_When_Uppercased # L& [34] ADLAM SMALL LETTER ALIF..ADLAM SMALL LETTER SHA -# Total code points: 1485 +# Total code points: 1525 # ================================================ @@ -4991,7 +5097,7 @@ FF41..FF5A ; Changes_When_Uppercased # L& [26] FULLWIDTH LATIN SMALL LETTER 2170..217F ; Changes_When_Titlecased # Nl [16] SMALL ROMAN NUMERAL ONE..SMALL ROMAN NUMERAL ONE THOUSAND 2184 ; Changes_When_Titlecased # L& LATIN SMALL LETTER REVERSED C 24D0..24E9 ; Changes_When_Titlecased # So [26] CIRCLED LATIN SMALL LETTER A..CIRCLED LATIN SMALL LETTER Z -2C30..2C5E ; Changes_When_Titlecased # L& [47] GLAGOLITIC SMALL LETTER AZU..GLAGOLITIC SMALL LETTER LATINATE MYSLITE +2C30..2C5F ; Changes_When_Titlecased # L& [48] GLAGOLITIC SMALL LETTER AZU..GLAGOLITIC SMALL LETTER CAUDATE CHRIVI 2C61 ; Changes_When_Titlecased # L& LATIN SMALL LETTER L WITH DOUBLE BAR 2C65..2C66 ; Changes_When_Titlecased # L& [2] LATIN SMALL LETTER A WITH STROKE..LATIN SMALL LETTER T WITH DIAGONAL STROKE 2C68 ; Changes_When_Titlecased # L& LATIN SMALL LETTER H WITH DESCENDER @@ -5156,9 +5262,13 @@ A7B9 ; Changes_When_Titlecased # L& LATIN SMALL LETTER U WITH STR A7BB ; Changes_When_Titlecased # L& LATIN SMALL LETTER GLOTTAL A A7BD ; Changes_When_Titlecased # L& LATIN SMALL LETTER GLOTTAL I A7BF ; Changes_When_Titlecased # L& LATIN SMALL LETTER GLOTTAL U +A7C1 ; Changes_When_Titlecased # L& LATIN SMALL LETTER OLD POLISH O A7C3 ; Changes_When_Titlecased # L& LATIN SMALL LETTER ANGLICANA W A7C8 ; Changes_When_Titlecased # L& LATIN SMALL LETTER D WITH SHORT STROKE OVERLAY A7CA ; Changes_When_Titlecased # L& LATIN SMALL LETTER S WITH SHORT STROKE OVERLAY +A7D1 ; Changes_When_Titlecased # L& LATIN SMALL LETTER CLOSED INSULAR G +A7D7 ; Changes_When_Titlecased # L& LATIN SMALL LETTER MIDDLE SCOTS S +A7D9 ; Changes_When_Titlecased # L& LATIN SMALL LETTER SIGMOID S A7F6 ; Changes_When_Titlecased # L& LATIN SMALL LETTER REVERSED HALF H AB53 ; Changes_When_Titlecased # L& LATIN SMALL LETTER CHI AB70..ABBF ; Changes_When_Titlecased # L& [80] CHEROKEE SMALL LETTER A..CHEROKEE SMALL LETTER YA @@ -5167,12 +5277,16 @@ FB13..FB17 ; Changes_When_Titlecased # L& [5] ARMENIAN SMALL LIGATURE MEN N FF41..FF5A ; Changes_When_Titlecased # L& [26] FULLWIDTH LATIN SMALL LETTER A..FULLWIDTH LATIN SMALL LETTER Z 10428..1044F ; Changes_When_Titlecased # L& [40] DESERET SMALL LETTER LONG I..DESERET SMALL LETTER EW 104D8..104FB ; Changes_When_Titlecased # L& [36] OSAGE SMALL LETTER A..OSAGE SMALL LETTER ZHA +10597..105A1 ; Changes_When_Titlecased # L& [11] VITHKUQI SMALL LETTER A..VITHKUQI SMALL LETTER GA +105A3..105B1 ; Changes_When_Titlecased # L& [15] VITHKUQI SMALL LETTER HA..VITHKUQI SMALL LETTER RE +105B3..105B9 ; Changes_When_Titlecased # L& [7] VITHKUQI SMALL LETTER SE..VITHKUQI SMALL LETTER XE +105BB..105BC ; Changes_When_Titlecased # L& [2] VITHKUQI SMALL LETTER Y..VITHKUQI SMALL LETTER ZE 10CC0..10CF2 ; Changes_When_Titlecased # L& [51] OLD HUNGARIAN SMALL LETTER A..OLD HUNGARIAN SMALL LETTER US 118C0..118DF ; Changes_When_Titlecased # L& [32] WARANG CITI SMALL LETTER NGAA..WARANG CITI SMALL LETTER VIYO 16E60..16E7F ; Changes_When_Titlecased # L& [32] MEDEFAIDRIN SMALL LETTER M..MEDEFAIDRIN SMALL LETTER Y 1E922..1E943 ; Changes_When_Titlecased # L& [34] ADLAM SMALL LETTER ALIF..ADLAM SMALL LETTER SHA -# Total code points: 1412 +# Total code points: 1452 # ================================================ @@ -5616,7 +5730,7 @@ FF41..FF5A ; Changes_When_Titlecased # L& [26] FULLWIDTH LATIN SMALL LETTER 2160..216F ; Changes_When_Casefolded # Nl [16] ROMAN NUMERAL ONE..ROMAN NUMERAL ONE THOUSAND 2183 ; Changes_When_Casefolded # L& ROMAN NUMERAL REVERSED ONE HUNDRED 24B6..24CF ; Changes_When_Casefolded # So [26] CIRCLED LATIN CAPITAL LETTER A..CIRCLED LATIN CAPITAL LETTER Z -2C00..2C2E ; Changes_When_Casefolded # L& [47] GLAGOLITIC CAPITAL LETTER AZU..GLAGOLITIC CAPITAL LETTER LATINATE MYSLITE +2C00..2C2F ; Changes_When_Casefolded # L& [48] GLAGOLITIC CAPITAL LETTER AZU..GLAGOLITIC CAPITAL LETTER CAUDATE CHRIVI 2C60 ; Changes_When_Casefolded # L& LATIN CAPITAL LETTER L WITH DOUBLE BAR 2C62..2C64 ; Changes_When_Casefolded # L& [3] LATIN CAPITAL LETTER L WITH MIDDLE TILDE..LATIN CAPITAL LETTER R WITH TAIL 2C67 ; Changes_When_Casefolded # L& LATIN CAPITAL LETTER H WITH DESCENDER @@ -5781,9 +5895,13 @@ A7B8 ; Changes_When_Casefolded # L& LATIN CAPITAL LETTER U WITH S A7BA ; Changes_When_Casefolded # L& LATIN CAPITAL LETTER GLOTTAL A A7BC ; Changes_When_Casefolded # L& LATIN CAPITAL LETTER GLOTTAL I A7BE ; Changes_When_Casefolded # L& LATIN CAPITAL LETTER GLOTTAL U +A7C0 ; Changes_When_Casefolded # L& LATIN CAPITAL LETTER OLD POLISH O A7C2 ; Changes_When_Casefolded # L& LATIN CAPITAL LETTER ANGLICANA W A7C4..A7C7 ; Changes_When_Casefolded # L& [4] LATIN CAPITAL LETTER C WITH PALATAL HOOK..LATIN CAPITAL LETTER D WITH SHORT STROKE OVERLAY A7C9 ; Changes_When_Casefolded # L& LATIN CAPITAL LETTER S WITH SHORT STROKE OVERLAY +A7D0 ; Changes_When_Casefolded # L& LATIN CAPITAL LETTER CLOSED INSULAR G +A7D6 ; Changes_When_Casefolded # L& LATIN CAPITAL LETTER MIDDLE SCOTS S +A7D8 ; Changes_When_Casefolded # L& LATIN CAPITAL LETTER SIGMOID S A7F5 ; Changes_When_Casefolded # L& LATIN CAPITAL LETTER REVERSED HALF H AB70..ABBF ; Changes_When_Casefolded # L& [80] CHEROKEE SMALL LETTER A..CHEROKEE SMALL LETTER YA FB00..FB06 ; Changes_When_Casefolded # L& [7] LATIN SMALL LIGATURE FF..LATIN SMALL LIGATURE ST @@ -5791,12 +5909,16 @@ FB13..FB17 ; Changes_When_Casefolded # L& [5] ARMENIAN SMALL LIGATURE MEN N FF21..FF3A ; Changes_When_Casefolded # L& [26] FULLWIDTH LATIN CAPITAL LETTER A..FULLWIDTH LATIN CAPITAL LETTER Z 10400..10427 ; Changes_When_Casefolded # L& [40] DESERET CAPITAL LETTER LONG I..DESERET CAPITAL LETTER EW 104B0..104D3 ; Changes_When_Casefolded # L& [36] OSAGE CAPITAL LETTER A..OSAGE CAPITAL LETTER ZHA +10570..1057A ; Changes_When_Casefolded # L& [11] VITHKUQI CAPITAL LETTER A..VITHKUQI CAPITAL LETTER GA +1057C..1058A ; Changes_When_Casefolded # L& [15] VITHKUQI CAPITAL LETTER HA..VITHKUQI CAPITAL LETTER RE +1058C..10592 ; Changes_When_Casefolded # L& [7] VITHKUQI CAPITAL LETTER SE..VITHKUQI CAPITAL LETTER XE +10594..10595 ; Changes_When_Casefolded # L& [2] VITHKUQI CAPITAL LETTER Y..VITHKUQI CAPITAL LETTER ZE 10C80..10CB2 ; Changes_When_Casefolded # L& [51] OLD HUNGARIAN CAPITAL LETTER A..OLD HUNGARIAN CAPITAL LETTER US 118A0..118BF ; Changes_When_Casefolded # L& [32] WARANG CITI CAPITAL LETTER NGAA..WARANG CITI CAPITAL LETTER VIYO 16E40..16E5F ; Changes_When_Casefolded # L& [32] MEDEFAIDRIN CAPITAL LETTER M..MEDEFAIDRIN CAPITAL LETTER Y 1E900..1E921 ; Changes_When_Casefolded # L& [34] ADLAM CAPITAL LETTER ALIF..ADLAM CAPITAL LETTER SHA -# Total code points: 1466 +# Total code points: 1506 # ================================================ @@ -5893,9 +6015,7 @@ FF21..FF3A ; Changes_When_Casefolded # L& [26] FULLWIDTH LATIN CAPITAL LETTE 2160..217F ; Changes_When_Casemapped # Nl [32] ROMAN NUMERAL ONE..SMALL ROMAN NUMERAL ONE THOUSAND 2183..2184 ; Changes_When_Casemapped # L& [2] ROMAN NUMERAL REVERSED ONE HUNDRED..LATIN SMALL LETTER REVERSED C 24B6..24E9 ; Changes_When_Casemapped # So [52] CIRCLED LATIN CAPITAL LETTER A..CIRCLED LATIN SMALL LETTER Z -2C00..2C2E ; Changes_When_Casemapped # L& [47] GLAGOLITIC CAPITAL LETTER AZU..GLAGOLITIC CAPITAL LETTER LATINATE MYSLITE -2C30..2C5E ; Changes_When_Casemapped # L& [47] GLAGOLITIC SMALL LETTER AZU..GLAGOLITIC SMALL LETTER LATINATE MYSLITE -2C60..2C70 ; Changes_When_Casemapped # L& [17] LATIN CAPITAL LETTER L WITH DOUBLE BAR..LATIN CAPITAL LETTER TURNED ALPHA +2C00..2C70 ; Changes_When_Casemapped # L& [113] GLAGOLITIC CAPITAL LETTER AZU..LATIN CAPITAL LETTER TURNED ALPHA 2C72..2C73 ; Changes_When_Casemapped # L& [2] LATIN CAPITAL LETTER W WITH HOOK..LATIN SMALL LETTER W WITH HOOK 2C75..2C76 ; Changes_When_Casemapped # L& [2] LATIN CAPITAL LETTER HALF H..LATIN SMALL LETTER HALF H 2C7E..2CE3 ; Changes_When_Casemapped # L& [102] LATIN CAPITAL LETTER S WITH SWASH TAIL..COPTIC SMALL LETTER OLD NUBIAN WAU @@ -5912,8 +6032,9 @@ A779..A787 ; Changes_When_Casemapped # L& [15] LATIN CAPITAL LETTER INSULAR A78B..A78D ; Changes_When_Casemapped # L& [3] LATIN CAPITAL LETTER SALTILLO..LATIN CAPITAL LETTER TURNED H A790..A794 ; Changes_When_Casemapped # L& [5] LATIN CAPITAL LETTER N WITH DESCENDER..LATIN SMALL LETTER C WITH PALATAL HOOK A796..A7AE ; Changes_When_Casemapped # L& [25] LATIN CAPITAL LETTER B WITH FLOURISH..LATIN CAPITAL LETTER SMALL CAPITAL I -A7B0..A7BF ; Changes_When_Casemapped # L& [16] LATIN CAPITAL LETTER TURNED K..LATIN SMALL LETTER GLOTTAL U -A7C2..A7CA ; Changes_When_Casemapped # L& [9] LATIN CAPITAL LETTER ANGLICANA W..LATIN SMALL LETTER S WITH SHORT STROKE OVERLAY +A7B0..A7CA ; Changes_When_Casemapped # L& [27] LATIN CAPITAL LETTER TURNED K..LATIN SMALL LETTER S WITH SHORT STROKE OVERLAY +A7D0..A7D1 ; Changes_When_Casemapped # L& [2] LATIN CAPITAL LETTER CLOSED INSULAR G..LATIN SMALL LETTER CLOSED INSULAR G +A7D6..A7D9 ; Changes_When_Casemapped # L& [4] LATIN CAPITAL LETTER MIDDLE SCOTS S..LATIN SMALL LETTER SIGMOID S A7F5..A7F6 ; Changes_When_Casemapped # L& [2] LATIN CAPITAL LETTER REVERSED HALF H..LATIN SMALL LETTER REVERSED HALF H AB53 ; Changes_When_Casemapped # L& LATIN SMALL LETTER CHI AB70..ABBF ; Changes_When_Casemapped # L& [80] CHEROKEE SMALL LETTER A..CHEROKEE SMALL LETTER YA @@ -5924,13 +6045,21 @@ FF41..FF5A ; Changes_When_Casemapped # L& [26] FULLWIDTH LATIN SMALL LETTER 10400..1044F ; Changes_When_Casemapped # L& [80] DESERET CAPITAL LETTER LONG I..DESERET SMALL LETTER EW 104B0..104D3 ; Changes_When_Casemapped # L& [36] OSAGE CAPITAL LETTER A..OSAGE CAPITAL LETTER ZHA 104D8..104FB ; Changes_When_Casemapped # L& [36] OSAGE SMALL LETTER A..OSAGE SMALL LETTER ZHA +10570..1057A ; Changes_When_Casemapped # L& [11] VITHKUQI CAPITAL LETTER A..VITHKUQI CAPITAL LETTER GA +1057C..1058A ; Changes_When_Casemapped # L& [15] VITHKUQI CAPITAL LETTER HA..VITHKUQI CAPITAL LETTER RE +1058C..10592 ; Changes_When_Casemapped # L& [7] VITHKUQI CAPITAL LETTER SE..VITHKUQI CAPITAL LETTER XE +10594..10595 ; Changes_When_Casemapped # L& [2] VITHKUQI CAPITAL LETTER Y..VITHKUQI CAPITAL LETTER ZE +10597..105A1 ; Changes_When_Casemapped # L& [11] VITHKUQI SMALL LETTER A..VITHKUQI SMALL LETTER GA +105A3..105B1 ; Changes_When_Casemapped # L& [15] VITHKUQI SMALL LETTER HA..VITHKUQI SMALL LETTER RE +105B3..105B9 ; Changes_When_Casemapped # L& [7] VITHKUQI SMALL LETTER SE..VITHKUQI SMALL LETTER XE +105BB..105BC ; Changes_When_Casemapped # L& [2] VITHKUQI SMALL LETTER Y..VITHKUQI SMALL LETTER ZE 10C80..10CB2 ; Changes_When_Casemapped # L& [51] OLD HUNGARIAN CAPITAL LETTER A..OLD HUNGARIAN CAPITAL LETTER US 10CC0..10CF2 ; Changes_When_Casemapped # L& [51] OLD HUNGARIAN SMALL LETTER A..OLD HUNGARIAN SMALL LETTER US 118A0..118DF ; Changes_When_Casemapped # L& [64] WARANG CITI CAPITAL LETTER NGAA..WARANG CITI SMALL LETTER VIYO 16E40..16E7F ; Changes_When_Casemapped # L& [64] MEDEFAIDRIN CAPITAL LETTER M..MEDEFAIDRIN SMALL LETTER Y 1E900..1E943 ; Changes_When_Casemapped # L& [68] ADLAM CAPITAL LETTER ALIF..ADLAM SMALL LETTER SHA -# Total code points: 2847 +# Total code points: 2927 # ================================================ @@ -6003,8 +6132,10 @@ FF41..FF5A ; Changes_When_Casemapped # L& [26] FULLWIDTH LATIN SMALL LETTER 0828 ; ID_Start # Lm SAMARITAN MODIFIER LETTER I 0840..0858 ; ID_Start # Lo [25] MANDAIC LETTER HALQA..MANDAIC LETTER AIN 0860..086A ; ID_Start # Lo [11] SYRIAC LETTER MALAYALAM NGA..SYRIAC LETTER MALAYALAM SSA -08A0..08B4 ; ID_Start # Lo [21] ARABIC LETTER BEH WITH SMALL V BELOW..ARABIC LETTER KAF WITH DOT BELOW -08B6..08C7 ; ID_Start # Lo [18] ARABIC LETTER BEH WITH SMALL MEEM ABOVE..ARABIC LETTER LAM WITH SMALL ARABIC LETTER TAH ABOVE +0870..0887 ; ID_Start # Lo [24] ARABIC LETTER ALEF WITH ATTACHED FATHA..ARABIC BASELINE ROUND DOT +0889..088E ; ID_Start # Lo [6] ARABIC LETTER NOON WITH INVERTED SMALL V..ARABIC VERTICAL TAIL +08A0..08C8 ; ID_Start # Lo [41] ARABIC LETTER BEH WITH SMALL V BELOW..ARABIC LETTER GRAF +08C9 ; ID_Start # Lm ARABIC SMALL FARSI YEH 0904..0939 ; ID_Start # Lo [54] DEVANAGARI LETTER SHORT A..DEVANAGARI LETTER HA 093D ; ID_Start # Lo DEVANAGARI SIGN AVAGRAHA 0950 ; ID_Start # Lo DEVANAGARI OM @@ -6070,6 +6201,7 @@ FF41..FF5A ; Changes_When_Casemapped # L& [26] FULLWIDTH LATIN SMALL LETTER 0C2A..0C39 ; ID_Start # Lo [16] TELUGU LETTER PA..TELUGU LETTER HA 0C3D ; ID_Start # Lo TELUGU SIGN AVAGRAHA 0C58..0C5A ; ID_Start # Lo [3] TELUGU LETTER TSA..TELUGU LETTER RRRA +0C5D ; ID_Start # Lo TELUGU LETTER NAKAARA POLLU 0C60..0C61 ; ID_Start # Lo [2] TELUGU LETTER VOCALIC RR..TELUGU LETTER VOCALIC LL 0C80 ; ID_Start # Lo KANNADA SIGN SPACING CANDRABINDU 0C85..0C8C ; ID_Start # Lo [8] KANNADA LETTER A..KANNADA LETTER VOCALIC L @@ -6078,7 +6210,7 @@ FF41..FF5A ; Changes_When_Casemapped # L& [26] FULLWIDTH LATIN SMALL LETTER 0CAA..0CB3 ; ID_Start # Lo [10] KANNADA LETTER PA..KANNADA LETTER LLA 0CB5..0CB9 ; ID_Start # Lo [5] KANNADA LETTER VA..KANNADA LETTER HA 0CBD ; ID_Start # Lo KANNADA SIGN AVAGRAHA -0CDE ; ID_Start # Lo KANNADA LETTER FA +0CDD..0CDE ; ID_Start # Lo [2] KANNADA LETTER NAKAARA POLLU..KANNADA LETTER FA 0CE0..0CE1 ; ID_Start # Lo [2] KANNADA LETTER VOCALIC RR..KANNADA LETTER VOCALIC LL 0CF1..0CF2 ; ID_Start # Lo [2] KANNADA SIGN JIHVAMULIYA..KANNADA SIGN UPADHMANIYA 0D04..0D0C ; ID_Start # Lo [9] MALAYALAM LETTER VEDIC ANUSVARA..MALAYALAM LETTER VOCALIC L @@ -6153,9 +6285,8 @@ FF41..FF5A ; Changes_When_Casemapped # L& [26] FULLWIDTH LATIN SMALL LETTER 16A0..16EA ; ID_Start # Lo [75] RUNIC LETTER FEHU FEOH FE F..RUNIC LETTER X 16EE..16F0 ; ID_Start # Nl [3] RUNIC ARLAUG SYMBOL..RUNIC BELGTHOR SYMBOL 16F1..16F8 ; ID_Start # Lo [8] RUNIC LETTER K..RUNIC LETTER FRANKS CASKET AESC -1700..170C ; ID_Start # Lo [13] TAGALOG LETTER A..TAGALOG LETTER YA -170E..1711 ; ID_Start # Lo [4] TAGALOG LETTER LA..TAGALOG LETTER HA -1720..1731 ; ID_Start # Lo [18] HANUNOO LETTER A..HANUNOO LETTER HA +1700..1711 ; ID_Start # Lo [18] TAGALOG LETTER A..TAGALOG LETTER HA +171F..1731 ; ID_Start # Lo [19] TAGALOG LETTER ARCHAIC RA..HANUNOO LETTER HA 1740..1751 ; ID_Start # Lo [18] BUHID LETTER A..BUHID LETTER HA 1760..176C ; ID_Start # Lo [13] TAGBANWA LETTER A..TAGBANWA LETTER YA 176E..1770 ; ID_Start # Lo [3] TAGBANWA LETTER LA..TAGBANWA LETTER SA @@ -6179,7 +6310,7 @@ FF41..FF5A ; Changes_When_Casemapped # L& [26] FULLWIDTH LATIN SMALL LETTER 1A20..1A54 ; ID_Start # Lo [53] TAI THAM LETTER HIGH KA..TAI THAM LETTER GREAT SA 1AA7 ; ID_Start # Lm TAI THAM SIGN MAI YAMOK 1B05..1B33 ; ID_Start # Lo [47] BALINESE LETTER AKARA..BALINESE LETTER HA -1B45..1B4B ; ID_Start # Lo [7] BALINESE LETTER KAF SASAK..BALINESE LETTER ASYURA SASAK +1B45..1B4C ; ID_Start # Lo [8] BALINESE LETTER KAF SASAK..BALINESE LETTER ARCHAIC JNYA 1B83..1BA0 ; ID_Start # Lo [30] SUNDANESE LETTER A..SUNDANESE LETTER HA 1BAE..1BAF ; ID_Start # Lo [2] SUNDANESE LETTER KHA..SUNDANESE LETTER SYA 1BBA..1BE5 ; ID_Start # Lo [44] SUNDANESE AVAGRAHA..BATAK LETTER U @@ -6242,9 +6373,7 @@ FF41..FF5A ; Changes_When_Casemapped # L& [26] FULLWIDTH LATIN SMALL LETTER 2160..2182 ; ID_Start # Nl [35] ROMAN NUMERAL ONE..ROMAN NUMERAL TEN THOUSAND 2183..2184 ; ID_Start # L& [2] ROMAN NUMERAL REVERSED ONE HUNDRED..LATIN SMALL LETTER REVERSED C 2185..2188 ; ID_Start # Nl [4] ROMAN NUMERAL SIX LATE FORM..ROMAN NUMERAL ONE HUNDRED THOUSAND -2C00..2C2E ; ID_Start # L& [47] GLAGOLITIC CAPITAL LETTER AZU..GLAGOLITIC CAPITAL LETTER LATINATE MYSLITE -2C30..2C5E ; ID_Start # L& [47] GLAGOLITIC SMALL LETTER AZU..GLAGOLITIC SMALL LETTER LATINATE MYSLITE -2C60..2C7B ; ID_Start # L& [28] LATIN CAPITAL LETTER L WITH DOUBLE BAR..LATIN LETTER SMALL CAPITAL TURNED E +2C00..2C7B ; ID_Start # L& [124] GLAGOLITIC CAPITAL LETTER AZU..LATIN LETTER SMALL CAPITAL TURNED E 2C7C..2C7D ; ID_Start # Lm [2] LATIN SUBSCRIPT SMALL LETTER J..MODIFIER LETTER CAPITAL V 2C7E..2CE4 ; ID_Start # L& [103] LATIN CAPITAL LETTER S WITH SWASH TAIL..COPTIC SYMBOL KAI 2CEB..2CEE ; ID_Start # L& [4] COPTIC CAPITAL LETTER CRYPTOGRAMMIC SHEI..COPTIC SMALL LETTER CRYPTOGRAMMIC GANGIA @@ -6283,8 +6412,7 @@ FF41..FF5A ; Changes_When_Casemapped # L& [26] FULLWIDTH LATIN SMALL LETTER 31A0..31BF ; ID_Start # Lo [32] BOPOMOFO LETTER BU..BOPOMOFO LETTER AH 31F0..31FF ; ID_Start # Lo [16] KATAKANA LETTER SMALL KU..KATAKANA LETTER SMALL RO 3400..4DBF ; ID_Start # Lo [6592] CJK UNIFIED IDEOGRAPH-3400..CJK UNIFIED IDEOGRAPH-4DBF -4E00..9FFC ; ID_Start # Lo [20989] CJK UNIFIED IDEOGRAPH-4E00..CJK UNIFIED IDEOGRAPH-9FFC -A000..A014 ; ID_Start # Lo [21] YI SYLLABLE IT..YI SYLLABLE E +4E00..A014 ; ID_Start # Lo [21013] CJK UNIFIED IDEOGRAPH-4E00..YI SYLLABLE E A015 ; ID_Start # Lm YI SYLLABLE WU A016..A48C ; ID_Start # Lo [1143] YI SYLLABLE BIT..YI SYLLABLE YYR A4D0..A4F7 ; ID_Start # Lo [40] LISU LETTER BA..LISU LETTER OE @@ -6307,8 +6435,11 @@ A771..A787 ; ID_Start # L& [23] LATIN SMALL LETTER DUM..LATIN SMALL LETTER I A788 ; ID_Start # Lm MODIFIER LETTER LOW CIRCUMFLEX ACCENT A78B..A78E ; ID_Start # L& [4] LATIN CAPITAL LETTER SALTILLO..LATIN SMALL LETTER L WITH RETROFLEX HOOK AND BELT A78F ; ID_Start # Lo LATIN LETTER SINOLOGICAL DOT -A790..A7BF ; ID_Start # L& [48] LATIN CAPITAL LETTER N WITH DESCENDER..LATIN SMALL LETTER GLOTTAL U -A7C2..A7CA ; ID_Start # L& [9] LATIN CAPITAL LETTER ANGLICANA W..LATIN SMALL LETTER S WITH SHORT STROKE OVERLAY +A790..A7CA ; ID_Start # L& [59] LATIN CAPITAL LETTER N WITH DESCENDER..LATIN SMALL LETTER S WITH SHORT STROKE OVERLAY +A7D0..A7D1 ; ID_Start # L& [2] LATIN CAPITAL LETTER CLOSED INSULAR G..LATIN SMALL LETTER CLOSED INSULAR G +A7D3 ; ID_Start # L& LATIN SMALL LETTER DOUBLE THORN +A7D5..A7D9 ; ID_Start # L& [5] LATIN SMALL LETTER DOUBLE WYNN..LATIN SMALL LETTER SIGMOID S +A7F2..A7F4 ; ID_Start # Lm [3] MODIFIER LETTER CAPITAL C..MODIFIER LETTER CAPITAL Q A7F5..A7F6 ; ID_Start # L& [2] LATIN CAPITAL LETTER REVERSED HALF H..LATIN SMALL LETTER REVERSED HALF H A7F7 ; ID_Start # Lo LATIN EPIGRAPHIC LETTER SIDEWAYS I A7F8..A7F9 ; ID_Start # Lm [2] MODIFIER LETTER CAPITAL H WITH STROKE..MODIFIER LETTER SMALL LIGATURE OE @@ -6418,9 +6549,20 @@ FFDA..FFDC ; ID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL 104D8..104FB ; ID_Start # L& [36] OSAGE SMALL LETTER A..OSAGE SMALL LETTER ZHA 10500..10527 ; ID_Start # Lo [40] ELBASAN LETTER A..ELBASAN LETTER KHE 10530..10563 ; ID_Start # Lo [52] CAUCASIAN ALBANIAN LETTER ALT..CAUCASIAN ALBANIAN LETTER KIW +10570..1057A ; ID_Start # L& [11] VITHKUQI CAPITAL LETTER A..VITHKUQI CAPITAL LETTER GA +1057C..1058A ; ID_Start # L& [15] VITHKUQI CAPITAL LETTER HA..VITHKUQI CAPITAL LETTER RE +1058C..10592 ; ID_Start # L& [7] VITHKUQI CAPITAL LETTER SE..VITHKUQI CAPITAL LETTER XE +10594..10595 ; ID_Start # L& [2] VITHKUQI CAPITAL LETTER Y..VITHKUQI CAPITAL LETTER ZE +10597..105A1 ; ID_Start # L& [11] VITHKUQI SMALL LETTER A..VITHKUQI SMALL LETTER GA +105A3..105B1 ; ID_Start # L& [15] VITHKUQI SMALL LETTER HA..VITHKUQI SMALL LETTER RE +105B3..105B9 ; ID_Start # L& [7] VITHKUQI SMALL LETTER SE..VITHKUQI SMALL LETTER XE +105BB..105BC ; ID_Start # L& [2] VITHKUQI SMALL LETTER Y..VITHKUQI SMALL LETTER ZE 10600..10736 ; ID_Start # Lo [311] LINEAR A SIGN AB001..LINEAR A SIGN A664 10740..10755 ; ID_Start # Lo [22] LINEAR A SIGN A701 A..LINEAR A SIGN A732 JE 10760..10767 ; ID_Start # Lo [8] LINEAR A SIGN A800..LINEAR A SIGN A807 +10780..10785 ; ID_Start # Lm [6] MODIFIER LETTER SMALL CAPITAL AA..MODIFIER LETTER SMALL B WITH HOOK +10787..107B0 ; ID_Start # Lm [42] MODIFIER LETTER SMALL DZ DIGRAPH..MODIFIER LETTER SMALL V WITH RIGHT HOOK +107B2..107BA ; ID_Start # Lm [9] MODIFIER LETTER SMALL CAPITAL Y..MODIFIER LETTER SMALL S WITH CURL 10800..10805 ; ID_Start # Lo [6] CYPRIOT SYLLABLE A..CYPRIOT SYLLABLE JA 10808 ; ID_Start # Lo CYPRIOT SYLLABLE JO 1080A..10835 ; ID_Start # Lo [44] CYPRIOT SYLLABLE KA..CYPRIOT SYLLABLE WO @@ -6456,9 +6598,12 @@ FFDA..FFDC ; ID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL 10F00..10F1C ; ID_Start # Lo [29] OLD SOGDIAN LETTER ALEPH..OLD SOGDIAN LETTER FINAL TAW WITH VERTICAL TAIL 10F27 ; ID_Start # Lo OLD SOGDIAN LIGATURE AYIN-DALETH 10F30..10F45 ; ID_Start # Lo [22] SOGDIAN LETTER ALEPH..SOGDIAN INDEPENDENT SHIN +10F70..10F81 ; ID_Start # Lo [18] OLD UYGHUR LETTER ALEPH..OLD UYGHUR LETTER LESH 10FB0..10FC4 ; ID_Start # Lo [21] CHORASMIAN LETTER ALEPH..CHORASMIAN LETTER TAW 10FE0..10FF6 ; ID_Start # Lo [23] ELYMAIC LETTER ALEPH..ELYMAIC LIGATURE ZAYIN-YODH 11003..11037 ; ID_Start # Lo [53] BRAHMI SIGN JIHVAMULIYA..BRAHMI LETTER OLD TAMIL NNNA +11071..11072 ; ID_Start # Lo [2] BRAHMI LETTER OLD TAMIL SHORT E..BRAHMI LETTER OLD TAMIL SHORT O +11075 ; ID_Start # Lo BRAHMI LETTER OLD TAMIL LLA 11083..110AF ; ID_Start # Lo [45] KAITHI LETTER A..KAITHI LETTER HA 110D0..110E8 ; ID_Start # Lo [25] SORA SOMPENG LETTER SAH..SORA SOMPENG LETTER MAE 11103..11126 ; ID_Start # Lo [36] CHAKMA LETTER AA..CHAKMA LETTER HAA @@ -6500,6 +6645,7 @@ FFDA..FFDC ; ID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL 11680..116AA ; ID_Start # Lo [43] TAKRI LETTER A..TAKRI LETTER RRA 116B8 ; ID_Start # Lo TAKRI LETTER ARCHAIC KHA 11700..1171A ; ID_Start # Lo [27] AHOM LETTER KA..AHOM LETTER ALTERNATE BA +11740..11746 ; ID_Start # Lo [7] AHOM LETTER CA..AHOM LETTER LLA 11800..1182B ; ID_Start # Lo [44] DOGRA LETTER A..DOGRA LETTER RRA 118A0..118DF ; ID_Start # L& [64] WARANG CITI CAPITAL LETTER NGAA..WARANG CITI SMALL LETTER VIYO 118FF..11906 ; ID_Start # Lo [8] WARANG CITI OM..DIVES AKURU LETTER E @@ -6519,7 +6665,7 @@ FFDA..FFDC ; ID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL 11A50 ; ID_Start # Lo SOYOMBO LETTER A 11A5C..11A89 ; ID_Start # Lo [46] SOYOMBO LETTER KA..SOYOMBO CLUSTER-INITIAL LETTER SA 11A9D ; ID_Start # Lo SOYOMBO MARK PLUTA -11AC0..11AF8 ; ID_Start # Lo [57] PAU CIN HAU LETTER PA..PAU CIN HAU GLOTTAL STOP FINAL +11AB0..11AF8 ; ID_Start # Lo [73] CANADIAN SYLLABICS NATTILIK HI..PAU CIN HAU GLOTTAL STOP FINAL 11C00..11C08 ; ID_Start # Lo [9] BHAIKSUKI LETTER A..BHAIKSUKI LETTER VOCALIC L 11C0A..11C2E ; ID_Start # Lo [37] BHAIKSUKI LETTER E..BHAIKSUKI LETTER HA 11C40 ; ID_Start # Lo BHAIKSUKI SIGN AVAGRAHA @@ -6537,10 +6683,12 @@ FFDA..FFDC ; ID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL 12000..12399 ; ID_Start # Lo [922] CUNEIFORM SIGN A..CUNEIFORM SIGN U U 12400..1246E ; ID_Start # Nl [111] CUNEIFORM NUMERIC SIGN TWO ASH..CUNEIFORM NUMERIC SIGN NINE U VARIANT FORM 12480..12543 ; ID_Start # Lo [196] CUNEIFORM SIGN AB TIMES NUN TENU..CUNEIFORM SIGN ZU5 TIMES THREE DISH TENU +12F90..12FF0 ; ID_Start # Lo [97] CYPRO-MINOAN SIGN CM001..CYPRO-MINOAN SIGN CM114 13000..1342E ; ID_Start # Lo [1071] EGYPTIAN HIEROGLYPH A001..EGYPTIAN HIEROGLYPH AA032 14400..14646 ; ID_Start # Lo [583] ANATOLIAN HIEROGLYPH A001..ANATOLIAN HIEROGLYPH A530 16800..16A38 ; ID_Start # Lo [569] BAMUM LETTER PHASE-A NGKUE MFON..BAMUM LETTER PHASE-F VUEQ 16A40..16A5E ; ID_Start # Lo [31] MRO LETTER TA..MRO LETTER TEK +16A70..16ABE ; ID_Start # Lo [79] TANGSA LETTER OZ..TANGSA LETTER ZA 16AD0..16AED ; ID_Start # Lo [30] BASSA VAH LETTER ENNI..BASSA VAH LETTER I 16B00..16B2F ; ID_Start # Lo [48] PAHAWH HMONG VOWEL KEEB..PAHAWH HMONG CONSONANT CAU 16B40..16B43 ; ID_Start # Lm [4] PAHAWH HMONG SIGN VOS SEEV..PAHAWH HMONG SIGN IB YAM @@ -6555,7 +6703,10 @@ FFDA..FFDC ; ID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL 17000..187F7 ; ID_Start # Lo [6136] TANGUT IDEOGRAPH-17000..TANGUT IDEOGRAPH-187F7 18800..18CD5 ; ID_Start # Lo [1238] TANGUT COMPONENT-001..KHITAN SMALL SCRIPT CHARACTER-18CD5 18D00..18D08 ; ID_Start # Lo [9] TANGUT IDEOGRAPH-18D00..TANGUT IDEOGRAPH-18D08 -1B000..1B11E ; ID_Start # Lo [287] KATAKANA LETTER ARCHAIC E..HENTAIGANA LETTER N-MU-MO-2 +1AFF0..1AFF3 ; ID_Start # Lm [4] KATAKANA LETTER MINNAN TONE-2..KATAKANA LETTER MINNAN TONE-5 +1AFF5..1AFFB ; ID_Start # Lm [7] KATAKANA LETTER MINNAN TONE-7..KATAKANA LETTER MINNAN NASALIZED TONE-5 +1AFFD..1AFFE ; ID_Start # Lm [2] KATAKANA LETTER MINNAN NASALIZED TONE-7..KATAKANA LETTER MINNAN NASALIZED TONE-8 +1B000..1B122 ; ID_Start # Lo [291] KATAKANA LETTER ARCHAIC E..KATAKANA LETTER ARCHAIC WU 1B150..1B152 ; ID_Start # Lo [3] HIRAGANA LETTER SMALL WI..HIRAGANA LETTER SMALL WO 1B164..1B167 ; ID_Start # Lo [4] KATAKANA LETTER SMALL WI..KATAKANA LETTER SMALL N 1B170..1B2FB ; ID_Start # Lo [396] NUSHU CHARACTER-1B170..NUSHU CHARACTER-1B2FB @@ -6593,10 +6744,18 @@ FFDA..FFDC ; ID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL 1D78A..1D7A8 ; ID_Start # L& [31] MATHEMATICAL SANS-SERIF BOLD EPSILON SYMBOL..MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL OMEGA 1D7AA..1D7C2 ; ID_Start # L& [25] MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL ALPHA..MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL OMEGA 1D7C4..1D7CB ; ID_Start # L& [8] MATHEMATICAL SANS-SERIF BOLD ITALIC EPSILON SYMBOL..MATHEMATICAL BOLD SMALL DIGAMMA +1DF00..1DF09 ; ID_Start # L& [10] LATIN SMALL LETTER FENG DIGRAPH WITH TRILL..LATIN SMALL LETTER T WITH HOOK AND RETROFLEX HOOK +1DF0A ; ID_Start # Lo LATIN LETTER RETROFLEX CLICK WITH RETROFLEX HOOK +1DF0B..1DF1E ; ID_Start # L& [20] LATIN SMALL LETTER ESH WITH DOUBLE BAR..LATIN SMALL LETTER S WITH CURL 1E100..1E12C ; ID_Start # Lo [45] NYIAKENG PUACHUE HMONG LETTER MA..NYIAKENG PUACHUE HMONG LETTER W 1E137..1E13D ; ID_Start # Lm [7] NYIAKENG PUACHUE HMONG SIGN FOR PERSON..NYIAKENG PUACHUE HMONG SYLLABLE LENGTHENER 1E14E ; ID_Start # Lo NYIAKENG PUACHUE HMONG LOGOGRAM NYAJ +1E290..1E2AD ; ID_Start # Lo [30] TOTO LETTER PA..TOTO LETTER A 1E2C0..1E2EB ; ID_Start # Lo [44] WANCHO LETTER AA..WANCHO LETTER YIH +1E7E0..1E7E6 ; ID_Start # Lo [7] ETHIOPIC SYLLABLE HHYA..ETHIOPIC SYLLABLE HHYO +1E7E8..1E7EB ; ID_Start # Lo [4] ETHIOPIC SYLLABLE GURAGE HHWA..ETHIOPIC SYLLABLE HHWE +1E7ED..1E7EE ; ID_Start # Lo [2] ETHIOPIC SYLLABLE GURAGE MWI..ETHIOPIC SYLLABLE GURAGE MWEE +1E7F0..1E7FE ; ID_Start # Lo [15] ETHIOPIC SYLLABLE GURAGE QWI..ETHIOPIC SYLLABLE GURAGE PWEE 1E800..1E8C4 ; ID_Start # Lo [197] MENDE KIKAKUI SYLLABLE M001 KI..MENDE KIKAKUI SYLLABLE M060 NYON 1E900..1E943 ; ID_Start # L& [68] ADLAM CAPITAL LETTER ALIF..ADLAM SMALL LETTER SHA 1E94B ; ID_Start # Lm ADLAM NASALIZATION MARK @@ -6633,15 +6792,15 @@ FFDA..FFDC ; ID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL 1EEA1..1EEA3 ; ID_Start # Lo [3] ARABIC MATHEMATICAL DOUBLE-STRUCK BEH..ARABIC MATHEMATICAL DOUBLE-STRUCK DAL 1EEA5..1EEA9 ; ID_Start # Lo [5] ARABIC MATHEMATICAL DOUBLE-STRUCK WAW..ARABIC MATHEMATICAL DOUBLE-STRUCK YEH 1EEAB..1EEBB ; ID_Start # Lo [17] ARABIC MATHEMATICAL DOUBLE-STRUCK LAM..ARABIC MATHEMATICAL DOUBLE-STRUCK GHAIN -20000..2A6DD ; ID_Start # Lo [42718] CJK UNIFIED IDEOGRAPH-20000..CJK UNIFIED IDEOGRAPH-2A6DD -2A700..2B734 ; ID_Start # Lo [4149] CJK UNIFIED IDEOGRAPH-2A700..CJK UNIFIED IDEOGRAPH-2B734 +20000..2A6DF ; ID_Start # Lo [42720] CJK UNIFIED IDEOGRAPH-20000..CJK UNIFIED IDEOGRAPH-2A6DF +2A700..2B738 ; ID_Start # Lo [4153] CJK UNIFIED IDEOGRAPH-2A700..CJK UNIFIED IDEOGRAPH-2B738 2B740..2B81D ; ID_Start # Lo [222] CJK UNIFIED IDEOGRAPH-2B740..CJK UNIFIED IDEOGRAPH-2B81D 2B820..2CEA1 ; ID_Start # Lo [5762] CJK UNIFIED IDEOGRAPH-2B820..CJK UNIFIED IDEOGRAPH-2CEA1 2CEB0..2EBE0 ; ID_Start # Lo [7473] CJK UNIFIED IDEOGRAPH-2CEB0..CJK UNIFIED IDEOGRAPH-2EBE0 2F800..2FA1D ; ID_Start # Lo [542] CJK COMPATIBILITY IDEOGRAPH-2F800..CJK COMPATIBILITY IDEOGRAPH-2FA1D 30000..3134A ; ID_Start # Lo [4939] CJK UNIFIED IDEOGRAPH-30000..CJK UNIFIED IDEOGRAPH-3134A -# Total code points: 131482 +# Total code points: 131997 # ================================================ @@ -6746,9 +6905,12 @@ FFDA..FFDC ; ID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL 0840..0858 ; ID_Continue # Lo [25] MANDAIC LETTER HALQA..MANDAIC LETTER AIN 0859..085B ; ID_Continue # Mn [3] MANDAIC AFFRICATION MARK..MANDAIC GEMINATION MARK 0860..086A ; ID_Continue # Lo [11] SYRIAC LETTER MALAYALAM NGA..SYRIAC LETTER MALAYALAM SSA -08A0..08B4 ; ID_Continue # Lo [21] ARABIC LETTER BEH WITH SMALL V BELOW..ARABIC LETTER KAF WITH DOT BELOW -08B6..08C7 ; ID_Continue # Lo [18] ARABIC LETTER BEH WITH SMALL MEEM ABOVE..ARABIC LETTER LAM WITH SMALL ARABIC LETTER TAH ABOVE -08D3..08E1 ; ID_Continue # Mn [15] ARABIC SMALL LOW WAW..ARABIC SMALL HIGH SIGN SAFHA +0870..0887 ; ID_Continue # Lo [24] ARABIC LETTER ALEF WITH ATTACHED FATHA..ARABIC BASELINE ROUND DOT +0889..088E ; ID_Continue # Lo [6] ARABIC LETTER NOON WITH INVERTED SMALL V..ARABIC VERTICAL TAIL +0898..089F ; ID_Continue # Mn [8] ARABIC SMALL HIGH WORD AL-JUZ..ARABIC HALF MADDA OVER MADDA +08A0..08C8 ; ID_Continue # Lo [41] ARABIC LETTER BEH WITH SMALL V BELOW..ARABIC LETTER GRAF +08C9 ; ID_Continue # Lm ARABIC SMALL FARSI YEH +08CA..08E1 ; ID_Continue # Mn [24] ARABIC SMALL HIGH FARSI YEH..ARABIC SMALL HIGH SIGN SAFHA 08E3..0902 ; ID_Continue # Mn [32] ARABIC TURNED DAMMA BELOW..DEVANAGARI SIGN ANUSVARA 0903 ; ID_Continue # Mc DEVANAGARI SIGN VISARGA 0904..0939 ; ID_Continue # Lo [54] DEVANAGARI LETTER SHORT A..DEVANAGARI LETTER HA @@ -6886,6 +7048,7 @@ FFDA..FFDC ; ID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL 0C0E..0C10 ; ID_Continue # Lo [3] TELUGU LETTER E..TELUGU LETTER AI 0C12..0C28 ; ID_Continue # Lo [23] TELUGU LETTER O..TELUGU LETTER NA 0C2A..0C39 ; ID_Continue # Lo [16] TELUGU LETTER PA..TELUGU LETTER HA +0C3C ; ID_Continue # Mn TELUGU SIGN NUKTA 0C3D ; ID_Continue # Lo TELUGU SIGN AVAGRAHA 0C3E..0C40 ; ID_Continue # Mn [3] TELUGU VOWEL SIGN AA..TELUGU VOWEL SIGN II 0C41..0C44 ; ID_Continue # Mc [4] TELUGU VOWEL SIGN U..TELUGU VOWEL SIGN VOCALIC RR @@ -6893,6 +7056,7 @@ FFDA..FFDC ; ID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL 0C4A..0C4D ; ID_Continue # Mn [4] TELUGU VOWEL SIGN O..TELUGU SIGN VIRAMA 0C55..0C56 ; ID_Continue # Mn [2] TELUGU LENGTH MARK..TELUGU AI LENGTH MARK 0C58..0C5A ; ID_Continue # Lo [3] TELUGU LETTER TSA..TELUGU LETTER RRRA +0C5D ; ID_Continue # Lo TELUGU LETTER NAKAARA POLLU 0C60..0C61 ; ID_Continue # Lo [2] TELUGU LETTER VOCALIC RR..TELUGU LETTER VOCALIC LL 0C62..0C63 ; ID_Continue # Mn [2] TELUGU VOWEL SIGN VOCALIC L..TELUGU VOWEL SIGN VOCALIC LL 0C66..0C6F ; ID_Continue # Nd [10] TELUGU DIGIT ZERO..TELUGU DIGIT NINE @@ -6914,7 +7078,7 @@ FFDA..FFDC ; ID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL 0CCA..0CCB ; ID_Continue # Mc [2] KANNADA VOWEL SIGN O..KANNADA VOWEL SIGN OO 0CCC..0CCD ; ID_Continue # Mn [2] KANNADA VOWEL SIGN AU..KANNADA SIGN VIRAMA 0CD5..0CD6 ; ID_Continue # Mc [2] KANNADA LENGTH MARK..KANNADA AI LENGTH MARK -0CDE ; ID_Continue # Lo KANNADA LETTER FA +0CDD..0CDE ; ID_Continue # Lo [2] KANNADA LETTER NAKAARA POLLU..KANNADA LETTER FA 0CE0..0CE1 ; ID_Continue # Lo [2] KANNADA LETTER VOCALIC RR..KANNADA LETTER VOCALIC LL 0CE2..0CE3 ; ID_Continue # Mn [2] KANNADA VOWEL SIGN VOCALIC L..KANNADA VOWEL SIGN VOCALIC LL 0CE6..0CEF ; ID_Continue # Nd [10] KANNADA DIGIT ZERO..KANNADA DIGIT NINE @@ -7058,11 +7222,12 @@ FFDA..FFDC ; ID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL 16A0..16EA ; ID_Continue # Lo [75] RUNIC LETTER FEHU FEOH FE F..RUNIC LETTER X 16EE..16F0 ; ID_Continue # Nl [3] RUNIC ARLAUG SYMBOL..RUNIC BELGTHOR SYMBOL 16F1..16F8 ; ID_Continue # Lo [8] RUNIC LETTER K..RUNIC LETTER FRANKS CASKET AESC -1700..170C ; ID_Continue # Lo [13] TAGALOG LETTER A..TAGALOG LETTER YA -170E..1711 ; ID_Continue # Lo [4] TAGALOG LETTER LA..TAGALOG LETTER HA +1700..1711 ; ID_Continue # Lo [18] TAGALOG LETTER A..TAGALOG LETTER HA 1712..1714 ; ID_Continue # Mn [3] TAGALOG VOWEL SIGN I..TAGALOG SIGN VIRAMA -1720..1731 ; ID_Continue # Lo [18] HANUNOO LETTER A..HANUNOO LETTER HA -1732..1734 ; ID_Continue # Mn [3] HANUNOO VOWEL SIGN I..HANUNOO SIGN PAMUDPOD +1715 ; ID_Continue # Mc TAGALOG SIGN PAMUDPOD +171F..1731 ; ID_Continue # Lo [19] TAGALOG LETTER ARCHAIC RA..HANUNOO LETTER HA +1732..1733 ; ID_Continue # Mn [2] HANUNOO VOWEL SIGN I..HANUNOO VOWEL SIGN U +1734 ; ID_Continue # Mc HANUNOO SIGN PAMUDPOD 1740..1751 ; ID_Continue # Lo [18] BUHID LETTER A..BUHID LETTER HA 1752..1753 ; ID_Continue # Mn [2] BUHID VOWEL SIGN I..BUHID VOWEL SIGN U 1760..176C ; ID_Continue # Lo [13] TAGBANWA LETTER A..TAGBANWA LETTER YA @@ -7081,6 +7246,7 @@ FFDA..FFDC ; ID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL 17DD ; ID_Continue # Mn KHMER SIGN ATTHACAN 17E0..17E9 ; ID_Continue # Nd [10] KHMER DIGIT ZERO..KHMER DIGIT NINE 180B..180D ; ID_Continue # Mn [3] MONGOLIAN FREE VARIATION SELECTOR ONE..MONGOLIAN FREE VARIATION SELECTOR THREE +180F ; ID_Continue # Mn MONGOLIAN FREE VARIATION SELECTOR FOUR 1810..1819 ; ID_Continue # Nd [10] MONGOLIAN DIGIT ZERO..MONGOLIAN DIGIT NINE 1820..1842 ; ID_Continue # Lo [35] MONGOLIAN LETTER A..MONGOLIAN LETTER CHI 1843 ; ID_Continue # Lm MONGOLIAN LETTER TODO LONG VOWEL SIGN @@ -7128,7 +7294,7 @@ FFDA..FFDC ; ID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL 1A90..1A99 ; ID_Continue # Nd [10] TAI THAM THAM DIGIT ZERO..TAI THAM THAM DIGIT NINE 1AA7 ; ID_Continue # Lm TAI THAM SIGN MAI YAMOK 1AB0..1ABD ; ID_Continue # Mn [14] COMBINING DOUBLED CIRCUMFLEX ACCENT..COMBINING PARENTHESES BELOW -1ABF..1AC0 ; ID_Continue # Mn [2] COMBINING LATIN SMALL LETTER W BELOW..COMBINING LATIN SMALL LETTER TURNED W BELOW +1ABF..1ACE ; ID_Continue # Mn [16] COMBINING LATIN SMALL LETTER W BELOW..COMBINING LATIN SMALL LETTER INSULAR T 1B00..1B03 ; ID_Continue # Mn [4] BALINESE SIGN ULU RICEM..BALINESE SIGN SURANG 1B04 ; ID_Continue # Mc BALINESE SIGN BISAH 1B05..1B33 ; ID_Continue # Lo [47] BALINESE LETTER AKARA..BALINESE LETTER HA @@ -7140,7 +7306,7 @@ FFDA..FFDC ; ID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL 1B3D..1B41 ; ID_Continue # Mc [5] BALINESE VOWEL SIGN LA LENGA TEDUNG..BALINESE VOWEL SIGN TALING REPA TEDUNG 1B42 ; ID_Continue # Mn BALINESE VOWEL SIGN PEPET 1B43..1B44 ; ID_Continue # Mc [2] BALINESE VOWEL SIGN PEPET TEDUNG..BALINESE ADEG ADEG -1B45..1B4B ; ID_Continue # Lo [7] BALINESE LETTER KAF SASAK..BALINESE LETTER ASYURA SASAK +1B45..1B4C ; ID_Continue # Lo [8] BALINESE LETTER KAF SASAK..BALINESE LETTER ARCHAIC JNYA 1B50..1B59 ; ID_Continue # Nd [10] BALINESE DIGIT ZERO..BALINESE DIGIT NINE 1B6B..1B73 ; ID_Continue # Mn [9] BALINESE MUSICAL SYMBOL COMBINING TEGEH..BALINESE MUSICAL SYMBOL COMBINING GONG 1B80..1B81 ; ID_Continue # Mn [2] SUNDANESE SIGN PANYECEK..SUNDANESE SIGN PANGLAYAR @@ -7194,8 +7360,7 @@ FFDA..FFDC ; ID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL 1D78 ; ID_Continue # Lm MODIFIER LETTER CYRILLIC EN 1D79..1D9A ; ID_Continue # L& [34] LATIN SMALL LETTER INSULAR G..LATIN SMALL LETTER EZH WITH RETROFLEX HOOK 1D9B..1DBF ; ID_Continue # Lm [37] MODIFIER LETTER SMALL TURNED ALPHA..MODIFIER LETTER SMALL THETA -1DC0..1DF9 ; ID_Continue # Mn [58] COMBINING DOTTED GRAVE ACCENT..COMBINING WIDE INVERTED BRIDGE BELOW -1DFB..1DFF ; ID_Continue # Mn [5] COMBINING DELETION MARK..COMBINING RIGHT ARROWHEAD AND DOWN ARROWHEAD BELOW +1DC0..1DFF ; ID_Continue # Mn [64] COMBINING DOTTED GRAVE ACCENT..COMBINING RIGHT ARROWHEAD AND DOWN ARROWHEAD BELOW 1E00..1F15 ; ID_Continue # L& [278] LATIN CAPITAL LETTER A WITH RING BELOW..GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA 1F18..1F1D ; ID_Continue # L& [6] GREEK CAPITAL LETTER EPSILON WITH PSILI..GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA 1F20..1F45 ; ID_Continue # L& [38] GREEK SMALL LETTER ETA WITH PSILI..GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA @@ -7243,9 +7408,7 @@ FFDA..FFDC ; ID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL 2160..2182 ; ID_Continue # Nl [35] ROMAN NUMERAL ONE..ROMAN NUMERAL TEN THOUSAND 2183..2184 ; ID_Continue # L& [2] ROMAN NUMERAL REVERSED ONE HUNDRED..LATIN SMALL LETTER REVERSED C 2185..2188 ; ID_Continue # Nl [4] ROMAN NUMERAL SIX LATE FORM..ROMAN NUMERAL ONE HUNDRED THOUSAND -2C00..2C2E ; ID_Continue # L& [47] GLAGOLITIC CAPITAL LETTER AZU..GLAGOLITIC CAPITAL LETTER LATINATE MYSLITE -2C30..2C5E ; ID_Continue # L& [47] GLAGOLITIC SMALL LETTER AZU..GLAGOLITIC SMALL LETTER LATINATE MYSLITE -2C60..2C7B ; ID_Continue # L& [28] LATIN CAPITAL LETTER L WITH DOUBLE BAR..LATIN LETTER SMALL CAPITAL TURNED E +2C00..2C7B ; ID_Continue # L& [124] GLAGOLITIC CAPITAL LETTER AZU..LATIN LETTER SMALL CAPITAL TURNED E 2C7C..2C7D ; ID_Continue # Lm [2] LATIN SUBSCRIPT SMALL LETTER J..MODIFIER LETTER CAPITAL V 2C7E..2CE4 ; ID_Continue # L& [103] LATIN CAPITAL LETTER S WITH SWASH TAIL..COPTIC SYMBOL KAI 2CEB..2CEE ; ID_Continue # L& [4] COPTIC CAPITAL LETTER CRYPTOGRAMMIC SHEI..COPTIC SMALL LETTER CRYPTOGRAMMIC GANGIA @@ -7290,8 +7453,7 @@ FFDA..FFDC ; ID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL 31A0..31BF ; ID_Continue # Lo [32] BOPOMOFO LETTER BU..BOPOMOFO LETTER AH 31F0..31FF ; ID_Continue # Lo [16] KATAKANA LETTER SMALL KU..KATAKANA LETTER SMALL RO 3400..4DBF ; ID_Continue # Lo [6592] CJK UNIFIED IDEOGRAPH-3400..CJK UNIFIED IDEOGRAPH-4DBF -4E00..9FFC ; ID_Continue # Lo [20989] CJK UNIFIED IDEOGRAPH-4E00..CJK UNIFIED IDEOGRAPH-9FFC -A000..A014 ; ID_Continue # Lo [21] YI SYLLABLE IT..YI SYLLABLE E +4E00..A014 ; ID_Continue # Lo [21013] CJK UNIFIED IDEOGRAPH-4E00..YI SYLLABLE E A015 ; ID_Continue # Lm YI SYLLABLE WU A016..A48C ; ID_Continue # Lo [1143] YI SYLLABLE BIT..YI SYLLABLE YYR A4D0..A4F7 ; ID_Continue # Lo [40] LISU LETTER BA..LISU LETTER OE @@ -7319,8 +7481,11 @@ A771..A787 ; ID_Continue # L& [23] LATIN SMALL LETTER DUM..LATIN SMALL LETTE A788 ; ID_Continue # Lm MODIFIER LETTER LOW CIRCUMFLEX ACCENT A78B..A78E ; ID_Continue # L& [4] LATIN CAPITAL LETTER SALTILLO..LATIN SMALL LETTER L WITH RETROFLEX HOOK AND BELT A78F ; ID_Continue # Lo LATIN LETTER SINOLOGICAL DOT -A790..A7BF ; ID_Continue # L& [48] LATIN CAPITAL LETTER N WITH DESCENDER..LATIN SMALL LETTER GLOTTAL U -A7C2..A7CA ; ID_Continue # L& [9] LATIN CAPITAL LETTER ANGLICANA W..LATIN SMALL LETTER S WITH SHORT STROKE OVERLAY +A790..A7CA ; ID_Continue # L& [59] LATIN CAPITAL LETTER N WITH DESCENDER..LATIN SMALL LETTER S WITH SHORT STROKE OVERLAY +A7D0..A7D1 ; ID_Continue # L& [2] LATIN CAPITAL LETTER CLOSED INSULAR G..LATIN SMALL LETTER CLOSED INSULAR G +A7D3 ; ID_Continue # L& LATIN SMALL LETTER DOUBLE THORN +A7D5..A7D9 ; ID_Continue # L& [5] LATIN SMALL LETTER DOUBLE WYNN..LATIN SMALL LETTER SIGMOID S +A7F2..A7F4 ; ID_Continue # Lm [3] MODIFIER LETTER CAPITAL C..MODIFIER LETTER CAPITAL Q A7F5..A7F6 ; ID_Continue # L& [2] LATIN CAPITAL LETTER REVERSED HALF H..LATIN SMALL LETTER REVERSED HALF H A7F7 ; ID_Continue # Lo LATIN EPIGRAPHIC LETTER SIDEWAYS I A7F8..A7F9 ; ID_Continue # Lm [2] MODIFIER LETTER CAPITAL H WITH STROKE..MODIFIER LETTER SMALL LIGATURE OE @@ -7499,9 +7664,20 @@ FFDA..FFDC ; ID_Continue # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HAN 104D8..104FB ; ID_Continue # L& [36] OSAGE SMALL LETTER A..OSAGE SMALL LETTER ZHA 10500..10527 ; ID_Continue # Lo [40] ELBASAN LETTER A..ELBASAN LETTER KHE 10530..10563 ; ID_Continue # Lo [52] CAUCASIAN ALBANIAN LETTER ALT..CAUCASIAN ALBANIAN LETTER KIW +10570..1057A ; ID_Continue # L& [11] VITHKUQI CAPITAL LETTER A..VITHKUQI CAPITAL LETTER GA +1057C..1058A ; ID_Continue # L& [15] VITHKUQI CAPITAL LETTER HA..VITHKUQI CAPITAL LETTER RE +1058C..10592 ; ID_Continue # L& [7] VITHKUQI CAPITAL LETTER SE..VITHKUQI CAPITAL LETTER XE +10594..10595 ; ID_Continue # L& [2] VITHKUQI CAPITAL LETTER Y..VITHKUQI CAPITAL LETTER ZE +10597..105A1 ; ID_Continue # L& [11] VITHKUQI SMALL LETTER A..VITHKUQI SMALL LETTER GA +105A3..105B1 ; ID_Continue # L& [15] VITHKUQI SMALL LETTER HA..VITHKUQI SMALL LETTER RE +105B3..105B9 ; ID_Continue # L& [7] VITHKUQI SMALL LETTER SE..VITHKUQI SMALL LETTER XE +105BB..105BC ; ID_Continue # L& [2] VITHKUQI SMALL LETTER Y..VITHKUQI SMALL LETTER ZE 10600..10736 ; ID_Continue # Lo [311] LINEAR A SIGN AB001..LINEAR A SIGN A664 10740..10755 ; ID_Continue # Lo [22] LINEAR A SIGN A701 A..LINEAR A SIGN A732 JE 10760..10767 ; ID_Continue # Lo [8] LINEAR A SIGN A800..LINEAR A SIGN A807 +10780..10785 ; ID_Continue # Lm [6] MODIFIER LETTER SMALL CAPITAL AA..MODIFIER LETTER SMALL B WITH HOOK +10787..107B0 ; ID_Continue # Lm [42] MODIFIER LETTER SMALL DZ DIGRAPH..MODIFIER LETTER SMALL V WITH RIGHT HOOK +107B2..107BA ; ID_Continue # Lm [9] MODIFIER LETTER SMALL CAPITAL Y..MODIFIER LETTER SMALL S WITH CURL 10800..10805 ; ID_Continue # Lo [6] CYPRIOT SYLLABLE A..CYPRIOT SYLLABLE JA 10808 ; ID_Continue # Lo CYPRIOT SYLLABLE JO 1080A..10835 ; ID_Continue # Lo [44] CYPRIOT SYLLABLE KA..CYPRIOT SYLLABLE WO @@ -7547,6 +7723,8 @@ FFDA..FFDC ; ID_Continue # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HAN 10F27 ; ID_Continue # Lo OLD SOGDIAN LIGATURE AYIN-DALETH 10F30..10F45 ; ID_Continue # Lo [22] SOGDIAN LETTER ALEPH..SOGDIAN INDEPENDENT SHIN 10F46..10F50 ; ID_Continue # Mn [11] SOGDIAN COMBINING DOT BELOW..SOGDIAN COMBINING STROKE BELOW +10F70..10F81 ; ID_Continue # Lo [18] OLD UYGHUR LETTER ALEPH..OLD UYGHUR LETTER LESH +10F82..10F85 ; ID_Continue # Mn [4] OLD UYGHUR COMBINING DOT ABOVE..OLD UYGHUR COMBINING TWO DOTS BELOW 10FB0..10FC4 ; ID_Continue # Lo [21] CHORASMIAN LETTER ALEPH..CHORASMIAN LETTER TAW 10FE0..10FF6 ; ID_Continue # Lo [23] ELYMAIC LETTER ALEPH..ELYMAIC LIGATURE ZAYIN-YODH 11000 ; ID_Continue # Mc BRAHMI SIGN CANDRABINDU @@ -7555,6 +7733,10 @@ FFDA..FFDC ; ID_Continue # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HAN 11003..11037 ; ID_Continue # Lo [53] BRAHMI SIGN JIHVAMULIYA..BRAHMI LETTER OLD TAMIL NNNA 11038..11046 ; ID_Continue # Mn [15] BRAHMI VOWEL SIGN AA..BRAHMI VIRAMA 11066..1106F ; ID_Continue # Nd [10] BRAHMI DIGIT ZERO..BRAHMI DIGIT NINE +11070 ; ID_Continue # Mn BRAHMI SIGN OLD TAMIL VIRAMA +11071..11072 ; ID_Continue # Lo [2] BRAHMI LETTER OLD TAMIL SHORT E..BRAHMI LETTER OLD TAMIL SHORT O +11073..11074 ; ID_Continue # Mn [2] BRAHMI VOWEL SIGN OLD TAMIL SHORT E..BRAHMI VOWEL SIGN OLD TAMIL SHORT O +11075 ; ID_Continue # Lo BRAHMI LETTER OLD TAMIL LLA 1107F..11081 ; ID_Continue # Mn [3] BRAHMI NUMBER JOINER..KAITHI SIGN ANUSVARA 11082 ; ID_Continue # Mc KAITHI SIGN VISARGA 11083..110AF ; ID_Continue # Lo [45] KAITHI LETTER A..KAITHI LETTER HA @@ -7562,6 +7744,7 @@ FFDA..FFDC ; ID_Continue # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HAN 110B3..110B6 ; ID_Continue # Mn [4] KAITHI VOWEL SIGN U..KAITHI VOWEL SIGN AI 110B7..110B8 ; ID_Continue # Mc [2] KAITHI VOWEL SIGN O..KAITHI VOWEL SIGN AU 110B9..110BA ; ID_Continue # Mn [2] KAITHI SIGN VIRAMA..KAITHI SIGN NUKTA +110C2 ; ID_Continue # Mn KAITHI VOWEL SIGN VOCALIC R 110D0..110E8 ; ID_Continue # Lo [25] SORA SOMPENG LETTER SAH..SORA SOMPENG LETTER MAE 110F0..110F9 ; ID_Continue # Nd [10] SORA SOMPENG DIGIT ZERO..SORA SOMPENG DIGIT NINE 11100..11102 ; ID_Continue # Mn [3] CHAKMA SIGN CANDRABINDU..CHAKMA SIGN VISARGA @@ -7687,6 +7870,7 @@ FFDA..FFDC ; ID_Continue # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HAN 11726 ; ID_Continue # Mc AHOM VOWEL SIGN E 11727..1172B ; ID_Continue # Mn [5] AHOM VOWEL SIGN AW..AHOM SIGN KILLER 11730..11739 ; ID_Continue # Nd [10] AHOM DIGIT ZERO..AHOM DIGIT NINE +11740..11746 ; ID_Continue # Lo [7] AHOM LETTER CA..AHOM LETTER LLA 11800..1182B ; ID_Continue # Lo [44] DOGRA LETTER A..DOGRA LETTER RRA 1182C..1182E ; ID_Continue # Mc [3] DOGRA VOWEL SIGN AA..DOGRA VOWEL SIGN II 1182F..11837 ; ID_Continue # Mn [9] DOGRA VOWEL SIGN U..DOGRA SIGN ANUSVARA @@ -7737,7 +7921,7 @@ FFDA..FFDC ; ID_Continue # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HAN 11A97 ; ID_Continue # Mc SOYOMBO SIGN VISARGA 11A98..11A99 ; ID_Continue # Mn [2] SOYOMBO GEMINATION MARK..SOYOMBO SUBJOINER 11A9D ; ID_Continue # Lo SOYOMBO MARK PLUTA -11AC0..11AF8 ; ID_Continue # Lo [57] PAU CIN HAU LETTER PA..PAU CIN HAU GLOTTAL STOP FINAL +11AB0..11AF8 ; ID_Continue # Lo [73] CANADIAN SYLLABICS NATTILIK HI..PAU CIN HAU GLOTTAL STOP FINAL 11C00..11C08 ; ID_Continue # Lo [9] BHAIKSUKI LETTER A..BHAIKSUKI LETTER VOCALIC L 11C0A..11C2E ; ID_Continue # Lo [37] BHAIKSUKI LETTER E..BHAIKSUKI LETTER HA 11C2F ; ID_Continue # Mc BHAIKSUKI VOWEL SIGN AA @@ -7783,11 +7967,14 @@ FFDA..FFDC ; ID_Continue # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HAN 12000..12399 ; ID_Continue # Lo [922] CUNEIFORM SIGN A..CUNEIFORM SIGN U U 12400..1246E ; ID_Continue # Nl [111] CUNEIFORM NUMERIC SIGN TWO ASH..CUNEIFORM NUMERIC SIGN NINE U VARIANT FORM 12480..12543 ; ID_Continue # Lo [196] CUNEIFORM SIGN AB TIMES NUN TENU..CUNEIFORM SIGN ZU5 TIMES THREE DISH TENU +12F90..12FF0 ; ID_Continue # Lo [97] CYPRO-MINOAN SIGN CM001..CYPRO-MINOAN SIGN CM114 13000..1342E ; ID_Continue # Lo [1071] EGYPTIAN HIEROGLYPH A001..EGYPTIAN HIEROGLYPH AA032 14400..14646 ; ID_Continue # Lo [583] ANATOLIAN HIEROGLYPH A001..ANATOLIAN HIEROGLYPH A530 16800..16A38 ; ID_Continue # Lo [569] BAMUM LETTER PHASE-A NGKUE MFON..BAMUM LETTER PHASE-F VUEQ 16A40..16A5E ; ID_Continue # Lo [31] MRO LETTER TA..MRO LETTER TEK 16A60..16A69 ; ID_Continue # Nd [10] MRO DIGIT ZERO..MRO DIGIT NINE +16A70..16ABE ; ID_Continue # Lo [79] TANGSA LETTER OZ..TANGSA LETTER ZA +16AC0..16AC9 ; ID_Continue # Nd [10] TANGSA DIGIT ZERO..TANGSA DIGIT NINE 16AD0..16AED ; ID_Continue # Lo [30] BASSA VAH LETTER ENNI..BASSA VAH LETTER I 16AF0..16AF4 ; ID_Continue # Mn [5] BASSA VAH COMBINING HIGH TONE..BASSA VAH COMBINING HIGH-LOW TONE 16B00..16B2F ; ID_Continue # Lo [48] PAHAWH HMONG VOWEL KEEB..PAHAWH HMONG CONSONANT CAU @@ -7810,7 +7997,10 @@ FFDA..FFDC ; ID_Continue # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HAN 17000..187F7 ; ID_Continue # Lo [6136] TANGUT IDEOGRAPH-17000..TANGUT IDEOGRAPH-187F7 18800..18CD5 ; ID_Continue # Lo [1238] TANGUT COMPONENT-001..KHITAN SMALL SCRIPT CHARACTER-18CD5 18D00..18D08 ; ID_Continue # Lo [9] TANGUT IDEOGRAPH-18D00..TANGUT IDEOGRAPH-18D08 -1B000..1B11E ; ID_Continue # Lo [287] KATAKANA LETTER ARCHAIC E..HENTAIGANA LETTER N-MU-MO-2 +1AFF0..1AFF3 ; ID_Continue # Lm [4] KATAKANA LETTER MINNAN TONE-2..KATAKANA LETTER MINNAN TONE-5 +1AFF5..1AFFB ; ID_Continue # Lm [7] KATAKANA LETTER MINNAN TONE-7..KATAKANA LETTER MINNAN NASALIZED TONE-5 +1AFFD..1AFFE ; ID_Continue # Lm [2] KATAKANA LETTER MINNAN NASALIZED TONE-7..KATAKANA LETTER MINNAN NASALIZED TONE-8 +1B000..1B122 ; ID_Continue # Lo [291] KATAKANA LETTER ARCHAIC E..KATAKANA LETTER ARCHAIC WU 1B150..1B152 ; ID_Continue # Lo [3] HIRAGANA LETTER SMALL WI..HIRAGANA LETTER SMALL WO 1B164..1B167 ; ID_Continue # Lo [4] KATAKANA LETTER SMALL WI..KATAKANA LETTER SMALL N 1B170..1B2FB ; ID_Continue # Lo [396] NUSHU CHARACTER-1B170..NUSHU CHARACTER-1B2FB @@ -7819,6 +8009,8 @@ FFDA..FFDC ; ID_Continue # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HAN 1BC80..1BC88 ; ID_Continue # Lo [9] DUPLOYAN AFFIX HIGH ACUTE..DUPLOYAN AFFIX HIGH VERTICAL 1BC90..1BC99 ; ID_Continue # Lo [10] DUPLOYAN AFFIX LOW ACUTE..DUPLOYAN AFFIX LOW ARROW 1BC9D..1BC9E ; ID_Continue # Mn [2] DUPLOYAN THICK LETTER SELECTOR..DUPLOYAN DOUBLE MARK +1CF00..1CF2D ; ID_Continue # Mn [46] ZNAMENNY COMBINING MARK GORAZDO NIZKO S KRYZHEM ON LEFT..ZNAMENNY COMBINING MARK KRYZH ON LEFT +1CF30..1CF46 ; ID_Continue # Mn [23] ZNAMENNY COMBINING TONAL RANGE MARK MRACHNO..ZNAMENNY PRIZNAK MODIFIER ROG 1D165..1D166 ; ID_Continue # Mc [2] MUSICAL SYMBOL COMBINING STEM..MUSICAL SYMBOL COMBINING SPRECHGESANG STEM 1D167..1D169 ; ID_Continue # Mn [3] MUSICAL SYMBOL COMBINING TREMOLO-1..MUSICAL SYMBOL COMBINING TREMOLO-3 1D16D..1D172 ; ID_Continue # Mc [6] MUSICAL SYMBOL COMBINING AUGMENTATION DOT..MUSICAL SYMBOL COMBINING FLAG-5 @@ -7863,6 +8055,9 @@ FFDA..FFDC ; ID_Continue # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HAN 1DA84 ; ID_Continue # Mn SIGNWRITING LOCATION HEAD NECK 1DA9B..1DA9F ; ID_Continue # Mn [5] SIGNWRITING FILL MODIFIER-2..SIGNWRITING FILL MODIFIER-6 1DAA1..1DAAF ; ID_Continue # Mn [15] SIGNWRITING ROTATION MODIFIER-2..SIGNWRITING ROTATION MODIFIER-16 +1DF00..1DF09 ; ID_Continue # L& [10] LATIN SMALL LETTER FENG DIGRAPH WITH TRILL..LATIN SMALL LETTER T WITH HOOK AND RETROFLEX HOOK +1DF0A ; ID_Continue # Lo LATIN LETTER RETROFLEX CLICK WITH RETROFLEX HOOK +1DF0B..1DF1E ; ID_Continue # L& [20] LATIN SMALL LETTER ESH WITH DOUBLE BAR..LATIN SMALL LETTER S WITH CURL 1E000..1E006 ; ID_Continue # Mn [7] COMBINING GLAGOLITIC LETTER AZU..COMBINING GLAGOLITIC LETTER ZHIVETE 1E008..1E018 ; ID_Continue # Mn [17] COMBINING GLAGOLITIC LETTER ZEMLJA..COMBINING GLAGOLITIC LETTER HERU 1E01B..1E021 ; ID_Continue # Mn [7] COMBINING GLAGOLITIC LETTER SHTA..COMBINING GLAGOLITIC LETTER YATI @@ -7873,9 +8068,15 @@ FFDA..FFDC ; ID_Continue # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HAN 1E137..1E13D ; ID_Continue # Lm [7] NYIAKENG PUACHUE HMONG SIGN FOR PERSON..NYIAKENG PUACHUE HMONG SYLLABLE LENGTHENER 1E140..1E149 ; ID_Continue # Nd [10] NYIAKENG PUACHUE HMONG DIGIT ZERO..NYIAKENG PUACHUE HMONG DIGIT NINE 1E14E ; ID_Continue # Lo NYIAKENG PUACHUE HMONG LOGOGRAM NYAJ +1E290..1E2AD ; ID_Continue # Lo [30] TOTO LETTER PA..TOTO LETTER A +1E2AE ; ID_Continue # Mn TOTO SIGN RISING TONE 1E2C0..1E2EB ; ID_Continue # Lo [44] WANCHO LETTER AA..WANCHO LETTER YIH 1E2EC..1E2EF ; ID_Continue # Mn [4] WANCHO TONE TUP..WANCHO TONE KOINI 1E2F0..1E2F9 ; ID_Continue # Nd [10] WANCHO DIGIT ZERO..WANCHO DIGIT NINE +1E7E0..1E7E6 ; ID_Continue # Lo [7] ETHIOPIC SYLLABLE HHYA..ETHIOPIC SYLLABLE HHYO +1E7E8..1E7EB ; ID_Continue # Lo [4] ETHIOPIC SYLLABLE GURAGE HHWA..ETHIOPIC SYLLABLE HHWE +1E7ED..1E7EE ; ID_Continue # Lo [2] ETHIOPIC SYLLABLE GURAGE MWI..ETHIOPIC SYLLABLE GURAGE MWEE +1E7F0..1E7FE ; ID_Continue # Lo [15] ETHIOPIC SYLLABLE GURAGE QWI..ETHIOPIC SYLLABLE GURAGE PWEE 1E800..1E8C4 ; ID_Continue # Lo [197] MENDE KIKAKUI SYLLABLE M001 KI..MENDE KIKAKUI SYLLABLE M060 NYON 1E8D0..1E8D6 ; ID_Continue # Mn [7] MENDE KIKAKUI COMBINING NUMBER TEENS..MENDE KIKAKUI COMBINING NUMBER MILLIONS 1E900..1E943 ; ID_Continue # L& [68] ADLAM CAPITAL LETTER ALIF..ADLAM SMALL LETTER SHA @@ -7916,8 +8117,8 @@ FFDA..FFDC ; ID_Continue # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HAN 1EEA5..1EEA9 ; ID_Continue # Lo [5] ARABIC MATHEMATICAL DOUBLE-STRUCK WAW..ARABIC MATHEMATICAL DOUBLE-STRUCK YEH 1EEAB..1EEBB ; ID_Continue # Lo [17] ARABIC MATHEMATICAL DOUBLE-STRUCK LAM..ARABIC MATHEMATICAL DOUBLE-STRUCK GHAIN 1FBF0..1FBF9 ; ID_Continue # Nd [10] SEGMENTED DIGIT ZERO..SEGMENTED DIGIT NINE -20000..2A6DD ; ID_Continue # Lo [42718] CJK UNIFIED IDEOGRAPH-20000..CJK UNIFIED IDEOGRAPH-2A6DD -2A700..2B734 ; ID_Continue # Lo [4149] CJK UNIFIED IDEOGRAPH-2A700..CJK UNIFIED IDEOGRAPH-2B734 +20000..2A6DF ; ID_Continue # Lo [42720] CJK UNIFIED IDEOGRAPH-20000..CJK UNIFIED IDEOGRAPH-2A6DF +2A700..2B738 ; ID_Continue # Lo [4153] CJK UNIFIED IDEOGRAPH-2A700..CJK UNIFIED IDEOGRAPH-2B738 2B740..2B81D ; ID_Continue # Lo [222] CJK UNIFIED IDEOGRAPH-2B740..CJK UNIFIED IDEOGRAPH-2B81D 2B820..2CEA1 ; ID_Continue # Lo [5762] CJK UNIFIED IDEOGRAPH-2B820..CJK UNIFIED IDEOGRAPH-2CEA1 2CEB0..2EBE0 ; ID_Continue # Lo [7473] CJK UNIFIED IDEOGRAPH-2CEB0..CJK UNIFIED IDEOGRAPH-2EBE0 @@ -7925,7 +8126,7 @@ FFDA..FFDC ; ID_Continue # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HAN 30000..3134A ; ID_Continue # Lo [4939] CJK UNIFIED IDEOGRAPH-30000..CJK UNIFIED IDEOGRAPH-3134A E0100..E01EF ; ID_Continue # Mn [240] VARIATION SELECTOR-17..VARIATION SELECTOR-256 -# Total code points: 134434 +# Total code points: 135072 # ================================================ @@ -7995,8 +8196,10 @@ E0100..E01EF ; ID_Continue # Mn [240] VARIATION SELECTOR-17..VARIATION SELECTOR 0828 ; XID_Start # Lm SAMARITAN MODIFIER LETTER I 0840..0858 ; XID_Start # Lo [25] MANDAIC LETTER HALQA..MANDAIC LETTER AIN 0860..086A ; XID_Start # Lo [11] SYRIAC LETTER MALAYALAM NGA..SYRIAC LETTER MALAYALAM SSA -08A0..08B4 ; XID_Start # Lo [21] ARABIC LETTER BEH WITH SMALL V BELOW..ARABIC LETTER KAF WITH DOT BELOW -08B6..08C7 ; XID_Start # Lo [18] ARABIC LETTER BEH WITH SMALL MEEM ABOVE..ARABIC LETTER LAM WITH SMALL ARABIC LETTER TAH ABOVE +0870..0887 ; XID_Start # Lo [24] ARABIC LETTER ALEF WITH ATTACHED FATHA..ARABIC BASELINE ROUND DOT +0889..088E ; XID_Start # Lo [6] ARABIC LETTER NOON WITH INVERTED SMALL V..ARABIC VERTICAL TAIL +08A0..08C8 ; XID_Start # Lo [41] ARABIC LETTER BEH WITH SMALL V BELOW..ARABIC LETTER GRAF +08C9 ; XID_Start # Lm ARABIC SMALL FARSI YEH 0904..0939 ; XID_Start # Lo [54] DEVANAGARI LETTER SHORT A..DEVANAGARI LETTER HA 093D ; XID_Start # Lo DEVANAGARI SIGN AVAGRAHA 0950 ; XID_Start # Lo DEVANAGARI OM @@ -8062,6 +8265,7 @@ E0100..E01EF ; ID_Continue # Mn [240] VARIATION SELECTOR-17..VARIATION SELECTOR 0C2A..0C39 ; XID_Start # Lo [16] TELUGU LETTER PA..TELUGU LETTER HA 0C3D ; XID_Start # Lo TELUGU SIGN AVAGRAHA 0C58..0C5A ; XID_Start # Lo [3] TELUGU LETTER TSA..TELUGU LETTER RRRA +0C5D ; XID_Start # Lo TELUGU LETTER NAKAARA POLLU 0C60..0C61 ; XID_Start # Lo [2] TELUGU LETTER VOCALIC RR..TELUGU LETTER VOCALIC LL 0C80 ; XID_Start # Lo KANNADA SIGN SPACING CANDRABINDU 0C85..0C8C ; XID_Start # Lo [8] KANNADA LETTER A..KANNADA LETTER VOCALIC L @@ -8070,7 +8274,7 @@ E0100..E01EF ; ID_Continue # Mn [240] VARIATION SELECTOR-17..VARIATION SELECTOR 0CAA..0CB3 ; XID_Start # Lo [10] KANNADA LETTER PA..KANNADA LETTER LLA 0CB5..0CB9 ; XID_Start # Lo [5] KANNADA LETTER VA..KANNADA LETTER HA 0CBD ; XID_Start # Lo KANNADA SIGN AVAGRAHA -0CDE ; XID_Start # Lo KANNADA LETTER FA +0CDD..0CDE ; XID_Start # Lo [2] KANNADA LETTER NAKAARA POLLU..KANNADA LETTER FA 0CE0..0CE1 ; XID_Start # Lo [2] KANNADA LETTER VOCALIC RR..KANNADA LETTER VOCALIC LL 0CF1..0CF2 ; XID_Start # Lo [2] KANNADA SIGN JIHVAMULIYA..KANNADA SIGN UPADHMANIYA 0D04..0D0C ; XID_Start # Lo [9] MALAYALAM LETTER VEDIC ANUSVARA..MALAYALAM LETTER VOCALIC L @@ -8145,9 +8349,8 @@ E0100..E01EF ; ID_Continue # Mn [240] VARIATION SELECTOR-17..VARIATION SELECTOR 16A0..16EA ; XID_Start # Lo [75] RUNIC LETTER FEHU FEOH FE F..RUNIC LETTER X 16EE..16F0 ; XID_Start # Nl [3] RUNIC ARLAUG SYMBOL..RUNIC BELGTHOR SYMBOL 16F1..16F8 ; XID_Start # Lo [8] RUNIC LETTER K..RUNIC LETTER FRANKS CASKET AESC -1700..170C ; XID_Start # Lo [13] TAGALOG LETTER A..TAGALOG LETTER YA -170E..1711 ; XID_Start # Lo [4] TAGALOG LETTER LA..TAGALOG LETTER HA -1720..1731 ; XID_Start # Lo [18] HANUNOO LETTER A..HANUNOO LETTER HA +1700..1711 ; XID_Start # Lo [18] TAGALOG LETTER A..TAGALOG LETTER HA +171F..1731 ; XID_Start # Lo [19] TAGALOG LETTER ARCHAIC RA..HANUNOO LETTER HA 1740..1751 ; XID_Start # Lo [18] BUHID LETTER A..BUHID LETTER HA 1760..176C ; XID_Start # Lo [13] TAGBANWA LETTER A..TAGBANWA LETTER YA 176E..1770 ; XID_Start # Lo [3] TAGBANWA LETTER LA..TAGBANWA LETTER SA @@ -8171,7 +8374,7 @@ E0100..E01EF ; ID_Continue # Mn [240] VARIATION SELECTOR-17..VARIATION SELECTOR 1A20..1A54 ; XID_Start # Lo [53] TAI THAM LETTER HIGH KA..TAI THAM LETTER GREAT SA 1AA7 ; XID_Start # Lm TAI THAM SIGN MAI YAMOK 1B05..1B33 ; XID_Start # Lo [47] BALINESE LETTER AKARA..BALINESE LETTER HA -1B45..1B4B ; XID_Start # Lo [7] BALINESE LETTER KAF SASAK..BALINESE LETTER ASYURA SASAK +1B45..1B4C ; XID_Start # Lo [8] BALINESE LETTER KAF SASAK..BALINESE LETTER ARCHAIC JNYA 1B83..1BA0 ; XID_Start # Lo [30] SUNDANESE LETTER A..SUNDANESE LETTER HA 1BAE..1BAF ; XID_Start # Lo [2] SUNDANESE LETTER KHA..SUNDANESE LETTER SYA 1BBA..1BE5 ; XID_Start # Lo [44] SUNDANESE AVAGRAHA..BATAK LETTER U @@ -8234,9 +8437,7 @@ E0100..E01EF ; ID_Continue # Mn [240] VARIATION SELECTOR-17..VARIATION SELECTOR 2160..2182 ; XID_Start # Nl [35] ROMAN NUMERAL ONE..ROMAN NUMERAL TEN THOUSAND 2183..2184 ; XID_Start # L& [2] ROMAN NUMERAL REVERSED ONE HUNDRED..LATIN SMALL LETTER REVERSED C 2185..2188 ; XID_Start # Nl [4] ROMAN NUMERAL SIX LATE FORM..ROMAN NUMERAL ONE HUNDRED THOUSAND -2C00..2C2E ; XID_Start # L& [47] GLAGOLITIC CAPITAL LETTER AZU..GLAGOLITIC CAPITAL LETTER LATINATE MYSLITE -2C30..2C5E ; XID_Start # L& [47] GLAGOLITIC SMALL LETTER AZU..GLAGOLITIC SMALL LETTER LATINATE MYSLITE -2C60..2C7B ; XID_Start # L& [28] LATIN CAPITAL LETTER L WITH DOUBLE BAR..LATIN LETTER SMALL CAPITAL TURNED E +2C00..2C7B ; XID_Start # L& [124] GLAGOLITIC CAPITAL LETTER AZU..LATIN LETTER SMALL CAPITAL TURNED E 2C7C..2C7D ; XID_Start # Lm [2] LATIN SUBSCRIPT SMALL LETTER J..MODIFIER LETTER CAPITAL V 2C7E..2CE4 ; XID_Start # L& [103] LATIN CAPITAL LETTER S WITH SWASH TAIL..COPTIC SYMBOL KAI 2CEB..2CEE ; XID_Start # L& [4] COPTIC CAPITAL LETTER CRYPTOGRAMMIC SHEI..COPTIC SMALL LETTER CRYPTOGRAMMIC GANGIA @@ -8274,8 +8475,7 @@ E0100..E01EF ; ID_Continue # Mn [240] VARIATION SELECTOR-17..VARIATION SELECTOR 31A0..31BF ; XID_Start # Lo [32] BOPOMOFO LETTER BU..BOPOMOFO LETTER AH 31F0..31FF ; XID_Start # Lo [16] KATAKANA LETTER SMALL KU..KATAKANA LETTER SMALL RO 3400..4DBF ; XID_Start # Lo [6592] CJK UNIFIED IDEOGRAPH-3400..CJK UNIFIED IDEOGRAPH-4DBF -4E00..9FFC ; XID_Start # Lo [20989] CJK UNIFIED IDEOGRAPH-4E00..CJK UNIFIED IDEOGRAPH-9FFC -A000..A014 ; XID_Start # Lo [21] YI SYLLABLE IT..YI SYLLABLE E +4E00..A014 ; XID_Start # Lo [21013] CJK UNIFIED IDEOGRAPH-4E00..YI SYLLABLE E A015 ; XID_Start # Lm YI SYLLABLE WU A016..A48C ; XID_Start # Lo [1143] YI SYLLABLE BIT..YI SYLLABLE YYR A4D0..A4F7 ; XID_Start # Lo [40] LISU LETTER BA..LISU LETTER OE @@ -8298,8 +8498,11 @@ A771..A787 ; XID_Start # L& [23] LATIN SMALL LETTER DUM..LATIN SMALL LETTER A788 ; XID_Start # Lm MODIFIER LETTER LOW CIRCUMFLEX ACCENT A78B..A78E ; XID_Start # L& [4] LATIN CAPITAL LETTER SALTILLO..LATIN SMALL LETTER L WITH RETROFLEX HOOK AND BELT A78F ; XID_Start # Lo LATIN LETTER SINOLOGICAL DOT -A790..A7BF ; XID_Start # L& [48] LATIN CAPITAL LETTER N WITH DESCENDER..LATIN SMALL LETTER GLOTTAL U -A7C2..A7CA ; XID_Start # L& [9] LATIN CAPITAL LETTER ANGLICANA W..LATIN SMALL LETTER S WITH SHORT STROKE OVERLAY +A790..A7CA ; XID_Start # L& [59] LATIN CAPITAL LETTER N WITH DESCENDER..LATIN SMALL LETTER S WITH SHORT STROKE OVERLAY +A7D0..A7D1 ; XID_Start # L& [2] LATIN CAPITAL LETTER CLOSED INSULAR G..LATIN SMALL LETTER CLOSED INSULAR G +A7D3 ; XID_Start # L& LATIN SMALL LETTER DOUBLE THORN +A7D5..A7D9 ; XID_Start # L& [5] LATIN SMALL LETTER DOUBLE WYNN..LATIN SMALL LETTER SIGMOID S +A7F2..A7F4 ; XID_Start # Lm [3] MODIFIER LETTER CAPITAL C..MODIFIER LETTER CAPITAL Q A7F5..A7F6 ; XID_Start # L& [2] LATIN CAPITAL LETTER REVERSED HALF H..LATIN SMALL LETTER REVERSED HALF H A7F7 ; XID_Start # Lo LATIN EPIGRAPHIC LETTER SIDEWAYS I A7F8..A7F9 ; XID_Start # Lm [2] MODIFIER LETTER CAPITAL H WITH STROKE..MODIFIER LETTER SMALL LIGATURE OE @@ -8414,9 +8617,20 @@ FFDA..FFDC ; XID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGU 104D8..104FB ; XID_Start # L& [36] OSAGE SMALL LETTER A..OSAGE SMALL LETTER ZHA 10500..10527 ; XID_Start # Lo [40] ELBASAN LETTER A..ELBASAN LETTER KHE 10530..10563 ; XID_Start # Lo [52] CAUCASIAN ALBANIAN LETTER ALT..CAUCASIAN ALBANIAN LETTER KIW +10570..1057A ; XID_Start # L& [11] VITHKUQI CAPITAL LETTER A..VITHKUQI CAPITAL LETTER GA +1057C..1058A ; XID_Start # L& [15] VITHKUQI CAPITAL LETTER HA..VITHKUQI CAPITAL LETTER RE +1058C..10592 ; XID_Start # L& [7] VITHKUQI CAPITAL LETTER SE..VITHKUQI CAPITAL LETTER XE +10594..10595 ; XID_Start # L& [2] VITHKUQI CAPITAL LETTER Y..VITHKUQI CAPITAL LETTER ZE +10597..105A1 ; XID_Start # L& [11] VITHKUQI SMALL LETTER A..VITHKUQI SMALL LETTER GA +105A3..105B1 ; XID_Start # L& [15] VITHKUQI SMALL LETTER HA..VITHKUQI SMALL LETTER RE +105B3..105B9 ; XID_Start # L& [7] VITHKUQI SMALL LETTER SE..VITHKUQI SMALL LETTER XE +105BB..105BC ; XID_Start # L& [2] VITHKUQI SMALL LETTER Y..VITHKUQI SMALL LETTER ZE 10600..10736 ; XID_Start # Lo [311] LINEAR A SIGN AB001..LINEAR A SIGN A664 10740..10755 ; XID_Start # Lo [22] LINEAR A SIGN A701 A..LINEAR A SIGN A732 JE 10760..10767 ; XID_Start # Lo [8] LINEAR A SIGN A800..LINEAR A SIGN A807 +10780..10785 ; XID_Start # Lm [6] MODIFIER LETTER SMALL CAPITAL AA..MODIFIER LETTER SMALL B WITH HOOK +10787..107B0 ; XID_Start # Lm [42] MODIFIER LETTER SMALL DZ DIGRAPH..MODIFIER LETTER SMALL V WITH RIGHT HOOK +107B2..107BA ; XID_Start # Lm [9] MODIFIER LETTER SMALL CAPITAL Y..MODIFIER LETTER SMALL S WITH CURL 10800..10805 ; XID_Start # Lo [6] CYPRIOT SYLLABLE A..CYPRIOT SYLLABLE JA 10808 ; XID_Start # Lo CYPRIOT SYLLABLE JO 1080A..10835 ; XID_Start # Lo [44] CYPRIOT SYLLABLE KA..CYPRIOT SYLLABLE WO @@ -8452,9 +8666,12 @@ FFDA..FFDC ; XID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGU 10F00..10F1C ; XID_Start # Lo [29] OLD SOGDIAN LETTER ALEPH..OLD SOGDIAN LETTER FINAL TAW WITH VERTICAL TAIL 10F27 ; XID_Start # Lo OLD SOGDIAN LIGATURE AYIN-DALETH 10F30..10F45 ; XID_Start # Lo [22] SOGDIAN LETTER ALEPH..SOGDIAN INDEPENDENT SHIN +10F70..10F81 ; XID_Start # Lo [18] OLD UYGHUR LETTER ALEPH..OLD UYGHUR LETTER LESH 10FB0..10FC4 ; XID_Start # Lo [21] CHORASMIAN LETTER ALEPH..CHORASMIAN LETTER TAW 10FE0..10FF6 ; XID_Start # Lo [23] ELYMAIC LETTER ALEPH..ELYMAIC LIGATURE ZAYIN-YODH 11003..11037 ; XID_Start # Lo [53] BRAHMI SIGN JIHVAMULIYA..BRAHMI LETTER OLD TAMIL NNNA +11071..11072 ; XID_Start # Lo [2] BRAHMI LETTER OLD TAMIL SHORT E..BRAHMI LETTER OLD TAMIL SHORT O +11075 ; XID_Start # Lo BRAHMI LETTER OLD TAMIL LLA 11083..110AF ; XID_Start # Lo [45] KAITHI LETTER A..KAITHI LETTER HA 110D0..110E8 ; XID_Start # Lo [25] SORA SOMPENG LETTER SAH..SORA SOMPENG LETTER MAE 11103..11126 ; XID_Start # Lo [36] CHAKMA LETTER AA..CHAKMA LETTER HAA @@ -8496,6 +8713,7 @@ FFDA..FFDC ; XID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGU 11680..116AA ; XID_Start # Lo [43] TAKRI LETTER A..TAKRI LETTER RRA 116B8 ; XID_Start # Lo TAKRI LETTER ARCHAIC KHA 11700..1171A ; XID_Start # Lo [27] AHOM LETTER KA..AHOM LETTER ALTERNATE BA +11740..11746 ; XID_Start # Lo [7] AHOM LETTER CA..AHOM LETTER LLA 11800..1182B ; XID_Start # Lo [44] DOGRA LETTER A..DOGRA LETTER RRA 118A0..118DF ; XID_Start # L& [64] WARANG CITI CAPITAL LETTER NGAA..WARANG CITI SMALL LETTER VIYO 118FF..11906 ; XID_Start # Lo [8] WARANG CITI OM..DIVES AKURU LETTER E @@ -8515,7 +8733,7 @@ FFDA..FFDC ; XID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGU 11A50 ; XID_Start # Lo SOYOMBO LETTER A 11A5C..11A89 ; XID_Start # Lo [46] SOYOMBO LETTER KA..SOYOMBO CLUSTER-INITIAL LETTER SA 11A9D ; XID_Start # Lo SOYOMBO MARK PLUTA -11AC0..11AF8 ; XID_Start # Lo [57] PAU CIN HAU LETTER PA..PAU CIN HAU GLOTTAL STOP FINAL +11AB0..11AF8 ; XID_Start # Lo [73] CANADIAN SYLLABICS NATTILIK HI..PAU CIN HAU GLOTTAL STOP FINAL 11C00..11C08 ; XID_Start # Lo [9] BHAIKSUKI LETTER A..BHAIKSUKI LETTER VOCALIC L 11C0A..11C2E ; XID_Start # Lo [37] BHAIKSUKI LETTER E..BHAIKSUKI LETTER HA 11C40 ; XID_Start # Lo BHAIKSUKI SIGN AVAGRAHA @@ -8533,10 +8751,12 @@ FFDA..FFDC ; XID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGU 12000..12399 ; XID_Start # Lo [922] CUNEIFORM SIGN A..CUNEIFORM SIGN U U 12400..1246E ; XID_Start # Nl [111] CUNEIFORM NUMERIC SIGN TWO ASH..CUNEIFORM NUMERIC SIGN NINE U VARIANT FORM 12480..12543 ; XID_Start # Lo [196] CUNEIFORM SIGN AB TIMES NUN TENU..CUNEIFORM SIGN ZU5 TIMES THREE DISH TENU +12F90..12FF0 ; XID_Start # Lo [97] CYPRO-MINOAN SIGN CM001..CYPRO-MINOAN SIGN CM114 13000..1342E ; XID_Start # Lo [1071] EGYPTIAN HIEROGLYPH A001..EGYPTIAN HIEROGLYPH AA032 14400..14646 ; XID_Start # Lo [583] ANATOLIAN HIEROGLYPH A001..ANATOLIAN HIEROGLYPH A530 16800..16A38 ; XID_Start # Lo [569] BAMUM LETTER PHASE-A NGKUE MFON..BAMUM LETTER PHASE-F VUEQ 16A40..16A5E ; XID_Start # Lo [31] MRO LETTER TA..MRO LETTER TEK +16A70..16ABE ; XID_Start # Lo [79] TANGSA LETTER OZ..TANGSA LETTER ZA 16AD0..16AED ; XID_Start # Lo [30] BASSA VAH LETTER ENNI..BASSA VAH LETTER I 16B00..16B2F ; XID_Start # Lo [48] PAHAWH HMONG VOWEL KEEB..PAHAWH HMONG CONSONANT CAU 16B40..16B43 ; XID_Start # Lm [4] PAHAWH HMONG SIGN VOS SEEV..PAHAWH HMONG SIGN IB YAM @@ -8551,7 +8771,10 @@ FFDA..FFDC ; XID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGU 17000..187F7 ; XID_Start # Lo [6136] TANGUT IDEOGRAPH-17000..TANGUT IDEOGRAPH-187F7 18800..18CD5 ; XID_Start # Lo [1238] TANGUT COMPONENT-001..KHITAN SMALL SCRIPT CHARACTER-18CD5 18D00..18D08 ; XID_Start # Lo [9] TANGUT IDEOGRAPH-18D00..TANGUT IDEOGRAPH-18D08 -1B000..1B11E ; XID_Start # Lo [287] KATAKANA LETTER ARCHAIC E..HENTAIGANA LETTER N-MU-MO-2 +1AFF0..1AFF3 ; XID_Start # Lm [4] KATAKANA LETTER MINNAN TONE-2..KATAKANA LETTER MINNAN TONE-5 +1AFF5..1AFFB ; XID_Start # Lm [7] KATAKANA LETTER MINNAN TONE-7..KATAKANA LETTER MINNAN NASALIZED TONE-5 +1AFFD..1AFFE ; XID_Start # Lm [2] KATAKANA LETTER MINNAN NASALIZED TONE-7..KATAKANA LETTER MINNAN NASALIZED TONE-8 +1B000..1B122 ; XID_Start # Lo [291] KATAKANA LETTER ARCHAIC E..KATAKANA LETTER ARCHAIC WU 1B150..1B152 ; XID_Start # Lo [3] HIRAGANA LETTER SMALL WI..HIRAGANA LETTER SMALL WO 1B164..1B167 ; XID_Start # Lo [4] KATAKANA LETTER SMALL WI..KATAKANA LETTER SMALL N 1B170..1B2FB ; XID_Start # Lo [396] NUSHU CHARACTER-1B170..NUSHU CHARACTER-1B2FB @@ -8589,10 +8812,18 @@ FFDA..FFDC ; XID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGU 1D78A..1D7A8 ; XID_Start # L& [31] MATHEMATICAL SANS-SERIF BOLD EPSILON SYMBOL..MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL OMEGA 1D7AA..1D7C2 ; XID_Start # L& [25] MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL ALPHA..MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL OMEGA 1D7C4..1D7CB ; XID_Start # L& [8] MATHEMATICAL SANS-SERIF BOLD ITALIC EPSILON SYMBOL..MATHEMATICAL BOLD SMALL DIGAMMA +1DF00..1DF09 ; XID_Start # L& [10] LATIN SMALL LETTER FENG DIGRAPH WITH TRILL..LATIN SMALL LETTER T WITH HOOK AND RETROFLEX HOOK +1DF0A ; XID_Start # Lo LATIN LETTER RETROFLEX CLICK WITH RETROFLEX HOOK +1DF0B..1DF1E ; XID_Start # L& [20] LATIN SMALL LETTER ESH WITH DOUBLE BAR..LATIN SMALL LETTER S WITH CURL 1E100..1E12C ; XID_Start # Lo [45] NYIAKENG PUACHUE HMONG LETTER MA..NYIAKENG PUACHUE HMONG LETTER W 1E137..1E13D ; XID_Start # Lm [7] NYIAKENG PUACHUE HMONG SIGN FOR PERSON..NYIAKENG PUACHUE HMONG SYLLABLE LENGTHENER 1E14E ; XID_Start # Lo NYIAKENG PUACHUE HMONG LOGOGRAM NYAJ +1E290..1E2AD ; XID_Start # Lo [30] TOTO LETTER PA..TOTO LETTER A 1E2C0..1E2EB ; XID_Start # Lo [44] WANCHO LETTER AA..WANCHO LETTER YIH +1E7E0..1E7E6 ; XID_Start # Lo [7] ETHIOPIC SYLLABLE HHYA..ETHIOPIC SYLLABLE HHYO +1E7E8..1E7EB ; XID_Start # Lo [4] ETHIOPIC SYLLABLE GURAGE HHWA..ETHIOPIC SYLLABLE HHWE +1E7ED..1E7EE ; XID_Start # Lo [2] ETHIOPIC SYLLABLE GURAGE MWI..ETHIOPIC SYLLABLE GURAGE MWEE +1E7F0..1E7FE ; XID_Start # Lo [15] ETHIOPIC SYLLABLE GURAGE QWI..ETHIOPIC SYLLABLE GURAGE PWEE 1E800..1E8C4 ; XID_Start # Lo [197] MENDE KIKAKUI SYLLABLE M001 KI..MENDE KIKAKUI SYLLABLE M060 NYON 1E900..1E943 ; XID_Start # L& [68] ADLAM CAPITAL LETTER ALIF..ADLAM SMALL LETTER SHA 1E94B ; XID_Start # Lm ADLAM NASALIZATION MARK @@ -8629,15 +8860,15 @@ FFDA..FFDC ; XID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGU 1EEA1..1EEA3 ; XID_Start # Lo [3] ARABIC MATHEMATICAL DOUBLE-STRUCK BEH..ARABIC MATHEMATICAL DOUBLE-STRUCK DAL 1EEA5..1EEA9 ; XID_Start # Lo [5] ARABIC MATHEMATICAL DOUBLE-STRUCK WAW..ARABIC MATHEMATICAL DOUBLE-STRUCK YEH 1EEAB..1EEBB ; XID_Start # Lo [17] ARABIC MATHEMATICAL DOUBLE-STRUCK LAM..ARABIC MATHEMATICAL DOUBLE-STRUCK GHAIN -20000..2A6DD ; XID_Start # Lo [42718] CJK UNIFIED IDEOGRAPH-20000..CJK UNIFIED IDEOGRAPH-2A6DD -2A700..2B734 ; XID_Start # Lo [4149] CJK UNIFIED IDEOGRAPH-2A700..CJK UNIFIED IDEOGRAPH-2B734 +20000..2A6DF ; XID_Start # Lo [42720] CJK UNIFIED IDEOGRAPH-20000..CJK UNIFIED IDEOGRAPH-2A6DF +2A700..2B738 ; XID_Start # Lo [4153] CJK UNIFIED IDEOGRAPH-2A700..CJK UNIFIED IDEOGRAPH-2B738 2B740..2B81D ; XID_Start # Lo [222] CJK UNIFIED IDEOGRAPH-2B740..CJK UNIFIED IDEOGRAPH-2B81D 2B820..2CEA1 ; XID_Start # Lo [5762] CJK UNIFIED IDEOGRAPH-2B820..CJK UNIFIED IDEOGRAPH-2CEA1 2CEB0..2EBE0 ; XID_Start # Lo [7473] CJK UNIFIED IDEOGRAPH-2CEB0..CJK UNIFIED IDEOGRAPH-2EBE0 2F800..2FA1D ; XID_Start # Lo [542] CJK COMPATIBILITY IDEOGRAPH-2F800..CJK COMPATIBILITY IDEOGRAPH-2FA1D 30000..3134A ; XID_Start # Lo [4939] CJK UNIFIED IDEOGRAPH-30000..CJK UNIFIED IDEOGRAPH-3134A -# Total code points: 131459 +# Total code points: 131974 # ================================================ @@ -8738,9 +8969,12 @@ FFDA..FFDC ; XID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGU 0840..0858 ; XID_Continue # Lo [25] MANDAIC LETTER HALQA..MANDAIC LETTER AIN 0859..085B ; XID_Continue # Mn [3] MANDAIC AFFRICATION MARK..MANDAIC GEMINATION MARK 0860..086A ; XID_Continue # Lo [11] SYRIAC LETTER MALAYALAM NGA..SYRIAC LETTER MALAYALAM SSA -08A0..08B4 ; XID_Continue # Lo [21] ARABIC LETTER BEH WITH SMALL V BELOW..ARABIC LETTER KAF WITH DOT BELOW -08B6..08C7 ; XID_Continue # Lo [18] ARABIC LETTER BEH WITH SMALL MEEM ABOVE..ARABIC LETTER LAM WITH SMALL ARABIC LETTER TAH ABOVE -08D3..08E1 ; XID_Continue # Mn [15] ARABIC SMALL LOW WAW..ARABIC SMALL HIGH SIGN SAFHA +0870..0887 ; XID_Continue # Lo [24] ARABIC LETTER ALEF WITH ATTACHED FATHA..ARABIC BASELINE ROUND DOT +0889..088E ; XID_Continue # Lo [6] ARABIC LETTER NOON WITH INVERTED SMALL V..ARABIC VERTICAL TAIL +0898..089F ; XID_Continue # Mn [8] ARABIC SMALL HIGH WORD AL-JUZ..ARABIC HALF MADDA OVER MADDA +08A0..08C8 ; XID_Continue # Lo [41] ARABIC LETTER BEH WITH SMALL V BELOW..ARABIC LETTER GRAF +08C9 ; XID_Continue # Lm ARABIC SMALL FARSI YEH +08CA..08E1 ; XID_Continue # Mn [24] ARABIC SMALL HIGH FARSI YEH..ARABIC SMALL HIGH SIGN SAFHA 08E3..0902 ; XID_Continue # Mn [32] ARABIC TURNED DAMMA BELOW..DEVANAGARI SIGN ANUSVARA 0903 ; XID_Continue # Mc DEVANAGARI SIGN VISARGA 0904..0939 ; XID_Continue # Lo [54] DEVANAGARI LETTER SHORT A..DEVANAGARI LETTER HA @@ -8878,6 +9112,7 @@ FFDA..FFDC ; XID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGU 0C0E..0C10 ; XID_Continue # Lo [3] TELUGU LETTER E..TELUGU LETTER AI 0C12..0C28 ; XID_Continue # Lo [23] TELUGU LETTER O..TELUGU LETTER NA 0C2A..0C39 ; XID_Continue # Lo [16] TELUGU LETTER PA..TELUGU LETTER HA +0C3C ; XID_Continue # Mn TELUGU SIGN NUKTA 0C3D ; XID_Continue # Lo TELUGU SIGN AVAGRAHA 0C3E..0C40 ; XID_Continue # Mn [3] TELUGU VOWEL SIGN AA..TELUGU VOWEL SIGN II 0C41..0C44 ; XID_Continue # Mc [4] TELUGU VOWEL SIGN U..TELUGU VOWEL SIGN VOCALIC RR @@ -8885,6 +9120,7 @@ FFDA..FFDC ; XID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGU 0C4A..0C4D ; XID_Continue # Mn [4] TELUGU VOWEL SIGN O..TELUGU SIGN VIRAMA 0C55..0C56 ; XID_Continue # Mn [2] TELUGU LENGTH MARK..TELUGU AI LENGTH MARK 0C58..0C5A ; XID_Continue # Lo [3] TELUGU LETTER TSA..TELUGU LETTER RRRA +0C5D ; XID_Continue # Lo TELUGU LETTER NAKAARA POLLU 0C60..0C61 ; XID_Continue # Lo [2] TELUGU LETTER VOCALIC RR..TELUGU LETTER VOCALIC LL 0C62..0C63 ; XID_Continue # Mn [2] TELUGU VOWEL SIGN VOCALIC L..TELUGU VOWEL SIGN VOCALIC LL 0C66..0C6F ; XID_Continue # Nd [10] TELUGU DIGIT ZERO..TELUGU DIGIT NINE @@ -8906,7 +9142,7 @@ FFDA..FFDC ; XID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGU 0CCA..0CCB ; XID_Continue # Mc [2] KANNADA VOWEL SIGN O..KANNADA VOWEL SIGN OO 0CCC..0CCD ; XID_Continue # Mn [2] KANNADA VOWEL SIGN AU..KANNADA SIGN VIRAMA 0CD5..0CD6 ; XID_Continue # Mc [2] KANNADA LENGTH MARK..KANNADA AI LENGTH MARK -0CDE ; XID_Continue # Lo KANNADA LETTER FA +0CDD..0CDE ; XID_Continue # Lo [2] KANNADA LETTER NAKAARA POLLU..KANNADA LETTER FA 0CE0..0CE1 ; XID_Continue # Lo [2] KANNADA LETTER VOCALIC RR..KANNADA LETTER VOCALIC LL 0CE2..0CE3 ; XID_Continue # Mn [2] KANNADA VOWEL SIGN VOCALIC L..KANNADA VOWEL SIGN VOCALIC LL 0CE6..0CEF ; XID_Continue # Nd [10] KANNADA DIGIT ZERO..KANNADA DIGIT NINE @@ -9050,11 +9286,12 @@ FFDA..FFDC ; XID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGU 16A0..16EA ; XID_Continue # Lo [75] RUNIC LETTER FEHU FEOH FE F..RUNIC LETTER X 16EE..16F0 ; XID_Continue # Nl [3] RUNIC ARLAUG SYMBOL..RUNIC BELGTHOR SYMBOL 16F1..16F8 ; XID_Continue # Lo [8] RUNIC LETTER K..RUNIC LETTER FRANKS CASKET AESC -1700..170C ; XID_Continue # Lo [13] TAGALOG LETTER A..TAGALOG LETTER YA -170E..1711 ; XID_Continue # Lo [4] TAGALOG LETTER LA..TAGALOG LETTER HA +1700..1711 ; XID_Continue # Lo [18] TAGALOG LETTER A..TAGALOG LETTER HA 1712..1714 ; XID_Continue # Mn [3] TAGALOG VOWEL SIGN I..TAGALOG SIGN VIRAMA -1720..1731 ; XID_Continue # Lo [18] HANUNOO LETTER A..HANUNOO LETTER HA -1732..1734 ; XID_Continue # Mn [3] HANUNOO VOWEL SIGN I..HANUNOO SIGN PAMUDPOD +1715 ; XID_Continue # Mc TAGALOG SIGN PAMUDPOD +171F..1731 ; XID_Continue # Lo [19] TAGALOG LETTER ARCHAIC RA..HANUNOO LETTER HA +1732..1733 ; XID_Continue # Mn [2] HANUNOO VOWEL SIGN I..HANUNOO VOWEL SIGN U +1734 ; XID_Continue # Mc HANUNOO SIGN PAMUDPOD 1740..1751 ; XID_Continue # Lo [18] BUHID LETTER A..BUHID LETTER HA 1752..1753 ; XID_Continue # Mn [2] BUHID VOWEL SIGN I..BUHID VOWEL SIGN U 1760..176C ; XID_Continue # Lo [13] TAGBANWA LETTER A..TAGBANWA LETTER YA @@ -9073,6 +9310,7 @@ FFDA..FFDC ; XID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGU 17DD ; XID_Continue # Mn KHMER SIGN ATTHACAN 17E0..17E9 ; XID_Continue # Nd [10] KHMER DIGIT ZERO..KHMER DIGIT NINE 180B..180D ; XID_Continue # Mn [3] MONGOLIAN FREE VARIATION SELECTOR ONE..MONGOLIAN FREE VARIATION SELECTOR THREE +180F ; XID_Continue # Mn MONGOLIAN FREE VARIATION SELECTOR FOUR 1810..1819 ; XID_Continue # Nd [10] MONGOLIAN DIGIT ZERO..MONGOLIAN DIGIT NINE 1820..1842 ; XID_Continue # Lo [35] MONGOLIAN LETTER A..MONGOLIAN LETTER CHI 1843 ; XID_Continue # Lm MONGOLIAN LETTER TODO LONG VOWEL SIGN @@ -9120,7 +9358,7 @@ FFDA..FFDC ; XID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGU 1A90..1A99 ; XID_Continue # Nd [10] TAI THAM THAM DIGIT ZERO..TAI THAM THAM DIGIT NINE 1AA7 ; XID_Continue # Lm TAI THAM SIGN MAI YAMOK 1AB0..1ABD ; XID_Continue # Mn [14] COMBINING DOUBLED CIRCUMFLEX ACCENT..COMBINING PARENTHESES BELOW -1ABF..1AC0 ; XID_Continue # Mn [2] COMBINING LATIN SMALL LETTER W BELOW..COMBINING LATIN SMALL LETTER TURNED W BELOW +1ABF..1ACE ; XID_Continue # Mn [16] COMBINING LATIN SMALL LETTER W BELOW..COMBINING LATIN SMALL LETTER INSULAR T 1B00..1B03 ; XID_Continue # Mn [4] BALINESE SIGN ULU RICEM..BALINESE SIGN SURANG 1B04 ; XID_Continue # Mc BALINESE SIGN BISAH 1B05..1B33 ; XID_Continue # Lo [47] BALINESE LETTER AKARA..BALINESE LETTER HA @@ -9132,7 +9370,7 @@ FFDA..FFDC ; XID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGU 1B3D..1B41 ; XID_Continue # Mc [5] BALINESE VOWEL SIGN LA LENGA TEDUNG..BALINESE VOWEL SIGN TALING REPA TEDUNG 1B42 ; XID_Continue # Mn BALINESE VOWEL SIGN PEPET 1B43..1B44 ; XID_Continue # Mc [2] BALINESE VOWEL SIGN PEPET TEDUNG..BALINESE ADEG ADEG -1B45..1B4B ; XID_Continue # Lo [7] BALINESE LETTER KAF SASAK..BALINESE LETTER ASYURA SASAK +1B45..1B4C ; XID_Continue # Lo [8] BALINESE LETTER KAF SASAK..BALINESE LETTER ARCHAIC JNYA 1B50..1B59 ; XID_Continue # Nd [10] BALINESE DIGIT ZERO..BALINESE DIGIT NINE 1B6B..1B73 ; XID_Continue # Mn [9] BALINESE MUSICAL SYMBOL COMBINING TEGEH..BALINESE MUSICAL SYMBOL COMBINING GONG 1B80..1B81 ; XID_Continue # Mn [2] SUNDANESE SIGN PANYECEK..SUNDANESE SIGN PANGLAYAR @@ -9186,8 +9424,7 @@ FFDA..FFDC ; XID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGU 1D78 ; XID_Continue # Lm MODIFIER LETTER CYRILLIC EN 1D79..1D9A ; XID_Continue # L& [34] LATIN SMALL LETTER INSULAR G..LATIN SMALL LETTER EZH WITH RETROFLEX HOOK 1D9B..1DBF ; XID_Continue # Lm [37] MODIFIER LETTER SMALL TURNED ALPHA..MODIFIER LETTER SMALL THETA -1DC0..1DF9 ; XID_Continue # Mn [58] COMBINING DOTTED GRAVE ACCENT..COMBINING WIDE INVERTED BRIDGE BELOW -1DFB..1DFF ; XID_Continue # Mn [5] COMBINING DELETION MARK..COMBINING RIGHT ARROWHEAD AND DOWN ARROWHEAD BELOW +1DC0..1DFF ; XID_Continue # Mn [64] COMBINING DOTTED GRAVE ACCENT..COMBINING RIGHT ARROWHEAD AND DOWN ARROWHEAD BELOW 1E00..1F15 ; XID_Continue # L& [278] LATIN CAPITAL LETTER A WITH RING BELOW..GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA 1F18..1F1D ; XID_Continue # L& [6] GREEK CAPITAL LETTER EPSILON WITH PSILI..GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA 1F20..1F45 ; XID_Continue # L& [38] GREEK SMALL LETTER ETA WITH PSILI..GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA @@ -9235,9 +9472,7 @@ FFDA..FFDC ; XID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGU 2160..2182 ; XID_Continue # Nl [35] ROMAN NUMERAL ONE..ROMAN NUMERAL TEN THOUSAND 2183..2184 ; XID_Continue # L& [2] ROMAN NUMERAL REVERSED ONE HUNDRED..LATIN SMALL LETTER REVERSED C 2185..2188 ; XID_Continue # Nl [4] ROMAN NUMERAL SIX LATE FORM..ROMAN NUMERAL ONE HUNDRED THOUSAND -2C00..2C2E ; XID_Continue # L& [47] GLAGOLITIC CAPITAL LETTER AZU..GLAGOLITIC CAPITAL LETTER LATINATE MYSLITE -2C30..2C5E ; XID_Continue # L& [47] GLAGOLITIC SMALL LETTER AZU..GLAGOLITIC SMALL LETTER LATINATE MYSLITE -2C60..2C7B ; XID_Continue # L& [28] LATIN CAPITAL LETTER L WITH DOUBLE BAR..LATIN LETTER SMALL CAPITAL TURNED E +2C00..2C7B ; XID_Continue # L& [124] GLAGOLITIC CAPITAL LETTER AZU..LATIN LETTER SMALL CAPITAL TURNED E 2C7C..2C7D ; XID_Continue # Lm [2] LATIN SUBSCRIPT SMALL LETTER J..MODIFIER LETTER CAPITAL V 2C7E..2CE4 ; XID_Continue # L& [103] LATIN CAPITAL LETTER S WITH SWASH TAIL..COPTIC SYMBOL KAI 2CEB..2CEE ; XID_Continue # L& [4] COPTIC CAPITAL LETTER CRYPTOGRAMMIC SHEI..COPTIC SMALL LETTER CRYPTOGRAMMIC GANGIA @@ -9281,8 +9516,7 @@ FFDA..FFDC ; XID_Start # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGU 31A0..31BF ; XID_Continue # Lo [32] BOPOMOFO LETTER BU..BOPOMOFO LETTER AH 31F0..31FF ; XID_Continue # Lo [16] KATAKANA LETTER SMALL KU..KATAKANA LETTER SMALL RO 3400..4DBF ; XID_Continue # Lo [6592] CJK UNIFIED IDEOGRAPH-3400..CJK UNIFIED IDEOGRAPH-4DBF -4E00..9FFC ; XID_Continue # Lo [20989] CJK UNIFIED IDEOGRAPH-4E00..CJK UNIFIED IDEOGRAPH-9FFC -A000..A014 ; XID_Continue # Lo [21] YI SYLLABLE IT..YI SYLLABLE E +4E00..A014 ; XID_Continue # Lo [21013] CJK UNIFIED IDEOGRAPH-4E00..YI SYLLABLE E A015 ; XID_Continue # Lm YI SYLLABLE WU A016..A48C ; XID_Continue # Lo [1143] YI SYLLABLE BIT..YI SYLLABLE YYR A4D0..A4F7 ; XID_Continue # Lo [40] LISU LETTER BA..LISU LETTER OE @@ -9310,8 +9544,11 @@ A771..A787 ; XID_Continue # L& [23] LATIN SMALL LETTER DUM..LATIN SMALL LETT A788 ; XID_Continue # Lm MODIFIER LETTER LOW CIRCUMFLEX ACCENT A78B..A78E ; XID_Continue # L& [4] LATIN CAPITAL LETTER SALTILLO..LATIN SMALL LETTER L WITH RETROFLEX HOOK AND BELT A78F ; XID_Continue # Lo LATIN LETTER SINOLOGICAL DOT -A790..A7BF ; XID_Continue # L& [48] LATIN CAPITAL LETTER N WITH DESCENDER..LATIN SMALL LETTER GLOTTAL U -A7C2..A7CA ; XID_Continue # L& [9] LATIN CAPITAL LETTER ANGLICANA W..LATIN SMALL LETTER S WITH SHORT STROKE OVERLAY +A790..A7CA ; XID_Continue # L& [59] LATIN CAPITAL LETTER N WITH DESCENDER..LATIN SMALL LETTER S WITH SHORT STROKE OVERLAY +A7D0..A7D1 ; XID_Continue # L& [2] LATIN CAPITAL LETTER CLOSED INSULAR G..LATIN SMALL LETTER CLOSED INSULAR G +A7D3 ; XID_Continue # L& LATIN SMALL LETTER DOUBLE THORN +A7D5..A7D9 ; XID_Continue # L& [5] LATIN SMALL LETTER DOUBLE WYNN..LATIN SMALL LETTER SIGMOID S +A7F2..A7F4 ; XID_Continue # Lm [3] MODIFIER LETTER CAPITAL C..MODIFIER LETTER CAPITAL Q A7F5..A7F6 ; XID_Continue # L& [2] LATIN CAPITAL LETTER REVERSED HALF H..LATIN SMALL LETTER REVERSED HALF H A7F7 ; XID_Continue # Lo LATIN EPIGRAPHIC LETTER SIDEWAYS I A7F8..A7F9 ; XID_Continue # Lm [2] MODIFIER LETTER CAPITAL H WITH STROKE..MODIFIER LETTER SMALL LIGATURE OE @@ -9496,9 +9733,20 @@ FFDA..FFDC ; XID_Continue # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HA 104D8..104FB ; XID_Continue # L& [36] OSAGE SMALL LETTER A..OSAGE SMALL LETTER ZHA 10500..10527 ; XID_Continue # Lo [40] ELBASAN LETTER A..ELBASAN LETTER KHE 10530..10563 ; XID_Continue # Lo [52] CAUCASIAN ALBANIAN LETTER ALT..CAUCASIAN ALBANIAN LETTER KIW +10570..1057A ; XID_Continue # L& [11] VITHKUQI CAPITAL LETTER A..VITHKUQI CAPITAL LETTER GA +1057C..1058A ; XID_Continue # L& [15] VITHKUQI CAPITAL LETTER HA..VITHKUQI CAPITAL LETTER RE +1058C..10592 ; XID_Continue # L& [7] VITHKUQI CAPITAL LETTER SE..VITHKUQI CAPITAL LETTER XE +10594..10595 ; XID_Continue # L& [2] VITHKUQI CAPITAL LETTER Y..VITHKUQI CAPITAL LETTER ZE +10597..105A1 ; XID_Continue # L& [11] VITHKUQI SMALL LETTER A..VITHKUQI SMALL LETTER GA +105A3..105B1 ; XID_Continue # L& [15] VITHKUQI SMALL LETTER HA..VITHKUQI SMALL LETTER RE +105B3..105B9 ; XID_Continue # L& [7] VITHKUQI SMALL LETTER SE..VITHKUQI SMALL LETTER XE +105BB..105BC ; XID_Continue # L& [2] VITHKUQI SMALL LETTER Y..VITHKUQI SMALL LETTER ZE 10600..10736 ; XID_Continue # Lo [311] LINEAR A SIGN AB001..LINEAR A SIGN A664 10740..10755 ; XID_Continue # Lo [22] LINEAR A SIGN A701 A..LINEAR A SIGN A732 JE 10760..10767 ; XID_Continue # Lo [8] LINEAR A SIGN A800..LINEAR A SIGN A807 +10780..10785 ; XID_Continue # Lm [6] MODIFIER LETTER SMALL CAPITAL AA..MODIFIER LETTER SMALL B WITH HOOK +10787..107B0 ; XID_Continue # Lm [42] MODIFIER LETTER SMALL DZ DIGRAPH..MODIFIER LETTER SMALL V WITH RIGHT HOOK +107B2..107BA ; XID_Continue # Lm [9] MODIFIER LETTER SMALL CAPITAL Y..MODIFIER LETTER SMALL S WITH CURL 10800..10805 ; XID_Continue # Lo [6] CYPRIOT SYLLABLE A..CYPRIOT SYLLABLE JA 10808 ; XID_Continue # Lo CYPRIOT SYLLABLE JO 1080A..10835 ; XID_Continue # Lo [44] CYPRIOT SYLLABLE KA..CYPRIOT SYLLABLE WO @@ -9544,6 +9792,8 @@ FFDA..FFDC ; XID_Continue # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HA 10F27 ; XID_Continue # Lo OLD SOGDIAN LIGATURE AYIN-DALETH 10F30..10F45 ; XID_Continue # Lo [22] SOGDIAN LETTER ALEPH..SOGDIAN INDEPENDENT SHIN 10F46..10F50 ; XID_Continue # Mn [11] SOGDIAN COMBINING DOT BELOW..SOGDIAN COMBINING STROKE BELOW +10F70..10F81 ; XID_Continue # Lo [18] OLD UYGHUR LETTER ALEPH..OLD UYGHUR LETTER LESH +10F82..10F85 ; XID_Continue # Mn [4] OLD UYGHUR COMBINING DOT ABOVE..OLD UYGHUR COMBINING TWO DOTS BELOW 10FB0..10FC4 ; XID_Continue # Lo [21] CHORASMIAN LETTER ALEPH..CHORASMIAN LETTER TAW 10FE0..10FF6 ; XID_Continue # Lo [23] ELYMAIC LETTER ALEPH..ELYMAIC LIGATURE ZAYIN-YODH 11000 ; XID_Continue # Mc BRAHMI SIGN CANDRABINDU @@ -9552,6 +9802,10 @@ FFDA..FFDC ; XID_Continue # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HA 11003..11037 ; XID_Continue # Lo [53] BRAHMI SIGN JIHVAMULIYA..BRAHMI LETTER OLD TAMIL NNNA 11038..11046 ; XID_Continue # Mn [15] BRAHMI VOWEL SIGN AA..BRAHMI VIRAMA 11066..1106F ; XID_Continue # Nd [10] BRAHMI DIGIT ZERO..BRAHMI DIGIT NINE +11070 ; XID_Continue # Mn BRAHMI SIGN OLD TAMIL VIRAMA +11071..11072 ; XID_Continue # Lo [2] BRAHMI LETTER OLD TAMIL SHORT E..BRAHMI LETTER OLD TAMIL SHORT O +11073..11074 ; XID_Continue # Mn [2] BRAHMI VOWEL SIGN OLD TAMIL SHORT E..BRAHMI VOWEL SIGN OLD TAMIL SHORT O +11075 ; XID_Continue # Lo BRAHMI LETTER OLD TAMIL LLA 1107F..11081 ; XID_Continue # Mn [3] BRAHMI NUMBER JOINER..KAITHI SIGN ANUSVARA 11082 ; XID_Continue # Mc KAITHI SIGN VISARGA 11083..110AF ; XID_Continue # Lo [45] KAITHI LETTER A..KAITHI LETTER HA @@ -9559,6 +9813,7 @@ FFDA..FFDC ; XID_Continue # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HA 110B3..110B6 ; XID_Continue # Mn [4] KAITHI VOWEL SIGN U..KAITHI VOWEL SIGN AI 110B7..110B8 ; XID_Continue # Mc [2] KAITHI VOWEL SIGN O..KAITHI VOWEL SIGN AU 110B9..110BA ; XID_Continue # Mn [2] KAITHI SIGN VIRAMA..KAITHI SIGN NUKTA +110C2 ; XID_Continue # Mn KAITHI VOWEL SIGN VOCALIC R 110D0..110E8 ; XID_Continue # Lo [25] SORA SOMPENG LETTER SAH..SORA SOMPENG LETTER MAE 110F0..110F9 ; XID_Continue # Nd [10] SORA SOMPENG DIGIT ZERO..SORA SOMPENG DIGIT NINE 11100..11102 ; XID_Continue # Mn [3] CHAKMA SIGN CANDRABINDU..CHAKMA SIGN VISARGA @@ -9684,6 +9939,7 @@ FFDA..FFDC ; XID_Continue # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HA 11726 ; XID_Continue # Mc AHOM VOWEL SIGN E 11727..1172B ; XID_Continue # Mn [5] AHOM VOWEL SIGN AW..AHOM SIGN KILLER 11730..11739 ; XID_Continue # Nd [10] AHOM DIGIT ZERO..AHOM DIGIT NINE +11740..11746 ; XID_Continue # Lo [7] AHOM LETTER CA..AHOM LETTER LLA 11800..1182B ; XID_Continue # Lo [44] DOGRA LETTER A..DOGRA LETTER RRA 1182C..1182E ; XID_Continue # Mc [3] DOGRA VOWEL SIGN AA..DOGRA VOWEL SIGN II 1182F..11837 ; XID_Continue # Mn [9] DOGRA VOWEL SIGN U..DOGRA SIGN ANUSVARA @@ -9734,7 +9990,7 @@ FFDA..FFDC ; XID_Continue # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HA 11A97 ; XID_Continue # Mc SOYOMBO SIGN VISARGA 11A98..11A99 ; XID_Continue # Mn [2] SOYOMBO GEMINATION MARK..SOYOMBO SUBJOINER 11A9D ; XID_Continue # Lo SOYOMBO MARK PLUTA -11AC0..11AF8 ; XID_Continue # Lo [57] PAU CIN HAU LETTER PA..PAU CIN HAU GLOTTAL STOP FINAL +11AB0..11AF8 ; XID_Continue # Lo [73] CANADIAN SYLLABICS NATTILIK HI..PAU CIN HAU GLOTTAL STOP FINAL 11C00..11C08 ; XID_Continue # Lo [9] BHAIKSUKI LETTER A..BHAIKSUKI LETTER VOCALIC L 11C0A..11C2E ; XID_Continue # Lo [37] BHAIKSUKI LETTER E..BHAIKSUKI LETTER HA 11C2F ; XID_Continue # Mc BHAIKSUKI VOWEL SIGN AA @@ -9780,11 +10036,14 @@ FFDA..FFDC ; XID_Continue # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HA 12000..12399 ; XID_Continue # Lo [922] CUNEIFORM SIGN A..CUNEIFORM SIGN U U 12400..1246E ; XID_Continue # Nl [111] CUNEIFORM NUMERIC SIGN TWO ASH..CUNEIFORM NUMERIC SIGN NINE U VARIANT FORM 12480..12543 ; XID_Continue # Lo [196] CUNEIFORM SIGN AB TIMES NUN TENU..CUNEIFORM SIGN ZU5 TIMES THREE DISH TENU +12F90..12FF0 ; XID_Continue # Lo [97] CYPRO-MINOAN SIGN CM001..CYPRO-MINOAN SIGN CM114 13000..1342E ; XID_Continue # Lo [1071] EGYPTIAN HIEROGLYPH A001..EGYPTIAN HIEROGLYPH AA032 14400..14646 ; XID_Continue # Lo [583] ANATOLIAN HIEROGLYPH A001..ANATOLIAN HIEROGLYPH A530 16800..16A38 ; XID_Continue # Lo [569] BAMUM LETTER PHASE-A NGKUE MFON..BAMUM LETTER PHASE-F VUEQ 16A40..16A5E ; XID_Continue # Lo [31] MRO LETTER TA..MRO LETTER TEK 16A60..16A69 ; XID_Continue # Nd [10] MRO DIGIT ZERO..MRO DIGIT NINE +16A70..16ABE ; XID_Continue # Lo [79] TANGSA LETTER OZ..TANGSA LETTER ZA +16AC0..16AC9 ; XID_Continue # Nd [10] TANGSA DIGIT ZERO..TANGSA DIGIT NINE 16AD0..16AED ; XID_Continue # Lo [30] BASSA VAH LETTER ENNI..BASSA VAH LETTER I 16AF0..16AF4 ; XID_Continue # Mn [5] BASSA VAH COMBINING HIGH TONE..BASSA VAH COMBINING HIGH-LOW TONE 16B00..16B2F ; XID_Continue # Lo [48] PAHAWH HMONG VOWEL KEEB..PAHAWH HMONG CONSONANT CAU @@ -9807,7 +10066,10 @@ FFDA..FFDC ; XID_Continue # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HA 17000..187F7 ; XID_Continue # Lo [6136] TANGUT IDEOGRAPH-17000..TANGUT IDEOGRAPH-187F7 18800..18CD5 ; XID_Continue # Lo [1238] TANGUT COMPONENT-001..KHITAN SMALL SCRIPT CHARACTER-18CD5 18D00..18D08 ; XID_Continue # Lo [9] TANGUT IDEOGRAPH-18D00..TANGUT IDEOGRAPH-18D08 -1B000..1B11E ; XID_Continue # Lo [287] KATAKANA LETTER ARCHAIC E..HENTAIGANA LETTER N-MU-MO-2 +1AFF0..1AFF3 ; XID_Continue # Lm [4] KATAKANA LETTER MINNAN TONE-2..KATAKANA LETTER MINNAN TONE-5 +1AFF5..1AFFB ; XID_Continue # Lm [7] KATAKANA LETTER MINNAN TONE-7..KATAKANA LETTER MINNAN NASALIZED TONE-5 +1AFFD..1AFFE ; XID_Continue # Lm [2] KATAKANA LETTER MINNAN NASALIZED TONE-7..KATAKANA LETTER MINNAN NASALIZED TONE-8 +1B000..1B122 ; XID_Continue # Lo [291] KATAKANA LETTER ARCHAIC E..KATAKANA LETTER ARCHAIC WU 1B150..1B152 ; XID_Continue # Lo [3] HIRAGANA LETTER SMALL WI..HIRAGANA LETTER SMALL WO 1B164..1B167 ; XID_Continue # Lo [4] KATAKANA LETTER SMALL WI..KATAKANA LETTER SMALL N 1B170..1B2FB ; XID_Continue # Lo [396] NUSHU CHARACTER-1B170..NUSHU CHARACTER-1B2FB @@ -9816,6 +10078,8 @@ FFDA..FFDC ; XID_Continue # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HA 1BC80..1BC88 ; XID_Continue # Lo [9] DUPLOYAN AFFIX HIGH ACUTE..DUPLOYAN AFFIX HIGH VERTICAL 1BC90..1BC99 ; XID_Continue # Lo [10] DUPLOYAN AFFIX LOW ACUTE..DUPLOYAN AFFIX LOW ARROW 1BC9D..1BC9E ; XID_Continue # Mn [2] DUPLOYAN THICK LETTER SELECTOR..DUPLOYAN DOUBLE MARK +1CF00..1CF2D ; XID_Continue # Mn [46] ZNAMENNY COMBINING MARK GORAZDO NIZKO S KRYZHEM ON LEFT..ZNAMENNY COMBINING MARK KRYZH ON LEFT +1CF30..1CF46 ; XID_Continue # Mn [23] ZNAMENNY COMBINING TONAL RANGE MARK MRACHNO..ZNAMENNY PRIZNAK MODIFIER ROG 1D165..1D166 ; XID_Continue # Mc [2] MUSICAL SYMBOL COMBINING STEM..MUSICAL SYMBOL COMBINING SPRECHGESANG STEM 1D167..1D169 ; XID_Continue # Mn [3] MUSICAL SYMBOL COMBINING TREMOLO-1..MUSICAL SYMBOL COMBINING TREMOLO-3 1D16D..1D172 ; XID_Continue # Mc [6] MUSICAL SYMBOL COMBINING AUGMENTATION DOT..MUSICAL SYMBOL COMBINING FLAG-5 @@ -9860,6 +10124,9 @@ FFDA..FFDC ; XID_Continue # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HA 1DA84 ; XID_Continue # Mn SIGNWRITING LOCATION HEAD NECK 1DA9B..1DA9F ; XID_Continue # Mn [5] SIGNWRITING FILL MODIFIER-2..SIGNWRITING FILL MODIFIER-6 1DAA1..1DAAF ; XID_Continue # Mn [15] SIGNWRITING ROTATION MODIFIER-2..SIGNWRITING ROTATION MODIFIER-16 +1DF00..1DF09 ; XID_Continue # L& [10] LATIN SMALL LETTER FENG DIGRAPH WITH TRILL..LATIN SMALL LETTER T WITH HOOK AND RETROFLEX HOOK +1DF0A ; XID_Continue # Lo LATIN LETTER RETROFLEX CLICK WITH RETROFLEX HOOK +1DF0B..1DF1E ; XID_Continue # L& [20] LATIN SMALL LETTER ESH WITH DOUBLE BAR..LATIN SMALL LETTER S WITH CURL 1E000..1E006 ; XID_Continue # Mn [7] COMBINING GLAGOLITIC LETTER AZU..COMBINING GLAGOLITIC LETTER ZHIVETE 1E008..1E018 ; XID_Continue # Mn [17] COMBINING GLAGOLITIC LETTER ZEMLJA..COMBINING GLAGOLITIC LETTER HERU 1E01B..1E021 ; XID_Continue # Mn [7] COMBINING GLAGOLITIC LETTER SHTA..COMBINING GLAGOLITIC LETTER YATI @@ -9870,9 +10137,15 @@ FFDA..FFDC ; XID_Continue # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HA 1E137..1E13D ; XID_Continue # Lm [7] NYIAKENG PUACHUE HMONG SIGN FOR PERSON..NYIAKENG PUACHUE HMONG SYLLABLE LENGTHENER 1E140..1E149 ; XID_Continue # Nd [10] NYIAKENG PUACHUE HMONG DIGIT ZERO..NYIAKENG PUACHUE HMONG DIGIT NINE 1E14E ; XID_Continue # Lo NYIAKENG PUACHUE HMONG LOGOGRAM NYAJ +1E290..1E2AD ; XID_Continue # Lo [30] TOTO LETTER PA..TOTO LETTER A +1E2AE ; XID_Continue # Mn TOTO SIGN RISING TONE 1E2C0..1E2EB ; XID_Continue # Lo [44] WANCHO LETTER AA..WANCHO LETTER YIH 1E2EC..1E2EF ; XID_Continue # Mn [4] WANCHO TONE TUP..WANCHO TONE KOINI 1E2F0..1E2F9 ; XID_Continue # Nd [10] WANCHO DIGIT ZERO..WANCHO DIGIT NINE +1E7E0..1E7E6 ; XID_Continue # Lo [7] ETHIOPIC SYLLABLE HHYA..ETHIOPIC SYLLABLE HHYO +1E7E8..1E7EB ; XID_Continue # Lo [4] ETHIOPIC SYLLABLE GURAGE HHWA..ETHIOPIC SYLLABLE HHWE +1E7ED..1E7EE ; XID_Continue # Lo [2] ETHIOPIC SYLLABLE GURAGE MWI..ETHIOPIC SYLLABLE GURAGE MWEE +1E7F0..1E7FE ; XID_Continue # Lo [15] ETHIOPIC SYLLABLE GURAGE QWI..ETHIOPIC SYLLABLE GURAGE PWEE 1E800..1E8C4 ; XID_Continue # Lo [197] MENDE KIKAKUI SYLLABLE M001 KI..MENDE KIKAKUI SYLLABLE M060 NYON 1E8D0..1E8D6 ; XID_Continue # Mn [7] MENDE KIKAKUI COMBINING NUMBER TEENS..MENDE KIKAKUI COMBINING NUMBER MILLIONS 1E900..1E943 ; XID_Continue # L& [68] ADLAM CAPITAL LETTER ALIF..ADLAM SMALL LETTER SHA @@ -9913,8 +10186,8 @@ FFDA..FFDC ; XID_Continue # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HA 1EEA5..1EEA9 ; XID_Continue # Lo [5] ARABIC MATHEMATICAL DOUBLE-STRUCK WAW..ARABIC MATHEMATICAL DOUBLE-STRUCK YEH 1EEAB..1EEBB ; XID_Continue # Lo [17] ARABIC MATHEMATICAL DOUBLE-STRUCK LAM..ARABIC MATHEMATICAL DOUBLE-STRUCK GHAIN 1FBF0..1FBF9 ; XID_Continue # Nd [10] SEGMENTED DIGIT ZERO..SEGMENTED DIGIT NINE -20000..2A6DD ; XID_Continue # Lo [42718] CJK UNIFIED IDEOGRAPH-20000..CJK UNIFIED IDEOGRAPH-2A6DD -2A700..2B734 ; XID_Continue # Lo [4149] CJK UNIFIED IDEOGRAPH-2A700..CJK UNIFIED IDEOGRAPH-2B734 +20000..2A6DF ; XID_Continue # Lo [42720] CJK UNIFIED IDEOGRAPH-20000..CJK UNIFIED IDEOGRAPH-2A6DF +2A700..2B738 ; XID_Continue # Lo [4153] CJK UNIFIED IDEOGRAPH-2A700..CJK UNIFIED IDEOGRAPH-2B738 2B740..2B81D ; XID_Continue # Lo [222] CJK UNIFIED IDEOGRAPH-2B740..CJK UNIFIED IDEOGRAPH-2B81D 2B820..2CEA1 ; XID_Continue # Lo [5762] CJK UNIFIED IDEOGRAPH-2B820..CJK UNIFIED IDEOGRAPH-2CEA1 2CEB0..2EBE0 ; XID_Continue # Lo [7473] CJK UNIFIED IDEOGRAPH-2CEB0..CJK UNIFIED IDEOGRAPH-2EBE0 @@ -9922,7 +10195,7 @@ FFDA..FFDC ; XID_Continue # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HA 30000..3134A ; XID_Continue # Lo [4939] CJK UNIFIED IDEOGRAPH-30000..CJK UNIFIED IDEOGRAPH-3134A E0100..E01EF ; XID_Continue # Mn [240] VARIATION SELECTOR-17..VARIATION SELECTOR-256 -# Total code points: 134415 +# Total code points: 135053 # ================================================ @@ -9943,6 +10216,7 @@ E0100..E01EF ; XID_Continue # Mn [240] VARIATION SELECTOR-17..VARIATION SELECTO 17B4..17B5 ; Default_Ignorable_Code_Point # Mn [2] KHMER VOWEL INHERENT AQ..KHMER VOWEL INHERENT AA 180B..180D ; Default_Ignorable_Code_Point # Mn [3] MONGOLIAN FREE VARIATION SELECTOR ONE..MONGOLIAN FREE VARIATION SELECTOR THREE 180E ; Default_Ignorable_Code_Point # Cf MONGOLIAN VOWEL SEPARATOR +180F ; Default_Ignorable_Code_Point # Mn MONGOLIAN FREE VARIATION SELECTOR FOUR 200B..200F ; Default_Ignorable_Code_Point # Cf [5] ZERO WIDTH SPACE..RIGHT-TO-LEFT MARK 202A..202E ; Default_Ignorable_Code_Point # Cf [5] LEFT-TO-RIGHT EMBEDDING..RIGHT-TO-LEFT OVERRIDE 2060..2064 ; Default_Ignorable_Code_Point # Cf [5] WORD JOINER..INVISIBLE PLUS @@ -9963,7 +10237,7 @@ E0080..E00FF ; Default_Ignorable_Code_Point # Cn [128] .... -# Total code points: 4173 +# Total code points: 4174 # ================================================ @@ -9997,7 +10271,8 @@ E01F0..E0FFF ; Default_Ignorable_Code_Point # Cn [3600] .............. +2E52..2E54 ; Pattern_Syntax # Po [3] TIRONIAN SIGN CAPITAL ET..MEDIEVAL QUESTION MARK +2E55 ; Pattern_Syntax # Ps LEFT SQUARE BRACKET WITH STROKE +2E56 ; Pattern_Syntax # Pe RIGHT SQUARE BRACKET WITH STROKE +2E57 ; Pattern_Syntax # Ps LEFT SQUARE BRACKET WITH DOUBLE STROKE +2E58 ; Pattern_Syntax # Pe RIGHT SQUARE BRACKET WITH DOUBLE STROKE +2E59 ; Pattern_Syntax # Ps TOP HALF LEFT PARENTHESIS +2E5A ; Pattern_Syntax # Pe TOP HALF RIGHT PARENTHESIS +2E5B ; Pattern_Syntax # Ps BOTTOM HALF LEFT PARENTHESIS +2E5C ; Pattern_Syntax # Pe BOTTOM HALF RIGHT PARENTHESIS +2E5D ; Pattern_Syntax # Pd OBLIQUE HYPHEN +2E5E..2E7F ; Pattern_Syntax # Cn [34] .. 3001..3003 ; Pattern_Syntax # Po [3] IDEOGRAPHIC COMMA..DITTO MARK 3008 ; Pattern_Syntax # Ps LEFT ANGLE BRACKET 3009 ; Pattern_Syntax # Pe RIGHT ANGLE BRACKET @@ -1682,11 +1727,12 @@ FE45..FE46 ; Pattern_Syntax # Po [2] SESAME DOT..WHITE SESAME DOT 0600..0605 ; Prepended_Concatenation_Mark # Cf [6] ARABIC NUMBER SIGN..ARABIC NUMBER MARK ABOVE 06DD ; Prepended_Concatenation_Mark # Cf ARABIC END OF AYAH 070F ; Prepended_Concatenation_Mark # Cf SYRIAC ABBREVIATION MARK +0890..0891 ; Prepended_Concatenation_Mark # Cf [2] ARABIC POUND MARK ABOVE..ARABIC PIASTRE MARK ABOVE 08E2 ; Prepended_Concatenation_Mark # Cf ARABIC DISPUTED END OF AYAH 110BD ; Prepended_Concatenation_Mark # Cf KAITHI NUMBER SIGN 110CD ; Prepended_Concatenation_Mark # Cf KAITHI NUMBER SIGN ABOVE -# Total code points: 11 +# Total code points: 13 # ================================================ diff --git a/make/data/unicodedata/PropertyValueAliases.txt b/make/data/unicodedata/PropertyValueAliases.txt index a72c86715917a4215584ee8b91ca4e4100a23532..0d9356fb8e955c3ed0ae39734348a13ee2b00fba 100644 --- a/make/data/unicodedata/PropertyValueAliases.txt +++ b/make/data/unicodedata/PropertyValueAliases.txt @@ -1,6 +1,6 @@ -# PropertyValueAliases-13.0.0.txt -# Date: 2019-11-13, 21:52:10 GMT -# Copyright (c) 2019 Unicode, Inc. +# PropertyValueAliases-14.0.0.txt +# Date: 2021-05-10, 21:08:53 GMT +# Copyright (c) 2021 Unicode, Inc. # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries. # For terms of use, see http://www.unicode.org/terms_of_use.html # @@ -89,6 +89,7 @@ age; 11.0 ; V11_0 age; 12.0 ; V12_0 age; 12.1 ; V12_1 age; 13.0 ; V13_0 +age; 14.0 ; V14_0 age; NA ; Unassigned # Alphabetic (Alpha) @@ -160,6 +161,7 @@ blk; Ancient_Greek_Numbers ; Ancient_Greek_Numbers blk; Ancient_Symbols ; Ancient_Symbols blk; Arabic ; Arabic blk; Arabic_Ext_A ; Arabic_Extended_A +blk; Arabic_Ext_B ; Arabic_Extended_B blk; Arabic_Math ; Arabic_Mathematical_Alphabetic_Symbols blk; Arabic_PF_A ; Arabic_Presentation_Forms_A ; Arabic_Presentation_Forms-A blk; Arabic_PF_B ; Arabic_Presentation_Forms_B @@ -216,6 +218,7 @@ blk; Cuneiform ; Cuneiform blk; Cuneiform_Numbers ; Cuneiform_Numbers_And_Punctuation blk; Currency_Symbols ; Currency_Symbols blk; Cypriot_Syllabary ; Cypriot_Syllabary +blk; Cypro_Minoan ; Cypro_Minoan blk; Cyrillic ; Cyrillic blk; Cyrillic_Ext_A ; Cyrillic_Extended_A blk; Cyrillic_Ext_B ; Cyrillic_Extended_B @@ -246,6 +249,7 @@ blk; Enclosed_Ideographic_Sup ; Enclosed_Ideographic_Supplement blk; Ethiopic ; Ethiopic blk; Ethiopic_Ext ; Ethiopic_Extended blk; Ethiopic_Ext_A ; Ethiopic_Extended_A +blk; Ethiopic_Ext_B ; Ethiopic_Extended_B blk; Ethiopic_Sup ; Ethiopic_Supplement blk; Geometric_Shapes ; Geometric_Shapes blk; Geometric_Shapes_Ext ; Geometric_Shapes_Extended @@ -285,6 +289,7 @@ blk; Jamo_Ext_B ; Hangul_Jamo_Extended_B blk; Javanese ; Javanese blk; Kaithi ; Kaithi blk; Kana_Ext_A ; Kana_Extended_A +blk; Kana_Ext_B ; Kana_Extended_B blk; Kana_Sup ; Kana_Supplement blk; Kanbun ; Kanbun blk; Kangxi ; Kangxi_Radicals @@ -306,6 +311,8 @@ blk; Latin_Ext_B ; Latin_Extended_B blk; Latin_Ext_C ; Latin_Extended_C blk; Latin_Ext_D ; Latin_Extended_D blk; Latin_Ext_E ; Latin_Extended_E +blk; Latin_Ext_F ; Latin_Extended_F +blk; Latin_Ext_G ; Latin_Extended_G blk; Lepcha ; Lepcha blk; Letterlike_Symbols ; Letterlike_Symbols blk; Limbu ; Limbu @@ -372,6 +379,7 @@ blk; Old_Persian ; Old_Persian blk; Old_Sogdian ; Old_Sogdian blk; Old_South_Arabian ; Old_South_Arabian blk; Old_Turkic ; Old_Turkic +blk; Old_Uyghur ; Old_Uyghur blk; Oriya ; Oriya blk; Ornamental_Dingbats ; Ornamental_Dingbats blk; Osage ; Osage @@ -433,6 +441,7 @@ blk; Tai_Xuan_Jing ; Tai_Xuan_Jing_Symbols blk; Takri ; Takri blk; Tamil ; Tamil blk; Tamil_Sup ; Tamil_Supplement +blk; Tangsa ; Tangsa blk; Tangut ; Tangut blk; Tangut_Components ; Tangut_Components blk; Tangut_Sup ; Tangut_Supplement @@ -442,13 +451,16 @@ blk; Thai ; Thai blk; Tibetan ; Tibetan blk; Tifinagh ; Tifinagh blk; Tirhuta ; Tirhuta +blk; Toto ; Toto blk; Transport_And_Map ; Transport_And_Map_Symbols blk; UCAS ; Unified_Canadian_Aboriginal_Syllabics; Canadian_Syllabics blk; UCAS_Ext ; Unified_Canadian_Aboriginal_Syllabics_Extended +blk; UCAS_Ext_A ; Unified_Canadian_Aboriginal_Syllabics_Extended_A blk; Ugaritic ; Ugaritic blk; Vai ; Vai blk; Vedic_Ext ; Vedic_Extensions blk; Vertical_Forms ; Vertical_Forms +blk; Vithkuqi ; Vithkuqi blk; VS ; Variation_Selectors blk; VS_Sup ; Variation_Selectors_Supplement blk; Wancho ; Wancho @@ -458,6 +470,7 @@ blk; Yi_Radicals ; Yi_Radicals blk; Yi_Syllables ; Yi_Syllables blk; Yijing ; Yijing_Hexagram_Symbols blk; Zanabazar_Square ; Zanabazar_Square +blk; Znamenny_Music ; Znamenny_Musical_Notation # Canonical_Combining_Class (ccc) @@ -1032,6 +1045,8 @@ jg ; Taw ; Taw jg ; Teh_Marbuta ; Teh_Marbuta jg ; Teh_Marbuta_Goal ; Hamza_On_Heh_Goal jg ; Teth ; Teth +jg ; Thin_Yeh ; Thin_Yeh +jg ; Vertical_Tail ; Vertical_Tail jg ; Waw ; Waw jg ; Yeh ; Yeh jg ; Yeh_Barree ; Yeh_Barree @@ -1262,6 +1277,7 @@ sc ; Cham ; Cham sc ; Cher ; Cherokee sc ; Chrs ; Chorasmian sc ; Copt ; Coptic ; Qaac +sc ; Cpmn ; Cypro_Minoan sc ; Cprt ; Cypriot sc ; Cyrl ; Cyrillic sc ; Deva ; Devanagari @@ -1341,6 +1357,7 @@ sc ; Orkh ; Old_Turkic sc ; Orya ; Oriya sc ; Osge ; Osage sc ; Osma ; Osmanya +sc ; Ougr ; Old_Uyghur sc ; Palm ; Palmyrene sc ; Pauc ; Pau_Cin_Hau sc ; Perm ; Old_Permic @@ -1383,8 +1400,11 @@ sc ; Thaa ; Thaana sc ; Thai ; Thai sc ; Tibt ; Tibetan sc ; Tirh ; Tirhuta +sc ; Tnsa ; Tangsa +sc ; Toto ; Toto sc ; Ugar ; Ugaritic sc ; Vaii ; Vai +sc ; Vith ; Vithkuqi sc ; Wara ; Warang_Citi sc ; Wcho ; Wancho sc ; Xpeo ; Old_Persian diff --git a/make/data/unicodedata/ReadMe.txt b/make/data/unicodedata/ReadMe.txt new file mode 100644 index 0000000000000000000000000000000000000000..154781ab2d2c91ba0905cdc3102296da30c3767d --- /dev/null +++ b/make/data/unicodedata/ReadMe.txt @@ -0,0 +1,16 @@ +# Unicode Character Database +# Date: 2021-09-10, 17:22:00 GMT [KW] +# Copyright (c) 2021 Unicode, Inc. +# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries. +# For terms of use, see https://www.unicode.org/terms_of_use.html +# +# For documentation, see the following: +# NamesList.html +# UAX #38, "Unicode Han Database (Unihan)" +# UAX #44, "Unicode Character Database" +# UTS #51, "Unicode Emoji" +# +# The UAXes and UTS #51 can be accessed at https://www.unicode.org/versions/Unicode14.0.0/ + +This directory contains the final data files +for the Unicode Character Database, for Version 14.0.0 of the Unicode Standard. diff --git a/make/data/unicodedata/Scripts.txt b/make/data/unicodedata/Scripts.txt index eb3cd86e0c723f9b72cabfa9e92bcca547940931..00a04f5587a659d178aac44b73012f63992250e8 100644 --- a/make/data/unicodedata/Scripts.txt +++ b/make/data/unicodedata/Scripts.txt @@ -1,16 +1,16 @@ -# Scripts-13.0.0.txt -# Date: 2020-01-22, 00:07:43 GMT -# Copyright (c) 2020 Unicode, Inc. +# Scripts-14.0.0.txt +# Date: 2021-07-10, 00:35:31 GMT +# Copyright (c) 2021 Unicode, Inc. # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries. # For terms of use, see http://www.unicode.org/terms_of_use.html # # Unicode Character Database # For documentation, see http://www.unicode.org/reports/tr44/ # For more information, see: -# UAX #24, Unicode Script Property: http://www.unicode.org/reports/tr24/ +# UAX #24, Unicode Script Property: https://www.unicode.org/reports/tr24/ # Especially the sections: -# http://www.unicode.org/reports/tr24/#Assignment_Script_Values -# http://www.unicode.org/reports/tr24/#Assignment_ScriptX_Values +# https://www.unicode.org/reports/tr24/#Assignment_Script_Values +# https://www.unicode.org/reports/tr24/#Assignment_ScriptX_Values # # ================================================ @@ -154,7 +154,7 @@ 208A..208C ; Common # Sm [3] SUBSCRIPT PLUS SIGN..SUBSCRIPT EQUALS SIGN 208D ; Common # Ps SUBSCRIPT LEFT PARENTHESIS 208E ; Common # Pe SUBSCRIPT RIGHT PARENTHESIS -20A0..20BF ; Common # Sc [32] EURO-CURRENCY SIGN..BITCOIN SIGN +20A0..20C0 ; Common # Sc [33] EURO-CURRENCY SIGN..SOM SIGN 2100..2101 ; Common # So [2] ACCOUNT OF..ADDRESSED TO THE SUBJECT 2102 ; Common # L& DOUBLE-STRUCK CAPITAL C 2103..2106 ; Common # So [4] DEGREE CELSIUS..CADA UNA @@ -347,7 +347,16 @@ 2E42 ; Common # Ps DOUBLE LOW-REVERSED-9 QUOTATION MARK 2E43..2E4F ; Common # Po [13] DASH WITH LEFT UPTURN..CORNISH VERSE DIVIDER 2E50..2E51 ; Common # So [2] CROSS PATTY WITH RIGHT CROSSBAR..CROSS PATTY WITH LEFT CROSSBAR -2E52 ; Common # Po TIRONIAN SIGN CAPITAL ET +2E52..2E54 ; Common # Po [3] TIRONIAN SIGN CAPITAL ET..MEDIEVAL QUESTION MARK +2E55 ; Common # Ps LEFT SQUARE BRACKET WITH STROKE +2E56 ; Common # Pe RIGHT SQUARE BRACKET WITH STROKE +2E57 ; Common # Ps LEFT SQUARE BRACKET WITH DOUBLE STROKE +2E58 ; Common # Pe RIGHT SQUARE BRACKET WITH DOUBLE STROKE +2E59 ; Common # Ps TOP HALF LEFT PARENTHESIS +2E5A ; Common # Pe TOP HALF RIGHT PARENTHESIS +2E5B ; Common # Ps BOTTOM HALF LEFT PARENTHESIS +2E5C ; Common # Pe BOTTOM HALF RIGHT PARENTHESIS +2E5D ; Common # Pd OBLIQUE HYPHEN 2FF0..2FFB ; Common # So [12] IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT..IDEOGRAPHIC DESCRIPTION CHARACTER OVERLAID 3000 ; Common # Zs IDEOGRAPHIC SPACE 3001..3003 ; Common # Po [3] IDEOGRAPHIC COMMA..DITTO MARK @@ -511,9 +520,8 @@ FFFC..FFFD ; Common # So [2] OBJECT REPLACEMENT CHARACTER..REPLACEMENT CHAR 10190..1019C ; Common # So [13] ROMAN SEXTANS SIGN..ASCIA SYMBOL 101D0..101FC ; Common # So [45] PHAISTOS DISC SIGN PEDESTRIAN..PHAISTOS DISC SIGN WAVY BAND 102E1..102FB ; Common # No [27] COPTIC EPACT DIGIT ONE..COPTIC EPACT NUMBER NINE HUNDRED -16FE2 ; Common # Po OLD CHINESE HOOK MARK -16FE3 ; Common # Lm OLD CHINESE ITERATION MARK 1BCA0..1BCA3 ; Common # Cf [4] SHORTHAND FORMAT LETTER OVERLAP..SHORTHAND FORMAT UP STEP +1CF50..1CFC3 ; Common # So [116] ZNAMENNY NEUME KRYUK..ZNAMENNY NEUME PAUK 1D000..1D0F5 ; Common # So [246] BYZANTINE MUSICAL SYMBOL PSILI..BYZANTINE MUSICAL SYMBOL GORGON NEO KATO 1D100..1D126 ; Common # So [39] MUSICAL SYMBOL SINGLE BARLINE..MUSICAL SYMBOL DRUM CLEF-2 1D129..1D164 ; Common # So [60] MUSICAL SYMBOL MULTIPLE MEASURE REST..MUSICAL SYMBOL ONE HUNDRED TWENTY-EIGHTH NOTE @@ -523,7 +531,7 @@ FFFC..FFFD ; Common # So [2] OBJECT REPLACEMENT CHARACTER..REPLACEMENT CHAR 1D173..1D17A ; Common # Cf [8] MUSICAL SYMBOL BEGIN BEAM..MUSICAL SYMBOL END PHRASE 1D183..1D184 ; Common # So [2] MUSICAL SYMBOL ARPEGGIATO UP..MUSICAL SYMBOL ARPEGGIATO DOWN 1D18C..1D1A9 ; Common # So [30] MUSICAL SYMBOL RINFORZANDO..MUSICAL SYMBOL DEGREE SLASH -1D1AE..1D1E8 ; Common # So [59] MUSICAL SYMBOL PEDAL MARK..MUSICAL SYMBOL KIEVAN FLAT SIGN +1D1AE..1D1EA ; Common # So [61] MUSICAL SYMBOL PEDAL MARK..MUSICAL SYMBOL KORON 1D2E0..1D2F3 ; Common # No [20] MAYAN NUMERAL ZERO..MAYAN NUMERAL NINETEEN 1D300..1D356 ; Common # So [87] MONOGRAM FOR EARTH..TETRAGRAM FOR FOSTERING 1D360..1D378 ; Common # No [25] COUNTING ROD UNIT DIGIT ONE..TALLY MARK FIVE @@ -593,35 +601,36 @@ FFFC..FFFD ; Common # So [2] OBJECT REPLACEMENT CHARACTER..REPLACEMENT CHAR 1F300..1F3FA ; Common # So [251] CYCLONE..AMPHORA 1F3FB..1F3FF ; Common # Sk [5] EMOJI MODIFIER FITZPATRICK TYPE-1-2..EMOJI MODIFIER FITZPATRICK TYPE-6 1F400..1F6D7 ; Common # So [728] RAT..ELEVATOR -1F6E0..1F6EC ; Common # So [13] HAMMER AND WRENCH..AIRPLANE ARRIVING +1F6DD..1F6EC ; Common # So [16] PLAYGROUND SLIDE..AIRPLANE ARRIVING 1F6F0..1F6FC ; Common # So [13] SATELLITE..ROLLER SKATE 1F700..1F773 ; Common # So [116] ALCHEMICAL SYMBOL FOR QUINTESSENCE..ALCHEMICAL SYMBOL FOR HALF OUNCE 1F780..1F7D8 ; Common # So [89] BLACK LEFT-POINTING ISOSCELES RIGHT TRIANGLE..NEGATIVE CIRCLED SQUARE 1F7E0..1F7EB ; Common # So [12] LARGE ORANGE CIRCLE..LARGE BROWN SQUARE +1F7F0 ; Common # So HEAVY EQUALS SIGN 1F800..1F80B ; Common # So [12] LEFTWARDS ARROW WITH SMALL TRIANGLE ARROWHEAD..DOWNWARDS ARROW WITH LARGE TRIANGLE ARROWHEAD 1F810..1F847 ; Common # So [56] LEFTWARDS ARROW WITH SMALL EQUILATERAL ARROWHEAD..DOWNWARDS HEAVY ARROW 1F850..1F859 ; Common # So [10] LEFTWARDS SANS-SERIF ARROW..UP DOWN SANS-SERIF ARROW 1F860..1F887 ; Common # So [40] WIDE-HEADED LEFTWARDS LIGHT BARB ARROW..WIDE-HEADED SOUTH WEST VERY HEAVY BARB ARROW 1F890..1F8AD ; Common # So [30] LEFTWARDS TRIANGLE ARROWHEAD..WHITE ARROW SHAFT WIDTH TWO THIRDS 1F8B0..1F8B1 ; Common # So [2] ARROW POINTING UPWARDS THEN NORTH WEST..ARROW POINTING RIGHTWARDS THEN CURVING SOUTH WEST -1F900..1F978 ; Common # So [121] CIRCLED CROSS FORMEE WITH FOUR DOTS..DISGUISED FACE -1F97A..1F9CB ; Common # So [82] FACE WITH PLEADING EYES..BUBBLE TEA -1F9CD..1FA53 ; Common # So [135] STANDING PERSON..BLACK CHESS KNIGHT-BISHOP +1F900..1FA53 ; Common # So [340] CIRCLED CROSS FORMEE WITH FOUR DOTS..BLACK CHESS KNIGHT-BISHOP 1FA60..1FA6D ; Common # So [14] XIANGQI RED GENERAL..XIANGQI BLACK SOLDIER 1FA70..1FA74 ; Common # So [5] BALLET SHOES..THONG SANDAL -1FA78..1FA7A ; Common # So [3] DROP OF BLOOD..STETHOSCOPE +1FA78..1FA7C ; Common # So [5] DROP OF BLOOD..CRUTCH 1FA80..1FA86 ; Common # So [7] YO-YO..NESTING DOLLS -1FA90..1FAA8 ; Common # So [25] RINGED PLANET..ROCK -1FAB0..1FAB6 ; Common # So [7] FLY..FEATHER -1FAC0..1FAC2 ; Common # So [3] ANATOMICAL HEART..PEOPLE HUGGING -1FAD0..1FAD6 ; Common # So [7] BLUEBERRIES..TEAPOT +1FA90..1FAAC ; Common # So [29] RINGED PLANET..HAMSA +1FAB0..1FABA ; Common # So [11] FLY..NEST WITH EGGS +1FAC0..1FAC5 ; Common # So [6] ANATOMICAL HEART..PERSON WITH CROWN +1FAD0..1FAD9 ; Common # So [10] BLUEBERRIES..JAR +1FAE0..1FAE7 ; Common # So [8] MELTING FACE..BUBBLES +1FAF0..1FAF6 ; Common # So [7] HAND WITH INDEX FINGER AND THUMB CROSSED..HEART HANDS 1FB00..1FB92 ; Common # So [147] BLOCK SEXTANT-1..UPPER HALF INVERSE MEDIUM SHADE AND LOWER HALF BLOCK 1FB94..1FBCA ; Common # So [55] LEFT HALF INVERSE MEDIUM SHADE AND RIGHT HALF BLOCK..WHITE UP-POINTING CHEVRON 1FBF0..1FBF9 ; Common # Nd [10] SEGMENTED DIGIT ZERO..SEGMENTED DIGIT NINE E0001 ; Common # Cf LANGUAGE TAG E0020..E007F ; Common # Cf [96] TAG SPACE..CANCEL TAG -# Total code points: 8087 +# Total code points: 8252 # ================================================ @@ -664,8 +673,11 @@ A770 ; Latin # Lm MODIFIER LETTER US A771..A787 ; Latin # L& [23] LATIN SMALL LETTER DUM..LATIN SMALL LETTER INSULAR T A78B..A78E ; Latin # L& [4] LATIN CAPITAL LETTER SALTILLO..LATIN SMALL LETTER L WITH RETROFLEX HOOK AND BELT A78F ; Latin # Lo LATIN LETTER SINOLOGICAL DOT -A790..A7BF ; Latin # L& [48] LATIN CAPITAL LETTER N WITH DESCENDER..LATIN SMALL LETTER GLOTTAL U -A7C2..A7CA ; Latin # L& [9] LATIN CAPITAL LETTER ANGLICANA W..LATIN SMALL LETTER S WITH SHORT STROKE OVERLAY +A790..A7CA ; Latin # L& [59] LATIN CAPITAL LETTER N WITH DESCENDER..LATIN SMALL LETTER S WITH SHORT STROKE OVERLAY +A7D0..A7D1 ; Latin # L& [2] LATIN CAPITAL LETTER CLOSED INSULAR G..LATIN SMALL LETTER CLOSED INSULAR G +A7D3 ; Latin # L& LATIN SMALL LETTER DOUBLE THORN +A7D5..A7D9 ; Latin # L& [5] LATIN SMALL LETTER DOUBLE WYNN..LATIN SMALL LETTER SIGMOID S +A7F2..A7F4 ; Latin # Lm [3] MODIFIER LETTER CAPITAL C..MODIFIER LETTER CAPITAL Q A7F5..A7F6 ; Latin # L& [2] LATIN CAPITAL LETTER REVERSED HALF H..LATIN SMALL LETTER REVERSED HALF H A7F7 ; Latin # Lo LATIN EPIGRAPHIC LETTER SIDEWAYS I A7F8..A7F9 ; Latin # Lm [2] MODIFIER LETTER CAPITAL H WITH STROKE..MODIFIER LETTER SMALL LIGATURE OE @@ -679,8 +691,14 @@ AB69 ; Latin # Lm MODIFIER LETTER SMALL TURNED W FB00..FB06 ; Latin # L& [7] LATIN SMALL LIGATURE FF..LATIN SMALL LIGATURE ST FF21..FF3A ; Latin # L& [26] FULLWIDTH LATIN CAPITAL LETTER A..FULLWIDTH LATIN CAPITAL LETTER Z FF41..FF5A ; Latin # L& [26] FULLWIDTH LATIN SMALL LETTER A..FULLWIDTH LATIN SMALL LETTER Z +10780..10785 ; Latin # Lm [6] MODIFIER LETTER SMALL CAPITAL AA..MODIFIER LETTER SMALL B WITH HOOK +10787..107B0 ; Latin # Lm [42] MODIFIER LETTER SMALL DZ DIGRAPH..MODIFIER LETTER SMALL V WITH RIGHT HOOK +107B2..107BA ; Latin # Lm [9] MODIFIER LETTER SMALL CAPITAL Y..MODIFIER LETTER SMALL S WITH CURL +1DF00..1DF09 ; Latin # L& [10] LATIN SMALL LETTER FENG DIGRAPH WITH TRILL..LATIN SMALL LETTER T WITH HOOK AND RETROFLEX HOOK +1DF0A ; Latin # Lo LATIN LETTER RETROFLEX CLICK WITH RETROFLEX HOOK +1DF0B..1DF1E ; Latin # L& [20] LATIN SMALL LETTER ESH WITH DOUBLE BAR..LATIN SMALL LETTER S WITH CURL -# Total code points: 1374 +# Total code points: 1475 # ================================================ @@ -820,7 +838,7 @@ FB46..FB4F ; Hebrew # Lo [10] HEBREW LETTER TSADI WITH DAGESH..HEBREW LIGATU 060E..060F ; Arabic # So [2] ARABIC POETIC VERSE SIGN..ARABIC SIGN MISRA 0610..061A ; Arabic # Mn [11] ARABIC SIGN SALLALLAHOU ALAYHE WASSALLAM..ARABIC SMALL KASRA 061C ; Arabic # Cf ARABIC LETTER MARK -061E ; Arabic # Po ARABIC TRIPLE DOT PUNCTUATION MARK +061D..061E ; Arabic # Po [2] ARABIC END OF TEXT MARK..ARABIC TRIPLE DOT PUNCTUATION MARK 0620..063F ; Arabic # Lo [32] ARABIC LETTER KASHMIRI YEH..ARABIC LETTER FARSI YEH WITH THREE DOTS ABOVE 0641..064A ; Arabic # Lo [10] ARABIC LETTER FEH..ARABIC LETTER YEH 0656..065F ; Arabic # Mn [10] ARABIC SUBSCRIPT ALEF..ARABIC WAVY HAMZA BELOW @@ -843,18 +861,25 @@ FB46..FB4F ; Hebrew # Lo [10] HEBREW LETTER TSADI WITH DAGESH..HEBREW LIGATU 06FD..06FE ; Arabic # So [2] ARABIC SIGN SINDHI AMPERSAND..ARABIC SIGN SINDHI POSTPOSITION MEN 06FF ; Arabic # Lo ARABIC LETTER HEH WITH INVERTED V 0750..077F ; Arabic # Lo [48] ARABIC LETTER BEH WITH THREE DOTS HORIZONTALLY BELOW..ARABIC LETTER KAF WITH TWO DOTS ABOVE -08A0..08B4 ; Arabic # Lo [21] ARABIC LETTER BEH WITH SMALL V BELOW..ARABIC LETTER KAF WITH DOT BELOW -08B6..08C7 ; Arabic # Lo [18] ARABIC LETTER BEH WITH SMALL MEEM ABOVE..ARABIC LETTER LAM WITH SMALL ARABIC LETTER TAH ABOVE -08D3..08E1 ; Arabic # Mn [15] ARABIC SMALL LOW WAW..ARABIC SMALL HIGH SIGN SAFHA +0870..0887 ; Arabic # Lo [24] ARABIC LETTER ALEF WITH ATTACHED FATHA..ARABIC BASELINE ROUND DOT +0888 ; Arabic # Sk ARABIC RAISED ROUND DOT +0889..088E ; Arabic # Lo [6] ARABIC LETTER NOON WITH INVERTED SMALL V..ARABIC VERTICAL TAIL +0890..0891 ; Arabic # Cf [2] ARABIC POUND MARK ABOVE..ARABIC PIASTRE MARK ABOVE +0898..089F ; Arabic # Mn [8] ARABIC SMALL HIGH WORD AL-JUZ..ARABIC HALF MADDA OVER MADDA +08A0..08C8 ; Arabic # Lo [41] ARABIC LETTER BEH WITH SMALL V BELOW..ARABIC LETTER GRAF +08C9 ; Arabic # Lm ARABIC SMALL FARSI YEH +08CA..08E1 ; Arabic # Mn [24] ARABIC SMALL HIGH FARSI YEH..ARABIC SMALL HIGH SIGN SAFHA 08E3..08FF ; Arabic # Mn [29] ARABIC TURNED DAMMA BELOW..ARABIC MARK SIDEWAYS NOON GHUNNA FB50..FBB1 ; Arabic # Lo [98] ARABIC LETTER ALEF WASLA ISOLATED FORM..ARABIC LETTER YEH BARREE WITH HAMZA ABOVE FINAL FORM -FBB2..FBC1 ; Arabic # Sk [16] ARABIC SYMBOL DOT ABOVE..ARABIC SYMBOL SMALL TAH BELOW +FBB2..FBC2 ; Arabic # Sk [17] ARABIC SYMBOL DOT ABOVE..ARABIC SYMBOL WASLA ABOVE FBD3..FD3D ; Arabic # Lo [363] ARABIC LETTER NG ISOLATED FORM..ARABIC LIGATURE ALEF WITH FATHATAN ISOLATED FORM +FD40..FD4F ; Arabic # So [16] ARABIC LIGATURE RAHIMAHU ALLAAH..ARABIC LIGATURE RAHIMAHUM ALLAAH FD50..FD8F ; Arabic # Lo [64] ARABIC LIGATURE TEH WITH JEEM WITH MEEM INITIAL FORM..ARABIC LIGATURE MEEM WITH KHAH WITH MEEM INITIAL FORM FD92..FDC7 ; Arabic # Lo [54] ARABIC LIGATURE MEEM WITH JEEM WITH KHAH INITIAL FORM..ARABIC LIGATURE NOON WITH JEEM WITH YEH FINAL FORM +FDCF ; Arabic # So ARABIC LIGATURE SALAAMUHU ALAYNAA FDF0..FDFB ; Arabic # Lo [12] ARABIC LIGATURE SALLA USED AS KORANIC STOP SIGN ISOLATED FORM..ARABIC LIGATURE JALLAJALALOUHOU FDFC ; Arabic # Sc RIAL SIGN -FDFD ; Arabic # So ARABIC LIGATURE BISMILLAH AR-RAHMAN AR-RAHEEM +FDFD..FDFF ; Arabic # So [3] ARABIC LIGATURE BISMILLAH AR-RAHMAN AR-RAHEEM..ARABIC LIGATURE AZZA WA JALL FE70..FE74 ; Arabic # Lo [5] ARABIC FATHATAN ISOLATED FORM..ARABIC KASRATAN ISOLATED FORM FE76..FEFC ; Arabic # Lo [135] ARABIC FATHA ISOLATED FORM..ARABIC LIGATURE LAM WITH ALEF FINAL FORM 10E60..10E7E ; Arabic # No [31] RUMI DIGIT ONE..RUMI FRACTION TWO THIRDS @@ -893,7 +918,7 @@ FE76..FEFC ; Arabic # Lo [135] ARABIC FATHA ISOLATED FORM..ARABIC LIGATURE LA 1EEAB..1EEBB ; Arabic # Lo [17] ARABIC MATHEMATICAL DOUBLE-STRUCK LAM..ARABIC MATHEMATICAL DOUBLE-STRUCK GHAIN 1EEF0..1EEF1 ; Arabic # Sm [2] ARABIC MATHEMATICAL OPERATOR MEEM WITH HAH WITH TATWEEL..ARABIC MATHEMATICAL OPERATOR HAH WITH DAL -# Total code points: 1291 +# Total code points: 1365 # ================================================ @@ -1113,6 +1138,7 @@ A8FF ; Devanagari # Mn DEVANAGARI VOWEL SIGN AY 0C0E..0C10 ; Telugu # Lo [3] TELUGU LETTER E..TELUGU LETTER AI 0C12..0C28 ; Telugu # Lo [23] TELUGU LETTER O..TELUGU LETTER NA 0C2A..0C39 ; Telugu # Lo [16] TELUGU LETTER PA..TELUGU LETTER HA +0C3C ; Telugu # Mn TELUGU SIGN NUKTA 0C3D ; Telugu # Lo TELUGU SIGN AVAGRAHA 0C3E..0C40 ; Telugu # Mn [3] TELUGU VOWEL SIGN AA..TELUGU VOWEL SIGN II 0C41..0C44 ; Telugu # Mc [4] TELUGU VOWEL SIGN U..TELUGU VOWEL SIGN VOCALIC RR @@ -1120,6 +1146,7 @@ A8FF ; Devanagari # Mn DEVANAGARI VOWEL SIGN AY 0C4A..0C4D ; Telugu # Mn [4] TELUGU VOWEL SIGN O..TELUGU SIGN VIRAMA 0C55..0C56 ; Telugu # Mn [2] TELUGU LENGTH MARK..TELUGU AI LENGTH MARK 0C58..0C5A ; Telugu # Lo [3] TELUGU LETTER TSA..TELUGU LETTER RRRA +0C5D ; Telugu # Lo TELUGU LETTER NAKAARA POLLU 0C60..0C61 ; Telugu # Lo [2] TELUGU LETTER VOCALIC RR..TELUGU LETTER VOCALIC LL 0C62..0C63 ; Telugu # Mn [2] TELUGU VOWEL SIGN VOCALIC L..TELUGU VOWEL SIGN VOCALIC LL 0C66..0C6F ; Telugu # Nd [10] TELUGU DIGIT ZERO..TELUGU DIGIT NINE @@ -1127,7 +1154,7 @@ A8FF ; Devanagari # Mn DEVANAGARI VOWEL SIGN AY 0C78..0C7E ; Telugu # No [7] TELUGU FRACTION DIGIT ZERO FOR ODD POWERS OF FOUR..TELUGU FRACTION DIGIT THREE FOR EVEN POWERS OF FOUR 0C7F ; Telugu # So TELUGU SIGN TUUMU -# Total code points: 98 +# Total code points: 100 # ================================================ @@ -1150,13 +1177,13 @@ A8FF ; Devanagari # Mn DEVANAGARI VOWEL SIGN AY 0CCA..0CCB ; Kannada # Mc [2] KANNADA VOWEL SIGN O..KANNADA VOWEL SIGN OO 0CCC..0CCD ; Kannada # Mn [2] KANNADA VOWEL SIGN AU..KANNADA SIGN VIRAMA 0CD5..0CD6 ; Kannada # Mc [2] KANNADA LENGTH MARK..KANNADA AI LENGTH MARK -0CDE ; Kannada # Lo KANNADA LETTER FA +0CDD..0CDE ; Kannada # Lo [2] KANNADA LETTER NAKAARA POLLU..KANNADA LETTER FA 0CE0..0CE1 ; Kannada # Lo [2] KANNADA LETTER VOCALIC RR..KANNADA LETTER VOCALIC LL 0CE2..0CE3 ; Kannada # Mn [2] KANNADA VOWEL SIGN VOCALIC L..KANNADA VOWEL SIGN VOCALIC LL 0CE6..0CEF ; Kannada # Nd [10] KANNADA DIGIT ZERO..KANNADA DIGIT NINE 0CF1..0CF2 ; Kannada # Lo [2] KANNADA SIGN JIHVAMULIYA..KANNADA SIGN UPADHMANIYA -# Total code points: 89 +# Total code points: 90 # ================================================ @@ -1411,8 +1438,12 @@ AB09..AB0E ; Ethiopic # Lo [6] ETHIOPIC SYLLABLE DDHU..ETHIOPIC SYLLABLE DD AB11..AB16 ; Ethiopic # Lo [6] ETHIOPIC SYLLABLE DZU..ETHIOPIC SYLLABLE DZO AB20..AB26 ; Ethiopic # Lo [7] ETHIOPIC SYLLABLE CCHHA..ETHIOPIC SYLLABLE CCHHO AB28..AB2E ; Ethiopic # Lo [7] ETHIOPIC SYLLABLE BBA..ETHIOPIC SYLLABLE BBO +1E7E0..1E7E6 ; Ethiopic # Lo [7] ETHIOPIC SYLLABLE HHYA..ETHIOPIC SYLLABLE HHYO +1E7E8..1E7EB ; Ethiopic # Lo [4] ETHIOPIC SYLLABLE GURAGE HHWA..ETHIOPIC SYLLABLE HHWE +1E7ED..1E7EE ; Ethiopic # Lo [2] ETHIOPIC SYLLABLE GURAGE MWI..ETHIOPIC SYLLABLE GURAGE MWEE +1E7F0..1E7FE ; Ethiopic # Lo [15] ETHIOPIC SYLLABLE GURAGE QWI..ETHIOPIC SYLLABLE GURAGE PWEE -# Total code points: 495 +# Total code points: 523 # ================================================ @@ -1430,8 +1461,9 @@ AB70..ABBF ; Cherokee # L& [80] CHEROKEE SMALL LETTER A..CHEROKEE SMALL LETT 166E ; Canadian_Aboriginal # Po CANADIAN SYLLABICS FULL STOP 166F..167F ; Canadian_Aboriginal # Lo [17] CANADIAN SYLLABICS QAI..CANADIAN SYLLABICS BLACKFOOT W 18B0..18F5 ; Canadian_Aboriginal # Lo [70] CANADIAN SYLLABICS OY..CANADIAN SYLLABICS CARRIER DENTAL S +11AB0..11ABF ; Canadian_Aboriginal # Lo [16] CANADIAN SYLLABICS NATTILIK HI..CANADIAN SYLLABICS SPA -# Total code points: 710 +# Total code points: 726 # ================================================ @@ -1480,6 +1512,7 @@ AB70..ABBF ; Cherokee # L& [80] CHEROKEE SMALL LETTER A..CHEROKEE SMALL LETT 1807..180A ; Mongolian # Po [4] MONGOLIAN SIBE SYLLABLE BOUNDARY MARKER..MONGOLIAN NIRUGU 180B..180D ; Mongolian # Mn [3] MONGOLIAN FREE VARIATION SELECTOR ONE..MONGOLIAN FREE VARIATION SELECTOR THREE 180E ; Mongolian # Cf MONGOLIAN VOWEL SEPARATOR +180F ; Mongolian # Mn MONGOLIAN FREE VARIATION SELECTOR FOUR 1810..1819 ; Mongolian # Nd [10] MONGOLIAN DIGIT ZERO..MONGOLIAN DIGIT NINE 1820..1842 ; Mongolian # Lo [35] MONGOLIAN LETTER A..MONGOLIAN LETTER CHI 1843 ; Mongolian # Lm MONGOLIAN LETTER TODO LONG VOWEL SIGN @@ -1491,18 +1524,18 @@ AB70..ABBF ; Cherokee # L& [80] CHEROKEE SMALL LETTER A..CHEROKEE SMALL LETT 18AA ; Mongolian # Lo MONGOLIAN LETTER MANCHU ALI GALI LHA 11660..1166C ; Mongolian # Po [13] MONGOLIAN BIRGA WITH ORNAMENT..MONGOLIAN TURNED SWIRL BIRGA WITH DOUBLE ORNAMENT -# Total code points: 167 +# Total code points: 168 # ================================================ 3041..3096 ; Hiragana # Lo [86] HIRAGANA LETTER SMALL A..HIRAGANA LETTER SMALL KE 309D..309E ; Hiragana # Lm [2] HIRAGANA ITERATION MARK..HIRAGANA VOICED ITERATION MARK 309F ; Hiragana # Lo HIRAGANA DIGRAPH YORI -1B001..1B11E ; Hiragana # Lo [286] HIRAGANA LETTER ARCHAIC YE..HENTAIGANA LETTER N-MU-MO-2 +1B001..1B11F ; Hiragana # Lo [287] HIRAGANA LETTER ARCHAIC YE..HIRAGANA LETTER ARCHAIC WU 1B150..1B152 ; Hiragana # Lo [3] HIRAGANA LETTER SMALL WI..HIRAGANA LETTER SMALL WO 1F200 ; Hiragana # So SQUARE HIRAGANA HOKA -# Total code points: 379 +# Total code points: 380 # ================================================ @@ -1514,10 +1547,14 @@ AB70..ABBF ; Cherokee # L& [80] CHEROKEE SMALL LETTER A..CHEROKEE SMALL LETT 3300..3357 ; Katakana # So [88] SQUARE APAATO..SQUARE WATTO FF66..FF6F ; Katakana # Lo [10] HALFWIDTH KATAKANA LETTER WO..HALFWIDTH KATAKANA LETTER SMALL TU FF71..FF9D ; Katakana # Lo [45] HALFWIDTH KATAKANA LETTER A..HALFWIDTH KATAKANA LETTER N +1AFF0..1AFF3 ; Katakana # Lm [4] KATAKANA LETTER MINNAN TONE-2..KATAKANA LETTER MINNAN TONE-5 +1AFF5..1AFFB ; Katakana # Lm [7] KATAKANA LETTER MINNAN TONE-7..KATAKANA LETTER MINNAN NASALIZED TONE-5 +1AFFD..1AFFE ; Katakana # Lm [2] KATAKANA LETTER MINNAN NASALIZED TONE-7..KATAKANA LETTER MINNAN NASALIZED TONE-8 1B000 ; Katakana # Lo KATAKANA LETTER ARCHAIC E +1B120..1B122 ; Katakana # Lo [3] KATAKANA LETTER ARCHAIC YI..KATAKANA LETTER ARCHAIC WU 1B164..1B167 ; Katakana # Lo [4] KATAKANA LETTER SMALL WI..KATAKANA LETTER SMALL N -# Total code points: 304 +# Total code points: 320 # ================================================ @@ -1538,19 +1575,21 @@ FF71..FF9D ; Katakana # Lo [45] HALFWIDTH KATAKANA LETTER A..HALFWIDTH KATAK 3038..303A ; Han # Nl [3] HANGZHOU NUMERAL TEN..HANGZHOU NUMERAL THIRTY 303B ; Han # Lm VERTICAL IDEOGRAPHIC ITERATION MARK 3400..4DBF ; Han # Lo [6592] CJK UNIFIED IDEOGRAPH-3400..CJK UNIFIED IDEOGRAPH-4DBF -4E00..9FFC ; Han # Lo [20989] CJK UNIFIED IDEOGRAPH-4E00..CJK UNIFIED IDEOGRAPH-9FFC +4E00..9FFF ; Han # Lo [20992] CJK UNIFIED IDEOGRAPH-4E00..CJK UNIFIED IDEOGRAPH-9FFF F900..FA6D ; Han # Lo [366] CJK COMPATIBILITY IDEOGRAPH-F900..CJK COMPATIBILITY IDEOGRAPH-FA6D FA70..FAD9 ; Han # Lo [106] CJK COMPATIBILITY IDEOGRAPH-FA70..CJK COMPATIBILITY IDEOGRAPH-FAD9 +16FE2 ; Han # Po OLD CHINESE HOOK MARK +16FE3 ; Han # Lm OLD CHINESE ITERATION MARK 16FF0..16FF1 ; Han # Mc [2] VIETNAMESE ALTERNATE READING MARK CA..VIETNAMESE ALTERNATE READING MARK NHAY -20000..2A6DD ; Han # Lo [42718] CJK UNIFIED IDEOGRAPH-20000..CJK UNIFIED IDEOGRAPH-2A6DD -2A700..2B734 ; Han # Lo [4149] CJK UNIFIED IDEOGRAPH-2A700..CJK UNIFIED IDEOGRAPH-2B734 +20000..2A6DF ; Han # Lo [42720] CJK UNIFIED IDEOGRAPH-20000..CJK UNIFIED IDEOGRAPH-2A6DF +2A700..2B738 ; Han # Lo [4153] CJK UNIFIED IDEOGRAPH-2A700..CJK UNIFIED IDEOGRAPH-2B738 2B740..2B81D ; Han # Lo [222] CJK UNIFIED IDEOGRAPH-2B740..CJK UNIFIED IDEOGRAPH-2B81D 2B820..2CEA1 ; Han # Lo [5762] CJK UNIFIED IDEOGRAPH-2B820..CJK UNIFIED IDEOGRAPH-2CEA1 2CEB0..2EBE0 ; Han # Lo [7473] CJK UNIFIED IDEOGRAPH-2CEB0..CJK UNIFIED IDEOGRAPH-2EBE0 2F800..2FA1D ; Han # Lo [542] CJK COMPATIBILITY IDEOGRAPH-2F800..CJK COMPATIBILITY IDEOGRAPH-2FA1D 30000..3134A ; Han # Lo [4939] CJK UNIFIED IDEOGRAPH-30000..CJK UNIFIED IDEOGRAPH-3134A -# Total code points: 94204 +# Total code points: 94215 # ================================================ @@ -1593,15 +1632,14 @@ A490..A4C6 ; Yi # So [55] YI RADICAL QOT..YI RADICAL KE 0951..0954 ; Inherited # Mn [4] DEVANAGARI STRESS SIGN UDATTA..DEVANAGARI ACUTE ACCENT 1AB0..1ABD ; Inherited # Mn [14] COMBINING DOUBLED CIRCUMFLEX ACCENT..COMBINING PARENTHESES BELOW 1ABE ; Inherited # Me COMBINING PARENTHESES OVERLAY -1ABF..1AC0 ; Inherited # Mn [2] COMBINING LATIN SMALL LETTER W BELOW..COMBINING LATIN SMALL LETTER TURNED W BELOW +1ABF..1ACE ; Inherited # Mn [16] COMBINING LATIN SMALL LETTER W BELOW..COMBINING LATIN SMALL LETTER INSULAR T 1CD0..1CD2 ; Inherited # Mn [3] VEDIC TONE KARSHANA..VEDIC TONE PRENKHA 1CD4..1CE0 ; Inherited # Mn [13] VEDIC SIGN YAJURVEDIC MIDLINE SVARITA..VEDIC TONE RIGVEDIC KASHMIRI INDEPENDENT SVARITA 1CE2..1CE8 ; Inherited # Mn [7] VEDIC SIGN VISARGA SVARITA..VEDIC SIGN VISARGA ANUDATTA WITH TAIL 1CED ; Inherited # Mn VEDIC SIGN TIRYAK 1CF4 ; Inherited # Mn VEDIC TONE CANDRA ABOVE 1CF8..1CF9 ; Inherited # Mn [2] VEDIC TONE RING ABOVE..VEDIC TONE DOUBLE RING ABOVE -1DC0..1DF9 ; Inherited # Mn [58] COMBINING DOTTED GRAVE ACCENT..COMBINING WIDE INVERTED BRIDGE BELOW -1DFB..1DFF ; Inherited # Mn [5] COMBINING DELETION MARK..COMBINING RIGHT ARROWHEAD AND DOWN ARROWHEAD BELOW +1DC0..1DFF ; Inherited # Mn [64] COMBINING DOTTED GRAVE ACCENT..COMBINING RIGHT ARROWHEAD AND DOWN ARROWHEAD BELOW 200C..200D ; Inherited # Cf [2] ZERO WIDTH NON-JOINER..ZERO WIDTH JOINER 20D0..20DC ; Inherited # Mn [13] COMBINING LEFT HARPOON ABOVE..COMBINING FOUR DOTS ABOVE 20DD..20E0 ; Inherited # Me [4] COMBINING ENCLOSING CIRCLE..COMBINING ENCLOSING CIRCLE BACKSLASH @@ -1615,26 +1653,30 @@ FE20..FE2D ; Inherited # Mn [14] COMBINING LIGATURE LEFT HALF..COMBINING CON 101FD ; Inherited # Mn PHAISTOS DISC SIGN COMBINING OBLIQUE STROKE 102E0 ; Inherited # Mn COPTIC EPACT THOUSANDS MARK 1133B ; Inherited # Mn COMBINING BINDU BELOW +1CF00..1CF2D ; Inherited # Mn [46] ZNAMENNY COMBINING MARK GORAZDO NIZKO S KRYZHEM ON LEFT..ZNAMENNY COMBINING MARK KRYZH ON LEFT +1CF30..1CF46 ; Inherited # Mn [23] ZNAMENNY COMBINING TONAL RANGE MARK MRACHNO..ZNAMENNY PRIZNAK MODIFIER ROG 1D167..1D169 ; Inherited # Mn [3] MUSICAL SYMBOL COMBINING TREMOLO-1..MUSICAL SYMBOL COMBINING TREMOLO-3 1D17B..1D182 ; Inherited # Mn [8] MUSICAL SYMBOL COMBINING ACCENT..MUSICAL SYMBOL COMBINING LOURE 1D185..1D18B ; Inherited # Mn [7] MUSICAL SYMBOL COMBINING DOIT..MUSICAL SYMBOL COMBINING TRIPLE TONGUE 1D1AA..1D1AD ; Inherited # Mn [4] MUSICAL SYMBOL COMBINING DOWN BOW..MUSICAL SYMBOL COMBINING SNAP PIZZICATO E0100..E01EF ; Inherited # Mn [240] VARIATION SELECTOR-17..VARIATION SELECTOR-256 -# Total code points: 573 +# Total code points: 657 # ================================================ -1700..170C ; Tagalog # Lo [13] TAGALOG LETTER A..TAGALOG LETTER YA -170E..1711 ; Tagalog # Lo [4] TAGALOG LETTER LA..TAGALOG LETTER HA +1700..1711 ; Tagalog # Lo [18] TAGALOG LETTER A..TAGALOG LETTER HA 1712..1714 ; Tagalog # Mn [3] TAGALOG VOWEL SIGN I..TAGALOG SIGN VIRAMA +1715 ; Tagalog # Mc TAGALOG SIGN PAMUDPOD +171F ; Tagalog # Lo TAGALOG LETTER ARCHAIC RA -# Total code points: 20 +# Total code points: 23 # ================================================ 1720..1731 ; Hanunoo # Lo [18] HANUNOO LETTER A..HANUNOO LETTER HA -1732..1734 ; Hanunoo # Mn [3] HANUNOO VOWEL SIGN I..HANUNOO SIGN PAMUDPOD +1732..1733 ; Hanunoo # Mn [2] HANUNOO VOWEL SIGN I..HANUNOO VOWEL SIGN U +1734 ; Hanunoo # Mc HANUNOO SIGN PAMUDPOD # Total code points: 21 @@ -1762,15 +1804,14 @@ E0100..E01EF ; Inherited # Mn [240] VARIATION SELECTOR-17..VARIATION SELECTOR-2 # ================================================ -2C00..2C2E ; Glagolitic # L& [47] GLAGOLITIC CAPITAL LETTER AZU..GLAGOLITIC CAPITAL LETTER LATINATE MYSLITE -2C30..2C5E ; Glagolitic # L& [47] GLAGOLITIC SMALL LETTER AZU..GLAGOLITIC SMALL LETTER LATINATE MYSLITE +2C00..2C5F ; Glagolitic # L& [96] GLAGOLITIC CAPITAL LETTER AZU..GLAGOLITIC SMALL LETTER CAUDATE CHRIVI 1E000..1E006 ; Glagolitic # Mn [7] COMBINING GLAGOLITIC LETTER AZU..COMBINING GLAGOLITIC LETTER ZHIVETE 1E008..1E018 ; Glagolitic # Mn [17] COMBINING GLAGOLITIC LETTER ZEMLJA..COMBINING GLAGOLITIC LETTER HERU 1E01B..1E021 ; Glagolitic # Mn [7] COMBINING GLAGOLITIC LETTER SHTA..COMBINING GLAGOLITIC LETTER YATI 1E023..1E024 ; Glagolitic # Mn [2] COMBINING GLAGOLITIC LETTER YU..COMBINING GLAGOLITIC LETTER SMALL YUS 1E026..1E02A ; Glagolitic # Mn [5] COMBINING GLAGOLITIC LETTER YO..COMBINING GLAGOLITIC LETTER FITA -# Total code points: 132 +# Total code points: 134 # ================================================ @@ -1836,14 +1877,15 @@ A82C ; Syloti_Nagri # Mn SYLOTI NAGRI SIGN ALTERNATE HASANTA 1B3D..1B41 ; Balinese # Mc [5] BALINESE VOWEL SIGN LA LENGA TEDUNG..BALINESE VOWEL SIGN TALING REPA TEDUNG 1B42 ; Balinese # Mn BALINESE VOWEL SIGN PEPET 1B43..1B44 ; Balinese # Mc [2] BALINESE VOWEL SIGN PEPET TEDUNG..BALINESE ADEG ADEG -1B45..1B4B ; Balinese # Lo [7] BALINESE LETTER KAF SASAK..BALINESE LETTER ASYURA SASAK +1B45..1B4C ; Balinese # Lo [8] BALINESE LETTER KAF SASAK..BALINESE LETTER ARCHAIC JNYA 1B50..1B59 ; Balinese # Nd [10] BALINESE DIGIT ZERO..BALINESE DIGIT NINE 1B5A..1B60 ; Balinese # Po [7] BALINESE PANTI..BALINESE PAMENENG 1B61..1B6A ; Balinese # So [10] BALINESE MUSICAL SYMBOL DONG..BALINESE MUSICAL SYMBOL DANG GEDE 1B6B..1B73 ; Balinese # Mn [9] BALINESE MUSICAL SYMBOL COMBINING TEGEH..BALINESE MUSICAL SYMBOL COMBINING GONG 1B74..1B7C ; Balinese # So [9] BALINESE MUSICAL SYMBOL RIGHT-HAND OPEN DUG..BALINESE MUSICAL SYMBOL LEFT-HAND OPEN PING +1B7D..1B7E ; Balinese # Po [2] BALINESE PANTI LANTANG..BALINESE PAMADA LANTANG -# Total code points: 121 +# Total code points: 124 # ================================================ @@ -2178,9 +2220,10 @@ ABF0..ABF9 ; Meetei_Mayek # Nd [10] MEETEI MAYEK DIGIT ZERO..MEETEI MAYEK DI 110BB..110BC ; Kaithi # Po [2] KAITHI ABBREVIATION SIGN..KAITHI ENUMERATION SIGN 110BD ; Kaithi # Cf KAITHI NUMBER SIGN 110BE..110C1 ; Kaithi # Po [4] KAITHI SECTION MARK..KAITHI DOUBLE DANDA +110C2 ; Kaithi # Mn KAITHI VOWEL SIGN VOCALIC R 110CD ; Kaithi # Cf KAITHI NUMBER SIGN ABOVE -# Total code points: 67 +# Total code points: 68 # ================================================ @@ -2207,9 +2250,13 @@ ABF0..ABF9 ; Meetei_Mayek # Nd [10] MEETEI MAYEK DIGIT ZERO..MEETEI MAYEK DI 11047..1104D ; Brahmi # Po [7] BRAHMI DANDA..BRAHMI PUNCTUATION LOTUS 11052..11065 ; Brahmi # No [20] BRAHMI NUMBER ONE..BRAHMI NUMBER ONE THOUSAND 11066..1106F ; Brahmi # Nd [10] BRAHMI DIGIT ZERO..BRAHMI DIGIT NINE +11070 ; Brahmi # Mn BRAHMI SIGN OLD TAMIL VIRAMA +11071..11072 ; Brahmi # Lo [2] BRAHMI LETTER OLD TAMIL SHORT E..BRAHMI LETTER OLD TAMIL SHORT O +11073..11074 ; Brahmi # Mn [2] BRAHMI VOWEL SIGN OLD TAMIL SHORT E..BRAHMI VOWEL SIGN OLD TAMIL SHORT O +11075 ; Brahmi # Lo BRAHMI LETTER OLD TAMIL LLA 1107F ; Brahmi # Mn BRAHMI NUMBER JOINER -# Total code points: 109 +# Total code points: 115 # ================================================ @@ -2301,9 +2348,10 @@ ABF0..ABF9 ; Meetei_Mayek # Nd [10] MEETEI MAYEK DIGIT ZERO..MEETEI MAYEK DI 116B6 ; Takri # Mc TAKRI SIGN VIRAMA 116B7 ; Takri # Mn TAKRI SIGN NUKTA 116B8 ; Takri # Lo TAKRI LETTER ARCHAIC KHA +116B9 ; Takri # Po TAKRI ABBREVIATION SIGN 116C0..116C9 ; Takri # Nd [10] TAKRI DIGIT ZERO..TAKRI DIGIT NINE -# Total code points: 67 +# Total code points: 68 # ================================================ @@ -2561,8 +2609,9 @@ ABF0..ABF9 ; Meetei_Mayek # Nd [10] MEETEI MAYEK DIGIT ZERO..MEETEI MAYEK DI 1173A..1173B ; Ahom # No [2] AHOM NUMBER TEN..AHOM NUMBER TWENTY 1173C..1173E ; Ahom # Po [3] AHOM SIGN SMALL SECTION..AHOM SIGN RULAI 1173F ; Ahom # So AHOM SYMBOL VI +11740..11746 ; Ahom # Lo [7] AHOM LETTER CA..AHOM LETTER LLA -# Total code points: 58 +# Total code points: 65 # ================================================ @@ -2897,4 +2946,46 @@ ABF0..ABF9 ; Meetei_Mayek # Nd [10] MEETEI MAYEK DIGIT ZERO..MEETEI MAYEK DI # Total code points: 47 +# ================================================ + +12F90..12FF0 ; Cypro_Minoan # Lo [97] CYPRO-MINOAN SIGN CM001..CYPRO-MINOAN SIGN CM114 +12FF1..12FF2 ; Cypro_Minoan # Po [2] CYPRO-MINOAN SIGN CM301..CYPRO-MINOAN SIGN CM302 + +# Total code points: 99 + +# ================================================ + +10F70..10F81 ; Old_Uyghur # Lo [18] OLD UYGHUR LETTER ALEPH..OLD UYGHUR LETTER LESH +10F82..10F85 ; Old_Uyghur # Mn [4] OLD UYGHUR COMBINING DOT ABOVE..OLD UYGHUR COMBINING TWO DOTS BELOW +10F86..10F89 ; Old_Uyghur # Po [4] OLD UYGHUR PUNCTUATION BAR..OLD UYGHUR PUNCTUATION FOUR DOTS + +# Total code points: 26 + +# ================================================ + +16A70..16ABE ; Tangsa # Lo [79] TANGSA LETTER OZ..TANGSA LETTER ZA +16AC0..16AC9 ; Tangsa # Nd [10] TANGSA DIGIT ZERO..TANGSA DIGIT NINE + +# Total code points: 89 + +# ================================================ + +1E290..1E2AD ; Toto # Lo [30] TOTO LETTER PA..TOTO LETTER A +1E2AE ; Toto # Mn TOTO SIGN RISING TONE + +# Total code points: 31 + +# ================================================ + +10570..1057A ; Vithkuqi # L& [11] VITHKUQI CAPITAL LETTER A..VITHKUQI CAPITAL LETTER GA +1057C..1058A ; Vithkuqi # L& [15] VITHKUQI CAPITAL LETTER HA..VITHKUQI CAPITAL LETTER RE +1058C..10592 ; Vithkuqi # L& [7] VITHKUQI CAPITAL LETTER SE..VITHKUQI CAPITAL LETTER XE +10594..10595 ; Vithkuqi # L& [2] VITHKUQI CAPITAL LETTER Y..VITHKUQI CAPITAL LETTER ZE +10597..105A1 ; Vithkuqi # L& [11] VITHKUQI SMALL LETTER A..VITHKUQI SMALL LETTER GA +105A3..105B1 ; Vithkuqi # L& [15] VITHKUQI SMALL LETTER HA..VITHKUQI SMALL LETTER RE +105B3..105B9 ; Vithkuqi # L& [7] VITHKUQI SMALL LETTER SE..VITHKUQI SMALL LETTER XE +105BB..105BC ; Vithkuqi # L& [2] VITHKUQI SMALL LETTER Y..VITHKUQI SMALL LETTER ZE + +# Total code points: 70 + # EOF diff --git a/make/data/unicodedata/SpecialCasing.txt b/make/data/unicodedata/SpecialCasing.txt index ae71d58f644d7d814ac49fc73459b1e783039818..5c2a8aae46dd821120de5323797de270f1631c55 100644 --- a/make/data/unicodedata/SpecialCasing.txt +++ b/make/data/unicodedata/SpecialCasing.txt @@ -1,6 +1,6 @@ -# SpecialCasing-13.0.0.txt -# Date: 2019-09-08, 23:31:24 GMT -# Copyright (c) 2019 Unicode, Inc. +# SpecialCasing-14.0.0.txt +# Date: 2021-03-08, 19:35:55 GMT +# Copyright (c) 2021 Unicode, Inc. # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries. # For terms of use, see http://www.unicode.org/terms_of_use.html # diff --git a/make/data/unicodedata/UnicodeData.txt b/make/data/unicodedata/UnicodeData.txt index e22f967bbab8f2477a43533a334e21ebc0728eda..b5abef7ed437eefea5781e462e00d74ac5c02aba 100644 --- a/make/data/unicodedata/UnicodeData.txt +++ b/make/data/unicodedata/UnicodeData.txt @@ -1525,6 +1525,7 @@ 061A;ARABIC SMALL KASRA;Mn;32;NSM;;;;;N;;;;; 061B;ARABIC SEMICOLON;Po;0;AL;;;;;N;;;;; 061C;ARABIC LETTER MARK;Cf;0;AL;;;;;N;;;;; +061D;ARABIC END OF TEXT MARK;Po;0;AL;;;;;N;;;;; 061E;ARABIC TRIPLE DOT PUNCTUATION MARK;Po;0;AL;;;;;N;;;;; 061F;ARABIC QUESTION MARK;Po;0;AL;;;;;N;;;;; 0620;ARABIC LETTER KASHMIRI YEH;Lo;0;AL;;;;;N;;;;; @@ -2089,6 +2090,47 @@ 0868;SYRIAC LETTER MALAYALAM LLA;Lo;0;AL;;;;;N;;;;; 0869;SYRIAC LETTER MALAYALAM LLLA;Lo;0;AL;;;;;N;;;;; 086A;SYRIAC LETTER MALAYALAM SSA;Lo;0;AL;;;;;N;;;;; +0870;ARABIC LETTER ALEF WITH ATTACHED FATHA;Lo;0;AL;;;;;N;;;;; +0871;ARABIC LETTER ALEF WITH ATTACHED TOP RIGHT FATHA;Lo;0;AL;;;;;N;;;;; +0872;ARABIC LETTER ALEF WITH RIGHT MIDDLE STROKE;Lo;0;AL;;;;;N;;;;; +0873;ARABIC LETTER ALEF WITH LEFT MIDDLE STROKE;Lo;0;AL;;;;;N;;;;; +0874;ARABIC LETTER ALEF WITH ATTACHED KASRA;Lo;0;AL;;;;;N;;;;; +0875;ARABIC LETTER ALEF WITH ATTACHED BOTTOM RIGHT KASRA;Lo;0;AL;;;;;N;;;;; +0876;ARABIC LETTER ALEF WITH ATTACHED ROUND DOT ABOVE;Lo;0;AL;;;;;N;;;;; +0877;ARABIC LETTER ALEF WITH ATTACHED RIGHT ROUND DOT;Lo;0;AL;;;;;N;;;;; +0878;ARABIC LETTER ALEF WITH ATTACHED LEFT ROUND DOT;Lo;0;AL;;;;;N;;;;; +0879;ARABIC LETTER ALEF WITH ATTACHED ROUND DOT BELOW;Lo;0;AL;;;;;N;;;;; +087A;ARABIC LETTER ALEF WITH DOT ABOVE;Lo;0;AL;;;;;N;;;;; +087B;ARABIC LETTER ALEF WITH ATTACHED TOP RIGHT FATHA AND DOT ABOVE;Lo;0;AL;;;;;N;;;;; +087C;ARABIC LETTER ALEF WITH RIGHT MIDDLE STROKE AND DOT ABOVE;Lo;0;AL;;;;;N;;;;; +087D;ARABIC LETTER ALEF WITH ATTACHED BOTTOM RIGHT KASRA AND DOT ABOVE;Lo;0;AL;;;;;N;;;;; +087E;ARABIC LETTER ALEF WITH ATTACHED TOP RIGHT FATHA AND LEFT RING;Lo;0;AL;;;;;N;;;;; +087F;ARABIC LETTER ALEF WITH RIGHT MIDDLE STROKE AND LEFT RING;Lo;0;AL;;;;;N;;;;; +0880;ARABIC LETTER ALEF WITH ATTACHED BOTTOM RIGHT KASRA AND LEFT RING;Lo;0;AL;;;;;N;;;;; +0881;ARABIC LETTER ALEF WITH ATTACHED RIGHT HAMZA;Lo;0;AL;;;;;N;;;;; +0882;ARABIC LETTER ALEF WITH ATTACHED LEFT HAMZA;Lo;0;AL;;;;;N;;;;; +0883;ARABIC TATWEEL WITH OVERSTRUCK HAMZA;Lo;0;AL;;;;;N;;;;; +0884;ARABIC TATWEEL WITH OVERSTRUCK WAW;Lo;0;AL;;;;;N;;;;; +0885;ARABIC TATWEEL WITH TWO DOTS BELOW;Lo;0;AL;;;;;N;;;;; +0886;ARABIC LETTER THIN YEH;Lo;0;AL;;;;;N;;;;; +0887;ARABIC BASELINE ROUND DOT;Lo;0;AL;;;;;N;;;;; +0888;ARABIC RAISED ROUND DOT;Sk;0;AL;;;;;N;;;;; +0889;ARABIC LETTER NOON WITH INVERTED SMALL V;Lo;0;AL;;;;;N;;;;; +088A;ARABIC LETTER HAH WITH INVERTED SMALL V BELOW;Lo;0;AL;;;;;N;;;;; +088B;ARABIC LETTER TAH WITH DOT BELOW;Lo;0;AL;;;;;N;;;;; +088C;ARABIC LETTER TAH WITH THREE DOTS BELOW;Lo;0;AL;;;;;N;;;;; +088D;ARABIC LETTER KEHEH WITH TWO DOTS VERTICALLY BELOW;Lo;0;AL;;;;;N;;;;; +088E;ARABIC VERTICAL TAIL;Lo;0;AL;;;;;N;;;;; +0890;ARABIC POUND MARK ABOVE;Cf;0;AN;;;;;N;;;;; +0891;ARABIC PIASTRE MARK ABOVE;Cf;0;AN;;;;;N;;;;; +0898;ARABIC SMALL HIGH WORD AL-JUZ;Mn;230;NSM;;;;;N;;;;; +0899;ARABIC SMALL LOW WORD ISHMAAM;Mn;220;NSM;;;;;N;;;;; +089A;ARABIC SMALL LOW WORD IMAALA;Mn;220;NSM;;;;;N;;;;; +089B;ARABIC SMALL LOW WORD TASHEEL;Mn;220;NSM;;;;;N;;;;; +089C;ARABIC MADDA WAAJIB;Mn;230;NSM;;;;;N;;;;; +089D;ARABIC SUPERSCRIPT ALEF MOKHASSAS;Mn;230;NSM;;;;;N;;;;; +089E;ARABIC DOUBLED MADDA;Mn;230;NSM;;;;;N;;;;; +089F;ARABIC HALF MADDA OVER MADDA;Mn;230;NSM;;;;;N;;;;; 08A0;ARABIC LETTER BEH WITH SMALL V BELOW;Lo;0;AL;;;;;N;;;;; 08A1;ARABIC LETTER BEH WITH HAMZA ABOVE;Lo;0;AL;;;;;N;;;;; 08A2;ARABIC LETTER JEEM WITH TWO DOTS ABOVE;Lo;0;AL;;;;;N;;;;; @@ -2110,6 +2152,7 @@ 08B2;ARABIC LETTER ZAIN WITH INVERTED V ABOVE;Lo;0;AL;;;;;N;;;;; 08B3;ARABIC LETTER AIN WITH THREE DOTS BELOW;Lo;0;AL;;;;;N;;;;; 08B4;ARABIC LETTER KAF WITH DOT BELOW;Lo;0;AL;;;;;N;;;;; +08B5;ARABIC LETTER QAF WITH DOT BELOW AND NO DOTS ABOVE;Lo;0;AL;;;;;N;;;;; 08B6;ARABIC LETTER BEH WITH SMALL MEEM ABOVE;Lo;0;AL;;;;;N;;;;; 08B7;ARABIC LETTER PEH WITH SMALL MEEM ABOVE;Lo;0;AL;;;;;N;;;;; 08B8;ARABIC LETTER TEH WITH SMALL TEH ABOVE;Lo;0;AL;;;;;N;;;;; @@ -2128,6 +2171,17 @@ 08C5;ARABIC LETTER JEEM WITH THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;; 08C6;ARABIC LETTER JEEM WITH THREE DOTS BELOW;Lo;0;AL;;;;;N;;;;; 08C7;ARABIC LETTER LAM WITH SMALL ARABIC LETTER TAH ABOVE;Lo;0;AL;;;;;N;;;;; +08C8;ARABIC LETTER GRAF;Lo;0;AL;;;;;N;;;;; +08C9;ARABIC SMALL FARSI YEH;Lm;0;AL;;;;;N;;;;; +08CA;ARABIC SMALL HIGH FARSI YEH;Mn;230;NSM;;;;;N;;;;; +08CB;ARABIC SMALL HIGH YEH BARREE WITH TWO DOTS BELOW;Mn;230;NSM;;;;;N;;;;; +08CC;ARABIC SMALL HIGH WORD SAH;Mn;230;NSM;;;;;N;;;;; +08CD;ARABIC SMALL HIGH ZAH;Mn;230;NSM;;;;;N;;;;; +08CE;ARABIC LARGE ROUND DOT ABOVE;Mn;230;NSM;;;;;N;;;;; +08CF;ARABIC LARGE ROUND DOT BELOW;Mn;220;NSM;;;;;N;;;;; +08D0;ARABIC SUKUN BELOW;Mn;220;NSM;;;;;N;;;;; +08D1;ARABIC LARGE CIRCLE BELOW;Mn;220;NSM;;;;;N;;;;; +08D2;ARABIC LARGE ROUND DOT INSIDE CIRCLE BELOW;Mn;220;NSM;;;;;N;;;;; 08D3;ARABIC SMALL LOW WAW;Mn;220;NSM;;;;;N;;;;; 08D4;ARABIC SMALL HIGH WORD AR-RUB;Mn;230;NSM;;;;;N;;;;; 08D5;ARABIC SMALL HIGH SAD;Mn;230;NSM;;;;;N;;;;; @@ -2786,6 +2840,7 @@ 0C37;TELUGU LETTER SSA;Lo;0;L;;;;;N;;;;; 0C38;TELUGU LETTER SA;Lo;0;L;;;;;N;;;;; 0C39;TELUGU LETTER HA;Lo;0;L;;;;;N;;;;; +0C3C;TELUGU SIGN NUKTA;Mn;7;NSM;;;;;N;;;;; 0C3D;TELUGU SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;; 0C3E;TELUGU VOWEL SIGN AA;Mn;0;NSM;;;;;N;;;;; 0C3F;TELUGU VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;; @@ -2806,6 +2861,7 @@ 0C58;TELUGU LETTER TSA;Lo;0;L;;;;;N;;;;; 0C59;TELUGU LETTER DZA;Lo;0;L;;;;;N;;;;; 0C5A;TELUGU LETTER RRRA;Lo;0;L;;;;;N;;;;; +0C5D;TELUGU LETTER NAKAARA POLLU;Lo;0;L;;;;;N;;;;; 0C60;TELUGU LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;; 0C61;TELUGU LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;; 0C62;TELUGU VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;; @@ -2901,6 +2957,7 @@ 0CCD;KANNADA SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;; 0CD5;KANNADA LENGTH MARK;Mc;0;L;;;;;N;;;;; 0CD6;KANNADA AI LENGTH MARK;Mc;0;L;;;;;N;;;;; +0CDD;KANNADA LETTER NAKAARA POLLU;Lo;0;L;;;;;N;;;;; 0CDE;KANNADA LETTER FA;Lo;0;L;;;;;N;;;;; 0CE0;KANNADA LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;; 0CE1;KANNADA LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;; @@ -5258,6 +5315,7 @@ 170A;TAGALOG LETTER BA;Lo;0;L;;;;;N;;;;; 170B;TAGALOG LETTER MA;Lo;0;L;;;;;N;;;;; 170C;TAGALOG LETTER YA;Lo;0;L;;;;;N;;;;; +170D;TAGALOG LETTER RA;Lo;0;L;;;;;N;;;;; 170E;TAGALOG LETTER LA;Lo;0;L;;;;;N;;;;; 170F;TAGALOG LETTER WA;Lo;0;L;;;;;N;;;;; 1710;TAGALOG LETTER SA;Lo;0;L;;;;;N;;;;; @@ -5265,6 +5323,8 @@ 1712;TAGALOG VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;; 1713;TAGALOG VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;; 1714;TAGALOG SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;; +1715;TAGALOG SIGN PAMUDPOD;Mc;9;L;;;;;N;;;;; +171F;TAGALOG LETTER ARCHAIC RA;Lo;0;L;;;;;N;;;;; 1720;HANUNOO LETTER A;Lo;0;L;;;;;N;;;;; 1721;HANUNOO LETTER I;Lo;0;L;;;;;N;;;;; 1722;HANUNOO LETTER U;Lo;0;L;;;;;N;;;;; @@ -5285,7 +5345,7 @@ 1731;HANUNOO LETTER HA;Lo;0;L;;;;;N;;;;; 1732;HANUNOO VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;; 1733;HANUNOO VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;; -1734;HANUNOO SIGN PAMUDPOD;Mn;9;NSM;;;;;N;;;;; +1734;HANUNOO SIGN PAMUDPOD;Mc;9;L;;;;;N;;;;; 1735;PHILIPPINE SINGLE PUNCTUATION;Po;0;L;;;;;N;;;;; 1736;PHILIPPINE DOUBLE PUNCTUATION;Po;0;L;;;;;N;;;;; 1740;BUHID LETTER A;Lo;0;L;;;;;N;;;;; @@ -5455,6 +5515,7 @@ 180C;MONGOLIAN FREE VARIATION SELECTOR TWO;Mn;0;NSM;;;;;N;;;;; 180D;MONGOLIAN FREE VARIATION SELECTOR THREE;Mn;0;NSM;;;;;N;;;;; 180E;MONGOLIAN VOWEL SEPARATOR;Cf;0;BN;;;;;N;;;;; +180F;MONGOLIAN FREE VARIATION SELECTOR FOUR;Mn;0;NSM;;;;;N;;;;; 1810;MONGOLIAN DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; 1811;MONGOLIAN DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; 1812;MONGOLIAN DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; @@ -6059,6 +6120,20 @@ 1ABE;COMBINING PARENTHESES OVERLAY;Me;0;NSM;;;;;N;;;;; 1ABF;COMBINING LATIN SMALL LETTER W BELOW;Mn;220;NSM;;;;;N;;;;; 1AC0;COMBINING LATIN SMALL LETTER TURNED W BELOW;Mn;220;NSM;;;;;N;;;;; +1AC1;COMBINING LEFT PARENTHESIS ABOVE LEFT;Mn;230;NSM;;;;;N;;;;; +1AC2;COMBINING RIGHT PARENTHESIS ABOVE RIGHT;Mn;230;NSM;;;;;N;;;;; +1AC3;COMBINING LEFT PARENTHESIS BELOW LEFT;Mn;220;NSM;;;;;N;;;;; +1AC4;COMBINING RIGHT PARENTHESIS BELOW RIGHT;Mn;220;NSM;;;;;N;;;;; +1AC5;COMBINING SQUARE BRACKETS ABOVE;Mn;230;NSM;;;;;N;;;;; +1AC6;COMBINING NUMBER SIGN ABOVE;Mn;230;NSM;;;;;N;;;;; +1AC7;COMBINING INVERTED DOUBLE ARCH ABOVE;Mn;230;NSM;;;;;N;;;;; +1AC8;COMBINING PLUS SIGN ABOVE;Mn;230;NSM;;;;;N;;;;; +1AC9;COMBINING DOUBLE PLUS SIGN ABOVE;Mn;230;NSM;;;;;N;;;;; +1ACA;COMBINING DOUBLE PLUS SIGN BELOW;Mn;220;NSM;;;;;N;;;;; +1ACB;COMBINING TRIPLE ACUTE ACCENT;Mn;230;NSM;;;;;N;;;;; +1ACC;COMBINING LATIN SMALL LETTER INSULAR G;Mn;230;NSM;;;;;N;;;;; +1ACD;COMBINING LATIN SMALL LETTER INSULAR R;Mn;230;NSM;;;;;N;;;;; +1ACE;COMBINING LATIN SMALL LETTER INSULAR T;Mn;230;NSM;;;;;N;;;;; 1B00;BALINESE SIGN ULU RICEM;Mn;0;NSM;;;;;N;;;;; 1B01;BALINESE SIGN ULU CANDRA;Mn;0;NSM;;;;;N;;;;; 1B02;BALINESE SIGN CECEK;Mn;0;NSM;;;;;N;;;;; @@ -6135,6 +6210,7 @@ 1B49;BALINESE LETTER VE SASAK;Lo;0;L;;;;;N;;;;; 1B4A;BALINESE LETTER ZAL SASAK;Lo;0;L;;;;;N;;;;; 1B4B;BALINESE LETTER ASYURA SASAK;Lo;0;L;;;;;N;;;;; +1B4C;BALINESE LETTER ARCHAIC JNYA;Lo;0;L;;;;;N;;;;; 1B50;BALINESE DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; 1B51;BALINESE DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; 1B52;BALINESE DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; @@ -6180,6 +6256,8 @@ 1B7A;BALINESE MUSICAL SYMBOL LEFT-HAND CLOSED PLAK;So;0;L;;;;;N;;;;; 1B7B;BALINESE MUSICAL SYMBOL LEFT-HAND CLOSED PLUK;So;0;L;;;;;N;;;;; 1B7C;BALINESE MUSICAL SYMBOL LEFT-HAND OPEN PING;So;0;L;;;;;N;;;;; +1B7D;BALINESE PANTI LANTANG;Po;0;L;;;;;N;;;;; +1B7E;BALINESE PAMADA LANTANG;Po;0;L;;;;;N;;;;; 1B80;SUNDANESE SIGN PANYECEK;Mn;0;NSM;;;;;N;;;;; 1B81;SUNDANESE SIGN PANGLAYAR;Mn;0;NSM;;;;;N;;;;; 1B82;SUNDANESE SIGN PANGWISAD;Mc;0;L;;;;;N;;;;; @@ -6778,6 +6856,7 @@ 1DF7;COMBINING KAVYKA ABOVE LEFT;Mn;228;NSM;;;;;N;;;;; 1DF8;COMBINING DOT ABOVE LEFT;Mn;228;NSM;;;;;N;;;;; 1DF9;COMBINING WIDE INVERTED BRIDGE BELOW;Mn;220;NSM;;;;;N;;;;; +1DFA;COMBINING DOT BELOW LEFT;Mn;218;NSM;;;;;N;;;;; 1DFB;COMBINING DELETION MARK;Mn;230;NSM;;;;;N;;;;; 1DFC;COMBINING DOUBLE INVERTED BREVE BELOW;Mn;233;NSM;;;;;N;;;;; 1DFD;COMBINING ALMOST EQUAL TO BELOW;Mn;220;NSM;;;;;N;;;;; @@ -7457,6 +7536,7 @@ 20BD;RUBLE SIGN;Sc;0;ET;;;;;N;;;;; 20BE;LARI SIGN;Sc;0;ET;;;;;N;;;;; 20BF;BITCOIN SIGN;Sc;0;ET;;;;;N;;;;; +20C0;SOM SIGN;Sc;0;ET;;;;;N;;;;; 20D0;COMBINING LEFT HARPOON ABOVE;Mn;230;NSM;;;;;N;NON-SPACING LEFT HARPOON ABOVE;;;; 20D1;COMBINING RIGHT HARPOON ABOVE;Mn;230;NSM;;;;;N;NON-SPACING RIGHT HARPOON ABOVE;;;; 20D2;COMBINING LONG VERTICAL LINE OVERLAY;Mn;1;NSM;;;;;N;NON-SPACING LONG VERTICAL BAR OVERLAY;;;; @@ -10300,6 +10380,7 @@ 2C2C;GLAGOLITIC CAPITAL LETTER SHTAPIC;Lu;0;L;;;;;N;;;;2C5C; 2C2D;GLAGOLITIC CAPITAL LETTER TROKUTASTI A;Lu;0;L;;;;;N;;;;2C5D; 2C2E;GLAGOLITIC CAPITAL LETTER LATINATE MYSLITE;Lu;0;L;;;;;N;;;;2C5E; +2C2F;GLAGOLITIC CAPITAL LETTER CAUDATE CHRIVI;Lu;0;L;;;;;N;;;;2C5F; 2C30;GLAGOLITIC SMALL LETTER AZU;Ll;0;L;;;;;N;;;2C00;;2C00 2C31;GLAGOLITIC SMALL LETTER BUKY;Ll;0;L;;;;;N;;;2C01;;2C01 2C32;GLAGOLITIC SMALL LETTER VEDE;Ll;0;L;;;;;N;;;2C02;;2C02 @@ -10347,6 +10428,7 @@ 2C5C;GLAGOLITIC SMALL LETTER SHTAPIC;Ll;0;L;;;;;N;;;2C2C;;2C2C 2C5D;GLAGOLITIC SMALL LETTER TROKUTASTI A;Ll;0;L;;;;;N;;;2C2D;;2C2D 2C5E;GLAGOLITIC SMALL LETTER LATINATE MYSLITE;Ll;0;L;;;;;N;;;2C2E;;2C2E +2C5F;GLAGOLITIC SMALL LETTER CAUDATE CHRIVI;Ll;0;L;;;;;N;;;2C2F;;2C2F 2C60;LATIN CAPITAL LETTER L WITH DOUBLE BAR;Lu;0;L;;;;;N;;;;2C61; 2C61;LATIN SMALL LETTER L WITH DOUBLE BAR;Ll;0;L;;;;;N;;;2C60;;2C60 2C62;LATIN CAPITAL LETTER L WITH MIDDLE TILDE;Lu;0;L;;;;;N;;;;026B; @@ -10795,6 +10877,17 @@ 2E50;CROSS PATTY WITH RIGHT CROSSBAR;So;0;ON;;;;;N;;;;; 2E51;CROSS PATTY WITH LEFT CROSSBAR;So;0;ON;;;;;N;;;;; 2E52;TIRONIAN SIGN CAPITAL ET;Po;0;ON;;;;;N;;;;; +2E53;MEDIEVAL EXCLAMATION MARK;Po;0;ON;;;;;N;;;;; +2E54;MEDIEVAL QUESTION MARK;Po;0;ON;;;;;N;;;;; +2E55;LEFT SQUARE BRACKET WITH STROKE;Ps;0;ON;;;;;Y;;;;; +2E56;RIGHT SQUARE BRACKET WITH STROKE;Pe;0;ON;;;;;Y;;;;; +2E57;LEFT SQUARE BRACKET WITH DOUBLE STROKE;Ps;0;ON;;;;;Y;;;;; +2E58;RIGHT SQUARE BRACKET WITH DOUBLE STROKE;Pe;0;ON;;;;;Y;;;;; +2E59;TOP HALF LEFT PARENTHESIS;Ps;0;ON;;;;;Y;;;;; +2E5A;TOP HALF RIGHT PARENTHESIS;Pe;0;ON;;;;;Y;;;;; +2E5B;BOTTOM HALF LEFT PARENTHESIS;Ps;0;ON;;;;;Y;;;;; +2E5C;BOTTOM HALF RIGHT PARENTHESIS;Pe;0;ON;;;;;Y;;;;; +2E5D;OBLIQUE HYPHEN;Pd;0;ON;;;;;N;;;;; 2E80;CJK RADICAL REPEAT;So;0;ON;;;;;N;;;;; 2E81;CJK RADICAL CLIFF;So;0;ON;;;;;N;;;;; 2E82;CJK RADICAL SECOND ONE;So;0;ON;;;;;N;;;;; @@ -12204,7 +12297,7 @@ 4DFE;HEXAGRAM FOR AFTER COMPLETION;So;0;ON;;;;;N;;;;; 4DFF;HEXAGRAM FOR BEFORE COMPLETION;So;0;ON;;;;;N;;;;; 4E00;;Lo;0;L;;;;;N;;;;; -9FFC;;Lo;0;L;;;;;N;;;;; +9FFF;;Lo;0;L;;;;;N;;;;; A000;YI SYLLABLE IT;Lo;0;L;;;;;N;;;;; A001;YI SYLLABLE IX;Lo;0;L;;;;;N;;;;; A002;YI SYLLABLE I;Lo;0;L;;;;;N;;;;; @@ -14149,6 +14242,8 @@ A7BC;LATIN CAPITAL LETTER GLOTTAL I;Lu;0;L;;;;;N;;;;A7BD; A7BD;LATIN SMALL LETTER GLOTTAL I;Ll;0;L;;;;;N;;;A7BC;;A7BC A7BE;LATIN CAPITAL LETTER GLOTTAL U;Lu;0;L;;;;;N;;;;A7BF; A7BF;LATIN SMALL LETTER GLOTTAL U;Ll;0;L;;;;;N;;;A7BE;;A7BE +A7C0;LATIN CAPITAL LETTER OLD POLISH O;Lu;0;L;;;;;N;;;;A7C1; +A7C1;LATIN SMALL LETTER OLD POLISH O;Ll;0;L;;;;;N;;;A7C0;;A7C0 A7C2;LATIN CAPITAL LETTER ANGLICANA W;Lu;0;L;;;;;N;;;;A7C3; A7C3;LATIN SMALL LETTER ANGLICANA W;Ll;0;L;;;;;N;;;A7C2;;A7C2 A7C4;LATIN CAPITAL LETTER C WITH PALATAL HOOK;Lu;0;L;;;;;N;;;;A794; @@ -14158,6 +14253,17 @@ A7C7;LATIN CAPITAL LETTER D WITH SHORT STROKE OVERLAY;Lu;0;L;;;;;N;;;;A7C8; A7C8;LATIN SMALL LETTER D WITH SHORT STROKE OVERLAY;Ll;0;L;;;;;N;;;A7C7;;A7C7 A7C9;LATIN CAPITAL LETTER S WITH SHORT STROKE OVERLAY;Lu;0;L;;;;;N;;;;A7CA; A7CA;LATIN SMALL LETTER S WITH SHORT STROKE OVERLAY;Ll;0;L;;;;;N;;;A7C9;;A7C9 +A7D0;LATIN CAPITAL LETTER CLOSED INSULAR G;Lu;0;L;;;;;N;;;;A7D1; +A7D1;LATIN SMALL LETTER CLOSED INSULAR G;Ll;0;L;;;;;N;;;A7D0;;A7D0 +A7D3;LATIN SMALL LETTER DOUBLE THORN;Ll;0;L;;;;;N;;;;; +A7D5;LATIN SMALL LETTER DOUBLE WYNN;Ll;0;L;;;;;N;;;;; +A7D6;LATIN CAPITAL LETTER MIDDLE SCOTS S;Lu;0;L;;;;;N;;;;A7D7; +A7D7;LATIN SMALL LETTER MIDDLE SCOTS S;Ll;0;L;;;;;N;;;A7D6;;A7D6 +A7D8;LATIN CAPITAL LETTER SIGMOID S;Lu;0;L;;;;;N;;;;A7D9; +A7D9;LATIN SMALL LETTER SIGMOID S;Ll;0;L;;;;;N;;;A7D8;;A7D8 +A7F2;MODIFIER LETTER CAPITAL C;Lm;0;L; 0043;;;;N;;;;; +A7F3;MODIFIER LETTER CAPITAL F;Lm;0;L; 0046;;;;N;;;;; +A7F4;MODIFIER LETTER CAPITAL Q;Lm;0;L; 0051;;;;N;;;;; A7F5;LATIN CAPITAL LETTER REVERSED HALF H;Lu;0;L;;;;;N;;;;A7F6; A7F6;LATIN SMALL LETTER REVERSED HALF H;Ll;0;L;;;;;N;;;A7F5;;A7F5 A7F7;LATIN EPIGRAPHIC LETTER SIDEWAYS I;Lo;0;L;;;;;N;;;;; @@ -15794,6 +15900,7 @@ FBBE;ARABIC SYMBOL TWO DOTS VERTICALLY BELOW;Sk;0;AL;;;;;N;;;;; FBBF;ARABIC SYMBOL RING;Sk;0;AL;;;;;N;;;;; FBC0;ARABIC SYMBOL SMALL TAH ABOVE;Sk;0;AL;;;;;N;;;;; FBC1;ARABIC SYMBOL SMALL TAH BELOW;Sk;0;AL;;;;;N;;;;; +FBC2;ARABIC SYMBOL WASLA ABOVE;Sk;0;AL;;;;;N;;;;; FBD3;ARABIC LETTER NG ISOLATED FORM;Lo;0;AL; 06AD;;;;N;;;;; FBD4;ARABIC LETTER NG FINAL FORM;Lo;0;AL; 06AD;;;;N;;;;; FBD5;ARABIC LETTER NG INITIAL FORM;Lo;0;AL; 06AD;;;;N;;;;; @@ -16159,6 +16266,22 @@ FD3C;ARABIC LIGATURE ALEF WITH FATHATAN FINAL FORM;Lo;0;AL; 0627 064B;;;; FD3D;ARABIC LIGATURE ALEF WITH FATHATAN ISOLATED FORM;Lo;0;AL; 0627 064B;;;;N;;;;; FD3E;ORNATE LEFT PARENTHESIS;Pe;0;ON;;;;;N;;;;; FD3F;ORNATE RIGHT PARENTHESIS;Ps;0;ON;;;;;N;;;;; +FD40;ARABIC LIGATURE RAHIMAHU ALLAAH;So;0;ON;;;;;N;;;;; +FD41;ARABIC LIGATURE RADI ALLAAHU ANH;So;0;ON;;;;;N;;;;; +FD42;ARABIC LIGATURE RADI ALLAAHU ANHAA;So;0;ON;;;;;N;;;;; +FD43;ARABIC LIGATURE RADI ALLAAHU ANHUM;So;0;ON;;;;;N;;;;; +FD44;ARABIC LIGATURE RADI ALLAAHU ANHUMAA;So;0;ON;;;;;N;;;;; +FD45;ARABIC LIGATURE RADI ALLAAHU ANHUNNA;So;0;ON;;;;;N;;;;; +FD46;ARABIC LIGATURE SALLALLAAHU ALAYHI WA-AALIH;So;0;ON;;;;;N;;;;; +FD47;ARABIC LIGATURE ALAYHI AS-SALAAM;So;0;ON;;;;;N;;;;; +FD48;ARABIC LIGATURE ALAYHIM AS-SALAAM;So;0;ON;;;;;N;;;;; +FD49;ARABIC LIGATURE ALAYHIMAA AS-SALAAM;So;0;ON;;;;;N;;;;; +FD4A;ARABIC LIGATURE ALAYHI AS-SALAATU WAS-SALAAM;So;0;ON;;;;;N;;;;; +FD4B;ARABIC LIGATURE QUDDISA SIRRAH;So;0;ON;;;;;N;;;;; +FD4C;ARABIC LIGATURE SALLALLAHU ALAYHI WAAALIHEE WA-SALLAM;So;0;ON;;;;;N;;;;; +FD4D;ARABIC LIGATURE ALAYHAA AS-SALAAM;So;0;ON;;;;;N;;;;; +FD4E;ARABIC LIGATURE TABAARAKA WA-TAAALAA;So;0;ON;;;;;N;;;;; +FD4F;ARABIC LIGATURE RAHIMAHUM ALLAAH;So;0;ON;;;;;N;;;;; FD50;ARABIC LIGATURE TEH WITH JEEM WITH MEEM INITIAL FORM;Lo;0;AL; 062A 062C 0645;;;;N;;;;; FD51;ARABIC LIGATURE TEH WITH HAH WITH JEEM FINAL FORM;Lo;0;AL; 062A 062D 062C;;;;N;;;;; FD52;ARABIC LIGATURE TEH WITH HAH WITH JEEM INITIAL FORM;Lo;0;AL; 062A 062D 062C;;;;N;;;;; @@ -16277,6 +16400,7 @@ FDC4;ARABIC LIGATURE AIN WITH JEEM WITH MEEM INITIAL FORM;Lo;0;AL; 0639 FDC5;ARABIC LIGATURE SAD WITH MEEM WITH MEEM INITIAL FORM;Lo;0;AL; 0635 0645 0645;;;;N;;;;; FDC6;ARABIC LIGATURE SEEN WITH KHAH WITH YEH FINAL FORM;Lo;0;AL; 0633 062E 064A;;;;N;;;;; FDC7;ARABIC LIGATURE NOON WITH JEEM WITH YEH FINAL FORM;Lo;0;AL; 0646 062C 064A;;;;N;;;;; +FDCF;ARABIC LIGATURE SALAAMUHU ALAYNAA;So;0;ON;;;;;N;;;;; FDF0;ARABIC LIGATURE SALLA USED AS KORANIC STOP SIGN ISOLATED FORM;Lo;0;AL; 0635 0644 06D2;;;;N;;;;; FDF1;ARABIC LIGATURE QALA USED AS KORANIC STOP SIGN ISOLATED FORM;Lo;0;AL; 0642 0644 06D2;;;;N;;;;; FDF2;ARABIC LIGATURE ALLAH ISOLATED FORM;Lo;0;AL; 0627 0644 0644 0647;;;;N;;;;; @@ -16291,6 +16415,8 @@ FDFA;ARABIC LIGATURE SALLALLAHOU ALAYHE WASALLAM;Lo;0;AL; 0635 0644 06 FDFB;ARABIC LIGATURE JALLAJALALOUHOU;Lo;0;AL; 062C 0644 0020 062C 0644 0627 0644 0647;;;;N;ARABIC LETTER JALLAJALALOUHOU;;;; FDFC;RIAL SIGN;Sc;0;AL; 0631 06CC 0627 0644;;;;N;;;;; FDFD;ARABIC LIGATURE BISMILLAH AR-RAHMAN AR-RAHEEM;So;0;ON;;;;;N;;;;; +FDFE;ARABIC LIGATURE SUBHAANAHU WA TAAALAA;So;0;ON;;;;;N;;;;; +FDFF;ARABIC LIGATURE AZZA WA JALL;So;0;ON;;;;;N;;;;; FE00;VARIATION SELECTOR-1;Mn;0;NSM;;;;;N;;;;; FE01;VARIATION SELECTOR-2;Mn;0;NSM;;;;;N;;;;; FE02;VARIATION SELECTOR-3;Mn;0;NSM;;;;;N;;;;; @@ -17798,6 +17924,76 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 10562;CAUCASIAN ALBANIAN LETTER PIWR;Lo;0;L;;;;;N;;;;; 10563;CAUCASIAN ALBANIAN LETTER KIW;Lo;0;L;;;;;N;;;;; 1056F;CAUCASIAN ALBANIAN CITATION MARK;Po;0;L;;;;;N;;;;; +10570;VITHKUQI CAPITAL LETTER A;Lu;0;L;;;;;N;;;;10597; +10571;VITHKUQI CAPITAL LETTER BBE;Lu;0;L;;;;;N;;;;10598; +10572;VITHKUQI CAPITAL LETTER BE;Lu;0;L;;;;;N;;;;10599; +10573;VITHKUQI CAPITAL LETTER CE;Lu;0;L;;;;;N;;;;1059A; +10574;VITHKUQI CAPITAL LETTER CHE;Lu;0;L;;;;;N;;;;1059B; +10575;VITHKUQI CAPITAL LETTER DE;Lu;0;L;;;;;N;;;;1059C; +10576;VITHKUQI CAPITAL LETTER DHE;Lu;0;L;;;;;N;;;;1059D; +10577;VITHKUQI CAPITAL LETTER EI;Lu;0;L;;;;;N;;;;1059E; +10578;VITHKUQI CAPITAL LETTER E;Lu;0;L;;;;;N;;;;1059F; +10579;VITHKUQI CAPITAL LETTER FE;Lu;0;L;;;;;N;;;;105A0; +1057A;VITHKUQI CAPITAL LETTER GA;Lu;0;L;;;;;N;;;;105A1; +1057C;VITHKUQI CAPITAL LETTER HA;Lu;0;L;;;;;N;;;;105A3; +1057D;VITHKUQI CAPITAL LETTER HHA;Lu;0;L;;;;;N;;;;105A4; +1057E;VITHKUQI CAPITAL LETTER I;Lu;0;L;;;;;N;;;;105A5; +1057F;VITHKUQI CAPITAL LETTER IJE;Lu;0;L;;;;;N;;;;105A6; +10580;VITHKUQI CAPITAL LETTER JE;Lu;0;L;;;;;N;;;;105A7; +10581;VITHKUQI CAPITAL LETTER KA;Lu;0;L;;;;;N;;;;105A8; +10582;VITHKUQI CAPITAL LETTER LA;Lu;0;L;;;;;N;;;;105A9; +10583;VITHKUQI CAPITAL LETTER LLA;Lu;0;L;;;;;N;;;;105AA; +10584;VITHKUQI CAPITAL LETTER ME;Lu;0;L;;;;;N;;;;105AB; +10585;VITHKUQI CAPITAL LETTER NE;Lu;0;L;;;;;N;;;;105AC; +10586;VITHKUQI CAPITAL LETTER NJE;Lu;0;L;;;;;N;;;;105AD; +10587;VITHKUQI CAPITAL LETTER O;Lu;0;L;;;;;N;;;;105AE; +10588;VITHKUQI CAPITAL LETTER PE;Lu;0;L;;;;;N;;;;105AF; +10589;VITHKUQI CAPITAL LETTER QA;Lu;0;L;;;;;N;;;;105B0; +1058A;VITHKUQI CAPITAL LETTER RE;Lu;0;L;;;;;N;;;;105B1; +1058C;VITHKUQI CAPITAL LETTER SE;Lu;0;L;;;;;N;;;;105B3; +1058D;VITHKUQI CAPITAL LETTER SHE;Lu;0;L;;;;;N;;;;105B4; +1058E;VITHKUQI CAPITAL LETTER TE;Lu;0;L;;;;;N;;;;105B5; +1058F;VITHKUQI CAPITAL LETTER THE;Lu;0;L;;;;;N;;;;105B6; +10590;VITHKUQI CAPITAL LETTER U;Lu;0;L;;;;;N;;;;105B7; +10591;VITHKUQI CAPITAL LETTER VE;Lu;0;L;;;;;N;;;;105B8; +10592;VITHKUQI CAPITAL LETTER XE;Lu;0;L;;;;;N;;;;105B9; +10594;VITHKUQI CAPITAL LETTER Y;Lu;0;L;;;;;N;;;;105BB; +10595;VITHKUQI CAPITAL LETTER ZE;Lu;0;L;;;;;N;;;;105BC; +10597;VITHKUQI SMALL LETTER A;Ll;0;L;;;;;N;;;10570;;10570 +10598;VITHKUQI SMALL LETTER BBE;Ll;0;L;;;;;N;;;10571;;10571 +10599;VITHKUQI SMALL LETTER BE;Ll;0;L;;;;;N;;;10572;;10572 +1059A;VITHKUQI SMALL LETTER CE;Ll;0;L;;;;;N;;;10573;;10573 +1059B;VITHKUQI SMALL LETTER CHE;Ll;0;L;;;;;N;;;10574;;10574 +1059C;VITHKUQI SMALL LETTER DE;Ll;0;L;;;;;N;;;10575;;10575 +1059D;VITHKUQI SMALL LETTER DHE;Ll;0;L;;;;;N;;;10576;;10576 +1059E;VITHKUQI SMALL LETTER EI;Ll;0;L;;;;;N;;;10577;;10577 +1059F;VITHKUQI SMALL LETTER E;Ll;0;L;;;;;N;;;10578;;10578 +105A0;VITHKUQI SMALL LETTER FE;Ll;0;L;;;;;N;;;10579;;10579 +105A1;VITHKUQI SMALL LETTER GA;Ll;0;L;;;;;N;;;1057A;;1057A +105A3;VITHKUQI SMALL LETTER HA;Ll;0;L;;;;;N;;;1057C;;1057C +105A4;VITHKUQI SMALL LETTER HHA;Ll;0;L;;;;;N;;;1057D;;1057D +105A5;VITHKUQI SMALL LETTER I;Ll;0;L;;;;;N;;;1057E;;1057E +105A6;VITHKUQI SMALL LETTER IJE;Ll;0;L;;;;;N;;;1057F;;1057F +105A7;VITHKUQI SMALL LETTER JE;Ll;0;L;;;;;N;;;10580;;10580 +105A8;VITHKUQI SMALL LETTER KA;Ll;0;L;;;;;N;;;10581;;10581 +105A9;VITHKUQI SMALL LETTER LA;Ll;0;L;;;;;N;;;10582;;10582 +105AA;VITHKUQI SMALL LETTER LLA;Ll;0;L;;;;;N;;;10583;;10583 +105AB;VITHKUQI SMALL LETTER ME;Ll;0;L;;;;;N;;;10584;;10584 +105AC;VITHKUQI SMALL LETTER NE;Ll;0;L;;;;;N;;;10585;;10585 +105AD;VITHKUQI SMALL LETTER NJE;Ll;0;L;;;;;N;;;10586;;10586 +105AE;VITHKUQI SMALL LETTER O;Ll;0;L;;;;;N;;;10587;;10587 +105AF;VITHKUQI SMALL LETTER PE;Ll;0;L;;;;;N;;;10588;;10588 +105B0;VITHKUQI SMALL LETTER QA;Ll;0;L;;;;;N;;;10589;;10589 +105B1;VITHKUQI SMALL LETTER RE;Ll;0;L;;;;;N;;;1058A;;1058A +105B3;VITHKUQI SMALL LETTER SE;Ll;0;L;;;;;N;;;1058C;;1058C +105B4;VITHKUQI SMALL LETTER SHE;Ll;0;L;;;;;N;;;1058D;;1058D +105B5;VITHKUQI SMALL LETTER TE;Ll;0;L;;;;;N;;;1058E;;1058E +105B6;VITHKUQI SMALL LETTER THE;Ll;0;L;;;;;N;;;1058F;;1058F +105B7;VITHKUQI SMALL LETTER U;Ll;0;L;;;;;N;;;10590;;10590 +105B8;VITHKUQI SMALL LETTER VE;Ll;0;L;;;;;N;;;10591;;10591 +105B9;VITHKUQI SMALL LETTER XE;Ll;0;L;;;;;N;;;10592;;10592 +105BB;VITHKUQI SMALL LETTER Y;Ll;0;L;;;;;N;;;10594;;10594 +105BC;VITHKUQI SMALL LETTER ZE;Ll;0;L;;;;;N;;;10595;;10595 10600;LINEAR A SIGN AB001;Lo;0;L;;;;;N;;;;; 10601;LINEAR A SIGN AB002;Lo;0;L;;;;;N;;;;; 10602;LINEAR A SIGN AB003;Lo;0;L;;;;;N;;;;; @@ -18139,6 +18335,63 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 10765;LINEAR A SIGN A805;Lo;0;L;;;;;N;;;;; 10766;LINEAR A SIGN A806;Lo;0;L;;;;;N;;;;; 10767;LINEAR A SIGN A807;Lo;0;L;;;;;N;;;;; +10780;MODIFIER LETTER SMALL CAPITAL AA;Lm;0;L;;;;;N;;;;; +10781;MODIFIER LETTER SUPERSCRIPT TRIANGULAR COLON;Lm;0;L; 02D0;;;;N;;;;; +10782;MODIFIER LETTER SUPERSCRIPT HALF TRIANGULAR COLON;Lm;0;L; 02D1;;;;N;;;;; +10783;MODIFIER LETTER SMALL AE;Lm;0;L; 00E6;;;;N;;;;; +10784;MODIFIER LETTER SMALL CAPITAL B;Lm;0;L; 0299;;;;N;;;;; +10785;MODIFIER LETTER SMALL B WITH HOOK;Lm;0;L; 0253;;;;N;;;;; +10787;MODIFIER LETTER SMALL DZ DIGRAPH;Lm;0;L; 02A3;;;;N;;;;; +10788;MODIFIER LETTER SMALL DZ DIGRAPH WITH RETROFLEX HOOK;Lm;0;L; AB66;;;;N;;;;; +10789;MODIFIER LETTER SMALL DZ DIGRAPH WITH CURL;Lm;0;L; 02A5;;;;N;;;;; +1078A;MODIFIER LETTER SMALL DEZH DIGRAPH;Lm;0;L; 02A4;;;;N;;;;; +1078B;MODIFIER LETTER SMALL D WITH TAIL;Lm;0;L; 0256;;;;N;;;;; +1078C;MODIFIER LETTER SMALL D WITH HOOK;Lm;0;L; 0257;;;;N;;;;; +1078D;MODIFIER LETTER SMALL D WITH HOOK AND TAIL;Lm;0;L; 1D91;;;;N;;;;; +1078E;MODIFIER LETTER SMALL REVERSED E;Lm;0;L; 0258;;;;N;;;;; +1078F;MODIFIER LETTER SMALL CLOSED REVERSED OPEN E;Lm;0;L; 025E;;;;N;;;;; +10790;MODIFIER LETTER SMALL FENG DIGRAPH;Lm;0;L; 02A9;;;;N;;;;; +10791;MODIFIER LETTER SMALL RAMS HORN;Lm;0;L; 0264;;;;N;;;;; +10792;MODIFIER LETTER SMALL CAPITAL G;Lm;0;L; 0262;;;;N;;;;; +10793;MODIFIER LETTER SMALL G WITH HOOK;Lm;0;L; 0260;;;;N;;;;; +10794;MODIFIER LETTER SMALL CAPITAL G WITH HOOK;Lm;0;L; 029B;;;;N;;;;; +10795;MODIFIER LETTER SMALL H WITH STROKE;Lm;0;L; 0127;;;;N;;;;; +10796;MODIFIER LETTER SMALL CAPITAL H;Lm;0;L; 029C;;;;N;;;;; +10797;MODIFIER LETTER SMALL HENG WITH HOOK;Lm;0;L; 0267;;;;N;;;;; +10798;MODIFIER LETTER SMALL DOTLESS J WITH STROKE AND HOOK;Lm;0;L; 0284;;;;N;;;;; +10799;MODIFIER LETTER SMALL LS DIGRAPH;Lm;0;L; 02AA;;;;N;;;;; +1079A;MODIFIER LETTER SMALL LZ DIGRAPH;Lm;0;L; 02AB;;;;N;;;;; +1079B;MODIFIER LETTER SMALL L WITH BELT;Lm;0;L; 026C;;;;N;;;;; +1079C;MODIFIER LETTER SMALL CAPITAL L WITH BELT;Lm;0;L; 1DF04;;;;N;;;;; +1079D;MODIFIER LETTER SMALL L WITH RETROFLEX HOOK AND BELT;Lm;0;L; A78E;;;;N;;;;; +1079E;MODIFIER LETTER SMALL LEZH;Lm;0;L; 026E;;;;N;;;;; +1079F;MODIFIER LETTER SMALL LEZH WITH RETROFLEX HOOK;Lm;0;L; 1DF05;;;;N;;;;; +107A0;MODIFIER LETTER SMALL TURNED Y;Lm;0;L; 028E;;;;N;;;;; +107A1;MODIFIER LETTER SMALL TURNED Y WITH BELT;Lm;0;L; 1DF06;;;;N;;;;; +107A2;MODIFIER LETTER SMALL O WITH STROKE;Lm;0;L; 00F8;;;;N;;;;; +107A3;MODIFIER LETTER SMALL CAPITAL OE;Lm;0;L; 0276;;;;N;;;;; +107A4;MODIFIER LETTER SMALL CLOSED OMEGA;Lm;0;L; 0277;;;;N;;;;; +107A5;MODIFIER LETTER SMALL Q;Lm;0;L; 0071;;;;N;;;;; +107A6;MODIFIER LETTER SMALL TURNED R WITH LONG LEG;Lm;0;L; 027A;;;;N;;;;; +107A7;MODIFIER LETTER SMALL TURNED R WITH LONG LEG AND RETROFLEX HOOK;Lm;0;L; 1DF08;;;;N;;;;; +107A8;MODIFIER LETTER SMALL R WITH TAIL;Lm;0;L; 027D;;;;N;;;;; +107A9;MODIFIER LETTER SMALL R WITH FISHHOOK;Lm;0;L; 027E;;;;N;;;;; +107AA;MODIFIER LETTER SMALL CAPITAL R;Lm;0;L; 0280;;;;N;;;;; +107AB;MODIFIER LETTER SMALL TC DIGRAPH WITH CURL;Lm;0;L; 02A8;;;;N;;;;; +107AC;MODIFIER LETTER SMALL TS DIGRAPH;Lm;0;L; 02A6;;;;N;;;;; +107AD;MODIFIER LETTER SMALL TS DIGRAPH WITH RETROFLEX HOOK;Lm;0;L; AB67;;;;N;;;;; +107AE;MODIFIER LETTER SMALL TESH DIGRAPH;Lm;0;L; 02A7;;;;N;;;;; +107AF;MODIFIER LETTER SMALL T WITH RETROFLEX HOOK;Lm;0;L; 0288;;;;N;;;;; +107B0;MODIFIER LETTER SMALL V WITH RIGHT HOOK;Lm;0;L; 2C71;;;;N;;;;; +107B2;MODIFIER LETTER SMALL CAPITAL Y;Lm;0;L; 028F;;;;N;;;;; +107B3;MODIFIER LETTER GLOTTAL STOP WITH STROKE;Lm;0;L; 02A1;;;;N;;;;; +107B4;MODIFIER LETTER REVERSED GLOTTAL STOP WITH STROKE;Lm;0;L; 02A2;;;;N;;;;; +107B5;MODIFIER LETTER BILABIAL CLICK;Lm;0;L; 0298;;;;N;;;;; +107B6;MODIFIER LETTER DENTAL CLICK;Lm;0;L; 01C0;;;;N;;;;; +107B7;MODIFIER LETTER LATERAL CLICK;Lm;0;L; 01C1;;;;N;;;;; +107B8;MODIFIER LETTER ALVEOLAR CLICK;Lm;0;L; 01C2;;;;N;;;;; +107B9;MODIFIER LETTER RETROFLEX CLICK WITH RETROFLEX HOOK;Lm;0;L; 1DF0A;;;;N;;;;; +107BA;MODIFIER LETTER SMALL S WITH CURL;Lm;0;L; 1DF1E;;;;N;;;;; 10800;CYPRIOT SYLLABLE A;Lo;0;R;;;;;N;;;;; 10801;CYPRIOT SYLLABLE E;Lo;0;R;;;;;N;;;;; 10802;CYPRIOT SYLLABLE I;Lo;0;R;;;;;N;;;;; @@ -19222,6 +19475,32 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 10F57;SOGDIAN PUNCTUATION CIRCLE WITH DOT;Po;0;AL;;;;;N;;;;; 10F58;SOGDIAN PUNCTUATION TWO CIRCLES WITH DOTS;Po;0;AL;;;;;N;;;;; 10F59;SOGDIAN PUNCTUATION HALF CIRCLE WITH DOT;Po;0;AL;;;;;N;;;;; +10F70;OLD UYGHUR LETTER ALEPH;Lo;0;R;;;;;N;;;;; +10F71;OLD UYGHUR LETTER BETH;Lo;0;R;;;;;N;;;;; +10F72;OLD UYGHUR LETTER GIMEL-HETH;Lo;0;R;;;;;N;;;;; +10F73;OLD UYGHUR LETTER WAW;Lo;0;R;;;;;N;;;;; +10F74;OLD UYGHUR LETTER ZAYIN;Lo;0;R;;;;;N;;;;; +10F75;OLD UYGHUR LETTER FINAL HETH;Lo;0;R;;;;;N;;;;; +10F76;OLD UYGHUR LETTER YODH;Lo;0;R;;;;;N;;;;; +10F77;OLD UYGHUR LETTER KAPH;Lo;0;R;;;;;N;;;;; +10F78;OLD UYGHUR LETTER LAMEDH;Lo;0;R;;;;;N;;;;; +10F79;OLD UYGHUR LETTER MEM;Lo;0;R;;;;;N;;;;; +10F7A;OLD UYGHUR LETTER NUN;Lo;0;R;;;;;N;;;;; +10F7B;OLD UYGHUR LETTER SAMEKH;Lo;0;R;;;;;N;;;;; +10F7C;OLD UYGHUR LETTER PE;Lo;0;R;;;;;N;;;;; +10F7D;OLD UYGHUR LETTER SADHE;Lo;0;R;;;;;N;;;;; +10F7E;OLD UYGHUR LETTER RESH;Lo;0;R;;;;;N;;;;; +10F7F;OLD UYGHUR LETTER SHIN;Lo;0;R;;;;;N;;;;; +10F80;OLD UYGHUR LETTER TAW;Lo;0;R;;;;;N;;;;; +10F81;OLD UYGHUR LETTER LESH;Lo;0;R;;;;;N;;;;; +10F82;OLD UYGHUR COMBINING DOT ABOVE;Mn;230;NSM;;;;;N;;;;; +10F83;OLD UYGHUR COMBINING DOT BELOW;Mn;220;NSM;;;;;N;;;;; +10F84;OLD UYGHUR COMBINING TWO DOTS ABOVE;Mn;230;NSM;;;;;N;;;;; +10F85;OLD UYGHUR COMBINING TWO DOTS BELOW;Mn;220;NSM;;;;;N;;;;; +10F86;OLD UYGHUR PUNCTUATION BAR;Po;0;R;;;;;N;;;;; +10F87;OLD UYGHUR PUNCTUATION TWO BARS;Po;0;R;;;;;N;;;;; +10F88;OLD UYGHUR PUNCTUATION TWO DOTS;Po;0;R;;;;;N;;;;; +10F89;OLD UYGHUR PUNCTUATION FOUR DOTS;Po;0;R;;;;;N;;;;; 10FB0;CHORASMIAN LETTER ALEPH;Lo;0;R;;;;;N;;;;; 10FB1;CHORASMIAN LETTER SMALL ALEPH;Lo;0;R;;;;;N;;;;; 10FB2;CHORASMIAN LETTER BETH;Lo;0;R;;;;;N;;;;; @@ -19381,6 +19660,12 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1106D;BRAHMI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; 1106E;BRAHMI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; 1106F;BRAHMI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +11070;BRAHMI SIGN OLD TAMIL VIRAMA;Mn;9;NSM;;;;;N;;;;; +11071;BRAHMI LETTER OLD TAMIL SHORT E;Lo;0;L;;;;;N;;;;; +11072;BRAHMI LETTER OLD TAMIL SHORT O;Lo;0;L;;;;;N;;;;; +11073;BRAHMI VOWEL SIGN OLD TAMIL SHORT E;Mn;0;NSM;;;;;N;;;;; +11074;BRAHMI VOWEL SIGN OLD TAMIL SHORT O;Mn;0;NSM;;;;;N;;;;; +11075;BRAHMI LETTER OLD TAMIL LLA;Lo;0;L;;;;;N;;;;; 1107F;BRAHMI NUMBER JOINER;Mn;9;NSM;;;;;N;;;;; 11080;KAITHI SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;; 11081;KAITHI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;; @@ -19448,6 +19733,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 110BF;KAITHI DOUBLE SECTION MARK;Po;0;L;;;;;N;;;;; 110C0;KAITHI DANDA;Po;0;L;;;;;N;;;;; 110C1;KAITHI DOUBLE DANDA;Po;0;L;;;;;N;;;;; +110C2;KAITHI VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;; 110CD;KAITHI NUMBER SIGN ABOVE;Cf;0;L;;;;;N;;;;; 110D0;SORA SOMPENG LETTER SAH;Lo;0;L;;;;;N;;;;; 110D1;SORA SOMPENG LETTER TAH;Lo;0;L;;;;;N;;;;; @@ -20385,6 +20671,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 116B6;TAKRI SIGN VIRAMA;Mc;9;L;;;;;N;;;;; 116B7;TAKRI SIGN NUKTA;Mn;7;NSM;;;;;N;;;;; 116B8;TAKRI LETTER ARCHAIC KHA;Lo;0;L;;;;;N;;;;; +116B9;TAKRI ABBREVIATION SIGN;Po;0;L;;;;;N;;;;; 116C0;TAKRI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; 116C1;TAKRI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; 116C2;TAKRI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; @@ -20453,6 +20740,13 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1173D;AHOM SIGN SECTION;Po;0;L;;;;;N;;;;; 1173E;AHOM SIGN RULAI;Po;0;L;;;;;N;;;;; 1173F;AHOM SYMBOL VI;So;0;L;;;;;N;;;;; +11740;AHOM LETTER CA;Lo;0;L;;;;;N;;;;; +11741;AHOM LETTER TTA;Lo;0;L;;;;;N;;;;; +11742;AHOM LETTER TTHA;Lo;0;L;;;;;N;;;;; +11743;AHOM LETTER DDA;Lo;0;L;;;;;N;;;;; +11744;AHOM LETTER DDHA;Lo;0;L;;;;;N;;;;; +11745;AHOM LETTER NNA;Lo;0;L;;;;;N;;;;; +11746;AHOM LETTER LLA;Lo;0;L;;;;;N;;;;; 11800;DOGRA LETTER A;Lo;0;L;;;;;N;;;;; 11801;DOGRA LETTER AA;Lo;0;L;;;;;N;;;;; 11802;DOGRA LETTER I;Lo;0;L;;;;;N;;;;; @@ -20889,6 +21183,22 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 11AA0;SOYOMBO HEAD MARK WITH MOON AND SUN;Po;0;L;;;;;N;;;;; 11AA1;SOYOMBO TERMINAL MARK-1;Po;0;L;;;;;N;;;;; 11AA2;SOYOMBO TERMINAL MARK-2;Po;0;L;;;;;N;;;;; +11AB0;CANADIAN SYLLABICS NATTILIK HI;Lo;0;L;;;;;N;;;;; +11AB1;CANADIAN SYLLABICS NATTILIK HII;Lo;0;L;;;;;N;;;;; +11AB2;CANADIAN SYLLABICS NATTILIK HO;Lo;0;L;;;;;N;;;;; +11AB3;CANADIAN SYLLABICS NATTILIK HOO;Lo;0;L;;;;;N;;;;; +11AB4;CANADIAN SYLLABICS NATTILIK HA;Lo;0;L;;;;;N;;;;; +11AB5;CANADIAN SYLLABICS NATTILIK HAA;Lo;0;L;;;;;N;;;;; +11AB6;CANADIAN SYLLABICS NATTILIK SHRI;Lo;0;L;;;;;N;;;;; +11AB7;CANADIAN SYLLABICS NATTILIK SHRII;Lo;0;L;;;;;N;;;;; +11AB8;CANADIAN SYLLABICS NATTILIK SHRO;Lo;0;L;;;;;N;;;;; +11AB9;CANADIAN SYLLABICS NATTILIK SHROO;Lo;0;L;;;;;N;;;;; +11ABA;CANADIAN SYLLABICS NATTILIK SHRA;Lo;0;L;;;;;N;;;;; +11ABB;CANADIAN SYLLABICS NATTILIK SHRAA;Lo;0;L;;;;;N;;;;; +11ABC;CANADIAN SYLLABICS SPE;Lo;0;L;;;;;N;;;;; +11ABD;CANADIAN SYLLABICS SPI;Lo;0;L;;;;;N;;;;; +11ABE;CANADIAN SYLLABICS SPO;Lo;0;L;;;;;N;;;;; +11ABF;CANADIAN SYLLABICS SPA;Lo;0;L;;;;;N;;;;; 11AC0;PAU CIN HAU LETTER PA;Lo;0;L;;;;;N;;;;; 11AC1;PAU CIN HAU LETTER KA;Lo;0;L;;;;;N;;;;; 11AC2;PAU CIN HAU LETTER LA;Lo;0;L;;;;;N;;;;; @@ -22560,6 +22870,105 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 12541;CUNEIFORM SIGN ZA7;Lo;0;L;;;;;N;;;;; 12542;CUNEIFORM SIGN ZU OVER ZU PLUS SAR;Lo;0;L;;;;;N;;;;; 12543;CUNEIFORM SIGN ZU5 TIMES THREE DISH TENU;Lo;0;L;;;;;N;;;;; +12F90;CYPRO-MINOAN SIGN CM001;Lo;0;L;;;;;N;;;;; +12F91;CYPRO-MINOAN SIGN CM002;Lo;0;L;;;;;N;;;;; +12F92;CYPRO-MINOAN SIGN CM004;Lo;0;L;;;;;N;;;;; +12F93;CYPRO-MINOAN SIGN CM005;Lo;0;L;;;;;N;;;;; +12F94;CYPRO-MINOAN SIGN CM006;Lo;0;L;;;;;N;;;;; +12F95;CYPRO-MINOAN SIGN CM007;Lo;0;L;;;;;N;;;;; +12F96;CYPRO-MINOAN SIGN CM008;Lo;0;L;;;;;N;;;;; +12F97;CYPRO-MINOAN SIGN CM009;Lo;0;L;;;;;N;;;;; +12F98;CYPRO-MINOAN SIGN CM010;Lo;0;L;;;;;N;;;;; +12F99;CYPRO-MINOAN SIGN CM011;Lo;0;L;;;;;N;;;;; +12F9A;CYPRO-MINOAN SIGN CM012;Lo;0;L;;;;;N;;;;; +12F9B;CYPRO-MINOAN SIGN CM012B;Lo;0;L;;;;;N;;;;; +12F9C;CYPRO-MINOAN SIGN CM013;Lo;0;L;;;;;N;;;;; +12F9D;CYPRO-MINOAN SIGN CM015;Lo;0;L;;;;;N;;;;; +12F9E;CYPRO-MINOAN SIGN CM017;Lo;0;L;;;;;N;;;;; +12F9F;CYPRO-MINOAN SIGN CM019;Lo;0;L;;;;;N;;;;; +12FA0;CYPRO-MINOAN SIGN CM021;Lo;0;L;;;;;N;;;;; +12FA1;CYPRO-MINOAN SIGN CM023;Lo;0;L;;;;;N;;;;; +12FA2;CYPRO-MINOAN SIGN CM024;Lo;0;L;;;;;N;;;;; +12FA3;CYPRO-MINOAN SIGN CM025;Lo;0;L;;;;;N;;;;; +12FA4;CYPRO-MINOAN SIGN CM026;Lo;0;L;;;;;N;;;;; +12FA5;CYPRO-MINOAN SIGN CM027;Lo;0;L;;;;;N;;;;; +12FA6;CYPRO-MINOAN SIGN CM028;Lo;0;L;;;;;N;;;;; +12FA7;CYPRO-MINOAN SIGN CM029;Lo;0;L;;;;;N;;;;; +12FA8;CYPRO-MINOAN SIGN CM030;Lo;0;L;;;;;N;;;;; +12FA9;CYPRO-MINOAN SIGN CM033;Lo;0;L;;;;;N;;;;; +12FAA;CYPRO-MINOAN SIGN CM034;Lo;0;L;;;;;N;;;;; +12FAB;CYPRO-MINOAN SIGN CM035;Lo;0;L;;;;;N;;;;; +12FAC;CYPRO-MINOAN SIGN CM036;Lo;0;L;;;;;N;;;;; +12FAD;CYPRO-MINOAN SIGN CM037;Lo;0;L;;;;;N;;;;; +12FAE;CYPRO-MINOAN SIGN CM038;Lo;0;L;;;;;N;;;;; +12FAF;CYPRO-MINOAN SIGN CM039;Lo;0;L;;;;;N;;;;; +12FB0;CYPRO-MINOAN SIGN CM040;Lo;0;L;;;;;N;;;;; +12FB1;CYPRO-MINOAN SIGN CM041;Lo;0;L;;;;;N;;;;; +12FB2;CYPRO-MINOAN SIGN CM044;Lo;0;L;;;;;N;;;;; +12FB3;CYPRO-MINOAN SIGN CM046;Lo;0;L;;;;;N;;;;; +12FB4;CYPRO-MINOAN SIGN CM047;Lo;0;L;;;;;N;;;;; +12FB5;CYPRO-MINOAN SIGN CM049;Lo;0;L;;;;;N;;;;; +12FB6;CYPRO-MINOAN SIGN CM050;Lo;0;L;;;;;N;;;;; +12FB7;CYPRO-MINOAN SIGN CM051;Lo;0;L;;;;;N;;;;; +12FB8;CYPRO-MINOAN SIGN CM052;Lo;0;L;;;;;N;;;;; +12FB9;CYPRO-MINOAN SIGN CM053;Lo;0;L;;;;;N;;;;; +12FBA;CYPRO-MINOAN SIGN CM054;Lo;0;L;;;;;N;;;;; +12FBB;CYPRO-MINOAN SIGN CM055;Lo;0;L;;;;;N;;;;; +12FBC;CYPRO-MINOAN SIGN CM056;Lo;0;L;;;;;N;;;;; +12FBD;CYPRO-MINOAN SIGN CM058;Lo;0;L;;;;;N;;;;; +12FBE;CYPRO-MINOAN SIGN CM059;Lo;0;L;;;;;N;;;;; +12FBF;CYPRO-MINOAN SIGN CM060;Lo;0;L;;;;;N;;;;; +12FC0;CYPRO-MINOAN SIGN CM061;Lo;0;L;;;;;N;;;;; +12FC1;CYPRO-MINOAN SIGN CM062;Lo;0;L;;;;;N;;;;; +12FC2;CYPRO-MINOAN SIGN CM063;Lo;0;L;;;;;N;;;;; +12FC3;CYPRO-MINOAN SIGN CM064;Lo;0;L;;;;;N;;;;; +12FC4;CYPRO-MINOAN SIGN CM066;Lo;0;L;;;;;N;;;;; +12FC5;CYPRO-MINOAN SIGN CM067;Lo;0;L;;;;;N;;;;; +12FC6;CYPRO-MINOAN SIGN CM068;Lo;0;L;;;;;N;;;;; +12FC7;CYPRO-MINOAN SIGN CM069;Lo;0;L;;;;;N;;;;; +12FC8;CYPRO-MINOAN SIGN CM070;Lo;0;L;;;;;N;;;;; +12FC9;CYPRO-MINOAN SIGN CM071;Lo;0;L;;;;;N;;;;; +12FCA;CYPRO-MINOAN SIGN CM072;Lo;0;L;;;;;N;;;;; +12FCB;CYPRO-MINOAN SIGN CM073;Lo;0;L;;;;;N;;;;; +12FCC;CYPRO-MINOAN SIGN CM074;Lo;0;L;;;;;N;;;;; +12FCD;CYPRO-MINOAN SIGN CM075;Lo;0;L;;;;;N;;;;; +12FCE;CYPRO-MINOAN SIGN CM075B;Lo;0;L;;;;;N;;;;; +12FCF;CYPRO-MINOAN SIGN CM076;Lo;0;L;;;;;N;;;;; +12FD0;CYPRO-MINOAN SIGN CM078;Lo;0;L;;;;;N;;;;; +12FD1;CYPRO-MINOAN SIGN CM079;Lo;0;L;;;;;N;;;;; +12FD2;CYPRO-MINOAN SIGN CM080;Lo;0;L;;;;;N;;;;; +12FD3;CYPRO-MINOAN SIGN CM081;Lo;0;L;;;;;N;;;;; +12FD4;CYPRO-MINOAN SIGN CM082;Lo;0;L;;;;;N;;;;; +12FD5;CYPRO-MINOAN SIGN CM083;Lo;0;L;;;;;N;;;;; +12FD6;CYPRO-MINOAN SIGN CM084;Lo;0;L;;;;;N;;;;; +12FD7;CYPRO-MINOAN SIGN CM085;Lo;0;L;;;;;N;;;;; +12FD8;CYPRO-MINOAN SIGN CM086;Lo;0;L;;;;;N;;;;; +12FD9;CYPRO-MINOAN SIGN CM087;Lo;0;L;;;;;N;;;;; +12FDA;CYPRO-MINOAN SIGN CM088;Lo;0;L;;;;;N;;;;; +12FDB;CYPRO-MINOAN SIGN CM089;Lo;0;L;;;;;N;;;;; +12FDC;CYPRO-MINOAN SIGN CM090;Lo;0;L;;;;;N;;;;; +12FDD;CYPRO-MINOAN SIGN CM091;Lo;0;L;;;;;N;;;;; +12FDE;CYPRO-MINOAN SIGN CM092;Lo;0;L;;;;;N;;;;; +12FDF;CYPRO-MINOAN SIGN CM094;Lo;0;L;;;;;N;;;;; +12FE0;CYPRO-MINOAN SIGN CM095;Lo;0;L;;;;;N;;;;; +12FE1;CYPRO-MINOAN SIGN CM096;Lo;0;L;;;;;N;;;;; +12FE2;CYPRO-MINOAN SIGN CM097;Lo;0;L;;;;;N;;;;; +12FE3;CYPRO-MINOAN SIGN CM098;Lo;0;L;;;;;N;;;;; +12FE4;CYPRO-MINOAN SIGN CM099;Lo;0;L;;;;;N;;;;; +12FE5;CYPRO-MINOAN SIGN CM100;Lo;0;L;;;;;N;;;;; +12FE6;CYPRO-MINOAN SIGN CM101;Lo;0;L;;;;;N;;;;; +12FE7;CYPRO-MINOAN SIGN CM102;Lo;0;L;;;;;N;;;;; +12FE8;CYPRO-MINOAN SIGN CM103;Lo;0;L;;;;;N;;;;; +12FE9;CYPRO-MINOAN SIGN CM104;Lo;0;L;;;;;N;;;;; +12FEA;CYPRO-MINOAN SIGN CM105;Lo;0;L;;;;;N;;;;; +12FEB;CYPRO-MINOAN SIGN CM107;Lo;0;L;;;;;N;;;;; +12FEC;CYPRO-MINOAN SIGN CM108;Lo;0;L;;;;;N;;;;; +12FED;CYPRO-MINOAN SIGN CM109;Lo;0;L;;;;;N;;;;; +12FEE;CYPRO-MINOAN SIGN CM110;Lo;0;L;;;;;N;;;;; +12FEF;CYPRO-MINOAN SIGN CM112;Lo;0;L;;;;;N;;;;; +12FF0;CYPRO-MINOAN SIGN CM114;Lo;0;L;;;;;N;;;;; +12FF1;CYPRO-MINOAN SIGN CM301;Po;0;L;;;;;N;;;;; +12FF2;CYPRO-MINOAN SIGN CM302;Po;0;L;;;;;N;;;;; 13000;EGYPTIAN HIEROGLYPH A001;Lo;0;L;;;;;N;;;;; 13001;EGYPTIAN HIEROGLYPH A002;Lo;0;L;;;;;N;;;;; 13002;EGYPTIAN HIEROGLYPH A003;Lo;0;L;;;;;N;;;;; @@ -24835,6 +25244,95 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 16A69;MRO DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; 16A6E;MRO DANDA;Po;0;L;;;;;N;;;;; 16A6F;MRO DOUBLE DANDA;Po;0;L;;;;;N;;;;; +16A70;TANGSA LETTER OZ;Lo;0;L;;;;;N;;;;; +16A71;TANGSA LETTER OC;Lo;0;L;;;;;N;;;;; +16A72;TANGSA LETTER OQ;Lo;0;L;;;;;N;;;;; +16A73;TANGSA LETTER OX;Lo;0;L;;;;;N;;;;; +16A74;TANGSA LETTER AZ;Lo;0;L;;;;;N;;;;; +16A75;TANGSA LETTER AC;Lo;0;L;;;;;N;;;;; +16A76;TANGSA LETTER AQ;Lo;0;L;;;;;N;;;;; +16A77;TANGSA LETTER AX;Lo;0;L;;;;;N;;;;; +16A78;TANGSA LETTER VZ;Lo;0;L;;;;;N;;;;; +16A79;TANGSA LETTER VC;Lo;0;L;;;;;N;;;;; +16A7A;TANGSA LETTER VQ;Lo;0;L;;;;;N;;;;; +16A7B;TANGSA LETTER VX;Lo;0;L;;;;;N;;;;; +16A7C;TANGSA LETTER EZ;Lo;0;L;;;;;N;;;;; +16A7D;TANGSA LETTER EC;Lo;0;L;;;;;N;;;;; +16A7E;TANGSA LETTER EQ;Lo;0;L;;;;;N;;;;; +16A7F;TANGSA LETTER EX;Lo;0;L;;;;;N;;;;; +16A80;TANGSA LETTER IZ;Lo;0;L;;;;;N;;;;; +16A81;TANGSA LETTER IC;Lo;0;L;;;;;N;;;;; +16A82;TANGSA LETTER IQ;Lo;0;L;;;;;N;;;;; +16A83;TANGSA LETTER IX;Lo;0;L;;;;;N;;;;; +16A84;TANGSA LETTER UZ;Lo;0;L;;;;;N;;;;; +16A85;TANGSA LETTER UC;Lo;0;L;;;;;N;;;;; +16A86;TANGSA LETTER UQ;Lo;0;L;;;;;N;;;;; +16A87;TANGSA LETTER UX;Lo;0;L;;;;;N;;;;; +16A88;TANGSA LETTER AWZ;Lo;0;L;;;;;N;;;;; +16A89;TANGSA LETTER AWC;Lo;0;L;;;;;N;;;;; +16A8A;TANGSA LETTER AWQ;Lo;0;L;;;;;N;;;;; +16A8B;TANGSA LETTER AWX;Lo;0;L;;;;;N;;;;; +16A8C;TANGSA LETTER UIZ;Lo;0;L;;;;;N;;;;; +16A8D;TANGSA LETTER UIC;Lo;0;L;;;;;N;;;;; +16A8E;TANGSA LETTER UIQ;Lo;0;L;;;;;N;;;;; +16A8F;TANGSA LETTER UIX;Lo;0;L;;;;;N;;;;; +16A90;TANGSA LETTER FINAL NG;Lo;0;L;;;;;N;;;;; +16A91;TANGSA LETTER LONG UEX;Lo;0;L;;;;;N;;;;; +16A92;TANGSA LETTER SHORT UEZ;Lo;0;L;;;;;N;;;;; +16A93;TANGSA LETTER SHORT AWX;Lo;0;L;;;;;N;;;;; +16A94;TANGSA LETTER UEC;Lo;0;L;;;;;N;;;;; +16A95;TANGSA LETTER UEZ;Lo;0;L;;;;;N;;;;; +16A96;TANGSA LETTER UEQ;Lo;0;L;;;;;N;;;;; +16A97;TANGSA LETTER UEX;Lo;0;L;;;;;N;;;;; +16A98;TANGSA LETTER UIUZ;Lo;0;L;;;;;N;;;;; +16A99;TANGSA LETTER UIUC;Lo;0;L;;;;;N;;;;; +16A9A;TANGSA LETTER UIUQ;Lo;0;L;;;;;N;;;;; +16A9B;TANGSA LETTER UIUX;Lo;0;L;;;;;N;;;;; +16A9C;TANGSA LETTER MZ;Lo;0;L;;;;;N;;;;; +16A9D;TANGSA LETTER MC;Lo;0;L;;;;;N;;;;; +16A9E;TANGSA LETTER MQ;Lo;0;L;;;;;N;;;;; +16A9F;TANGSA LETTER MX;Lo;0;L;;;;;N;;;;; +16AA0;TANGSA LETTER KA;Lo;0;L;;;;;N;;;;; +16AA1;TANGSA LETTER KHA;Lo;0;L;;;;;N;;;;; +16AA2;TANGSA LETTER GA;Lo;0;L;;;;;N;;;;; +16AA3;TANGSA LETTER NGA;Lo;0;L;;;;;N;;;;; +16AA4;TANGSA LETTER SA;Lo;0;L;;;;;N;;;;; +16AA5;TANGSA LETTER YA;Lo;0;L;;;;;N;;;;; +16AA6;TANGSA LETTER WA;Lo;0;L;;;;;N;;;;; +16AA7;TANGSA LETTER PA;Lo;0;L;;;;;N;;;;; +16AA8;TANGSA LETTER NYA;Lo;0;L;;;;;N;;;;; +16AA9;TANGSA LETTER PHA;Lo;0;L;;;;;N;;;;; +16AAA;TANGSA LETTER BA;Lo;0;L;;;;;N;;;;; +16AAB;TANGSA LETTER MA;Lo;0;L;;;;;N;;;;; +16AAC;TANGSA LETTER NA;Lo;0;L;;;;;N;;;;; +16AAD;TANGSA LETTER HA;Lo;0;L;;;;;N;;;;; +16AAE;TANGSA LETTER LA;Lo;0;L;;;;;N;;;;; +16AAF;TANGSA LETTER HTA;Lo;0;L;;;;;N;;;;; +16AB0;TANGSA LETTER TA;Lo;0;L;;;;;N;;;;; +16AB1;TANGSA LETTER DA;Lo;0;L;;;;;N;;;;; +16AB2;TANGSA LETTER RA;Lo;0;L;;;;;N;;;;; +16AB3;TANGSA LETTER NHA;Lo;0;L;;;;;N;;;;; +16AB4;TANGSA LETTER SHA;Lo;0;L;;;;;N;;;;; +16AB5;TANGSA LETTER CA;Lo;0;L;;;;;N;;;;; +16AB6;TANGSA LETTER TSA;Lo;0;L;;;;;N;;;;; +16AB7;TANGSA LETTER GHA;Lo;0;L;;;;;N;;;;; +16AB8;TANGSA LETTER HTTA;Lo;0;L;;;;;N;;;;; +16AB9;TANGSA LETTER THA;Lo;0;L;;;;;N;;;;; +16ABA;TANGSA LETTER XA;Lo;0;L;;;;;N;;;;; +16ABB;TANGSA LETTER FA;Lo;0;L;;;;;N;;;;; +16ABC;TANGSA LETTER DHA;Lo;0;L;;;;;N;;;;; +16ABD;TANGSA LETTER CHA;Lo;0;L;;;;;N;;;;; +16ABE;TANGSA LETTER ZA;Lo;0;L;;;;;N;;;;; +16AC0;TANGSA DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +16AC1;TANGSA DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +16AC2;TANGSA DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +16AC3;TANGSA DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +16AC4;TANGSA DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +16AC5;TANGSA DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +16AC6;TANGSA DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +16AC7;TANGSA DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +16AC8;TANGSA DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +16AC9;TANGSA DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; 16AD0;BASSA VAH LETTER ENNI;Lo;0;L;;;;;N;;;;; 16AD1;BASSA VAH LETTER KA;Lo;0;L;;;;;N;;;;; 16AD2;BASSA VAH LETTER SE;Lo;0;L;;;;;N;;;;; @@ -26487,6 +26985,19 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 18CD5;KHITAN SMALL SCRIPT CHARACTER-18CD5;Lo;0;L;;;;;N;;;;; 18D00;;Lo;0;L;;;;;N;;;;; 18D08;;Lo;0;L;;;;;N;;;;; +1AFF0;KATAKANA LETTER MINNAN TONE-2;Lm;0;L;;;;;N;;;;; +1AFF1;KATAKANA LETTER MINNAN TONE-3;Lm;0;L;;;;;N;;;;; +1AFF2;KATAKANA LETTER MINNAN TONE-4;Lm;0;L;;;;;N;;;;; +1AFF3;KATAKANA LETTER MINNAN TONE-5;Lm;0;L;;;;;N;;;;; +1AFF5;KATAKANA LETTER MINNAN TONE-7;Lm;0;L;;;;;N;;;;; +1AFF6;KATAKANA LETTER MINNAN TONE-8;Lm;0;L;;;;;N;;;;; +1AFF7;KATAKANA LETTER MINNAN NASALIZED TONE-1;Lm;0;L;;;;;N;;;;; +1AFF8;KATAKANA LETTER MINNAN NASALIZED TONE-2;Lm;0;L;;;;;N;;;;; +1AFF9;KATAKANA LETTER MINNAN NASALIZED TONE-3;Lm;0;L;;;;;N;;;;; +1AFFA;KATAKANA LETTER MINNAN NASALIZED TONE-4;Lm;0;L;;;;;N;;;;; +1AFFB;KATAKANA LETTER MINNAN NASALIZED TONE-5;Lm;0;L;;;;;N;;;;; +1AFFD;KATAKANA LETTER MINNAN NASALIZED TONE-7;Lm;0;L;;;;;N;;;;; +1AFFE;KATAKANA LETTER MINNAN NASALIZED TONE-8;Lm;0;L;;;;;N;;;;; 1B000;KATAKANA LETTER ARCHAIC E;Lo;0;L;;;;;N;;;;; 1B001;HIRAGANA LETTER ARCHAIC YE;Lo;0;L;;;;;N;;;;; 1B002;HENTAIGANA LETTER A-1;Lo;0;L;;;;;N;;;;; @@ -26774,6 +27285,10 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1B11C;HENTAIGANA LETTER WO-7;Lo;0;L;;;;;N;;;;; 1B11D;HENTAIGANA LETTER N-MU-MO-1;Lo;0;L;;;;;N;;;;; 1B11E;HENTAIGANA LETTER N-MU-MO-2;Lo;0;L;;;;;N;;;;; +1B11F;HIRAGANA LETTER ARCHAIC WU;Lo;0;L;;;;;N;;;;; +1B120;KATAKANA LETTER ARCHAIC YI;Lo;0;L;;;;;N;;;;; +1B121;KATAKANA LETTER ARCHAIC YE;Lo;0;L;;;;;N;;;;; +1B122;KATAKANA LETTER ARCHAIC WU;Lo;0;L;;;;;N;;;;; 1B150;HIRAGANA LETTER SMALL WI;Lo;0;L;;;;;N;;;;; 1B151;HIRAGANA LETTER SMALL WE;Lo;0;L;;;;;N;;;;; 1B152;HIRAGANA LETTER SMALL WO;Lo;0;L;;;;;N;;;;; @@ -27324,6 +27839,191 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1BCA1;SHORTHAND FORMAT CONTINUING OVERLAP;Cf;0;BN;;;;;N;;;;; 1BCA2;SHORTHAND FORMAT DOWN STEP;Cf;0;BN;;;;;N;;;;; 1BCA3;SHORTHAND FORMAT UP STEP;Cf;0;BN;;;;;N;;;;; +1CF00;ZNAMENNY COMBINING MARK GORAZDO NIZKO S KRYZHEM ON LEFT;Mn;0;NSM;;;;;N;;;;; +1CF01;ZNAMENNY COMBINING MARK NIZKO S KRYZHEM ON LEFT;Mn;0;NSM;;;;;N;;;;; +1CF02;ZNAMENNY COMBINING MARK TSATA ON LEFT;Mn;0;NSM;;;;;N;;;;; +1CF03;ZNAMENNY COMBINING MARK GORAZDO NIZKO ON LEFT;Mn;0;NSM;;;;;N;;;;; +1CF04;ZNAMENNY COMBINING MARK NIZKO ON LEFT;Mn;0;NSM;;;;;N;;;;; +1CF05;ZNAMENNY COMBINING MARK SREDNE ON LEFT;Mn;0;NSM;;;;;N;;;;; +1CF06;ZNAMENNY COMBINING MARK MALO POVYSHE ON LEFT;Mn;0;NSM;;;;;N;;;;; +1CF07;ZNAMENNY COMBINING MARK POVYSHE ON LEFT;Mn;0;NSM;;;;;N;;;;; +1CF08;ZNAMENNY COMBINING MARK VYSOKO ON LEFT;Mn;0;NSM;;;;;N;;;;; +1CF09;ZNAMENNY COMBINING MARK MALO POVYSHE S KHOKHLOM ON LEFT;Mn;0;NSM;;;;;N;;;;; +1CF0A;ZNAMENNY COMBINING MARK POVYSHE S KHOKHLOM ON LEFT;Mn;0;NSM;;;;;N;;;;; +1CF0B;ZNAMENNY COMBINING MARK VYSOKO S KHOKHLOM ON LEFT;Mn;0;NSM;;;;;N;;;;; +1CF0C;ZNAMENNY COMBINING MARK GORAZDO NIZKO S KRYZHEM ON RIGHT;Mn;0;NSM;;;;;N;;;;; +1CF0D;ZNAMENNY COMBINING MARK NIZKO S KRYZHEM ON RIGHT;Mn;0;NSM;;;;;N;;;;; +1CF0E;ZNAMENNY COMBINING MARK TSATA ON RIGHT;Mn;0;NSM;;;;;N;;;;; +1CF0F;ZNAMENNY COMBINING MARK GORAZDO NIZKO ON RIGHT;Mn;0;NSM;;;;;N;;;;; +1CF10;ZNAMENNY COMBINING MARK NIZKO ON RIGHT;Mn;0;NSM;;;;;N;;;;; +1CF11;ZNAMENNY COMBINING MARK SREDNE ON RIGHT;Mn;0;NSM;;;;;N;;;;; +1CF12;ZNAMENNY COMBINING MARK MALO POVYSHE ON RIGHT;Mn;0;NSM;;;;;N;;;;; +1CF13;ZNAMENNY COMBINING MARK POVYSHE ON RIGHT;Mn;0;NSM;;;;;N;;;;; +1CF14;ZNAMENNY COMBINING MARK VYSOKO ON RIGHT;Mn;0;NSM;;;;;N;;;;; +1CF15;ZNAMENNY COMBINING MARK MALO POVYSHE S KHOKHLOM ON RIGHT;Mn;0;NSM;;;;;N;;;;; +1CF16;ZNAMENNY COMBINING MARK POVYSHE S KHOKHLOM ON RIGHT;Mn;0;NSM;;;;;N;;;;; +1CF17;ZNAMENNY COMBINING MARK VYSOKO S KHOKHLOM ON RIGHT;Mn;0;NSM;;;;;N;;;;; +1CF18;ZNAMENNY COMBINING MARK TSATA S KRYZHEM;Mn;0;NSM;;;;;N;;;;; +1CF19;ZNAMENNY COMBINING MARK MALO POVYSHE S KRYZHEM;Mn;0;NSM;;;;;N;;;;; +1CF1A;ZNAMENNY COMBINING MARK STRANNO MALO POVYSHE;Mn;0;NSM;;;;;N;;;;; +1CF1B;ZNAMENNY COMBINING MARK POVYSHE S KRYZHEM;Mn;0;NSM;;;;;N;;;;; +1CF1C;ZNAMENNY COMBINING MARK POVYSHE STRANNO;Mn;0;NSM;;;;;N;;;;; +1CF1D;ZNAMENNY COMBINING MARK VYSOKO S KRYZHEM;Mn;0;NSM;;;;;N;;;;; +1CF1E;ZNAMENNY COMBINING MARK MALO POVYSHE STRANNO;Mn;0;NSM;;;;;N;;;;; +1CF1F;ZNAMENNY COMBINING MARK GORAZDO VYSOKO;Mn;0;NSM;;;;;N;;;;; +1CF20;ZNAMENNY COMBINING MARK ZELO;Mn;0;NSM;;;;;N;;;;; +1CF21;ZNAMENNY COMBINING MARK ON;Mn;0;NSM;;;;;N;;;;; +1CF22;ZNAMENNY COMBINING MARK RAVNO;Mn;0;NSM;;;;;N;;;;; +1CF23;ZNAMENNY COMBINING MARK TIKHAYA;Mn;0;NSM;;;;;N;;;;; +1CF24;ZNAMENNY COMBINING MARK BORZAYA;Mn;0;NSM;;;;;N;;;;; +1CF25;ZNAMENNY COMBINING MARK UDARKA;Mn;0;NSM;;;;;N;;;;; +1CF26;ZNAMENNY COMBINING MARK PODVERTKA;Mn;0;NSM;;;;;N;;;;; +1CF27;ZNAMENNY COMBINING MARK LOMKA;Mn;0;NSM;;;;;N;;;;; +1CF28;ZNAMENNY COMBINING MARK KUPNAYA;Mn;0;NSM;;;;;N;;;;; +1CF29;ZNAMENNY COMBINING MARK KACHKA;Mn;0;NSM;;;;;N;;;;; +1CF2A;ZNAMENNY COMBINING MARK ZEVOK;Mn;0;NSM;;;;;N;;;;; +1CF2B;ZNAMENNY COMBINING MARK SKOBA;Mn;0;NSM;;;;;N;;;;; +1CF2C;ZNAMENNY COMBINING MARK RAZSEKA;Mn;0;NSM;;;;;N;;;;; +1CF2D;ZNAMENNY COMBINING MARK KRYZH ON LEFT;Mn;0;NSM;;;;;N;;;;; +1CF30;ZNAMENNY COMBINING TONAL RANGE MARK MRACHNO;Mn;0;NSM;;;;;N;;;;; +1CF31;ZNAMENNY COMBINING TONAL RANGE MARK SVETLO;Mn;0;NSM;;;;;N;;;;; +1CF32;ZNAMENNY COMBINING TONAL RANGE MARK TRESVETLO;Mn;0;NSM;;;;;N;;;;; +1CF33;ZNAMENNY COMBINING MARK ZADERZHKA;Mn;0;NSM;;;;;N;;;;; +1CF34;ZNAMENNY COMBINING MARK DEMESTVENNY ZADERZHKA;Mn;0;NSM;;;;;N;;;;; +1CF35;ZNAMENNY COMBINING MARK OTSECHKA;Mn;0;NSM;;;;;N;;;;; +1CF36;ZNAMENNY COMBINING MARK PODCHASHIE;Mn;0;NSM;;;;;N;;;;; +1CF37;ZNAMENNY COMBINING MARK PODCHASHIE WITH VERTICAL STROKE;Mn;0;NSM;;;;;N;;;;; +1CF38;ZNAMENNY COMBINING MARK CHASHKA;Mn;0;NSM;;;;;N;;;;; +1CF39;ZNAMENNY COMBINING MARK CHASHKA POLNAYA;Mn;0;NSM;;;;;N;;;;; +1CF3A;ZNAMENNY COMBINING MARK OBLACHKO;Mn;0;NSM;;;;;N;;;;; +1CF3B;ZNAMENNY COMBINING MARK SOROCHYA NOZHKA;Mn;0;NSM;;;;;N;;;;; +1CF3C;ZNAMENNY COMBINING MARK TOCHKA;Mn;0;NSM;;;;;N;;;;; +1CF3D;ZNAMENNY COMBINING MARK DVOETOCHIE;Mn;0;NSM;;;;;N;;;;; +1CF3E;ZNAMENNY COMBINING ATTACHING VERTICAL OMET;Mn;0;NSM;;;;;N;;;;; +1CF3F;ZNAMENNY COMBINING MARK CURVED OMET;Mn;0;NSM;;;;;N;;;;; +1CF40;ZNAMENNY COMBINING MARK KRYZH;Mn;0;NSM;;;;;N;;;;; +1CF41;ZNAMENNY COMBINING LOWER TONAL RANGE INDICATOR;Mn;0;NSM;;;;;N;;;;; +1CF42;ZNAMENNY PRIZNAK MODIFIER LEVEL-2;Mn;0;NSM;;;;;N;;;;; +1CF43;ZNAMENNY PRIZNAK MODIFIER LEVEL-3;Mn;0;NSM;;;;;N;;;;; +1CF44;ZNAMENNY PRIZNAK MODIFIER DIRECTION FLIP;Mn;0;NSM;;;;;N;;;;; +1CF45;ZNAMENNY PRIZNAK MODIFIER KRYZH;Mn;0;NSM;;;;;N;;;;; +1CF46;ZNAMENNY PRIZNAK MODIFIER ROG;Mn;0;NSM;;;;;N;;;;; +1CF50;ZNAMENNY NEUME KRYUK;So;0;L;;;;;N;;;;; +1CF51;ZNAMENNY NEUME KRYUK TIKHY;So;0;L;;;;;N;;;;; +1CF52;ZNAMENNY NEUME PARAKLIT;So;0;L;;;;;N;;;;; +1CF53;ZNAMENNY NEUME DVA V CHELNU;So;0;L;;;;;N;;;;; +1CF54;ZNAMENNY NEUME KLYUCH;So;0;L;;;;;N;;;;; +1CF55;ZNAMENNY NEUME ZANOZHEK;So;0;L;;;;;N;;;;; +1CF56;ZNAMENNY NEUME STOPITSA;So;0;L;;;;;N;;;;; +1CF57;ZNAMENNY NEUME STOPITSA S OCHKOM;So;0;L;;;;;N;;;;; +1CF58;ZNAMENNY NEUME PEREVODKA;So;0;L;;;;;N;;;;; +1CF59;ZNAMENNY NEUME PEREVODKA NEPOSTOYANNAYA;So;0;L;;;;;N;;;;; +1CF5A;ZNAMENNY NEUME STOPITSA WITH SOROCHYA NOZHKA;So;0;L;;;;;N;;;;; +1CF5B;ZNAMENNY NEUME CHELYUSTKA;So;0;L;;;;;N;;;;; +1CF5C;ZNAMENNY NEUME PALKA;So;0;L;;;;;N;;;;; +1CF5D;ZNAMENNY NEUME ZAPYATAYA;So;0;L;;;;;N;;;;; +1CF5E;ZNAMENNY NEUME GOLUBCHIK BORZY;So;0;L;;;;;N;;;;; +1CF5F;ZNAMENNY NEUME GOLUBCHIK TIKHY;So;0;L;;;;;N;;;;; +1CF60;ZNAMENNY NEUME GOLUBCHIK MRACHNY;So;0;L;;;;;N;;;;; +1CF61;ZNAMENNY NEUME GOLUBCHIK SVETLY;So;0;L;;;;;N;;;;; +1CF62;ZNAMENNY NEUME GOLUBCHIK TRESVETLY;So;0;L;;;;;N;;;;; +1CF63;ZNAMENNY NEUME VRAKHIYA PROSTAYA;So;0;L;;;;;N;;;;; +1CF64;ZNAMENNY NEUME VRAKHIYA MRACHNAYA;So;0;L;;;;;N;;;;; +1CF65;ZNAMENNY NEUME VRAKHIYA SVETLAYA;So;0;L;;;;;N;;;;; +1CF66;ZNAMENNY NEUME VRAKHIYA TRESVETLAYA;So;0;L;;;;;N;;;;; +1CF67;ZNAMENNY NEUME VRAKHIYA KLYUCHEVAYA PROSTAYA;So;0;L;;;;;N;;;;; +1CF68;ZNAMENNY NEUME VRAKHIYA KLYUCHEVAYA MRACHNAYA;So;0;L;;;;;N;;;;; +1CF69;ZNAMENNY NEUME VRAKHIYA KLYUCHEVAYA SVETLAYA;So;0;L;;;;;N;;;;; +1CF6A;ZNAMENNY NEUME VRAKHIYA KLYUCHEVAYA TRESVETLAYA;So;0;L;;;;;N;;;;; +1CF6B;ZNAMENNY NEUME DOUBLE ZAPYATAYA;So;0;L;;;;;N;;;;; +1CF6C;ZNAMENNY NEUME REVERSED CHELYUSTKA;So;0;L;;;;;N;;;;; +1CF6D;ZNAMENNY NEUME DERBITSA;So;0;L;;;;;N;;;;; +1CF6E;ZNAMENNY NEUME KHAMILO;So;0;L;;;;;N;;;;; +1CF6F;ZNAMENNY NEUME CHASHKA;So;0;L;;;;;N;;;;; +1CF70;ZNAMENNY NEUME PODCHASHIE;So;0;L;;;;;N;;;;; +1CF71;ZNAMENNY NEUME SKAMEYTSA MRACHNAYA;So;0;L;;;;;N;;;;; +1CF72;ZNAMENNY NEUME SKAMEYTSA SVETLAYA;So;0;L;;;;;N;;;;; +1CF73;ZNAMENNY NEUME SKAMEYTSA TRESVETLAYA;So;0;L;;;;;N;;;;; +1CF74;ZNAMENNY NEUME SKAMEYTSA TIKHAYA;So;0;L;;;;;N;;;;; +1CF75;ZNAMENNY NEUME DEMESTVENNY KLYUCH;So;0;L;;;;;N;;;;; +1CF76;ZNAMENNY NEUME SKAMEYTSA KLYUCHEVAYA SVETLAYA;So;0;L;;;;;N;;;;; +1CF77;ZNAMENNY NEUME SKAMEYTSA KLYUCHENEPOSTOYANNAYA;So;0;L;;;;;N;;;;; +1CF78;ZNAMENNY NEUME SKAMEYTSA KLYUCHEVAYA TIKHAYA;So;0;L;;;;;N;;;;; +1CF79;ZNAMENNY NEUME SKAMEYTSA DVOECHELNAYA PROSTAYA;So;0;L;;;;;N;;;;; +1CF7A;ZNAMENNY NEUME SKAMEYTSA DVOECHELNAYA SVETLAYA;So;0;L;;;;;N;;;;; +1CF7B;ZNAMENNY NEUME SKAMEYTSA DVOECHELNAYA NEPOSTOYANNAYA;So;0;L;;;;;N;;;;; +1CF7C;ZNAMENNY NEUME SKAMEYTSA DVOECHELNAYA KLYUCHEVAYA;So;0;L;;;;;N;;;;; +1CF7D;ZNAMENNY NEUME SLOZHITIE;So;0;L;;;;;N;;;;; +1CF7E;ZNAMENNY NEUME SLOZHITIE S ZAPYATOY;So;0;L;;;;;N;;;;; +1CF7F;ZNAMENNY NEUME SLOZHITIE ZAKRYTOE;So;0;L;;;;;N;;;;; +1CF80;ZNAMENNY NEUME SLOZHITIE S KRYZHEM;So;0;L;;;;;N;;;;; +1CF81;ZNAMENNY NEUME KRYZH;So;0;L;;;;;N;;;;; +1CF82;ZNAMENNY NEUME ROG;So;0;L;;;;;N;;;;; +1CF83;ZNAMENNY NEUME FITA;So;0;L;;;;;N;;;;; +1CF84;ZNAMENNY NEUME KOBYLA;So;0;L;;;;;N;;;;; +1CF85;ZNAMENNY NEUME ZMEYTSA;So;0;L;;;;;N;;;;; +1CF86;ZNAMENNY NEUME STATYA;So;0;L;;;;;N;;;;; +1CF87;ZNAMENNY NEUME STATYA S ZAPYATOY;So;0;L;;;;;N;;;;; +1CF88;ZNAMENNY NEUME STATYA S KRYZHEM;So;0;L;;;;;N;;;;; +1CF89;ZNAMENNY NEUME STATYA S ZAPYATOY I KRYZHEM;So;0;L;;;;;N;;;;; +1CF8A;ZNAMENNY NEUME STATYA S KRYZHEM I ZAPYATOY;So;0;L;;;;;N;;;;; +1CF8B;ZNAMENNY NEUME STATYA ZAKRYTAYA;So;0;L;;;;;N;;;;; +1CF8C;ZNAMENNY NEUME STATYA ZAKRYTAYA S ZAPYATOY;So;0;L;;;;;N;;;;; +1CF8D;ZNAMENNY NEUME STATYA S ROGOM;So;0;L;;;;;N;;;;; +1CF8E;ZNAMENNY NEUME STATYA S DVUMYA ZAPYATYMI;So;0;L;;;;;N;;;;; +1CF8F;ZNAMENNY NEUME STATYA S ZAPYATOY I PODCHASHIEM;So;0;L;;;;;N;;;;; +1CF90;ZNAMENNY NEUME POLKULIZMY;So;0;L;;;;;N;;;;; +1CF91;ZNAMENNY NEUME STATYA NEPOSTOYANNAYA;So;0;L;;;;;N;;;;; +1CF92;ZNAMENNY NEUME STRELA PROSTAYA;So;0;L;;;;;N;;;;; +1CF93;ZNAMENNY NEUME STRELA MRACHNOTIKHAYA;So;0;L;;;;;N;;;;; +1CF94;ZNAMENNY NEUME STRELA KRYZHEVAYA;So;0;L;;;;;N;;;;; +1CF95;ZNAMENNY NEUME STRELA POLUPOVODNAYA;So;0;L;;;;;N;;;;; +1CF96;ZNAMENNY NEUME STRELA POVODNAYA;So;0;L;;;;;N;;;;; +1CF97;ZNAMENNY NEUME STRELA NEPOSTOYANNAYA;So;0;L;;;;;N;;;;; +1CF98;ZNAMENNY NEUME STRELA KLYUCHEPOVODNAYA;So;0;L;;;;;N;;;;; +1CF99;ZNAMENNY NEUME STRELA KLYUCHENEPOSTOYANNAYA;So;0;L;;;;;N;;;;; +1CF9A;ZNAMENNY NEUME STRELA TIKHAYA PUTNAYA;So;0;L;;;;;N;;;;; +1CF9B;ZNAMENNY NEUME STRELA DVOECHELNAYA;So;0;L;;;;;N;;;;; +1CF9C;ZNAMENNY NEUME STRELA DVOECHELNOKRYZHEVAYA;So;0;L;;;;;N;;;;; +1CF9D;ZNAMENNY NEUME STRELA DVOECHELNOPOVODNAYA;So;0;L;;;;;N;;;;; +1CF9E;ZNAMENNY NEUME STRELA DVOECHELNAYA KLYUCHEVAYA;So;0;L;;;;;N;;;;; +1CF9F;ZNAMENNY NEUME STRELA DVOECHELNOPOVODNAYA KLYUCHEVAYA;So;0;L;;;;;N;;;;; +1CFA0;ZNAMENNY NEUME STRELA GROMNAYA WITH SINGLE ZAPYATAYA;So;0;L;;;;;N;;;;; +1CFA1;ZNAMENNY NEUME STRELA GROMOPOVODNAYA WITH SINGLE ZAPYATAYA;So;0;L;;;;;N;;;;; +1CFA2;ZNAMENNY NEUME STRELA GROMNAYA;So;0;L;;;;;N;;;;; +1CFA3;ZNAMENNY NEUME STRELA GROMOPOVODNAYA;So;0;L;;;;;N;;;;; +1CFA4;ZNAMENNY NEUME STRELA GROMOPOVODNAYA WITH DOUBLE ZAPYATAYA;So;0;L;;;;;N;;;;; +1CFA5;ZNAMENNY NEUME STRELA GROMOKRYZHEVAYA;So;0;L;;;;;N;;;;; +1CFA6;ZNAMENNY NEUME STRELA GROMOKRYZHEVAYA POVODNAYA;So;0;L;;;;;N;;;;; +1CFA7;ZNAMENNY NEUME MECHIK;So;0;L;;;;;N;;;;; +1CFA8;ZNAMENNY NEUME MECHIK POVODNY;So;0;L;;;;;N;;;;; +1CFA9;ZNAMENNY NEUME MECHIK KLYUCHEVOY;So;0;L;;;;;N;;;;; +1CFAA;ZNAMENNY NEUME MECHIK KLYUCHEPOVODNY;So;0;L;;;;;N;;;;; +1CFAB;ZNAMENNY NEUME MECHIK KLYUCHENEPOSTOYANNY;So;0;L;;;;;N;;;;; +1CFAC;ZNAMENNY NEUME STRELA TRYASOGLASNAYA;So;0;L;;;;;N;;;;; +1CFAD;ZNAMENNY NEUME STRELA TRYASOPOVODNAYA;So;0;L;;;;;N;;;;; +1CFAE;ZNAMENNY NEUME STRELA TRYASOSTRELNAYA;So;0;L;;;;;N;;;;; +1CFAF;ZNAMENNY NEUME OSOKA;So;0;L;;;;;N;;;;; +1CFB0;ZNAMENNY NEUME OSOKA SVETLAYA;So;0;L;;;;;N;;;;; +1CFB1;ZNAMENNY NEUME OSOKA TRESVETLAYA;So;0;L;;;;;N;;;;; +1CFB2;ZNAMENNY NEUME OSOKA KRYUKOVAYA SVETLAYA;So;0;L;;;;;N;;;;; +1CFB3;ZNAMENNY NEUME OSOKA KLYUCHEVAYA SVETLAYA;So;0;L;;;;;N;;;;; +1CFB4;ZNAMENNY NEUME OSOKA KLYUCHEVAYA NEPOSTOYANNAYA;So;0;L;;;;;N;;;;; +1CFB5;ZNAMENNY NEUME STRELA KRYUKOVAYA;So;0;L;;;;;N;;;;; +1CFB6;ZNAMENNY NEUME STRELA KRYUKOVAYA POVODNAYA;So;0;L;;;;;N;;;;; +1CFB7;ZNAMENNY NEUME STRELA KRYUKOVAYA GROMNAYA WITH SINGLE ZAPYATAYA;So;0;L;;;;;N;;;;; +1CFB8;ZNAMENNY NEUME STRELA KRYUKOVAYA GROMOPOVODNAYA WITH SINGLE ZAPYATAYA;So;0;L;;;;;N;;;;; +1CFB9;ZNAMENNY NEUME STRELA KRYUKOVAYA GROMNAYA;So;0;L;;;;;N;;;;; +1CFBA;ZNAMENNY NEUME STRELA KRYUKOVAYA GROMOPOVODNAYA;So;0;L;;;;;N;;;;; +1CFBB;ZNAMENNY NEUME STRELA KRYUKOVAYA GROMOPOVODNAYA WITH DOUBLE ZAPYATAYA;So;0;L;;;;;N;;;;; +1CFBC;ZNAMENNY NEUME STRELA KRYUKOVAYA GROMOKRYZHEVAYA;So;0;L;;;;;N;;;;; +1CFBD;ZNAMENNY NEUME STRELA KRYUKOVAYA GROMOKRYZHEVAYA POVODNAYA;So;0;L;;;;;N;;;;; +1CFBE;ZNAMENNY NEUME STRELA KRYUKOVAYA TRYASKA;So;0;L;;;;;N;;;;; +1CFBF;ZNAMENNY NEUME KUFISMA;So;0;L;;;;;N;;;;; +1CFC0;ZNAMENNY NEUME OBLAKO;So;0;L;;;;;N;;;;; +1CFC1;ZNAMENNY NEUME DUDA;So;0;L;;;;;N;;;;; +1CFC2;ZNAMENNY NEUME NEMKA;So;0;L;;;;;N;;;;; +1CFC3;ZNAMENNY NEUME PAUK;So;0;L;;;;;N;;;;; 1D000;BYZANTINE MUSICAL SYMBOL PSILI;So;0;L;;;;;N;;;;; 1D001;BYZANTINE MUSICAL SYMBOL DASEIA;So;0;L;;;;;N;;;;; 1D002;BYZANTINE MUSICAL SYMBOL PERISPOMENI;So;0;L;;;;;N;;;;; @@ -27801,6 +28501,8 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1D1E6;MUSICAL SYMBOL KIEVAN EIGHTH NOTE STEM DOWN;So;0;L;;;;;N;;;;; 1D1E7;MUSICAL SYMBOL KIEVAN EIGHTH NOTE STEM UP;So;0;L;;;;;N;;;;; 1D1E8;MUSICAL SYMBOL KIEVAN FLAT SIGN;So;0;L;;;;;N;;;;; +1D1E9;MUSICAL SYMBOL SORI;So;0;ON;;;;;N;;;;; +1D1EA;MUSICAL SYMBOL KORON;So;0;ON;;;;;N;;;;; 1D200;GREEK VOCAL NOTATION SYMBOL-1;So;0;ON;;;;;N;;;;; 1D201;GREEK VOCAL NOTATION SYMBOL-2;So;0;ON;;;;;N;;;;; 1D202;GREEK VOCAL NOTATION SYMBOL-3;So;0;ON;;;;;N;;;;; @@ -29671,6 +30373,37 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1DAAD;SIGNWRITING ROTATION MODIFIER-14;Mn;0;NSM;;;;;N;;;;; 1DAAE;SIGNWRITING ROTATION MODIFIER-15;Mn;0;NSM;;;;;N;;;;; 1DAAF;SIGNWRITING ROTATION MODIFIER-16;Mn;0;NSM;;;;;N;;;;; +1DF00;LATIN SMALL LETTER FENG DIGRAPH WITH TRILL;Ll;0;L;;;;;N;;;;; +1DF01;LATIN SMALL LETTER REVERSED SCRIPT G;Ll;0;L;;;;;N;;;;; +1DF02;LATIN LETTER SMALL CAPITAL TURNED G;Ll;0;L;;;;;N;;;;; +1DF03;LATIN SMALL LETTER REVERSED K;Ll;0;L;;;;;N;;;;; +1DF04;LATIN LETTER SMALL CAPITAL L WITH BELT;Ll;0;L;;;;;N;;;;; +1DF05;LATIN SMALL LETTER LEZH WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;; +1DF06;LATIN SMALL LETTER TURNED Y WITH BELT;Ll;0;L;;;;;N;;;;; +1DF07;LATIN SMALL LETTER REVERSED ENG;Ll;0;L;;;;;N;;;;; +1DF08;LATIN SMALL LETTER TURNED R WITH LONG LEG AND RETROFLEX HOOK;Ll;0;L;;;;;N;;;;; +1DF09;LATIN SMALL LETTER T WITH HOOK AND RETROFLEX HOOK;Ll;0;L;;;;;N;;;;; +1DF0A;LATIN LETTER RETROFLEX CLICK WITH RETROFLEX HOOK;Lo;0;L;;;;;N;;;;; +1DF0B;LATIN SMALL LETTER ESH WITH DOUBLE BAR;Ll;0;L;;;;;N;;;;; +1DF0C;LATIN SMALL LETTER ESH WITH DOUBLE BAR AND CURL;Ll;0;L;;;;;N;;;;; +1DF0D;LATIN SMALL LETTER TURNED T WITH CURL;Ll;0;L;;;;;N;;;;; +1DF0E;LATIN LETTER INVERTED GLOTTAL STOP WITH CURL;Ll;0;L;;;;;N;;;;; +1DF0F;LATIN LETTER STRETCHED C WITH CURL;Ll;0;L;;;;;N;;;;; +1DF10;LATIN LETTER SMALL CAPITAL TURNED K;Ll;0;L;;;;;N;;;;; +1DF11;LATIN SMALL LETTER L WITH FISHHOOK;Ll;0;L;;;;;N;;;;; +1DF12;LATIN SMALL LETTER DEZH DIGRAPH WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;; +1DF13;LATIN SMALL LETTER L WITH BELT AND PALATAL HOOK;Ll;0;L;;;;;N;;;;; +1DF14;LATIN SMALL LETTER ENG WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;; +1DF15;LATIN SMALL LETTER TURNED R WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;; +1DF16;LATIN SMALL LETTER R WITH FISHHOOK AND PALATAL HOOK;Ll;0;L;;;;;N;;;;; +1DF17;LATIN SMALL LETTER TESH DIGRAPH WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;; +1DF18;LATIN SMALL LETTER EZH WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;; +1DF19;LATIN SMALL LETTER DEZH DIGRAPH WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;; +1DF1A;LATIN SMALL LETTER I WITH STROKE AND RETROFLEX HOOK;Ll;0;L;;;;;N;;;;; +1DF1B;LATIN SMALL LETTER O WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;; +1DF1C;LATIN SMALL LETTER TESH DIGRAPH WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;; +1DF1D;LATIN SMALL LETTER C WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;; +1DF1E;LATIN SMALL LETTER S WITH CURL;Ll;0;L;;;;;N;;;;; 1E000;COMBINING GLAGOLITIC LETTER AZU;Mn;230;NSM;;;;;N;;;;; 1E001;COMBINING GLAGOLITIC LETTER BUKY;Mn;230;NSM;;;;;N;;;;; 1E002;COMBINING GLAGOLITIC LETTER VEDE;Mn;230;NSM;;;;;N;;;;; @@ -29780,6 +30513,37 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1E149;NYIAKENG PUACHUE HMONG DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; 1E14E;NYIAKENG PUACHUE HMONG LOGOGRAM NYAJ;Lo;0;L;;;;;N;;;;; 1E14F;NYIAKENG PUACHUE HMONG CIRCLED CA;So;0;L;;;;;N;;;;; +1E290;TOTO LETTER PA;Lo;0;L;;;;;N;;;;; +1E291;TOTO LETTER BA;Lo;0;L;;;;;N;;;;; +1E292;TOTO LETTER TA;Lo;0;L;;;;;N;;;;; +1E293;TOTO LETTER DA;Lo;0;L;;;;;N;;;;; +1E294;TOTO LETTER KA;Lo;0;L;;;;;N;;;;; +1E295;TOTO LETTER GA;Lo;0;L;;;;;N;;;;; +1E296;TOTO LETTER MA;Lo;0;L;;;;;N;;;;; +1E297;TOTO LETTER NA;Lo;0;L;;;;;N;;;;; +1E298;TOTO LETTER NGA;Lo;0;L;;;;;N;;;;; +1E299;TOTO LETTER SA;Lo;0;L;;;;;N;;;;; +1E29A;TOTO LETTER CHA;Lo;0;L;;;;;N;;;;; +1E29B;TOTO LETTER YA;Lo;0;L;;;;;N;;;;; +1E29C;TOTO LETTER WA;Lo;0;L;;;;;N;;;;; +1E29D;TOTO LETTER JA;Lo;0;L;;;;;N;;;;; +1E29E;TOTO LETTER HA;Lo;0;L;;;;;N;;;;; +1E29F;TOTO LETTER RA;Lo;0;L;;;;;N;;;;; +1E2A0;TOTO LETTER LA;Lo;0;L;;;;;N;;;;; +1E2A1;TOTO LETTER I;Lo;0;L;;;;;N;;;;; +1E2A2;TOTO LETTER BREATHY I;Lo;0;L;;;;;N;;;;; +1E2A3;TOTO LETTER IU;Lo;0;L;;;;;N;;;;; +1E2A4;TOTO LETTER BREATHY IU;Lo;0;L;;;;;N;;;;; +1E2A5;TOTO LETTER U;Lo;0;L;;;;;N;;;;; +1E2A6;TOTO LETTER E;Lo;0;L;;;;;N;;;;; +1E2A7;TOTO LETTER BREATHY E;Lo;0;L;;;;;N;;;;; +1E2A8;TOTO LETTER EO;Lo;0;L;;;;;N;;;;; +1E2A9;TOTO LETTER BREATHY EO;Lo;0;L;;;;;N;;;;; +1E2AA;TOTO LETTER O;Lo;0;L;;;;;N;;;;; +1E2AB;TOTO LETTER AE;Lo;0;L;;;;;N;;;;; +1E2AC;TOTO LETTER BREATHY AE;Lo;0;L;;;;;N;;;;; +1E2AD;TOTO LETTER A;Lo;0;L;;;;;N;;;;; +1E2AE;TOTO SIGN RISING TONE;Mn;230;NSM;;;;;N;;;;; 1E2C0;WANCHO LETTER AA;Lo;0;L;;;;;N;;;;; 1E2C1;WANCHO LETTER A;Lo;0;L;;;;;N;;;;; 1E2C2;WANCHO LETTER BA;Lo;0;L;;;;;N;;;;; @@ -29839,6 +30603,34 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1E2F8;WANCHO DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; 1E2F9;WANCHO DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; 1E2FF;WANCHO NGUN SIGN;Sc;0;ET;;;;;N;;;;; +1E7E0;ETHIOPIC SYLLABLE HHYA;Lo;0;L;;;;;N;;;;; +1E7E1;ETHIOPIC SYLLABLE HHYU;Lo;0;L;;;;;N;;;;; +1E7E2;ETHIOPIC SYLLABLE HHYI;Lo;0;L;;;;;N;;;;; +1E7E3;ETHIOPIC SYLLABLE HHYAA;Lo;0;L;;;;;N;;;;; +1E7E4;ETHIOPIC SYLLABLE HHYEE;Lo;0;L;;;;;N;;;;; +1E7E5;ETHIOPIC SYLLABLE HHYE;Lo;0;L;;;;;N;;;;; +1E7E6;ETHIOPIC SYLLABLE HHYO;Lo;0;L;;;;;N;;;;; +1E7E8;ETHIOPIC SYLLABLE GURAGE HHWA;Lo;0;L;;;;;N;;;;; +1E7E9;ETHIOPIC SYLLABLE HHWI;Lo;0;L;;;;;N;;;;; +1E7EA;ETHIOPIC SYLLABLE HHWEE;Lo;0;L;;;;;N;;;;; +1E7EB;ETHIOPIC SYLLABLE HHWE;Lo;0;L;;;;;N;;;;; +1E7ED;ETHIOPIC SYLLABLE GURAGE MWI;Lo;0;L;;;;;N;;;;; +1E7EE;ETHIOPIC SYLLABLE GURAGE MWEE;Lo;0;L;;;;;N;;;;; +1E7F0;ETHIOPIC SYLLABLE GURAGE QWI;Lo;0;L;;;;;N;;;;; +1E7F1;ETHIOPIC SYLLABLE GURAGE QWEE;Lo;0;L;;;;;N;;;;; +1E7F2;ETHIOPIC SYLLABLE GURAGE QWE;Lo;0;L;;;;;N;;;;; +1E7F3;ETHIOPIC SYLLABLE GURAGE BWI;Lo;0;L;;;;;N;;;;; +1E7F4;ETHIOPIC SYLLABLE GURAGE BWEE;Lo;0;L;;;;;N;;;;; +1E7F5;ETHIOPIC SYLLABLE GURAGE KWI;Lo;0;L;;;;;N;;;;; +1E7F6;ETHIOPIC SYLLABLE GURAGE KWEE;Lo;0;L;;;;;N;;;;; +1E7F7;ETHIOPIC SYLLABLE GURAGE KWE;Lo;0;L;;;;;N;;;;; +1E7F8;ETHIOPIC SYLLABLE GURAGE GWI;Lo;0;L;;;;;N;;;;; +1E7F9;ETHIOPIC SYLLABLE GURAGE GWEE;Lo;0;L;;;;;N;;;;; +1E7FA;ETHIOPIC SYLLABLE GURAGE GWE;Lo;0;L;;;;;N;;;;; +1E7FB;ETHIOPIC SYLLABLE GURAGE FWI;Lo;0;L;;;;;N;;;;; +1E7FC;ETHIOPIC SYLLABLE GURAGE FWEE;Lo;0;L;;;;;N;;;;; +1E7FD;ETHIOPIC SYLLABLE GURAGE PWI;Lo;0;L;;;;;N;;;;; +1E7FE;ETHIOPIC SYLLABLE GURAGE PWEE;Lo;0;L;;;;;N;;;;; 1E800;MENDE KIKAKUI SYLLABLE M001 KI;Lo;0;R;;;;;N;;;;; 1E801;MENDE KIKAKUI SYLLABLE M002 KA;Lo;0;R;;;;;N;;;;; 1E802;MENDE KIKAKUI SYLLABLE M003 KU;Lo;0;R;;;;;N;;;;; @@ -31886,6 +32678,9 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1F6D5;HINDU TEMPLE;So;0;ON;;;;;N;;;;; 1F6D6;HUT;So;0;ON;;;;;N;;;;; 1F6D7;ELEVATOR;So;0;ON;;;;;N;;;;; +1F6DD;PLAYGROUND SLIDE;So;0;ON;;;;;N;;;;; +1F6DE;WHEEL;So;0;ON;;;;;N;;;;; +1F6DF;RING BUOY;So;0;ON;;;;;N;;;;; 1F6E0;HAMMER AND WRENCH;So;0;ON;;;;;N;;;;; 1F6E1;SHIELD;So;0;ON;;;;;N;;;;; 1F6E2;OIL DRUM;So;0;ON;;;;;N;;;;; @@ -32129,6 +32924,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1F7E9;LARGE GREEN SQUARE;So;0;ON;;;;;N;;;;; 1F7EA;LARGE PURPLE SQUARE;So;0;ON;;;;;N;;;;; 1F7EB;LARGE BROWN SQUARE;So;0;ON;;;;;N;;;;; +1F7F0;HEAVY EQUALS SIGN;So;0;ON;;;;;N;;;;; 1F800;LEFTWARDS ARROW WITH SMALL TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;; 1F801;UPWARDS ARROW WITH SMALL TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;; 1F802;RIGHTWARDS ARROW WITH SMALL TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;; @@ -32400,6 +33196,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1F976;FREEZING FACE;So;0;ON;;;;;N;;;;; 1F977;NINJA;So;0;ON;;;;;N;;;;; 1F978;DISGUISED FACE;So;0;ON;;;;;N;;;;; +1F979;FACE HOLDING BACK TEARS;So;0;ON;;;;;N;;;;; 1F97A;FACE WITH PLEADING EYES;So;0;ON;;;;;N;;;;; 1F97B;SARI;So;0;ON;;;;;N;;;;; 1F97C;LAB COAT;So;0;ON;;;;;N;;;;; @@ -32482,6 +33279,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1F9C9;MATE DRINK;So;0;ON;;;;;N;;;;; 1F9CA;ICE CUBE;So;0;ON;;;;;N;;;;; 1F9CB;BUBBLE TEA;So;0;ON;;;;;N;;;;; +1F9CC;TROLL;So;0;ON;;;;;N;;;;; 1F9CD;STANDING PERSON;So;0;ON;;;;;N;;;;; 1F9CE;KNEELING PERSON;So;0;ON;;;;;N;;;;; 1F9CF;DEAF PERSON;So;0;ON;;;;;N;;;;; @@ -32639,6 +33437,8 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1FA78;DROP OF BLOOD;So;0;ON;;;;;N;;;;; 1FA79;ADHESIVE BANDAGE;So;0;ON;;;;;N;;;;; 1FA7A;STETHOSCOPE;So;0;ON;;;;;N;;;;; +1FA7B;X-RAY;So;0;ON;;;;;N;;;;; +1FA7C;CRUTCH;So;0;ON;;;;;N;;;;; 1FA80;YO-YO;So;0;ON;;;;;N;;;;; 1FA81;KITE;So;0;ON;;;;;N;;;;; 1FA82;PARACHUTE;So;0;ON;;;;;N;;;;; @@ -32671,6 +33471,10 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1FAA6;HEADSTONE;So;0;ON;;;;;N;;;;; 1FAA7;PLACARD;So;0;ON;;;;;N;;;;; 1FAA8;ROCK;So;0;ON;;;;;N;;;;; +1FAA9;MIRROR BALL;So;0;ON;;;;;N;;;;; +1FAAA;IDENTIFICATION CARD;So;0;ON;;;;;N;;;;; +1FAAB;LOW BATTERY;So;0;ON;;;;;N;;;;; +1FAAC;HAMSA;So;0;ON;;;;;N;;;;; 1FAB0;FLY;So;0;ON;;;;;N;;;;; 1FAB1;WORM;So;0;ON;;;;;N;;;;; 1FAB2;BEETLE;So;0;ON;;;;;N;;;;; @@ -32678,9 +33482,16 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1FAB4;POTTED PLANT;So;0;ON;;;;;N;;;;; 1FAB5;WOOD;So;0;ON;;;;;N;;;;; 1FAB6;FEATHER;So;0;ON;;;;;N;;;;; +1FAB7;LOTUS;So;0;ON;;;;;N;;;;; +1FAB8;CORAL;So;0;ON;;;;;N;;;;; +1FAB9;EMPTY NEST;So;0;ON;;;;;N;;;;; +1FABA;NEST WITH EGGS;So;0;ON;;;;;N;;;;; 1FAC0;ANATOMICAL HEART;So;0;ON;;;;;N;;;;; 1FAC1;LUNGS;So;0;ON;;;;;N;;;;; 1FAC2;PEOPLE HUGGING;So;0;ON;;;;;N;;;;; +1FAC3;PREGNANT MAN;So;0;ON;;;;;N;;;;; +1FAC4;PREGNANT PERSON;So;0;ON;;;;;N;;;;; +1FAC5;PERSON WITH CROWN;So;0;ON;;;;;N;;;;; 1FAD0;BLUEBERRIES;So;0;ON;;;;;N;;;;; 1FAD1;BELL PEPPER;So;0;ON;;;;;N;;;;; 1FAD2;OLIVE;So;0;ON;;;;;N;;;;; @@ -32688,6 +33499,24 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1FAD4;TAMALE;So;0;ON;;;;;N;;;;; 1FAD5;FONDUE;So;0;ON;;;;;N;;;;; 1FAD6;TEAPOT;So;0;ON;;;;;N;;;;; +1FAD7;POURING LIQUID;So;0;ON;;;;;N;;;;; +1FAD8;BEANS;So;0;ON;;;;;N;;;;; +1FAD9;JAR;So;0;ON;;;;;N;;;;; +1FAE0;MELTING FACE;So;0;ON;;;;;N;;;;; +1FAE1;SALUTING FACE;So;0;ON;;;;;N;;;;; +1FAE2;FACE WITH OPEN EYES AND HAND OVER MOUTH;So;0;ON;;;;;N;;;;; +1FAE3;FACE WITH PEEKING EYE;So;0;ON;;;;;N;;;;; +1FAE4;FACE WITH DIAGONAL MOUTH;So;0;ON;;;;;N;;;;; +1FAE5;DOTTED LINE FACE;So;0;ON;;;;;N;;;;; +1FAE6;BITING LIP;So;0;ON;;;;;N;;;;; +1FAE7;BUBBLES;So;0;ON;;;;;N;;;;; +1FAF0;HAND WITH INDEX FINGER AND THUMB CROSSED;So;0;ON;;;;;N;;;;; +1FAF1;RIGHTWARDS HAND;So;0;ON;;;;;N;;;;; +1FAF2;LEFTWARDS HAND;So;0;ON;;;;;N;;;;; +1FAF3;PALM DOWN HAND;So;0;ON;;;;;N;;;;; +1FAF4;PALM UP HAND;So;0;ON;;;;;N;;;;; +1FAF5;INDEX POINTING AT THE VIEWER;So;0;ON;;;;;N;;;;; +1FAF6;HEART HANDS;So;0;ON;;;;;N;;;;; 1FB00;BLOCK SEXTANT-1;So;0;ON;;;;;N;;;;; 1FB01;BLOCK SEXTANT-2;So;0;ON;;;;;N;;;;; 1FB02;BLOCK SEXTANT-12;So;0;ON;;;;;N;;;;; @@ -32901,9 +33730,9 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1FBF8;SEGMENTED DIGIT EIGHT;Nd;0;EN; 0038;8;8;8;N;;;;; 1FBF9;SEGMENTED DIGIT NINE;Nd;0;EN; 0039;9;9;9;N;;;;; 20000;;Lo;0;L;;;;;N;;;;; -2A6DD;;Lo;0;L;;;;;N;;;;; +2A6DF;;Lo;0;L;;;;;N;;;;; 2A700;;Lo;0;L;;;;;N;;;;; -2B734;;Lo;0;L;;;;;N;;;;; +2B738;;Lo;0;L;;;;;N;;;;; 2B740;;Lo;0;L;;;;;N;;;;; 2B81D;;Lo;0;L;;;;;N;;;;; 2B820;;Lo;0;L;;;;;N;;;;; diff --git a/make/data/unicodedata/VERSION b/make/data/unicodedata/VERSION deleted file mode 100644 index 02161ca86e5e8ecad11b9b69fbb8b4564dae144f..0000000000000000000000000000000000000000 --- a/make/data/unicodedata/VERSION +++ /dev/null @@ -1 +0,0 @@ -13.0.0 diff --git a/make/data/unicodedata/auxiliary/GraphemeBreakProperty.txt b/make/data/unicodedata/auxiliary/GraphemeBreakProperty.txt index 504c708280200f701fe613035b2b42651f569362..15de396fdc12d20e8334559ce2550626badab6c8 100644 --- a/make/data/unicodedata/auxiliary/GraphemeBreakProperty.txt +++ b/make/data/unicodedata/auxiliary/GraphemeBreakProperty.txt @@ -1,6 +1,6 @@ -# GraphemeBreakProperty-13.0.0.txt -# Date: 2019-10-21, 14:30:35 GMT -# Copyright (c) 2019 Unicode, Inc. +# GraphemeBreakProperty-14.0.0.txt +# Date: 2021-08-12, 23:13:02 GMT +# Copyright (c) 2021 Unicode, Inc. # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries. # For terms of use, see http://www.unicode.org/terms_of_use.html # @@ -21,6 +21,7 @@ 0600..0605 ; Prepend # Cf [6] ARABIC NUMBER SIGN..ARABIC NUMBER MARK ABOVE 06DD ; Prepend # Cf ARABIC END OF AYAH 070F ; Prepend # Cf SYRIAC ABBREVIATION MARK +0890..0891 ; Prepend # Cf [2] ARABIC POUND MARK ABOVE..ARABIC PIASTRE MARK ABOVE 08E2 ; Prepend # Cf ARABIC DISPUTED END OF AYAH 0D4E ; Prepend # Lo MALAYALAM LETTER DOT REPH 110BD ; Prepend # Cf KAITHI NUMBER SIGN @@ -32,7 +33,7 @@ 11A84..11A89 ; Prepend # Lo [6] SOYOMBO SIGN JIHVAMULIYA..SOYOMBO CLUSTER-INITIAL LETTER SA 11D46 ; Prepend # Lo MASARAM GONDI REPHA -# Total code points: 24 +# Total code points: 26 # ================================================ @@ -104,7 +105,8 @@ E01F0..E0FFF ; Control # Cn [3600] .. 0825..0827 ; Extend # Mn [3] SAMARITAN VOWEL SIGN SHORT A..SAMARITAN VOWEL SIGN U 0829..082D ; Extend # Mn [5] SAMARITAN VOWEL SIGN LONG I..SAMARITAN MARK NEQUDAA 0859..085B ; Extend # Mn [3] MANDAIC AFFRICATION MARK..MANDAIC GEMINATION MARK -08D3..08E1 ; Extend # Mn [15] ARABIC SMALL LOW WAW..ARABIC SMALL HIGH SIGN SAFHA +0898..089F ; Extend # Mn [8] ARABIC SMALL HIGH WORD AL-JUZ..ARABIC HALF MADDA OVER MADDA +08CA..08E1 ; Extend # Mn [24] ARABIC SMALL HIGH FARSI YEH..ARABIC SMALL HIGH SIGN SAFHA 08E3..0902 ; Extend # Mn [32] ARABIC TURNED DAMMA BELOW..DEVANAGARI SIGN ANUSVARA 093A ; Extend # Mn DEVANAGARI VOWEL SIGN OE 093C ; Extend # Mn DEVANAGARI SIGN NUKTA @@ -151,6 +153,7 @@ E01F0..E0FFF ; Control # Cn [3600] .. 0BD7 ; Extend # Mc TAMIL AU LENGTH MARK 0C00 ; Extend # Mn TELUGU SIGN COMBINING CANDRABINDU ABOVE 0C04 ; Extend # Mn TELUGU SIGN COMBINING ANUSVARA ABOVE +0C3C ; Extend # Mn TELUGU SIGN NUKTA 0C3E..0C40 ; Extend # Mn [3] TELUGU VOWEL SIGN AA..TELUGU VOWEL SIGN II 0C46..0C48 ; Extend # Mn [3] TELUGU VOWEL SIGN E..TELUGU VOWEL SIGN AI 0C4A..0C4D ; Extend # Mn [4] TELUGU VOWEL SIGN O..TELUGU SIGN VIRAMA @@ -206,7 +209,7 @@ E01F0..E0FFF ; Control # Cn [3600] .. 109D ; Extend # Mn MYANMAR VOWEL SIGN AITON AI 135D..135F ; Extend # Mn [3] ETHIOPIC COMBINING GEMINATION AND VOWEL LENGTH MARK..ETHIOPIC COMBINING GEMINATION MARK 1712..1714 ; Extend # Mn [3] TAGALOG VOWEL SIGN I..TAGALOG SIGN VIRAMA -1732..1734 ; Extend # Mn [3] HANUNOO VOWEL SIGN I..HANUNOO SIGN PAMUDPOD +1732..1733 ; Extend # Mn [2] HANUNOO VOWEL SIGN I..HANUNOO VOWEL SIGN U 1752..1753 ; Extend # Mn [2] BUHID VOWEL SIGN I..BUHID VOWEL SIGN U 1772..1773 ; Extend # Mn [2] TAGBANWA VOWEL SIGN I..TAGBANWA VOWEL SIGN U 17B4..17B5 ; Extend # Mn [2] KHMER VOWEL INHERENT AQ..KHMER VOWEL INHERENT AA @@ -215,6 +218,7 @@ E01F0..E0FFF ; Control # Cn [3600] .. 17C9..17D3 ; Extend # Mn [11] KHMER SIGN MUUSIKATOAN..KHMER SIGN BATHAMASAT 17DD ; Extend # Mn KHMER SIGN ATTHACAN 180B..180D ; Extend # Mn [3] MONGOLIAN FREE VARIATION SELECTOR ONE..MONGOLIAN FREE VARIATION SELECTOR THREE +180F ; Extend # Mn MONGOLIAN FREE VARIATION SELECTOR FOUR 1885..1886 ; Extend # Mn [2] MONGOLIAN LETTER ALI GALI BALUDA..MONGOLIAN LETTER ALI GALI THREE BALUDA 18A9 ; Extend # Mn MONGOLIAN LETTER ALI GALI DAGALGA 1920..1922 ; Extend # Mn [3] LIMBU VOWEL SIGN A..LIMBU VOWEL SIGN U @@ -232,7 +236,7 @@ E01F0..E0FFF ; Control # Cn [3600] .. 1A7F ; Extend # Mn TAI THAM COMBINING CRYPTOGRAMMIC DOT 1AB0..1ABD ; Extend # Mn [14] COMBINING DOUBLED CIRCUMFLEX ACCENT..COMBINING PARENTHESES BELOW 1ABE ; Extend # Me COMBINING PARENTHESES OVERLAY -1ABF..1AC0 ; Extend # Mn [2] COMBINING LATIN SMALL LETTER W BELOW..COMBINING LATIN SMALL LETTER TURNED W BELOW +1ABF..1ACE ; Extend # Mn [16] COMBINING LATIN SMALL LETTER W BELOW..COMBINING LATIN SMALL LETTER INSULAR T 1B00..1B03 ; Extend # Mn [4] BALINESE SIGN ULU RICEM..BALINESE SIGN SURANG 1B34 ; Extend # Mn BALINESE SIGN REREKAN 1B35 ; Extend # Mc BALINESE VOWEL SIGN TEDUNG @@ -256,8 +260,7 @@ E01F0..E0FFF ; Control # Cn [3600] .. 1CED ; Extend # Mn VEDIC SIGN TIRYAK 1CF4 ; Extend # Mn VEDIC TONE CANDRA ABOVE 1CF8..1CF9 ; Extend # Mn [2] VEDIC TONE RING ABOVE..VEDIC TONE DOUBLE RING ABOVE -1DC0..1DF9 ; Extend # Mn [58] COMBINING DOTTED GRAVE ACCENT..COMBINING WIDE INVERTED BRIDGE BELOW -1DFB..1DFF ; Extend # Mn [5] COMBINING DELETION MARK..COMBINING RIGHT ARROWHEAD AND DOWN ARROWHEAD BELOW +1DC0..1DFF ; Extend # Mn [64] COMBINING DOTTED GRAVE ACCENT..COMBINING RIGHT ARROWHEAD AND DOWN ARROWHEAD BELOW 200C ; Extend # Cf ZERO WIDTH NON-JOINER 20D0..20DC ; Extend # Mn [13] COMBINING LEFT HARPOON ABOVE..COMBINING FOUR DOTS ABOVE 20DD..20E0 ; Extend # Me [4] COMBINING ENCLOSING CIRCLE..COMBINING ENCLOSING CIRCLE BACKSLASH @@ -322,11 +325,15 @@ FF9E..FF9F ; Extend # Lm [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HALFWIDT 10D24..10D27 ; Extend # Mn [4] HANIFI ROHINGYA SIGN HARBAHAY..HANIFI ROHINGYA SIGN TASSI 10EAB..10EAC ; Extend # Mn [2] YEZIDI COMBINING HAMZA MARK..YEZIDI COMBINING MADDA MARK 10F46..10F50 ; Extend # Mn [11] SOGDIAN COMBINING DOT BELOW..SOGDIAN COMBINING STROKE BELOW +10F82..10F85 ; Extend # Mn [4] OLD UYGHUR COMBINING DOT ABOVE..OLD UYGHUR COMBINING TWO DOTS BELOW 11001 ; Extend # Mn BRAHMI SIGN ANUSVARA 11038..11046 ; Extend # Mn [15] BRAHMI VOWEL SIGN AA..BRAHMI VIRAMA +11070 ; Extend # Mn BRAHMI SIGN OLD TAMIL VIRAMA +11073..11074 ; Extend # Mn [2] BRAHMI VOWEL SIGN OLD TAMIL SHORT E..BRAHMI VOWEL SIGN OLD TAMIL SHORT O 1107F..11081 ; Extend # Mn [3] BRAHMI NUMBER JOINER..KAITHI SIGN ANUSVARA 110B3..110B6 ; Extend # Mn [4] KAITHI VOWEL SIGN U..KAITHI VOWEL SIGN AI 110B9..110BA ; Extend # Mn [2] KAITHI SIGN VIRAMA..KAITHI SIGN NUKTA +110C2 ; Extend # Mn KAITHI VOWEL SIGN VOCALIC R 11100..11102 ; Extend # Mn [3] CHAKMA SIGN CANDRABINDU..CHAKMA SIGN VISARGA 11127..1112B ; Extend # Mn [5] CHAKMA VOWEL SIGN A..CHAKMA VOWEL SIGN UU 1112D..11134 ; Extend # Mn [8] CHAKMA VOWEL SIGN AI..CHAKMA MAAYYAA @@ -412,6 +419,8 @@ FF9E..FF9F ; Extend # Lm [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HALFWIDT 16F8F..16F92 ; Extend # Mn [4] MIAO TONE RIGHT..MIAO TONE BELOW 16FE4 ; Extend # Mn KHITAN SMALL SCRIPT FILLER 1BC9D..1BC9E ; Extend # Mn [2] DUPLOYAN THICK LETTER SELECTOR..DUPLOYAN DOUBLE MARK +1CF00..1CF2D ; Extend # Mn [46] ZNAMENNY COMBINING MARK GORAZDO NIZKO S KRYZHEM ON LEFT..ZNAMENNY COMBINING MARK KRYZH ON LEFT +1CF30..1CF46 ; Extend # Mn [23] ZNAMENNY COMBINING TONAL RANGE MARK MRACHNO..ZNAMENNY PRIZNAK MODIFIER ROG 1D165 ; Extend # Mc MUSICAL SYMBOL COMBINING STEM 1D167..1D169 ; Extend # Mn [3] MUSICAL SYMBOL COMBINING TREMOLO-1..MUSICAL SYMBOL COMBINING TREMOLO-3 1D16E..1D172 ; Extend # Mc [5] MUSICAL SYMBOL COMBINING FLAG-1..MUSICAL SYMBOL COMBINING FLAG-5 @@ -431,6 +440,7 @@ FF9E..FF9F ; Extend # Lm [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HALFWIDT 1E023..1E024 ; Extend # Mn [2] COMBINING GLAGOLITIC LETTER YU..COMBINING GLAGOLITIC LETTER SMALL YUS 1E026..1E02A ; Extend # Mn [5] COMBINING GLAGOLITIC LETTER YO..COMBINING GLAGOLITIC LETTER FITA 1E130..1E136 ; Extend # Mn [7] NYIAKENG PUACHUE HMONG TONE-B..NYIAKENG PUACHUE HMONG TONE-D +1E2AE ; Extend # Mn TOTO SIGN RISING TONE 1E2EC..1E2EF ; Extend # Mn [4] WANCHO TONE TUP..WANCHO TONE KOINI 1E8D0..1E8D6 ; Extend # Mn [7] MENDE KIKAKUI COMBINING NUMBER TEENS..MENDE KIKAKUI COMBINING NUMBER MILLIONS 1E944..1E94A ; Extend # Mn [7] ADLAM ALIF LENGTHENER..ADLAM NUKTA @@ -438,7 +448,7 @@ FF9E..FF9F ; Extend # Lm [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HALFWIDT E0020..E007F ; Extend # Cf [96] TAG SPACE..CANCEL TAG E0100..E01EF ; Extend # Mn [240] VARIATION SELECTOR-17..VARIATION SELECTOR-256 -# Total code points: 1984 +# Total code points: 2095 # ================================================ @@ -495,6 +505,8 @@ E0100..E01EF ; Extend # Mn [240] VARIATION SELECTOR-17..VARIATION SELECTOR-256 103B..103C ; SpacingMark # Mc [2] MYANMAR CONSONANT SIGN MEDIAL YA..MYANMAR CONSONANT SIGN MEDIAL RA 1056..1057 ; SpacingMark # Mc [2] MYANMAR VOWEL SIGN VOCALIC R..MYANMAR VOWEL SIGN VOCALIC RR 1084 ; SpacingMark # Mc MYANMAR VOWEL SIGN SHAN E +1715 ; SpacingMark # Mc TAGALOG SIGN PAMUDPOD +1734 ; SpacingMark # Mc HANUNOO SIGN PAMUDPOD 17B6 ; SpacingMark # Mc KHMER VOWEL SIGN AA 17BE..17C5 ; SpacingMark # Mc [8] KHMER VOWEL SIGN OE..KHMER VOWEL SIGN AU 17C7..17C8 ; SpacingMark # Mc [2] KHMER SIGN REAHMUK..KHMER SIGN YUUKALEAPINTU @@ -579,7 +591,6 @@ ABEC ; SpacingMark # Mc MEETEI MAYEK LUM IYEK 116AC ; SpacingMark # Mc TAKRI SIGN VISARGA 116AE..116AF ; SpacingMark # Mc [2] TAKRI VOWEL SIGN I..TAKRI VOWEL SIGN II 116B6 ; SpacingMark # Mc TAKRI SIGN VIRAMA -11720..11721 ; SpacingMark # Mc [2] AHOM VOWEL SIGN A..AHOM VOWEL SIGN AA 11726 ; SpacingMark # Mc AHOM VOWEL SIGN E 1182C..1182E ; SpacingMark # Mc [3] DOGRA VOWEL SIGN AA..DOGRA VOWEL SIGN II 11838 ; SpacingMark # Mc DOGRA SIGN VISARGA diff --git a/make/data/unicodedata/auxiliary/GraphemeBreakTest.txt b/make/data/unicodedata/auxiliary/GraphemeBreakTest.txt index e3cd8806ceb398fcc93b7ba149692d271dde7ca5..6bb1fe98b5adc43aca70b892eff402f14be75314 100644 --- a/make/data/unicodedata/auxiliary/GraphemeBreakTest.txt +++ b/make/data/unicodedata/auxiliary/GraphemeBreakTest.txt @@ -1,6 +1,6 @@ -# GraphemeBreakTest-13.0.0.txt -# Date: 2019-11-15, 19:49:10 GMT -# Copyright (c) 2019 Unicode, Inc. +# GraphemeBreakTest-14.0.0.txt +# Date: 2021-03-08, 06:22:32 GMT +# Copyright (c) 2021 Unicode, Inc. # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries. # For terms of use, see http://www.unicode.org/terms_of_use.html # diff --git a/make/data/unicodedata/emoji/emoji-data.txt b/make/data/unicodedata/emoji/emoji-data.txt index a01213299b71085835d7690e0d37f6c04e1ad1a3..a35d434df220dcd1f62415a79228b4d14e966b7c 100644 --- a/make/data/unicodedata/emoji/emoji-data.txt +++ b/make/data/unicodedata/emoji/emoji-data.txt @@ -1,11 +1,11 @@ -# emoji-data.txt -# Date: 2020-01-28, 20:52:38 GMT -# Copyright (c) 2020 Unicode, Inc. +# emoji-data-14.0.0.txt +# Date: 2021-08-26, 17:22:22 GMT +# Copyright (c) 2021 Unicode, Inc. # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries. # For terms of use, see http://www.unicode.org/terms_of_use.html # # Emoji Data for UTS #51 -# Version: 13.0 +# Used with Emoji Version 14.0 and subsequent minor revisions (if any) # # For documentation and usage, see http://www.unicode.org/reports/tr51 # @@ -22,7 +22,7 @@ # All omitted code points have Emoji=No # @missing: 0000..10FFFF ; Emoji ; No -0023 ; Emoji # E0.0 [1] (#️) number sign +0023 ; Emoji # E0.0 [1] (#️) hash sign 002A ; Emoji # E0.0 [1] (*️) asterisk 0030..0039 ; Emoji # E0.0 [10] (0️..9️) digit zero..digit nine 00A9 ; Emoji # E0.6 [1] (©️) copyright @@ -119,8 +119,8 @@ 2747 ; Emoji # E0.6 [1] (❇️) sparkle 274C ; Emoji # E0.6 [1] (❌) cross mark 274E ; Emoji # E0.6 [1] (❎) cross mark button -2753..2755 ; Emoji # E0.6 [3] (❓..❕) question mark..white exclamation mark -2757 ; Emoji # E0.6 [1] (❗) exclamation mark +2753..2755 ; Emoji # E0.6 [3] (❓..❕) red question mark..white exclamation mark +2757 ; Emoji # E0.6 [1] (❗) red exclamation mark 2763 ; Emoji # E1.0 [1] (❣️) heart exclamation 2764 ; Emoji # E0.6 [1] (❤️) red heart 2795..2797 ; Emoji # E0.6 [3] (➕..➗) plus..divide @@ -239,7 +239,7 @@ 1F509 ; Emoji # E1.0 [1] (🔉) speaker medium volume 1F50A..1F514 ; Emoji # E0.6 [11] (🔊..🔔) speaker high volume..bell 1F515 ; Emoji # E1.0 [1] (🔕) bell with slash -1F516..1F52B ; Emoji # E0.6 [22] (🔖..🔫) bookmark..pistol +1F516..1F52B ; Emoji # E0.6 [22] (🔖..🔫) bookmark..water pistol 1F52C..1F52D ; Emoji # E1.0 [2] (🔬..🔭) microscope..telescope 1F52E..1F53D ; Emoji # E0.6 [16] (🔮..🔽) crystal ball..downwards button 1F549..1F54A ; Emoji # E0.7 [2] (🕉️..🕊️) om..dove @@ -294,7 +294,7 @@ 1F62E..1F62F ; Emoji # E1.0 [2] (😮..😯) face with open mouth..hushed face 1F630..1F633 ; Emoji # E0.6 [4] (😰..😳) anxious face with sweat..flushed face 1F634 ; Emoji # E1.0 [1] (😴) sleeping face -1F635 ; Emoji # E0.6 [1] (😵) dizzy face +1F635 ; Emoji # E0.6 [1] (😵) face with crossed-out eyes 1F636 ; Emoji # E1.0 [1] (😶) face without mouth 1F637..1F640 ; Emoji # E0.6 [10] (😷..🙀) face with medical mask..weary cat 1F641..1F644 ; Emoji # E1.0 [4] (🙁..🙄) slightly frowning face..face with rolling eyes @@ -341,6 +341,7 @@ 1F6D1..1F6D2 ; Emoji # E3.0 [2] (🛑..🛒) stop sign..shopping cart 1F6D5 ; Emoji # E12.0 [1] (🛕) hindu temple 1F6D6..1F6D7 ; Emoji # E13.0 [2] (🛖..🛗) hut..elevator +1F6DD..1F6DF ; Emoji # E14.0 [3] (🛝..🛟) playground slide..ring buoy 1F6E0..1F6E5 ; Emoji # E0.7 [6] (🛠️..🛥️) hammer and wrench..motor boat 1F6E9 ; Emoji # E0.7 [1] (🛩️) small airplane 1F6EB..1F6EC ; Emoji # E1.0 [2] (🛫..🛬) airplane departure..airplane arrival @@ -352,6 +353,7 @@ 1F6FA ; Emoji # E12.0 [1] (🛺) auto rickshaw 1F6FB..1F6FC ; Emoji # E13.0 [2] (🛻..🛼) pickup truck..roller skate 1F7E0..1F7EB ; Emoji # E12.0 [12] (🟠..🟫) orange circle..brown square +1F7F0 ; Emoji # E14.0 [1] (🟰) heavy equals sign 1F90C ; Emoji # E13.0 [1] (🤌) pinched fingers 1F90D..1F90F ; Emoji # E12.0 [3] (🤍..🤏) white heart..pinching hand 1F910..1F918 ; Emoji # E1.0 [9] (🤐..🤘) zipper-mouth face..sign of the horns @@ -375,6 +377,7 @@ 1F972 ; Emoji # E13.0 [1] (🥲) smiling face with tear 1F973..1F976 ; Emoji # E11.0 [4] (🥳..🥶) partying face..cold face 1F977..1F978 ; Emoji # E13.0 [2] (🥷..🥸) ninja..disguised face +1F979 ; Emoji # E14.0 [1] (🥹) face holding back tears 1F97A ; Emoji # E11.0 [1] (🥺) pleading face 1F97B ; Emoji # E12.0 [1] (🥻) sari 1F97C..1F97F ; Emoji # E11.0 [4] (🥼..🥿) lab coat..flat shoe @@ -392,21 +395,29 @@ 1F9C1..1F9C2 ; Emoji # E11.0 [2] (🧁..🧂) cupcake..salt 1F9C3..1F9CA ; Emoji # E12.0 [8] (🧃..🧊) beverage box..ice 1F9CB ; Emoji # E13.0 [1] (🧋) bubble tea +1F9CC ; Emoji # E14.0 [1] (🧌) troll 1F9CD..1F9CF ; Emoji # E12.0 [3] (🧍..🧏) person standing..deaf person 1F9D0..1F9E6 ; Emoji # E5.0 [23] (🧐..🧦) face with monocle..socks 1F9E7..1F9FF ; Emoji # E11.0 [25] (🧧..🧿) red envelope..nazar amulet 1FA70..1FA73 ; Emoji # E12.0 [4] (🩰..🩳) ballet shoes..shorts 1FA74 ; Emoji # E13.0 [1] (🩴) thong sandal 1FA78..1FA7A ; Emoji # E12.0 [3] (🩸..🩺) drop of blood..stethoscope +1FA7B..1FA7C ; Emoji # E14.0 [2] (🩻..🩼) x-ray..crutch 1FA80..1FA82 ; Emoji # E12.0 [3] (🪀..🪂) yo-yo..parachute 1FA83..1FA86 ; Emoji # E13.0 [4] (🪃..🪆) boomerang..nesting dolls 1FA90..1FA95 ; Emoji # E12.0 [6] (🪐..🪕) ringed planet..banjo 1FA96..1FAA8 ; Emoji # E13.0 [19] (🪖..🪨) military helmet..rock +1FAA9..1FAAC ; Emoji # E14.0 [4] (🪩..🪬) mirror ball..hamsa 1FAB0..1FAB6 ; Emoji # E13.0 [7] (🪰..🪶) fly..feather +1FAB7..1FABA ; Emoji # E14.0 [4] (🪷..🪺) lotus..nest with eggs 1FAC0..1FAC2 ; Emoji # E13.0 [3] (🫀..🫂) anatomical heart..people hugging +1FAC3..1FAC5 ; Emoji # E14.0 [3] (🫃..🫅) pregnant man..person with crown 1FAD0..1FAD6 ; Emoji # E13.0 [7] (🫐..🫖) blueberries..teapot +1FAD7..1FAD9 ; Emoji # E14.0 [3] (🫗..🫙) pouring liquid..jar +1FAE0..1FAE7 ; Emoji # E14.0 [8] (🫠..🫧) melting face..bubbles +1FAF0..1FAF6 ; Emoji # E14.0 [7] (🫰..🫶) hand with index finger and thumb crossed..heart hands -# Total elements: 1367 +# Total elements: 1404 # ================================================ @@ -438,8 +449,8 @@ 2728 ; Emoji_Presentation # E0.6 [1] (✨) sparkles 274C ; Emoji_Presentation # E0.6 [1] (❌) cross mark 274E ; Emoji_Presentation # E0.6 [1] (❎) cross mark button -2753..2755 ; Emoji_Presentation # E0.6 [3] (❓..❕) question mark..white exclamation mark -2757 ; Emoji_Presentation # E0.6 [1] (❗) exclamation mark +2753..2755 ; Emoji_Presentation # E0.6 [3] (❓..❕) red question mark..white exclamation mark +2757 ; Emoji_Presentation # E0.6 [1] (❗) red exclamation mark 2795..2797 ; Emoji_Presentation # E0.6 [3] (➕..➗) plus..divide 27B0 ; Emoji_Presentation # E0.6 [1] (➰) curly loop 27BF ; Emoji_Presentation # E1.0 [1] (➿) double curly loop @@ -533,7 +544,7 @@ 1F509 ; Emoji_Presentation # E1.0 [1] (🔉) speaker medium volume 1F50A..1F514 ; Emoji_Presentation # E0.6 [11] (🔊..🔔) speaker high volume..bell 1F515 ; Emoji_Presentation # E1.0 [1] (🔕) bell with slash -1F516..1F52B ; Emoji_Presentation # E0.6 [22] (🔖..🔫) bookmark..pistol +1F516..1F52B ; Emoji_Presentation # E0.6 [22] (🔖..🔫) bookmark..water pistol 1F52C..1F52D ; Emoji_Presentation # E1.0 [2] (🔬..🔭) microscope..telescope 1F52E..1F53D ; Emoji_Presentation # E0.6 [16] (🔮..🔽) crystal ball..downwards button 1F54B..1F54E ; Emoji_Presentation # E1.0 [4] (🕋..🕎) kaaba..menorah @@ -569,7 +580,7 @@ 1F62E..1F62F ; Emoji_Presentation # E1.0 [2] (😮..😯) face with open mouth..hushed face 1F630..1F633 ; Emoji_Presentation # E0.6 [4] (😰..😳) anxious face with sweat..flushed face 1F634 ; Emoji_Presentation # E1.0 [1] (😴) sleeping face -1F635 ; Emoji_Presentation # E0.6 [1] (😵) dizzy face +1F635 ; Emoji_Presentation # E0.6 [1] (😵) face with crossed-out eyes 1F636 ; Emoji_Presentation # E1.0 [1] (😶) face without mouth 1F637..1F640 ; Emoji_Presentation # E0.6 [10] (😷..🙀) face with medical mask..weary cat 1F641..1F644 ; Emoji_Presentation # E1.0 [4] (🙁..🙄) slightly frowning face..face with rolling eyes @@ -614,6 +625,7 @@ 1F6D1..1F6D2 ; Emoji_Presentation # E3.0 [2] (🛑..🛒) stop sign..shopping cart 1F6D5 ; Emoji_Presentation # E12.0 [1] (🛕) hindu temple 1F6D6..1F6D7 ; Emoji_Presentation # E13.0 [2] (🛖..🛗) hut..elevator +1F6DD..1F6DF ; Emoji_Presentation # E14.0 [3] (🛝..🛟) playground slide..ring buoy 1F6EB..1F6EC ; Emoji_Presentation # E1.0 [2] (🛫..🛬) airplane departure..airplane arrival 1F6F4..1F6F6 ; Emoji_Presentation # E3.0 [3] (🛴..🛶) kick scooter..canoe 1F6F7..1F6F8 ; Emoji_Presentation # E5.0 [2] (🛷..🛸) sled..flying saucer @@ -621,6 +633,7 @@ 1F6FA ; Emoji_Presentation # E12.0 [1] (🛺) auto rickshaw 1F6FB..1F6FC ; Emoji_Presentation # E13.0 [2] (🛻..🛼) pickup truck..roller skate 1F7E0..1F7EB ; Emoji_Presentation # E12.0 [12] (🟠..🟫) orange circle..brown square +1F7F0 ; Emoji_Presentation # E14.0 [1] (🟰) heavy equals sign 1F90C ; Emoji_Presentation # E13.0 [1] (🤌) pinched fingers 1F90D..1F90F ; Emoji_Presentation # E12.0 [3] (🤍..🤏) white heart..pinching hand 1F910..1F918 ; Emoji_Presentation # E1.0 [9] (🤐..🤘) zipper-mouth face..sign of the horns @@ -644,6 +657,7 @@ 1F972 ; Emoji_Presentation # E13.0 [1] (🥲) smiling face with tear 1F973..1F976 ; Emoji_Presentation # E11.0 [4] (🥳..🥶) partying face..cold face 1F977..1F978 ; Emoji_Presentation # E13.0 [2] (🥷..🥸) ninja..disguised face +1F979 ; Emoji_Presentation # E14.0 [1] (🥹) face holding back tears 1F97A ; Emoji_Presentation # E11.0 [1] (🥺) pleading face 1F97B ; Emoji_Presentation # E12.0 [1] (🥻) sari 1F97C..1F97F ; Emoji_Presentation # E11.0 [4] (🥼..🥿) lab coat..flat shoe @@ -661,21 +675,29 @@ 1F9C1..1F9C2 ; Emoji_Presentation # E11.0 [2] (🧁..🧂) cupcake..salt 1F9C3..1F9CA ; Emoji_Presentation # E12.0 [8] (🧃..🧊) beverage box..ice 1F9CB ; Emoji_Presentation # E13.0 [1] (🧋) bubble tea +1F9CC ; Emoji_Presentation # E14.0 [1] (🧌) troll 1F9CD..1F9CF ; Emoji_Presentation # E12.0 [3] (🧍..🧏) person standing..deaf person 1F9D0..1F9E6 ; Emoji_Presentation # E5.0 [23] (🧐..🧦) face with monocle..socks 1F9E7..1F9FF ; Emoji_Presentation # E11.0 [25] (🧧..🧿) red envelope..nazar amulet 1FA70..1FA73 ; Emoji_Presentation # E12.0 [4] (🩰..🩳) ballet shoes..shorts 1FA74 ; Emoji_Presentation # E13.0 [1] (🩴) thong sandal 1FA78..1FA7A ; Emoji_Presentation # E12.0 [3] (🩸..🩺) drop of blood..stethoscope +1FA7B..1FA7C ; Emoji_Presentation # E14.0 [2] (🩻..🩼) x-ray..crutch 1FA80..1FA82 ; Emoji_Presentation # E12.0 [3] (🪀..🪂) yo-yo..parachute 1FA83..1FA86 ; Emoji_Presentation # E13.0 [4] (🪃..🪆) boomerang..nesting dolls 1FA90..1FA95 ; Emoji_Presentation # E12.0 [6] (🪐..🪕) ringed planet..banjo 1FA96..1FAA8 ; Emoji_Presentation # E13.0 [19] (🪖..🪨) military helmet..rock +1FAA9..1FAAC ; Emoji_Presentation # E14.0 [4] (🪩..🪬) mirror ball..hamsa 1FAB0..1FAB6 ; Emoji_Presentation # E13.0 [7] (🪰..🪶) fly..feather +1FAB7..1FABA ; Emoji_Presentation # E14.0 [4] (🪷..🪺) lotus..nest with eggs 1FAC0..1FAC2 ; Emoji_Presentation # E13.0 [3] (🫀..🫂) anatomical heart..people hugging +1FAC3..1FAC5 ; Emoji_Presentation # E14.0 [3] (🫃..🫅) pregnant man..person with crown 1FAD0..1FAD6 ; Emoji_Presentation # E13.0 [7] (🫐..🫖) blueberries..teapot +1FAD7..1FAD9 ; Emoji_Presentation # E14.0 [3] (🫗..🫙) pouring liquid..jar +1FAE0..1FAE7 ; Emoji_Presentation # E14.0 [8] (🫠..🫧) melting face..bubbles +1FAF0..1FAF6 ; Emoji_Presentation # E14.0 [7] (🫰..🫶) hand with index finger and thumb crossed..heart hands -# Total elements: 1148 +# Total elements: 1185 # ================================================ @@ -738,15 +760,17 @@ 1F9BB ; Emoji_Modifier_Base # E12.0 [1] (🦻) ear with hearing aid 1F9CD..1F9CF ; Emoji_Modifier_Base # E12.0 [3] (🧍..🧏) person standing..deaf person 1F9D1..1F9DD ; Emoji_Modifier_Base # E5.0 [13] (🧑..🧝) person..elf +1FAC3..1FAC5 ; Emoji_Modifier_Base # E14.0 [3] (🫃..🫅) pregnant man..person with crown +1FAF0..1FAF6 ; Emoji_Modifier_Base # E14.0 [7] (🫰..🫶) hand with index finger and thumb crossed..heart hands -# Total elements: 122 +# Total elements: 132 # ================================================ # All omitted code points have Emoji_Component=No # @missing: 0000..10FFFF ; Emoji_Component ; No -0023 ; Emoji_Component # E0.0 [1] (#️) number sign +0023 ; Emoji_Component # E0.0 [1] (#️) hash sign 002A ; Emoji_Component # E0.0 [1] (*️) asterisk 0030..0039 ; Emoji_Component # E0.0 [10] (0️..9️) digit zero..digit nine 200D ; Emoji_Component # E0.0 [1] (‍) zero width joiner @@ -902,8 +926,8 @@ E0020..E007F ; Emoji_Component # E0.0 [96] (󠀠..󠁿) tag space..c 2747 ; Extended_Pictographic# E0.6 [1] (❇️) sparkle 274C ; Extended_Pictographic# E0.6 [1] (❌) cross mark 274E ; Extended_Pictographic# E0.6 [1] (❎) cross mark button -2753..2755 ; Extended_Pictographic# E0.6 [3] (❓..❕) question mark..white exclamation mark -2757 ; Extended_Pictographic# E0.6 [1] (❗) exclamation mark +2753..2755 ; Extended_Pictographic# E0.6 [3] (❓..❕) red question mark..white exclamation mark +2757 ; Extended_Pictographic# E0.6 [1] (❗) red exclamation mark 2763 ; Extended_Pictographic# E1.0 [1] (❣️) heart exclamation 2764 ; Extended_Pictographic# E0.6 [1] (❤️) red heart 2765..2767 ; Extended_Pictographic# E0.0 [3] (❥..❧) ROTATED HEAVY BLACK HEART BULLET..ROTATED FLORAL HEART BULLET @@ -1041,7 +1065,7 @@ E0020..E007F ; Emoji_Component # E0.0 [96] (󠀠..󠁿) tag space..c 1F509 ; Extended_Pictographic# E1.0 [1] (🔉) speaker medium volume 1F50A..1F514 ; Extended_Pictographic# E0.6 [11] (🔊..🔔) speaker high volume..bell 1F515 ; Extended_Pictographic# E1.0 [1] (🔕) bell with slash -1F516..1F52B ; Extended_Pictographic# E0.6 [22] (🔖..🔫) bookmark..pistol +1F516..1F52B ; Extended_Pictographic# E0.6 [22] (🔖..🔫) bookmark..water pistol 1F52C..1F52D ; Extended_Pictographic# E1.0 [2] (🔬..🔭) microscope..telescope 1F52E..1F53D ; Extended_Pictographic# E0.6 [16] (🔮..🔽) crystal ball..downwards button 1F546..1F548 ; Extended_Pictographic# E0.0 [3] (🕆..🕈) WHITE LATIN CROSS..CELTIC CROSS @@ -1117,7 +1141,7 @@ E0020..E007F ; Emoji_Component # E0.0 [96] (󠀠..󠁿) tag space..c 1F62E..1F62F ; Extended_Pictographic# E1.0 [2] (😮..😯) face with open mouth..hushed face 1F630..1F633 ; Extended_Pictographic# E0.6 [4] (😰..😳) anxious face with sweat..flushed face 1F634 ; Extended_Pictographic# E1.0 [1] (😴) sleeping face -1F635 ; Extended_Pictographic# E0.6 [1] (😵) dizzy face +1F635 ; Extended_Pictographic# E0.6 [1] (😵) face with crossed-out eyes 1F636 ; Extended_Pictographic# E1.0 [1] (😶) face without mouth 1F637..1F640 ; Extended_Pictographic# E0.6 [10] (😷..🙀) face with medical mask..weary cat 1F641..1F644 ; Extended_Pictographic# E1.0 [4] (🙁..🙄) slightly frowning face..face with rolling eyes @@ -1166,7 +1190,8 @@ E0020..E007F ; Emoji_Component # E0.0 [96] (󠀠..󠁿) tag space..c 1F6D3..1F6D4 ; Extended_Pictographic# E0.0 [2] (🛓..🛔) STUPA..PAGODA 1F6D5 ; Extended_Pictographic# E12.0 [1] (🛕) hindu temple 1F6D6..1F6D7 ; Extended_Pictographic# E13.0 [2] (🛖..🛗) hut..elevator -1F6D8..1F6DF ; Extended_Pictographic# E0.0 [8] (🛘..🛟) .. +1F6D8..1F6DC ; Extended_Pictographic# E0.0 [5] (🛘..🛜) .. +1F6DD..1F6DF ; Extended_Pictographic# E14.0 [3] (🛝..🛟) playground slide..ring buoy 1F6E0..1F6E5 ; Extended_Pictographic# E0.7 [6] (🛠️..🛥️) hammer and wrench..motor boat 1F6E6..1F6E8 ; Extended_Pictographic# E0.0 [3] (🛦..🛨) UP-POINTING MILITARY AIRPLANE..UP-POINTING SMALL AIRPLANE 1F6E9 ; Extended_Pictographic# E0.7 [1] (🛩️) small airplane @@ -1185,7 +1210,9 @@ E0020..E007F ; Emoji_Component # E0.0 [96] (󠀠..󠁿) tag space..c 1F774..1F77F ; Extended_Pictographic# E0.0 [12] (🝴..🝿) .. 1F7D5..1F7DF ; Extended_Pictographic# E0.0 [11] (🟕..🟟) CIRCLED TRIANGLE.. 1F7E0..1F7EB ; Extended_Pictographic# E12.0 [12] (🟠..🟫) orange circle..brown square -1F7EC..1F7FF ; Extended_Pictographic# E0.0 [20] (🟬..🟿) .. +1F7EC..1F7EF ; Extended_Pictographic# E0.0 [4] (🟬..🟯) .. +1F7F0 ; Extended_Pictographic# E14.0 [1] (🟰) heavy equals sign +1F7F1..1F7FF ; Extended_Pictographic# E0.0 [15] (🟱..🟿) .. 1F80C..1F80F ; Extended_Pictographic# E0.0 [4] (🠌..🠏) .. 1F848..1F84F ; Extended_Pictographic# E0.0 [8] (🡈..🡏) .. 1F85A..1F85F ; Extended_Pictographic# E0.0 [6] (🡚..🡟) .. @@ -1214,7 +1241,7 @@ E0020..E007F ; Emoji_Component # E0.0 [96] (󠀠..󠁿) tag space..c 1F972 ; Extended_Pictographic# E13.0 [1] (🥲) smiling face with tear 1F973..1F976 ; Extended_Pictographic# E11.0 [4] (🥳..🥶) partying face..cold face 1F977..1F978 ; Extended_Pictographic# E13.0 [2] (🥷..🥸) ninja..disguised face -1F979 ; Extended_Pictographic# E0.0 [1] (🥹) +1F979 ; Extended_Pictographic# E14.0 [1] (🥹) face holding back tears 1F97A ; Extended_Pictographic# E11.0 [1] (🥺) pleading face 1F97B ; Extended_Pictographic# E12.0 [1] (🥻) sari 1F97C..1F97F ; Extended_Pictographic# E11.0 [4] (🥼..🥿) lab coat..flat shoe @@ -1232,7 +1259,7 @@ E0020..E007F ; Emoji_Component # E0.0 [96] (󠀠..󠁿) tag space..c 1F9C1..1F9C2 ; Extended_Pictographic# E11.0 [2] (🧁..🧂) cupcake..salt 1F9C3..1F9CA ; Extended_Pictographic# E12.0 [8] (🧃..🧊) beverage box..ice 1F9CB ; Extended_Pictographic# E13.0 [1] (🧋) bubble tea -1F9CC ; Extended_Pictographic# E0.0 [1] (🧌) +1F9CC ; Extended_Pictographic# E14.0 [1] (🧌) troll 1F9CD..1F9CF ; Extended_Pictographic# E12.0 [3] (🧍..🧏) person standing..deaf person 1F9D0..1F9E6 ; Extended_Pictographic# E5.0 [23] (🧐..🧦) face with monocle..socks 1F9E7..1F9FF ; Extended_Pictographic# E11.0 [25] (🧧..🧿) red envelope..nazar amulet @@ -1241,19 +1268,28 @@ E0020..E007F ; Emoji_Component # E0.0 [96] (󠀠..󠁿) tag space..c 1FA74 ; Extended_Pictographic# E13.0 [1] (🩴) thong sandal 1FA75..1FA77 ; Extended_Pictographic# E0.0 [3] (🩵..🩷) .. 1FA78..1FA7A ; Extended_Pictographic# E12.0 [3] (🩸..🩺) drop of blood..stethoscope -1FA7B..1FA7F ; Extended_Pictographic# E0.0 [5] (🩻..🩿) .. +1FA7B..1FA7C ; Extended_Pictographic# E14.0 [2] (🩻..🩼) x-ray..crutch +1FA7D..1FA7F ; Extended_Pictographic# E0.0 [3] (🩽..🩿) .. 1FA80..1FA82 ; Extended_Pictographic# E12.0 [3] (🪀..🪂) yo-yo..parachute 1FA83..1FA86 ; Extended_Pictographic# E13.0 [4] (🪃..🪆) boomerang..nesting dolls 1FA87..1FA8F ; Extended_Pictographic# E0.0 [9] (🪇..🪏) .. 1FA90..1FA95 ; Extended_Pictographic# E12.0 [6] (🪐..🪕) ringed planet..banjo 1FA96..1FAA8 ; Extended_Pictographic# E13.0 [19] (🪖..🪨) military helmet..rock -1FAA9..1FAAF ; Extended_Pictographic# E0.0 [7] (🪩..🪯) .. +1FAA9..1FAAC ; Extended_Pictographic# E14.0 [4] (🪩..🪬) mirror ball..hamsa +1FAAD..1FAAF ; Extended_Pictographic# E0.0 [3] (🪭..🪯) .. 1FAB0..1FAB6 ; Extended_Pictographic# E13.0 [7] (🪰..🪶) fly..feather -1FAB7..1FABF ; Extended_Pictographic# E0.0 [9] (🪷..🪿) .. +1FAB7..1FABA ; Extended_Pictographic# E14.0 [4] (🪷..🪺) lotus..nest with eggs +1FABB..1FABF ; Extended_Pictographic# E0.0 [5] (🪻..🪿) .. 1FAC0..1FAC2 ; Extended_Pictographic# E13.0 [3] (🫀..🫂) anatomical heart..people hugging -1FAC3..1FACF ; Extended_Pictographic# E0.0 [13] (🫃..🫏) .. +1FAC3..1FAC5 ; Extended_Pictographic# E14.0 [3] (🫃..🫅) pregnant man..person with crown +1FAC6..1FACF ; Extended_Pictographic# E0.0 [10] (🫆..🫏) .. 1FAD0..1FAD6 ; Extended_Pictographic# E13.0 [7] (🫐..🫖) blueberries..teapot -1FAD7..1FAFF ; Extended_Pictographic# E0.0 [41] (🫗..🫿) .. +1FAD7..1FAD9 ; Extended_Pictographic# E14.0 [3] (🫗..🫙) pouring liquid..jar +1FADA..1FADF ; Extended_Pictographic# E0.0 [6] (🫚..🫟) .. +1FAE0..1FAE7 ; Extended_Pictographic# E14.0 [8] (🫠..🫧) melting face..bubbles +1FAE8..1FAEF ; Extended_Pictographic# E0.0 [8] (🫨..🫯) .. +1FAF0..1FAF6 ; Extended_Pictographic# E14.0 [7] (🫰..🫶) hand with index finger and thumb crossed..heart hands +1FAF7..1FAFF ; Extended_Pictographic# E0.0 [9] (🫷..🫿) .. 1FC00..1FFFD ; Extended_Pictographic# E0.0[1022] (🰀..🿽) .. # Total elements: 3537 diff --git a/make/devkit/createJMHBundle.sh b/make/devkit/createJMHBundle.sh index d34c9939ff07b58d90dcd6f50dee1ef9d733c3fc..059fb7acb6fb9fdb5722b6b288bee40d8421169a 100644 --- a/make/devkit/createJMHBundle.sh +++ b/make/devkit/createJMHBundle.sh @@ -26,7 +26,7 @@ # Create a bundle in the build directory, containing what's needed to # build and run JMH microbenchmarks from the OpenJDK build. -JMH_VERSION=1.33 +JMH_VERSION=1.34 COMMONS_MATH3_VERSION=3.2 JOPT_SIMPLE_VERSION=4.6 diff --git a/make/hotspot/lib/JvmFeatures.gmk b/make/hotspot/lib/JvmFeatures.gmk index ab555f9d82d4e7cb01e271fa0807c7673a544293..07ce6feaf6f692cbfcc70c7a903f04b73e9b066a 100644 --- a/make/hotspot/lib/JvmFeatures.gmk +++ b/make/hotspot/lib/JvmFeatures.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2013, 2022, 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 @@ -130,13 +130,6 @@ ifneq ($(call check-jvm-feature, cds), true) JVM_EXCLUDE_PATTERNS += cds/ endif -ifneq ($(call check-jvm-feature, nmt), true) - JVM_CFLAGS_FEATURES += -DINCLUDE_NMT=0 - JVM_EXCLUDE_FILES += \ - memBaseline.cpp memReporter.cpp mallocTracker.cpp virtualMemoryTracker.cpp nmtCommon.cpp \ - memTracker.cpp nmtDCmd.cpp mallocSiteTable.cpp threadStackTracker.cpp -endif - ifneq ($(call check-jvm-feature, g1gc), true) JVM_CFLAGS_FEATURES += -DINCLUDE_G1GC=0 JVM_EXCLUDE_PATTERNS += gc/g1 diff --git a/make/ide/vscode/hotspot/CreateVSCodeProject.gmk b/make/ide/vscode/hotspot/CreateVSCodeProject.gmk index 8b82c38a7518e2ef866e50cb81ce65d27d63a310..bc56e878de6f34add01103c1e0570d136fa85fba 100644 --- a/make/ide/vscode/hotspot/CreateVSCodeProject.gmk +++ b/make/ide/vscode/hotspot/CreateVSCodeProject.gmk @@ -29,6 +29,13 @@ default: all include $(SPEC) include MakeBase.gmk +################################################################################ +# SedEscape +# +# Escape special characters for use in SED replacement string +################################################################################ +SedEscape = $(subst !,\!,$(subst \,\\,$1)) + ################################################################################ # Return the full path to an indexer-specific file fragment. # @@ -78,15 +85,15 @@ define CreateFromTemplate $(SED) -e '/{{INDEXER_EXTENSIONS}}/r $(call GetIndexerFragment,extensions)' \ -e '/{{INDEXER_SETTINGS}}/r $(call GetIndexerFragment,settings)' \ -e '/{{EXTRA_WORKSPACE_ROOT}}/r $(call GetExtraWorkspaceRoot)' $1 | \ - $(SED) -e 's!{{TOPDIR}}!$(call FixPath,$(TOPDIR))!g' \ - -e 's!{{TOPDIR_RELATIVE}}!$(call FixPath,$(strip \ - $(call RelativePath,$(OUTPUTDIR),$(TOPDIR))))!g' \ - -e 's!{{WORKSPACE_ROOT}}!$(call FixPath,$(WORKSPACE_ROOT))!g' \ - -e 's!{{OUTPUTDIR}}!$(call FixPath,$(OUTPUTDIR))!g' \ + $(SED) -e 's!{{TOPDIR}}!$(call SedEscape,$(call FixPath,$(TOPDIR)))!g' \ + -e 's!{{TOPDIR_RELATIVE}}!$(call SedEscape,$(call FixPath,$(strip \ + $(call RelativePath,$(OUTPUTDIR),$(TOPDIR)))))!g' \ + -e 's!{{WORKSPACE_ROOT}}!$(call SedEscape,$(call FixPath,$(WORKSPACE_ROOT)))!g' \ + -e 's!{{OUTPUTDIR}}!$(call SedEscape,$(call FixPath,$(OUTPUTDIR)))!g' \ -e 's!{{CONF_NAME}}!$(CONF_NAME)!g' \ - -e 's!{{COMPILER}}!$(call FixPath,$(CXX)) $(SYSROOT_CFLAGS)!g' \ - -e 's!{{MAKE}}!$(call FixPath,$(MAKE))!g' \ - -e 's!{{PATH}}!$(call FixPath,$(PATH))!g' \ + -e 's!{{COMPILER}}!$(call SedEscape,$(call FixPath,$(CXX))) $(SYSROOT_CFLAGS)!g' \ + -e 's!{{MAKE}}!$(call SedEscape,$(call FixPath,$(MAKE)))!g' \ + -e 's!{{PATH}}!$(call SedEscape,$(call FixPath,$(PATH)))!g' \ -e 's!{{DEBUGENGINENAME}}!$(call DebugEngineName)!g' \ -e '/{{INDEXER_EXTENSIONS}}/d' \ -e '/{{INDEXER_SETTINGS}}/d' \ diff --git a/make/modules/java.base/Java.gmk b/make/modules/java.base/Java.gmk index b5bd86ada54724c62bdbe7bc832292a191d9db76..25c14d2b1d265cc93268275b9e22690f30a18f2c 100644 --- a/make/modules/java.base/Java.gmk +++ b/make/modules/java.base/Java.gmk @@ -23,7 +23,7 @@ # questions. # -DOCLINT += -Xdoclint:all/protected,-reference \ +DOCLINT += -Xdoclint:all/protected \ '-Xdoclint/package:java.*,javax.*' JAVAC_FLAGS += -XDstringConcat=inline COPY += .icu .dat .spp .nrm content-types.properties \ diff --git a/make/modules/java.datatransfer/Java.gmk b/make/modules/java.datatransfer/Java.gmk index a9f7c8f4f0af9aee4b8f5decbc2af7e42c9d7c59..29feb6df9f55283dce03fa03f4ab659a3c6b56f5 100644 --- a/make/modules/java.datatransfer/Java.gmk +++ b/make/modules/java.datatransfer/Java.gmk @@ -23,6 +23,6 @@ # questions. # -DOCLINT += -Xdoclint:all/protected,-reference \ +DOCLINT += -Xdoclint:all/protected \ '-Xdoclint/package:java.*,javax.*' COPY += flavormap.properties diff --git a/make/modules/java.logging/Java.gmk b/make/modules/java.logging/Java.gmk index a6641fc1485d506aa3d11ce6e41512d1bf64720e..f49e425718e7fc45c52e1f55c81e221145a781cf 100644 --- a/make/modules/java.logging/Java.gmk +++ b/make/modules/java.logging/Java.gmk @@ -23,5 +23,5 @@ # questions. # -DOCLINT += -Xdoclint:all/protected,-reference \ +DOCLINT += -Xdoclint:all/protected \ '-Xdoclint/package:java.*,javax.*' diff --git a/make/modules/java.management/Java.gmk b/make/modules/java.management/Java.gmk index a6641fc1485d506aa3d11ce6e41512d1bf64720e..f49e425718e7fc45c52e1f55c81e221145a781cf 100644 --- a/make/modules/java.management/Java.gmk +++ b/make/modules/java.management/Java.gmk @@ -23,5 +23,5 @@ # questions. # -DOCLINT += -Xdoclint:all/protected,-reference \ +DOCLINT += -Xdoclint:all/protected \ '-Xdoclint/package:java.*,javax.*' diff --git a/make/modules/jdk.jstatd/Launcher.gmk b/make/modules/jdk.jstatd/Launcher.gmk index 26813fa06e741913ef4243f8cb7719ace20dc51a..2137fddd9a01011215b73bd8fc6b6cb577f334a7 100644 --- a/make/modules/jdk.jstatd/Launcher.gmk +++ b/make/modules/jdk.jstatd/Launcher.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2022, 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,5 +27,4 @@ include LauncherCommon.gmk $(eval $(call SetupBuildLauncher, jstatd, \ MAIN_CLASS := sun.tools.jstatd.Jstatd, \ - JAVA_ARGS := -Djava.security.manager=allow, \ )) diff --git a/make/scripts/update_copyright_year.sh b/make/scripts/update_copyright_year.sh index 0f9ba80fc5af9f9d66ac23895135c9515d85f769..a825486a94179e1ddc10e8f4ecf53d0b893f1e2f 100644 --- a/make/scripts/update_copyright_year.sh +++ b/make/scripts/update_copyright_year.sh @@ -1,7 +1,7 @@ #!/bin/bash -f # -# Copyright (c) 2010, 2020, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2010, 2022, 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,27 +23,87 @@ # questions. # -# Script to update the Copyright YEAR range in Mercurial sources. +# Script to update the Copyright YEAR range in Mercurial & Git sources. # (Originally from xdono, Thanks!) -awk=awk +#------------------------------------------------------------ +copyright="Copyright (c)" +company="Oracle" +#------------------------------------------------------------ + +awk="awk" # Stop on any error set -e +# To allow total changes counting +shopt -s lastpipe + +# Get an absolute path to this script, since that determines the top-level directory. +this_script_dir=`dirname $0` +this_script_dir=`cd $this_script_dir > /dev/null && pwd` + # Temp area tmp=/tmp/`basename $0`.${USER}.$$ rm -f -r ${tmp} mkdir -p ${tmp} total=0 +# Default or supplied company name +if [ "$3" != "" ] ; then + company="$3" +fi + # This year or supplied year -if [ "$1" != "" ] ; then - year="$1" +if [ "$2" != "" ] ; then + year="$2" else year=`date +%Y` fi +# VCS select +vcs="$1" + +if [ -z "$vcs" ] ; then + git_found=false + hg_found=false + + [ -d "${this_script_dir}/../../.git" ] && git_found=true + [ -d "${this_script_dir}/../../.hg" ] && hg_found=true + + if [ "$git_found" == "true" ] && [ "$hg_found" == "false" ] ; then + vcs="git" + elif [ "$hg_found" == "true" ] && [ "$git_found" == "false" ] ; then + vcs="hg" + else + echo "Error: could not auto-detect version control system" + vcs="" + fi +fi + +case "$vcs" in + "git") + echo "Using Git version control system" + vcs_status=(git ls-files -m) + vcs_list_changesets=(git log --no-merges --since="${year}-01-01T00:00:00Z" --until="${year}-12-31T23:59:59Z" --pretty=tformat:"%H") + vcs_changeset_message=(git log -1 --pretty=tformat:"%B") # followed by ${changeset} + vcs_changeset_files=(git diff-tree --no-commit-id --name-only -r) # followed by ${changeset} + ;; + + "hg") + echo "Using Mercurial version control system" + vcs_status=(hg status) + vcs_list_changesets=(hg log --no-merges -v -d "${year}-01-01 to ${year}-12-31" --template '{node}\n') + vcs_changeset_message=(hg log -l1 --template '{desc}\n' --rev) # followed by ${changeset} + vcs_changeset_files=(hg log -l1 -v --template '{files}\n' --rev) # followed by ${changeset} + ;; + + *) + echo "Usage: `basename "$0"` [year [company]]" + exit 1 + ;; +esac + # Return true if it makes sense to edit this file saneFileToCheck() { @@ -68,8 +128,6 @@ updateFile() # file { changed="false" if [ `saneFileToCheck "$1"` = "true" ] ; then - copyright="Copyright (c)" - company="Oracle" rm -f $1.OLD mv $1 $1.OLD cat $1.OLD | \ @@ -94,12 +152,10 @@ updateChangesetFiles() # changeset count=0 files=${tmp}/files.$1 rm -f ${files} - hg log -l1 --rev $1 -v --template '{files}\n' | expand \ + "${vcs_changeset_files[@]}" "$1" | expand \ | ${awk} -F' ' '{for(i=1;i<=NF;i++)print $i}' \ > ${files} if [ -f "${files}" -a -s "${files}" ] ; then - copyright="Copyright (c)" - company="Oracle" fcount=`cat ${files}| wc -l` for i in `cat ${files}` ; do if [ `updateFile "${i}"` = "true" ] ; then @@ -116,8 +172,8 @@ updateChangesetFiles() # changeset printf " ERROR: No files changed in the changeset? Must be a mistake.\n" set -x ls -al ${files} - hg log -l1 --rev $1 -v --template '{files}\n' - hg log -l1 --rev $1 -v --template '{files}\n' | expand \ + "${vcs_changeset_files[@]}" "$1" + "${vcs_changeset_files[@]}" "$1" | expand \ | ${awk} -F' ' '{for(i=1;i<=NF;i++)print $i}' set +x exit 1 @@ -126,16 +182,16 @@ updateChangesetFiles() # changeset } # Check if repository is clean -previous=`hg status|wc -l` +previous=`"${vcs_status[@]}"|wc -l` if [ ${previous} -ne 0 ] ; then echo "WARNING: This repository contains previously edited working set files." - echo " hg status | wc -l = `hg status | wc -l`" + echo " ${vcs_status[*]} | wc -l = `"${vcs_status[@]}" | wc -l`" fi # Get all changesets this year all_changesets=${tmp}/all_changesets rm -f ${all_changesets} -hg log --no-merges -v -d "${year}-01-01 to ${year}-12-31" --template '{node}\n' > ${all_changesets} +"${vcs_list_changesets[@]}" > ${all_changesets} # Check changeset to see if it is Copyright only changes, filter changesets if [ -s ${all_changesets} ] ; then @@ -146,7 +202,7 @@ if [ -s ${all_changesets} ] ; then desc=${tmp}/desc.${changeset} rm -f ${desc} echo "------------------------------------------------" - hg log -l1 --rev ${changeset} --template '{desc}\n' > ${desc} + "${vcs_changeset_message[@]}" "${changeset}" > ${desc} printf "%d: %s\n%s\n" ${index} "${changeset}" "`cat ${desc}|head -1`" if [ "${year}" = "2010" ] ; then if cat ${desc} | fgrep -i "Added tag" > /dev/null ; then @@ -175,18 +231,18 @@ if [ ${total} -gt 0 ] ; then echo "---------------------------------------------" echo "Updated the copyright year on a total of ${total} files." if [ ${previous} -eq 0 ] ; then - echo "This count should match the count of modified files in the repository: hg status -m" + echo "This count should match the count of modified files in the repository: ${vcs_status[*]}" else echo "WARNING: This repository contained previously edited working set files." fi - echo " hg status -m | wc -l = `hg status -m | wc -l`" + echo " ${vcs_status[*]} | wc -l = `"${vcs_status[@]}" | wc -l`" else echo "---------------------------------------------" echo "No files were changed" if [ ${previous} -ne 0 ] ; then echo "WARNING: This repository contained previously edited working set files." fi - echo " hg status -m | wc -l = `hg status -m | wc -l`" + echo " ${vcs_status[*]} | wc -l = `"${vcs_status[@]}" | wc -l`" fi # Cleanup diff --git a/src/hotspot/cpu/aarch64/aarch64.ad b/src/hotspot/cpu/aarch64/aarch64.ad index 75af9ed04b217ec3aff1e6ec6c32b0ebf7fc3d99..3e1a6cd0a54cc1daa87d138cb20e3a4e503691e2 100644 --- a/src/hotspot/cpu/aarch64/aarch64.ad +++ b/src/hotspot/cpu/aarch64/aarch64.ad @@ -1,5 +1,5 @@ // -// Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved. +// Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved. // Copyright (c) 2014, 2021, Red Hat, Inc. All rights reserved. // DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. // @@ -2732,11 +2732,8 @@ bool is_vector_arith_imm_pattern(Node* n, Node* m) { // Should the matcher clone input 'm' of node 'n'? bool Matcher::pd_clone_node(Node* n, Node* m, Matcher::MStack& mstack) { // ShiftV src (ShiftCntV con) - // StoreVector (VectorStoreMask src) // Binary src (Replicate con) - if (is_vshift_con_pattern(n, m) || - (UseSVE > 0 && m->Opcode() == Op_VectorStoreMask && n->Opcode() == Op_StoreVector) || - is_vector_arith_imm_pattern(n, m)) { + if (is_vshift_con_pattern(n, m) || is_vector_arith_imm_pattern(n, m)) { mstack.push(m, Visit); return true; } @@ -17018,16 +17015,17 @@ instruct string_compress(iRegP_R2 src, iRegP_R1 dst, iRegI_R3 len, iRegI_R0 result, rFlagsReg cr) %{ match(Set result (StrCompressedCopy src (Binary dst len))); - effect(TEMP tmp1, TEMP tmp2, TEMP tmp3, TEMP tmp4, USE_KILL src, USE_KILL dst, USE_KILL len, KILL cr); + effect(TEMP tmp1, TEMP tmp2, TEMP tmp3, TEMP tmp4, + USE_KILL src, USE_KILL dst, USE len, KILL cr); - format %{ "String Compress $src,$dst -> $result // KILL R1, R2, R3, R4" %} + format %{ "String Compress $src,$dst,$len -> $result // KILL $src,$dst" %} ins_encode %{ __ char_array_compress($src$$Register, $dst$$Register, $len$$Register, + $result$$Register, $tmp1$$FloatRegister, $tmp2$$FloatRegister, - $tmp3$$FloatRegister, $tmp4$$FloatRegister, - $result$$Register); + $tmp3$$FloatRegister, $tmp4$$FloatRegister); %} - ins_pipe( pipe_slow ); + ins_pipe(pipe_slow); %} // fast byte[] to char[] inflation @@ -17052,22 +17050,43 @@ instruct string_inflate(Universe dummy, iRegP_R0 src, iRegP_R1 dst, iRegI_R2 len // encode char[] to byte[] in ISO_8859_1 instruct encode_iso_array(iRegP_R2 src, iRegP_R1 dst, iRegI_R3 len, - vRegD_V0 Vtmp1, vRegD_V1 Vtmp2, - vRegD_V2 Vtmp3, vRegD_V3 Vtmp4, + vRegD_V0 vtmp0, vRegD_V1 vtmp1, + vRegD_V2 vtmp2, vRegD_V3 vtmp3, iRegI_R0 result, rFlagsReg cr) %{ predicate(!((EncodeISOArrayNode*)n)->is_ascii()); match(Set result (EncodeISOArray src (Binary dst len))); - effect(USE_KILL src, USE_KILL dst, USE_KILL len, - KILL Vtmp1, KILL Vtmp2, KILL Vtmp3, KILL Vtmp4, KILL cr); + effect(USE_KILL src, USE_KILL dst, USE len, + KILL vtmp0, KILL vtmp1, KILL vtmp2, KILL vtmp3, KILL cr); - format %{ "Encode array $src,$dst,$len -> $result" %} + format %{ "Encode ISO array $src,$dst,$len -> $result" %} ins_encode %{ __ encode_iso_array($src$$Register, $dst$$Register, $len$$Register, - $result$$Register, $Vtmp1$$FloatRegister, $Vtmp2$$FloatRegister, - $Vtmp3$$FloatRegister, $Vtmp4$$FloatRegister); + $result$$Register, false, + $vtmp0$$FloatRegister, $vtmp1$$FloatRegister, + $vtmp2$$FloatRegister, $vtmp3$$FloatRegister); %} - ins_pipe( pipe_class_memory ); + ins_pipe(pipe_class_memory); +%} + +instruct encode_ascii_array(iRegP_R2 src, iRegP_R1 dst, iRegI_R3 len, + vRegD_V0 vtmp0, vRegD_V1 vtmp1, + vRegD_V2 vtmp2, vRegD_V3 vtmp3, + iRegI_R0 result, rFlagsReg cr) +%{ + predicate(((EncodeISOArrayNode*)n)->is_ascii()); + match(Set result (EncodeISOArray src (Binary dst len))); + effect(USE_KILL src, USE_KILL dst, USE len, + KILL vtmp0, KILL vtmp1, KILL vtmp2, KILL vtmp3, KILL cr); + + format %{ "Encode ASCII array $src,$dst,$len -> $result" %} + ins_encode %{ + __ encode_iso_array($src$$Register, $dst$$Register, $len$$Register, + $result$$Register, true, + $vtmp0$$FloatRegister, $vtmp1$$FloatRegister, + $vtmp2$$FloatRegister, $vtmp3$$FloatRegister); + %} + ins_pipe(pipe_class_memory); %} // ============================================================================ diff --git a/src/hotspot/cpu/aarch64/assembler_aarch64.hpp b/src/hotspot/cpu/aarch64/assembler_aarch64.hpp index 95edeadbf187af9fc3593e416a9c34dab63f4104..3717756d9d95b1425e3fdf55fac9a986f10f1a29 100644 --- a/src/hotspot/cpu/aarch64/assembler_aarch64.hpp +++ b/src/hotspot/cpu/aarch64/assembler_aarch64.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2014, 2021, Red Hat Inc. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -27,6 +27,7 @@ #define CPU_AARCH64_ASSEMBLER_AARCH64_HPP #include "asm/register.hpp" +#include "metaprogramming/enableIf.hpp" #ifdef __GNUC__ @@ -404,18 +405,11 @@ class Address { : _mode(no_mode) { } Address(Register r) : _base(r), _index(noreg), _offset(0), _mode(base_plus_offset), _target(0) { } - Address(Register r, int o) - : _base(r), _index(noreg), _offset(o), _mode(base_plus_offset), _target(0) { } - Address(Register r, long o) - : _base(r), _index(noreg), _offset(o), _mode(base_plus_offset), _target(0) { } - Address(Register r, long long o) - : _base(r), _index(noreg), _offset(o), _mode(base_plus_offset), _target(0) { } - Address(Register r, unsigned int o) - : _base(r), _index(noreg), _offset(o), _mode(base_plus_offset), _target(0) { } - Address(Register r, unsigned long o) - : _base(r), _index(noreg), _offset(o), _mode(base_plus_offset), _target(0) { } - Address(Register r, unsigned long long o) - : _base(r), _index(noreg), _offset(o), _mode(base_plus_offset), _target(0) { } + + template::value)> + Address(Register r, T o) + : _base(r), _index(noreg), _offset(o), _mode(base_plus_offset), _target(0) {} + Address(Register r, ByteSize disp) : Address(r, in_bytes(disp)) { } Address(Register r, Register r1, extend ext = lsl()) @@ -1726,7 +1720,7 @@ void mvnw(Register Rd, Register Rm, #define INSN(NAME, op) \ void NAME(Register Rn, Register Rm, int imm, Condition cond) { \ - int regNumber = (Rm == zr ? 31 : (uintptr_t)Rm); \ + int regNumber = (Rm == zr ? 31 : Rm->encoding()); \ conditional_compare(op, 0, 0, 0, Rn, regNumber, imm, cond); \ } \ \ @@ -2424,6 +2418,12 @@ public: INSN(cnt, 0, 0b100000010110, 0); // accepted arrangements: T8B, T16B INSN(uaddlp, 1, 0b100000001010, 2); // accepted arrangements: T8B, T16B, T4H, T8H, T2S, T4S INSN(uaddlv, 1, 0b110000001110, 1); // accepted arrangements: T8B, T16B, T4H, T8H, T4S + // Zero compare. + INSN(cmeq, 0, 0b100000100110, 3); // accepted arrangements: T8B, T16B, T4H, T8H, T2S, T4S, T2D + INSN(cmge, 1, 0b100000100010, 3); // accepted arrangements: T8B, T16B, T4H, T8H, T2S, T4S, T2D + INSN(cmgt, 0, 0b100000100010, 3); // accepted arrangements: T8B, T16B, T4H, T8H, T2S, T4S, T2D + INSN(cmle, 1, 0b100000100110, 3); // accepted arrangements: T8B, T16B, T4H, T8H, T2S, T4S, T2D + INSN(cmlt, 0, 0b100000101010, 3); // accepted arrangements: T8B, T16B, T4H, T8H, T2S, T4S, T2D #undef INSN diff --git a/src/hotspot/cpu/aarch64/bytes_aarch64.hpp b/src/hotspot/cpu/aarch64/bytes_aarch64.hpp index acb2e493a9a6bfcdccfccae5e4d043b2da85e7ba..672f03b93a961ccdecffbe31f8b9bc925adec141 100644 --- a/src/hotspot/cpu/aarch64/bytes_aarch64.hpp +++ b/src/hotspot/cpu/aarch64/bytes_aarch64.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2014, Red Hat Inc. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -26,7 +26,7 @@ #ifndef CPU_AARCH64_BYTES_AARCH64_HPP #define CPU_AARCH64_BYTES_AARCH64_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" class Bytes: AllStatic { public: diff --git a/src/hotspot/cpu/aarch64/c1_LIRGenerator_aarch64.cpp b/src/hotspot/cpu/aarch64/c1_LIRGenerator_aarch64.cpp index 0a97872900e8940e33d80f7ce23fffcb0e8ee0f1..9f60e493d6acfe2c37a8d8abb96708f815342a26 100644 --- a/src/hotspot/cpu/aarch64/c1_LIRGenerator_aarch64.cpp +++ b/src/hotspot/cpu/aarch64/c1_LIRGenerator_aarch64.cpp @@ -148,7 +148,7 @@ LIR_Address* LIRGenerator::generate_address(LIR_Opr base, LIR_Opr index, if (index->is_constant()) { LIR_Const *constant = index->as_constant_ptr(); if (constant->type() == T_INT) { - large_disp += index->as_jint() << shift; + large_disp += ((intx)index->as_jint()) << shift; } else { assert(constant->type() == T_LONG, "should be"); jlong c = index->as_jlong() << shift; @@ -194,7 +194,7 @@ LIR_Address* LIRGenerator::generate_address(LIR_Opr base, LIR_Opr index, if (large_disp == 0 && index->is_register()) { return new LIR_Address(base, index, type); } else { - assert(Address::offset_ok_for_immed(large_disp, 0), "must be"); + assert(Address::offset_ok_for_immed(large_disp, shift), "failed for large_disp: " INTPTR_FORMAT " and shift %d", large_disp, shift); return new LIR_Address(base, large_disp, type); } } @@ -204,24 +204,7 @@ LIR_Address* LIRGenerator::emit_array_address(LIR_Opr array_opr, LIR_Opr index_o int offset_in_bytes = arrayOopDesc::base_offset_in_bytes(type); int elem_size = type2aelembytes(type); int shift = exact_log2(elem_size); - - LIR_Address* addr; - if (index_opr->is_constant()) { - addr = new LIR_Address(array_opr, - offset_in_bytes + (intx)(index_opr->as_jint()) * elem_size, type); - } else { - if (offset_in_bytes) { - LIR_Opr tmp = new_pointer_register(); - __ add(array_opr, LIR_OprFact::intConst(offset_in_bytes), tmp); - array_opr = tmp; - offset_in_bytes = 0; - } - addr = new LIR_Address(array_opr, - index_opr, - LIR_Address::scale(type), - offset_in_bytes, type); - } - return addr; + return generate_address(array_opr, index_opr, shift, offset_in_bytes, type); } LIR_Opr LIRGenerator::load_immediate(int x, BasicType type) { diff --git a/src/hotspot/cpu/aarch64/copy_aarch64.hpp b/src/hotspot/cpu/aarch64/copy_aarch64.hpp index 3912ee086cf0c4a093094f59da801c8863fb6736..0ff9ace59cc2f3761c7aed3f433dc77b32d7e2e3 100644 --- a/src/hotspot/cpu/aarch64/copy_aarch64.hpp +++ b/src/hotspot/cpu/aarch64/copy_aarch64.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2014, Red Hat Inc. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -52,4 +52,166 @@ static void pd_zero_to_bytes(void* to, size_t count) { (void)memset(to, 0, count); } +#ifndef _WINDOWS + +#define COPY_SMALL(from, to, count) \ +{ \ + long tmp0, tmp1, tmp2, tmp3; \ + long tmp4, tmp5, tmp6, tmp7; \ + __asm volatile( \ +" adr %[t0], 0f;\n" \ +" add %[t0], %[t0], %[cnt], lsl #5;\n" \ +" br %[t0];\n" \ +" .align 5;\n" \ +"0:" \ +" b 1f;\n" \ +" .align 5;\n" \ +" ldr %[t0], [%[s], #0];\n" \ +" str %[t0], [%[d], #0];\n" \ +" b 1f;\n" \ +" .align 5;\n" \ +" ldp %[t0], %[t1], [%[s], #0];\n" \ +" stp %[t0], %[t1], [%[d], #0];\n" \ +" b 1f;\n" \ +" .align 5;\n" \ +" ldp %[t0], %[t1], [%[s], #0];\n" \ +" ldr %[t2], [%[s], #16];\n" \ +" stp %[t0], %[t1], [%[d], #0];\n" \ +" str %[t2], [%[d], #16];\n" \ +" b 1f;\n" \ +" .align 5;\n" \ +" ldp %[t0], %[t1], [%[s], #0];\n" \ +" ldp %[t2], %[t3], [%[s], #16];\n" \ +" stp %[t0], %[t1], [%[d], #0];\n" \ +" stp %[t2], %[t3], [%[d], #16];\n" \ +" b 1f;\n" \ +" .align 5;\n" \ +" ldp %[t0], %[t1], [%[s], #0];\n" \ +" ldp %[t2], %[t3], [%[s], #16];\n" \ +" ldr %[t4], [%[s], #32];\n" \ +" stp %[t0], %[t1], [%[d], #0];\n" \ +" stp %[t2], %[t3], [%[d], #16];\n" \ +" str %[t4], [%[d], #32];\n" \ +" b 1f;\n" \ +" .align 5;\n" \ +" ldp %[t0], %[t1], [%[s], #0];\n" \ +" ldp %[t2], %[t3], [%[s], #16];\n" \ +" ldp %[t4], %[t5], [%[s], #32];\n" \ +"2:" \ +" stp %[t0], %[t1], [%[d], #0];\n" \ +" stp %[t2], %[t3], [%[d], #16];\n" \ +" stp %[t4], %[t5], [%[d], #32];\n" \ +" b 1f;\n" \ +" .align 5;\n" \ +" ldr %[t6], [%[s], #0];\n" \ +" ldp %[t0], %[t1], [%[s], #8];\n" \ +" ldp %[t2], %[t3], [%[s], #24];\n" \ +" ldp %[t4], %[t5], [%[s], #40];\n" \ +" str %[t6], [%[d]], #8;\n" \ +" b 2b;\n" \ +" .align 5;\n" \ +" ldp %[t0], %[t1], [%[s], #0];\n" \ +" ldp %[t2], %[t3], [%[s], #16];\n" \ +" ldp %[t4], %[t5], [%[s], #32];\n" \ +" ldp %[t6], %[t7], [%[s], #48];\n" \ +" stp %[t0], %[t1], [%[d], #0];\n" \ +" stp %[t2], %[t3], [%[d], #16];\n" \ +" stp %[t4], %[t5], [%[d], #32];\n" \ +" stp %[t6], %[t7], [%[d], #48];\n" \ +"1:" \ + \ + : [s]"+r"(from), [d]"+r"(to), [cnt]"+r"(count), \ + [t0]"=&r"(tmp0), [t1]"=&r"(tmp1), [t2]"=&r"(tmp2), [t3]"=&r"(tmp3), \ + [t4]"=&r"(tmp4), [t5]"=&r"(tmp5), [t6]"=&r"(tmp6), [t7]"=&r"(tmp7) \ + : \ + : "memory", "cc"); \ +} + +static void pd_conjoint_words(const HeapWord* from, HeapWord* to, size_t count) { + __asm volatile( "prfm pldl1strm, [%[s], #0];" :: [s]"r"(from) : "memory"); + if (__builtin_expect(count <= 8, 1)) { + COPY_SMALL(from, to, count); + return; + } + _Copy_conjoint_words(from, to, count); +} + +static void pd_disjoint_words(const HeapWord* from, HeapWord* to, size_t count) { + if (__builtin_constant_p(count)) { + memcpy(to, from, count * sizeof(HeapWord)); + return; + } + __asm volatile( "prfm pldl1strm, [%[s], #0];" :: [s]"r"(from) : "memory"); + if (__builtin_expect(count <= 8, 1)) { + COPY_SMALL(from, to, count); + return; + } + _Copy_disjoint_words(from, to, count); +} + +static void pd_disjoint_words_atomic(const HeapWord* from, HeapWord* to, size_t count) { + __asm volatile( "prfm pldl1strm, [%[s], #0];" :: [s]"r"(from) : "memory"); + if (__builtin_expect(count <= 8, 1)) { + COPY_SMALL(from, to, count); + return; + } + _Copy_disjoint_words(from, to, count); +} + +static void pd_aligned_conjoint_words(const HeapWord* from, HeapWord* to, size_t count) { + pd_conjoint_words(from, to, count); +} + +static void pd_aligned_disjoint_words(const HeapWord* from, HeapWord* to, size_t count) { + pd_disjoint_words(from, to, count); +} + +static void pd_conjoint_bytes(const void* from, void* to, size_t count) { + (void)memmove(to, from, count); +} + +static void pd_conjoint_bytes_atomic(const void* from, void* to, size_t count) { + pd_conjoint_bytes(from, to, count); +} + +static void pd_conjoint_jshorts_atomic(const jshort* from, jshort* to, size_t count) { + _Copy_conjoint_jshorts_atomic(from, to, count); +} + +static void pd_conjoint_jints_atomic(const jint* from, jint* to, size_t count) { + _Copy_conjoint_jints_atomic(from, to, count); +} + +static void pd_conjoint_jlongs_atomic(const jlong* from, jlong* to, size_t count) { + _Copy_conjoint_jlongs_atomic(from, to, count); +} + +static void pd_conjoint_oops_atomic(const oop* from, oop* to, size_t count) { + assert(BytesPerLong == BytesPerOop, "jlongs and oops must be the same size"); + _Copy_conjoint_jlongs_atomic((const jlong*)from, (jlong*)to, count); +} + +static void pd_arrayof_conjoint_bytes(const HeapWord* from, HeapWord* to, size_t count) { + _Copy_arrayof_conjoint_bytes(from, to, count); +} + +static void pd_arrayof_conjoint_jshorts(const HeapWord* from, HeapWord* to, size_t count) { + _Copy_arrayof_conjoint_jshorts(from, to, count); +} + +static void pd_arrayof_conjoint_jints(const HeapWord* from, HeapWord* to, size_t count) { + _Copy_arrayof_conjoint_jints(from, to, count); +} + +static void pd_arrayof_conjoint_jlongs(const HeapWord* from, HeapWord* to, size_t count) { + _Copy_arrayof_conjoint_jlongs(from, to, count); +} + +static void pd_arrayof_conjoint_oops(const HeapWord* from, HeapWord* to, size_t count) { + assert(!UseCompressedOops, "foo!"); + assert(BytesPerLong == BytesPerOop, "jlongs and oops must be the same size"); + _Copy_arrayof_conjoint_jlongs(from, to, count); +} +#endif // _WINDOWS + #endif // CPU_AARCH64_COPY_AARCH64_HPP diff --git a/src/hotspot/cpu/aarch64/foreign_globals_aarch64.cpp b/src/hotspot/cpu/aarch64/foreign_globals_aarch64.cpp index d08afc79a52451ed082ce5dafb7e2c24e8c4ec20..4334a395571a0b215ded547cbdd9d0e114b2d7ea 100644 --- a/src/hotspot/cpu/aarch64/foreign_globals_aarch64.cpp +++ b/src/hotspot/cpu/aarch64/foreign_globals_aarch64.cpp @@ -45,7 +45,7 @@ bool ABIDescriptor::is_volatile_reg(FloatRegister reg) const { const ABIDescriptor ForeignGlobals::parse_abi_descriptor_impl(jobject jabi) const { oop abi_oop = JNIHandles::resolve_non_null(jabi); ABIDescriptor abi; - const Register (*to_Register)(int) = as_Register; + constexpr Register (*to_Register)(int) = as_Register; objArrayOop inputStorage = cast(abi_oop->obj_field(ABI.inputStorage_offset)); loadArray(inputStorage, INTEGER_TYPE, abi._integer_argument_registers, to_Register); diff --git a/src/hotspot/cpu/aarch64/frame_aarch64.cpp b/src/hotspot/cpu/aarch64/frame_aarch64.cpp index 35cc1ee1f8402e4c52ed8dfe3af2a9686aa9db5e..cb59e8b12afc79f32b5e3793d216ed49b4beb000 100644 --- a/src/hotspot/cpu/aarch64/frame_aarch64.cpp +++ b/src/hotspot/cpu/aarch64/frame_aarch64.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2014, 2020, Red Hat Inc. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -358,6 +358,7 @@ frame frame::sender_for_entry_frame(RegisterMap* map) const { assert(map->include_argument_oops(), "should be set by clear"); vmassert(jfa->last_Java_pc() != NULL, "not walkable"); frame fr(jfa->last_Java_sp(), jfa->last_Java_fp(), jfa->last_Java_pc()); + fr.set_sp_is_trusted(); return fr; } @@ -463,12 +464,21 @@ frame frame::sender_for_interpreter_frame(RegisterMap* map) const { //------------------------------------------------------------------------------ // frame::sender_for_compiled_frame frame frame::sender_for_compiled_frame(RegisterMap* map) const { - // we cannot rely upon the last fp having been saved to the thread - // in C2 code but it will have been pushed onto the stack. so we - // have to find it relative to the unextended sp + // When the sp of a compiled frame is correct, we can get the correct sender sp + // by unextended sp + frame size. + // For the following two scenarios, the sp of a compiled frame is correct: + // a) This compiled frame is built from the anchor. + // b) This compiled frame is built from a callee frame, and the callee frame can + // calculate its sp correctly. + // + // For b), if the callee frame is a native code frame (such as leaf call), the sp of + // the compiled frame cannot be calculated correctly. There is currently no suitable + // solution to solve this problem perfectly. But when PreserveFramePointer is enabled, + // we can get the correct sender sp by fp + 2 (that is sender_sp()). assert(_cb->frame_size() >= 0, "must have non-zero frame size"); - intptr_t* l_sender_sp = unextended_sp() + _cb->frame_size(); + intptr_t* l_sender_sp = (!PreserveFramePointer || _sp_is_trusted) ? unextended_sp() + _cb->frame_size() + : sender_sp(); intptr_t* unextended_sp = l_sender_sp; // the return_address is always the word on the stack diff --git a/src/hotspot/cpu/aarch64/frame_aarch64.hpp b/src/hotspot/cpu/aarch64/frame_aarch64.hpp index 716c0ff9f1a59ee88bb2f045fc82d6589c96e021..95f470befa021ab433baf524045ece4c55d17786 100644 --- a/src/hotspot/cpu/aarch64/frame_aarch64.hpp +++ b/src/hotspot/cpu/aarch64/frame_aarch64.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2014, Red Hat Inc. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -124,6 +124,11 @@ intptr_t* _unextended_sp; void adjust_unextended_sp(); + // true means _sp value is correct and we can use it to get the sender's sp + // of the compiled frame, otherwise, _sp value may be invalid and we can use + // _fp to get the sender's sp if PreserveFramePointer is enabled. + bool _sp_is_trusted; + intptr_t* ptr_at_addr(int offset) const { return (intptr_t*) addr_at(offset); } @@ -165,4 +170,6 @@ // returns the sending frame, without applying any barriers frame sender_raw(RegisterMap* map) const; + void set_sp_is_trusted() { _sp_is_trusted = true; } + #endif // CPU_AARCH64_FRAME_AARCH64_HPP diff --git a/src/hotspot/cpu/aarch64/frame_aarch64.inline.hpp b/src/hotspot/cpu/aarch64/frame_aarch64.inline.hpp index 5be02aa57e7a3c8c56c21c19fe79c46060b08f92..b0fe436ca59609a5475c4503b755675a0c55bd58 100644 --- a/src/hotspot/cpu/aarch64/frame_aarch64.inline.hpp +++ b/src/hotspot/cpu/aarch64/frame_aarch64.inline.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2014, Red Hat Inc. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -41,6 +41,7 @@ inline frame::frame() { _fp = NULL; _cb = NULL; _deopt_state = unknown; + _sp_is_trusted = false; } static int spin; @@ -64,6 +65,7 @@ inline void frame::init(intptr_t* sp, intptr_t* fp, address pc) { } else { _deopt_state = not_deoptimized; } + _sp_is_trusted = false; } inline frame::frame(intptr_t* sp, intptr_t* fp, address pc) { @@ -91,6 +93,7 @@ inline frame::frame(intptr_t* sp, intptr_t* unextended_sp, intptr_t* fp, address } else { _deopt_state = not_deoptimized; } + _sp_is_trusted = false; } inline frame::frame(intptr_t* sp, intptr_t* fp) { @@ -122,6 +125,7 @@ inline frame::frame(intptr_t* sp, intptr_t* fp) { } else { _deopt_state = not_deoptimized; } + _sp_is_trusted = false; } // Accessors diff --git a/src/hotspot/cpu/aarch64/globalDefinitions_aarch64.hpp b/src/hotspot/cpu/aarch64/globalDefinitions_aarch64.hpp index 3c779bb11b15cfe961ccad89c6d4d78abe586269..fe88f7b887c1958e1368ed5eb6e0da74729feb39 100644 --- a/src/hotspot/cpu/aarch64/globalDefinitions_aarch64.hpp +++ b/src/hotspot/cpu/aarch64/globalDefinitions_aarch64.hpp @@ -67,4 +67,6 @@ const bool CCallingConventionRequiresIntsAsLongs = false; #define NOT_R18_RESERVED(code) code #endif +#define USE_POINTERS_TO_REGISTER_IMPL_ARRAY + #endif // CPU_AARCH64_GLOBALDEFINITIONS_AARCH64_HPP diff --git a/src/hotspot/cpu/aarch64/jniTypes_aarch64.hpp b/src/hotspot/cpu/aarch64/jniTypes_aarch64.hpp index 4254cdf4cfd575a0c57756ae6ca8f4cb59cbccc3..8d20a6a170152042c346d148347907b1c115c4f1 100644 --- a/src/hotspot/cpu/aarch64/jniTypes_aarch64.hpp +++ b/src/hotspot/cpu/aarch64/jniTypes_aarch64.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2014, Red Hat Inc. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -27,7 +27,7 @@ #define CPU_AARCH64_JNITYPES_AARCH64_HPP #include "jni.h" -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "oops/oop.hpp" // This file holds platform-dependent routines used to write primitive jni diff --git a/src/hotspot/cpu/aarch64/jvmciCodeInstaller_aarch64.cpp b/src/hotspot/cpu/aarch64/jvmciCodeInstaller_aarch64.cpp index 17b9780129db00d13f169645e305c7ffba0c52a0..aacca26a36c8843b80244dc4c9cdf00651767ca4 100644 --- a/src/hotspot/cpu/aarch64/jvmciCodeInstaller_aarch64.cpp +++ b/src/hotspot/cpu/aarch64/jvmciCodeInstaller_aarch64.cpp @@ -186,7 +186,7 @@ VMReg CodeInstaller::get_hotspot_reg(jint jvmci_reg, JVMCI_TRAPS) { if (jvmci_reg < RegisterImpl::number_of_registers) { return as_Register(jvmci_reg)->as_VMReg(); } else { - jint floatRegisterNumber = jvmci_reg - RegisterImpl::number_of_registers_for_jvmci; + jint floatRegisterNumber = jvmci_reg - RegisterImpl::number_of_declared_registers; if (floatRegisterNumber >= 0 && floatRegisterNumber < FloatRegisterImpl::number_of_registers) { return as_FloatRegister(floatRegisterNumber)->as_VMReg(); } diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp index bcb5eb92a0bdbe679704095bf33a2e25339d1651..69124c299c15145aef0debd8e49596f396dd35d6 100644 --- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp +++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2014, 2021, Red Hat Inc. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -29,6 +29,7 @@ #include "jvm.h" #include "asm/assembler.hpp" #include "asm/assembler.inline.hpp" +#include "ci/ciEnv.hpp" #include "gc/shared/barrierSet.hpp" #include "gc/shared/barrierSetAssembler.hpp" #include "gc/shared/cardTableBarrierSet.hpp" @@ -159,8 +160,7 @@ int MacroAssembler::pd_patch_instruction_size(address branch, address target) { Instruction_aarch64::patch(branch+8, 20, 5, (dest >>= 16) & 0xffff); assert(target_addr_for_insn(branch) == target, "should be"); instructions = 3; - } else if (Instruction_aarch64::extract(insn, 31, 22) == 0b1011100101 && - Instruction_aarch64::extract(insn, 4, 0) == 0b11111) { + } else if (NativeInstruction::is_ldrw_to_zr(address(&insn))) { // nothing to do assert(target == 0, "did not expect to relocate target for polling page load"); } else { @@ -283,15 +283,19 @@ address MacroAssembler::target_addr_for_insn(address insn_addr, unsigned insn) { return address(uint64_t(Instruction_aarch64::extract(insns[0], 20, 5)) + (uint64_t(Instruction_aarch64::extract(insns[1], 20, 5)) << 16) + (uint64_t(Instruction_aarch64::extract(insns[2], 20, 5)) << 32)); - } else if (Instruction_aarch64::extract(insn, 31, 22) == 0b1011100101 && - Instruction_aarch64::extract(insn, 4, 0) == 0b11111) { - return 0; } else { ShouldNotReachHere(); } return address(((uint64_t)insn_addr + (offset << 2))); } +address MacroAssembler::target_addr_for_insn_or_null(address insn_addr, unsigned insn) { + if (NativeInstruction::is_ldrw_to_zr(address(&insn))) { + return 0; + } + return MacroAssembler::target_addr_for_insn(insn_addr, insn); +} + void MacroAssembler::safepoint_poll(Label& slow_path, bool at_return, bool acquire, bool in_nmethod) { if (acquire) { lea(rscratch1, Address(rthread, JavaThread::polling_word_offset())); @@ -4923,111 +4927,118 @@ void MacroAssembler::fill_words(Register base, Register cnt, Register value) bind(fini); } -// Intrinsic for sun/nio/cs/ISO_8859_1$Encoder.implEncodeISOArray and -// java/lang/StringUTF16.compress. +// Intrinsic for +// +// - sun/nio/cs/ISO_8859_1$Encoder.implEncodeISOArray +// return the number of characters copied. +// - java/lang/StringUTF16.compress +// return zero (0) if copy fails, otherwise 'len'. +// +// This version always returns the number of characters copied, and does not +// clobber the 'len' register. A successful copy will complete with the post- +// condition: 'res' == 'len', while an unsuccessful copy will exit with the +// post-condition: 0 <= 'res' < 'len'. +// +// NOTE: Attempts to use 'ld2' (and 'umaxv' in the ISO part) has proven to +// degrade performance (on Ampere Altra - Neoverse N1), to an extent +// beyond the acceptable, even though the footprint would be smaller. +// Using 'umaxv' in the ASCII-case comes with a small penalty but does +// avoid additional bloat. +// void MacroAssembler::encode_iso_array(Register src, Register dst, - Register len, Register result, - FloatRegister Vtmp1, FloatRegister Vtmp2, - FloatRegister Vtmp3, FloatRegister Vtmp4) + Register len, Register res, bool ascii, + FloatRegister vtmp0, FloatRegister vtmp1, + FloatRegister vtmp2, FloatRegister vtmp3) { - Label DONE, SET_RESULT, NEXT_32, NEXT_32_PRFM, LOOP_8, NEXT_8, LOOP_1, NEXT_1, - NEXT_32_START, NEXT_32_PRFM_START; - Register tmp1 = rscratch1, tmp2 = rscratch2; - - mov(result, len); // Save initial len - - cmp(len, (u1)8); // handle shortest strings first - br(LT, LOOP_1); - cmp(len, (u1)32); - br(LT, NEXT_8); - // The following code uses the SIMD 'uzp1' and 'uzp2' instructions - // to convert chars to bytes - if (SoftwarePrefetchHintDistance >= 0) { - ld1(Vtmp1, Vtmp2, Vtmp3, Vtmp4, T8H, src); - subs(tmp2, len, SoftwarePrefetchHintDistance/2 + 16); - br(LE, NEXT_32_START); - b(NEXT_32_PRFM_START); - BIND(NEXT_32_PRFM); - ld1(Vtmp1, Vtmp2, Vtmp3, Vtmp4, T8H, src); - BIND(NEXT_32_PRFM_START); - prfm(Address(src, SoftwarePrefetchHintDistance)); - orr(v4, T16B, Vtmp1, Vtmp2); - orr(v5, T16B, Vtmp3, Vtmp4); - uzp1(Vtmp1, T16B, Vtmp1, Vtmp2); - uzp1(Vtmp3, T16B, Vtmp3, Vtmp4); - uzp2(v5, T16B, v4, v5); // high bytes - umov(tmp2, v5, D, 1); - fmovd(tmp1, v5); - orr(tmp1, tmp1, tmp2); - cbnz(tmp1, LOOP_8); - stpq(Vtmp1, Vtmp3, dst); - sub(len, len, 32); - add(dst, dst, 32); - add(src, src, 64); - subs(tmp2, len, SoftwarePrefetchHintDistance/2 + 16); - br(GE, NEXT_32_PRFM); - cmp(len, (u1)32); - br(LT, LOOP_8); - BIND(NEXT_32); - ld1(Vtmp1, Vtmp2, Vtmp3, Vtmp4, T8H, src); - BIND(NEXT_32_START); - } else { - BIND(NEXT_32); - ld1(Vtmp1, Vtmp2, Vtmp3, Vtmp4, T8H, src); - } - prfm(Address(src, SoftwarePrefetchHintDistance)); - uzp1(v4, T16B, Vtmp1, Vtmp2); - uzp1(v5, T16B, Vtmp3, Vtmp4); - orr(Vtmp1, T16B, Vtmp1, Vtmp2); - orr(Vtmp3, T16B, Vtmp3, Vtmp4); - uzp2(Vtmp1, T16B, Vtmp1, Vtmp3); // high bytes - umov(tmp2, Vtmp1, D, 1); - fmovd(tmp1, Vtmp1); - orr(tmp1, tmp1, tmp2); - cbnz(tmp1, LOOP_8); - stpq(v4, v5, dst); - sub(len, len, 32); - add(dst, dst, 32); - add(src, src, 64); - cmp(len, (u1)32); - br(GE, NEXT_32); - cbz(len, DONE); - - BIND(LOOP_8); - cmp(len, (u1)8); - br(LT, LOOP_1); - BIND(NEXT_8); - ld1(Vtmp1, T8H, src); - uzp1(Vtmp2, T16B, Vtmp1, Vtmp1); // low bytes - uzp2(Vtmp3, T16B, Vtmp1, Vtmp1); // high bytes - fmovd(tmp1, Vtmp3); - cbnz(tmp1, NEXT_1); - strd(Vtmp2, dst); - - sub(len, len, 8); - add(dst, dst, 8); - add(src, src, 16); - cmp(len, (u1)8); - br(GE, NEXT_8); - - BIND(LOOP_1); - - cbz(len, DONE); - BIND(NEXT_1); - ldrh(tmp1, Address(post(src, 2))); - tst(tmp1, 0xff00); - br(NE, SET_RESULT); - strb(tmp1, Address(post(dst, 1))); - subs(len, len, 1); - br(GT, NEXT_1); - - BIND(SET_RESULT); - sub(result, result, len); // Return index where we stopped - // Return len == 0 if we processed all - // characters - BIND(DONE); -} + Register cnt = res; + Register max = rscratch1; + Register chk = rscratch2; + prfm(Address(src), PLDL1STRM); + movw(cnt, len); + +#define ASCII(insn) do { if (ascii) { insn; } } while (0) + + Label LOOP_32, DONE_32, FAIL_32; + + BIND(LOOP_32); + { + cmpw(cnt, 32); + br(LT, DONE_32); + ld1(vtmp0, vtmp1, vtmp2, vtmp3, T8H, Address(post(src, 64))); + // Extract lower bytes. + FloatRegister vlo0 = v4; + FloatRegister vlo1 = v5; + uzp1(vlo0, T16B, vtmp0, vtmp1); + uzp1(vlo1, T16B, vtmp2, vtmp3); + // Merge bits... + orr(vtmp0, T16B, vtmp0, vtmp1); + orr(vtmp2, T16B, vtmp2, vtmp3); + // Extract merged upper bytes. + FloatRegister vhix = vtmp0; + uzp2(vhix, T16B, vtmp0, vtmp2); + // ISO-check on hi-parts (all zero). + // ASCII-check on lo-parts (no sign). + FloatRegister vlox = vtmp1; // Merge lower bytes. + ASCII(orr(vlox, T16B, vlo0, vlo1)); + umov(chk, vhix, D, 1); ASCII(cmlt(vlox, T16B, vlox)); + fmovd(max, vhix); ASCII(umaxv(vlox, T16B, vlox)); + orr(chk, chk, max); ASCII(umov(max, vlox, B, 0)); + ASCII(orr(chk, chk, max)); + cbnz(chk, FAIL_32); + subw(cnt, cnt, 32); + st1(vlo0, vlo1, T16B, Address(post(dst, 32))); + b(LOOP_32); + } + BIND(FAIL_32); + sub(src, src, 64); + BIND(DONE_32); + + Label LOOP_8, SKIP_8; + + BIND(LOOP_8); + { + cmpw(cnt, 8); + br(LT, SKIP_8); + FloatRegister vhi = vtmp0; + FloatRegister vlo = vtmp1; + ld1(vtmp3, T8H, src); + uzp1(vlo, T16B, vtmp3, vtmp3); + uzp2(vhi, T16B, vtmp3, vtmp3); + // ISO-check on hi-parts (all zero). + // ASCII-check on lo-parts (no sign). + ASCII(cmlt(vtmp2, T16B, vlo)); + fmovd(chk, vhi); ASCII(umaxv(vtmp2, T16B, vtmp2)); + ASCII(umov(max, vtmp2, B, 0)); + ASCII(orr(chk, chk, max)); + cbnz(chk, SKIP_8); + + strd(vlo, Address(post(dst, 8))); + subw(cnt, cnt, 8); + add(src, src, 16); + b(LOOP_8); + } + BIND(SKIP_8); + +#undef ASCII + + Label LOOP, DONE; + + cbz(cnt, DONE); + BIND(LOOP); + { + Register chr = rscratch1; + ldrh(chr, Address(post(src, 2))); + tst(chr, ascii ? 0xff80 : 0xff00); + br(NE, DONE); + strb(chr, Address(post(dst, 1))); + subs(cnt, cnt, 1); + br(GT, LOOP); + } + BIND(DONE); + // Return index where we stopped. + subw(res, len, cnt); +} // Inflate byte[] array to char[]. address MacroAssembler::byte_array_inflate(Register src, Register dst, Register len, @@ -5136,13 +5147,13 @@ address MacroAssembler::byte_array_inflate(Register src, Register dst, Register // Compress char[] array to byte[]. void MacroAssembler::char_array_compress(Register src, Register dst, Register len, - FloatRegister tmp1Reg, FloatRegister tmp2Reg, - FloatRegister tmp3Reg, FloatRegister tmp4Reg, - Register result) { - encode_iso_array(src, dst, len, result, - tmp1Reg, tmp2Reg, tmp3Reg, tmp4Reg); - cmp(len, zr); - csel(result, result, zr, EQ); + Register res, + FloatRegister tmp0, FloatRegister tmp1, + FloatRegister tmp2, FloatRegister tmp3) { + encode_iso_array(src, dst, len, res, false, tmp0, tmp1, tmp2, tmp3); + // Adjust result: res == len ? len : 0 + cmp(len, res); + csel(res, res, zr, EQ); } // get_thread() can be called anywhere inside generated code so we diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp index a9ebc8bdc69196fe97229633737f99992c20701f..16f9790bde42c20cb808f6c2321b7135c1279452 100644 --- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp +++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2014, 2021, Red Hat Inc. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -27,6 +27,7 @@ #define CPU_AARCH64_MACROASSEMBLER_AARCH64_HPP #include "asm/assembler.inline.hpp" +#include "metaprogramming/enableIf.hpp" #include "oops/compressedOops.hpp" #include "runtime/vm_version.hpp" #include "utilities/powerOfTwo.hpp" @@ -493,17 +494,10 @@ public: inline void mov(Register dst, address addr) { mov_immediate64(dst, (uint64_t)addr); } - inline void mov(Register dst, int imm64) { mov_immediate64(dst, (uint64_t)imm64); } - inline void mov(Register dst, long imm64) { mov_immediate64(dst, (uint64_t)imm64); } - inline void mov(Register dst, long long imm64) { mov_immediate64(dst, (uint64_t)imm64); } - inline void mov(Register dst, unsigned int imm64) { mov_immediate64(dst, (uint64_t)imm64); } - inline void mov(Register dst, unsigned long imm64) { mov_immediate64(dst, (uint64_t)imm64); } - inline void mov(Register dst, unsigned long long imm64) { mov_immediate64(dst, (uint64_t)imm64); } + template::value)> + inline void mov(Register dst, T o) { mov_immediate64(dst, (uint64_t)o); } - inline void movw(Register dst, uint32_t imm32) - { - mov_immediate32(dst, imm32); - } + inline void movw(Register dst, uint32_t imm32) { mov_immediate32(dst, imm32); } void mov(Register dst, RegisterOrConstant src) { if (src.is_register()) @@ -606,10 +600,15 @@ public: static bool uses_implicit_null_check(void* address); static address target_addr_for_insn(address insn_addr, unsigned insn); + static address target_addr_for_insn_or_null(address insn_addr, unsigned insn); static address target_addr_for_insn(address insn_addr) { unsigned insn = *(unsigned*)insn_addr; return target_addr_for_insn(insn_addr, insn); } + static address target_addr_for_insn_or_null(address insn_addr) { + unsigned insn = *(unsigned*)insn_addr; + return target_addr_for_insn_or_null(insn_addr, insn); + } // Required platform-specific helpers for Label::patch_instructions. // They _shadow_ the declarations in AbstractAssembler, which are undefined. @@ -1255,14 +1254,15 @@ public: FloatRegister vtmp3, Register tmp4); void char_array_compress(Register src, Register dst, Register len, - FloatRegister tmp1Reg, FloatRegister tmp2Reg, - FloatRegister tmp3Reg, FloatRegister tmp4Reg, - Register result); + Register res, + FloatRegister vtmp0, FloatRegister vtmp1, + FloatRegister vtmp2, FloatRegister vtmp3); void encode_iso_array(Register src, Register dst, - Register len, Register result, - FloatRegister Vtmp1, FloatRegister Vtmp2, - FloatRegister Vtmp3, FloatRegister Vtmp4); + Register len, Register res, bool ascii, + FloatRegister vtmp0, FloatRegister vtmp1, + FloatRegister vtmp2, FloatRegister vtmp3); + void fast_log(FloatRegister vtmp0, FloatRegister vtmp1, FloatRegister vtmp2, FloatRegister vtmp3, FloatRegister vtmp4, FloatRegister vtmp5, FloatRegister tmpC1, FloatRegister tmpC2, FloatRegister tmpC3, diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64_log.cpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64_log.cpp index d65c3df226d7d4270d33bc03eb21778f8ce6cdc7..45772ff1afd63a2d1f14482bf05bbc9f8f536055 100644 --- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64_log.cpp +++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64_log.cpp @@ -297,7 +297,8 @@ void MacroAssembler::fast_log(FloatRegister vtmp0, FloatRegister vtmp1, bind(MAIN); fmovs(tmp3, vtmp5); // int intB0 = AS_INT_BITS(B); mov(tmp5, 0x3FE0); - mov(rscratch1, 0xffffe00000000000); + uint64_t mask = UCONST64(0xffffe00000000000); + mov(rscratch1, mask); andr(tmp2, tmp2, tmp1, LSR, 48); // hiWord & 0x7FF0 sub(tmp2, tmp2, tmp5); // tmp2 = hiWord & 0x7FF0 - 0x3FE0 scvtfwd(vtmp5, tmp2); // vtmp5 = (double)tmp2; diff --git a/src/hotspot/cpu/aarch64/matcher_aarch64.hpp b/src/hotspot/cpu/aarch64/matcher_aarch64.hpp index f2f55e504accdd515d60d895fadc940806da20bd..aca82240a5731fb10d8734bbce8411763b8744de 100644 --- a/src/hotspot/cpu/aarch64/matcher_aarch64.hpp +++ b/src/hotspot/cpu/aarch64/matcher_aarch64.hpp @@ -161,6 +161,6 @@ } // Implements a variant of EncodeISOArrayNode that encode ASCII only - static const bool supports_encode_ascii_array = false; + static const bool supports_encode_ascii_array = true; #endif // CPU_AARCH64_MATCHER_AARCH64_HPP diff --git a/src/hotspot/cpu/aarch64/nativeInst_aarch64.cpp b/src/hotspot/cpu/aarch64/nativeInst_aarch64.cpp index d808e4b5b53de9eb13da164cca7dc24871a72dbd..7599c21c2fcaa88e107b457f5963e19ba9f6d48d 100644 --- a/src/hotspot/cpu/aarch64/nativeInst_aarch64.cpp +++ b/src/hotspot/cpu/aarch64/nativeInst_aarch64.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2014, 2020, Red Hat Inc. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -315,7 +315,7 @@ void NativeMovRegMem::set_offset(int x) { void NativeMovRegMem::verify() { #ifdef ASSERT - address dest = MacroAssembler::target_addr_for_insn(instruction_address()); + address dest = MacroAssembler::target_addr_for_insn_or_null(instruction_address()); #endif } @@ -329,7 +329,7 @@ void NativeJump::check_verified_entry_alignment(address entry, address verified_ address NativeJump::jump_destination() const { - address dest = MacroAssembler::target_addr_for_insn(instruction_address()); + address dest = MacroAssembler::target_addr_for_insn_or_null(instruction_address()); // We use jump to self as the unresolved address which the inline // cache code (and relocs) know about diff --git a/src/hotspot/cpu/aarch64/register_aarch64.cpp b/src/hotspot/cpu/aarch64/register_aarch64.cpp index b785457ae29ccdc206d839ca0121912366af5a3e..096e480a824cc21c6e250aa057e7bba2497fca4d 100644 --- a/src/hotspot/cpu/aarch64/register_aarch64.cpp +++ b/src/hotspot/cpu/aarch64/register_aarch64.cpp @@ -26,6 +26,10 @@ #include "precompiled.hpp" #include "register_aarch64.hpp" +REGISTER_IMPL_DEFINITION(Register, RegisterImpl, RegisterImpl::number_of_declared_registers); +REGISTER_IMPL_DEFINITION(FloatRegister, FloatRegisterImpl, FloatRegisterImpl::number_of_registers); +REGISTER_IMPL_DEFINITION(PRegister, PRegisterImpl, PRegisterImpl::number_of_registers); + const int ConcreteRegisterImpl::max_gpr = RegisterImpl::number_of_registers * RegisterImpl::max_slots_per_register; @@ -38,7 +42,7 @@ const int ConcreteRegisterImpl::max_pr PRegisterImpl::number_of_registers * PRegisterImpl::max_slots_per_register; const char* RegisterImpl::name() const { - const char* names[number_of_registers] = { + static const char *const names[number_of_registers] = { "c_rarg0", "c_rarg1", "c_rarg2", "c_rarg3", "c_rarg4", "c_rarg5", "c_rarg6", "c_rarg7", "rscratch1", "rscratch2", "r10", "r11", "r12", "r13", "r14", "r15", "r16", @@ -50,7 +54,7 @@ const char* RegisterImpl::name() const { } const char* FloatRegisterImpl::name() const { - const char* names[number_of_registers] = { + static const char *const names[number_of_registers] = { "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v8", "v9", "v10", "v11", "v12", "v13", "v14", "v15", "v16", "v17", "v18", "v19", "v20", "v21", "v22", "v23", @@ -60,7 +64,7 @@ const char* FloatRegisterImpl::name() const { } const char* PRegisterImpl::name() const { - const char* names[number_of_registers] = { + static const char *const names[number_of_registers] = { "p0", "p1", "p2", "p3", "p4", "p5", "p6", "p7", "p8", "p9", "p10", "p11", "p12", "p13", "p14", "p15" }; diff --git a/src/hotspot/cpu/aarch64/register_aarch64.hpp b/src/hotspot/cpu/aarch64/register_aarch64.hpp index 7b472856dc442a7a0a0654f45ffcb477d77ce445..7e531710c1d1fe2ce0cc925de324d361d27aab6f 100644 --- a/src/hotspot/cpu/aarch64/register_aarch64.hpp +++ b/src/hotspot/cpu/aarch64/register_aarch64.hpp @@ -34,42 +34,42 @@ typedef VMRegImpl* VMReg; // Use Register as shortcut class RegisterImpl; -typedef RegisterImpl* Register; +typedef const RegisterImpl* Register; -inline const Register as_Register(int encoding) { - return (Register)(intptr_t) encoding; -} +inline constexpr Register as_Register(int encoding); class RegisterImpl: public AbstractRegisterImpl { - public: + static constexpr Register first(); + +public: enum { number_of_registers = 32, - number_of_byte_registers = 32, - number_of_registers_for_jvmci = 34, // Including SP and ZR. + number_of_declared_registers = 34, // Including SP and ZR. max_slots_per_register = 2 }; // derived registers, offsets, and addresses - Register successor() const { return as_Register(encoding() + 1); } + const Register successor() const { return this + 1; } // construction - inline friend const Register as_Register(int encoding); + inline friend constexpr Register as_Register(int encoding); - VMReg as_VMReg(); + VMReg as_VMReg() const; // accessors - int encoding() const { assert(is_valid(), "invalid register"); return (intptr_t)this; } - bool is_valid() const { return 0 <= (intptr_t)this && (intptr_t)this < number_of_registers; } - bool has_byte_register() const { return 0 <= (intptr_t)this && (intptr_t)this < number_of_byte_registers; } + int encoding() const { assert(is_valid(), "invalid register"); return encoding_nocheck(); } + bool is_valid() const { return (unsigned)encoding_nocheck() < number_of_registers; } const char* name() const; - int encoding_nocheck() const { return (intptr_t)this; } + int encoding_nocheck() const { return this - first(); } }; + +REGISTER_IMPL_DECLARATION(Register, RegisterImpl, RegisterImpl::number_of_declared_registers); + // The integer registers of the aarch64 architecture CONSTANT_REGISTER_DECLARATION(Register, noreg, (-1)); - CONSTANT_REGISTER_DECLARATION(Register, r0, (0)); CONSTANT_REGISTER_DECLARATION(Register, r1, (1)); CONSTANT_REGISTER_DECLARATION(Register, r2, (2)); @@ -126,15 +126,15 @@ const Register dummy_reg = r31_sp; // Use FloatRegister as shortcut class FloatRegisterImpl; -typedef FloatRegisterImpl* FloatRegister; +typedef const FloatRegisterImpl* FloatRegister; -inline FloatRegister as_FloatRegister(int encoding) { - return (FloatRegister)(intptr_t) encoding; -} +inline constexpr FloatRegister as_FloatRegister(int encoding); // The implementation of floating point registers for the architecture class FloatRegisterImpl: public AbstractRegisterImpl { - public: + static constexpr FloatRegister first(); + +public: enum { number_of_registers = 32, max_slots_per_register = 8, @@ -144,21 +144,25 @@ class FloatRegisterImpl: public AbstractRegisterImpl { }; // construction - inline friend FloatRegister as_FloatRegister(int encoding); + inline friend constexpr FloatRegister as_FloatRegister(int encoding); - VMReg as_VMReg(); + VMReg as_VMReg() const; // derived registers, offsets, and addresses - FloatRegister successor() const { return as_FloatRegister((encoding() + 1) % 32); } + FloatRegister successor() const { + return as_FloatRegister((encoding() + 1) % (unsigned)number_of_registers); + } // accessors - int encoding() const { assert(is_valid(), "invalid register"); return (intptr_t)this; } - int encoding_nocheck() const { return (intptr_t)this; } - bool is_valid() const { return 0 <= (intptr_t)this && (intptr_t)this < number_of_registers; } + int encoding() const { assert(is_valid(), "invalid register"); return encoding_nocheck(); } + bool is_valid() const { return (unsigned)encoding_nocheck() < number_of_registers; } const char* name() const; - + int encoding_nocheck() const { return this - first(); } }; +REGISTER_IMPL_DECLARATION(FloatRegister, FloatRegisterImpl, FloatRegisterImpl::number_of_registers); + + // The float registers of the AARCH64 architecture CONSTANT_REGISTER_DECLARATION(FloatRegister, fnoreg , (-1)); @@ -232,13 +236,13 @@ CONSTANT_REGISTER_DECLARATION(FloatRegister, z31 , (31)); class PRegisterImpl; -typedef PRegisterImpl* PRegister; -inline PRegister as_PRegister(int encoding) { - return (PRegister)(intptr_t)encoding; -} +typedef const PRegisterImpl* PRegister; +inline constexpr PRegister as_PRegister(int encoding); // The implementation of predicate registers for the architecture class PRegisterImpl: public AbstractRegisterImpl { + static constexpr PRegister first(); + public: enum { number_of_registers = 16, @@ -252,21 +256,24 @@ class PRegisterImpl: public AbstractRegisterImpl { }; // construction - inline friend PRegister as_PRegister(int encoding); + inline friend constexpr PRegister as_PRegister(int encoding); - VMReg as_VMReg(); + VMReg as_VMReg() const; // derived registers, offsets, and addresses - PRegister successor() const { return as_PRegister(encoding() + 1); } + PRegister successor() const { return this + 1; } // accessors - int encoding() const { assert(is_valid(), "invalid register"); return (intptr_t)this; } - int encoding_nocheck() const { return (intptr_t)this; } - bool is_valid() const { return 0 <= (intptr_t)this && (intptr_t)this < number_of_registers; } - bool is_governing() const { return 0 <= (intptr_t)this && (intptr_t)this < number_of_governing_registers; } + int encoding() const { assert(is_valid(), "invalid register"); return encoding_nocheck(); } + int encoding_nocheck() const { return this - first(); } + bool is_valid() const { return (unsigned)encoding_nocheck() < number_of_registers; } + bool is_governing() const { return first() <= this && this - first() < number_of_governing_registers; } const char* name() const; }; + +REGISTER_IMPL_DECLARATION(PRegister, PRegisterImpl, PRegisterImpl::number_of_registers); + // The predicate registers of SVE. CONSTANT_REGISTER_DECLARATION(PRegister, pnoreg, (-1)); diff --git a/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp b/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp index 254cde16e0922a4b3ebebe43b6f52ce51ee2ff67..08cc2b20a61e2ad6d33f09446d29942057009db9 100644 --- a/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp +++ b/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp @@ -1783,13 +1783,14 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm, // Simple recursive lock? __ ldr(rscratch1, Address(sp, lock_slot_offset * VMRegImpl::stack_slot_size)); __ cbz(rscratch1, done); + } - // Must save r0 if if it is live now because cmpxchg must use it - if (ret_type != T_FLOAT && ret_type != T_DOUBLE && ret_type != T_VOID) { - save_native_result(masm, ret_type, stack_slots); - } - + // Must save r0 if if it is live now because cmpxchg must use it + if (ret_type != T_FLOAT && ret_type != T_DOUBLE && ret_type != T_VOID) { + save_native_result(masm, ret_type, stack_slots); + } + if (!UseHeavyMonitors) { // get address of the stack lock __ lea(r0, Address(sp, lock_slot_offset * VMRegImpl::stack_slot_size)); // get old displaced header diff --git a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp index dbfdae754afd871ed31807779c0579094fcf336c..7d7f9b57e8c35446d28660a716ed7e3540baa30f 100644 --- a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp +++ b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp @@ -1,6 +1,6 @@ /* - * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2014, 2021, Red Hat Inc. All rights reserved. + * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2022, Red Hat 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 @@ -5337,11 +5337,11 @@ class StubGenerator: public StubCodeGenerator { __ add(str1, str1, wordSize); __ add(str2, str2, wordSize); if (SoftwarePrefetchHintDistance >= 0) { + __ align(OptoLoopAlignment); __ bind(LARGE_LOOP_PREFETCH); __ prfm(Address(str1, SoftwarePrefetchHintDistance)); __ prfm(Address(str2, SoftwarePrefetchHintDistance)); - __ align(OptoLoopAlignment); for (int i = 0; i < 4; i++) { __ ldp(tmp1, tmp1h, Address(str1, i * 16)); __ ldp(tmp2, tmp2h, Address(str2, i * 16)); diff --git a/src/hotspot/cpu/aarch64/universalUpcallHandler_aarch64.cpp b/src/hotspot/cpu/aarch64/universalUpcallHandler_aarch64.cpp index 41bb34e40abe5f2b84db77c9f10ed2b5a986198a..e3287652891a40b2642c87167feee49999504fa0 100644 --- a/src/hotspot/cpu/aarch64/universalUpcallHandler_aarch64.cpp +++ b/src/hotspot/cpu/aarch64/universalUpcallHandler_aarch64.cpp @@ -71,7 +71,8 @@ address ProgrammableUpcallHandler::generate_upcall_stub(jobject rec, jobject jab // Capture prev stack pointer (stack arguments base) __ add(rscratch1, rfp, 16); // Skip saved FP and LR - __ str(rscratch1, Address(sp, layout.stack_args)); + Address slot = __ legitimize_address(Address(sp, layout.stack_args), wordSize, rscratch2); + __ str(rscratch1, slot); // Call upcall helper __ ldr(c_rarg0, rec_adr); diff --git a/src/hotspot/cpu/aarch64/vmreg_aarch64.inline.hpp b/src/hotspot/cpu/aarch64/vmreg_aarch64.inline.hpp index 8452417b6cf188d4d90341271c23b3c2cc95519c..aa750104896f104e23d4541c9cd81cd37a62bf4d 100644 --- a/src/hotspot/cpu/aarch64/vmreg_aarch64.inline.hpp +++ b/src/hotspot/cpu/aarch64/vmreg_aarch64.inline.hpp @@ -26,17 +26,17 @@ #ifndef CPU_AARCH64_VMREG_AARCH64_INLINE_HPP #define CPU_AARCH64_VMREG_AARCH64_INLINE_HPP -inline VMReg RegisterImpl::as_VMReg() { +inline VMReg RegisterImpl::as_VMReg() const { if( this==noreg ) return VMRegImpl::Bad(); return VMRegImpl::as_VMReg(encoding() * RegisterImpl::max_slots_per_register); } -inline VMReg FloatRegisterImpl::as_VMReg() { +inline VMReg FloatRegisterImpl::as_VMReg() const { return VMRegImpl::as_VMReg((encoding() * FloatRegisterImpl::max_slots_per_register) + ConcreteRegisterImpl::max_gpr); } -inline VMReg PRegisterImpl::as_VMReg() { +inline VMReg PRegisterImpl::as_VMReg() const { return VMRegImpl::as_VMReg(encoding() + ConcreteRegisterImpl::max_fpr); } diff --git a/src/hotspot/cpu/arm/arm.ad b/src/hotspot/cpu/arm/arm.ad index 42d6d4151b28669400511d4fb21b6537557792cb..f2ac7b58e7336b859ee494318270823ed9107d16 100644 --- a/src/hotspot/cpu/arm/arm.ad +++ b/src/hotspot/cpu/arm/arm.ad @@ -1,5 +1,5 @@ // -// Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved. +// Copyright (c) 2008, 2022, 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 @@ -123,9 +123,18 @@ public: }; }; +// Assert that the given node is not a var shift. +bool assert_not_var_shift(const Node *n); %} source %{ + +// Assert that the given node is not a var shift. +bool assert_not_var_shift(const Node *n) { + assert(!n->as_ShiftV()->is_var_shift(), "illegal var shift"); + return true; +} + #define __ _masm. static FloatRegister reg_to_FloatRegister_object(int register_encoding); @@ -10591,7 +10600,7 @@ instruct vneg16B_reg(vecX dst, vecX src) %{ ins_pipe( ialu_reg_reg ); // FIXME %} -// ------------------------------ Shift --------------------------------------- +// ------------------------------ ShiftCount ---------------------------------- instruct vslcntD(vecD dst, iRegI cnt) %{ predicate(n->as_Vector()->length_in_bytes() == 8 && VM_Version::has_simd()); @@ -10650,6 +10659,8 @@ instruct vsrcntX(vecX dst, iRegI cnt) %{ ins_pipe( ialu_reg_reg ); // FIXME %} +// ------------------------------ LogicalShift -------------------------------- + // Byte vector logical left/right shift based on sign instruct vsh8B_reg(vecD dst, vecD src, vecD shift) %{ predicate(n->as_Vector()->length() == 8); @@ -10766,9 +10777,9 @@ instruct vsh2L_reg(vecX dst, vecX src, vecX shift) %{ ins_pipe( ialu_reg_reg ); // FIXME %} -// ------------------------------ LeftShift ----------------------------------- +// ------------------------------ LogicalLeftShift ---------------------------- -// Byte vector left shift +// Byte vector logical left shift instruct vsl8B_reg(vecD dst, vecD src, vecD shift) %{ predicate(n->as_Vector()->length() == 8); match(Set dst (LShiftVB src shift)); @@ -10790,7 +10801,7 @@ instruct vsl16B_reg(vecX dst, vecX src, vecX shift) %{ %} instruct vsl8B_immI(vecD dst, vecD src, immI shift) %{ - predicate(n->as_Vector()->length() == 8); + predicate(n->as_Vector()->length() == 8 && assert_not_var_shift(n)); match(Set dst (LShiftVB src (LShiftCntV shift))); size(4); ins_cost(DEFAULT_COST); // FIXME @@ -10806,7 +10817,7 @@ instruct vsl8B_immI(vecD dst, vecD src, immI shift) %{ %} instruct vsl16B_immI(vecX dst, vecX src, immI shift) %{ - predicate(n->as_Vector()->length() == 16); + predicate(n->as_Vector()->length() == 16 && assert_not_var_shift(n)); match(Set dst (LShiftVB src (LShiftCntV shift))); size(4); ins_cost(DEFAULT_COST); // FIXME @@ -10821,11 +10832,10 @@ instruct vsl16B_immI(vecX dst, vecX src, immI shift) %{ ins_pipe( ialu_reg_reg ); // FIXME %} -// Shorts/Chars vector logical left/right shift +// Shorts/Chars vector logical left shift instruct vsl4S_reg(vecD dst, vecD src, vecD shift) %{ predicate(n->as_Vector()->length() == 4); match(Set dst (LShiftVS src shift)); - match(Set dst (URShiftVS src shift)); size(4*1); ins_cost(DEFAULT_COST*1); // FIXME expand %{ @@ -10836,7 +10846,6 @@ instruct vsl4S_reg(vecD dst, vecD src, vecD shift) %{ instruct vsl8S_reg(vecX dst, vecX src, vecX shift) %{ predicate(n->as_Vector()->length() == 8); match(Set dst (LShiftVS src shift)); - match(Set dst (URShiftVS src shift)); size(4*1); ins_cost(DEFAULT_COST*1); // FIXME expand %{ @@ -10845,7 +10854,7 @@ instruct vsl8S_reg(vecX dst, vecX src, vecX shift) %{ %} instruct vsl4S_immI(vecD dst, vecD src, immI shift) %{ - predicate(n->as_Vector()->length() == 4); + predicate(n->as_Vector()->length() == 4 && assert_not_var_shift(n)); match(Set dst (LShiftVS src (LShiftCntV shift))); size(4); ins_cost(DEFAULT_COST); // FIXME @@ -10861,7 +10870,7 @@ instruct vsl4S_immI(vecD dst, vecD src, immI shift) %{ %} instruct vsl8S_immI(vecX dst, vecX src, immI shift) %{ - predicate(n->as_Vector()->length() == 8); + predicate(n->as_Vector()->length() == 8 && assert_not_var_shift(n)); match(Set dst (LShiftVS src shift)); size(4); ins_cost(DEFAULT_COST); // FIXME @@ -10876,11 +10885,10 @@ instruct vsl8S_immI(vecX dst, vecX src, immI shift) %{ ins_pipe( ialu_reg_reg ); // FIXME %} -// Integers vector logical left/right shift +// Integers vector logical left shift instruct vsl2I_reg(vecD dst, vecD src, vecD shift) %{ predicate(n->as_Vector()->length() == 2 && VM_Version::has_simd()); match(Set dst (LShiftVI src shift)); - match(Set dst (URShiftVI src shift)); size(4*1); ins_cost(DEFAULT_COST*1); // FIXME expand %{ @@ -10891,7 +10899,6 @@ instruct vsl2I_reg(vecD dst, vecD src, vecD shift) %{ instruct vsl4I_reg(vecX dst, vecX src, vecX shift) %{ predicate(n->as_Vector()->length() == 4 && VM_Version::has_simd()); match(Set dst (LShiftVI src shift)); - match(Set dst (URShiftVI src shift)); size(4*1); ins_cost(DEFAULT_COST*1); // FIXME expand %{ @@ -10900,7 +10907,9 @@ instruct vsl4I_reg(vecX dst, vecX src, vecX shift) %{ %} instruct vsl2I_immI(vecD dst, vecD src, immI shift) %{ - predicate(n->as_Vector()->length() == 2 && VM_Version::has_simd()); + predicate(n->as_Vector()->length() == 2 && + VM_Version::has_simd() && + assert_not_var_shift(n)); match(Set dst (LShiftVI src (LShiftCntV shift))); size(4); ins_cost(DEFAULT_COST); // FIXME @@ -10916,7 +10925,9 @@ instruct vsl2I_immI(vecD dst, vecD src, immI shift) %{ %} instruct vsl4I_immI(vecX dst, vecX src, immI shift) %{ - predicate(n->as_Vector()->length() == 4 && VM_Version::has_simd()); + predicate(n->as_Vector()->length() == 4 && + VM_Version::has_simd() && + assert_not_var_shift(n)); match(Set dst (LShiftVI src (LShiftCntV shift))); size(4); ins_cost(DEFAULT_COST); // FIXME @@ -10931,11 +10942,10 @@ instruct vsl4I_immI(vecX dst, vecX src, immI shift) %{ ins_pipe( ialu_reg_reg ); // FIXME %} -// Longs vector logical left/right shift +// Longs vector logical left shift instruct vsl2L_reg(vecX dst, vecX src, vecX shift) %{ predicate(n->as_Vector()->length() == 2); match(Set dst (LShiftVL src shift)); - match(Set dst (URShiftVL src shift)); size(4*1); ins_cost(DEFAULT_COST*1); // FIXME expand %{ @@ -10944,7 +10954,7 @@ instruct vsl2L_reg(vecX dst, vecX src, vecX shift) %{ %} instruct vsl2L_immI(vecX dst, vecX src, immI shift) %{ - predicate(n->as_Vector()->length() == 2); + predicate(n->as_Vector()->length() == 2 && assert_not_var_shift(n)); match(Set dst (LShiftVL src (LShiftCntV shift))); size(4); ins_cost(DEFAULT_COST); // FIXME @@ -10965,9 +10975,79 @@ instruct vsl2L_immI(vecX dst, vecX src, immI shift) %{ // for negative data because java code convert short value into int with // sign extension before a shift. +// Right shift with vector shift count on aarch32 SIMD is implemented as left +// shift by negative shift count value. +// +// Method is_var_shift() denotes that vector shift count is a variable shift: +// 1) for this case, vector shift count should be negated before conducting +// right shifts. E.g., vsrl4S_reg_var rule. +// 2) for the opposite case, vector shift count is generated via RShiftCntV +// rules and is already negated there. Hence, no negation is needed. +// E.g., vsrl4S_reg rule. + // Chars vector logical right shift +instruct vsrl4S_reg(vecD dst, vecD src, vecD shift) %{ + predicate(n->as_Vector()->length() == 4 && !n->as_ShiftV()->is_var_shift()); + match(Set dst (URShiftVS src shift)); + size(4); + ins_cost(DEFAULT_COST); + expand %{ + vsh4S_reg(dst, src, shift); + %} +%} + +instruct vsrl4S_reg_var(vecD dst, vecD src, vecD shift, vecD tmp) %{ + predicate(n->as_Vector()->length() == 4 && n->as_ShiftV()->is_var_shift()); + match(Set dst (URShiftVS src shift)); + effect(TEMP tmp); + size(4*2); + ins_cost(DEFAULT_COST*2); + format %{ + "VNEG.S8 $tmp.D,$shift.D\n\t! neg packed8B" + "VSHL.U16 $dst.D,$src.D,$tmp.D\t! logical right shift packed4S" + %} + ins_encode %{ + bool quad = false; + __ vnegI($tmp$$FloatRegister, $shift$$FloatRegister, + MacroAssembler::VELEM_SIZE_8, quad); + __ vshlUI($dst$$FloatRegister, $tmp$$FloatRegister, $src$$FloatRegister, + MacroAssembler::VELEM_SIZE_16, quad); + %} + ins_pipe(ialu_reg_reg); +%} + +instruct vsrl8S_reg(vecX dst, vecX src, vecX shift) %{ + predicate(n->as_Vector()->length() == 8 && !n->as_ShiftV()->is_var_shift()); + match(Set dst (URShiftVS src shift)); + size(4); + ins_cost(DEFAULT_COST); + expand %{ + vsh8S_reg(dst, src, shift); + %} +%} + +instruct vsrl8S_reg_var(vecX dst, vecX src, vecX shift, vecX tmp) %{ + predicate(n->as_Vector()->length() == 8 && n->as_ShiftV()->is_var_shift()); + match(Set dst (URShiftVS src shift)); + effect(TEMP tmp); + size(4*2); + ins_cost(DEFAULT_COST*2); + format %{ + "VNEG.S8 $tmp.Q,$shift.Q\n\t! neg packed16B" + "VSHL.U16 $dst.Q,$src.Q,$tmp.Q\t! logical right shift packed8S" + %} + ins_encode %{ + bool quad = true; + __ vnegI($tmp$$FloatRegister, $shift$$FloatRegister, + MacroAssembler::VELEM_SIZE_8, quad); + __ vshlUI($dst$$FloatRegister, $tmp$$FloatRegister, $src$$FloatRegister, + MacroAssembler::VELEM_SIZE_16, quad); + %} + ins_pipe(ialu_reg_reg); +%} + instruct vsrl4S_immI(vecD dst, vecD src, immI shift) %{ - predicate(n->as_Vector()->length() == 4); + predicate(n->as_Vector()->length() == 4 && assert_not_var_shift(n)); match(Set dst (URShiftVS src (RShiftCntV shift))); size(4); ins_cost(DEFAULT_COST); // FIXME @@ -10983,7 +11063,7 @@ instruct vsrl4S_immI(vecD dst, vecD src, immI shift) %{ %} instruct vsrl8S_immI(vecX dst, vecX src, immI shift) %{ - predicate(n->as_Vector()->length() == 8); + predicate(n->as_Vector()->length() == 8 && assert_not_var_shift(n)); match(Set dst (URShiftVS src (RShiftCntV shift))); size(4); ins_cost(DEFAULT_COST); // FIXME @@ -10999,8 +11079,78 @@ instruct vsrl8S_immI(vecX dst, vecX src, immI shift) %{ %} // Integers vector logical right shift +instruct vsrl2I_reg(vecD dst, vecD src, vecD shift) %{ + predicate(n->as_Vector()->length() == 2 && + VM_Version::has_simd() && + !n->as_ShiftV()->is_var_shift()); + match(Set dst (URShiftVI src shift)); + size(4); + ins_cost(DEFAULT_COST); + expand %{ + vsh2I_reg(dst, src, shift); + %} +%} + +instruct vsrl2I_reg_var(vecD dst, vecD src, vecD shift, vecD tmp) %{ + predicate(n->as_Vector()->length() == 2 && + VM_Version::has_simd() && + n->as_ShiftV()->is_var_shift()); + match(Set dst (URShiftVI src shift)); + effect(TEMP tmp); + size(4*2); + ins_cost(DEFAULT_COST*2); + format %{ + "VNEG.S8 $tmp.D,$shift.D\n\t! neg packed8B" + "VSHL.U32 $dst.D,$src.D,$tmp.D\t! logical right shift packed2I" + %} + ins_encode %{ + bool quad = false; + __ vnegI($tmp$$FloatRegister, $shift$$FloatRegister, + MacroAssembler::VELEM_SIZE_8, quad); + __ vshlUI($dst$$FloatRegister, $tmp$$FloatRegister, $src$$FloatRegister, + MacroAssembler::VELEM_SIZE_32, quad); + %} + ins_pipe(ialu_reg_reg); +%} + +instruct vsrl4I_reg(vecX dst, vecX src, vecX shift) %{ + predicate(n->as_Vector()->length() == 4 && + VM_Version::has_simd() && + !n->as_ShiftV()->is_var_shift()); + match(Set dst (URShiftVI src shift)); + size(4); + ins_cost(DEFAULT_COST); + expand %{ + vsh4I_reg(dst, src, shift); + %} +%} + +instruct vsrl4I_reg_var(vecX dst, vecX src, vecX shift, vecX tmp) %{ + predicate(n->as_Vector()->length() == 4 && + VM_Version::has_simd() && + n->as_ShiftV()->is_var_shift()); + match(Set dst (URShiftVI src shift)); + effect(TEMP tmp); + size(4*2); + ins_cost(DEFAULT_COST*2); + format %{ + "VNEG.S8 $tmp.Q,$shift.Q\n\t! neg packed16B" + "VSHL.U32 $dst.Q,$src.Q,$tmp.Q\t! logical right shift packed4I" + %} + ins_encode %{ + bool quad = true; + __ vnegI($tmp$$FloatRegister, $shift$$FloatRegister, + MacroAssembler::VELEM_SIZE_8, quad); + __ vshlUI($dst$$FloatRegister, $tmp$$FloatRegister, $src$$FloatRegister, + MacroAssembler::VELEM_SIZE_32, quad); + %} + ins_pipe(ialu_reg_reg); +%} + instruct vsrl2I_immI(vecD dst, vecD src, immI shift) %{ - predicate(n->as_Vector()->length() == 2 && VM_Version::has_simd()); + predicate(n->as_Vector()->length() == 2 && + VM_Version::has_simd() && + assert_not_var_shift(n)); match(Set dst (URShiftVI src (RShiftCntV shift))); size(4); ins_cost(DEFAULT_COST); // FIXME @@ -11016,7 +11166,9 @@ instruct vsrl2I_immI(vecD dst, vecD src, immI shift) %{ %} instruct vsrl4I_immI(vecX dst, vecX src, immI shift) %{ - predicate(n->as_Vector()->length() == 4 && VM_Version::has_simd()); + predicate(n->as_Vector()->length() == 4 && + VM_Version::has_simd() && + assert_not_var_shift(n)); match(Set dst (URShiftVI src (RShiftCntV shift))); size(4); ins_cost(DEFAULT_COST); // FIXME @@ -11032,8 +11184,38 @@ instruct vsrl4I_immI(vecX dst, vecX src, immI shift) %{ %} // Longs vector logical right shift +instruct vsrl2L_reg(vecX dst, vecX src, vecX shift) %{ + predicate(n->as_Vector()->length() == 2 && !n->as_ShiftV()->is_var_shift()); + match(Set dst (URShiftVL src shift)); + size(4); + ins_cost(DEFAULT_COST); + expand %{ + vsh2L_reg(dst, src, shift); + %} +%} + +instruct vsrl2L_reg_var(vecX dst, vecX src, vecX shift, vecX tmp) %{ + predicate(n->as_Vector()->length() == 2 && n->as_ShiftV()->is_var_shift()); + match(Set dst (URShiftVL src shift)); + effect(TEMP tmp, DEF dst, USE src, USE shift); + size(4*2); + ins_cost(DEFAULT_COST*2); + format %{ + "VNEG.S8 $tmp.Q,$shift.Q\n\t! neg packed16B" + "VSHL.U64 $dst.Q,$src.Q,$tmp.Q\t! logical right shift packed2L" + %} + ins_encode %{ + bool quad = true; + __ vnegI($tmp$$FloatRegister, $shift$$FloatRegister, + MacroAssembler::VELEM_SIZE_8, quad); + __ vshlUI($dst$$FloatRegister, $tmp$$FloatRegister, $src$$FloatRegister, + MacroAssembler::VELEM_SIZE_64, quad); + %} + ins_pipe(ialu_reg_reg); +%} + instruct vsrl2L_immI(vecX dst, vecX src, immI shift) %{ - predicate(n->as_Vector()->length() == 2); + predicate(n->as_Vector()->length() == 2 && assert_not_var_shift(n)); match(Set dst (URShiftVL src (RShiftCntV shift))); size(4); ins_cost(DEFAULT_COST); // FIXME @@ -11167,9 +11349,8 @@ instruct vsha2L_reg(vecX dst, vecX src, vecX shift) %{ %} // Byte vector arithmetic right shift - instruct vsra8B_reg(vecD dst, vecD src, vecD shift) %{ - predicate(n->as_Vector()->length() == 8); + predicate(n->as_Vector()->length() == 8 && !n->as_ShiftV()->is_var_shift()); match(Set dst (RShiftVB src shift)); size(4); ins_cost(DEFAULT_COST); // FIXME @@ -11178,8 +11359,28 @@ instruct vsra8B_reg(vecD dst, vecD src, vecD shift) %{ %} %} -instruct vsrl16B_reg(vecX dst, vecX src, vecX shift) %{ - predicate(n->as_Vector()->length() == 16); +instruct vsra8B_reg_var(vecD dst, vecD src, vecD shift, vecD tmp) %{ + predicate(n->as_Vector()->length() == 8 && n->as_ShiftV()->is_var_shift()); + match(Set dst (RShiftVB src shift)); + effect(TEMP tmp); + size(4*2); + ins_cost(DEFAULT_COST*2); + format %{ + "VNEG.S8 $tmp.D,$shift.D\n\t! neg packed8B" + "VSHL.S8 $dst.D,$src.D,$tmp.D\t! arithmetic right shift packed8B" + %} + ins_encode %{ + bool quad = false; + __ vnegI($tmp$$FloatRegister, $shift$$FloatRegister, + MacroAssembler::VELEM_SIZE_8, quad); + __ vshlSI($dst$$FloatRegister, $tmp$$FloatRegister, $src$$FloatRegister, + MacroAssembler::VELEM_SIZE_8, quad); + %} + ins_pipe(ialu_reg_reg); +%} + +instruct vsra16B_reg(vecX dst, vecX src, vecX shift) %{ + predicate(n->as_Vector()->length() == 16 && !n->as_ShiftV()->is_var_shift()); match(Set dst (RShiftVB src shift)); size(4); ins_cost(DEFAULT_COST); // FIXME @@ -11188,13 +11389,33 @@ instruct vsrl16B_reg(vecX dst, vecX src, vecX shift) %{ %} %} -instruct vsrl8B_immI(vecD dst, vecD src, immI shift) %{ - predicate(n->as_Vector()->length() == 8); +instruct vsra16B_reg_var(vecX dst, vecX src, vecX shift, vecX tmp) %{ + predicate(n->as_Vector()->length() == 16 && n->as_ShiftV()->is_var_shift()); match(Set dst (RShiftVB src shift)); + effect(TEMP tmp); + size(4*2); + ins_cost(DEFAULT_COST*2); + format %{ + "VNEG.S8 $tmp.Q,$shift.Q\n\t! neg packed16B" + "VSHL.S8 $dst.Q,$src.Q,$tmp.Q\t! arithmetic right shift packed16B" + %} + ins_encode %{ + bool quad = true; + __ vnegI($tmp$$FloatRegister, $shift$$FloatRegister, + MacroAssembler::VELEM_SIZE_8, quad); + __ vshlSI($dst$$FloatRegister, $tmp$$FloatRegister, $src$$FloatRegister, + MacroAssembler::VELEM_SIZE_8, quad); + %} + ins_pipe(ialu_reg_reg); +%} + +instruct vsra8B_immI(vecD dst, vecD src, immI shift) %{ + predicate(n->as_Vector()->length() == 8 && assert_not_var_shift(n)); + match(Set dst (RShiftVB src (RShiftCntV shift))); size(4); ins_cost(DEFAULT_COST); // FIXME format %{ - "VSHR.S8 $dst.D,$src.D,$shift\t! logical right shift packed8B" + "VSHR.S8 $dst.D,$src.D,$shift\t! arithmetic right shift packed8B" %} ins_encode %{ bool quad = false; @@ -11204,13 +11425,13 @@ instruct vsrl8B_immI(vecD dst, vecD src, immI shift) %{ ins_pipe( ialu_reg_reg ); // FIXME %} -instruct vsrl16B_immI(vecX dst, vecX src, immI shift) %{ - predicate(n->as_Vector()->length() == 16); - match(Set dst (RShiftVB src shift)); +instruct vsra16B_immI(vecX dst, vecX src, immI shift) %{ + predicate(n->as_Vector()->length() == 16 && assert_not_var_shift(n)); + match(Set dst (RShiftVB src (RShiftCntV shift))); size(4); ins_cost(DEFAULT_COST); // FIXME format %{ - "VSHR.S8 $dst.Q,$src.Q,$shift\t! logical right shift packed16B" + "VSHR.S8 $dst.Q,$src.Q,$shift\t! arithmetic right shift packed16B" %} ins_encode %{ bool quad = true; @@ -11222,7 +11443,7 @@ instruct vsrl16B_immI(vecX dst, vecX src, immI shift) %{ // Shorts vector arithmetic right shift instruct vsra4S_reg(vecD dst, vecD src, vecD shift) %{ - predicate(n->as_Vector()->length() == 4); + predicate(n->as_Vector()->length() == 4 && !n->as_ShiftV()->is_var_shift()); match(Set dst (RShiftVS src shift)); size(4); ins_cost(DEFAULT_COST); // FIXME @@ -11231,8 +11452,28 @@ instruct vsra4S_reg(vecD dst, vecD src, vecD shift) %{ %} %} +instruct vsra4S_reg_var(vecD dst, vecD src, vecD shift, vecD tmp) %{ + predicate(n->as_Vector()->length() == 4 && n->as_ShiftV()->is_var_shift()); + match(Set dst (RShiftVS src shift)); + effect(TEMP tmp); + size(4*2); + ins_cost(DEFAULT_COST*2); + format %{ + "VNEG.S8 $tmp.D,$shift.D\n\t! neg packed8B" + "VSHL.S16 $dst.D,$src.D,$tmp.D\t! arithmetic right shift packed4S" + %} + ins_encode %{ + bool quad = false; + __ vnegI($tmp$$FloatRegister, $shift$$FloatRegister, + MacroAssembler::VELEM_SIZE_8, quad); + __ vshlSI($dst$$FloatRegister, $tmp$$FloatRegister, $src$$FloatRegister, + MacroAssembler::VELEM_SIZE_16, quad); + %} + ins_pipe(ialu_reg_reg); +%} + instruct vsra8S_reg(vecX dst, vecX src, vecX shift) %{ - predicate(n->as_Vector()->length() == 8); + predicate(n->as_Vector()->length() == 8 && !n->as_ShiftV()->is_var_shift()); match(Set dst (RShiftVS src shift)); size(4); ins_cost(DEFAULT_COST); // FIXME @@ -11241,13 +11482,33 @@ instruct vsra8S_reg(vecX dst, vecX src, vecX shift) %{ %} %} -instruct vsra4S_immI(vecD dst, vecD src, immI shift) %{ - predicate(n->as_Vector()->length() == 4); +instruct vsra8S_reg_var(vecX dst, vecX src, vecX shift, vecX tmp) %{ + predicate(n->as_Vector()->length() == 8 && n->as_ShiftV()->is_var_shift()); match(Set dst (RShiftVS src shift)); + effect(TEMP tmp); + size(4*2); + ins_cost(DEFAULT_COST*2); + format %{ + "VNEG.S8 $tmp.Q,$shift.Q\n\t! neg packed16B" + "VSHL.S16 $dst.Q,$src.Q,$tmp.Q\t! arithmetic right shift packed8S" + %} + ins_encode %{ + bool quad = true; + __ vnegI($tmp$$FloatRegister, $shift$$FloatRegister, + MacroAssembler::VELEM_SIZE_8, quad); + __ vshlSI($dst$$FloatRegister, $tmp$$FloatRegister, $src$$FloatRegister, + MacroAssembler::VELEM_SIZE_16, quad); + %} + ins_pipe(ialu_reg_reg); +%} + +instruct vsra4S_immI(vecD dst, vecD src, immI shift) %{ + predicate(n->as_Vector()->length() == 4 && assert_not_var_shift(n)); + match(Set dst (RShiftVS src (RShiftCntV shift))); size(4); ins_cost(DEFAULT_COST); // FIXME format %{ - "VSHR.S16 $dst.D,$src.D,$shift\t! logical right shift packed4S" + "VSHR.S16 $dst.D,$src.D,$shift\t! arithmetic right shift packed4S" %} ins_encode %{ bool quad = false; @@ -11258,12 +11519,12 @@ instruct vsra4S_immI(vecD dst, vecD src, immI shift) %{ %} instruct vsra8S_immI(vecX dst, vecX src, immI shift) %{ - predicate(n->as_Vector()->length() == 8); - match(Set dst (RShiftVS src shift)); + predicate(n->as_Vector()->length() == 8 && assert_not_var_shift(n)); + match(Set dst (RShiftVS src (RShiftCntV shift))); size(4); ins_cost(DEFAULT_COST); // FIXME format %{ - "VSHR.S16 $dst.Q,$src.Q,$shift\t! logical right shift packed8S" + "VSHR.S16 $dst.Q,$src.Q,$shift\t! arithmetic right shift packed8S" %} ins_encode %{ bool quad = true; @@ -11275,7 +11536,7 @@ instruct vsra8S_immI(vecX dst, vecX src, immI shift) %{ // Integers vector arithmetic right shift instruct vsra2I_reg(vecD dst, vecD src, vecD shift) %{ - predicate(n->as_Vector()->length() == 2); + predicate(n->as_Vector()->length() == 2 && !n->as_ShiftV()->is_var_shift()); match(Set dst (RShiftVI src shift)); size(4); ins_cost(DEFAULT_COST); // FIXME @@ -11284,8 +11545,28 @@ instruct vsra2I_reg(vecD dst, vecD src, vecD shift) %{ %} %} +instruct vsra2I_reg_var(vecD dst, vecD src, vecD shift, vecD tmp) %{ + predicate(n->as_Vector()->length() == 2 && n->as_ShiftV()->is_var_shift()); + match(Set dst (RShiftVI src shift)); + effect(TEMP tmp); + size(4*2); + ins_cost(DEFAULT_COST*2); + format %{ + "VNEG.S8 $tmp.D,$shift.D\n\t! neg packed8B" + "VSHL.S32 $dst.D,$src.D,$tmp.D\t! arithmetic right shift packed2I" + %} + ins_encode %{ + bool quad = false; + __ vnegI($tmp$$FloatRegister, $shift$$FloatRegister, + MacroAssembler::VELEM_SIZE_8, quad); + __ vshlSI($dst$$FloatRegister, $tmp$$FloatRegister, $src$$FloatRegister, + MacroAssembler::VELEM_SIZE_32, quad); + %} + ins_pipe(ialu_reg_reg); +%} + instruct vsra4I_reg(vecX dst, vecX src, vecX shift) %{ - predicate(n->as_Vector()->length() == 4); + predicate(n->as_Vector()->length() == 4 && !n->as_ShiftV()->is_var_shift()); match(Set dst (RShiftVI src shift)); size(4); ins_cost(DEFAULT_COST); // FIXME @@ -11294,13 +11575,33 @@ instruct vsra4I_reg(vecX dst, vecX src, vecX shift) %{ %} %} -instruct vsra2I_immI(vecD dst, vecD src, immI shift) %{ - predicate(n->as_Vector()->length() == 2); +instruct vsra4I_reg_var(vecX dst, vecX src, vecX shift, vecX tmp) %{ + predicate(n->as_Vector()->length() == 4 && n->as_ShiftV()->is_var_shift()); match(Set dst (RShiftVI src shift)); + effect(TEMP tmp); + size(4*2); + ins_cost(DEFAULT_COST*2); + format %{ + "VNEG.S8 $tmp.Q,$shift.Q\n\t! neg packed16B" + "VSHL.S32 $dst.Q,$src.Q,$tmp.Q\t! arithmetic right shift packed4I" + %} + ins_encode %{ + bool quad = true; + __ vnegI($tmp$$FloatRegister, $shift$$FloatRegister, + MacroAssembler::VELEM_SIZE_8, quad); + __ vshlSI($dst$$FloatRegister, $tmp$$FloatRegister, $src$$FloatRegister, + MacroAssembler::VELEM_SIZE_32, quad); + %} + ins_pipe(ialu_reg_reg); +%} + +instruct vsra2I_immI(vecD dst, vecD src, immI shift) %{ + predicate(n->as_Vector()->length() == 2 && assert_not_var_shift(n)); + match(Set dst (RShiftVI src (RShiftCntV shift))); size(4); ins_cost(DEFAULT_COST); // FIXME format %{ - "VSHR.S32 $dst.D,$src.D,$shift\t! logical right shift packed2I" + "VSHR.S32 $dst.D,$src.D,$shift\t! arithmetic right shift packed2I" %} ins_encode %{ bool quad = false; @@ -11311,12 +11612,12 @@ instruct vsra2I_immI(vecD dst, vecD src, immI shift) %{ %} instruct vsra4I_immI(vecX dst, vecX src, immI shift) %{ - predicate(n->as_Vector()->length() == 4); - match(Set dst (RShiftVI src shift)); + predicate(n->as_Vector()->length() == 4 && assert_not_var_shift(n)); + match(Set dst (RShiftVI src (RShiftCntV shift))); size(4); ins_cost(DEFAULT_COST); // FIXME format %{ - "VSHR.S32 $dst.Q,$src.Q,$shift\t! logical right shift packed4I" + "VSHR.S32 $dst.Q,$src.Q,$shift\t! arithmetic right shift packed4I" %} ins_encode %{ bool quad = true; @@ -11328,7 +11629,7 @@ instruct vsra4I_immI(vecX dst, vecX src, immI shift) %{ // Longs vector arithmetic right shift instruct vsra2L_reg(vecX dst, vecX src, vecX shift) %{ - predicate(n->as_Vector()->length() == 2); + predicate(n->as_Vector()->length() == 2 && !n->as_ShiftV()->is_var_shift()); match(Set dst (RShiftVL src shift)); size(4); ins_cost(DEFAULT_COST); // FIXME @@ -11337,13 +11638,33 @@ instruct vsra2L_reg(vecX dst, vecX src, vecX shift) %{ %} %} -instruct vsra2L_immI(vecX dst, vecX src, immI shift) %{ - predicate(n->as_Vector()->length() == 2); +instruct vsra2L_reg_var(vecX dst, vecX src, vecX shift, vecX tmp) %{ + predicate(n->as_Vector()->length() == 2 && n->as_ShiftV()->is_var_shift()); match(Set dst (RShiftVL src shift)); + effect(TEMP tmp); + size(4*2); + ins_cost(DEFAULT_COST*2); + format %{ + "VNEG.S8 $tmp.Q,$shift.Q\n\t! neg packed16B" + "VSHL.S64 $dst.Q,$src.Q,$tmp.Q\t! arithmetic right shift packed2L" + %} + ins_encode %{ + bool quad = true; + __ vnegI($tmp$$FloatRegister, $shift$$FloatRegister, + MacroAssembler::VELEM_SIZE_8, quad); + __ vshlSI($dst$$FloatRegister, $tmp$$FloatRegister, $src$$FloatRegister, + MacroAssembler::VELEM_SIZE_64, quad); + %} + ins_pipe(ialu_reg_reg); +%} + +instruct vsra2L_immI(vecX dst, vecX src, immI shift) %{ + predicate(n->as_Vector()->length() == 2 && assert_not_var_shift(n)); + match(Set dst (RShiftVL src (RShiftCntV shift))); size(4); ins_cost(DEFAULT_COST); // FIXME format %{ - "VSHR.S64 $dst.Q,$src.Q,$shift\t! logical right shift packed2L" + "VSHR.S64 $dst.Q,$src.Q,$shift\t! arithmetic right shift packed2L" %} ins_encode %{ bool quad = true; diff --git a/src/hotspot/cpu/arm/bytes_arm.hpp b/src/hotspot/cpu/arm/bytes_arm.hpp index b0d481f314d13ca05e1495c35bd8cecd53dc79fb..34af43edcac0b4656e277b00cf17bca360b29fb6 100644 --- a/src/hotspot/cpu/arm/bytes_arm.hpp +++ b/src/hotspot/cpu/arm/bytes_arm.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2022, 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,7 +25,7 @@ #ifndef CPU_ARM_BYTES_ARM_HPP #define CPU_ARM_BYTES_ARM_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "utilities/macros.hpp" #ifndef VM_LITTLE_ENDIAN diff --git a/src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp b/src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp index 920e6c87c4ffdfd00e9e1dca72f0c0f84630a543..f7ffe84618d1c59c6646a753047f27c29740392c 100644 --- a/src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp +++ b/src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp @@ -1680,6 +1680,9 @@ void LIR_Assembler::logic_op(LIR_Code code, LIR_Opr left, LIR_Opr right, LIR_Opr } else { assert(right->is_constant(), "must be"); const uint c = (uint)right->as_constant_ptr()->as_jint(); + if (!Assembler::is_arith_imm_in_range(c)) { + BAILOUT("illegal arithmetic operand"); + } switch (code) { case lir_logic_and: __ and_32(res, lreg, c); break; case lir_logic_or: __ orr_32(res, lreg, c); break; diff --git a/src/hotspot/cpu/arm/jniTypes_arm.hpp b/src/hotspot/cpu/arm/jniTypes_arm.hpp index 66596eac1a0346b7135d56946e9458afe00e5145..660e58110f886fac0583f0cbef71e5d8085189ff 100644 --- a/src/hotspot/cpu/arm/jniTypes_arm.hpp +++ b/src/hotspot/cpu/arm/jniTypes_arm.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ #define CPU_ARM_JNITYPES_ARM_HPP #include "jni.h" -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "oops/oop.hpp" // This file holds platform-dependent routines used to write primitive jni diff --git a/src/hotspot/cpu/ppc/bytes_ppc.hpp b/src/hotspot/cpu/ppc/bytes_ppc.hpp index 8249068ecd6f0d71e211faa956772ff30435da1a..a4d061e9b732fa8f2613a64d0e86853ff53e40a6 100644 --- a/src/hotspot/cpu/ppc/bytes_ppc.hpp +++ b/src/hotspot/cpu/ppc/bytes_ppc.hpp @@ -1,6 +1,6 @@ /* - * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2012, 2016 SAP SE. All rights reserved. + * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2022 SAP SE. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ #ifndef CPU_PPC_BYTES_PPC_HPP #define CPU_PPC_BYTES_PPC_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" class Bytes: AllStatic { public: diff --git a/src/hotspot/cpu/ppc/c1_CodeStubs_ppc.cpp b/src/hotspot/cpu/ppc/c1_CodeStubs_ppc.cpp index 4f329d2e63333accbc0d53651f2bc3367e0f7310..109372bb1a4b155daebdfb5e64f03ecda14f3aaf 100644 --- a/src/hotspot/cpu/ppc/c1_CodeStubs_ppc.cpp +++ b/src/hotspot/cpu/ppc/c1_CodeStubs_ppc.cpp @@ -81,8 +81,6 @@ void RangeCheckStub::emit_code(LIR_Assembler* ce) { if (_info->deoptimize_on_exception()) { address a = Runtime1::entry_for(Runtime1::predicate_failed_trap_id); - // May be used by optimizations like LoopInvariantCodeMotion or RangeCheckEliminator. - DEBUG_ONLY( __ untested("RangeCheckStub: predicate_failed_trap_id"); ) //__ load_const_optimized(R0, a); __ add_const_optimized(R0, R29_TOC, MacroAssembler::offset_to_global_toc(a)); __ mtctr(R0); diff --git a/src/hotspot/cpu/ppc/frame_ppc.cpp b/src/hotspot/cpu/ppc/frame_ppc.cpp index 870345789d6112339549d9964ebe4e7c9da3b531..b8e6433913b80a0956d720c745c41a9e2c33fbd7 100644 --- a/src/hotspot/cpu/ppc/frame_ppc.cpp +++ b/src/hotspot/cpu/ppc/frame_ppc.cpp @@ -1,6 +1,6 @@ /* - * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2012, 2021 SAP SE. All rights reserved. + * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2022 SAP SE. 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 @@ -294,9 +294,57 @@ void frame::patch_pc(Thread* thread, address pc) { } bool frame::is_interpreted_frame_valid(JavaThread* thread) const { - // Is there anything to do? assert(is_interpreted_frame(), "Not an interpreted frame"); - return true; + // These are reasonable sanity checks + if (fp() == 0 || (intptr_t(fp()) & (wordSize-1)) != 0) { + return false; + } + if (sp() == 0 || (intptr_t(sp()) & (wordSize-1)) != 0) { + return false; + } + int min_frame_slots = (abi_minframe_size + ijava_state_size) / sizeof(intptr_t); + if (fp() - min_frame_slots < sp()) { + return false; + } + // These are hacks to keep us out of trouble. + // The problem with these is that they mask other problems + if (fp() <= sp()) { // this attempts to deal with unsigned comparison above + return false; + } + + // do some validation of frame elements + + // first the method + + Method* m = *interpreter_frame_method_addr(); + + // validate the method we'd find in this potential sender + if (!Method::is_valid_method(m)) return false; + + // stack frames shouldn't be much larger than max_stack elements + // this test requires the use of unextended_sp which is the sp as seen by + // the current frame, and not sp which is the "raw" pc which could point + // further because of local variables of the callee method inserted after + // method arguments + if (fp() - unextended_sp() > 1024 + m->max_stack()*Interpreter::stackElementSize) { + return false; + } + + // validate bci/bcx + + address bcp = interpreter_frame_bcp(); + if (m->validate_bci_from_bcp(bcp) < 0) { + return false; + } + + // validate constantPoolCache* + ConstantPoolCache* cp = *interpreter_frame_cache_addr(); + if (MetaspaceObj::is_valid(cp) == false) return false; + + // validate locals + + address locals = (address) *interpreter_frame_locals_addr(); + return thread->is_in_stack_range_incl(locals, (address)fp()); } BasicType frame::interpreter_frame_result(oop* oop_result, jvalue* value_result) { diff --git a/src/hotspot/cpu/ppc/jniTypes_ppc.hpp b/src/hotspot/cpu/ppc/jniTypes_ppc.hpp index ef1fe4acfdf4bd8562e44e584d237473f2c18426..13ccaf408e9686f47fa29a6bd9c0a941f17576fd 100644 --- a/src/hotspot/cpu/ppc/jniTypes_ppc.hpp +++ b/src/hotspot/cpu/ppc/jniTypes_ppc.hpp @@ -1,6 +1,6 @@ /* - * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2012, 2013 SAP SE. All rights reserved. + * Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2022 SAP SE. 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,7 +27,7 @@ #define CPU_PPC_JNITYPES_PPC_HPP #include "jni.h" -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "oops/oop.hpp" // This file holds platform-dependent routines used to write primitive diff --git a/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp b/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp index a834fa1af36f2fc617c29b1fafc939ea1295bc85..315ca3f706282f15b0777cae86a4d4583354eb12 100644 --- a/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp +++ b/src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012, 2021 SAP SE. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -3216,8 +3216,9 @@ void SharedRuntime::montgomery_multiply(jint *a_ints, jint *b_ints, jint *n_ints // Make very sure we don't use so much space that the stack might // overflow. 512 jints corresponds to an 16384-bit integer and // will use here a total of 8k bytes of stack space. + int divisor = sizeof(unsigned long) * 4; + guarantee(longwords <= 8192 / divisor, "must be"); int total_allocation = longwords * sizeof (unsigned long) * 4; - guarantee(total_allocation <= 8192, "must be"); unsigned long *scratch = (unsigned long *)alloca(total_allocation); // Local scratch arrays @@ -3246,8 +3247,9 @@ void SharedRuntime::montgomery_square(jint *a_ints, jint *n_ints, // Make very sure we don't use so much space that the stack might // overflow. 512 jints corresponds to an 16384-bit integer and // will use here a total of 6k bytes of stack space. + int divisor = sizeof(unsigned long) * 3; + guarantee(longwords <= (8192 / divisor), "must be"); int total_allocation = longwords * sizeof (unsigned long) * 3; - guarantee(total_allocation <= 8192, "must be"); unsigned long *scratch = (unsigned long *)alloca(total_allocation); // Local scratch arrays diff --git a/src/hotspot/cpu/ppc/vm_version_ppc.cpp b/src/hotspot/cpu/ppc/vm_version_ppc.cpp index 96709b7196b732112a2200d8d202bb7e3a6fa2b3..e8138643a1f1a442ee7ecc0552d19b125c1cd8ed 100644 --- a/src/hotspot/cpu/ppc/vm_version_ppc.cpp +++ b/src/hotspot/cpu/ppc/vm_version_ppc.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012, 2020 SAP SE. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -435,7 +435,7 @@ void VM_Version::check_virtualizations() { // system_type=...qemu indicates PowerKVM // e.g. system_type=IBM pSeries (emulated by qemu) char line[500]; - FILE* fp = fopen(info_file, "r"); + FILE* fp = os::fopen(info_file, "r"); if (fp == NULL) { return; } diff --git a/src/hotspot/cpu/s390/bytes_s390.hpp b/src/hotspot/cpu/s390/bytes_s390.hpp index f6882f980abface44aed4169f259389bdce1b1e6..9b4d7b0422148e1a71efe21d4a02176bc25d8cd4 100644 --- a/src/hotspot/cpu/s390/bytes_s390.hpp +++ b/src/hotspot/cpu/s390/bytes_s390.hpp @@ -1,6 +1,6 @@ /* - * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2016, 2018 SAP SE. All rights reserved. + * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2022 SAP SE. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ #ifndef CPU_S390_BYTES_S390_HPP #define CPU_S390_BYTES_S390_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" class Bytes: AllStatic { public: diff --git a/src/hotspot/cpu/s390/c2_MacroAssembler_s390.cpp b/src/hotspot/cpu/s390/c2_MacroAssembler_s390.cpp index 83040fb6b7f41a0a88a09459f7a93b5443fada2d..04a6b88052c99cf11b4397061af77f5abd28888a 100644 --- a/src/hotspot/cpu/s390/c2_MacroAssembler_s390.cpp +++ b/src/hotspot/cpu/s390/c2_MacroAssembler_s390.cpp @@ -1,5 +1,6 @@ /* - * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2022 SAP SE. 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,22 +47,44 @@ // Note: // cnt is signed int. Do not rely on high word! // counts # characters, not bytes. -// The result is the number of characters copied before the first incompatible character was found. -// If precise is true, the processing stops exactly at this point. Otherwise, the result may be off -// by a few bytes. The result always indicates the number of copied characters. -// When used as a character index, the returned value points to the first incompatible character. // -// Note: Does not behave exactly like package private StringUTF16 compress java implementation in case of failure: -// - Different number of characters may have been written to dead array (if precise is false). -// - Returns a number --- - // Strings with 4 and 8 characters were fond to occur very frequently. + // Strings with 4 and 8 characters were found to occur very frequently. // Therefore, we handle them right away with minimal overhead. Label skipShortcut, skip4Shortcut, skip8Shortcut; Register Rout = Z_R0; @@ -133,7 +156,8 @@ unsigned int C2_MacroAssembler::string_compress(Register result, Register src, R if (VM_Version::has_VectorFacility()) { const int min_vcnt = 32; // Minimum #characters required to use vector instructions. // Otherwise just do nothing in vector mode. - // Must be multiple of 2*(vector register length in chars (8 HW = 128 bits)). + // Must correspond to # vector registers used by implementation, + // and must be a power of 2. const int log_min_vcnt = exact_log2(min_vcnt); Label VectorLoop, VectorDone, VectorBreak; @@ -150,7 +174,7 @@ unsigned int C2_MacroAssembler::string_compress(Register result, Register src, R z_brz(VectorDone); // not enough data for vector loop z_vzero(Vzero); // all zeroes - z_vgmh(Vmask, 0, 7); // generate 0xff00 mask for all 2-byte elements + z_vgmh(Vmask, mask_ix_l, mask_ix_r); // generate 0xff00/0xff80 mask for all 2-byte elements z_sllg(Z_R0, Rix, log_min_vcnt); // remember #chars that will be processed by vector loop bind(VectorLoop); @@ -162,7 +186,7 @@ unsigned int C2_MacroAssembler::string_compress(Register result, Register src, R z_vo(Vtmp2, Z_V22, Z_V23); z_vo(Vtmp1, Vtmp1, Vtmp2); z_vn(Vtmp1, Vtmp1, Vmask); - z_vceqhs(Vtmp1, Vtmp1, Vzero); // high half of all chars must be zero for successful compress. + z_vceqhs(Vtmp1, Vtmp1, Vzero); // all bits selected by mask must be zero for successful compress. z_bvnt(VectorBreak); // break vector loop if not all vector elements compare eq -> incompatible character found. // re-process data from current iteration in break handler. @@ -187,7 +211,8 @@ unsigned int C2_MacroAssembler::string_compress(Register result, Register src, R { const int min_cnt = 8; // Minimum #characters required to use unrolled loop. // Otherwise just do nothing in unrolled loop. - // Must be multiple of 8. + // Must correspond to # registers used by implementation, + // and must be a power of 2. const int log_min_cnt = exact_log2(min_cnt); Label UnrolledLoop, UnrolledDone, UnrolledBreak; @@ -197,7 +222,7 @@ unsigned int C2_MacroAssembler::string_compress(Register result, Register src, R z_lr(Rix, Rcnt); z_sr(Rix, Z_R0); } - z_sra(Rix, log_min_cnt); // unrolled loop count + z_sra(Rix, log_min_cnt); // unrolled loop count z_brz(UnrolledDone); bind(UnrolledLoop); @@ -244,6 +269,8 @@ unsigned int C2_MacroAssembler::string_compress(Register result, Register src, R z_sll(Rix, log_min_cnt); // # chars not yet processed in UnrolledLoop (due to break), broken iteration not included. z_sr(Z_R0, Rix); // fix # chars processed OK so far. if (!precise) { + // Because we don't need to be precise, we just return the # of characters which have been written. + // The first illegal character is in the index range [result-min_cnt/2, result+min_cnt/2). z_lgfr(result, Z_R0); z_sllg(Z_R1, Z_R0, 1); // # src bytes already processed. Only lower 32 bits are valid! // Z_R1 contents must be treated as unsigned operand! For huge strings, @@ -274,7 +301,7 @@ unsigned int C2_MacroAssembler::string_compress(Register result, Register src, R z_brh(ScalarDoit); z_llh(Z_R1, 0, Z_R0, Rsrc); z_bre(Scalar2Char); - z_tmll(Z_R1, 0xff00); + z_tmll(Z_R1, char_mask); z_lghi(result, 0); // cnt == 1, first char invalid, no chars successfully processed z_brnaz(AllDone); z_stc(Z_R1, 0, Z_R0, Rdst); @@ -283,11 +310,11 @@ unsigned int C2_MacroAssembler::string_compress(Register result, Register src, R bind(Scalar2Char); z_llh(Z_R0, 2, Z_R0, Rsrc); - z_tmll(Z_R1, 0xff00); + z_tmll(Z_R1, char_mask); z_lghi(result, 0); // cnt == 2, first char invalid, no chars successfully processed z_brnaz(AllDone); z_stc(Z_R1, 0, Z_R0, Rdst); - z_tmll(Z_R0, 0xff00); + z_tmll(Z_R0, char_mask); z_lghi(result, 1); // cnt == 2, second char invalid, one char successfully processed z_brnaz(AllDone); z_stc(Z_R0, 1, Z_R0, Rdst); @@ -299,17 +326,17 @@ unsigned int C2_MacroAssembler::string_compress(Register result, Register src, R #endif if (VM_Version::has_DistinctOpnds()) { - z_srk(Rix, Rcnt, Z_R0); // remaining # chars to compress in unrolled loop + z_srk(Rix, Rcnt, Z_R0); // remaining # chars to compress in scalar loop } else { z_lr(Rix, Rcnt); z_sr(Rix, Z_R0); } - z_lgfr(result, Rcnt); // # processed characters (if all runs ok). - z_brz(ScalarDone); // uses CC from Rix calculation + z_lgfr(result, Rcnt); // # processed characters (if all encodes ok). + z_brz(ScalarDone); // anything left to do? (uses CC from Rix calculation) bind(ScalarLoop); z_llh(Z_R1, 0, Z_R0, Rsrc); - z_tmll(Z_R1, 0xff00); + z_tmll(Z_R1, char_mask); z_brnaz(ScalarBreak); z_stc(Z_R1, 0, Z_R0, Rdst); add2reg(Rsrc, 2); @@ -329,7 +356,11 @@ unsigned int C2_MacroAssembler::string_compress(Register result, Register src, R bind(AllDone); if (precise) { - BLOCK_COMMENT("} encode_iso_array"); + if (toASCII) { + BLOCK_COMMENT("} encode_ascii_array"); + } else { + BLOCK_COMMENT("} encode_iso_array"); + } } else { BLOCK_COMMENT("} string_compress"); } diff --git a/src/hotspot/cpu/s390/c2_MacroAssembler_s390.hpp b/src/hotspot/cpu/s390/c2_MacroAssembler_s390.hpp index 08112a482d05cd4618d3504e5fc31adce444c402..a6c9865649522d807d91c3255daa05e9c04ad865 100644 --- a/src/hotspot/cpu/s390/c2_MacroAssembler_s390.hpp +++ b/src/hotspot/cpu/s390/c2_MacroAssembler_s390.hpp @@ -1,5 +1,6 @@ /* - * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2022 SAP SE. 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 @@ -38,7 +39,7 @@ // Early clobber: result. // Boolean precise controls accuracy of result value. unsigned int string_compress(Register result, Register src, Register dst, Register cnt, - Register tmp, bool precise); + Register tmp, bool precise, bool toASCII); // Inflate byte[] to char[]. unsigned int string_inflate_trot(Register src, Register dst, Register cnt, Register tmp); diff --git a/src/hotspot/cpu/s390/frame_s390.cpp b/src/hotspot/cpu/s390/frame_s390.cpp index d29227bb32effd34af833a9dbbd128fee57ac2eb..bfb38ffcdafa31a800ae6397ee7bf4ff19a07b30 100644 --- a/src/hotspot/cpu/s390/frame_s390.cpp +++ b/src/hotspot/cpu/s390/frame_s390.cpp @@ -1,6 +1,6 @@ /* - * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2016, 2019 SAP SE. All rights reserved. + * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2022 SAP SE. 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 @@ -298,9 +298,57 @@ void frame::patch_pc(Thread* thread, address pc) { } bool frame::is_interpreted_frame_valid(JavaThread* thread) const { - // Is there anything to do? assert(is_interpreted_frame(), "Not an interpreted frame"); - return true; + // These are reasonable sanity checks + if (fp() == 0 || (intptr_t(fp()) & (wordSize-1)) != 0) { + return false; + } + if (sp() == 0 || (intptr_t(sp()) & (wordSize-1)) != 0) { + return false; + } + int min_frame_slots = (z_abi_16_size + z_ijava_state_size) / sizeof(intptr_t); + if (fp() - min_frame_slots < sp()) { + return false; + } + // These are hacks to keep us out of trouble. + // The problem with these is that they mask other problems + if (fp() <= sp()) { // this attempts to deal with unsigned comparison above + return false; + } + + // do some validation of frame elements + + // first the method + + Method* m = *interpreter_frame_method_addr(); + + // validate the method we'd find in this potential sender + if (!Method::is_valid_method(m)) return false; + + // stack frames shouldn't be much larger than max_stack elements + // this test requires the use of unextended_sp which is the sp as seen by + // the current frame, and not sp which is the "raw" pc which could point + // further because of local variables of the callee method inserted after + // method arguments + if (fp() - unextended_sp() > 1024 + m->max_stack()*Interpreter::stackElementSize) { + return false; + } + + // validate bci/bcx + + address bcp = interpreter_frame_bcp(); + if (m->validate_bci_from_bcp(bcp) < 0) { + return false; + } + + // validate constantPoolCache* + ConstantPoolCache* cp = *interpreter_frame_cache_addr(); + if (MetaspaceObj::is_valid(cp) == false) return false; + + // validate locals + + address locals = (address) *interpreter_frame_locals_addr(); + return thread->is_in_stack_range_incl(locals, (address)fp()); } BasicType frame::interpreter_frame_result(oop* oop_result, jvalue* value_result) { diff --git a/src/hotspot/cpu/s390/jniTypes_s390.hpp b/src/hotspot/cpu/s390/jniTypes_s390.hpp index 56f4a05c6d4bfb5bbc0775f80b6e48279f51f898..951e7f5f6d28e8a9de2df73038bbb1465f14bb6a 100644 --- a/src/hotspot/cpu/s390/jniTypes_s390.hpp +++ b/src/hotspot/cpu/s390/jniTypes_s390.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2016 SAP SE. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -30,7 +30,7 @@ // jni types to the array of arguments passed into JavaCalls::call. #include "jni.h" -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "oops/oop.hpp" class JNITypes : AllStatic { diff --git a/src/hotspot/cpu/s390/matcher_s390.hpp b/src/hotspot/cpu/s390/matcher_s390.hpp index d95e3c17f433705ea5438605f1d5f138e0cce95d..ac55bd84dff10a5f79b3ae1376c31a37e0351d21 100644 --- a/src/hotspot/cpu/s390/matcher_s390.hpp +++ b/src/hotspot/cpu/s390/matcher_s390.hpp @@ -1,5 +1,6 @@ /* - * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2022 SAP SE. 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 @@ -150,6 +151,6 @@ } // Implements a variant of EncodeISOArrayNode that encode ASCII only - static const bool supports_encode_ascii_array = false; + static const bool supports_encode_ascii_array = true; #endif // CPU_S390_MATCHER_S390_HPP diff --git a/src/hotspot/cpu/s390/s390.ad b/src/hotspot/cpu/s390/s390.ad index 8a6e62a809b3efd8e6791dcfa4f36c65798f6e6c..74ad8ef40d31cfd15d7b7091e290487e5e2e6785 100644 --- a/src/hotspot/cpu/s390/s390.ad +++ b/src/hotspot/cpu/s390/s390.ad @@ -1,6 +1,6 @@ // -// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved. -// Copyright (c) 2017, 2020 SAP SE. All rights reserved. +// Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved. +// Copyright (c) 2017, 2022 SAP SE. 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 @@ -10230,7 +10230,7 @@ instruct string_compress(iRegP src, iRegP dst, iRegI result, iRegI len, iRegI tm format %{ "String Compress $src->$dst($len) -> $result" %} ins_encode %{ __ string_compress($result$$Register, $src$$Register, $dst$$Register, $len$$Register, - $tmp$$Register, false); + $tmp$$Register, false, false); %} ins_pipe(pipe_class_dummy); %} @@ -10291,10 +10291,24 @@ instruct encode_iso_array(iRegP src, iRegP dst, iRegI result, iRegI len, iRegI t match(Set result (EncodeISOArray src (Binary dst len))); effect(TEMP_DEF result, TEMP tmp, KILL cr); // R0, R1 are killed, too. ins_cost(300); - format %{ "Encode array $src->$dst($len) -> $result" %} + format %{ "Encode iso array $src->$dst($len) -> $result" %} ins_encode %{ __ string_compress($result$$Register, $src$$Register, $dst$$Register, $len$$Register, - $tmp$$Register, true); + $tmp$$Register, true, false); + %} + ins_pipe(pipe_class_dummy); +%} + +// encode char[] to byte[] in ASCII +instruct encode_ascii_array(iRegP src, iRegP dst, iRegI result, iRegI len, iRegI tmp, flagsReg cr) %{ + predicate(((EncodeISOArrayNode*)n)->is_ascii()); + match(Set result (EncodeISOArray src (Binary dst len))); + effect(TEMP_DEF result, TEMP tmp, KILL cr); // R0, R1 are killed, too. + ins_cost(300); + format %{ "Encode ascii array $src->$dst($len) -> $result" %} + ins_encode %{ + __ string_compress($result$$Register, $src$$Register, $dst$$Register, $len$$Register, + $tmp$$Register, true, true); %} ins_pipe(pipe_class_dummy); %} diff --git a/src/hotspot/cpu/s390/sharedRuntime_s390.cpp b/src/hotspot/cpu/s390/sharedRuntime_s390.cpp index 2b310f6e44f75921f50ac022201587ca855096e5..107ec979ffd22df2e82c7b97489128308b639b46 100644 --- a/src/hotspot/cpu/s390/sharedRuntime_s390.cpp +++ b/src/hotspot/cpu/s390/sharedRuntime_s390.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2016, 2019 SAP SE. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -3219,8 +3219,9 @@ void SharedRuntime::montgomery_multiply(jint *a_ints, jint *b_ints, jint *n_ints // Make very sure we don't use so much space that the stack might // overflow. 512 jints corresponds to an 16384-bit integer and // will use here a total of 8k bytes of stack space. + int divisor = sizeof(unsigned long) * 4; + guarantee(longwords <= 8192 / divisor, "must be"); int total_allocation = longwords * sizeof (unsigned long) * 4; - guarantee(total_allocation <= 8192, "must be"); unsigned long *scratch = (unsigned long *)alloca(total_allocation); // Local scratch arrays @@ -3249,8 +3250,9 @@ void SharedRuntime::montgomery_square(jint *a_ints, jint *n_ints, // Make very sure we don't use so much space that the stack might // overflow. 512 jints corresponds to an 16384-bit integer and // will use here a total of 6k bytes of stack space. + int divisor = sizeof(unsigned long) * 3; + guarantee(longwords <= (8192 / divisor), "must be"); int total_allocation = longwords * sizeof (unsigned long) * 3; - guarantee(total_allocation <= 8192, "must be"); unsigned long *scratch = (unsigned long *)alloca(total_allocation); // Local scratch arrays diff --git a/src/hotspot/cpu/x86/assembler_x86.cpp b/src/hotspot/cpu/x86/assembler_x86.cpp index 26d58624b12f63663120d42922fa53a2d0e249fd..3b1e42f3f959392846fc8848d0cbf8be86169081 100644 --- a/src/hotspot/cpu/x86/assembler_x86.cpp +++ b/src/hotspot/cpu/x86/assembler_x86.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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 @@ -2473,6 +2473,16 @@ void Assembler::movddup(XMMRegister dst, XMMRegister src) { emit_int16(0x12, 0xC0 | encode); } +void Assembler::vmovddup(XMMRegister dst, Address src, int vector_len) { + assert(VM_Version::supports_avx(), ""); + InstructionMark im(this); + InstructionAttr attributes(vector_len, /* rex_w */ VM_Version::supports_evex(), /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ true); + attributes.set_rex_vex_w_reverted(); + simd_prefix(dst, xnoreg, src, VEX_SIMD_F2, VEX_OPCODE_0F, &attributes); + emit_int8(0x12); + emit_operand(dst, src); +} + void Assembler::kmovbl(KRegister dst, KRegister src) { assert(VM_Version::supports_avx512dq(), ""); InstructionAttr attributes(AVX_128bit, /* rex_w */ false, /* legacy_mode */ true, /* no_mask_reg */ true, /* uses_vl */ false); @@ -4829,6 +4839,14 @@ void Assembler::vpopcntd(XMMRegister dst, XMMRegister src, int vector_len) { emit_int16(0x55, (0xC0 | encode)); } +void Assembler::vpopcntq(XMMRegister dst, XMMRegister src, int vector_len) { + assert(VM_Version::supports_avx512_vpopcntdq(), "must support vpopcntdq feature"); + InstructionAttr attributes(vector_len, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ true); + attributes.set_is_evex_instruction(); + int encode = vex_prefix_and_encode(dst->encoding(), 0, src->encoding(), VEX_SIMD_66, VEX_OPCODE_0F_38, &attributes); + emit_int16(0x55, (0xC0 | encode)); +} + void Assembler::popf() { emit_int8((unsigned char)0x9D); } @@ -7594,6 +7612,9 @@ void Assembler::pxor(XMMRegister dst, XMMRegister src) { void Assembler::vpxor(XMMRegister dst, XMMRegister nds, XMMRegister src, int vector_len) { assert(UseAVX > 0, "requires some form of AVX"); + assert(vector_len == AVX_128bit ? VM_Version::supports_avx() : + vector_len == AVX_256bit ? VM_Version::supports_avx2() : + vector_len == AVX_512bit ? VM_Version::supports_evex() : 0, ""); InstructionAttr attributes(vector_len, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ true); int encode = vex_prefix_and_encode(dst->encoding(), nds->encoding(), src->encoding(), VEX_SIMD_66, VEX_OPCODE_0F, &attributes); emit_int16((unsigned char)0xEF, (0xC0 | encode)); @@ -7601,6 +7622,9 @@ void Assembler::vpxor(XMMRegister dst, XMMRegister nds, XMMRegister src, int vec void Assembler::vpxor(XMMRegister dst, XMMRegister nds, Address src, int vector_len) { assert(UseAVX > 0, "requires some form of AVX"); + assert(vector_len == AVX_128bit ? VM_Version::supports_avx() : + vector_len == AVX_256bit ? VM_Version::supports_avx2() : + vector_len == AVX_512bit ? VM_Version::supports_evex() : 0, ""); InstructionMark im(this); InstructionAttr attributes(vector_len, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ true, /* uses_vl */ true); attributes.set_address_attributes(/* tuple_type */ EVEX_FV, /* input_size_in_bits */ EVEX_32bit); @@ -9725,6 +9749,68 @@ void Assembler::evpmaxsq(XMMRegister dst, KRegister mask, XMMRegister nds, Addre emit_operand(dst, src); } +void Assembler::evpternlogd(XMMRegister dst, int imm8, KRegister mask, XMMRegister src2, XMMRegister src3, bool merge, int vector_len) { + assert(VM_Version::supports_evex(), "requires EVEX support"); + assert(vector_len == Assembler::AVX_512bit || VM_Version::supports_avx512vl(), "requires VL support"); + InstructionAttr attributes(vector_len, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ false, /* uses_vl */ true); + attributes.set_is_evex_instruction(); + attributes.set_embedded_opmask_register_specifier(mask); + if (merge) { + attributes.reset_is_clear_context(); + } + int encode = vex_prefix_and_encode(dst->encoding(), src2->encoding(), src3->encoding(), VEX_SIMD_66, VEX_OPCODE_0F_3A, &attributes); + emit_int24(0x25, (unsigned char)(0xC0 | encode), imm8); +} + +void Assembler::evpternlogd(XMMRegister dst, int imm8, KRegister mask, XMMRegister src2, Address src3, bool merge, int vector_len) { + assert(VM_Version::supports_evex(), "requires EVEX support"); + assert(vector_len == Assembler::AVX_512bit || VM_Version::supports_avx512vl(), "requires VL support"); + assert(dst != xnoreg, "sanity"); + InstructionMark im(this); + InstructionAttr attributes(vector_len, /* vex_w */ false, /* legacy_mode */ false, /* no_mask_reg */ false, /* uses_vl */ true); + attributes.set_is_evex_instruction(); + attributes.set_embedded_opmask_register_specifier(mask); + attributes.set_address_attributes(/* tuple_type */ EVEX_FV, /* input_size_in_bits */ EVEX_64bit); + if (merge) { + attributes.reset_is_clear_context(); + } + vex_prefix(src3, src2->encoding(), dst->encoding(), VEX_SIMD_66, VEX_OPCODE_0F_3A, &attributes); + emit_int8(0x25); + emit_operand(dst, src3); + emit_int8(imm8); +} + +void Assembler::evpternlogq(XMMRegister dst, int imm8, KRegister mask, XMMRegister src2, XMMRegister src3, bool merge, int vector_len) { + assert(VM_Version::supports_evex(), "requires EVEX support"); + assert(vector_len == Assembler::AVX_512bit || VM_Version::supports_avx512vl(), "requires VL support"); + InstructionAttr attributes(vector_len, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ false, /* uses_vl */ true); + attributes.set_is_evex_instruction(); + attributes.set_embedded_opmask_register_specifier(mask); + if (merge) { + attributes.reset_is_clear_context(); + } + int encode = vex_prefix_and_encode(dst->encoding(), src2->encoding(), src3->encoding(), VEX_SIMD_66, VEX_OPCODE_0F_3A, &attributes); + emit_int24(0x25, (unsigned char)(0xC0 | encode), imm8); +} + +void Assembler::evpternlogq(XMMRegister dst, int imm8, KRegister mask, XMMRegister src2, Address src3, bool merge, int vector_len) { + assert(VM_Version::supports_evex(), "requires EVEX support"); + assert(vector_len == Assembler::AVX_512bit || VM_Version::supports_avx512vl(), "requires VL support"); + assert(dst != xnoreg, "sanity"); + InstructionMark im(this); + InstructionAttr attributes(vector_len, /* vex_w */ true, /* legacy_mode */ false, /* no_mask_reg */ false, /* uses_vl */ true); + attributes.set_is_evex_instruction(); + attributes.set_embedded_opmask_register_specifier(mask); + attributes.set_address_attributes(/* tuple_type */ EVEX_FV, /* input_size_in_bits */ EVEX_64bit); + if (merge) { + attributes.reset_is_clear_context(); + } + vex_prefix(src3, src2->encoding(), dst->encoding(), VEX_SIMD_66, VEX_OPCODE_0F_3A, &attributes); + emit_int8(0x25); + emit_operand(dst, src3); + emit_int8(imm8); +} + // duplicate 4-byte integer data from src into programmed locations in dest : requires AVX512VL void Assembler::vpbroadcastd(XMMRegister dst, XMMRegister src, int vector_len) { assert(UseAVX >= 2, ""); diff --git a/src/hotspot/cpu/x86/assembler_x86.hpp b/src/hotspot/cpu/x86/assembler_x86.hpp index dd0aae125263ec6004a1c88c16e273fb5eaca8a0..2cfb1e293609764a18ff0321fd1fff6ba997cf2c 100644 --- a/src/hotspot/cpu/x86/assembler_x86.hpp +++ b/src/hotspot/cpu/x86/assembler_x86.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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 @@ -377,7 +377,7 @@ class AddressLiteral { private: address target() { return _target; } - bool is_lval() { return _is_lval; } + bool is_lval() const { return _is_lval; } relocInfo::relocType reloc() const { return _rspec.type(); } const RelocationHolder& rspec() const { return _rspec; } @@ -1467,6 +1467,7 @@ private: void movb(Register dst, Address src); void movddup(XMMRegister dst, XMMRegister src); + void vmovddup(XMMRegister dst, Address src, int vector_len); void kandbl(KRegister dst, KRegister src1, KRegister src2); void kandwl(KRegister dst, KRegister src1, KRegister src2); @@ -1869,6 +1870,7 @@ private: void popcntl(Register dst, Register src); void vpopcntd(XMMRegister dst, XMMRegister src, int vector_len); + void vpopcntq(XMMRegister dst, XMMRegister src, int vector_len); #ifdef _LP64 void popcntq(Register dst, Address src); @@ -2413,6 +2415,12 @@ private: void evprorvd(XMMRegister dst, KRegister mask, XMMRegister nds, XMMRegister src, bool merge, int vector_len); void evprorvq(XMMRegister dst, KRegister mask, XMMRegister nds, XMMRegister src, bool merge, int vector_len); + void evpternlogd(XMMRegister dst, int imm8, KRegister mask, XMMRegister src2, XMMRegister src3, bool merge, int vector_len); + void evpternlogd(XMMRegister dst, int imm8, KRegister mask, XMMRegister src2, Address src3, bool merge, int vector_len); + void evpternlogq(XMMRegister dst, int imm8, KRegister mask, XMMRegister src2, XMMRegister src3, bool merge, int vector_len); + void evpternlogq(XMMRegister dst, int imm8, KRegister mask, XMMRegister src2, Address src3, bool merge, int vector_len); + + // Sub packed integers void psubb(XMMRegister dst, XMMRegister src); void psubw(XMMRegister dst, XMMRegister src); diff --git a/src/hotspot/cpu/x86/bytes_x86.hpp b/src/hotspot/cpu/x86/bytes_x86.hpp index 4ce19a473b49a1b054b79b1addb72084464fa7ce..cb5987d2c8262ba3f77d5d4eb216e416ad027576 100644 --- a/src/hotspot/cpu/x86/bytes_x86.hpp +++ b/src/hotspot/cpu/x86/bytes_x86.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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,7 +25,7 @@ #ifndef CPU_X86_BYTES_X86_HPP #define CPU_X86_BYTES_X86_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "utilities/align.hpp" #include "utilities/macros.hpp" diff --git a/src/hotspot/cpu/x86/c1_LIRGenerator_x86.cpp b/src/hotspot/cpu/x86/c1_LIRGenerator_x86.cpp index 0b62108c79fa266265fd50aff85b9b57798440b5..819c36957b35a0f48d43c291902583c5adc09f07 100644 --- a/src/hotspot/cpu/x86/c1_LIRGenerator_x86.cpp +++ b/src/hotspot/cpu/x86/c1_LIRGenerator_x86.cpp @@ -192,8 +192,32 @@ LIR_Address* LIRGenerator::emit_array_address(LIR_Opr array_opr, LIR_Opr index_o LIR_Address* addr; if (index_opr->is_constant()) { int elem_size = type2aelembytes(type); - addr = new LIR_Address(array_opr, - offset_in_bytes + (intx)(index_opr->as_jint()) * elem_size, type); +#ifdef _LP64 + jint index = index_opr->as_jint(); + jlong disp = offset_in_bytes + (jlong)(index) * elem_size; + if (disp > max_jint) { + // Displacement overflow. Cannot directly use instruction with 32-bit displacement for 64-bit addresses. + // Convert array index to long to do array offset computation with 64-bit values. + index_opr = new_register(T_LONG); + __ move(LIR_OprFact::longConst(index), index_opr); + addr = new LIR_Address(array_opr, index_opr, LIR_Address::scale(type), offset_in_bytes, type); + } else { + addr = new LIR_Address(array_opr, (intx)disp, type); + } +#else + // A displacement overflow can also occur for x86 but that is not a problem due to the 32-bit address range! + // Let's assume an array 'a' and an access with displacement 'disp'. When disp overflows, then "a + disp" will + // always be negative (i.e. underflows the 32-bit address range): + // Let N = 2^32: a + signed_overflow(disp) = a + disp - N. + // "a + disp" is always smaller than N. If an index was chosen which would point to an address beyond N, then + // range checks would catch that and throw an exception. Thus, a + disp < 0 holds which means that it always + // underflows the 32-bit address range: + // unsigned_underflow(a + signed_overflow(disp)) = unsigned_underflow(a + disp - N) + // = (a + disp - N) + N = a + disp + // This shows that we still end up at the correct address with a displacement overflow due to the 32-bit address + // range limitation. This overflow only needs to be handled if addresses can be larger as on 64-bit platforms. + addr = new LIR_Address(array_opr, offset_in_bytes + (intx)(index_opr->as_jint()) * elem_size, type); +#endif // _LP64 } else { #ifdef _LP64 if (index_opr->type() == T_INT) { diff --git a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp index a601f35f1c16729e833dcb8601a6b47bb0ec690e..65166197616ca89ef07512a0b6a397fd745157d4 100644 --- a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp +++ b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2020, 2022, 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 @@ -2192,84 +2192,6 @@ void C2_MacroAssembler::evpcmp(BasicType typ, KRegister kdmask, KRegister ksmask } } -void C2_MacroAssembler::vpcmpu(BasicType typ, XMMRegister dst, XMMRegister src1, XMMRegister src2, ComparisonPredicate comparison, - int vlen_in_bytes, XMMRegister vtmp1, XMMRegister vtmp2, Register scratch) { - int vlen_enc = vector_length_encoding(vlen_in_bytes*2); - switch (typ) { - case T_BYTE: - vpmovzxbw(vtmp1, src1, vlen_enc); - vpmovzxbw(vtmp2, src2, vlen_enc); - vpcmpCCW(dst, vtmp1, vtmp2, comparison, Assembler::W, vlen_enc, scratch); - vpacksswb(dst, dst, dst, vlen_enc); - break; - case T_SHORT: - vpmovzxwd(vtmp1, src1, vlen_enc); - vpmovzxwd(vtmp2, src2, vlen_enc); - vpcmpCCW(dst, vtmp1, vtmp2, comparison, Assembler::D, vlen_enc, scratch); - vpackssdw(dst, dst, dst, vlen_enc); - break; - case T_INT: - vpmovzxdq(vtmp1, src1, vlen_enc); - vpmovzxdq(vtmp2, src2, vlen_enc); - vpcmpCCW(dst, vtmp1, vtmp2, comparison, Assembler::Q, vlen_enc, scratch); - vpermilps(dst, dst, 8, vlen_enc); - break; - default: - assert(false, "Should not reach here"); - } - if (vlen_in_bytes == 16) { - vpermpd(dst, dst, 0x8, vlen_enc); - } -} - -void C2_MacroAssembler::vpcmpu32(BasicType typ, XMMRegister dst, XMMRegister src1, XMMRegister src2, ComparisonPredicate comparison, int vlen_in_bytes, - XMMRegister vtmp1, XMMRegister vtmp2, XMMRegister vtmp3, Register scratch) { - int vlen_enc = vector_length_encoding(vlen_in_bytes); - switch (typ) { - case T_BYTE: - vpmovzxbw(vtmp1, src1, vlen_enc); - vpmovzxbw(vtmp2, src2, vlen_enc); - vpcmpCCW(dst, vtmp1, vtmp2, comparison, Assembler::W, vlen_enc, scratch); - vextracti128(vtmp1, src1, 1); - vextracti128(vtmp2, src2, 1); - vpmovzxbw(vtmp1, vtmp1, vlen_enc); - vpmovzxbw(vtmp2, vtmp2, vlen_enc); - vpcmpCCW(vtmp3, vtmp1, vtmp2, comparison, Assembler::W, vlen_enc, scratch); - vpacksswb(dst, dst, vtmp3, vlen_enc); - vpermpd(dst, dst, 0xd8, vlen_enc); - break; - case T_SHORT: - vpmovzxwd(vtmp1, src1, vlen_enc); - vpmovzxwd(vtmp2, src2, vlen_enc); - vpcmpCCW(dst, vtmp1, vtmp2, comparison, Assembler::D, vlen_enc, scratch); - vextracti128(vtmp1, src1, 1); - vextracti128(vtmp2, src2, 1); - vpmovzxwd(vtmp1, vtmp1, vlen_enc); - vpmovzxwd(vtmp2, vtmp2, vlen_enc); - vpcmpCCW(vtmp3, vtmp1, vtmp2, comparison, Assembler::D, vlen_enc, scratch); - vpackssdw(dst, dst, vtmp3, vlen_enc); - vpermpd(dst, dst, 0xd8, vlen_enc); - break; - case T_INT: - vpmovzxdq(vtmp1, src1, vlen_enc); - vpmovzxdq(vtmp2, src2, vlen_enc); - vpcmpCCW(dst, vtmp1, vtmp2, comparison, Assembler::Q, vlen_enc, scratch); - vpshufd(dst, dst, 8, vlen_enc); - vpermq(dst, dst, 8, vlen_enc); - vextracti128(vtmp1, src1, 1); - vextracti128(vtmp2, src2, 1); - vpmovzxdq(vtmp1, vtmp1, vlen_enc); - vpmovzxdq(vtmp2, vtmp2, vlen_enc); - vpcmpCCW(vtmp3, vtmp1, vtmp2, comparison, Assembler::Q, vlen_enc, scratch); - vpshufd(vtmp3, vtmp3, 8, vlen_enc); - vpermq(vtmp3, vtmp3, 0x80, vlen_enc); - vpblendd(dst, dst, vtmp3, 0xf0, vlen_enc); - break; - default: - assert(false, "Should not reach here"); - } -} - void C2_MacroAssembler::evpblend(BasicType typ, XMMRegister dst, KRegister kmask, XMMRegister src1, XMMRegister src2, bool merge, int vector_len) { switch(typ) { case T_BYTE: @@ -4152,6 +4074,26 @@ void C2_MacroAssembler::vector_castF2I_evex(XMMRegister dst, XMMRegister src, XM bind(done); } +void C2_MacroAssembler::evpternlog(XMMRegister dst, int func, KRegister mask, XMMRegister src2, XMMRegister src3, + bool merge, BasicType bt, int vlen_enc) { + if (bt == T_INT) { + evpternlogd(dst, func, mask, src2, src3, merge, vlen_enc); + } else { + assert(bt == T_LONG, ""); + evpternlogq(dst, func, mask, src2, src3, merge, vlen_enc); + } +} + +void C2_MacroAssembler::evpternlog(XMMRegister dst, int func, KRegister mask, XMMRegister src2, Address src3, + bool merge, BasicType bt, int vlen_enc) { + if (bt == T_INT) { + evpternlogd(dst, func, mask, src2, src3, merge, vlen_enc); + } else { + assert(bt == T_LONG, ""); + evpternlogq(dst, func, mask, src2, src3, merge, vlen_enc); + } +} + #ifdef _LP64 void C2_MacroAssembler::vector_long_to_maskvec(XMMRegister dst, Register src, Register rtmp1, Register rtmp2, XMMRegister xtmp, int mask_len, diff --git a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp index a9ff645585327b884aa166fde6096a669bc64161..b97c1ed607d4b19bdfcfaa44f19a8291ef8ce1b6 100644 --- a/src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp +++ b/src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2020, 2022, 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 @@ -146,12 +146,6 @@ public: void load_iota_indices(XMMRegister dst, Register scratch, int vlen_in_bytes); - // vector compare - void vpcmpu(BasicType typ, XMMRegister dst, XMMRegister src1, XMMRegister src2, ComparisonPredicate comparison, int vlen_in_bytes, - XMMRegister vtmp1, XMMRegister vtmp2, Register scratch); - void vpcmpu32(BasicType typ, XMMRegister dst, XMMRegister src1, XMMRegister src2, ComparisonPredicate comparison, int vlen_in_bytes, - XMMRegister vtmp1, XMMRegister vtmp2, XMMRegister vtmp3, Register scratch); - // Reductions for vectors of bytes, shorts, ints, longs, floats, and doubles. // dst = src1 reduce(op, src2) using vtmp as temps @@ -311,4 +305,11 @@ public: void vector_castD2L_evex(XMMRegister dst, XMMRegister src, XMMRegister xtmp1, XMMRegister xtmp2, KRegister ktmp1, KRegister ktmp2, AddressLiteral double_sign_flip, Register scratch, int vec_enc); + + void evpternlog(XMMRegister dst, int func, KRegister mask, XMMRegister src2, XMMRegister src3, + bool merge, BasicType bt, int vlen_enc); + + void evpternlog(XMMRegister dst, int func, KRegister mask, XMMRegister src2, Address src3, + bool merge, BasicType bt, int vlen_enc); + #endif // CPU_X86_C2_MACROASSEMBLER_X86_HPP diff --git a/src/hotspot/cpu/x86/c2_intelJccErratum_x86.hpp b/src/hotspot/cpu/x86/c2_intelJccErratum_x86.hpp index f3f66f3d7bc15f6d00aee1ef61a3a92df4538049..415d8a99933e2159f9ba2c9aa576a284c6595e9f 100644 --- a/src/hotspot/cpu/x86/c2_intelJccErratum_x86.hpp +++ b/src/hotspot/cpu/x86/c2_intelJccErratum_x86.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2020, 2022, 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,7 +25,7 @@ #ifndef CPU_X86_INTELJCCERRATUM_X86_HPP #define CPU_X86_INTELJCCERRATUM_X86_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "utilities/globalDefinitions.hpp" class Block; diff --git a/src/hotspot/cpu/x86/copy_x86.hpp b/src/hotspot/cpu/x86/copy_x86.hpp index dc150a568afc76bfa0c313cb33745b3d2f18f318..74228b57f6c58949af2c1baa041cb899bcfb3fd5 100644 --- a/src/hotspot/cpu/x86/copy_x86.hpp +++ b/src/hotspot/cpu/x86/copy_x86.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2022, 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 @@ -59,4 +59,293 @@ static void pd_zero_to_bytes(void* to, size_t count) { (void)memset(to, 0, count); } +static void pd_conjoint_words(const HeapWord* from, HeapWord* to, size_t count) { +#if defined AMD64 || defined _WINDOWS + (void)memmove(to, from, count * HeapWordSize); +#else + // Includes a zero-count check. + intx temp = 0; + __asm__ volatile(" testl %6,%6 ;" + " jz 7f ;" + " cmpl %4,%5 ;" + " leal -4(%4,%6,4),%3;" + " jbe 1f ;" + " cmpl %7,%5 ;" + " jbe 4f ;" + "1: cmpl $32,%6 ;" + " ja 3f ;" + " subl %4,%1 ;" + "2: movl (%4),%3 ;" + " movl %7,(%5,%4,1) ;" + " addl $4,%0 ;" + " subl $1,%2 ;" + " jnz 2b ;" + " jmp 7f ;" + "3: rep; smovl ;" + " jmp 7f ;" + "4: cmpl $32,%2 ;" + " movl %7,%0 ;" + " leal -4(%5,%6,4),%1;" + " ja 6f ;" + " subl %4,%1 ;" + "5: movl (%4),%3 ;" + " movl %7,(%5,%4,1) ;" + " subl $4,%0 ;" + " subl $1,%2 ;" + " jnz 5b ;" + " jmp 7f ;" + "6: std ;" + " rep; smovl ;" + " cld ;" + "7: nop " + : "=S" (from), "=D" (to), "=c" (count), "=r" (temp) + : "0" (from), "1" (to), "2" (count), "3" (temp) + : "memory", "flags"); +#endif // AMD64 +} + +static void pd_disjoint_words(const HeapWord* from, HeapWord* to, size_t count) { +#ifdef AMD64 + switch (count) { + case 8: to[7] = from[7]; + case 7: to[6] = from[6]; + case 6: to[5] = from[5]; + case 5: to[4] = from[4]; + case 4: to[3] = from[3]; + case 3: to[2] = from[2]; + case 2: to[1] = from[1]; + case 1: to[0] = from[0]; + case 0: break; + default: + (void)memcpy(to, from, count * HeapWordSize); + break; + } +#else +#if defined _WINDOWS + (void)memcpy(to, from, count * HeapWordSize); +#else + // Includes a zero-count check. + intx temp = 0; + __asm__ volatile(" testl %6,%6 ;" + " jz 3f ;" + " cmpl $32,%6 ;" + " ja 2f ;" + " subl %4,%1 ;" + "1: movl (%4),%3 ;" + " movl %7,(%5,%4,1);" + " addl $4,%0 ;" + " subl $1,%2 ;" + " jnz 1b ;" + " jmp 3f ;" + "2: rep; smovl ;" + "3: nop " + : "=S" (from), "=D" (to), "=c" (count), "=r" (temp) + : "0" (from), "1" (to), "2" (count), "3" (temp) + : "memory", "cc"); +#endif // _WINDOWS +#endif // AMD64 +} + +static void pd_disjoint_words_atomic(const HeapWord* from, HeapWord* to, size_t count) { +#ifdef AMD64 + switch (count) { + case 8: to[7] = from[7]; + case 7: to[6] = from[6]; + case 6: to[5] = from[5]; + case 5: to[4] = from[4]; + case 4: to[3] = from[3]; + case 3: to[2] = from[2]; + case 2: to[1] = from[1]; + case 1: to[0] = from[0]; + case 0: break; + default: + while (count-- > 0) { + *to++ = *from++; + } + break; + } +#else + // pd_disjoint_words is word-atomic in this implementation. + pd_disjoint_words(from, to, count); +#endif // AMD64 +} + +static void pd_aligned_conjoint_words(const HeapWord* from, HeapWord* to, size_t count) { + pd_conjoint_words(from, to, count); +} + +static void pd_aligned_disjoint_words(const HeapWord* from, HeapWord* to, size_t count) { + pd_disjoint_words(from, to, count); +} + +static void pd_conjoint_bytes(const void* from, void* to, size_t count) { +#if defined AMD64 || defined _WINDOWS + (void)memmove(to, from, count); +#else + // Includes a zero-count check. + intx temp = 0; + __asm__ volatile(" testl %6,%6 ;" + " jz 13f ;" + " cmpl %4,%5 ;" + " leal -1(%4,%6),%3 ;" + " jbe 1f ;" + " cmpl %7,%5 ;" + " jbe 8f ;" + "1: cmpl $3,%6 ;" + " jbe 6f ;" + " movl %6,%3 ;" + " movl $4,%2 ;" + " subl %4,%2 ;" + " andl $3,%2 ;" + " jz 2f ;" + " subl %6,%3 ;" + " rep; smovb ;" + "2: movl %7,%2 ;" + " shrl $2,%2 ;" + " jz 5f ;" + " cmpl $32,%2 ;" + " ja 4f ;" + " subl %4,%1 ;" + "3: movl (%4),%%edx ;" + " movl %%edx,(%5,%4,1);" + " addl $4,%0 ;" + " subl $1,%2 ;" + " jnz 3b ;" + " addl %4,%1 ;" + " jmp 5f ;" + "4: rep; smovl ;" + "5: movl %7,%2 ;" + " andl $3,%2 ;" + " jz 13f ;" + "6: xorl %7,%3 ;" + "7: movb (%4,%7,1),%%dl ;" + " movb %%dl,(%5,%7,1) ;" + " addl $1,%3 ;" + " subl $1,%2 ;" + " jnz 7b ;" + " jmp 13f ;" + "8: std ;" + " cmpl $12,%2 ;" + " ja 9f ;" + " movl %7,%0 ;" + " leal -1(%6,%5),%1 ;" + " jmp 11f ;" + "9: xchgl %3,%2 ;" + " movl %6,%0 ;" + " addl $1,%2 ;" + " leal -1(%7,%5),%1 ;" + " andl $3,%2 ;" + " jz 10f ;" + " subl %6,%3 ;" + " rep; smovb ;" + "10: movl %7,%2 ;" + " subl $3,%0 ;" + " shrl $2,%2 ;" + " subl $3,%1 ;" + " rep; smovl ;" + " andl $3,%3 ;" + " jz 12f ;" + " movl %7,%2 ;" + " addl $3,%0 ;" + " addl $3,%1 ;" + "11: rep; smovb ;" + "12: cld ;" + "13: nop ;" + : "=S" (from), "=D" (to), "=c" (count), "=r" (temp) + : "0" (from), "1" (to), "2" (count), "3" (temp) + : "memory", "flags", "%edx"); +#endif // AMD64 +} + +static void pd_conjoint_bytes_atomic(const void* from, void* to, size_t count) { + pd_conjoint_bytes(from, to, count); +} + +// Windows has a different implementation +#ifndef _WINDOWS +static void pd_conjoint_jshorts_atomic(const jshort* from, jshort* to, size_t count) { + _Copy_conjoint_jshorts_atomic(from, to, count); +} + +static void pd_conjoint_jints_atomic(const jint* from, jint* to, size_t count) { +#ifdef AMD64 + _Copy_conjoint_jints_atomic(from, to, count); +#else + assert(HeapWordSize == BytesPerInt, "heapwords and jints must be the same size"); + // pd_conjoint_words is word-atomic in this implementation. + pd_conjoint_words((const HeapWord*)from, (HeapWord*)to, count); +#endif // AMD64 +} + +static void pd_conjoint_jlongs_atomic(const jlong* from, jlong* to, size_t count) { +#ifdef AMD64 + _Copy_conjoint_jlongs_atomic(from, to, count); +#else + // Guarantee use of fild/fistp or xmm regs via some asm code, because compilers won't. + if (from > to) { + while (count-- > 0) { + __asm__ volatile("fildll (%0); fistpll (%1)" + : + : "r" (from), "r" (to) + : "memory" ); + ++from; + ++to; + } + } else { + while (count-- > 0) { + __asm__ volatile("fildll (%0,%2,8); fistpll (%1,%2,8)" + : + : "r" (from), "r" (to), "r" (count) + : "memory" ); + } + } +#endif // AMD64 +} + +static void pd_conjoint_oops_atomic(const oop* from, oop* to, size_t count) { +#ifdef AMD64 + assert(BytesPerLong == BytesPerOop, "jlongs and oops must be the same size"); + _Copy_conjoint_jlongs_atomic((const jlong*)from, (jlong*)to, count); +#else + assert(HeapWordSize == BytesPerOop, "heapwords and oops must be the same size"); + // pd_conjoint_words is word-atomic in this implementation. + pd_conjoint_words((const HeapWord*)from, (HeapWord*)to, count); +#endif // AMD64 +} + +static void pd_arrayof_conjoint_bytes(const HeapWord* from, HeapWord* to, size_t count) { + _Copy_arrayof_conjoint_bytes(from, to, count); +} + +static void pd_arrayof_conjoint_jshorts(const HeapWord* from, HeapWord* to, size_t count) { + _Copy_arrayof_conjoint_jshorts(from, to, count); +} + +static void pd_arrayof_conjoint_jints(const HeapWord* from, HeapWord* to, size_t count) { +#ifdef AMD64 + _Copy_arrayof_conjoint_jints(from, to, count); +#else + pd_conjoint_jints_atomic((const jint*)from, (jint*)to, count); +#endif // AMD64 +} + +static void pd_arrayof_conjoint_jlongs(const HeapWord* from, HeapWord* to, size_t count) { +#ifdef AMD64 + _Copy_arrayof_conjoint_jlongs(from, to, count); +#else + pd_conjoint_jlongs_atomic((const jlong*)from, (jlong*)to, count); +#endif // AMD64 +} + +static void pd_arrayof_conjoint_oops(const HeapWord* from, HeapWord* to, size_t count) { +#ifdef AMD64 + assert(BytesPerLong == BytesPerOop, "jlongs and oops must be the same size"); + _Copy_arrayof_conjoint_jlongs(from, to, count); +#else + pd_conjoint_oops_atomic((const oop*)from, (oop*)to, count); +#endif // AMD64 +} + +#endif // _WINDOWS + #endif // CPU_X86_COPY_X86_HPP diff --git a/src/hotspot/cpu/x86/jniTypes_x86.hpp b/src/hotspot/cpu/x86/jniTypes_x86.hpp index 403a0b63e2be74c8853298b646351e81085a8d9f..5c925474796d4373d43008c00d7feca2b17090de 100644 --- a/src/hotspot/cpu/x86/jniTypes_x86.hpp +++ b/src/hotspot/cpu/x86/jniTypes_x86.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ #define CPU_X86_JNITYPES_X86_HPP #include "jni.h" -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "oops/oop.hpp" // This file holds platform-dependent routines used to write primitive jni diff --git a/src/hotspot/cpu/x86/macroAssembler_x86.cpp b/src/hotspot/cpu/x86/macroAssembler_x86.cpp index 36f480069749852497da30b6d6825d6e10f98a26..10a1cb4b6a1a0c094566558413e86fbdc0a9beff 100644 --- a/src/hotspot/cpu/x86/macroAssembler_x86.cpp +++ b/src/hotspot/cpu/x86/macroAssembler_x86.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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 @@ -2702,6 +2702,15 @@ void MacroAssembler::movss(XMMRegister dst, AddressLiteral src) { } } +void MacroAssembler::vmovddup(XMMRegister dst, AddressLiteral src, int vector_len, Register rscratch) { + if (reachable(src)) { + Assembler::vmovddup(dst, as_Address(src), vector_len); + } else { + lea(rscratch, src); + Assembler::vmovddup(dst, Address(rscratch, 0), vector_len); + } +} + void MacroAssembler::mulsd(XMMRegister dst, AddressLiteral src) { if (reachable(src)) { Assembler::mulsd(dst, as_Address(src)); @@ -3151,6 +3160,15 @@ void MacroAssembler::vpbroadcastw(XMMRegister dst, XMMRegister src, int vector_l Assembler::vpbroadcastw(dst, src, vector_len); } +void MacroAssembler::vbroadcastsd(XMMRegister dst, AddressLiteral src, int vector_len, Register rscratch) { + if (reachable(src)) { + Assembler::vbroadcastsd(dst, as_Address(src), vector_len); + } else { + lea(rscratch, src); + Assembler::vbroadcastsd(dst, Address(rscratch, 0), vector_len); + } +} + void MacroAssembler::vpcmpeqb(XMMRegister dst, XMMRegister nds, XMMRegister src, int vector_len) { assert(((dst->encoding() < 16 && src->encoding() < 16 && nds->encoding() < 16) || VM_Version::supports_avx512vlbw()),"XMM register should be 0-15"); Assembler::vpcmpeqb(dst, nds, src, vector_len); @@ -3219,7 +3237,7 @@ void MacroAssembler::vpcmpCC(XMMRegister dst, XMMRegister nds, XMMRegister src, } } -void MacroAssembler::vpcmpCCW(XMMRegister dst, XMMRegister nds, XMMRegister src, ComparisonPredicate cond, Width width, int vector_len, Register scratch_reg) { +void MacroAssembler::vpcmpCCW(XMMRegister dst, XMMRegister nds, XMMRegister src, XMMRegister xtmp, ComparisonPredicate cond, Width width, int vector_len) { int eq_cond_enc = 0x29; int gt_cond_enc = 0x37; if (width != Assembler::Q) { @@ -3232,15 +3250,18 @@ void MacroAssembler::vpcmpCCW(XMMRegister dst, XMMRegister nds, XMMRegister src, break; case neq: vpcmpCC(dst, nds, src, eq_cond_enc, width, vector_len); - vpxor(dst, dst, ExternalAddress(StubRoutines::x86::vector_all_bits_set()), vector_len, scratch_reg); + vallones(xtmp, vector_len); + vpxor(dst, xtmp, dst, vector_len); break; case le: vpcmpCC(dst, nds, src, gt_cond_enc, width, vector_len); - vpxor(dst, dst, ExternalAddress(StubRoutines::x86::vector_all_bits_set()), vector_len, scratch_reg); + vallones(xtmp, vector_len); + vpxor(dst, xtmp, dst, vector_len); break; case nlt: vpcmpCC(dst, src, nds, gt_cond_enc, width, vector_len); - vpxor(dst, dst, ExternalAddress(StubRoutines::x86::vector_all_bits_set()), vector_len, scratch_reg); + vallones(xtmp, vector_len); + vpxor(dst, xtmp, dst, vector_len); break; case lt: vpcmpCC(dst, src, nds, gt_cond_enc, width, vector_len); @@ -4630,12 +4651,19 @@ void MacroAssembler::verify_heapbase(const char* msg) { assert (Universe::heap() != NULL, "java heap should be initialized"); if (CheckCompressedOops) { Label ok; - push(rscratch1); // cmpptr trashes rscratch1 - cmpptr(r12_heapbase, ExternalAddress((address)CompressedOops::ptrs_base_addr())); + const auto src2 = ExternalAddress((address)CompressedOops::ptrs_base_addr()); + assert(!src2.is_lval(), "should not be lval"); + const bool is_src2_reachable = reachable(src2); + if (!is_src2_reachable) { + push(rscratch1); // cmpptr trashes rscratch1 + } + cmpptr(r12_heapbase, src2); jcc(Assembler::equal, ok); STOP(msg); bind(ok); - pop(rscratch1); + if (!is_src2_reachable) { + pop(rscratch1); + } } } #endif diff --git a/src/hotspot/cpu/x86/macroAssembler_x86.hpp b/src/hotspot/cpu/x86/macroAssembler_x86.hpp index 5c101b496875eb22ac4f622db7dbbdf06e4299af..3593874866ca81157b1fa49f975034d866383443 100644 --- a/src/hotspot/cpu/x86/macroAssembler_x86.hpp +++ b/src/hotspot/cpu/x86/macroAssembler_x86.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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 @@ -1176,6 +1176,9 @@ public: void movsd(XMMRegister dst, Address src) { Assembler::movsd(dst, src); } void movsd(XMMRegister dst, AddressLiteral src); + using Assembler::vmovddup; + void vmovddup(XMMRegister dst, AddressLiteral src, int vector_len, Register rscratch = rscratch1); + void mulpd(XMMRegister dst, XMMRegister src) { Assembler::mulpd(dst, src); } void mulpd(XMMRegister dst, Address src) { Assembler::mulpd(dst, src); } void mulpd(XMMRegister dst, AddressLiteral src); @@ -1284,6 +1287,9 @@ public: void vpbroadcastw(XMMRegister dst, XMMRegister src, int vector_len); void vpbroadcastw(XMMRegister dst, Address src, int vector_len) { Assembler::vpbroadcastw(dst, src, vector_len); } + using Assembler::vbroadcastsd; + void vbroadcastsd(XMMRegister dst, AddressLiteral src, int vector_len, Register rscratch = rscratch1); + void vpcmpeqb(XMMRegister dst, XMMRegister nds, XMMRegister src, int vector_len); void vpcmpeqw(XMMRegister dst, XMMRegister nds, XMMRegister src, int vector_len); @@ -1310,7 +1316,7 @@ public: void evpbroadcast(BasicType type, XMMRegister dst, Register src, int vector_len); // Emit comparison instruction for the specified comparison predicate. - void vpcmpCCW(XMMRegister dst, XMMRegister nds, XMMRegister src, ComparisonPredicate cond, Width width, int vector_len, Register scratch_reg); + void vpcmpCCW(XMMRegister dst, XMMRegister nds, XMMRegister src, XMMRegister xtmp, ComparisonPredicate cond, Width width, int vector_len); void vpcmpCC(XMMRegister dst, XMMRegister nds, XMMRegister src, int cond_encoding, Width width, int vector_len); void vpmovzxbw(XMMRegister dst, Address src, int vector_len); @@ -1489,8 +1495,14 @@ public: void vpxor(XMMRegister dst, XMMRegister nds, AddressLiteral src, int vector_len, Register scratch_reg = rscratch1); // Simple version for AVX2 256bit vectors - void vpxor(XMMRegister dst, XMMRegister src) { Assembler::vpxor(dst, dst, src, true); } - void vpxor(XMMRegister dst, Address src) { Assembler::vpxor(dst, dst, src, true); } + void vpxor(XMMRegister dst, XMMRegister src) { + assert(UseAVX >= 2, "Should be at least AVX2"); + Assembler::vpxor(dst, dst, src, AVX_256bit); + } + void vpxor(XMMRegister dst, Address src) { + assert(UseAVX >= 2, "Should be at least AVX2"); + Assembler::vpxor(dst, dst, src, AVX_256bit); + } void vpermd(XMMRegister dst, XMMRegister nds, XMMRegister src, int vector_len) { Assembler::vpermd(dst, nds, src, vector_len); } void vpermd(XMMRegister dst, XMMRegister nds, AddressLiteral src, int vector_len, Register scratch_reg); diff --git a/src/hotspot/cpu/x86/matcher_x86.hpp b/src/hotspot/cpu/x86/matcher_x86.hpp index 80ecf783434bae2835085043ad32c8bb95406fa5..61af24cf31c52261cbb2fd7149c880f1a22373fb 100644 --- a/src/hotspot/cpu/x86/matcher_x86.hpp +++ b/src/hotspot/cpu/x86/matcher_x86.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2021, 2022, 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 @@ -166,20 +166,7 @@ // Does the CPU supports vector unsigned comparison instructions? static const bool supports_vector_comparison_unsigned(int vlen, BasicType bt) { - int vlen_in_bytes = vlen * type2aelembytes(bt); - if ((UseAVX > 2) && (VM_Version::supports_avx512vl() || vlen_in_bytes == 64)) - return true; - else { - // instruction set supports only signed comparison - // so need to zero extend to higher integral type and perform comparison - // cannot cast long to higher integral type - // and on avx1 cannot cast 128 bit integral vectors to higher size - - if ((bt != T_LONG) && - ((UseAVX >= 2) || (vlen_in_bytes <= 8))) - return true; - } - return false; + return true; } // Some microarchitectures have mask registers used on vectors diff --git a/src/hotspot/cpu/x86/rdtsc_x86.hpp b/src/hotspot/cpu/x86/rdtsc_x86.hpp index f66997c9cfedfeae8cd1650931b79a656bbd9022..d9e77a0ae6bcf32d6d79711255d7fbc9b2b0b47f 100644 --- a/src/hotspot/cpu/x86/rdtsc_x86.hpp +++ b/src/hotspot/cpu/x86/rdtsc_x86.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2022, 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,7 +25,8 @@ #ifndef CPU_X86_RDTSC_X86_HPP #define CPU_X86_RDTSC_X86_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" +#include "utilities/globalDefinitions.hpp" #include "utilities/macros.hpp" // Interface to the x86 rdtsc() time counter, if available. diff --git a/src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp b/src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp index e139b3cf6eb7d33fa3872178b891e0eeaf83f88b..e5a46138473dff074e7032b7943842e0489d7c0a 100644 --- a/src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp +++ b/src/hotspot/cpu/x86/sharedRuntime_x86_32.cpp @@ -1862,12 +1862,14 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm, __ cmpptr(Address(rbp, lock_slot_rbp_offset), (int32_t)NULL_WORD); __ jcc(Assembler::equal, done); + } - // Must save rax, if if it is live now because cmpxchg must use it - if (ret_type != T_FLOAT && ret_type != T_DOUBLE && ret_type != T_VOID) { - save_native_result(masm, ret_type, stack_slots); - } + // Must save rax, if it is live now because cmpxchg must use it + if (ret_type != T_FLOAT && ret_type != T_DOUBLE && ret_type != T_VOID) { + save_native_result(masm, ret_type, stack_slots); + } + if (!UseHeavyMonitors) { // get old displaced header __ movptr(rbx, Address(rbp, lock_slot_rbp_offset)); diff --git a/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp b/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp index 9ff40e943ba6e4ec9c1a851323e38b6b98b24f53..6597c91bb42ff11d09b4c5c741a35bd0b27f8d25 100644 --- a/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp +++ b/src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2022, 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 @@ -2064,13 +2064,15 @@ nmethod* SharedRuntime::generate_native_wrapper(MacroAssembler* masm, // Simple recursive lock? __ cmpptr(Address(rsp, lock_slot_offset * VMRegImpl::stack_slot_size), (int32_t)NULL_WORD); __ jcc(Assembler::equal, done); + } - // Must save rax if if it is live now because cmpxchg must use it - if (ret_type != T_FLOAT && ret_type != T_DOUBLE && ret_type != T_VOID) { - save_native_result(masm, ret_type, stack_slots); - } + // Must save rax if it is live now because cmpxchg must use it + if (ret_type != T_FLOAT && ret_type != T_DOUBLE && ret_type != T_VOID) { + save_native_result(masm, ret_type, stack_slots); + } + if (!UseHeavyMonitors) { // get address of the stack lock __ lea(rax, Address(rsp, lock_slot_offset * VMRegImpl::stack_slot_size)); // get old displaced header @@ -3540,8 +3542,9 @@ void SharedRuntime::montgomery_multiply(jint *a_ints, jint *b_ints, jint *n_ints // Make very sure we don't use so much space that the stack might // overflow. 512 jints corresponds to an 16384-bit integer and // will use here a total of 8k bytes of stack space. + int divisor = sizeof(julong) * 4; + guarantee(longwords <= 8192 / divisor, "must be"); int total_allocation = longwords * sizeof (julong) * 4; - guarantee(total_allocation <= 8192, "must be"); julong *scratch = (julong *)alloca(total_allocation); // Local scratch arrays @@ -3569,8 +3572,9 @@ void SharedRuntime::montgomery_square(jint *a_ints, jint *n_ints, // Make very sure we don't use so much space that the stack might // overflow. 512 jints corresponds to an 16384-bit integer and // will use here a total of 6k bytes of stack space. + int divisor = sizeof(julong) * 3; + guarantee(longwords <= (8192 / divisor), "must be"); int total_allocation = longwords * sizeof (julong) * 3; - guarantee(total_allocation <= 8192, "must be"); julong *scratch = (julong *)alloca(total_allocation); // Local scratch arrays diff --git a/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp b/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp index 8e6257cb786cb9089a396e0ec967d82a4501ffb9..8b7188ca42c88ff68959b723b177f950d8fa87bc 100644 --- a/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp +++ b/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp @@ -1221,11 +1221,6 @@ class StubGenerator: public StubCodeGenerator { } __ addptr(qword_count, 4); __ BIND(L_end); - if (UseAVX >= 2) { - // clean upper bits of YMM registers - __ vpxor(xmm0, xmm0); - __ vpxor(xmm1, xmm1); - } } else { // Copy 32-bytes per iteration __ BIND(L_loop); @@ -1299,11 +1294,6 @@ class StubGenerator: public StubCodeGenerator { } __ subptr(qword_count, 4); __ BIND(L_end); - if (UseAVX >= 2) { - // clean upper bits of YMM registers - __ vpxor(xmm0, xmm0); - __ vpxor(xmm1, xmm1); - } } else { // Copy 32-bytes per iteration __ BIND(L_loop); diff --git a/src/hotspot/cpu/x86/x86.ad b/src/hotspot/cpu/x86/x86.ad index 448e3c0a98d3a4709436bd3649ca460da5bfb0a5..a9dc2997e218b9a41271808a060f221f5cc216d0 100644 --- a/src/hotspot/cpu/x86/x86.ad +++ b/src/hotspot/cpu/x86/x86.ad @@ -1,5 +1,5 @@ // -// Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved. +// Copyright (c) 2011, 2022, 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 @@ -1405,6 +1405,7 @@ const bool Matcher::match_rule_supported(int opcode) { } break; case Op_PopCountVI: + case Op_PopCountVL: if (!UsePopCountInstruction || !VM_Version::supports_avx512_vpopcntdq()) { return false; } @@ -1607,9 +1608,14 @@ const bool Matcher::match_rule_supported(int opcode) { } break; case Op_SqrtD: +#ifdef _LP64 if (UseSSE < 2) { return false; } +#else + // x86_32.ad has a special match rule for SqrtD. + // Together with common x86 rules, this handles all UseSSE cases. +#endif break; } return true; // Match rules are supported by default. @@ -1783,17 +1789,9 @@ const bool Matcher::match_rule_supported_vector(int opcode, int vlen, BasicType } break; case Op_VectorCastB2X: - if (size_in_bits == 256 && UseAVX < 2) { - return false; // Implementation limitation - } - break; case Op_VectorCastS2X: - if (is_integral_type(bt) && size_in_bits == 256 && UseAVX < 2) { - return false; - } - break; case Op_VectorCastI2X: - if (is_integral_type(bt) && size_in_bits == 256 && UseAVX < 2) { + if (bt != T_DOUBLE && size_in_bits == 256 && UseAVX < 2) { return false; } break; @@ -1896,6 +1894,12 @@ const bool Matcher::match_rule_supported_vector_masked(int opcode, int vlen, Bas case Op_FmaVD: return true; + case Op_MacroLogicV: + if(bt != T_INT && bt != T_LONG) { + return false; + } + return true; + // Binary masked operations case Op_AddVB: case Op_AddVS: @@ -2561,6 +2565,18 @@ static inline jlong replicate8_imm(int con, int width) { return val; } +static inline jlong high_bit_set(BasicType bt) { + switch (bt) { + case T_BYTE: return 0x8080808080808080; + case T_SHORT: return 0x8000800080008000; + case T_INT: return 0x8000000080000000; + case T_LONG: return 0x8000000000000000; + default: + ShouldNotReachHere(); + return 0; + } +} + #ifndef PRODUCT void MachNopNode::format(PhaseRegAlloc*, outputStream* st) const { st->print("nop \t# %d bytes pad for loops and calls", _count); @@ -6914,11 +6930,12 @@ instruct vcastBtoX(vec dst, vec src) %{ case T_LONG: __ vpmovsxbq($dst$$XMMRegister, $src$$XMMRegister, vlen_enc); break; - case T_DOUBLE: - __ vpmovsxbd($dst$$XMMRegister, $src$$XMMRegister, vlen_enc); + case T_DOUBLE: { + int mid_vlen_enc = (vlen_enc == Assembler::AVX_512bit) ? Assembler::AVX_256bit : Assembler::AVX_128bit; + __ vpmovsxbd($dst$$XMMRegister, $src$$XMMRegister, mid_vlen_enc); __ vcvtdq2pd($dst$$XMMRegister, $dst$$XMMRegister, vlen_enc); break; - + } default: assert(false, "%s", type2name(to_elem_bt)); } %} @@ -6985,10 +7002,12 @@ instruct vcastStoX_evex(vec dst, vec src) %{ case T_LONG: __ vpmovsxwq($dst$$XMMRegister, $src$$XMMRegister, vlen_enc); break; - case T_DOUBLE: - __ vpmovsxwd($dst$$XMMRegister, $src$$XMMRegister, vlen_enc); + case T_DOUBLE: { + int mid_vlen_enc = (vlen_enc == Assembler::AVX_512bit) ? Assembler::AVX_256bit : Assembler::AVX_128bit; + __ vpmovsxwd($dst$$XMMRegister, $src$$XMMRegister, mid_vlen_enc); __ vcvtdq2pd($dst$$XMMRegister, $dst$$XMMRegister, vlen_enc); break; + } default: ShouldNotReachHere(); } @@ -7311,62 +7330,75 @@ instruct evcmpFD(kReg dst, vec src1, vec src2, immI8 cond) %{ ins_pipe( pipe_slow ); %} -instruct vcmp(legVec dst, legVec src1, legVec src2, immI8 cond, rRegP scratch) %{ +instruct vcmp_direct(legVec dst, legVec src1, legVec src2, immI8 cond) %{ predicate(n->bottom_type()->isa_vectmask() == NULL && !is_unsigned_booltest_pred(n->in(2)->get_int()) && Matcher::vector_length_in_bytes(n->in(1)->in(1)) >= 4 && // src1 Matcher::vector_length_in_bytes(n->in(1)->in(1)) <= 32 && // src1 - is_integral_type(Matcher::vector_element_basic_type(n->in(1)->in(1)))); // src1 + is_integral_type(Matcher::vector_element_basic_type(n->in(1)->in(1))) && + (n->in(2)->get_int() == BoolTest::eq || + n->in(2)->get_int() == BoolTest::lt || + n->in(2)->get_int() == BoolTest::gt)); // cond match(Set dst (VectorMaskCmp (Binary src1 src2) cond)); - effect(TEMP scratch); - format %{ "vector_compare $dst,$src1,$src2,$cond\t! using $scratch as TEMP" %} + format %{ "vector_compare $dst,$src1,$src2,$cond\t!" %} ins_encode %{ int vlen_enc = vector_length_encoding(this, $src1); Assembler::ComparisonPredicate cmp = booltest_pred_to_comparison_pred($cond$$constant); Assembler::Width ww = widthForType(Matcher::vector_element_basic_type(this, $src1)); - __ vpcmpCCW($dst$$XMMRegister, $src1$$XMMRegister, $src2$$XMMRegister, cmp, ww, vlen_enc, $scratch$$Register); + __ vpcmpCCW($dst$$XMMRegister, $src1$$XMMRegister, $src2$$XMMRegister, xnoreg, cmp, ww, vlen_enc); %} ins_pipe( pipe_slow ); %} -instruct vcmpu(legVec dst, legVec src1, legVec src2, immI8 cond, legVec vtmp1, legVec vtmp2, rRegP scratch) %{ +instruct vcmp_negate(legVec dst, legVec src1, legVec src2, immI8 cond, legVec xtmp) %{ predicate(n->bottom_type()->isa_vectmask() == NULL && - is_unsigned_booltest_pred(n->in(2)->get_int()) && - Matcher::vector_length_in_bytes(n->in(1)->in(1)) >= 8 && // src1 - Matcher::vector_length_in_bytes(n->in(1)->in(1)) <= 16 && // src1 - is_integral_type(Matcher::vector_element_basic_type(n->in(1)->in(1)))); // src1 + !is_unsigned_booltest_pred(n->in(2)->get_int()) && + Matcher::vector_length_in_bytes(n->in(1)->in(1)) >= 4 && // src1 + Matcher::vector_length_in_bytes(n->in(1)->in(1)) <= 32 && // src1 + is_integral_type(Matcher::vector_element_basic_type(n->in(1)->in(1))) && + (n->in(2)->get_int() == BoolTest::ne || + n->in(2)->get_int() == BoolTest::le || + n->in(2)->get_int() == BoolTest::ge)); // cond match(Set dst (VectorMaskCmp (Binary src1 src2) cond)); - effect(TEMP vtmp1, TEMP vtmp2, TEMP scratch); - format %{ "vector_compareu $dst,$src1,$src2,$cond\t! using $scratch as TEMP" %} + effect(TEMP dst, TEMP xtmp); + format %{ "vector_compare $dst,$src1,$src2,$cond\t! using $xtmp as TEMP" %} ins_encode %{ - int vlen = Matcher::vector_length_in_bytes(this, $src1); + int vlen_enc = vector_length_encoding(this, $src1); Assembler::ComparisonPredicate cmp = booltest_pred_to_comparison_pred($cond$$constant); - BasicType bt = Matcher::vector_element_basic_type(this, $src1); - __ vpcmpu(bt, $dst$$XMMRegister, $src1$$XMMRegister, $src2$$XMMRegister, cmp, vlen, $vtmp1$$XMMRegister, - $vtmp2$$XMMRegister, $scratch$$Register); + Assembler::Width ww = widthForType(Matcher::vector_element_basic_type(this, $src1)); + __ vpcmpCCW($dst$$XMMRegister, $src1$$XMMRegister, $src2$$XMMRegister, $xtmp$$XMMRegister, cmp, ww, vlen_enc); %} ins_pipe( pipe_slow ); %} -instruct vcmpu32(legVec dst, legVec src1, legVec src2, immI8 cond, legVec vtmp1, legVec vtmp2, legVec vtmp3, rRegP scratch) %{ +instruct vcmpu(legVec dst, legVec src1, legVec src2, immI8 cond, legVec xtmp) %{ predicate(n->bottom_type()->isa_vectmask() == NULL && is_unsigned_booltest_pred(n->in(2)->get_int()) && - Matcher::vector_length_in_bytes(n->in(1)->in(1)) == 32 && // src1 + Matcher::vector_length_in_bytes(n->in(1)->in(1)) >= 4 && // src1 + Matcher::vector_length_in_bytes(n->in(1)->in(1)) <= 32 && // src1 is_integral_type(Matcher::vector_element_basic_type(n->in(1)->in(1)))); // src1 match(Set dst (VectorMaskCmp (Binary src1 src2) cond)); - effect(TEMP dst, TEMP vtmp1, TEMP vtmp2, TEMP vtmp3, TEMP scratch); - format %{ "vector_compareu $dst,$src1,$src2,$cond\t! using $scratch as TEMP" %} + effect(TEMP dst, TEMP xtmp); + format %{ "vector_compareu $dst,$src1,$src2,$cond\t! using $xtmp as TEMP" %} ins_encode %{ - int vlen = Matcher::vector_length_in_bytes(this, $src1); + InternalAddress flip_bit = $constantaddress(high_bit_set(Matcher::vector_element_basic_type(this, $src1))); + int vlen_enc = vector_length_encoding(this, $src1); Assembler::ComparisonPredicate cmp = booltest_pred_to_comparison_pred($cond$$constant); - BasicType bt = Matcher::vector_element_basic_type(this, $src1); - __ vpcmpu32(bt, $dst$$XMMRegister, $src1$$XMMRegister, $src2$$XMMRegister, cmp, vlen, $vtmp1$$XMMRegister, - $vtmp2$$XMMRegister, $vtmp3$$XMMRegister, $scratch$$Register); + Assembler::Width ww = widthForType(Matcher::vector_element_basic_type(this, $src1)); + + if (vlen_enc == Assembler::AVX_128bit) { + __ vmovddup($xtmp$$XMMRegister, flip_bit, vlen_enc, noreg); + } else { + __ vbroadcastsd($xtmp$$XMMRegister, flip_bit, vlen_enc, noreg); + } + __ vpxor($dst$$XMMRegister, $xtmp$$XMMRegister, $src1$$XMMRegister, vlen_enc); + __ vpxor($xtmp$$XMMRegister, $xtmp$$XMMRegister, $src2$$XMMRegister, vlen_enc); + __ vpcmpCCW($dst$$XMMRegister, $dst$$XMMRegister, $xtmp$$XMMRegister, $xtmp$$XMMRegister, cmp, ww, vlen_enc); %} ins_pipe( pipe_slow ); %} -instruct vcmpu64(vec dst, vec src1, vec src2, immI8 cond, rRegP scratch, kReg ktmp) %{ +instruct vcmp64(vec dst, vec src1, vec src2, immI8 cond, rRegP scratch, kReg ktmp) %{ predicate((n->bottom_type()->isa_vectmask() == NULL && Matcher::vector_length_in_bytes(n->in(1)->in(1)) == 64) && // src1 is_integral_type(Matcher::vector_element_basic_type(n->in(1)->in(1)))); // src1 @@ -8589,6 +8621,20 @@ instruct vpopcountI(vec dst, vec src) %{ ins_pipe( pipe_slow ); %} +instruct vpopcountL(vec dst, vec src) %{ + match(Set dst (PopCountVL src)); + format %{ "vpopcntq $dst,$src\t! vector popcount packedL" %} + ins_encode %{ + assert(UsePopCountInstruction, "not enabled"); + + int vlen_enc = vector_length_encoding(this, $src); + __ vpopcntq($dst$$XMMRegister, $src$$XMMRegister, vlen_enc); + __ evpmovqd($dst$$XMMRegister, $dst$$XMMRegister, vlen_enc); + + %} + ins_pipe( pipe_slow ); +%} + // --------------------------------- Bitwise Ternary Logic ---------------------------------- instruct vpternlog(vec dst, vec src2, vec src3, immU8 func) %{ @@ -9565,6 +9611,29 @@ instruct mask_opers_evex(kReg dst, kReg src1, kReg src2, kReg kscratch) %{ ins_pipe( pipe_slow ); %} +instruct vternlog_reg_masked(vec dst, vec src2, vec src3, immU8 func, kReg mask) %{ + match(Set dst (MacroLogicV dst (Binary src2 (Binary src3 (Binary func mask))))); + format %{ "vternlog_masked $dst,$src2,$src3,$func,$mask\t! vternlog masked operation" %} + ins_encode %{ + int vlen_enc = vector_length_encoding(this); + BasicType bt = Matcher::vector_element_basic_type(this); + __ evpternlog($dst$$XMMRegister, $func$$constant, $mask$$KRegister, + $src2$$XMMRegister, $src3$$XMMRegister, true, bt, vlen_enc); + %} + ins_pipe( pipe_slow ); +%} + +instruct vternlogd_mem_masked(vec dst, vec src2, memory src3, immU8 func, kReg mask) %{ + match(Set dst (MacroLogicV dst (Binary src2 (Binary src3 (Binary func mask))))); + format %{ "vternlog_masked $dst,$src2,$src3,$func,$mask\t! vternlog masked operation" %} + ins_encode %{ + int vlen_enc = vector_length_encoding(this); + BasicType bt = Matcher::vector_element_basic_type(this); + __ evpternlog($dst$$XMMRegister, $func$$constant, $mask$$KRegister, + $src2$$XMMRegister, $src3$$Address, true, bt, vlen_enc); + %} + ins_pipe( pipe_slow ); +%} instruct castMM(kReg dst) %{ diff --git a/src/hotspot/cpu/zero/bytes_zero.hpp b/src/hotspot/cpu/zero/bytes_zero.hpp index 9acd9dd2430e2782d8744fc2e11a04333119b06b..93d49b8a28d06fe2ce475aee078065f08f037247 100644 --- a/src/hotspot/cpu/zero/bytes_zero.hpp +++ b/src/hotspot/cpu/zero/bytes_zero.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved. * Copyright 2007, 2008, 2009 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -26,7 +26,7 @@ #ifndef CPU_ZERO_BYTES_ZERO_HPP #define CPU_ZERO_BYTES_ZERO_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" typedef union unaligned { u4 u; diff --git a/src/hotspot/cpu/zero/jniTypes_zero.hpp b/src/hotspot/cpu/zero/jniTypes_zero.hpp index 8d5a6bee7fa32059d8b49e985019693bae35182a..9f6fe78005b9efb63d909bb43881930525192d2c 100644 --- a/src/hotspot/cpu/zero/jniTypes_zero.hpp +++ b/src/hotspot/cpu/zero/jniTypes_zero.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ #define CPU_ZERO_JNITYPES_ZERO_HPP #include "jni.h" -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "oops/oop.hpp" // This file holds platform-dependent routines used to write primitive jni diff --git a/src/hotspot/os/aix/os_perf_aix.cpp b/src/hotspot/os/aix/os_perf_aix.cpp index ccdf013766e3acb9e390ff3ba86face0c72554b8..bdccca0c1c55f61086bf2bcd775ca432eabca688 100644 --- a/src/hotspot/os/aix/os_perf_aix.cpp +++ b/src/hotspot/os/aix/os_perf_aix.cpp @@ -239,7 +239,7 @@ static int SCANF_ARGS(2, 0) vread_statdata(const char* procfile, _SCANFMT_ const int n; char buf[2048]; - if ((f = fopen(procfile, "r")) == NULL) { + if ((f = os::fopen(procfile, "r")) == NULL) { return -1; } @@ -662,7 +662,7 @@ void SystemProcessInterface::SystemProcesses::ProcessIterator::get_exe_name() { jio_snprintf(buffer, PATH_MAX, "/proc/%s/stat", _entry->d_name); buffer[PATH_MAX - 1] = '\0'; - if ((fp = fopen(buffer, "r")) != NULL) { + if ((fp = os::fopen(buffer, "r")) != NULL) { if (fgets(buffer, PATH_MAX, fp) != NULL) { char* start, *end; // exe-name is between the first pair of ( and ) @@ -690,7 +690,7 @@ char* SystemProcessInterface::SystemProcesses::ProcessIterator::get_cmdline() { jio_snprintf(buffer, PATH_MAX, "/proc/%s/cmdline", _entry->d_name); buffer[PATH_MAX - 1] = '\0'; - if ((fp = fopen(buffer, "r")) != NULL) { + if ((fp = os::fopen(buffer, "r")) != NULL) { size_t size = 0; char dummy; diff --git a/src/hotspot/os/bsd/gc/z/zNUMA_bsd.cpp b/src/hotspot/os/bsd/gc/z/zNUMA_bsd.cpp index a0fe34c65041e9c60cdb14fadbdf0d66805a9477..e5b3895c44e6df677f612889573ff869abc2c66a 100644 --- a/src/hotspot/os/bsd/gc/z/zNUMA_bsd.cpp +++ b/src/hotspot/os/bsd/gc/z/zNUMA_bsd.cpp @@ -23,6 +23,7 @@ #include "precompiled.hpp" #include "gc/z/zNUMA.hpp" +#include "utilities/globalDefinitions.hpp" void ZNUMA::pd_initialize() { _enabled = false; diff --git a/src/hotspot/os/linux/attachListener_linux.cpp b/src/hotspot/os/linux/attachListener_linux.cpp index 628c3f1c462b158362502077c7f14f4330149cf9..eb723603b5f19e509bc1f0f9e2035805e714b8c9 100644 --- a/src/hotspot/os/linux/attachListener_linux.cpp +++ b/src/hotspot/os/linux/attachListener_linux.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2022, 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 @@ -385,7 +385,7 @@ LinuxAttachOperation* LinuxAttachListener::dequeue() { // write the given buffer to the socket int LinuxAttachListener::write_fully(int s, char* buf, int len) { do { - int n = ::write(s, buf, len); + ssize_t n = ::write(s, buf, len); if (n == -1) { if (errno != EINTR) return -1; } else { diff --git a/src/hotspot/os/linux/cgroupSubsystem_linux.cpp b/src/hotspot/os/linux/cgroupSubsystem_linux.cpp index 1593a701e67991e41b8a4d010b4a44b86803cd75..dd858a30e4cdf3b7354d02d59a2a434ec4a3d97c 100644 --- a/src/hotspot/os/linux/cgroupSubsystem_linux.cpp +++ b/src/hotspot/os/linux/cgroupSubsystem_linux.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2022, 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 @@ -146,7 +146,7 @@ bool CgroupSubsystemFactory::determine_type(CgroupInfo* cg_infos, * Conversely, for cgroups v2 (unified hierarchy), cpu, cpuacct, cpuset, memory * controllers must have hierarchy ID 0 and the unified controller mounted. */ - cgroups = fopen(proc_cgroups, "r"); + cgroups = os::fopen(proc_cgroups, "r"); if (cgroups == NULL) { log_debug(os, container)("Can't open %s, %s", proc_cgroups, os::strerror(errno)); *flags = INVALID_CGROUPS_GENERIC; @@ -214,7 +214,7 @@ bool CgroupSubsystemFactory::determine_type(CgroupInfo* cg_infos, * - on a cgroups v1 system, collect info for mapping * the host mount point to the local one via /proc/self/mountinfo below. */ - cgroup = fopen(proc_self_cgroup, "r"); + cgroup = os::fopen(proc_self_cgroup, "r"); if (cgroup == NULL) { log_debug(os, container)("Can't open %s, %s", proc_self_cgroup, os::strerror(errno)); @@ -269,7 +269,7 @@ bool CgroupSubsystemFactory::determine_type(CgroupInfo* cg_infos, // Find various mount points by reading /proc/self/mountinfo // mountinfo format is documented at https://www.kernel.org/doc/Documentation/filesystems/proc.txt - mntinfo = fopen(proc_self_mountinfo, "r"); + mntinfo = os::fopen(proc_self_mountinfo, "r"); if (mntinfo == NULL) { log_debug(os, container)("Can't open %s, %s", proc_self_mountinfo, os::strerror(errno)); diff --git a/src/hotspot/os/linux/cgroupSubsystem_linux.hpp b/src/hotspot/os/linux/cgroupSubsystem_linux.hpp index 754629714492911a7a20601a49fcad10873b31b1..5fc376a304e65d2b96c6083204a4f936ae62883b 100644 --- a/src/hotspot/os/linux/cgroupSubsystem_linux.hpp +++ b/src/hotspot/os/linux/cgroupSubsystem_linux.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2022, 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,7 @@ template int subsystem_file_line_contents(CgroupController* c, } strncat(file, filename, MAXPATHLEN-filelen); log_trace(os, container)("Path to %s is %s", filename, file); - fp = fopen(file, "r"); + fp = os::fopen(file, "r"); if (fp != NULL) { int err = 0; while ((p = fgets(buf, MAXPATHLEN, fp)) != NULL) { @@ -157,8 +157,10 @@ PRAGMA_DIAG_POP NULL, \ scan_fmt, \ &variable); \ - if (err != 0) \ + if (err != 0) { \ + log_trace(os, container)(logstring, (return_type) OSCONTAINER_ERROR); \ return (return_type) OSCONTAINER_ERROR; \ + } \ \ log_trace(os, container)(logstring, variable); \ } diff --git a/src/hotspot/os/linux/cgroupV2Subsystem_linux.cpp b/src/hotspot/os/linux/cgroupV2Subsystem_linux.cpp index 25146373532c6b13b641c973025c97320b503128..0b1bc9c6cddd83e9704215a5bb09e2aada28ca9a 100644 --- a/src/hotspot/os/linux/cgroupV2Subsystem_linux.cpp +++ b/src/hotspot/os/linux/cgroupV2Subsystem_linux.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, 2021, Red Hat Inc. + * Copyright (c) 2020, 2022, Red Hat Inc. * 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,7 +36,7 @@ */ int CgroupV2Subsystem::cpu_shares() { GET_CONTAINER_INFO(int, _unified, "/cpu.weight", - "Raw value for CPU shares is: %d", "%d", shares); + "Raw value for CPU Shares is: %d", "%d", shares); // Convert default value of 100 to no shares setup if (shares == 100) { log_debug(os, container)("CPU Shares is: %d", -1); diff --git a/src/hotspot/os/linux/decoder_linux.cpp b/src/hotspot/os/linux/decoder_linux.cpp index daa12ec6f6d7caa2331c188fc9503334eef3c99c..0fc0daf98e7b9ee89a635e9317905bb865142caa 100644 --- a/src/hotspot/os/linux/decoder_linux.cpp +++ b/src/hotspot/os/linux/decoder_linux.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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 @@ -58,7 +58,7 @@ bool ElfDecoder::demangle(const char* symbol, char *buf, int buflen) { bool ElfFile::specifies_noexecstack(const char* filepath) { if (filepath == NULL) return true; - FILE* file = fopen(filepath, "r"); + FILE* file = os::fopen(filepath, "r"); if (file == NULL) return true; // AARCH64 defaults to noexecstack. All others default to execstack. diff --git a/src/hotspot/os/linux/gc/z/zMountPoint_linux.cpp b/src/hotspot/os/linux/gc/z/zMountPoint_linux.cpp index d3c5ef3fd7d7d831b1a06e0e0c1dbb9b18bd3fd2..b0fa227ef7c05cd30d3a34fedabc422246061889 100644 --- a/src/hotspot/os/linux/gc/z/zMountPoint_linux.cpp +++ b/src/hotspot/os/linux/gc/z/zMountPoint_linux.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2022, 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 @@ #include "gc/z/zErrno.hpp" #include "gc/z/zMountPoint_linux.hpp" #include "runtime/globals.hpp" +#include "runtime/os.hpp" #include #include @@ -70,7 +71,7 @@ char* ZMountPoint::get_mountpoint(const char* line, const char* filesystem) cons } void ZMountPoint::get_mountpoints(const char* filesystem, ZArray* mountpoints) const { - FILE* fd = fopen(PROC_SELF_MOUNTINFO, "r"); + FILE* fd = os::fopen(PROC_SELF_MOUNTINFO, "r"); if (fd == NULL) { ZErrno err; log_error_p(gc)("Failed to open %s: %s", PROC_SELF_MOUNTINFO, err.to_string()); diff --git a/src/hotspot/os/linux/gc/z/zPhysicalMemoryBacking_linux.cpp b/src/hotspot/os/linux/gc/z/zPhysicalMemoryBacking_linux.cpp index 951b98d6cce40ba9d751cc3cc9ce3bba7f65c88c..b434acc3215eb3548c160491d0839bb52f99271c 100644 --- a/src/hotspot/os/linux/gc/z/zPhysicalMemoryBacking_linux.cpp +++ b/src/hotspot/os/linux/gc/z/zPhysicalMemoryBacking_linux.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2022, 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 @@ -329,7 +329,7 @@ void ZPhysicalMemoryBacking::warn_available_space(size_t max_capacity) const { void ZPhysicalMemoryBacking::warn_max_map_count(size_t max_capacity) const { const char* const filename = ZFILENAME_PROC_MAX_MAP_COUNT; - FILE* const file = fopen(filename, "r"); + FILE* const file = os::fopen(filename, "r"); if (file == NULL) { // Failed to open file, skip check log_debug_p(gc, init)("Failed to open %s", filename); diff --git a/src/hotspot/os/linux/gc/z/zSyscall_linux.hpp b/src/hotspot/os/linux/gc/z/zSyscall_linux.hpp index 95b13841b2a8f244ef7badeea45749f01f0d223d..1e1becf5a140f5db0666e659b764f2a254b25e90 100644 --- a/src/hotspot/os/linux/gc/z/zSyscall_linux.hpp +++ b/src/hotspot/os/linux/gc/z/zSyscall_linux.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2022, 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,7 +24,8 @@ #ifndef OS_LINUX_GC_Z_ZSYSCALL_LINUX_HPP #define OS_LINUX_GC_Z_ZSYSCALL_LINUX_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" +#include "utilities/globalDefinitions.hpp" // Flags for get_mempolicy() #ifndef MPOL_F_NODE diff --git a/src/hotspot/os/linux/osContainer_linux.hpp b/src/hotspot/os/linux/osContainer_linux.hpp index 940bc0e3874bf00048722622e99e3defee97a211..1ba4a9dabdc88eecd613920db168b6968f0d86b7 100644 --- a/src/hotspot/os/linux/osContainer_linux.hpp +++ b/src/hotspot/os/linux/osContainer_linux.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2022, 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,7 +27,7 @@ #include "utilities/globalDefinitions.hpp" #include "utilities/macros.hpp" -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #define OSCONTAINER_ERROR (-2) diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp index cd0fd06f4e14ba9b8bf955d73d27b4a04096f5bf..31b110efcbc647ad84cf3d27df4360efcc38ba51 100644 --- a/src/hotspot/os/linux/os_linux.cpp +++ b/src/hotspot/os/linux/os_linux.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2022, 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 @@ -258,7 +258,7 @@ bool os::Linux::get_tick_information(CPUPerfTicks* pticks, int which_logical_cpu memset(pticks, 0, sizeof(CPUPerfTicks)); - if ((fh = fopen("/proc/stat", "r")) == NULL) { + if ((fh = os::fopen("/proc/stat", "r")) == NULL) { return false; } @@ -352,7 +352,7 @@ void os::Linux::initialize_system_info() { pid_t pid = os::Linux::gettid(); char fname[32]; jio_snprintf(fname, sizeof(fname), "/proc/%d", pid); - FILE *fp = fopen(fname, "r"); + FILE *fp = os::fopen(fname, "r"); if (fp == NULL) { unsafe_chroot_detected = true; } else { @@ -806,7 +806,7 @@ bool os::create_thread(Thread* thread, ThreadType thr_type, // Calculate stack size if it's not specified by caller. size_t stack_size = os::Posix::get_initial_stack_size(thr_type, req_stack_size); - // In glibc versions prior to 2.7 the guard size mechanism + // In glibc versions prior to 2.27 the guard size mechanism // is not implemented properly. The posix standard requires adding // the size of the guard pages to the stack size, instead Linux // takes the space out of 'stacksize'. Thus we adapt the requested @@ -1027,7 +1027,7 @@ bool os::is_primordial_thread(void) { // Find the virtual memory area that contains addr static bool find_vma(address addr, address* vma_low, address* vma_high) { - FILE *fp = fopen("/proc/self/maps", "r"); + FILE *fp = os::fopen("/proc/self/maps", "r"); if (fp) { address low, high; while (!feof(fp)) { @@ -1139,7 +1139,7 @@ void os::Linux::capture_initial_stack(size_t max_size) { char stat[2048]; int statlen; - fp = fopen("/proc/self/stat", "r"); + fp = os::fopen("/proc/self/stat", "r"); if (fp) { statlen = fread(stat, 1, 2047, fp); stat[statlen] = '\0'; @@ -2004,7 +2004,7 @@ static void parse_os_info_helper(FILE* fp, char* distro, size_t length, bool get } static void parse_os_info(char* distro, size_t length, const char* file) { - FILE* fp = fopen(file, "r"); + FILE* fp = os::fopen(file, "r"); if (fp != NULL) { // if suse format, print out first line bool get_first_line = (strcmp(file, "/etc/SuSE-release") == 0); @@ -2065,7 +2065,7 @@ void os::Linux::print_system_memory_info(outputStream* st) { } bool os::Linux::query_process_memory_info(os::Linux::meminfo_t* info) { - FILE* f = ::fopen("/proc/self/status", "r"); + FILE* f = os::fopen("/proc/self/status", "r"); const int num_values = sizeof(os::Linux::meminfo_t) / sizeof(size_t); int num_found = 0; char buf[256]; @@ -2312,7 +2312,7 @@ void os::print_memory_info(outputStream* st) { static bool print_model_name_and_flags(outputStream* st, char* buf, size_t buflen) { #if defined(IA32) || defined(AMD64) // Other platforms have less repetitive cpuinfo files - FILE *fp = fopen("/proc/cpuinfo", "r"); + FILE *fp = os::fopen("/proc/cpuinfo", "r"); if (fp) { bool model_name_printed = false; while (!feof(fp)) { @@ -2416,7 +2416,7 @@ const char* search_string = "Processor"; // Parses the cpuinfo file for string representing the model name. void os::get_summary_cpu_info(char* cpuinfo, size_t length) { - FILE* fp = fopen("/proc/cpuinfo", "r"); + FILE* fp = os::fopen("/proc/cpuinfo", "r"); if (fp != NULL) { while (!feof(fp)) { char buf[256]; @@ -3551,7 +3551,7 @@ static void set_coredump_filter(CoredumpFilterBit bit) { FILE *f; long cdm; - if ((f = fopen("/proc/self/coredump_filter", "r+")) == NULL) { + if ((f = os::fopen("/proc/self/coredump_filter", "r+")) == NULL) { return; } @@ -3590,7 +3590,7 @@ static size_t scan_default_large_page_size() { // If we can't determine the value (e.g. /proc is not mounted, or the text // format has been changed), we'll set largest page size to 0 - FILE *fp = fopen("/proc/meminfo", "r"); + FILE *fp = os::fopen("/proc/meminfo", "r"); if (fp) { while (!feof(fp)) { int x = 0; @@ -4268,7 +4268,7 @@ int os::Linux::get_namespace_pid(int vmid) { int retpid = -1; snprintf(fname, sizeof(fname), "/proc/%d/status", vmid); - FILE *fp = fopen(fname, "r"); + FILE *fp = os::fopen(fname, "r"); if (fp) { int pid, nspid; @@ -5077,7 +5077,7 @@ static jlong slow_thread_cpu_time(Thread *thread, bool user_sys_cpu_time) { FILE *fp; snprintf(proc_name, 64, "/proc/self/task/%d/stat", tid); - fp = fopen(proc_name, "r"); + fp = os::fopen(proc_name, "r"); if (fp == NULL) return -1; statlen = fread(stat, 1, 2047, fp); stat[statlen] = '\0'; @@ -5382,7 +5382,7 @@ bool os::supports_map_sync() { void os::print_memory_mappings(char* addr, size_t bytes, outputStream* st) { unsigned long long start = (unsigned long long)addr; unsigned long long end = start + bytes; - FILE* f = ::fopen("/proc/self/maps", "r"); + FILE* f = os::fopen("/proc/self/maps", "r"); int num_found = 0; if (f != NULL) { st->print("Range [%llx-%llx) contains: ", start, end); diff --git a/src/hotspot/os/linux/os_perf_linux.cpp b/src/hotspot/os/linux/os_perf_linux.cpp index 4f8e411d47b1f80583b80342498ab1012518db4d..8d244887d4bdb8bd35cea8134c3941ddcb59b34a 100644 --- a/src/hotspot/os/linux/os_perf_linux.cpp +++ b/src/hotspot/os/linux/os_perf_linux.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2022, 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 @@ -234,7 +234,7 @@ static int SCANF_ARGS(2, 0) vread_statdata(const char* procfile, _SCANFMT_ const int n; char buf[2048]; - if ((f = fopen(procfile, "r")) == NULL) { + if ((f = os::fopen(procfile, "r")) == NULL) { return -1; } @@ -271,7 +271,7 @@ static int SCANF_ARGS(2, 3) read_statdata(const char* procfile, _SCANFMT_ const static FILE* open_statfile(void) { FILE *f; - if ((f = fopen("/proc/stat", "r")) == NULL) { + if ((f = os::fopen("/proc/stat", "r")) == NULL) { static int haveWarned = 0; if (!haveWarned) { haveWarned = 1; @@ -722,7 +722,7 @@ void SystemProcessInterface::SystemProcesses::ProcessIterator::get_exe_name() { jio_snprintf(buffer, PATH_MAX, "/proc/%s/stat", _entry->d_name); buffer[PATH_MAX - 1] = '\0'; - if ((fp = fopen(buffer, "r")) != NULL) { + if ((fp = os::fopen(buffer, "r")) != NULL) { if (fgets(buffer, PATH_MAX, fp) != NULL) { char* start, *end; // exe-name is between the first pair of ( and ) @@ -750,7 +750,7 @@ char* SystemProcessInterface::SystemProcesses::ProcessIterator::get_cmdline() { jio_snprintf(buffer, PATH_MAX, "/proc/%s/cmdline", _entry->d_name); buffer[PATH_MAX - 1] = '\0'; - if ((fp = fopen(buffer, "r")) != NULL) { + if ((fp = os::fopen(buffer, "r")) != NULL) { size_t size = 0; char dummy; diff --git a/src/hotspot/os/posix/os_posix.cpp b/src/hotspot/os/posix/os_posix.cpp index 3c990588562544016cfffe8fa394f3e785504cc1..31c1cbc3d4faacffa7e051ac4b7f415b9bafc2af 100644 --- a/src/hotspot/os/posix/os_posix.cpp +++ b/src/hotspot/os/posix/os_posix.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2022, 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 @@ -675,13 +675,13 @@ const char* os::get_current_directory(char *buf, size_t buflen) { return getcwd(buf, buflen); } -FILE* os::open(int fd, const char* mode) { +FILE* os::fdopen(int fd, const char* mode) { return ::fdopen(fd, mode); } -size_t os::write(int fd, const void *buf, unsigned int nBytes) { - size_t res; - RESTARTABLE((size_t) ::write(fd, buf, (size_t) nBytes), res); +ssize_t os::write(int fd, const void *buf, unsigned int nBytes) { + ssize_t res; + RESTARTABLE(::write(fd, buf, (size_t) nBytes), res); return res; } @@ -689,10 +689,6 @@ ssize_t os::read_at(int fd, void *buf, unsigned int nBytes, jlong offset) { return ::pread(fd, buf, nBytes, offset); } -int os::close(int fd) { - return ::close(fd); -} - void os::flockfile(FILE* fp) { ::flockfile(fp); } @@ -720,10 +716,6 @@ int os::socket_close(int fd) { return ::close(fd); } -int os::socket(int domain, int type, int protocol) { - return ::socket(domain, type, protocol); -} - int os::recv(int fd, char* buf, size_t nBytes, uint flags) { RESTARTABLE_RETURN_INT(::recv(fd, buf, nBytes, flags)); } diff --git a/src/hotspot/os/posix/perfMemory_posix.cpp b/src/hotspot/os/posix/perfMemory_posix.cpp index 5d0448246bf1929943f47d6c8ec37614c65ee8fc..7fcf867b3f86a6cdae6bb9a49bce15a8f9baf3c0 100644 --- a/src/hotspot/os/posix/perfMemory_posix.cpp +++ b/src/hotspot/os/posix/perfMemory_posix.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2022, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012, 2021 SAP SE. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -98,21 +98,20 @@ static void save_memory_to_file(char* addr, size_t size) { const char* destfile = PerfMemory::get_perfdata_file_path(); assert(destfile[0] != '\0', "invalid PerfData file path"); - int result; + int fd; - RESTARTABLE(os::open(destfile, O_CREAT|O_WRONLY|O_TRUNC, S_IRUSR|S_IWUSR), - result); - if (result == OS_ERR) { + RESTARTABLE(os::open(destfile, O_CREAT|O_WRONLY|O_TRUNC, S_IRUSR|S_IWUSR), fd); + if (fd == OS_ERR) { if (PrintMiscellaneous && Verbose) { warning("Could not create Perfdata save file: %s: %s\n", destfile, os::strerror(errno)); } } else { - int fd = result; + ssize_t result; for (size_t remaining = size; remaining > 0;) { - RESTARTABLE(::write(fd, addr, remaining), result); + result = os::write(fd, addr, remaining); if (result == OS_ERR) { if (PrintMiscellaneous && Verbose) { warning("Could not write Perfdata save file: %s: %s\n", @@ -331,7 +330,7 @@ static DIR *open_directory_secure(const char* dirname) { // Determine if the open directory is secure. if (!is_dirfd_secure(fd)) { // The directory is not a secure directory. - os::close(fd); + ::close(fd); return dirp; } @@ -339,21 +338,21 @@ static DIR *open_directory_secure(const char* dirname) { dirp = ::opendir(dirname); if (dirp == NULL) { // The directory doesn't exist, close fd and return. - os::close(fd); + ::close(fd); return dirp; } // Check to make sure fd and dirp are referencing the same file system object. if (!is_same_fsobject(fd, AIX_ONLY(dirp->dd_fd) NOT_AIX(dirfd(dirp)))) { // The directory is not secure. - os::close(fd); + ::close(fd); os::closedir(dirp); dirp = NULL; return dirp; } // Close initial open now that we know directory is secure - os::close(fd); + ::close(fd); return dirp; } @@ -842,9 +841,9 @@ static int create_sharedmem_resources(const char* dirname, const char* filename, // Open the filename in the current directory. // Cannot use O_TRUNC here; truncation of an existing file has to happen // after the is_file_secure() check below. - int result; - RESTARTABLE(os::open(filename, O_RDWR|O_CREAT|O_NOFOLLOW, S_IRUSR|S_IWUSR), result); - if (result == OS_ERR) { + int fd; + RESTARTABLE(os::open(filename, O_RDWR|O_CREAT|O_NOFOLLOW, S_IRUSR|S_IWUSR), fd); + if (fd == OS_ERR) { if (PrintMiscellaneous && Verbose) { if (errno == ELOOP) { warning("file %s is a symlink and is not secure\n", filename); @@ -860,15 +859,14 @@ static int create_sharedmem_resources(const char* dirname, const char* filename, // close the directory and reset the current working directory close_directory_secure_cwd(dirp, saved_cwd_fd); - // save the file descriptor - int fd = result; - // check to see if the file is secure if (!is_file_secure(fd, filename)) { ::close(fd); return -1; } + ssize_t result; + // truncate the file to get rid of any existing data RESTARTABLE(::ftruncate(fd, (off_t)0), result); if (result == OS_ERR) { @@ -895,7 +893,7 @@ static int create_sharedmem_resources(const char* dirname, const char* filename, int zero_int = 0; result = (int)os::seek_to_file_offset(fd, (jlong)(seekpos)); if (result == -1 ) break; - RESTARTABLE(::write(fd, &zero_int, 1), result); + result = os::write(fd, &zero_int, 1); if (result != 1) { if (errno == ENOSPC) { warning("Insufficient space for shared memory file:\n %s\nTry using the -Djava.io.tmpdir= option to select an alternate temp location.\n", filename); diff --git a/src/hotspot/os/posix/signals_posix.cpp b/src/hotspot/os/posix/signals_posix.cpp index 2c020a79408049797d5c2f1fcc1e5de8d968323e..895c3cc09ae88c5d7ec04c57e8716062b46a707a 100644 --- a/src/hotspot/os/posix/signals_posix.cpp +++ b/src/hotspot/os/posix/signals_posix.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022, 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 @@ -562,6 +562,11 @@ int JVM_HANDLE_XXX_SIGNAL(int sig, siginfo_t* info, { assert(info != NULL && ucVoid != NULL, "sanity"); + if (sig == BREAK_SIGNAL) { + assert(!ReduceSignalUsage, "Should not happen with -Xrs/-XX:+ReduceSignalUsage"); + return true; // ignore it + } + // Note: it's not uncommon that JNI code uses signal/sigset to install, // then restore certain signal handler (e.g. to temporarily block SIGPIPE, // or have a SIGILL handler when detecting CPU type). When that happens, @@ -1197,7 +1202,7 @@ int os::get_signal_number(const char* signal_name) { return -1; } -void set_signal_handler(int sig) { +void set_signal_handler(int sig, bool do_check = true) { // Check for overwrite. struct sigaction oldAct; sigaction(sig, (struct sigaction*)NULL, &oldAct); @@ -1241,7 +1246,7 @@ void set_signal_handler(int sig) { // Save handler setup for later checking vm_handlers.set(sig, &sigAct); - do_check_signal_periodically[sig] = true; + do_check_signal_periodically[sig] = do_check; int ret = sigaction(sig, &sigAct, &oldAct); assert(ret == 0, "check"); @@ -1279,7 +1284,12 @@ void install_signal_handlers() { set_signal_handler(SIGFPE); PPC64_ONLY(set_signal_handler(SIGTRAP);) set_signal_handler(SIGXFSZ); - + if (!ReduceSignalUsage) { + // This is just for early initialization phase. Intercepting the signal here reduces the risk + // that an attach client accidentally forces HotSpot to quit prematurely. We skip the periodic + // check because late initialization will overwrite it to UserHandler. + set_signal_handler(BREAK_SIGNAL, false); + } #if defined(__APPLE__) // lldb (gdb) installs both standard BSD signal handlers, and mach exception // handlers. By replacing the existing task exception handler, we disable lldb's mach diff --git a/src/hotspot/os/posix/signals_posix.hpp b/src/hotspot/os/posix/signals_posix.hpp index 373a02ff3a31475e9ca05865b9651ce001b01263..2efdb374c4eb2e1ed9750882831f144b6de070f2 100644 --- a/src/hotspot/os/posix/signals_posix.hpp +++ b/src/hotspot/os/posix/signals_posix.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2020, 2022, 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,7 +25,7 @@ #ifndef OS_POSIX_SIGNALS_POSIX_HPP #define OS_POSIX_SIGNALS_POSIX_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "utilities/globalDefinitions.hpp" class outputStream; diff --git a/src/hotspot/os/posix/threadLocalStorage_posix.cpp b/src/hotspot/os/posix/threadLocalStorage_posix.cpp index cc703ef811f94fe140bece77f8da533ddb0f9f71..25bbbe2244f788d6302235e1517c367b45906712 100644 --- a/src/hotspot/os/posix/threadLocalStorage_posix.cpp +++ b/src/hotspot/os/posix/threadLocalStorage_posix.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2022, 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,6 +23,7 @@ */ #include "runtime/threadLocalStorage.hpp" +#include "utilities/debug.hpp" #include static pthread_key_t _thread_key; diff --git a/src/hotspot/os/windows/gc/z/zMapper_windows.hpp b/src/hotspot/os/windows/gc/z/zMapper_windows.hpp index 4db80c899561d51cb1227cbd76b5e7b80c52bb4d..3e47b470f5f28445f5dbe56e83ab447a971ceb6c 100644 --- a/src/hotspot/os/windows/gc/z/zMapper_windows.hpp +++ b/src/hotspot/os/windows/gc/z/zMapper_windows.hpp @@ -24,7 +24,7 @@ #ifndef OS_WINDOWS_GC_Z_ZMAPPER_WINDOWS_HPP #define OS_WINDOWS_GC_Z_ZMAPPER_WINDOWS_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "utilities/globalDefinitions.hpp" #include diff --git a/src/hotspot/os/windows/iphlp_interface.hpp b/src/hotspot/os/windows/iphlp_interface.hpp index 0ebe971a5f17947ca346a49aea0f517f880b00de..3e7e0adef6500d7f25716127f81e8cc4df99eb91 100644 --- a/src/hotspot/os/windows/iphlp_interface.hpp +++ b/src/hotspot/os/windows/iphlp_interface.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2022, 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,7 +25,7 @@ #ifndef OS_WINDOWS_IPHLP_INTERFACE_HPP #define OS_WINDOWS_IPHLP_INTERFACE_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "utilities/macros.hpp" #include #include diff --git a/src/hotspot/os/windows/os_windows.cpp b/src/hotspot/os/windows/os_windows.cpp index e129b447cfd3794aa306c10a48fe56f4e849ea08..ed4ba3e1fc2ce3074c31fbd2dc7d9e31d8bc5e8c 100644 --- a/src/hotspot/os/windows/os_windows.cpp +++ b/src/hotspot/os/windows/os_windows.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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 @@ -529,7 +529,7 @@ static unsigned __stdcall thread_native_entry(Thread* thread) { res = 20115; // java thread } - log_info(os, thread)("Thread is alive (tid: " UINTX_FORMAT ").", os::current_thread_id()); + log_info(os, thread)("Thread is alive (tid: " UINTX_FORMAT ", stacksize: " SIZE_FORMAT "k).", os::current_thread_id(), thread->stack_size() / 1024); #ifdef USE_VECTORED_EXCEPTION_HANDLING // Any exception is caught by the Vectored Exception Handler, so VM can @@ -1553,7 +1553,7 @@ void * os::dll_load(const char *name, char *ebuf, int ebuflen) { || // Read location of signature (sizeof(signature_offset) != - (os::read(fd, (void*)&signature_offset, sizeof(signature_offset)))) + (::read(fd, (void*)&signature_offset, sizeof(signature_offset)))) || // Go to COFF File Header in dll // that is located after "signature" (4 bytes long) @@ -1562,7 +1562,7 @@ void * os::dll_load(const char *name, char *ebuf, int ebuflen) { || // Read field that contains code of architecture // that dll was built for - (sizeof(lib_arch) != (os::read(fd, (void*)&lib_arch, sizeof(lib_arch)))) + (sizeof(lib_arch) != (::read(fd, (void*)&lib_arch, sizeof(lib_arch)))) ); ::close(fd); @@ -4754,18 +4754,14 @@ int os::open(const char *path, int oflag, int mode) { return fd; } -FILE* os::open(int fd, const char* mode) { +FILE* os::fdopen(int fd, const char* mode) { return ::_fdopen(fd, mode); } -size_t os::write(int fd, const void *buf, unsigned int nBytes) { +ssize_t os::write(int fd, const void *buf, unsigned int nBytes) { return ::write(fd, buf, nBytes); } -int os::close(int fd) { - return ::close(fd); -} - void os::exit(int num) { win32::exit_process_or_thread(win32::EPT_PROCESS, num); } @@ -5725,10 +5721,6 @@ int os::socket_close(int fd) { return ::closesocket(fd); } -int os::socket(int domain, int type, int protocol) { - return ::socket(domain, type, protocol); -} - int os::connect(int fd, struct sockaddr* him, socklen_t len) { return ::connect(fd, him, len); } diff --git a/src/hotspot/os/windows/pdh_interface.hpp b/src/hotspot/os/windows/pdh_interface.hpp index 743c737d9982c6f1fca37eac2637ff4a37c6da72..151f9edd0e94906b1e56473a69337b7e3e8b9231 100644 --- a/src/hotspot/os/windows/pdh_interface.hpp +++ b/src/hotspot/os/windows/pdh_interface.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2022, 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,7 +25,7 @@ #ifndef OS_WINDOWS_PDH_INTERFACE_HPP #define OS_WINDOWS_PDH_INTERFACE_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include #include diff --git a/src/hotspot/os/windows/threadLocalStorage_windows.cpp b/src/hotspot/os/windows/threadLocalStorage_windows.cpp index 5648a672d71667ec946e491c2de6f1f7cf03d37c..7d809518aab33f3d958465de61be07b39d49a491 100644 --- a/src/hotspot/os/windows/threadLocalStorage_windows.cpp +++ b/src/hotspot/os/windows/threadLocalStorage_windows.cpp @@ -24,6 +24,7 @@ #include "precompiled.hpp" #include "runtime/threadLocalStorage.hpp" +#include "utilities/debug.hpp" #include static DWORD _thread_key; diff --git a/src/hotspot/os_cpu/bsd_aarch64/copy_bsd_aarch64.hpp b/src/hotspot/os_cpu/bsd_aarch64/copy_bsd_aarch64.hpp index 6f08cb351252dbc92dd240104e45f119020de8ae..580daec9ebf2ecce47736a166e180d0440a9e547 100644 --- a/src/hotspot/os_cpu/bsd_aarch64/copy_bsd_aarch64.hpp +++ b/src/hotspot/os_cpu/bsd_aarch64/copy_bsd_aarch64.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2014, Red Hat Inc. All rights reserved. * Copyright (c) 2021, Azul Systems, Inc. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,163 +27,6 @@ #ifndef OS_CPU_BSD_AARCH64_COPY_BSD_AARCH64_HPP #define OS_CPU_BSD_AARCH64_COPY_BSD_AARCH64_HPP -#define COPY_SMALL(from, to, count) \ -{ \ - long tmp0, tmp1, tmp2, tmp3; \ - long tmp4, tmp5, tmp6, tmp7; \ - __asm volatile( \ -" adr %[t0], 0f;\n" \ -" add %[t0], %[t0], %[cnt], lsl #5;\n" \ -" br %[t0];\n" \ -" .align 5;\n" \ -"0:" \ -" b 1f;\n" \ -" .align 5;\n" \ -" ldr %[t0], [%[s], #0];\n" \ -" str %[t0], [%[d], #0];\n" \ -" b 1f;\n" \ -" .align 5;\n" \ -" ldp %[t0], %[t1], [%[s], #0];\n" \ -" stp %[t0], %[t1], [%[d], #0];\n" \ -" b 1f;\n" \ -" .align 5;\n" \ -" ldp %[t0], %[t1], [%[s], #0];\n" \ -" ldr %[t2], [%[s], #16];\n" \ -" stp %[t0], %[t1], [%[d], #0];\n" \ -" str %[t2], [%[d], #16];\n" \ -" b 1f;\n" \ -" .align 5;\n" \ -" ldp %[t0], %[t1], [%[s], #0];\n" \ -" ldp %[t2], %[t3], [%[s], #16];\n" \ -" stp %[t0], %[t1], [%[d], #0];\n" \ -" stp %[t2], %[t3], [%[d], #16];\n" \ -" b 1f;\n" \ -" .align 5;\n" \ -" ldp %[t0], %[t1], [%[s], #0];\n" \ -" ldp %[t2], %[t3], [%[s], #16];\n" \ -" ldr %[t4], [%[s], #32];\n" \ -" stp %[t0], %[t1], [%[d], #0];\n" \ -" stp %[t2], %[t3], [%[d], #16];\n" \ -" str %[t4], [%[d], #32];\n" \ -" b 1f;\n" \ -" .align 5;\n" \ -" ldp %[t0], %[t1], [%[s], #0];\n" \ -" ldp %[t2], %[t3], [%[s], #16];\n" \ -" ldp %[t4], %[t5], [%[s], #32];\n" \ -"2:" \ -" stp %[t0], %[t1], [%[d], #0];\n" \ -" stp %[t2], %[t3], [%[d], #16];\n" \ -" stp %[t4], %[t5], [%[d], #32];\n" \ -" b 1f;\n" \ -" .align 5;\n" \ -" ldr %[t6], [%[s], #0];\n" \ -" ldp %[t0], %[t1], [%[s], #8];\n" \ -" ldp %[t2], %[t3], [%[s], #24];\n" \ -" ldp %[t4], %[t5], [%[s], #40];\n" \ -" str %[t6], [%[d]], #8;\n" \ -" b 2b;\n" \ -" .align 5;\n" \ -" ldp %[t0], %[t1], [%[s], #0];\n" \ -" ldp %[t2], %[t3], [%[s], #16];\n" \ -" ldp %[t4], %[t5], [%[s], #32];\n" \ -" ldp %[t6], %[t7], [%[s], #48];\n" \ -" stp %[t0], %[t1], [%[d], #0];\n" \ -" stp %[t2], %[t3], [%[d], #16];\n" \ -" stp %[t4], %[t5], [%[d], #32];\n" \ -" stp %[t6], %[t7], [%[d], #48];\n" \ -"1:" \ - \ - : [s]"+r"(from), [d]"+r"(to), [cnt]"+r"(count), \ - [t0]"=&r"(tmp0), [t1]"=&r"(tmp1), [t2]"=&r"(tmp2), [t3]"=&r"(tmp3), \ - [t4]"=&r"(tmp4), [t5]"=&r"(tmp5), [t6]"=&r"(tmp6), [t7]"=&r"(tmp7) \ - : \ - : "memory", "cc"); \ -} - -static void pd_conjoint_words(const HeapWord* from, HeapWord* to, size_t count) { - __asm volatile( "prfm pldl1strm, [%[s], #0];" :: [s]"r"(from) : "memory"); - if (__builtin_expect(count <= 8, 1)) { - COPY_SMALL(from, to, count); - return; - } - _Copy_conjoint_words(from, to, count); -} - -static void pd_disjoint_words(const HeapWord* from, HeapWord* to, size_t count) { - if (__builtin_constant_p(count)) { - memcpy(to, from, count * sizeof(HeapWord)); - return; - } - __asm volatile( "prfm pldl1strm, [%[s], #0];" :: [s]"r"(from) : "memory"); - if (__builtin_expect(count <= 8, 1)) { - COPY_SMALL(from, to, count); - return; - } - _Copy_disjoint_words(from, to, count); -} - -static void pd_disjoint_words_atomic(const HeapWord* from, HeapWord* to, size_t count) { - __asm volatile( "prfm pldl1strm, [%[s], #0];" :: [s]"r"(from) : "memory"); - if (__builtin_expect(count <= 8, 1)) { - COPY_SMALL(from, to, count); - return; - } - _Copy_disjoint_words(from, to, count); -} - -static void pd_aligned_conjoint_words(const HeapWord* from, HeapWord* to, size_t count) { - pd_conjoint_words(from, to, count); -} - -static void pd_aligned_disjoint_words(const HeapWord* from, HeapWord* to, size_t count) { - pd_disjoint_words(from, to, count); -} - -static void pd_conjoint_bytes(const void* from, void* to, size_t count) { - (void)memmove(to, from, count); -} - -static void pd_conjoint_bytes_atomic(const void* from, void* to, size_t count) { - pd_conjoint_bytes(from, to, count); -} - -static void pd_conjoint_jshorts_atomic(const jshort* from, jshort* to, size_t count) { - _Copy_conjoint_jshorts_atomic(from, to, count); -} - -static void pd_conjoint_jints_atomic(const jint* from, jint* to, size_t count) { - _Copy_conjoint_jints_atomic(from, to, count); -} - -static void pd_conjoint_jlongs_atomic(const jlong* from, jlong* to, size_t count) { - _Copy_conjoint_jlongs_atomic(from, to, count); -} - -static void pd_conjoint_oops_atomic(const oop* from, oop* to, size_t count) { - assert(BytesPerLong == BytesPerOop, "jlongs and oops must be the same size"); - _Copy_conjoint_jlongs_atomic((const jlong*)from, (jlong*)to, count); -} - -static void pd_arrayof_conjoint_bytes(const HeapWord* from, HeapWord* to, size_t count) { - _Copy_arrayof_conjoint_bytes(from, to, count); -} - -static void pd_arrayof_conjoint_jshorts(const HeapWord* from, HeapWord* to, size_t count) { - _Copy_arrayof_conjoint_jshorts(from, to, count); -} - -static void pd_arrayof_conjoint_jints(const HeapWord* from, HeapWord* to, size_t count) { - _Copy_arrayof_conjoint_jints(from, to, count); -} - -static void pd_arrayof_conjoint_jlongs(const HeapWord* from, HeapWord* to, size_t count) { - _Copy_arrayof_conjoint_jlongs(from, to, count); -} - -static void pd_arrayof_conjoint_oops(const HeapWord* from, HeapWord* to, size_t count) { - assert(!UseCompressedOops, "foo!"); - assert(BytesPerLong == BytesPerOop, "jlongs and oops must be the same size"); - _Copy_arrayof_conjoint_jlongs(from, to, count); -} +// Empty for build system #endif // OS_CPU_BSD_AARCH64_COPY_BSD_AARCH64_HPP diff --git a/src/hotspot/os_cpu/bsd_aarch64/thread_bsd_aarch64.cpp b/src/hotspot/os_cpu/bsd_aarch64/thread_bsd_aarch64.cpp index d8b1a0b20ef3287cb65acb47686f17b9c1a07e70..f07f22bc0cd7a3e8977883bc62f214f4e3ad942f 100644 --- a/src/hotspot/os_cpu/bsd_aarch64/thread_bsd_aarch64.cpp +++ b/src/hotspot/os_cpu/bsd_aarch64/thread_bsd_aarch64.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2014, Red Hat Inc. All rights reserved. * Copyright (c) 2021, Azul Systems, Inc. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,7 +32,9 @@ frame JavaThread::pd_last_frame() { assert(has_last_Java_frame(), "must have last_Java_sp() when suspended"); vmassert(_anchor.last_Java_pc() != NULL, "not walkable"); - return frame(_anchor.last_Java_sp(), _anchor.last_Java_fp(), _anchor.last_Java_pc()); + frame f = frame(_anchor.last_Java_sp(), _anchor.last_Java_fp(), _anchor.last_Java_pc()); + f.set_sp_is_trusted(); + return f; } // For Forte Analyzer AsyncGetCallTrace profiling support - thread is diff --git a/src/hotspot/os_cpu/bsd_x86/bsd_x86_32.S b/src/hotspot/os_cpu/bsd_x86/bsd_x86_32.S index 0d22a6a6790237637484b70ac27dad913ae0de50..02231040e15bda886acc2c0024f404c458b1b1d6 100644 --- a/src/hotspot/os_cpu/bsd_x86/bsd_x86_32.S +++ b/src/hotspot/os_cpu/bsd_x86/bsd_x86_32.S @@ -1,5 +1,5 @@ # -# Copyright (c) 2004, 2017, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2004, 2022, 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 @@ -39,7 +39,6 @@ # point or use it in the same manner as does the server # compiler. - .globl SYMBOL(_Copy_conjoint_bytes) .globl SYMBOL(_Copy_arrayof_conjoint_bytes) .globl SYMBOL(_Copy_conjoint_jshorts_atomic) .globl SYMBOL(_Copy_arrayof_conjoint_jshorts) @@ -72,117 +71,10 @@ SYMBOL(SpinPause): movl $1, %eax ret - # Support for void Copy::conjoint_bytes(void* from, - # void* to, - # size_t count) - .p2align 4,,15 - ELF_TYPE(_Copy_conjoint_bytes,@function) -SYMBOL(_Copy_conjoint_bytes): - pushl %esi - movl 4+12(%esp),%ecx # count - pushl %edi - movl 8+ 4(%esp),%esi # from - movl 8+ 8(%esp),%edi # to - cmpl %esi,%edi - leal -1(%esi,%ecx),%eax # from + count - 1 - jbe cb_CopyRight - cmpl %eax,%edi - jbe cb_CopyLeft - # copy from low to high -cb_CopyRight: - cmpl $3,%ecx - jbe 5f # <= 3 bytes - # align source address at dword address boundary - movl %ecx,%eax # original count - movl $4,%ecx - subl %esi,%ecx - andl $3,%ecx # prefix byte count - jz 1f # no prefix - subl %ecx,%eax # byte count less prefix - # copy prefix - subl %esi,%edi -0: movb (%esi),%dl - movb %dl,(%edi,%esi,1) - addl $1,%esi - subl $1,%ecx - jnz 0b - addl %esi,%edi -1: movl %eax,%ecx # byte count less prefix - shrl $2,%ecx # dword count - jz 4f # no dwords to move - cmpl $32,%ecx - jbe 2f # <= 32 dwords - # copy aligned dwords - rep; smovl - jmp 4f - # copy aligned dwords -2: subl %esi,%edi - .p2align 4,,15 -3: movl (%esi),%edx - movl %edx,(%edi,%esi,1) - addl $4,%esi - subl $1,%ecx - jnz 3b - addl %esi,%edi -4: movl %eax,%ecx # byte count less prefix -5: andl $3,%ecx # suffix byte count - jz 7f # no suffix - # copy suffix - xorl %eax,%eax -6: movb (%esi,%eax,1),%dl - movb %dl,(%edi,%eax,1) - addl $1,%eax - subl $1,%ecx - jnz 6b -7: popl %edi - popl %esi - ret - # copy from high to low -cb_CopyLeft: - std - leal -4(%edi,%ecx),%edi # to + count - 4 - movl %eax,%esi # from + count - 1 - movl %ecx,%eax - subl $3,%esi # from + count - 4 - cmpl $3,%ecx - jbe 5f # <= 3 bytes -1: shrl $2,%ecx # dword count - jz 4f # no dwords to move - cmpl $32,%ecx - ja 3f # > 32 dwords - # copy dwords, aligned or not - subl %esi,%edi - .p2align 4,,15 -2: movl (%esi),%edx - movl %edx,(%edi,%esi,1) - subl $4,%esi - subl $1,%ecx - jnz 2b - addl %esi,%edi - jmp 4f - # copy dwords, aligned or not -3: rep; smovl -4: movl %eax,%ecx # byte count -5: andl $3,%ecx # suffix byte count - jz 7f # no suffix - # copy suffix - subl %esi,%edi - addl $3,%esi -6: movb (%esi),%dl - movb %dl,(%edi,%esi,1) - subl $1,%esi - subl $1,%ecx - jnz 6b -7: cld - popl %edi - popl %esi - ret - # Support for void Copy::arrayof_conjoint_bytes(void* from, # void* to, # size_t count) # - # Same as _Copy_conjoint_bytes, except no source alignment check. .p2align 4,,15 ELF_TYPE(_Copy_arrayof_conjoint_bytes,@function) SYMBOL(_Copy_arrayof_conjoint_bytes): diff --git a/src/hotspot/os_cpu/bsd_x86/copy_bsd_x86.hpp b/src/hotspot/os_cpu/bsd_x86/copy_bsd_x86.hpp index 2a5498d8541aae88922896e8c2c6343616924fd4..e95c18c48a24632de6d2a337f4b5fa238a2e9b43 100644 --- a/src/hotspot/os_cpu/bsd_x86/copy_bsd_x86.hpp +++ b/src/hotspot/os_cpu/bsd_x86/copy_bsd_x86.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2022, 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,285 +25,6 @@ #ifndef OS_CPU_BSD_X86_COPY_BSD_X86_HPP #define OS_CPU_BSD_X86_COPY_BSD_X86_HPP -static void pd_conjoint_words(const HeapWord* from, HeapWord* to, size_t count) { -#ifdef AMD64 - (void)memmove(to, from, count * HeapWordSize); -#else - // Includes a zero-count check. - intx temp; - __asm__ volatile(" testl %6,%6 ;" - " jz 7f ;" - " cmpl %4,%5 ;" - " leal -4(%4,%6,4),%3;" - " jbe 1f ;" - " cmpl %7,%5 ;" - " jbe 4f ;" - "1: cmpl $32,%6 ;" - " ja 3f ;" - " subl %4,%1 ;" - "2: movl (%4),%3 ;" - " movl %7,(%5,%4,1) ;" - " addl $4,%0 ;" - " subl $1,%2 ;" - " jnz 2b ;" - " jmp 7f ;" - "3: rep; smovl ;" - " jmp 7f ;" - "4: cmpl $32,%2 ;" - " movl %7,%0 ;" - " leal -4(%5,%6,4),%1;" - " ja 6f ;" - " subl %4,%1 ;" - "5: movl (%4),%3 ;" - " movl %7,(%5,%4,1) ;" - " subl $4,%0 ;" - " subl $1,%2 ;" - " jnz 5b ;" - " jmp 7f ;" - "6: std ;" - " rep; smovl ;" - " cld ;" - "7: nop " - : "=S" (from), "=D" (to), "=c" (count), "=r" (temp) - : "0" (from), "1" (to), "2" (count), "3" (temp) - : "memory", "flags"); -#endif // AMD64 -} - -static void pd_disjoint_words(const HeapWord* from, HeapWord* to, size_t count) { -#ifdef AMD64 - switch (count) { - case 8: to[7] = from[7]; - case 7: to[6] = from[6]; - case 6: to[5] = from[5]; - case 5: to[4] = from[4]; - case 4: to[3] = from[3]; - case 3: to[2] = from[2]; - case 2: to[1] = from[1]; - case 1: to[0] = from[0]; - case 0: break; - default: - (void)memcpy(to, from, count * HeapWordSize); - break; - } -#else - // Includes a zero-count check. - intx temp; - __asm__ volatile(" testl %6,%6 ;" - " jz 3f ;" - " cmpl $32,%6 ;" - " ja 2f ;" - " subl %4,%1 ;" - "1: movl (%4),%3 ;" - " movl %7,(%5,%4,1);" - " addl $4,%0 ;" - " subl $1,%2 ;" - " jnz 1b ;" - " jmp 3f ;" - "2: rep; smovl ;" - "3: nop " - : "=S" (from), "=D" (to), "=c" (count), "=r" (temp) - : "0" (from), "1" (to), "2" (count), "3" (temp) - : "memory", "cc"); -#endif // AMD64 -} - -static void pd_disjoint_words_atomic(const HeapWord* from, HeapWord* to, size_t count) { -#ifdef AMD64 - switch (count) { - case 8: to[7] = from[7]; - case 7: to[6] = from[6]; - case 6: to[5] = from[5]; - case 5: to[4] = from[4]; - case 4: to[3] = from[3]; - case 3: to[2] = from[2]; - case 2: to[1] = from[1]; - case 1: to[0] = from[0]; - case 0: break; - default: - while (count-- > 0) { - *to++ = *from++; - } - break; - } -#else - // pd_disjoint_words is word-atomic in this implementation. - pd_disjoint_words(from, to, count); -#endif // AMD64 -} - -static void pd_aligned_conjoint_words(const HeapWord* from, HeapWord* to, size_t count) { - pd_conjoint_words(from, to, count); -} - -static void pd_aligned_disjoint_words(const HeapWord* from, HeapWord* to, size_t count) { - pd_disjoint_words(from, to, count); -} - -static void pd_conjoint_bytes(const void* from, void* to, size_t count) { -#ifdef AMD64 - (void)memmove(to, from, count); -#else - // Includes a zero-count check. - intx temp; - __asm__ volatile(" testl %6,%6 ;" - " jz 13f ;" - " cmpl %4,%5 ;" - " leal -1(%4,%6),%3 ;" - " jbe 1f ;" - " cmpl %7,%5 ;" - " jbe 8f ;" - "1: cmpl $3,%6 ;" - " jbe 6f ;" - " movl %6,%3 ;" - " movl $4,%2 ;" - " subl %4,%2 ;" - " andl $3,%2 ;" - " jz 2f ;" - " subl %6,%3 ;" - " rep; smovb ;" - "2: movl %7,%2 ;" - " shrl $2,%2 ;" - " jz 5f ;" - " cmpl $32,%2 ;" - " ja 4f ;" - " subl %4,%1 ;" - "3: movl (%4),%%edx ;" - " movl %%edx,(%5,%4,1);" - " addl $4,%0 ;" - " subl $1,%2 ;" - " jnz 3b ;" - " addl %4,%1 ;" - " jmp 5f ;" - "4: rep; smovl ;" - "5: movl %7,%2 ;" - " andl $3,%2 ;" - " jz 13f ;" - "6: xorl %7,%3 ;" - "7: movb (%4,%7,1),%%dl ;" - " movb %%dl,(%5,%7,1) ;" - " addl $1,%3 ;" - " subl $1,%2 ;" - " jnz 7b ;" - " jmp 13f ;" - "8: std ;" - " cmpl $12,%2 ;" - " ja 9f ;" - " movl %7,%0 ;" - " leal -1(%6,%5),%1 ;" - " jmp 11f ;" - "9: xchgl %3,%2 ;" - " movl %6,%0 ;" - " addl $1,%2 ;" - " leal -1(%7,%5),%1 ;" - " andl $3,%2 ;" - " jz 10f ;" - " subl %6,%3 ;" - " rep; smovb ;" - "10: movl %7,%2 ;" - " subl $3,%0 ;" - " shrl $2,%2 ;" - " subl $3,%1 ;" - " rep; smovl ;" - " andl $3,%3 ;" - " jz 12f ;" - " movl %7,%2 ;" - " addl $3,%0 ;" - " addl $3,%1 ;" - "11: rep; smovb ;" - "12: cld ;" - "13: nop ;" - : "=S" (from), "=D" (to), "=c" (count), "=r" (temp) - : "0" (from), "1" (to), "2" (count), "3" (temp) - : "memory", "flags", "%edx"); -#endif // AMD64 -} - -static void pd_conjoint_bytes_atomic(const void* from, void* to, size_t count) { - pd_conjoint_bytes(from, to, count); -} - -static void pd_conjoint_jshorts_atomic(const jshort* from, jshort* to, size_t count) { - _Copy_conjoint_jshorts_atomic(from, to, count); -} - -static void pd_conjoint_jints_atomic(const jint* from, jint* to, size_t count) { -#ifdef AMD64 - _Copy_conjoint_jints_atomic(from, to, count); -#else - assert(HeapWordSize == BytesPerInt, "heapwords and jints must be the same size"); - // pd_conjoint_words is word-atomic in this implementation. - pd_conjoint_words((const HeapWord*)from, (HeapWord*)to, count); -#endif // AMD64 -} - -static void pd_conjoint_jlongs_atomic(const jlong* from, jlong* to, size_t count) { -#ifdef AMD64 - _Copy_conjoint_jlongs_atomic(from, to, count); -#else - // Guarantee use of fild/fistp or xmm regs via some asm code, because compilers won't. - if (from > to) { - while (count-- > 0) { - __asm__ volatile("fildll (%0); fistpll (%1)" - : - : "r" (from), "r" (to) - : "memory" ); - ++from; - ++to; - } - } else { - while (count-- > 0) { - __asm__ volatile("fildll (%0,%2,8); fistpll (%1,%2,8)" - : - : "r" (from), "r" (to), "r" (count) - : "memory" ); - } - } -#endif // AMD64 -} - -static void pd_conjoint_oops_atomic(const oop* from, oop* to, size_t count) { -#ifdef AMD64 - assert(BytesPerLong == BytesPerOop, "jlongs and oops must be the same size"); - _Copy_conjoint_jlongs_atomic((const jlong*)from, (jlong*)to, count); -#else - assert(HeapWordSize == BytesPerOop, "heapwords and oops must be the same size"); - // pd_conjoint_words is word-atomic in this implementation. - pd_conjoint_words((const HeapWord*)from, (HeapWord*)to, count); -#endif // AMD64 -} - -static void pd_arrayof_conjoint_bytes(const HeapWord* from, HeapWord* to, size_t count) { - _Copy_arrayof_conjoint_bytes(from, to, count); -} - -static void pd_arrayof_conjoint_jshorts(const HeapWord* from, HeapWord* to, size_t count) { - _Copy_arrayof_conjoint_jshorts(from, to, count); -} - -static void pd_arrayof_conjoint_jints(const HeapWord* from, HeapWord* to, size_t count) { -#ifdef AMD64 - _Copy_arrayof_conjoint_jints(from, to, count); -#else - pd_conjoint_jints_atomic((const jint*)from, (jint*)to, count); -#endif // AMD64 -} - -static void pd_arrayof_conjoint_jlongs(const HeapWord* from, HeapWord* to, size_t count) { -#ifdef AMD64 - _Copy_arrayof_conjoint_jlongs(from, to, count); -#else - pd_conjoint_jlongs_atomic((const jlong*)from, (jlong*)to, count); -#endif // AMD64 -} - -static void pd_arrayof_conjoint_oops(const HeapWord* from, HeapWord* to, size_t count) { -#ifdef AMD64 - assert(BytesPerLong == BytesPerOop, "jlongs and oops must be the same size"); - _Copy_arrayof_conjoint_jlongs(from, to, count); -#else - pd_conjoint_oops_atomic((const oop*)from, (oop*)to, count); -#endif // AMD64 -} +// Empty for build system #endif // OS_CPU_BSD_X86_COPY_BSD_X86_HPP diff --git a/src/hotspot/os_cpu/linux_aarch64/copy_linux_aarch64.hpp b/src/hotspot/os_cpu/linux_aarch64/copy_linux_aarch64.hpp index f50d80022ae16db558d5c706039457028cc3e9ef..302929d85750daccd1dc099d510331cdcac72d4a 100644 --- a/src/hotspot/os_cpu/linux_aarch64/copy_linux_aarch64.hpp +++ b/src/hotspot/os_cpu/linux_aarch64/copy_linux_aarch64.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2014, Red Hat Inc. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -26,163 +26,6 @@ #ifndef OS_CPU_LINUX_AARCH64_COPY_LINUX_AARCH64_HPP #define OS_CPU_LINUX_AARCH64_COPY_LINUX_AARCH64_HPP -#define COPY_SMALL(from, to, count) \ -{ \ - long tmp0, tmp1, tmp2, tmp3; \ - long tmp4, tmp5, tmp6, tmp7; \ - __asm volatile( \ -" adr %[t0], 0f;" \ -" add %[t0], %[t0], %[cnt], lsl #5;" \ -" br %[t0];" \ -" .align 5;" \ -"0:" \ -" b 1f;" \ -" .align 5;" \ -" ldr %[t0], [%[s], #0];" \ -" str %[t0], [%[d], #0];" \ -" b 1f;" \ -" .align 5;" \ -" ldp %[t0], %[t1], [%[s], #0];" \ -" stp %[t0], %[t1], [%[d], #0];" \ -" b 1f;" \ -" .align 5;" \ -" ldp %[t0], %[t1], [%[s], #0];" \ -" ldr %[t2], [%[s], #16];" \ -" stp %[t0], %[t1], [%[d], #0];" \ -" str %[t2], [%[d], #16];" \ -" b 1f;" \ -" .align 5;" \ -" ldp %[t0], %[t1], [%[s], #0];" \ -" ldp %[t2], %[t3], [%[s], #16];" \ -" stp %[t0], %[t1], [%[d], #0];" \ -" stp %[t2], %[t3], [%[d], #16];" \ -" b 1f;" \ -" .align 5;" \ -" ldp %[t0], %[t1], [%[s], #0];" \ -" ldp %[t2], %[t3], [%[s], #16];" \ -" ldr %[t4], [%[s], #32];" \ -" stp %[t0], %[t1], [%[d], #0];" \ -" stp %[t2], %[t3], [%[d], #16];" \ -" str %[t4], [%[d], #32];" \ -" b 1f;" \ -" .align 5;" \ -" ldp %[t0], %[t1], [%[s], #0];" \ -" ldp %[t2], %[t3], [%[s], #16];" \ -" ldp %[t4], %[t5], [%[s], #32];" \ -"2:" \ -" stp %[t0], %[t1], [%[d], #0];" \ -" stp %[t2], %[t3], [%[d], #16];" \ -" stp %[t4], %[t5], [%[d], #32];" \ -" b 1f;" \ -" .align 5;" \ -" ldr %[t6], [%[s], #0];" \ -" ldp %[t0], %[t1], [%[s], #8];" \ -" ldp %[t2], %[t3], [%[s], #24];" \ -" ldp %[t4], %[t5], [%[s], #40];" \ -" str %[t6], [%[d]], #8;" \ -" b 2b;" \ -" .align 5;" \ -" ldp %[t0], %[t1], [%[s], #0];" \ -" ldp %[t2], %[t3], [%[s], #16];" \ -" ldp %[t4], %[t5], [%[s], #32];" \ -" ldp %[t6], %[t7], [%[s], #48];" \ -" stp %[t0], %[t1], [%[d], #0];" \ -" stp %[t2], %[t3], [%[d], #16];" \ -" stp %[t4], %[t5], [%[d], #32];" \ -" stp %[t6], %[t7], [%[d], #48];" \ -"1:" \ - \ - : [s]"+r"(from), [d]"+r"(to), [cnt]"+r"(count), \ - [t0]"=&r"(tmp0), [t1]"=&r"(tmp1), [t2]"=&r"(tmp2), [t3]"=&r"(tmp3), \ - [t4]"=&r"(tmp4), [t5]"=&r"(tmp5), [t6]"=&r"(tmp6), [t7]"=&r"(tmp7) \ - : \ - : "memory", "cc"); \ -} - -static void pd_conjoint_words(const HeapWord* from, HeapWord* to, size_t count) { - __asm volatile( "prfm pldl1strm, [%[s], #0];" :: [s]"r"(from) : "memory"); - if (__builtin_expect(count <= 8, 1)) { - COPY_SMALL(from, to, count); - return; - } - _Copy_conjoint_words(from, to, count); -} - -static void pd_disjoint_words(const HeapWord* from, HeapWord* to, size_t count) { - if (__builtin_constant_p(count)) { - memcpy(to, from, count * sizeof(HeapWord)); - return; - } - __asm volatile( "prfm pldl1strm, [%[s], #0];" :: [s]"r"(from) : "memory"); - if (__builtin_expect(count <= 8, 1)) { - COPY_SMALL(from, to, count); - return; - } - _Copy_disjoint_words(from, to, count); -} - -static void pd_disjoint_words_atomic(const HeapWord* from, HeapWord* to, size_t count) { - __asm volatile( "prfm pldl1strm, [%[s], #0];" :: [s]"r"(from) : "memory"); - if (__builtin_expect(count <= 8, 1)) { - COPY_SMALL(from, to, count); - return; - } - _Copy_disjoint_words(from, to, count); -} - -static void pd_aligned_conjoint_words(const HeapWord* from, HeapWord* to, size_t count) { - pd_conjoint_words(from, to, count); -} - -static void pd_aligned_disjoint_words(const HeapWord* from, HeapWord* to, size_t count) { - pd_disjoint_words(from, to, count); -} - -static void pd_conjoint_bytes(const void* from, void* to, size_t count) { - (void)memmove(to, from, count); -} - -static void pd_conjoint_bytes_atomic(const void* from, void* to, size_t count) { - pd_conjoint_bytes(from, to, count); -} - -static void pd_conjoint_jshorts_atomic(const jshort* from, jshort* to, size_t count) { - _Copy_conjoint_jshorts_atomic(from, to, count); -} - -static void pd_conjoint_jints_atomic(const jint* from, jint* to, size_t count) { - _Copy_conjoint_jints_atomic(from, to, count); -} - -static void pd_conjoint_jlongs_atomic(const jlong* from, jlong* to, size_t count) { - _Copy_conjoint_jlongs_atomic(from, to, count); -} - -static void pd_conjoint_oops_atomic(const oop* from, oop* to, size_t count) { - assert(BytesPerLong == BytesPerOop, "jlongs and oops must be the same size"); - _Copy_conjoint_jlongs_atomic((const jlong*)from, (jlong*)to, count); -} - -static void pd_arrayof_conjoint_bytes(const HeapWord* from, HeapWord* to, size_t count) { - _Copy_arrayof_conjoint_bytes(from, to, count); -} - -static void pd_arrayof_conjoint_jshorts(const HeapWord* from, HeapWord* to, size_t count) { - _Copy_arrayof_conjoint_jshorts(from, to, count); -} - -static void pd_arrayof_conjoint_jints(const HeapWord* from, HeapWord* to, size_t count) { - _Copy_arrayof_conjoint_jints(from, to, count); -} - -static void pd_arrayof_conjoint_jlongs(const HeapWord* from, HeapWord* to, size_t count) { - _Copy_arrayof_conjoint_jlongs(from, to, count); -} - -static void pd_arrayof_conjoint_oops(const HeapWord* from, HeapWord* to, size_t count) { - assert(!UseCompressedOops, "foo!"); - assert(BytesPerLong == BytesPerOop, "jlongs and oops must be the same size"); - _Copy_arrayof_conjoint_jlongs(from, to, count); -} +// Empty for build system #endif // OS_CPU_LINUX_AARCH64_COPY_LINUX_AARCH64_HPP diff --git a/src/hotspot/os_cpu/linux_aarch64/thread_linux_aarch64.cpp b/src/hotspot/os_cpu/linux_aarch64/thread_linux_aarch64.cpp index fca22629bc5651dfb40e4e59f5a0453aa8611552..f584da5814a684ecec06ef93ba4cccb9a0b3ff71 100644 --- a/src/hotspot/os_cpu/linux_aarch64/thread_linux_aarch64.cpp +++ b/src/hotspot/os_cpu/linux_aarch64/thread_linux_aarch64.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2014, Red Hat Inc. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -29,7 +29,9 @@ frame JavaThread::pd_last_frame() { assert(has_last_Java_frame(), "must have last_Java_sp() when suspended"); - return frame(_anchor.last_Java_sp(), _anchor.last_Java_fp(), _anchor.last_Java_pc()); + frame f = frame(_anchor.last_Java_sp(), _anchor.last_Java_fp(), _anchor.last_Java_pc()); + f.set_sp_is_trusted(); + return f; } // For Forte Analyzer AsyncGetCallTrace profiling support - thread is diff --git a/src/hotspot/os_cpu/linux_aarch64/vm_version_linux_aarch64.cpp b/src/hotspot/os_cpu/linux_aarch64/vm_version_linux_aarch64.cpp index 3497ae2ce73a59c4c3a74e85d2686a580fb131f0..b5f5a0787e91ab611b1f9dbe0cb383c5796cec9e 100644 --- a/src/hotspot/os_cpu/linux_aarch64/vm_version_linux_aarch64.cpp +++ b/src/hotspot/os_cpu/linux_aarch64/vm_version_linux_aarch64.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2022, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2014, 2020, Red Hat Inc. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -143,7 +143,7 @@ void VM_Version::get_os_cpu_info() { _zva_length = 4 << (dczid_el0 & 0xf); } - if (FILE *f = fopen("/proc/cpuinfo", "r")) { + if (FILE *f = os::fopen("/proc/cpuinfo", "r")) { // need a large buffer as the flags line may include lots of text char buf[1024], *p; while (fgets(buf, sizeof (buf), f) != NULL) { @@ -174,8 +174,8 @@ static bool read_fully(const char *fname, char *buf, size_t buflen) { assert(buflen >= 1, "invalid argument"); int fd = os::open(fname, O_RDONLY, 0); if (fd != -1) { - ssize_t read_sz = os::read(fd, buf, buflen); - os::close(fd); + ssize_t read_sz = ::read(fd, buf, buflen); + ::close(fd); // Skip if the contents is just "\n" because some machine only sets // '\n' to the board name. diff --git a/src/hotspot/os_cpu/linux_arm/linux_arm_32.S b/src/hotspot/os_cpu/linux_arm/linux_arm_32.S index c1c8fd428154ea929b1b58916b6d6aa65b6a87de..eb560d8f0c78b7bb904d77c28900ecb5e3836912 100644 --- a/src/hotspot/os_cpu/linux_arm/linux_arm_32.S +++ b/src/hotspot/os_cpu/linux_arm/linux_arm_32.S @@ -1,5 +1,5 @@ # -# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2008, 2022, 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 @@ -58,12 +58,6 @@ to .req r1 SpinPause: bx LR - # Support for void Copy::conjoint_bytes(void* from, - # void* to, - # size_t count) -_Copy_conjoint_bytes: - swi 0x9f0001 - # Support for void Copy::arrayof_conjoint_bytes(void* from, # void* to, # size_t count) diff --git a/src/hotspot/os_cpu/linux_ppc/thread_linux_ppc.cpp b/src/hotspot/os_cpu/linux_ppc/thread_linux_ppc.cpp index d09608c6aa763ff7f0b9cefea44f7871c5e95660..15f6220fc81dc37ed8cf177e2c829d278d8a2737 100644 --- a/src/hotspot/os_cpu/linux_ppc/thread_linux_ppc.cpp +++ b/src/hotspot/os_cpu/linux_ppc/thread_linux_ppc.cpp @@ -1,6 +1,6 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2012, 2019 SAP SE. All rights reserved. + * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2022 SAP SE. 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 @@ -58,14 +58,15 @@ bool JavaThread::pd_get_top_frame_for_profiling(frame* fr_addr, void* ucontext, // if we were running Java code when SIGPROF came in. if (isInJava) { ucontext_t* uc = (ucontext_t*) ucontext; - frame ret_frame((intptr_t*)uc->uc_mcontext.regs->gpr[1/*REG_SP*/], - (address)uc->uc_mcontext.regs->nip); + address pc = (address)uc->uc_mcontext.regs->nip; - if (ret_frame.pc() == NULL) { + if (pc == NULL) { // ucontext wasn't useful return false; } + frame ret_frame((intptr_t*)uc->uc_mcontext.regs->gpr[1/*REG_SP*/], pc); + if (ret_frame.fp() == NULL) { // The found frame does not have a valid frame pointer. // Bail out because this will create big trouble later on, either diff --git a/src/hotspot/os_cpu/linux_x86/copy_linux_x86.hpp b/src/hotspot/os_cpu/linux_x86/copy_linux_x86.hpp index de43d12f4a76f62013d4cddba377bfc0ad68ccd8..ed25d38cbffa07f7cb330117e66d9a2ee8343f56 100644 --- a/src/hotspot/os_cpu/linux_x86/copy_linux_x86.hpp +++ b/src/hotspot/os_cpu/linux_x86/copy_linux_x86.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2022, 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,285 +25,6 @@ #ifndef OS_CPU_LINUX_X86_COPY_LINUX_X86_HPP #define OS_CPU_LINUX_X86_COPY_LINUX_X86_HPP -static void pd_conjoint_words(const HeapWord* from, HeapWord* to, size_t count) { -#ifdef AMD64 - (void)memmove(to, from, count * HeapWordSize); -#else - // Includes a zero-count check. - intx temp = 0; - __asm__ volatile(" testl %6,%6 ;" - " jz 7f ;" - " cmpl %4,%5 ;" - " leal -4(%4,%6,4),%3;" - " jbe 1f ;" - " cmpl %7,%5 ;" - " jbe 4f ;" - "1: cmpl $32,%6 ;" - " ja 3f ;" - " subl %4,%1 ;" - "2: movl (%4),%3 ;" - " movl %7,(%5,%4,1) ;" - " addl $4,%0 ;" - " subl $1,%2 ;" - " jnz 2b ;" - " jmp 7f ;" - "3: rep; smovl ;" - " jmp 7f ;" - "4: cmpl $32,%2 ;" - " movl %7,%0 ;" - " leal -4(%5,%6,4),%1;" - " ja 6f ;" - " subl %4,%1 ;" - "5: movl (%4),%3 ;" - " movl %7,(%5,%4,1) ;" - " subl $4,%0 ;" - " subl $1,%2 ;" - " jnz 5b ;" - " jmp 7f ;" - "6: std ;" - " rep; smovl ;" - " cld ;" - "7: nop " - : "=S" (from), "=D" (to), "=c" (count), "=r" (temp) - : "0" (from), "1" (to), "2" (count), "3" (temp) - : "memory", "flags"); -#endif // AMD64 -} - -static void pd_disjoint_words(const HeapWord* from, HeapWord* to, size_t count) { -#ifdef AMD64 - switch (count) { - case 8: to[7] = from[7]; - case 7: to[6] = from[6]; - case 6: to[5] = from[5]; - case 5: to[4] = from[4]; - case 4: to[3] = from[3]; - case 3: to[2] = from[2]; - case 2: to[1] = from[1]; - case 1: to[0] = from[0]; - case 0: break; - default: - (void)memcpy(to, from, count * HeapWordSize); - break; - } -#else - // Includes a zero-count check. - intx temp = 0; - __asm__ volatile(" testl %6,%6 ;" - " jz 3f ;" - " cmpl $32,%6 ;" - " ja 2f ;" - " subl %4,%1 ;" - "1: movl (%4),%3 ;" - " movl %7,(%5,%4,1);" - " addl $4,%0 ;" - " subl $1,%2 ;" - " jnz 1b ;" - " jmp 3f ;" - "2: rep; smovl ;" - "3: nop " - : "=S" (from), "=D" (to), "=c" (count), "=r" (temp) - : "0" (from), "1" (to), "2" (count), "3" (temp) - : "memory", "cc"); -#endif // AMD64 -} - -static void pd_disjoint_words_atomic(const HeapWord* from, HeapWord* to, size_t count) { -#ifdef AMD64 - switch (count) { - case 8: to[7] = from[7]; - case 7: to[6] = from[6]; - case 6: to[5] = from[5]; - case 5: to[4] = from[4]; - case 4: to[3] = from[3]; - case 3: to[2] = from[2]; - case 2: to[1] = from[1]; - case 1: to[0] = from[0]; - case 0: break; - default: - while (count-- > 0) { - *to++ = *from++; - } - break; - } -#else - // pd_disjoint_words is word-atomic in this implementation. - pd_disjoint_words(from, to, count); -#endif // AMD64 -} - -static void pd_aligned_conjoint_words(const HeapWord* from, HeapWord* to, size_t count) { - pd_conjoint_words(from, to, count); -} - -static void pd_aligned_disjoint_words(const HeapWord* from, HeapWord* to, size_t count) { - pd_disjoint_words(from, to, count); -} - -static void pd_conjoint_bytes(const void* from, void* to, size_t count) { -#ifdef AMD64 - (void)memmove(to, from, count); -#else - // Includes a zero-count check. - intx temp = 0; - __asm__ volatile(" testl %6,%6 ;" - " jz 13f ;" - " cmpl %4,%5 ;" - " leal -1(%4,%6),%3 ;" - " jbe 1f ;" - " cmpl %7,%5 ;" - " jbe 8f ;" - "1: cmpl $3,%6 ;" - " jbe 6f ;" - " movl %6,%3 ;" - " movl $4,%2 ;" - " subl %4,%2 ;" - " andl $3,%2 ;" - " jz 2f ;" - " subl %6,%3 ;" - " rep; smovb ;" - "2: movl %7,%2 ;" - " shrl $2,%2 ;" - " jz 5f ;" - " cmpl $32,%2 ;" - " ja 4f ;" - " subl %4,%1 ;" - "3: movl (%4),%%edx ;" - " movl %%edx,(%5,%4,1);" - " addl $4,%0 ;" - " subl $1,%2 ;" - " jnz 3b ;" - " addl %4,%1 ;" - " jmp 5f ;" - "4: rep; smovl ;" - "5: movl %7,%2 ;" - " andl $3,%2 ;" - " jz 13f ;" - "6: xorl %7,%3 ;" - "7: movb (%4,%7,1),%%dl ;" - " movb %%dl,(%5,%7,1) ;" - " addl $1,%3 ;" - " subl $1,%2 ;" - " jnz 7b ;" - " jmp 13f ;" - "8: std ;" - " cmpl $12,%2 ;" - " ja 9f ;" - " movl %7,%0 ;" - " leal -1(%6,%5),%1 ;" - " jmp 11f ;" - "9: xchgl %3,%2 ;" - " movl %6,%0 ;" - " addl $1,%2 ;" - " leal -1(%7,%5),%1 ;" - " andl $3,%2 ;" - " jz 10f ;" - " subl %6,%3 ;" - " rep; smovb ;" - "10: movl %7,%2 ;" - " subl $3,%0 ;" - " shrl $2,%2 ;" - " subl $3,%1 ;" - " rep; smovl ;" - " andl $3,%3 ;" - " jz 12f ;" - " movl %7,%2 ;" - " addl $3,%0 ;" - " addl $3,%1 ;" - "11: rep; smovb ;" - "12: cld ;" - "13: nop ;" - : "=S" (from), "=D" (to), "=c" (count), "=r" (temp) - : "0" (from), "1" (to), "2" (count), "3" (temp) - : "memory", "flags", "%edx"); -#endif // AMD64 -} - -static void pd_conjoint_bytes_atomic(const void* from, void* to, size_t count) { - pd_conjoint_bytes(from, to, count); -} - -static void pd_conjoint_jshorts_atomic(const jshort* from, jshort* to, size_t count) { - _Copy_conjoint_jshorts_atomic(from, to, count); -} - -static void pd_conjoint_jints_atomic(const jint* from, jint* to, size_t count) { -#ifdef AMD64 - _Copy_conjoint_jints_atomic(from, to, count); -#else - assert(HeapWordSize == BytesPerInt, "heapwords and jints must be the same size"); - // pd_conjoint_words is word-atomic in this implementation. - pd_conjoint_words((const HeapWord*)from, (HeapWord*)to, count); -#endif // AMD64 -} - -static void pd_conjoint_jlongs_atomic(const jlong* from, jlong* to, size_t count) { -#ifdef AMD64 - _Copy_conjoint_jlongs_atomic(from, to, count); -#else - // Guarantee use of fild/fistp or xmm regs via some asm code, because compilers won't. - if (from > to) { - while (count-- > 0) { - __asm__ volatile("fildll (%0); fistpll (%1)" - : - : "r" (from), "r" (to) - : "memory" ); - ++from; - ++to; - } - } else { - while (count-- > 0) { - __asm__ volatile("fildll (%0,%2,8); fistpll (%1,%2,8)" - : - : "r" (from), "r" (to), "r" (count) - : "memory" ); - } - } -#endif // AMD64 -} - -static void pd_conjoint_oops_atomic(const oop* from, oop* to, size_t count) { -#ifdef AMD64 - assert(BytesPerLong == BytesPerOop, "jlongs and oops must be the same size"); - _Copy_conjoint_jlongs_atomic((const jlong*)from, (jlong*)to, count); -#else - assert(HeapWordSize == BytesPerOop, "heapwords and oops must be the same size"); - // pd_conjoint_words is word-atomic in this implementation. - pd_conjoint_words((const HeapWord*)from, (HeapWord*)to, count); -#endif // AMD64 -} - -static void pd_arrayof_conjoint_bytes(const HeapWord* from, HeapWord* to, size_t count) { - _Copy_arrayof_conjoint_bytes(from, to, count); -} - -static void pd_arrayof_conjoint_jshorts(const HeapWord* from, HeapWord* to, size_t count) { - _Copy_arrayof_conjoint_jshorts(from, to, count); -} - -static void pd_arrayof_conjoint_jints(const HeapWord* from, HeapWord* to, size_t count) { -#ifdef AMD64 - _Copy_arrayof_conjoint_jints(from, to, count); -#else - pd_conjoint_jints_atomic((const jint*)from, (jint*)to, count); -#endif // AMD64 -} - -static void pd_arrayof_conjoint_jlongs(const HeapWord* from, HeapWord* to, size_t count) { -#ifdef AMD64 - _Copy_arrayof_conjoint_jlongs(from, to, count); -#else - pd_conjoint_jlongs_atomic((const jlong*)from, (jlong*)to, count); -#endif // AMD64 -} - -static void pd_arrayof_conjoint_oops(const HeapWord* from, HeapWord* to, size_t count) { -#ifdef AMD64 - assert(BytesPerLong == BytesPerOop, "jlongs and oops must be the same size"); - _Copy_arrayof_conjoint_jlongs(from, to, count); -#else - pd_conjoint_oops_atomic((const oop*)from, (oop*)to, count); -#endif // AMD64 -} +// Empty for build system #endif // OS_CPU_LINUX_X86_COPY_LINUX_X86_HPP diff --git a/src/hotspot/os_cpu/linux_x86/linux_x86_32.S b/src/hotspot/os_cpu/linux_x86/linux_x86_32.S index 620179d99dda4848920b4855f04732c2df7fd8db..344358172defdc26ff1c27ff8d98cd3f45008796 100644 --- a/src/hotspot/os_cpu/linux_x86/linux_x86_32.S +++ b/src/hotspot/os_cpu/linux_x86/linux_x86_32.S @@ -1,5 +1,5 @@ # -# Copyright (c) 2004, 2017, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2004, 2022, 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,7 +28,6 @@ # point or use it in the same manner as does the server # compiler. - .globl _Copy_conjoint_bytes .globl _Copy_arrayof_conjoint_bytes .globl _Copy_conjoint_jshorts_atomic .globl _Copy_arrayof_conjoint_jshorts @@ -51,117 +50,10 @@ SpinPause: movl $1, %eax ret - # Support for void Copy::conjoint_bytes(void* from, - # void* to, - # size_t count) - .p2align 4,,15 - .type _Copy_conjoint_bytes,@function -_Copy_conjoint_bytes: - pushl %esi - movl 4+12(%esp),%ecx # count - pushl %edi - movl 8+ 4(%esp),%esi # from - movl 8+ 8(%esp),%edi # to - cmpl %esi,%edi - leal -1(%esi,%ecx),%eax # from + count - 1 - jbe cb_CopyRight - cmpl %eax,%edi - jbe cb_CopyLeft - # copy from low to high -cb_CopyRight: - cmpl $3,%ecx - jbe 5f # <= 3 bytes - # align source address at dword address boundary - movl %ecx,%eax # original count - movl $4,%ecx - subl %esi,%ecx - andl $3,%ecx # prefix byte count - jz 1f # no prefix - subl %ecx,%eax # byte count less prefix - # copy prefix - subl %esi,%edi -0: movb (%esi),%dl - movb %dl,(%edi,%esi,1) - addl $1,%esi - subl $1,%ecx - jnz 0b - addl %esi,%edi -1: movl %eax,%ecx # byte count less prefix - shrl $2,%ecx # dword count - jz 4f # no dwords to move - cmpl $32,%ecx - jbe 2f # <= 32 dwords - # copy aligned dwords - rep; smovl - jmp 4f - # copy aligned dwords -2: subl %esi,%edi - .p2align 4,,15 -3: movl (%esi),%edx - movl %edx,(%edi,%esi,1) - addl $4,%esi - subl $1,%ecx - jnz 3b - addl %esi,%edi -4: movl %eax,%ecx # byte count less prefix -5: andl $3,%ecx # suffix byte count - jz 7f # no suffix - # copy suffix - xorl %eax,%eax -6: movb (%esi,%eax,1),%dl - movb %dl,(%edi,%eax,1) - addl $1,%eax - subl $1,%ecx - jnz 6b -7: popl %edi - popl %esi - ret - # copy from high to low -cb_CopyLeft: - std - leal -4(%edi,%ecx),%edi # to + count - 4 - movl %eax,%esi # from + count - 1 - movl %ecx,%eax - subl $3,%esi # from + count - 4 - cmpl $3,%ecx - jbe 5f # <= 3 bytes -1: shrl $2,%ecx # dword count - jz 4f # no dwords to move - cmpl $32,%ecx - ja 3f # > 32 dwords - # copy dwords, aligned or not - subl %esi,%edi - .p2align 4,,15 -2: movl (%esi),%edx - movl %edx,(%edi,%esi,1) - subl $4,%esi - subl $1,%ecx - jnz 2b - addl %esi,%edi - jmp 4f - # copy dwords, aligned or not -3: rep; smovl -4: movl %eax,%ecx # byte count -5: andl $3,%ecx # suffix byte count - jz 7f # no suffix - # copy suffix - subl %esi,%edi - addl $3,%esi -6: movb (%esi),%dl - movb %dl,(%edi,%esi,1) - subl $1,%esi - subl $1,%ecx - jnz 6b -7: cld - popl %edi - popl %esi - ret - # Support for void Copy::arrayof_conjoint_bytes(void* from, # void* to, # size_t count) # - # Same as _Copy_conjoint_bytes, except no source alignment check. .p2align 4,,15 .type _Copy_arrayof_conjoint_bytes,@function _Copy_arrayof_conjoint_bytes: diff --git a/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp b/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp index cc71b0d278019bf95142c995b2ac504a9e41c473..5e346efee54e0279d03d4d2a7173600192208bf7 100644 --- a/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp +++ b/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2022, 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 @@ -462,7 +462,7 @@ juint os::cpu_microcode_revision() { juint result = 0; char data[2048] = {0}; // lines should fit in 2K buf size_t len = sizeof(data); - FILE *fp = fopen("/proc/cpuinfo", "r"); + FILE *fp = os::fopen("/proc/cpuinfo", "r"); if (fp) { while (!feof(fp)) { if (fgets(data, len, fp)) { diff --git a/src/hotspot/os_cpu/windows_aarch64/thread_windows_aarch64.cpp b/src/hotspot/os_cpu/windows_aarch64/thread_windows_aarch64.cpp index 6512df3e7b9188d76dce3f3260c12bd8828a7a69..c5267d85d377d20f6683d4eb0e271be9dc103249 100644 --- a/src/hotspot/os_cpu/windows_aarch64/thread_windows_aarch64.cpp +++ b/src/hotspot/os_cpu/windows_aarch64/thread_windows_aarch64.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2020, Microsoft Corporation. All rights reserved. + * Copyright (c) 2022, Alibaba Group Holding Limited. 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 @@ -29,7 +30,9 @@ frame JavaThread::pd_last_frame() { assert(has_last_Java_frame(), "must have last_Java_sp() when suspended"); vmassert(_anchor.last_Java_pc() != NULL, "not walkable"); - return frame(_anchor.last_Java_sp(), _anchor.last_Java_fp(), _anchor.last_Java_pc()); + frame f = frame(_anchor.last_Java_sp(), _anchor.last_Java_fp(), _anchor.last_Java_pc()); + f.set_sp_is_trusted(); + return f; } // For Forte Analyzer AsyncGetCallTrace profiling support - thread is diff --git a/src/hotspot/os_cpu/windows_x86/copy_windows_x86.hpp b/src/hotspot/os_cpu/windows_x86/copy_windows_x86.hpp index 2f0560d89878d0148dd15af6d1493e03ef13f5dd..820ca46cb25d16bb9f34702168d120e87e750163 100644 --- a/src/hotspot/os_cpu/windows_x86/copy_windows_x86.hpp +++ b/src/hotspot/os_cpu/windows_x86/copy_windows_x86.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2022, 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,64 +25,6 @@ #ifndef OS_CPU_WINDOWS_X86_COPY_WINDOWS_X86_HPP #define OS_CPU_WINDOWS_X86_COPY_WINDOWS_X86_HPP -static void pd_conjoint_words(const HeapWord* from, HeapWord* to, size_t count) { - (void)memmove(to, from, count * HeapWordSize); -} - -static void pd_disjoint_words(const HeapWord* from, HeapWord* to, size_t count) { -#ifdef AMD64 - switch (count) { - case 8: to[7] = from[7]; - case 7: to[6] = from[6]; - case 6: to[5] = from[5]; - case 5: to[4] = from[4]; - case 4: to[3] = from[3]; - case 3: to[2] = from[2]; - case 2: to[1] = from[1]; - case 1: to[0] = from[0]; - case 0: break; - default: - (void)memcpy(to, from, count * HeapWordSize); - break; - } -#else - (void)memcpy(to, from, count * HeapWordSize); -#endif // AMD64 -} - -static void pd_disjoint_words_atomic(const HeapWord* from, HeapWord* to, size_t count) { - switch (count) { - case 8: to[7] = from[7]; - case 7: to[6] = from[6]; - case 6: to[5] = from[5]; - case 5: to[4] = from[4]; - case 4: to[3] = from[3]; - case 3: to[2] = from[2]; - case 2: to[1] = from[1]; - case 1: to[0] = from[0]; - case 0: break; - default: while (count-- > 0) { - *to++ = *from++; - } - break; - } -} - -static void pd_aligned_conjoint_words(const HeapWord* from, HeapWord* to, size_t count) { - (void)memmove(to, from, count * HeapWordSize); -} - -static void pd_aligned_disjoint_words(const HeapWord* from, HeapWord* to, size_t count) { - pd_disjoint_words(from, to, count); -} - -static void pd_conjoint_bytes(const void* from, void* to, size_t count) { - (void)memmove(to, from, count); -} - -static void pd_conjoint_bytes_atomic(const void* from, void* to, size_t count) { - pd_conjoint_bytes(from, to, count); -} static void pd_conjoint_jshorts_atomic(const jshort* from, jshort* to, size_t count) { if (from > to) { diff --git a/src/hotspot/share/adlc/formssel.cpp b/src/hotspot/share/adlc/formssel.cpp index ee528d97b5f36f24f52e3033c6b34ef5aaef0fb8..f7ff8ccf40b14a0c4bc5be9f31b0edcc89d99097 100644 --- a/src/hotspot/share/adlc/formssel.cpp +++ b/src/hotspot/share/adlc/formssel.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2022, 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 @@ -4235,7 +4235,7 @@ bool MatchRule::is_vector() const { "VectorCastB2X", "VectorCastS2X", "VectorCastI2X", "VectorCastL2X", "VectorCastF2X", "VectorCastD2X", "VectorMaskWrapper","VectorMaskCmp","VectorReinterpret","LoadVectorMasked","StoreVectorMasked", - "FmaVD","FmaVF","PopCountVI","VectorLongToMask", + "FmaVD","FmaVF","PopCountVI", "PopCountVL", "VectorLongToMask", // Next are vector mask ops. "MaskAll", "AndVMask", "OrVMask", "XorVMask", "VectorMaskCast", // Next are not supported currently. diff --git a/src/hotspot/share/asm/register.hpp b/src/hotspot/share/asm/register.hpp index 861c43b2c84128e12b7fa465aadaa6fa73358739..06a8735f52061c05682bfd6158de1049086eb233 100644 --- a/src/hotspot/share/asm/register.hpp +++ b/src/hotspot/share/asm/register.hpp @@ -45,15 +45,48 @@ class AbstractRegisterImpl { int value() const { return (int)(intx)this; } }; + +// Macros to help define all kinds of registers + +#ifndef USE_POINTERS_TO_REGISTER_IMPL_ARRAY + #define AS_REGISTER(type,name) ((type)name##_##type##EnumValue) -#define CONSTANT_REGISTER_DECLARATION(type, name, value) \ -const type name = ((type)value); \ +#define CONSTANT_REGISTER_DECLARATION(type, name, value) \ +const type name = ((type)value); \ enum { name##_##type##EnumValue = (value) } -#define REGISTER_DECLARATION(type, name, value) \ +#else // USE_POINTERS_TO_REGISTER_IMPL_ARRAY + +#define REGISTER_IMPL_DECLARATION(type, impl_type, reg_count) \ +inline constexpr type as_ ## type(int encoding) { \ + return impl_type::first() + encoding; \ +} \ +extern impl_type all_ ## type ## s[reg_count + 1] INTERNAL_VISIBILITY; \ +inline constexpr type impl_type::first() { return all_ ## type ## s + 1; } + +#define REGISTER_IMPL_DEFINITION(type, impl_type, reg_count) \ +impl_type all_ ## type ## s[reg_count + 1]; + +#define CONSTANT_REGISTER_DECLARATION(type, name, value) \ +constexpr type name = as_ ## type(value); + +#endif // USE_POINTERS_TO_REGISTER_IMPL_ARRAY + + +#define REGISTER_DECLARATION(type, name, value) \ const type name = ((type)value) + +// For definitions of RegisterImpl* instances. To be redefined in an +// OS-specific way. +#ifdef __GNUC__ +#define INTERNAL_VISIBILITY __attribute__ ((visibility ("internal"))) +#else +#define INTERNAL_VISIBILITY +#endif + + #define REGISTER_DEFINITION(type, name) #include CPU_HEADER(register) diff --git a/src/hotspot/share/c1/c1_Compilation.cpp b/src/hotspot/share/c1/c1_Compilation.cpp index df4b6bbed54660b578b96d90b5e2c7e4c0780598..27c20a9c5fe4242132a7c5ccf9ccc2f58fa58886 100644 --- a/src/hotspot/share/c1/c1_Compilation.cpp +++ b/src/hotspot/share/c1/c1_Compilation.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2022, 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 @@ -703,7 +703,7 @@ void Compilation::print_timers() { #ifndef PRODUCT void Compilation::compile_only_this_method() { ResourceMark rm; - fileStream stream(fopen("c1_compile_only", "wt")); + fileStream stream(os::fopen("c1_compile_only", "wt")); stream.print_cr("# c1 compile only directives"); compile_only_this_scope(&stream, hir()->top_scope()); } @@ -717,7 +717,7 @@ void Compilation::compile_only_this_scope(outputStream* st, IRScope* scope) { } void Compilation::exclude_this_method() { - fileStream stream(fopen(".hotspot_compiler", "at")); + fileStream stream(os::fopen(".hotspot_compiler", "at")); stream.print("exclude "); method()->holder()->name()->print_symbol_on(&stream); stream.print(" "); diff --git a/src/hotspot/share/c1/c1_GraphBuilder.cpp b/src/hotspot/share/c1/c1_GraphBuilder.cpp index 032c6ffb3e3e63a7af8f38069cb90eaa1a70fd4e..e06251700bded8387405c213c7177c0de95f636d 100644 --- a/src/hotspot/share/c1/c1_GraphBuilder.cpp +++ b/src/hotspot/share/c1/c1_GraphBuilder.cpp @@ -2036,19 +2036,19 @@ void GraphBuilder::invoke(Bytecodes::Code code) { cha_monomorphic_target = target->find_monomorphic_target(calling_klass, declared_interface, singleton); if (cha_monomorphic_target != NULL) { if (cha_monomorphic_target->holder() != compilation()->env()->Object_klass()) { - // If CHA is able to bind this invoke then update the class - // to match that class, otherwise klass will refer to the - // interface. - klass = cha_monomorphic_target->holder(); + ciInstanceKlass* holder = cha_monomorphic_target->holder(); + ciInstanceKlass* constraint = (holder->is_subtype_of(singleton) ? holder : singleton); // avoid upcasts actual_recv = declared_interface; // insert a check it's really the expected class. - CheckCast* c = new CheckCast(klass, receiver, copy_state_for_exception()); + CheckCast* c = new CheckCast(constraint, receiver, copy_state_for_exception()); c->set_incompatible_class_change_check(); - c->set_direct_compare(klass->is_final()); + c->set_direct_compare(constraint->is_final()); // pass the result of the checkcast so that the compiler has // more accurate type info in the inlinee better_receiver = append_split(c); + + dependency_recorder()->assert_unique_implementor(declared_interface, singleton); } else { cha_monomorphic_target = NULL; // subtype check against Object is useless } @@ -2072,9 +2072,11 @@ void GraphBuilder::invoke(Bytecodes::Code code) { } // check if we could do inlining - if (!PatchALot && Inline && target->is_loaded() && callee_holder->is_linked() && !patch_for_appendix) { + if (!PatchALot && Inline && target->is_loaded() && !patch_for_appendix && + callee_holder->is_loaded()) { // the effect of symbolic reference resolution + // callee is known => check if we have static binding - if ((code == Bytecodes::_invokestatic && callee_holder->is_initialized()) || // invokestatic involves an initialization barrier on resolved klass + if ((code == Bytecodes::_invokestatic && klass->is_initialized()) || // invokestatic involves an initialization barrier on declaring class code == Bytecodes::_invokespecial || (code == Bytecodes::_invokevirtual && target->is_final_method()) || code == Bytecodes::_invokedynamic) { diff --git a/src/hotspot/share/c1/c1_IR.cpp b/src/hotspot/share/c1/c1_IR.cpp index 112089019803b3cab4ec394480196205c959662d..78aef07b4cf0c013d869d4e8b51f6ff359ccc597 100644 --- a/src/hotspot/share/c1/c1_IR.cpp +++ b/src/hotspot/share/c1/c1_IR.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2022, 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 @@ -1263,21 +1263,36 @@ void IR::print(bool cfg_only, bool live_only) { tty->print_cr("invalid IR"); } } +#endif // PRODUCT +#ifdef ASSERT class EndNotNullValidator : public BlockClosure { public: - EndNotNullValidator(IR* hir) { - hir->start()->iterate_postorder(this); + virtual void block_do(BlockBegin* block) { + assert(block->end() != NULL, "Expect block end to exist."); } +}; - void block_do(BlockBegin* block) { - assert(block->end() != NULL, "Expect block end to exist."); +class XentryFlagValidator : public BlockClosure { + public: + virtual void block_do(BlockBegin* block) { + for (int i = 0; i < block->end()->number_of_sux(); i++) { + assert(!block->end()->sux_at(i)->is_set(BlockBegin::exception_entry_flag), "must not be xhandler"); + } + for (int i = 0; i < block->number_of_exception_handlers(); i++) { + assert(block->exception_handler_at(i)->is_set(BlockBegin::exception_entry_flag), "must be xhandler"); + } } }; typedef GrowableArray BlockListList; -class PredecessorValidator : public BlockClosure { +// Validation goals: +// - code() length == blocks length +// - code() contents == blocks content +// - Each block's computed predecessors match sux lists (length) +// - Each block's computed predecessors match sux lists (set content) +class PredecessorAndCodeValidator : public BlockClosure { private: BlockListList* _predecessors; // Each index i will hold predecessors of block with id i BlockList* _blocks; @@ -1287,7 +1302,7 @@ class PredecessorValidator : public BlockClosure { } public: - PredecessorValidator(IR* hir) { + PredecessorAndCodeValidator(IR* hir) { ResourceMark rm; _predecessors = new BlockListList(BlockBegin::number_of_blocks(), BlockBegin::number_of_blocks(), NULL); _blocks = new BlockList(BlockBegin::number_of_blocks()); @@ -1308,20 +1323,10 @@ class PredecessorValidator : public BlockClosure { virtual void block_do(BlockBegin* block) { _blocks->append(block); - verify_successor_xentry_flag(block); collect_predecessors(block); } private: - void verify_successor_xentry_flag(const BlockBegin* block) const { - for (int i = 0; i < block->end()->number_of_sux(); i++) { - assert(!block->end()->sux_at(i)->is_set(BlockBegin::exception_entry_flag), "must not be xhandler"); - } - for (int i = 0; i < block->number_of_exception_handlers(); i++) { - assert(block->exception_handler_at(i)->is_set(BlockBegin::exception_entry_flag), "must be xhandler"); - } - } - void collect_predecessors(BlockBegin* block) { for (int i = 0; i < block->end()->number_of_sux(); i++) { collect_predecessor(block, block->end()->sux_at(i)); @@ -1363,26 +1368,87 @@ class PredecessorValidator : public BlockClosure { }; class VerifyBlockBeginField : public BlockClosure { - public: - - virtual void block_do(BlockBegin *block) { - for ( Instruction *cur = block; cur != NULL; cur = cur->next()) { + virtual void block_do(BlockBegin* block) { + for (Instruction* cur = block; cur != NULL; cur = cur->next()) { assert(cur->block() == block, "Block begin is not correct"); } } }; -void IR::verify() { -#ifdef ASSERT - PredecessorValidator pv(this); - EndNotNullValidator(this); +class ValidateEdgeMutuality : public BlockClosure { + public: + virtual void block_do(BlockBegin* block) { + for (int i = 0; i < block->end()->number_of_sux(); i++) { + assert(block->end()->sux_at(i)->is_predecessor(block), "Block's successor should have it as predecessor"); + } + + for (int i = 0; i < block->number_of_exception_handlers(); i++) { + assert(block->exception_handler_at(i)->is_predecessor(block), "Block's exception handler should have it as predecessor"); + } + + for (int i = 0; i < block->number_of_preds(); i++) { + assert(block->pred_at(i) != NULL, "Predecessor must exist"); + assert(block->pred_at(i)->end() != NULL, "Predecessor end must exist"); + bool is_sux = block->pred_at(i)->end()->is_sux(block); + bool is_xhandler = block->pred_at(i)->is_exception_handler(block); + assert(is_sux || is_xhandler, "Block's predecessor should have it as successor or xhandler"); + } + } +}; + +void IR::expand_with_neighborhood(BlockList& blocks) { + int original_size = blocks.length(); + for (int h = 0; h < original_size; h++) { + BlockBegin* block = blocks.at(h); + + for (int i = 0; i < block->end()->number_of_sux(); i++) { + if (!blocks.contains(block->end()->sux_at(i))) { + blocks.append(block->end()->sux_at(i)); + } + } + + for (int i = 0; i < block->number_of_preds(); i++) { + if (!blocks.contains(block->pred_at(i))) { + blocks.append(block->pred_at(i)); + } + } + + for (int i = 0; i < block->number_of_exception_handlers(); i++) { + if (!blocks.contains(block->exception_handler_at(i))) { + blocks.append(block->exception_handler_at(i)); + } + } + } +} + +void IR::verify_local(BlockList& blocks) { + EndNotNullValidator ennv; + blocks.iterate_forward(&ennv); + + ValidateEdgeMutuality vem; + blocks.iterate_forward(&vem); + VerifyBlockBeginField verifier; - this->iterate_postorder(&verifier); -#endif + blocks.iterate_forward(&verifier); } -#endif // PRODUCT +void IR::verify() { + XentryFlagValidator xe; + iterate_postorder(&xe); + + PredecessorAndCodeValidator pv(this); + + EndNotNullValidator ennv; + iterate_postorder(&ennv); + + ValidateEdgeMutuality vem; + iterate_postorder(&vem); + + VerifyBlockBeginField verifier; + iterate_postorder(&verifier); +} +#endif // ASSERT void SubstitutionResolver::visit(Value* v) { Value v0 = *v; diff --git a/src/hotspot/share/c1/c1_IR.hpp b/src/hotspot/share/c1/c1_IR.hpp index 31f44411280544c42d408fd83872d637a79cf790..1c759a8bee2408b7f3f2663643da4f5158e2cb9c 100644 --- a/src/hotspot/share/c1/c1_IR.hpp +++ b/src/hotspot/share/c1/c1_IR.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2022, 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 @@ -342,7 +342,10 @@ class IR: public CompilationResourceObj { // debugging static void print(BlockBegin* start, bool cfg_only, bool live_only = false) PRODUCT_RETURN; void print(bool cfg_only, bool live_only = false) PRODUCT_RETURN; - void verify() PRODUCT_RETURN; + + void expand_with_neighborhood(BlockList& blocks) NOT_DEBUG_RETURN; + void verify_local(BlockList&) NOT_DEBUG_RETURN; + void verify() NOT_DEBUG_RETURN; }; diff --git a/src/hotspot/share/c1/c1_Instruction.cpp b/src/hotspot/share/c1/c1_Instruction.cpp index 790c35e5020ea0d2438b9400679e9f90650f162d..4b66796a543f02cb6026b6d1d8d51d08a4b4d434 100644 --- a/src/hotspot/share/c1/c1_Instruction.cpp +++ b/src/hotspot/share/c1/c1_Instruction.cpp @@ -529,9 +529,10 @@ void BlockBegin::set_end(BlockEnd* new_end) { // Assumes that no predecessor of if (new_end == _end) return; // Remove this block as predecessor of its current successors - if (_end != NULL) - for (int i = 0; i < number_of_sux(); i++) { - sux_at(i)->remove_predecessor(this); + if (_end != NULL) { + for (int i = 0; i < number_of_sux(); i++) { + sux_at(i)->remove_predecessor(this); + } } _end = new_end; diff --git a/src/hotspot/share/c1/c1_Instruction.hpp b/src/hotspot/share/c1/c1_Instruction.hpp index 932b79792a5597639c6b7150a466a46e6e981820..1646557018f75496702cafd80b1020cc16fb1995 100644 --- a/src/hotspot/share/c1/c1_Instruction.hpp +++ b/src/hotspot/share/c1/c1_Instruction.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2022, 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 @@ -1822,6 +1822,7 @@ BASE(BlockEnd, StateSplit) // successors int number_of_sux() const { return _sux != NULL ? _sux->length() : 0; } BlockBegin* sux_at(int i) const { return _sux->at(i); } + bool is_sux(BlockBegin* sux) const { return _sux == NULL ? false : _sux->contains(sux); } BlockBegin* default_sux() const { return sux_at(number_of_sux() - 1); } void substitute_sux(BlockBegin* old_sux, BlockBegin* new_sux); }; diff --git a/src/hotspot/share/c1/c1_Optimizer.cpp b/src/hotspot/share/c1/c1_Optimizer.cpp index e406a530b73a9531ea9ae785d771a98d97c3acbe..e741cf90f9210f604c8f3335cb1e15505eed73a9 100644 --- a/src/hotspot/share/c1/c1_Optimizer.cpp +++ b/src/hotspot/share/c1/c1_Optimizer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2022, 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 @@ -180,6 +180,25 @@ void CE_Eliminator::block_do(BlockBegin* block) { return; } +#ifdef ASSERT +#define DO_DELAYED_VERIFICATION + /* + * We need to verify the internal representation after modifying it. + * Verifying only the blocks that have been tampered with is cheaper than verifying the whole graph, but we must + * capture blocks_to_verify_later before making the changes, since they might not be reachable afterwards. + * DO_DELAYED_VERIFICATION ensures that the code for this is either enabled in full, or not at all. + */ +#endif // ASSERT + +#ifdef DO_DELAYED_VERIFICATION + BlockList blocks_to_verify_later; + blocks_to_verify_later.append(block); + blocks_to_verify_later.append(t_block); + blocks_to_verify_later.append(f_block); + blocks_to_verify_later.append(sux); + _hir->expand_with_neighborhood(blocks_to_verify_later); +#endif // DO_DELAYED_VERIFICATION + // 2) substitute conditional expression // with an IfOp followed by a Goto // cut if_ away and get node before @@ -248,7 +267,10 @@ void CE_Eliminator::block_do(BlockBegin* block) { tty->print_cr("%d. IfOp in B%d", ifop_count(), block->block_id()); } - _hir->verify(); +#ifdef DO_DELAYED_VERIFICATION + _hir->verify_local(blocks_to_verify_later); +#endif // DO_DELAYED_VERIFICATION + } Value CE_Eliminator::make_ifop(Value x, Instruction::Condition cond, Value y, Value tval, Value fval) { @@ -312,6 +334,7 @@ void Optimizer::eliminate_conditional_expressions() { CE_Eliminator ce(ir()); } +// This removes others' relation to block, but doesnt empty block's lists void disconnect_from_graph(BlockBegin* block) { for (int p = 0; p < block->number_of_preds(); p++) { BlockBegin* pred = block->pred_at(p); @@ -387,6 +410,12 @@ class BlockMerger: public BlockClosure { assert(sux_state->caller_state() == end_state->caller_state(), "caller not equal"); #endif +#ifdef DO_DELAYED_VERIFICATION + BlockList blocks_to_verify_later; + blocks_to_verify_later.append(block); + _hir->expand_with_neighborhood(blocks_to_verify_later); +#endif // DO_DELAYED_VERIFICATION + // find instruction before end & append first instruction of sux block Instruction* prev = end->prev(); Instruction* next = sux->next(); @@ -396,6 +425,9 @@ class BlockMerger: public BlockClosure { // disconnect this block from all other blocks disconnect_from_graph(sux); +#ifdef DO_DELAYED_VERIFICATION + blocks_to_verify_later.remove(sux); // Sux is not part of graph anymore +#endif // DO_DELAYED_VERIFICATION block->set_end(sux->end()); // TODO Should this be done in set_end universally? @@ -404,6 +436,7 @@ class BlockMerger: public BlockClosure { BlockBegin* xhandler = sux->exception_handler_at(k); block->add_exception_handler(xhandler); + // TODO This should be in disconnect from graph... // also substitute predecessor of exception handler assert(xhandler->is_predecessor(sux), "missing predecessor"); xhandler->remove_predecessor(sux); @@ -419,7 +452,9 @@ class BlockMerger: public BlockClosure { _merge_count, block->block_id(), sux->block_id(), sux->state()->stack_size()); } - _hir->verify(); +#ifdef DO_DELAYED_VERIFICATION + _hir->verify_local(blocks_to_verify_later); +#endif // DO_DELAYED_VERIFICATION If* if_ = block->end()->as_If(); if (if_) { @@ -469,7 +504,9 @@ class BlockMerger: public BlockClosure { tty->print_cr("%d. replaced If and IfOp at end of B%d with single If", _merge_count, block->block_id()); } - _hir->verify(); +#ifdef DO_DELAYED_VERIFICATION + _hir->verify_local(blocks_to_verify_later); +#endif // DO_DELAYED_VERIFICATION } } } @@ -485,6 +522,9 @@ class BlockMerger: public BlockClosure { } }; +#ifdef ASSERT +#undef DO_DELAYED_VERIFICATION +#endif // ASSERT void Optimizer::eliminate_blocks() { // merge blocks if possible diff --git a/src/hotspot/share/c1/c1_RangeCheckElimination.cpp b/src/hotspot/share/c1/c1_RangeCheckElimination.cpp index fc5df4a420133f139b97ba55a0a7d425fb0ea59e..f5275eb9d5c5341a3ecf4ef18ec979d12d5306c8 100644 --- a/src/hotspot/share/c1/c1_RangeCheckElimination.cpp +++ b/src/hotspot/share/c1/c1_RangeCheckElimination.cpp @@ -365,7 +365,12 @@ void RangeCheckEliminator::update_bound(IntegerStack &pushed, Value v, Instructi bool RangeCheckEliminator::loop_invariant(BlockBegin *loop_header, Instruction *instruction) { assert(loop_header, "Loop header must not be null!"); if (!instruction) return true; - return instruction->dominator_depth() < loop_header->dominator_depth(); + for (BlockBegin *d = loop_header->dominator(); d != NULL; d = d->dominator()) { + if (d == instruction->block()) { + return true; + } + } + return false; } // Update bound. Pushes a new bound onto the stack. Tries to do a conjunction with the current bound. diff --git a/src/hotspot/share/c1/c1_Runtime1.hpp b/src/hotspot/share/c1/c1_Runtime1.hpp index 9212a4fb2498eac533e638611a185e33aa670151..3dcb27476a6f9b8d342461d2032248d94ab9c8fe 100644 --- a/src/hotspot/share/c1/c1_Runtime1.hpp +++ b/src/hotspot/share/c1/c1_Runtime1.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2022, 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,7 +28,7 @@ #include "c1/c1_FrameMap.hpp" #include "code/stubs.hpp" #include "interpreter/interpreter.hpp" -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "runtime/deoptimization.hpp" class StubAssembler; diff --git a/src/hotspot/share/cds/archiveUtils.cpp b/src/hotspot/share/cds/archiveUtils.cpp index 8c273c06a8d0b431a9591420c0577bb18808a371..27c94290c23e0c0bf3ad412d26b63d698ec34572 100644 --- a/src/hotspot/share/cds/archiveUtils.cpp +++ b/src/hotspot/share/cds/archiveUtils.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2022, 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 @@ -39,7 +39,9 @@ #include "oops/compressedOops.inline.hpp" #include "runtime/arguments.hpp" #include "utilities/bitMap.inline.hpp" +#include "utilities/debug.hpp" #include "utilities/formatBuffer.hpp" +#include "utilities/globalDefinitions.hpp" CHeapBitMap* ArchivePtrMarker::_ptrmap = NULL; VirtualSpace* ArchivePtrMarker::_vs; diff --git a/src/hotspot/share/cds/classListParser.cpp b/src/hotspot/share/cds/classListParser.cpp index 66e346b19442470807b7906255213f2267248a5b..1da5e79377bf01d25d266ba7d337f43aa3935ff5 100644 --- a/src/hotspot/share/cds/classListParser.cpp +++ b/src/hotspot/share/cds/classListParser.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2022, 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 @@ -64,7 +64,7 @@ ClassListParser::ClassListParser(const char* file) : _id2klass_table(INITIAL_TAB if (fd != -1) { // Obtain a File* from the file descriptor so that fgets() // can be used in parse_one_line() - _file = os::open(fd, "r"); + _file = os::fdopen(fd, "r"); } if (_file == NULL) { char errmsg[JVM_MAXPATHLEN]; diff --git a/src/hotspot/share/cds/classListWriter.cpp b/src/hotspot/share/cds/classListWriter.cpp index 6750a5d4cac09c113ae466ff631929b29149afbc..2ff647559c35a37645a2bc86af47fd2239ee4d38 100644 --- a/src/hotspot/share/cds/classListWriter.cpp +++ b/src/hotspot/share/cds/classListWriter.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2021, 2022, 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 @@ -59,11 +59,6 @@ void ClassListWriter::write(const InstanceKlass* k, const ClassFileStream* cfs) return; } - // filter out java/lang/invoke/BoundMethodHandle$Species.... - if (cfs != NULL && strcmp(cfs->source(), "_ClassSpecializer_generateConcreteSpeciesCode") == 0) { - return; - } - ClassListWriter w; write_to_stream(k, w.stream(), cfs); } @@ -107,10 +102,21 @@ void ClassListWriter::handle_class_unloading(const InstanceKlass* klass) { void ClassListWriter::write_to_stream(const InstanceKlass* k, outputStream* stream, const ClassFileStream* cfs) { assert_locked(); - ClassLoaderData* loader_data = k->class_loader_data(); - if (!SystemDictionaryShared::is_builtin_loader(loader_data)) { - if (cfs == NULL || strncmp(cfs->source(), "file:", 5) != 0) { + ClassLoaderData* loader_data = k->class_loader_data(); + bool is_builtin_loader = SystemDictionaryShared::is_builtin_loader(loader_data); + if (!is_builtin_loader) { + // class may be loaded from shared archive + if (!k->is_shared()) { + if (cfs == nullptr || cfs->source() == nullptr) { + // CDS static dump only handles unregistered class with known source. + return; + } + if (strncmp(cfs->source(), "file:", 5) != 0) { + return; + } + } else { + // Shared unregistered classes are skipped since their real source are not recorded in shared space. return; } if (!SystemDictionaryShared::add_unregistered_class(Thread::current(), (InstanceKlass*)k)) { @@ -118,6 +124,10 @@ void ClassListWriter::write_to_stream(const InstanceKlass* k, outputStream* stre } } + // filter out java/lang/invoke/BoundMethodHandle$Species... + if (cfs != nullptr && cfs->source() != nullptr && strcmp(cfs->source(), "_ClassSpecializer_generateConcreteSpeciesCode") == 0) { + return; + } { InstanceKlass* super = k->java_super(); @@ -145,7 +155,7 @@ void ClassListWriter::write_to_stream(const InstanceKlass* k, outputStream* stre ResourceMark rm; stream->print("%s id: %d", k->name()->as_C_string(), get_id(k)); - if (!SystemDictionaryShared::is_builtin_loader(loader_data)) { + if (!is_builtin_loader) { InstanceKlass* super = k->java_super(); assert(super != NULL, "must be"); stream->print(" super: %d", get_id(super)); diff --git a/src/hotspot/share/cds/dumpTimeClassInfo.hpp b/src/hotspot/share/cds/dumpTimeClassInfo.hpp index 04b0af221cfffae80fc4737c0cd6688179df9831..28fe986ff7a32c72a664f044bfd23ed658c47f44 100644 --- a/src/hotspot/share/cds/dumpTimeClassInfo.hpp +++ b/src/hotspot/share/cds/dumpTimeClassInfo.hpp @@ -1,6 +1,6 @@ /* - * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2021, 2022, 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 @@ -135,8 +135,7 @@ public: } bool is_excluded() { - // _klass may become NULL due to DynamicArchiveBuilder::set_to_null - return _excluded || _failed_verification || _klass == NULL; + return _excluded || _failed_verification; } // Was this class loaded while JvmtiExport::is_early_phase()==true diff --git a/src/hotspot/share/cds/dynamicArchive.cpp b/src/hotspot/share/cds/dynamicArchive.cpp index 8592e076c7f31317e3d8085124ca3c471d609d4b..0ff6a017fedfef3a28f0c83fe28484edcb1696fd 100644 --- a/src/hotspot/share/cds/dynamicArchive.cpp +++ b/src/hotspot/share/cds/dynamicArchive.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2022, 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 @@ -187,7 +187,7 @@ public: }; void DynamicArchiveBuilder::init_header() { - FileMapInfo* mapinfo = new FileMapInfo(false); + FileMapInfo* mapinfo = new FileMapInfo(_archive_name, false); assert(FileMapInfo::dynamic_info() == mapinfo, "must be"); FileMapInfo* base_info = FileMapInfo::current_info(); // header only be available after populate_header @@ -327,7 +327,7 @@ void DynamicArchiveBuilder::write_archive(char* serialized_data) { FileMapInfo* dynamic_info = FileMapInfo::dynamic_info(); assert(dynamic_info != NULL, "Sanity"); - dynamic_info->open_for_write(_archive_name); + dynamic_info->open_for_write(); ArchiveBuilder::write_archive(dynamic_info, NULL, NULL, NULL, NULL); address base = _requested_dynamic_archive_bottom; @@ -384,7 +384,7 @@ void DynamicArchive::check_for_dynamic_dump() { void DynamicArchive::prepare_for_dump_at_exit() { EXCEPTION_MARK; ResourceMark rm(THREAD); - MetaspaceShared::link_shared_classes(THREAD); + MetaspaceShared::link_shared_classes(false/*not from jcmd*/, THREAD); if (HAS_PENDING_EXCEPTION) { log_error(cds)("Dynamic dump has failed"); log_error(cds)("%s: %s", PENDING_EXCEPTION->klass()->external_name(), @@ -400,7 +400,7 @@ void DynamicArchive::dump_for_jcmd(const char* archive_name, TRAPS) { assert(UseSharedSpaces && RecordDynamicDumpInfo, "already checked in arguments.cpp"); assert(ArchiveClassesAtExit == nullptr, "already checked in arguments.cpp"); assert(DynamicDumpSharedSpaces, "already checked by check_for_dynamic_dump() during VM startup"); - MetaspaceShared::link_shared_classes(CHECK); + MetaspaceShared::link_shared_classes(true/*from jcmd*/, CHECK); dump(archive_name, THREAD); } diff --git a/src/hotspot/share/cds/dynamicArchive.hpp b/src/hotspot/share/cds/dynamicArchive.hpp index fbb831ae1953b9b4afa65b8bc853fbdd38b13d12..ec8a505978b9450ceead4846f0c1515b0a02f1fb 100644 --- a/src/hotspot/share/cds/dynamicArchive.hpp +++ b/src/hotspot/share/cds/dynamicArchive.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2022, 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,7 +27,7 @@ #include "cds/filemap.hpp" #include "classfile/compactHashtable.hpp" -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "memory/memRegion.hpp" #include "memory/virtualspace.hpp" #include "oops/oop.hpp" diff --git a/src/hotspot/share/cds/filemap.cpp b/src/hotspot/share/cds/filemap.cpp index 090f60c8aa5f0afbce0f0d81f86fdb02cf601a2c..5bf1887cfce18143a7a903bce1dad4fd6a6ae662 100644 --- a/src/hotspot/share/cds/filemap.cpp +++ b/src/hotspot/share/cds/filemap.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2022, 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 @@ -166,8 +166,9 @@ template static void get_header_version(char (&header_version) [N]) { assert(header_version[JVM_IDENT_MAX-1] == 0, "must be"); } -FileMapInfo::FileMapInfo(bool is_static) { +FileMapInfo::FileMapInfo(const char* full_path, bool is_static) { memset((void*)this, 0, sizeof(FileMapInfo)); + _full_path = full_path; _is_static = is_static; if (_is_static) { assert(_current_info == NULL, "must be singleton"); // not thread safe @@ -188,6 +189,9 @@ FileMapInfo::~FileMapInfo() { assert(_dynamic_archive_info == this, "must be singleton"); // not thread safe _dynamic_archive_info = NULL; } + if (_file_open) { + ::close(_fd); + } } void FileMapInfo::populate_header(size_t core_region_alignment) { @@ -273,7 +277,6 @@ void FileMapHeader::populate(FileMapInfo *info, size_t core_region_alignment, if (!DynamicDumpSharedSpaces) { set_shared_path_table(info->_shared_path_table); - CDS_JAVA_HEAP_ONLY(_heap_obj_roots = CompressedOops::encode(HeapShared::roots());) } } @@ -764,6 +767,21 @@ int FileMapInfo::num_paths(const char* path) { return npaths; } +// Returns true if a path within the paths exists and has non-zero size. +bool FileMapInfo::check_paths_existence(const char* paths) { + ClasspathStream cp_stream(paths); + bool exist = false; + struct stat st; + while (cp_stream.has_next()) { + const char* path = cp_stream.get_next(); + if (os::stat(path, &st) == 0 && st.st_size > 0) { + exist = true; + break; + } + } + return exist; +} + GrowableArray* FileMapInfo::create_path_array(const char* paths) { GrowableArray* path_array = new GrowableArray(10); JavaThread* current = JavaThread::current(); @@ -847,7 +865,12 @@ bool FileMapInfo::validate_boot_class_paths() { if (relaxed_check) { return true; // ok, relaxed check, runtime has extra boot append path entries } else { - mismatch = true; + ResourceMark rm; + if (check_paths_existence(rp)) { + // If a path exists in the runtime boot paths, it is considered a mismatch + // since there's no boot path specified during dump time. + mismatch = true; + } } } else if (dp_len > 0 && rp != NULL) { int num; @@ -1050,23 +1073,32 @@ void FileMapInfo::validate_non_existent_class_paths() { class FileHeaderHelper { int _fd; bool _is_valid; + bool _is_static; GenericCDSFileMapHeader* _header; + const char* _archive_name; const char* _base_archive_name; public: - FileHeaderHelper() : _fd(-1), _is_valid(false), _header(nullptr), _base_archive_name(nullptr) {} + FileHeaderHelper(const char* archive_name, bool is_static) { + _fd = -1; + _is_valid = false; + _header = nullptr; + _base_archive_name = nullptr; + _archive_name = archive_name; + _is_static = is_static; + } ~FileHeaderHelper() { if (_fd != -1) { - os::close(_fd); + ::close(_fd); } } - bool initialize(const char* archive_name) { - log_info(cds)("Opening shared archive: %s", archive_name); - _fd = os::open(archive_name, O_RDONLY | O_BINARY, 0); + bool initialize() { + assert(_archive_name != nullptr, "Archive name is NULL"); + _fd = os::open(_archive_name, O_RDONLY | O_BINARY, 0); if (_fd < 0) { - FileMapInfo::fail_continue("Specified shared archive not found (%s)", archive_name); + FileMapInfo::fail_continue("Specified shared archive not found (%s)", _archive_name); return false; } return initialize(_fd); @@ -1074,14 +1106,13 @@ public: // for an already opened file, do not set _fd bool initialize(int fd) { - assert(fd != -1, "Archive should be opened"); - - + assert(_archive_name != nullptr, "Archive name is NULL"); + assert(fd != -1, "Archive must be opened already"); // First read the generic header so we know the exact size of the actual header. GenericCDSFileMapHeader gen_header; size_t size = sizeof(GenericCDSFileMapHeader); - lseek(fd, 0, SEEK_SET); - size_t n = os::read(fd, (void*)&gen_header, (unsigned int)size); + os::lseek(fd, 0, SEEK_SET); + size_t n = ::read(fd, (void*)&gen_header, (unsigned int)size); if (n != size) { FileMapInfo::fail_continue("Unable to read generic CDS file map header from shared archive"); return false; @@ -1099,6 +1130,11 @@ public: return false; } + if (gen_header._version != CURRENT_CDS_ARCHIVE_VERSION) { + FileMapInfo::fail_continue("The shared archive file version %d does not match the required version %d", + gen_header._version, CURRENT_CDS_ARCHIVE_VERSION); + } + size_t filelen = os::lseek(fd, 0, SEEK_END); if (gen_header._header_size >= filelen) { FileMapInfo::fail_continue("Archive file header larger than archive file"); @@ -1108,8 +1144,8 @@ public: // Read the actual header and perform more checks size = gen_header._header_size; _header = (GenericCDSFileMapHeader*)NEW_C_HEAP_ARRAY(char, size, mtInternal); - lseek(fd, 0, SEEK_SET); - n = os::read(fd, (void*)_header, (unsigned int)size); + os::lseek(fd, 0, SEEK_SET); + n = ::read(fd, (void*)_header, (unsigned int)size); if (n != size) { FileMapInfo::fail_continue("Unable to read actual CDS file map header from shared archive"); return false; @@ -1204,28 +1240,6 @@ public: } }; -bool FileMapInfo::check_archive(const char* archive_name, bool is_static) { - FileHeaderHelper file_helper; - if (!file_helper.initialize(archive_name)) { - // Any errors are reported by fail_continue(). - return false; - } - - GenericCDSFileMapHeader* header = file_helper.get_generic_file_header(); - if (is_static) { - if (header->_magic != CDS_ARCHIVE_MAGIC) { - fail_continue("Not a base shared archive: %s", archive_name); - return false; - } - } else { - if (header->_magic != CDS_DYNAMIC_ARCHIVE_MAGIC) { - fail_continue("Not a top shared archive: %s", archive_name); - return false; - } - } - return true; -} - // Return value: // false: // is not a valid archive. *base_archive_name is set to null. @@ -1235,15 +1249,18 @@ bool FileMapInfo::check_archive(const char* archive_name, bool is_static) { // is a valid dynamic archive. bool FileMapInfo::get_base_archive_name_from_header(const char* archive_name, char** base_archive_name) { - FileHeaderHelper file_helper; + FileHeaderHelper file_helper(archive_name, false); *base_archive_name = NULL; - if (!file_helper.initialize(archive_name)) { + if (!file_helper.initialize()) { return false; } GenericCDSFileMapHeader* header = file_helper.get_generic_file_header(); if (header->_magic != CDS_DYNAMIC_ARCHIVE_MAGIC) { assert(header->_magic == CDS_ARCHIVE_MAGIC, "must be"); + if (AutoCreateSharedArchive) { + log_warning(cds)("AutoCreateSharedArchive is ignored because %s is a static archive", archive_name); + } return true; } @@ -1260,25 +1277,29 @@ bool FileMapInfo::get_base_archive_name_from_header(const char* archive_name, // Read the FileMapInfo information from the file. bool FileMapInfo::init_from_file(int fd) { - FileHeaderHelper file_helper; + FileHeaderHelper file_helper(_full_path, _is_static); if (!file_helper.initialize(fd)) { fail_continue("Unable to read the file header."); return false; } GenericCDSFileMapHeader* gen_header = file_helper.get_generic_file_header(); - unsigned int expected_magic = is_static() ? CDS_ARCHIVE_MAGIC : CDS_DYNAMIC_ARCHIVE_MAGIC; - if (gen_header->_magic != expected_magic) { - log_info(cds)("_magic expected: 0x%08x", expected_magic); - log_info(cds)(" actual: 0x%08x", gen_header->_magic); - FileMapInfo::fail_continue("The shared archive file has a bad magic number."); - return false; + if (_is_static) { + if (gen_header->_magic != CDS_ARCHIVE_MAGIC) { + FileMapInfo::fail_continue("Not a base shared archive: %s", _full_path); + return false; + } + } else { + if (gen_header->_magic != CDS_DYNAMIC_ARCHIVE_MAGIC) { + FileMapInfo::fail_continue("Not a top shared archive: %s", _full_path); + return false; + } } _header = (FileMapHeader*)os::malloc(gen_header->_header_size, mtInternal); - lseek(fd, 0, SEEK_SET); // reset to begin of the archive + os::lseek(fd, 0, SEEK_SET); // reset to begin of the archive size_t size = gen_header->_header_size; - size_t n = os::read(fd, (void*)_header, (unsigned int)size); + size_t n = ::read(fd, (void*)_header, (unsigned int)size); if (n != size) { fail_continue("Failed to read file header from the top archive file\n"); return false; @@ -1326,7 +1347,7 @@ bool FileMapInfo::init_from_file(int fd) { if (is_static()) { // just checking the last region is sufficient since the archive is written // in sequential order - size_t len = lseek(fd, 0, SEEK_END); + size_t len = os::lseek(fd, 0, SEEK_END); FileMapRegion* si = space_at(MetaspaceShared::last_valid_region); // The last space might be empty if (si->file_offset() > len || len - si->file_offset() < si->used()) { @@ -1339,7 +1360,7 @@ bool FileMapInfo::init_from_file(int fd) { } void FileMapInfo::seek_to_position(size_t pos) { - if (lseek(_fd, (long)pos, SEEK_SET) < 0) { + if (os::lseek(_fd, (long)pos, SEEK_SET) < 0) { fail_stop("Unable to seek to position " SIZE_FORMAT, pos); } } @@ -1349,11 +1370,6 @@ bool FileMapInfo::open_for_read() { if (_file_open) { return true; } - if (is_static()) { - _full_path = Arguments::GetSharedArchivePath(); - } else { - _full_path = Arguments::GetSharedDynamicArchivePath(); - } log_info(cds)("trying to map %s", _full_path); int fd = os::open(_full_path, O_RDONLY | O_BINARY, 0); if (fd < 0) { @@ -1375,12 +1391,7 @@ bool FileMapInfo::open_for_read() { // Write the FileMapInfo information to the file. -void FileMapInfo::open_for_write(const char* path) { - if (path == NULL) { - _full_path = Arguments::GetSharedArchivePath(); - } else { - _full_path = path; - } +void FileMapInfo::open_for_write() { LogMessage(cds) msg; if (msg.is_info()) { msg.info("Dumping shared data to file: "); @@ -1614,8 +1625,8 @@ size_t FileMapInfo::write_heap_regions(GrowableArray* regions, void FileMapInfo::write_bytes(const void* buffer, size_t nbytes) { assert(_file_open, "must be"); - size_t n = os::write(_fd, buffer, (unsigned int)nbytes); - if (n != nbytes) { + ssize_t n = os::write(_fd, buffer, (unsigned int)nbytes); + if (n < 0 || (size_t)n != nbytes) { // If the shared archive is corrupted, close it and remove it. close(); remove(_full_path); @@ -1750,7 +1761,7 @@ bool FileMapInfo::read_region(int i, char* base, size_t size, bool do_commit) { return false; } } - if (lseek(_fd, (long)si->file_offset(), SEEK_SET) != (int)si->file_offset() || + if (os::lseek(_fd, (long)si->file_offset(), SEEK_SET) != (int)si->file_offset() || read_bytes(base, size) != size) { return false; } @@ -1787,7 +1798,7 @@ MapArchiveResult FileMapInfo::map_region(int i, intx addr_delta, char* mapped_ba if (MetaspaceShared::use_windows_memory_mapping() && rs.is_reserved()) { // This is the second time we try to map the archive(s). We have already created a ReservedSpace // that covers all the FileMapRegions to ensure all regions can be mapped. However, Windows - // can't mmap into a ReservedSpace, so we just os::read() the data. We're going to patch all the + // can't mmap into a ReservedSpace, so we just ::read() the data. We're going to patch all the // regions anyway, so there's no benefit for mmap anyway. if (!read_region(i, requested_addr, size, /* do_commit = */ true)) { log_info(cds)("Failed to read %s shared space into reserved space at " INTPTR_FORMAT, @@ -1893,7 +1904,7 @@ bool FileMapInfo::relocate_pointers_in_core_regions(intx addr_delta) { size_t FileMapInfo::read_bytes(void* buffer, size_t count) { assert(_file_open, "Archive file is not open"); - size_t n = os::read(_fd, buffer, (unsigned int)count); + size_t n = ::read(_fd, buffer, (unsigned int)count); if (n != count) { // Close the file if there's a problem reading it. close(); @@ -2097,7 +2108,6 @@ void FileMapInfo::map_heap_regions_impl() { /*is_open_archive=*/ true, &open_heap_regions, &num_open_heap_regions)) { HeapShared::set_open_regions_mapped(); - HeapShared::set_roots(header()->heap_obj_roots()); } } } @@ -2366,15 +2376,20 @@ bool FileMapInfo::initialize() { return false; } - if (!open_for_read()) { - return false; - } - if (!init_from_file(_fd)) { - return false; - } - if (!validate_header()) { - return false; + if (!open_for_read() || !init_from_file(_fd) || !validate_header()) { + if (_is_static) { + FileMapInfo::fail_continue("Initialize static archive failed."); + return false; + } else { + FileMapInfo::fail_continue("Initialize dynamic archive failed."); + if (AutoCreateSharedArchive) { + DynamicDumpSharedSpaces = true; + ArchiveClassesAtExit = Arguments::GetSharedDynamicArchivePath(); + } + return false; + } } + return true; } diff --git a/src/hotspot/share/cds/filemap.hpp b/src/hotspot/share/cds/filemap.hpp index 816ac5469dc5d7d548ddd3671f8256e4062ede9e..ac2ad867f797393ca7af460f1a7f094ea268b5dd 100644 --- a/src/hotspot/share/cds/filemap.hpp +++ b/src/hotspot/share/cds/filemap.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2022, 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 @@ -232,7 +232,6 @@ private: // some expensive operations. bool _use_full_module_graph; // Can we use the full archived module graph? size_t _ptrmap_size_in_bits; // Size of pointer relocation bitmap - narrowOop _heap_obj_roots; // An objArray that stores all the roots of archived heap objects char* from_mapped_offset(size_t offset) const { return mapped_base_address() + offset; } @@ -279,14 +278,12 @@ public: jshort app_module_paths_start_index() const { return _app_module_paths_start_index; } jshort app_class_paths_start_index() const { return _app_class_paths_start_index; } jshort num_module_paths() const { return _num_module_paths; } - narrowOop heap_obj_roots() const { return _heap_obj_roots; } void set_has_platform_or_app_classes(bool v) { _has_platform_or_app_classes = v; } void set_cloned_vtables(char* p) { set_as_offset(p, &_cloned_vtables_offset); } void set_serialized_data(char* p) { set_as_offset(p, &_serialized_data_offset); } void set_ptrmap_size_in_bits(size_t s) { _ptrmap_size_in_bits = s; } void set_mapped_base_address(char* p) { _mapped_base_address = p; } - void set_heap_obj_roots(narrowOop r) { _heap_obj_roots = r; } void copy_base_archive_name(const char* name); void set_shared_path_table(SharedPathTable table) { @@ -359,7 +356,6 @@ private: public: static bool get_base_archive_name_from_header(const char* archive_name, char** base_archive_name); - static bool check_archive(const char* archive_name, bool is_static); static SharedPathTable shared_path_table() { return _shared_path_table; } @@ -373,7 +369,7 @@ public: void log_paths(const char* msg, int start_idx, int end_idx); - FileMapInfo(bool is_static); + FileMapInfo(const char* full_apth, bool is_static); ~FileMapInfo(); // Accessors @@ -413,8 +409,6 @@ public: void set_requested_base(char* b) { header()->set_requested_base(b); } char* requested_base_address() const { return header()->requested_base_address(); } - narrowOop heap_obj_roots() const { return header()->heap_obj_roots(); } - class DynamicArchiveHeader* dynamic_header() const { assert(!is_static(), "must be"); return (DynamicArchiveHeader*)header(); @@ -446,7 +440,7 @@ public: // File manipulation. bool initialize() NOT_CDS_RETURN_(false); bool open_for_read(); - void open_for_write(const char* path = NULL); + void open_for_write(); void write_header(); void write_region(int region, char* base, size_t size, bool read_only, bool allow_exec); @@ -560,6 +554,7 @@ public: void seek_to_position(size_t pos); char* skip_first_path_entry(const char* path) NOT_CDS_RETURN_(NULL); int num_paths(const char* path) NOT_CDS_RETURN_(0); + bool check_paths_existence(const char* paths) NOT_CDS_RETURN_(false); GrowableArray* create_path_array(const char* path) NOT_CDS_RETURN_(NULL); bool classpath_failure(const char* msg, const char* name) NOT_CDS_RETURN_(false); bool check_paths(int shared_path_start_idx, int num_paths, diff --git a/src/hotspot/share/cds/heapShared.cpp b/src/hotspot/share/cds/heapShared.cpp index 2ae72ffb5edf06a6d008410e39a4b36717623c00..a224db848bb98ee53076e0821427d60e8aa73d83 100644 --- a/src/hotspot/share/cds/heapShared.cpp +++ b/src/hotspot/share/cds/heapShared.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2022, 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 @@ -128,7 +128,6 @@ const static int num_fmg_open_archive_subgraph_entry_fields = sizeof(fmg_open_archive_subgraph_entry_fields) / sizeof(ArchivableStaticFieldInfo); GrowableArrayCHeap* HeapShared::_pending_roots = NULL; -narrowOop HeapShared::_roots_narrow; OopHandle HeapShared::_roots; #ifdef ASSERT @@ -152,7 +151,6 @@ void HeapShared::fixup_regions() { fill_failed_loaded_region(); } if (is_fully_available()) { - _roots = OopHandle(Universe::vm_global(), decode_from_archive(_roots_narrow)); if (!MetaspaceShared::use_full_module_graph()) { // Need to remove all the archived java.lang.Module objects from HeapShared::roots(). ClassLoaderDataShared::clear_archived_oops(); @@ -236,12 +234,6 @@ objArrayOop HeapShared::roots() { return roots; } -void HeapShared::set_roots(narrowOop roots) { - assert(UseSharedSpaces, "runtime only"); - assert(is_fully_available(), "must be"); - _roots_narrow = roots; -} - // Returns an objArray that contains all the roots of the archived objects oop HeapShared::get_root(int index, bool clear) { assert(index >= 0, "sanity"); @@ -670,7 +662,23 @@ void HeapShared::write_subgraph_info_table() { writer.dump(&_run_time_subgraph_info_table, "subgraphs"); } -void HeapShared::serialize_subgraph_info_table_header(SerializeClosure* soc) { +void HeapShared::serialize(SerializeClosure* soc) { + oop roots_oop = NULL; + + if (soc->reading()) { + soc->do_oop(&roots_oop); // read from archive + assert(oopDesc::is_oop_or_null(roots_oop), "is oop"); + // Create an OopHandle only if we have actually mapped or loaded the roots + if (roots_oop != NULL) { + assert(HeapShared::is_fully_available(), "must be"); + _roots = OopHandle(Universe::vm_global(), roots_oop); + } + } else { + // writing + roots_oop = roots(); + soc->do_oop(&roots_oop); // write to archive + } + _run_time_subgraph_info_table.serialize_header(soc); } @@ -1695,7 +1703,6 @@ bool HeapShared::load_heap_regions(FileMapInfo* mapinfo) { init_loaded_heap_relocation(loaded_regions, num_loaded_regions); _is_loaded = true; - set_roots(mapinfo->heap_obj_roots()); return true; } diff --git a/src/hotspot/share/cds/heapShared.hpp b/src/hotspot/share/cds/heapShared.hpp index 52a8de9ad4602a37169e290647ab2690e94a96ee..6447b124d2ffcc6addf02cfee6dda92ef2c63bbe 100644 --- a/src/hotspot/share/cds/heapShared.hpp +++ b/src/hotspot/share/cds/heapShared.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2022, 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 @@ -310,7 +310,6 @@ private: static SeenObjectsTable *_seen_objects_table; static GrowableArrayCHeap* _pending_roots; - static narrowOop _roots_narrow; static OopHandle _roots; static void init_seen_objects_table() { @@ -418,7 +417,6 @@ private: static oop get_root(int index, bool clear=false); // Run-time only - static void set_roots(narrowOop roots); static void clear_root(int index); #endif // INCLUDE_CDS_JAVA_HEAP @@ -468,7 +466,7 @@ private: static void init_for_dumping(TRAPS) NOT_CDS_JAVA_HEAP_RETURN; static void write_subgraph_info_table() NOT_CDS_JAVA_HEAP_RETURN; - static void serialize_subgraph_info_table_header(SerializeClosure* soc) NOT_CDS_JAVA_HEAP_RETURN; + static void serialize(SerializeClosure* soc) NOT_CDS_JAVA_HEAP_RETURN; }; #if INCLUDE_CDS_JAVA_HEAP diff --git a/src/hotspot/share/cds/metaspaceShared.cpp b/src/hotspot/share/cds/metaspaceShared.cpp index f714ce790b240a2b13e80cd01e673eb510ca8702..ca2e4ecacdec195bb3873335a0b84f171cbb44f3 100644 --- a/src/hotspot/share/cds/metaspaceShared.cpp +++ b/src/hotspot/share/cds/metaspaceShared.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2022, 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 @@ -384,7 +384,7 @@ void MetaspaceShared::serialize(SerializeClosure* soc) { // Dump/restore the symbol/string/subgraph_info tables SymbolTable::serialize_shared_table_header(soc); StringTable::serialize_shared_table_header(soc); - HeapShared::serialize_subgraph_info_table_header(soc); + HeapShared::serialize(soc); SystemDictionaryShared::serialize_dictionary_headers(soc); InstanceMirrorKlass::serialize_offsets(soc); @@ -556,7 +556,9 @@ void VM_PopulateDumpSharedSpace::doit() { builder.relocate_to_requested(); // Write the archive file - FileMapInfo* mapinfo = new FileMapInfo(true); + const char* static_archive = Arguments::GetSharedArchivePath(); + assert(static_archive != nullptr, "SharedArchiveFile not set?"); + FileMapInfo* mapinfo = new FileMapInfo(static_archive, true); mapinfo->populate_header(MetaspaceShared::core_region_alignment()); mapinfo->set_serialized_data(serialized_data); mapinfo->set_cloned_vtables(cloned_vtables); @@ -640,8 +642,10 @@ bool MetaspaceShared::link_class_for_cds(InstanceKlass* ik, TRAPS) { return res; } -void MetaspaceShared::link_shared_classes(TRAPS) { - LambdaFormInvokers::regenerate_holder_classes(CHECK); +void MetaspaceShared::link_shared_classes(bool jcmd_request, TRAPS) { + if (!jcmd_request) { + LambdaFormInvokers::regenerate_holder_classes(CHECK); + } // Collect all loaded ClassLoaderData. CollectCLDClosure collect_cld(THREAD); @@ -773,7 +777,7 @@ void MetaspaceShared::preload_and_dump_impl(TRAPS) { // were not explicitly specified in the classlist. E.g., if an interface implemented by class K // fails verification, all other interfaces that were not specified in the classlist but // are implemented by K are not verified. - link_shared_classes(CHECK); + link_shared_classes(false/*not from jcmd*/, CHECK); log_info(cds)("Rewriting and linking classes: done"); #if INCLUDE_CDS_JAVA_HEAP @@ -946,12 +950,20 @@ void MetaspaceShared::initialize_runtime_shared_and_meta_spaces() { _requested_base_address = static_mapinfo->requested_base_address(); if (dynamic_mapped) { FileMapInfo::set_shared_path_table(dynamic_mapinfo); + // turn AutoCreateSharedArchive off if successfully mapped + AutoCreateSharedArchive = false; } else { FileMapInfo::set_shared_path_table(static_mapinfo); } } else { set_shared_metaspace_range(NULL, NULL, NULL); + if (DynamicDumpSharedSpaces) { + warning("-XX:ArchiveClassesAtExit is unsupported when base CDS archive is not loaded. Run with -Xlog:cds for more info."); + } UseSharedSpaces = false; + // The base archive cannot be mapped. We cannot dump the dynamic shared archive. + AutoCreateSharedArchive = false; + DynamicDumpSharedSpaces = false; FileMapInfo::fail_continue("Unable to map shared spaces"); if (PrintSharedArchiveAndExit) { vm_exit_during_initialization("Unable to use shared archive."); @@ -967,7 +979,9 @@ void MetaspaceShared::initialize_runtime_shared_and_meta_spaces() { } FileMapInfo* MetaspaceShared::open_static_archive() { - FileMapInfo* mapinfo = new FileMapInfo(true); + const char* static_archive = Arguments::GetSharedArchivePath(); + assert(static_archive != nullptr, "SharedArchivePath is NULL"); + FileMapInfo* mapinfo = new FileMapInfo(static_archive, true); if (!mapinfo->initialize()) { delete(mapinfo); return NULL; @@ -979,11 +993,12 @@ FileMapInfo* MetaspaceShared::open_dynamic_archive() { if (DynamicDumpSharedSpaces) { return NULL; } - if (Arguments::GetSharedDynamicArchivePath() == NULL) { + const char* dynamic_archive = Arguments::GetSharedDynamicArchivePath(); + if (dynamic_archive == nullptr) { return NULL; } - FileMapInfo* mapinfo = new FileMapInfo(false); + FileMapInfo* mapinfo = new FileMapInfo(dynamic_archive, false); if (!mapinfo->initialize()) { delete(mapinfo); return NULL; diff --git a/src/hotspot/share/cds/metaspaceShared.hpp b/src/hotspot/share/cds/metaspaceShared.hpp index 74077d0fff05b582fca74a1d1c46e8760298de18..c7d64d7de0c4c43d00bcb67221887c92a34a828f 100644 --- a/src/hotspot/share/cds/metaspaceShared.hpp +++ b/src/hotspot/share/cds/metaspaceShared.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2022, 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 @@ -133,7 +133,7 @@ public: } static bool try_link_class(JavaThread* current, InstanceKlass* ik); - static void link_shared_classes(TRAPS) NOT_CDS_RETURN; + static void link_shared_classes(bool jcmd_request, TRAPS) NOT_CDS_RETURN; static bool link_class_for_cds(InstanceKlass* ik, TRAPS) NOT_CDS_RETURN_(false); static bool may_be_eagerly_linked(InstanceKlass* ik) NOT_CDS_RETURN_(false); diff --git a/src/hotspot/share/ci/ciEnv.cpp b/src/hotspot/share/ci/ciEnv.cpp index e29b56a3f277c89b20fd3c24ca2ea114d452ef81..323d67c986f685b69846e9040dfd5b8073d3e824 100644 --- a/src/hotspot/share/ci/ciEnv.cpp +++ b/src/hotspot/share/ci/ciEnv.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2022, 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 @@ -1688,7 +1688,7 @@ void ciEnv::dump_replay_data(int compile_id) { if (ret > 0) { int fd = os::open(buffer, O_RDWR | O_CREAT | O_TRUNC, 0666); if (fd != -1) { - FILE* replay_data_file = os::open(fd, "w"); + FILE* replay_data_file = os::fdopen(fd, "w"); if (replay_data_file != NULL) { fileStream replay_data_stream(replay_data_file, /*need_close=*/true); dump_replay_data(&replay_data_stream); @@ -1706,7 +1706,7 @@ void ciEnv::dump_inline_data(int compile_id) { if (ret > 0) { int fd = os::open(buffer, O_RDWR | O_CREAT | O_TRUNC, 0666); if (fd != -1) { - FILE* inline_data_file = os::open(fd, "w"); + FILE* inline_data_file = os::fdopen(fd, "w"); if (inline_data_file != NULL) { fileStream replay_data_stream(inline_data_file, /*need_close=*/true); GUARDED_VM_ENTRY( diff --git a/src/hotspot/share/ci/ciReplay.cpp b/src/hotspot/share/ci/ciReplay.cpp index e630278e649762ef7b96ad46554ef2218227741f..a2a249f157ac4e8cdbdd8a8eed68f62ce7d3c989 100644 --- a/src/hotspot/share/ci/ciReplay.cpp +++ b/src/hotspot/share/ci/ciReplay.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2022, 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 @@ -145,7 +145,7 @@ class CompileReplay : public StackObj { _protection_domain = Handle(); _protection_domain_initialized = false; - _stream = fopen(filename, "rt"); + _stream = os::fopen(filename, "rt"); if (_stream == NULL) { fprintf(stderr, "ERROR: Can't open replay file %s\n", filename); } diff --git a/src/hotspot/share/ci/ciStreams.cpp b/src/hotspot/share/ci/ciStreams.cpp index 4e9895bfaed8ad30b814f48cdd8efe88d10c4424..a1e6c5bffe82494a1bc201dc1048d2d02eb99f31 100644 --- a/src/hotspot/share/ci/ciStreams.cpp +++ b/src/hotspot/share/ci/ciStreams.cpp @@ -476,8 +476,9 @@ ciKlass* ciBytecodeStream::get_declared_method_holder() { constantPoolHandle cpool(THREAD, _method->get_Method()->constants()); bool ignore; // report as MethodHandle for invokedynamic, which is syntactically classless - if (cur_bc() == Bytecodes::_invokedynamic) - return CURRENT_ENV->get_klass_by_name(_holder, ciSymbols::java_lang_invoke_MethodHandle(), false); + if (cur_bc() == Bytecodes::_invokedynamic) { + return CURRENT_ENV->MethodHandle_klass(); + } return CURRENT_ENV->get_klass_by_index(cpool, get_method_holder_index(), ignore, _holder); } diff --git a/src/hotspot/share/ci/ciTypeFlow.cpp b/src/hotspot/share/ci/ciTypeFlow.cpp index 802ba97db2e7b2569cc0068348b276a47078f5d8..240cb6543807c960703b0b24856aa4f45e8f3dd1 100644 --- a/src/hotspot/share/ci/ciTypeFlow.cpp +++ b/src/hotspot/share/ci/ciTypeFlow.cpp @@ -2202,10 +2202,10 @@ bool ciTypeFlow::can_trap(ciBytecodeStream& str) { // ciTypeFlow::clone_loop_heads // // Clone the loop heads -bool ciTypeFlow::clone_loop_heads(Loop* lp, StateVector* temp_vector, JsrSet* temp_set) { +bool ciTypeFlow::clone_loop_heads(StateVector* temp_vector, JsrSet* temp_set) { bool rslt = false; for (PreorderLoops iter(loop_tree_root()); !iter.done(); iter.next()) { - lp = iter.current(); + Loop* lp = iter.current(); Block* head = lp->head(); if (lp == loop_tree_root() || lp->is_irreducible() || @@ -2450,6 +2450,103 @@ void ciTypeFlow::PreorderLoops::next() { } } +// If the tail is a branch to the head, retrieve how many times that path was taken from profiling +int ciTypeFlow::profiled_count(ciTypeFlow::Loop* loop) { + ciMethodData* methodData = method()->method_data(); + if (!methodData->is_mature()) { + return 0; + } + ciTypeFlow::Block* tail = loop->tail(); + if (tail->control() == -1) { + return 0; + } + + ciProfileData* data = methodData->bci_to_data(tail->control()); + assert(data != NULL, "some profile data expected at branch"); + + if (!data->is_JumpData()) { + return 0; + } + + ciBytecodeStream iter(method()); + iter.reset_to_bci(tail->control()); + + bool is_an_if = false; + bool wide = false; + Bytecodes::Code bc = iter.next(); + switch (bc) { + case Bytecodes::_ifeq: + case Bytecodes::_ifne: + case Bytecodes::_iflt: + case Bytecodes::_ifge: + case Bytecodes::_ifgt: + case Bytecodes::_ifle: + case Bytecodes::_if_icmpeq: + case Bytecodes::_if_icmpne: + case Bytecodes::_if_icmplt: + case Bytecodes::_if_icmpge: + case Bytecodes::_if_icmpgt: + case Bytecodes::_if_icmple: + case Bytecodes::_if_acmpeq: + case Bytecodes::_if_acmpne: + case Bytecodes::_ifnull: + case Bytecodes::_ifnonnull: + is_an_if = true; + break; + case Bytecodes::_goto_w: + case Bytecodes::_jsr_w: + wide = true; + break; + case Bytecodes::_goto: + case Bytecodes::_jsr: + break; + default: + fatal(" invalid bytecode: %s", Bytecodes::name(iter.cur_bc())); + } + + GrowableArray* succs = tail->successors(); + + if (!is_an_if) { + assert(((wide ? iter.get_far_dest() : iter.get_dest()) == loop->head()->start()) == (succs->at(ciTypeFlow::GOTO_TARGET) == loop->head()), "branch should lead to loop head"); + if (succs->at(ciTypeFlow::GOTO_TARGET) == loop->head()) { + return method()->scale_count(data->as_JumpData()->taken()); + } + } else { + assert((iter.get_dest() == loop->head()->start()) == (succs->at(ciTypeFlow::IF_TAKEN) == loop->head()), "bytecode and CFG not consistent"); + assert((tail->limit() == loop->head()->start()) == (succs->at(ciTypeFlow::IF_NOT_TAKEN) == loop->head()), "bytecode and CFG not consistent"); + if (succs->at(ciTypeFlow::IF_TAKEN) == loop->head()) { + return method()->scale_count(data->as_JumpData()->taken()); + } else if (succs->at(ciTypeFlow::IF_NOT_TAKEN) == loop->head()) { + return method()->scale_count(data->as_BranchData()->not_taken()); + } + } + + return 0; +} + +bool ciTypeFlow::Loop::at_insertion_point(Loop* lp, Loop* current) { + int lp_pre_order = lp->head()->pre_order(); + if (current->head()->pre_order() < lp_pre_order) { + return true; + } else if (current->head()->pre_order() > lp_pre_order) { + return false; + } + // In the case of a shared head, make the most frequent head/tail (as reported by profiling) the inner loop + if (current->head() == lp->head()) { + int lp_count = outer()->profiled_count(lp); + int current_count = outer()->profiled_count(current); + if (current_count < lp_count) { + return true; + } else if (current_count > lp_count) { + return false; + } + } + if (current->tail()->pre_order() > lp->tail()->pre_order()) { + return true; + } + return false; +} + // ------------------------------------------------------------------ // ciTypeFlow::Loop::sorted_merge // @@ -2467,12 +2564,10 @@ ciTypeFlow::Loop* ciTypeFlow::Loop::sorted_merge(Loop* lp) { int lp_pre_order = lp->head()->pre_order(); // Find insertion point for "lp" while (current != NULL) { - if (current == lp) + if (current == lp) { return leaf; // Already in list - if (current->head()->pre_order() < lp_pre_order) - break; - if (current->head()->pre_order() == lp_pre_order && - current->tail()->pre_order() > lp->tail()->pre_order()) { + } + if (at_insertion_point(lp, current)) { break; } prev = current; @@ -2732,7 +2827,7 @@ void ciTypeFlow::flow_types() { env()->comp_level() >= CompLevel_full_optimization) { // Loop optimizations are not performed on Tier1 compiles. - bool changed = clone_loop_heads(loop_tree_root(), temp_vector, temp_set); + bool changed = clone_loop_heads(temp_vector, temp_set); // If some loop heads were cloned, recompute postorder and loop tree if (changed) { diff --git a/src/hotspot/share/ci/ciTypeFlow.hpp b/src/hotspot/share/ci/ciTypeFlow.hpp index 907897fe310000835410711617a2355756fdc109..b733a694f380073a8c5549fc9a4bc855bc383984 100644 --- a/src/hotspot/share/ci/ciTypeFlow.hpp +++ b/src/hotspot/share/ci/ciTypeFlow.hpp @@ -717,6 +717,9 @@ public: bool _irreducible; LocalSet _def_locals; + ciTypeFlow* outer() const { return head()->outer(); } + bool at_insertion_point(Loop* lp, Loop* current); + public: Loop(Block* head, Block* tail) : _parent(NULL), _sibling(NULL), _child(NULL), @@ -795,7 +798,7 @@ private: bool can_trap(ciBytecodeStream& str); // Clone the loop heads. Returns true if any cloning occurred. - bool clone_loop_heads(Loop* lp, StateVector* temp_vector, JsrSet* temp_set); + bool clone_loop_heads(StateVector* temp_vector, JsrSet* temp_set); // Clone lp's head and replace tail's successors with clone. Block* clone_loop_head(Loop* lp, StateVector* temp_vector, JsrSet* temp_set); @@ -913,6 +916,8 @@ private: // Create the block map, which indexes blocks in pre_order. void map_blocks(); + int profiled_count(ciTypeFlow::Loop* loop); + public: // Perform type inference flow analysis. void do_flow(); diff --git a/src/hotspot/share/classfile/altHashing.hpp b/src/hotspot/share/classfile/altHashing.hpp index f2fc52410d16332d1b8530d029ea56a074fb4ded..555720c0666d9152e5e31b4707cb6cf35ad53c69 100644 --- a/src/hotspot/share/classfile/altHashing.hpp +++ b/src/hotspot/share/classfile/altHashing.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,8 @@ #define SHARE_CLASSFILE_ALTHASHING_HPP #include "jni.h" -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" +#include "utilities/globalDefinitions.hpp" /** * Implementation of alternate more secure hashing. diff --git a/src/hotspot/share/classfile/classFileParser.cpp b/src/hotspot/share/classfile/classFileParser.cpp index e9c813ce4fb4870006ceb273c67265df99085217..2325241dc64f7213d23b2ea3d0700a54da7a6102 100644 --- a/src/hotspot/share/classfile/classFileParser.cpp +++ b/src/hotspot/share/classfile/classFileParser.cpp @@ -3053,6 +3053,7 @@ static int inner_classes_jump_to_outer(const Array* inner_classes, int inner static bool inner_classes_check_loop_through_outer(const Array* inner_classes, int idx, const ConstantPool* cp, int length) { int slow = inner_classes->at(idx + InstanceKlass::inner_class_inner_class_info_offset); int fast = inner_classes->at(idx + InstanceKlass::inner_class_outer_class_info_offset); + while (fast != -1 && fast != 0) { if (slow != 0 && (cp->klass_name_at(slow) == cp->klass_name_at(fast))) { return true; // found a circularity @@ -3082,14 +3083,15 @@ bool ClassFileParser::check_inner_classes_circularity(const ConstantPool* cp, in for (int y = idx + InstanceKlass::inner_class_next_offset; y < length; y += InstanceKlass::inner_class_next_offset) { - // To maintain compatibility, throw an exception if duplicate inner classes - // entries are found. - guarantee_property((_inner_classes->at(idx) != _inner_classes->at(y) || - _inner_classes->at(idx+1) != _inner_classes->at(y+1) || - _inner_classes->at(idx+2) != _inner_classes->at(y+2) || - _inner_classes->at(idx+3) != _inner_classes->at(y+3)), - "Duplicate entry in InnerClasses attribute in class file %s", - CHECK_(true)); + // 4347400: make sure there's no duplicate entry in the classes array + if (_major_version >= JAVA_1_5_VERSION) { + guarantee_property((_inner_classes->at(idx) != _inner_classes->at(y) || + _inner_classes->at(idx+1) != _inner_classes->at(y+1) || + _inner_classes->at(idx+2) != _inner_classes->at(y+2) || + _inner_classes->at(idx+3) != _inner_classes->at(y+3)), + "Duplicate entry in InnerClasses attribute in class file %s", + CHECK_(true)); + } // Return true if there are two entries with the same inner_class_info_index. if (_inner_classes->at(y) == _inner_classes->at(idx)) { return true; @@ -3182,10 +3184,9 @@ u2 ClassFileParser::parse_classfile_inner_classes_attribute(const ClassFileStrea inner_classes->at_put(index++, inner_access_flags.as_short()); } - // 4347400: make sure there's no duplicate entry in the classes array - // Also, check for circular entries. + // Check for circular and duplicate entries. bool has_circularity = false; - if (_need_verify && _major_version >= JAVA_1_5_VERSION) { + if (_need_verify) { has_circularity = check_inner_classes_circularity(cp, length * 4, CHECK_0); if (has_circularity) { // If circularity check failed then ignore InnerClasses attribute. diff --git a/src/hotspot/share/classfile/classLoader.cpp b/src/hotspot/share/classfile/classLoader.cpp index d5ac1c308fdc4a50b5303f64665d3a16c4f1852e..7fb8f71cbc8d6290bc5d32f5264a31f7a7295b59 100644 --- a/src/hotspot/share/classfile/classLoader.cpp +++ b/src/hotspot/share/classfile/classLoader.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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 @@ -253,9 +253,9 @@ ClassFileStream* ClassPathDirEntry::open_stream(JavaThread* current, const char* if (file_handle != -1) { // read contents into resource array u1* buffer = NEW_RESOURCE_ARRAY(u1, st.st_size); - size_t num_read = os::read(file_handle, (char*) buffer, st.st_size); + size_t num_read = ::read(file_handle, (char*) buffer, st.st_size); // close file - os::close(file_handle); + ::close(file_handle); // construct ClassFileStream if (num_read == (size_t)st.st_size) { if (UsePerfData) { @@ -303,13 +303,19 @@ u1* ClassPathZipEntry::open_entry(JavaThread* current, const char* name, jint* f } // read contents into resource array - int size = (*filesize) + ((nul_terminate) ? 1 : 0); + size_t size = (uint32_t)(*filesize); + if (nul_terminate) { + if (sizeof(size) == sizeof(uint32_t) && size == UINT_MAX) { + return NULL; // 32-bit integer overflow will occur. + } + size++; + } buffer = NEW_RESOURCE_ARRAY(u1, size); if (!(*ReadEntry)(_zip, entry, buffer, filename)) return NULL; // return result if (nul_terminate) { - buffer[*filesize] = 0; + buffer[size - 1] = 0; } return buffer; } diff --git a/src/hotspot/share/classfile/classLoaderData.cpp b/src/hotspot/share/classfile/classLoaderData.cpp index 252daee19695f2b29af8eed6aea57d5a2b2ea058..e3a3ada3e8a9e1d1cc2a57926e0651c892670f75 100644 --- a/src/hotspot/share/classfile/classLoaderData.cpp +++ b/src/hotspot/share/classfile/classLoaderData.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2022, 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,6 +67,7 @@ #include "memory/universe.hpp" #include "oops/access.inline.hpp" #include "oops/klass.inline.hpp" +#include "oops/objArrayKlass.hpp" #include "oops/oop.inline.hpp" #include "oops/oopHandle.inline.hpp" #include "oops/weakHandle.inline.hpp" @@ -358,15 +359,28 @@ void ClassLoaderData::loaded_classes_do(KlassClosure* klass_closure) { // Lock-free access requires load_acquire for (Klass* k = Atomic::load_acquire(&_klasses); k != NULL; k = k->next_link()) { - // Do not filter ArrayKlass oops here... - if (k->is_array_klass() || (k->is_instance_klass() && InstanceKlass::cast(k)->is_loaded())) { + // Filter out InstanceKlasses (or their ObjArrayKlasses) that have not entered the + // loaded state. + if (k->is_instance_klass()) { + if (!InstanceKlass::cast(k)->is_loaded()) { + continue; + } + } else if (k->is_shared() && k->is_objArray_klass()) { + Klass* bottom = ObjArrayKlass::cast(k)->bottom_klass(); + if (bottom->is_instance_klass() && !InstanceKlass::cast(bottom)->is_loaded()) { + // This could happen if is a shared class that has been restored + // but is not yet marked as loaded. All archived array classes of the + // bottom class are already restored and placed in the _klasses list. + continue; + } + } + #ifdef ASSERT - oop m = k->java_mirror(); - assert(m != NULL, "NULL mirror"); - assert(m->is_a(vmClasses::Class_klass()), "invalid mirror"); + oop m = k->java_mirror(); + assert(m != NULL, "NULL mirror"); + assert(m->is_a(vmClasses::Class_klass()), "invalid mirror"); #endif - klass_closure->do_klass(k); - } + klass_closure->do_klass(k); } } diff --git a/src/hotspot/share/classfile/compactHashtable.cpp b/src/hotspot/share/classfile/compactHashtable.cpp index dc21ee4e7f3913ed4375d59894c69b8483a7570d..4538af56e4b9ebaa6a5cf24bfa492502f650fd88 100644 --- a/src/hotspot/share/classfile/compactHashtable.cpp +++ b/src/hotspot/share/classfile/compactHashtable.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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 @@ -252,7 +252,7 @@ HashtableTextDump::HashtableTextDump(const char* filename) : _fd(-1) { HashtableTextDump::~HashtableTextDump() { os::unmap_memory((char*)_base, _size); if (_fd >= 0) { - close(_fd); + ::close(_fd); } } diff --git a/src/hotspot/share/classfile/klassFactory.hpp b/src/hotspot/share/classfile/klassFactory.hpp index 2b2ee36dfa35bc3df6786dacccd279ed56e4bd82..b1584b3e2caec64e670927f1e524231834da9a97 100644 --- a/src/hotspot/share/classfile/klassFactory.hpp +++ b/src/hotspot/share/classfile/klassFactory.hpp @@ -1,5 +1,5 @@ /* -* Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved. +* Copyright (c) 2015, 2022, 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,7 +25,7 @@ #ifndef SHARE_CLASSFILE_KLASSFACTORY_HPP #define SHARE_CLASSFILE_KLASSFACTORY_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "runtime/handles.hpp" class ClassFileStream; diff --git a/src/hotspot/share/classfile/modules.hpp b/src/hotspot/share/classfile/modules.hpp index 31cab8209fa28a75e1a7d8fac106e2576abe617c..5c52a323b0cfdfd933df02aa6d20c712d3df88a7 100644 --- a/src/hotspot/share/classfile/modules.hpp +++ b/src/hotspot/share/classfile/modules.hpp @@ -1,5 +1,5 @@ /* -* Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved. +* Copyright (c) 2016, 2022, 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,7 +25,7 @@ #ifndef SHARE_CLASSFILE_MODULES_HPP #define SHARE_CLASSFILE_MODULES_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "runtime/handles.hpp" class ModuleEntryTable; diff --git a/src/hotspot/share/code/dependencies.cpp b/src/hotspot/share/code/dependencies.cpp index 8ca9c59fc8270105691f7772366c612adabf57a5..e150b300b7b6519db253c43994ace80ae8d8d90a 100644 --- a/src/hotspot/share/code/dependencies.cpp +++ b/src/hotspot/share/code/dependencies.cpp @@ -116,6 +116,12 @@ void Dependencies::assert_unique_concrete_method(ciKlass* ctxk, ciMethod* uniqm, } } +void Dependencies::assert_unique_implementor(ciInstanceKlass* ctxk, ciInstanceKlass* uniqk) { + check_ctxk(ctxk); + check_unique_implementor(ctxk, uniqk); + assert_common_2(unique_implementor, ctxk, uniqk); +} + void Dependencies::assert_has_no_finalizable_subclasses(ciKlass* ctxk) { check_ctxk(ctxk); assert_common_1(no_finalizable_subclasses, ctxk); @@ -173,6 +179,13 @@ void Dependencies::assert_abstract_with_unique_concrete_subtype(Klass* ctxk, Kla assert_common_2(abstract_with_unique_concrete_subtype, ctxk_dv, conck_dv); } +void Dependencies::assert_unique_implementor(InstanceKlass* ctxk, InstanceKlass* uniqk) { + check_ctxk(ctxk); + assert(ctxk->is_interface(), "not an interface"); + assert(ctxk->implementor() == uniqk, "not a unique implementor"); + assert_common_2(unique_implementor, DepValue(_oop_recorder, ctxk), DepValue(_oop_recorder, uniqk)); +} + void Dependencies::assert_unique_concrete_method(Klass* ctxk, Method* uniqm) { check_ctxk(ctxk); check_unique_method(ctxk, uniqm); @@ -580,6 +593,7 @@ const char* Dependencies::_dep_name[TYPE_LIMIT] = { "abstract_with_unique_concrete_subtype", "unique_concrete_method_2", "unique_concrete_method_4", + "unique_implementor", "no_finalizable_subclasses", "call_site_target_value" }; @@ -591,6 +605,7 @@ int Dependencies::_dep_args[TYPE_LIMIT] = { 2, // abstract_with_unique_concrete_subtype ctxk, k 2, // unique_concrete_method_2 ctxk, m 4, // unique_concrete_method_4 ctxk, m, resolved_klass, resolved_method + 2, // unique_implementor ctxk, implementor 1, // no_finalizable_subclasses ctxk 2 // call_site_target_value call_site, method_handle }; @@ -1813,6 +1828,16 @@ Klass* Dependencies::check_unique_concrete_method(InstanceKlass* ctxk, return NULL; } +Klass* Dependencies::check_unique_implementor(InstanceKlass* ctxk, Klass* uniqk, NewKlassDepChange* changes) { + assert(ctxk->is_interface(), "sanity"); + assert(ctxk->nof_implementors() > 0, "no implementors"); + if (ctxk->nof_implementors() == 1) { + assert(ctxk->implementor() == uniqk, "sanity"); + return NULL; + } + return ctxk; // no unique implementor +} + // Search for AME. // There are two version of checks. // 1) Spot checking version(Classload time). Newly added class is checked for AME. @@ -2062,6 +2087,9 @@ Klass* Dependencies::DepStream::check_new_klass_dependency(NewKlassDepChange* ch case unique_concrete_method_4: witness = check_unique_concrete_method(context_type(), method_argument(1), type_argument(2), method_argument(3), changes); break; + case unique_implementor: + witness = check_unique_implementor(context_type(), type_argument(1), changes); + break; case no_finalizable_subclasses: witness = check_has_no_finalizable_subclasses(context_type(), changes); break; diff --git a/src/hotspot/share/code/dependencies.hpp b/src/hotspot/share/code/dependencies.hpp index 104fc9ee6496bb290485ce6b3c633fdf8f8d2fa5..0d8fa9fa48c71a5743e6543b295836df1305a76d 100644 --- a/src/hotspot/share/code/dependencies.hpp +++ b/src/hotspot/share/code/dependencies.hpp @@ -143,6 +143,9 @@ class Dependencies: public ResourceObj { // of the analysis. unique_concrete_method_4, // one unique concrete method under CX + // This dependency asserts that interface CX has a unique implementor class. + unique_implementor, // one unique implementor under CX + // This dependency asserts that no instances of class or it's // subclasses require finalization registration. no_finalizable_subclasses, @@ -329,7 +332,10 @@ class Dependencies: public ResourceObj { assert(!is_concrete_klass(ctxk->as_instance_klass()), "must be abstract"); } static void check_unique_method(ciKlass* ctxk, ciMethod* m) { - assert(!m->can_be_statically_bound(ctxk->as_instance_klass()), "redundant"); + assert(!m->can_be_statically_bound(ctxk->as_instance_klass()) || ctxk->is_interface(), "redundant"); + } + static void check_unique_implementor(ciInstanceKlass* ctxk, ciInstanceKlass* uniqk) { + assert(ctxk->implementor() == uniqk, "not a unique implementor"); } void assert_common_1(DepType dept, ciBaseObject* x); @@ -343,9 +349,9 @@ class Dependencies: public ResourceObj { void assert_abstract_with_unique_concrete_subtype(ciKlass* ctxk, ciKlass* conck); void assert_unique_concrete_method(ciKlass* ctxk, ciMethod* uniqm); void assert_unique_concrete_method(ciKlass* ctxk, ciMethod* uniqm, ciKlass* resolved_klass, ciMethod* resolved_method); + void assert_unique_implementor(ciInstanceKlass* ctxk, ciInstanceKlass* uniqk); void assert_has_no_finalizable_subclasses(ciKlass* ctxk); void assert_call_site_target_value(ciCallSite* call_site, ciMethodHandle* method_handle); - #if INCLUDE_JVMCI private: static void check_ctxk(Klass* ctxk) { @@ -366,6 +372,7 @@ class Dependencies: public ResourceObj { void assert_evol_method(Method* m); void assert_has_no_finalizable_subclasses(Klass* ctxk); void assert_leaf_type(Klass* ctxk); + void assert_unique_implementor(InstanceKlass* ctxk, InstanceKlass* uniqk); void assert_unique_concrete_method(Klass* ctxk, Method* uniqm); void assert_abstract_with_unique_concrete_subtype(Klass* ctxk, Klass* conck); void assert_call_site_target_value(oop callSite, oop methodHandle); @@ -413,6 +420,7 @@ class Dependencies: public ResourceObj { static Klass* check_evol_method(Method* m); static Klass* check_leaf_type(InstanceKlass* ctxk); static Klass* check_abstract_with_unique_concrete_subtype(InstanceKlass* ctxk, Klass* conck, NewKlassDepChange* changes = NULL); + static Klass* check_unique_implementor(InstanceKlass* ctxk, Klass* uniqk, NewKlassDepChange* changes = NULL); static Klass* check_unique_concrete_method(InstanceKlass* ctxk, Method* uniqm, NewKlassDepChange* changes = NULL); static Klass* check_unique_concrete_method(InstanceKlass* ctxk, Method* uniqm, Klass* resolved_klass, Method* resolved_method, KlassDepChange* changes = NULL); static Klass* check_has_no_finalizable_subclasses(InstanceKlass* ctxk, NewKlassDepChange* changes = NULL); diff --git a/src/hotspot/share/code/vtableStubs.hpp b/src/hotspot/share/code/vtableStubs.hpp index 8fc2bdae94c2042149299637581baaaceaa29d6d..9498ad7d329e6ec3442a6eb9db42f38d373d232a 100644 --- a/src/hotspot/share/code/vtableStubs.hpp +++ b/src/hotspot/share/code/vtableStubs.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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,7 +27,7 @@ #include "asm/macroAssembler.hpp" #include "code/vmreg.hpp" -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" // A VtableStub holds an individual code stub for a pair (vtable index, #args) for either itables or vtables // There's a one-to-one relationship between a VtableStub and such a pair. diff --git a/src/hotspot/share/compiler/compileBroker.cpp b/src/hotspot/share/compiler/compileBroker.cpp index eab2751c3b03e910682f369d0bb431c0d8fb456e..1e2b5e395baa4260ac2e4584b2132f7dba000013 100644 --- a/src/hotspot/share/compiler/compileBroker.cpp +++ b/src/hotspot/share/compiler/compileBroker.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2022, 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 @@ -1970,6 +1970,8 @@ void CompileBroker::compiler_thread_loop() { method->clear_queued_for_compilation(); task->set_failure_reason("compilation is disabled"); } + } else { + task->set_failure_reason("breakpoints are present"); } if (UseDynamicNumberOfCompilerThreads) { @@ -2003,7 +2005,7 @@ void CompileBroker::init_compiler_thread_log() { os::file_separator(), thread_id, os::current_process_id()); } - fp = fopen(file_name, "wt"); + fp = os::fopen(file_name, "wt"); if (fp != NULL) { if (LogCompilation && Verbose) { tty->print_cr("Opening compilation log %s", file_name); diff --git a/src/hotspot/share/compiler/compileLog.cpp b/src/hotspot/share/compiler/compileLog.cpp index eb52c5f5fb1acd1decd55f1c27768575e4c06295..3dbc71f6075d6ac29a6d8495d050311efef554b0 100644 --- a/src/hotspot/share/compiler/compileLog.cpp +++ b/src/hotspot/share/compiler/compileLog.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2022, 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 @@ -225,7 +225,7 @@ void CompileLog::finish_log_on_error(outputStream* file, char* buf, int buflen) if (to_read < (julong)buflen) nr = (size_t)to_read; else nr = buflen; - bytes_read = read(partial_fd, buf, (int)nr); + bytes_read = ::read(partial_fd, buf, (int)nr); if (bytes_read <= 0) break; nr = bytes_read; to_read -= (julong)nr; @@ -235,7 +235,7 @@ void CompileLog::finish_log_on_error(outputStream* file, char* buf, int buflen) // Copy any remaining data inside a quote: bool saw_slop = false; int end_cdata = 0; // state machine [0..2] watching for too many "]]" - while ((bytes_read = read(partial_fd, buf, buflen-1)) > 0) { + while ((bytes_read = ::read(partial_fd, buf, buflen-1)) > 0) { nr = bytes_read; buf[buflen-1] = '\0'; if (!saw_slop) { @@ -285,7 +285,7 @@ void CompileLog::finish_log_on_error(outputStream* file, char* buf, int buflen) file->print_raw_cr(""); } file->print_raw_cr(""); - close(partial_fd); + ::close(partial_fd); } CompileLog* next_log = log->_next; delete log; // Removes partial file diff --git a/src/hotspot/share/compiler/compilerDefinitions.hpp b/src/hotspot/share/compiler/compilerDefinitions.hpp index 1c8096918a6a49a9233c55f62800583f56231d91..153dfaad3645cdeea4b5674312f20fb6b8d55dfa 100644 --- a/src/hotspot/share/compiler/compilerDefinitions.hpp +++ b/src/hotspot/share/compiler/compilerDefinitions.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2022, 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,7 +27,7 @@ #include "compiler/compiler_globals.hpp" #include "jvmci/jvmci_globals.hpp" -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "runtime/globals.hpp" // The (closed set) of concrete compiler classes. diff --git a/src/hotspot/share/compiler/compilerDirectives.hpp b/src/hotspot/share/compiler/compilerDirectives.hpp index d51aa28e28cc6026578aada9d7ec23b3b44f6fb8..7daa034a8d0262b97f9c4952b407329a387bf970 100644 --- a/src/hotspot/share/compiler/compilerDirectives.hpp +++ b/src/hotspot/share/compiler/compilerDirectives.hpp @@ -67,6 +67,7 @@ NOT_PRODUCT(cflags(TraceOptoPipelining, bool, TraceOptoPipelining, TraceOptoPipelining)) \ NOT_PRODUCT(cflags(TraceOptoOutput, bool, TraceOptoOutput, TraceOptoOutput)) \ NOT_PRODUCT(cflags(PrintIdeal, bool, PrintIdeal, PrintIdeal)) \ +NOT_PRODUCT(cflags(PrintIdealLevel, uintx, PrintIdealLevel, PrintIdealLevel)) \ cflags(TraceSpilling, bool, TraceSpilling, TraceSpilling) \ cflags(Vectorize, bool, false, Vectorize) \ cflags(CloneMapDebug, bool, false, CloneMapDebug) \ diff --git a/src/hotspot/share/compiler/compilerEvent.hpp b/src/hotspot/share/compiler/compilerEvent.hpp index 65fc296b66b3dab9e5f1dacfa1aed1c8ff2f54de..cf04ce9a4364b8f3fb2904ffe0a867f024197644 100644 --- a/src/hotspot/share/compiler/compilerEvent.hpp +++ b/src/hotspot/share/compiler/compilerEvent.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ #include "jni.h" #include "compiler/compilerDefinitions.hpp" -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "utilities/macros.hpp" #include "utilities/ticks.hpp" diff --git a/src/hotspot/share/compiler/compilerOracle.cpp b/src/hotspot/share/compiler/compilerOracle.cpp index 8464d22ef42d11a111d136941bc01e5492434334..7d58a28d27235bc63df84f73dc92a5a3aae3ef14 100644 --- a/src/hotspot/share/compiler/compilerOracle.cpp +++ b/src/hotspot/share/compiler/compilerOracle.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2022, 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 @@ -932,7 +932,7 @@ bool CompilerOracle::_quiet = false; void CompilerOracle::parse_from_file() { assert(has_command_file(), "command file must be specified"); - FILE* stream = fopen(cc_file(), "rt"); + FILE* stream = os::fopen(cc_file(), "rt"); if (stream == NULL) return; char token[1024]; diff --git a/src/hotspot/share/compiler/compilerOracle.hpp b/src/hotspot/share/compiler/compilerOracle.hpp index 858e5c794060ffbe96c84bc02339ee757881f491..f2fc0e8251dfd61cbb463907b57b24a234a1169c 100644 --- a/src/hotspot/share/compiler/compilerOracle.hpp +++ b/src/hotspot/share/compiler/compilerOracle.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2022, 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,7 +25,7 @@ #ifndef SHARE_COMPILER_COMPILERORACLE_HPP #define SHARE_COMPILER_COMPILERORACLE_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "oops/oopsHierarchy.hpp" class methodHandle; @@ -79,7 +79,8 @@ class methodHandle; option(TraceOptoPipelining, "TraceOptoPipelining", Bool) \ option(TraceOptoOutput, "TraceOptoOutput", Bool) \ option(TraceSpilling, "TraceSpilling", Bool) \ - option(PrintIdeal, "PrintIdeal", Bool) \ + option(PrintIdeal, "PrintIdeal", Bool) \ + option(PrintIdealLevel, "PrintIdealLevel", Uintx) \ option(IGVPrintLevel, "IGVPrintLevel", Intx) \ option(Vectorize, "Vectorize", Bool) \ option(VectorizeDebug, "VectorizeDebug", Uintx) \ diff --git a/src/hotspot/share/compiler/directivesParser.cpp b/src/hotspot/share/compiler/directivesParser.cpp index e88dda3768b810914b417ed4e8d0c3bb4634ef91..b4ce9a3877c88db97224f305437846a8746d9f9c 100644 --- a/src/hotspot/share/compiler/directivesParser.cpp +++ b/src/hotspot/share/compiler/directivesParser.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2022, 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 @@ -94,11 +94,11 @@ bool DirectivesParser::parse_from_file_inner(const char* filename, outputStream* if (file_handle != -1) { // read contents into resource array char* buffer = NEW_RESOURCE_ARRAY(char, st.st_size+1); - ssize_t num_read = os::read(file_handle, (char*) buffer, st.st_size); + ssize_t num_read = ::read(file_handle, (char*) buffer, st.st_size); if (num_read >= 0) { buffer[num_read] = '\0'; // close file - os::close(file_handle); + ::close(file_handle); return parse_string(buffer, stream) > 0; } } diff --git a/src/hotspot/share/compiler/disassembler.cpp b/src/hotspot/share/compiler/disassembler.cpp index 54cea9cc2811d56e1e1011c6768513b710764528..1beb75441cd429e14d1914fb35eba85bc6240dcc 100644 --- a/src/hotspot/share/compiler/disassembler.cpp +++ b/src/hotspot/share/compiler/disassembler.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2022, 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 @@ -267,7 +267,7 @@ void decode_env::print_hook_comments(address pc, bool newline) { _cached_src_lines = new (ResourceObj::C_HEAP, mtCode)GrowableArray(0, mtCode); } - if ((fp = fopen(file, "r")) == NULL) { + if ((fp = os::fopen(file, "r")) == NULL) { _cached_src = NULL; return; } diff --git a/src/hotspot/share/gc/g1/g1Allocator.cpp b/src/hotspot/share/gc/g1/g1Allocator.cpp index 7a6cb0a499dcb0807981d4ec7a3c43b070a92336..f83ae9b52d30d919745911eae7cebef620597539 100644 --- a/src/hotspot/share/gc/g1/g1Allocator.cpp +++ b/src/hotspot/share/gc/g1/g1Allocator.cpp @@ -301,10 +301,7 @@ G1PLABAllocator::G1PLABAllocator(G1Allocator* allocator) : _alloc_buffers[state] = NEW_C_HEAP_ARRAY(PLAB*, length, mtGC); size_t word_sz = _g1h->desired_plab_sz(state); for (uint node_index = 0; node_index < length; node_index++) { - // Specialized PLABs for old that handle BOT updates for object allocations. - _alloc_buffers[state][node_index] = (state == G1HeapRegionAttr::Old) - ? new G1BotUpdatingPLAB(word_sz) - : new PLAB(word_sz); + _alloc_buffers[state][node_index] = new PLAB(word_sz); } } } @@ -364,7 +361,6 @@ HeapWord* G1PLABAllocator::allocate_direct_or_new_plab(G1HeapRegionAttr dest, // Try direct allocation. HeapWord* result = _allocator->par_allocate_during_gc(dest, word_sz, node_index); if (result != NULL) { - update_bot_for_direct_allocation(dest, result, word_sz); _direct_allocated[dest.type()] += word_sz; } return result; diff --git a/src/hotspot/share/gc/g1/g1Allocator.hpp b/src/hotspot/share/gc/g1/g1Allocator.hpp index 8eea1e0f12b43ef2ba3c6ad82d70086134cefcc0..5014442845ab91469cf966e1a450b296660d3200 100644 --- a/src/hotspot/share/gc/g1/g1Allocator.hpp +++ b/src/hotspot/share/gc/g1/g1Allocator.hpp @@ -145,22 +145,6 @@ public: uint node_index); }; -// Specialized PLAB for old generation promotions. For old regions the -// BOT needs to be updated and the relevant data to do this efficiently -// is stored in the PLAB. -class G1BotUpdatingPLAB : public PLAB { - // An object spanning this threshold will cause a BOT update. - HeapWord* _next_bot_threshold; - // The region in which the PLAB resides. - HeapRegion* _region; -public: - G1BotUpdatingPLAB(size_t word_sz) : PLAB(word_sz) { } - // Sets the new PLAB buffer as well as updates the threshold and region. - void set_buf(HeapWord* buf, size_t word_sz) override; - // Updates the BOT if the last allocation crossed the threshold. - inline void update_bot(size_t word_sz); -}; - // Manages the PLABs used during garbage collection. Interface for allocation from PLABs. // Needs to handle multiple contexts, extra alignment in any "survivor" area and some // statistics. @@ -181,18 +165,11 @@ private: inline PLAB* alloc_buffer(G1HeapRegionAttr dest, uint node_index) const; inline PLAB* alloc_buffer(region_type_t dest, uint node_index) const; - // Helpers to do explicit BOT updates for allocations in old generation regions. - void update_bot_for_direct_allocation(G1HeapRegionAttr attr, HeapWord* addr, size_t size); - // Returns the number of allocation buffers for the given dest. // There is only 1 buffer for Old while Young may have multiple buffers depending on // active NUMA nodes. inline uint alloc_buffers_length(region_type_t dest) const; - // Returns if BOT updates are needed for the given destinaion. Currently we only have - // two destinations and BOT updates are only needed for the old generation. - inline bool needs_bot_update(G1HeapRegionAttr dest) const; - bool may_throw_away_buffer(size_t const allocation_word_sz, size_t const buffer_size) const; public: G1PLABAllocator(G1Allocator* allocator); @@ -221,9 +198,6 @@ public: bool* refill_failed, uint node_index); - // Update the BOT for the last PLAB allocation. - inline void update_bot_for_plab_allocation(G1HeapRegionAttr dest, size_t word_sz, uint node_index); - void undo_allocation(G1HeapRegionAttr dest, HeapWord* obj, size_t word_sz, uint node_index); }; diff --git a/src/hotspot/share/gc/g1/g1Allocator.inline.hpp b/src/hotspot/share/gc/g1/g1Allocator.inline.hpp index 82223a75ad454522d090186f03f1d1ffbfae8302..42d6a547257511d2d6a9eb4c669f254f5c84a52b 100644 --- a/src/hotspot/share/gc/g1/g1Allocator.inline.hpp +++ b/src/hotspot/share/gc/g1/g1Allocator.inline.hpp @@ -133,49 +133,4 @@ inline HeapWord* G1PLABAllocator::allocate(G1HeapRegionAttr dest, return allocate_direct_or_new_plab(dest, word_sz, refill_failed, node_index); } -inline bool G1PLABAllocator::needs_bot_update(G1HeapRegionAttr dest) const { - return dest.is_old(); -} - -inline void G1PLABAllocator::update_bot_for_direct_allocation(G1HeapRegionAttr attr, HeapWord* addr, size_t size) { - if (!needs_bot_update(attr)) { - return; - } - - // Out of PLAB allocations in an old generation region. Update BOT. - HeapRegion* region = _g1h->heap_region_containing(addr); - region->update_bot_at(addr, size); -} - -inline void G1PLABAllocator::update_bot_for_plab_allocation(G1HeapRegionAttr dest, size_t word_sz, uint node_index) { - assert(needs_bot_update(dest), "Wrong destination: %s", dest.get_type_str()); - G1BotUpdatingPLAB* plab = static_cast(alloc_buffer(dest, node_index)); - plab->update_bot(word_sz); -} - -inline void G1BotUpdatingPLAB::set_buf(HeapWord* buf, size_t word_sz) { - PLAB::set_buf(buf, word_sz); - // Update the region and threshold to allow efficient BOT updates. - _region = G1CollectedHeap::heap()->heap_region_containing(buf); - _next_bot_threshold = _region->bot_threshold_for_addr(buf); -} - -inline void G1BotUpdatingPLAB::update_bot(size_t word_sz) { - // The last object end is at _top, if it did not cross the - // threshold, there is nothing to do. - if (_top <= _next_bot_threshold) { - return; - } - - HeapWord* obj_start = _top - word_sz; - assert(contains(obj_start), - "Object start outside PLAB. bottom: " PTR_FORMAT " object: " PTR_FORMAT, - p2i(_bottom), p2i(obj_start)); - assert(obj_start <= _next_bot_threshold, - "Object start not below or at threshold. threshold: " PTR_FORMAT " object: " PTR_FORMAT, - p2i(_next_bot_threshold), p2i(obj_start)); - - _region->update_bot_crossing_threshold(&_next_bot_threshold, obj_start, _top); -} - #endif // SHARE_GC_G1_G1ALLOCATOR_INLINE_HPP diff --git a/src/hotspot/share/gc/g1/g1BlockOffsetTable.hpp b/src/hotspot/share/gc/g1/g1BlockOffsetTable.hpp index 81317721330ff64779bead6e5d6e421ba32c11ff..505c528da9f4b44e7eff02e6cb0924fd94bd75f2 100644 --- a/src/hotspot/share/gc/g1/g1BlockOffsetTable.hpp +++ b/src/hotspot/share/gc/g1/g1BlockOffsetTable.hpp @@ -160,8 +160,7 @@ public: void verify() const; - // Given an address calculate where the next threshold needing an update is. - inline HeapWord* threshold_for_addr(const void* addr); + inline HeapWord* align_up_by_card_size(HeapWord* const addr) const; // Returns the address of the start of the block containing "addr", or // else "null" if it is covered by no block. (May have side effects, diff --git a/src/hotspot/share/gc/g1/g1BlockOffsetTable.inline.hpp b/src/hotspot/share/gc/g1/g1BlockOffsetTable.inline.hpp index 9652c600b8c48bde8818352d3e9aa68cd6a90a23..7ae313f2f70a244ca7574a2d881d39136ff85ced 100644 --- a/src/hotspot/share/gc/g1/g1BlockOffsetTable.inline.hpp +++ b/src/hotspot/share/gc/g1/g1BlockOffsetTable.inline.hpp @@ -31,18 +31,9 @@ #include "gc/shared/memset_with_concurrent_readers.hpp" #include "runtime/atomic.hpp" -inline HeapWord* G1BlockOffsetTablePart::threshold_for_addr(const void* addr) { +inline HeapWord* G1BlockOffsetTablePart::align_up_by_card_size(HeapWord* const addr) const { assert(addr >= _hr->bottom() && addr < _hr->top(), "invalid address"); - size_t index = _bot->index_for(addr); - HeapWord* card_boundary = _bot->address_for_index(index); - // Address at card boundary, use as threshold. - if (card_boundary == addr) { - return card_boundary; - } - - // Calculate next threshold. - HeapWord* threshold = card_boundary + BOTConstants::card_size_in_words(); - return threshold; + return align_up(addr, BOTConstants::card_size()); } inline HeapWord* G1BlockOffsetTablePart::block_start(const void* addr) { diff --git a/src/hotspot/share/gc/g1/g1CollectionSetChooser.hpp b/src/hotspot/share/gc/g1/g1CollectionSetChooser.hpp index 5692a0c407e273dfa07ab877b03e7a88c0f752cd..e8894323d651837505c767f5512ce8170886162d 100644 --- a/src/hotspot/share/gc/g1/g1CollectionSetChooser.hpp +++ b/src/hotspot/share/gc/g1/g1CollectionSetChooser.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2022, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ #define SHARE_GC_G1_G1COLLECTIONSETCHOOSER_HPP #include "gc/g1/heapRegion.hpp" -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "runtime/globals.hpp" class G1CollectionSetCandidates; diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp index ece2ac0452adedf33b7e7580b2ae737613302062..c2800aacfbc5405b79ccb47e36d267760b613584 100644 --- a/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp +++ b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp @@ -1646,9 +1646,10 @@ void G1ConcurrentMark::weak_refs_work() { if (has_overflown()) { // We can not trust g1_is_alive and the contents of the heap if the marking stack // overflowed while processing references. Exit the VM. - fatal("Overflow during reference processing, can not continue. Please " - "increase MarkStackSizeMax (current value: " SIZE_FORMAT ") and " - "restart.", MarkStackSizeMax); + fatal("Overflow during reference processing, can not continue. Current mark stack depth: " + SIZE_FORMAT ", MarkStackSize: " SIZE_FORMAT ", MarkStackSizeMax: " SIZE_FORMAT ". " + "Please increase MarkStackSize and/or MarkStackSizeMax and restart.", + _global_mark_stack.size(), MarkStackSize, MarkStackSizeMax); return; } @@ -2008,13 +2009,21 @@ void G1ConcurrentMark::print_stats() { } void G1ConcurrentMark::concurrent_cycle_abort() { - if (!cm_thread()->in_progress() || _has_aborted) { - // We haven't started a concurrent cycle or we have already aborted it. No need to do anything. + // We haven't started a concurrent cycle no need to do anything; we might have + // aborted the marking because of shutting down though. In this case the marking + // might have already completed the abort (leading to in_progress() below to + // return false), however this still left marking state particularly in the + // shared marking bitmap that must be cleaned up. + // If there are multiple full gcs during shutdown we do this work repeatedly for + // nothing, but this situation should be extremely rare (a full gc after shutdown + // has been signalled is alredy rare), and this work should be negligible compared + // to actual full gc work. + if (!cm_thread()->in_progress() && !_g1h->concurrent_mark_is_terminating()) { return; } - // Clear all marks in the next bitmap for the next marking cycle. This will allow us to skip the next - // concurrent bitmap clearing. + // Clear all marks in the next bitmap for this full gc as it has been used by the + // marking that is interrupted by this full gc. { GCTraceTime(Debug, gc) debug("Clear Next Bitmap"); clear_next_bitmap(_g1h->workers()); @@ -2028,9 +2037,8 @@ void G1ConcurrentMark::concurrent_cycle_abort() { for (uint i = 0; i < _max_num_tasks; ++i) { _tasks[i]->clear_region_fields(); } - _first_overflow_barrier_sync.abort(); - _second_overflow_barrier_sync.abort(); - _has_aborted = true; + + abort_marking_threads(); SATBMarkQueueSet& satb_mq_set = G1BarrierSet::satb_mark_queue_set(); satb_mq_set.abandon_partial_marking(); @@ -2041,6 +2049,13 @@ void G1ConcurrentMark::concurrent_cycle_abort() { satb_mq_set.is_active() /* expected_active */); } +void G1ConcurrentMark::abort_marking_threads() { + assert(!_root_regions.scan_in_progress(), "still doing root region scan"); + _has_aborted = true; + _first_overflow_barrier_sync.abort(); + _second_overflow_barrier_sync.abort(); +} + static void print_ms_time_info(const char* prefix, const char* name, NumberSeq& ns) { log_trace(gc, marking)("%s%5d %12s: total time = %8.2f s (avg = %8.2f ms).", diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMark.hpp b/src/hotspot/share/gc/g1/g1ConcurrentMark.hpp index 86ad5ddeeb92fc112007862b3373de96df934ece..d2e3ae624f2655d2c0c0aec7a716afaa5512978a 100644 --- a/src/hotspot/share/gc/g1/g1ConcurrentMark.hpp +++ b/src/hotspot/share/gc/g1/g1ConcurrentMark.hpp @@ -496,6 +496,11 @@ public: void concurrent_cycle_abort(); void concurrent_cycle_end(); + // Notifies marking threads to abort. This is a best-effort notification. Does not + // guarantee or update any state after the call. Root region scan must not be + // running. + void abort_marking_threads(); + void update_accum_task_vtime(int i, double vtime) { _accum_task_vtime[i] += vtime; } diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMarkThread.cpp b/src/hotspot/share/gc/g1/g1ConcurrentMarkThread.cpp index 1b2b883f71a6498bcf917ffbeb9bf586c9c40681..d7bdd8ea9a564eee148779de6793e622d4f796ea 100644 --- a/src/hotspot/share/gc/g1/g1ConcurrentMarkThread.cpp +++ b/src/hotspot/share/gc/g1/g1ConcurrentMarkThread.cpp @@ -139,6 +139,15 @@ void G1ConcurrentMarkThread::run_service() { } void G1ConcurrentMarkThread::stop_service() { + if (in_progress()) { + // We are not allowed to abort the marking threads during root region scan. + // Needs to be done separately. + _cm->root_regions()->abort(); + _cm->root_regions()->wait_until_scan_finished(); + + _cm->abort_marking_threads(); + } + MutexLocker ml(CGC_lock, Mutex::_no_safepoint_check_flag); CGC_lock->notify_all(); } diff --git a/src/hotspot/share/gc/g1/g1DirtyCardQueue.cpp b/src/hotspot/share/gc/g1/g1DirtyCardQueue.cpp index 9819328ee669dac107c82efc54d97b77b098bfd2..4ef40d29f16180477020bbf25da07e4789d886b1 100644 --- a/src/hotspot/share/gc/g1/g1DirtyCardQueue.cpp +++ b/src/hotspot/share/gc/g1/g1DirtyCardQueue.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2022, 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,7 +24,6 @@ #include "precompiled.hpp" #include "gc/g1/g1BarrierSet.inline.hpp" -#include "gc/g1/g1BufferNodeList.hpp" #include "gc/g1/g1CardTableEntryClosure.hpp" #include "gc/g1/g1CollectedHeap.inline.hpp" #include "gc/g1/g1ConcurrentRefineStats.hpp" @@ -35,6 +34,7 @@ #include "gc/g1/g1RemSet.hpp" #include "gc/g1/g1ThreadLocalData.hpp" #include "gc/g1/heapRegionRemSet.inline.hpp" +#include "gc/shared/bufferNodeList.hpp" #include "gc/shared/suspendibleThreadSet.hpp" #include "memory/iterator.hpp" #include "runtime/atomic.hpp" @@ -123,7 +123,13 @@ void G1DirtyCardQueueSet::enqueue_completed_buffer(BufferNode* cbn) { // Increment _num_cards before adding to queue, so queue removal doesn't // need to deal with _num_cards possibly going negative. size_t new_num_cards = Atomic::add(&_num_cards, buffer_size() - cbn->index()); - _completed.push(*cbn); + { + // Perform push in CS. The old tail may be popped while the push is + // observing it (attaching it to the new buffer). We need to ensure it + // can't be reused until the push completes, to avoid ABA problems. + GlobalCounter::CriticalSection cs(Thread::current()); + _completed.push(*cbn); + } if ((new_num_cards > process_cards_threshold()) && (_primary_refinement_thread != NULL)) { _primary_refinement_thread->activate(); @@ -307,7 +313,7 @@ void G1DirtyCardQueueSet::enqueue_all_paused_buffers() { } void G1DirtyCardQueueSet::abandon_completed_buffers() { - G1BufferNodeList list = take_all_completed_buffers(); + BufferNodeList list = take_all_completed_buffers(); BufferNode* buffers_to_delete = list._head; while (buffers_to_delete != NULL) { BufferNode* bn = buffers_to_delete; @@ -328,20 +334,20 @@ void G1DirtyCardQueueSet::notify_if_necessary() { // result. The queue sets must share the same allocator. void G1DirtyCardQueueSet::merge_bufferlists(G1RedirtyCardsQueueSet* src) { assert(allocator() == src->allocator(), "precondition"); - const G1BufferNodeList from = src->take_all_completed_buffers(); + const BufferNodeList from = src->take_all_completed_buffers(); if (from._head != NULL) { Atomic::add(&_num_cards, from._entry_count); _completed.append(*from._head, *from._tail); } } -G1BufferNodeList G1DirtyCardQueueSet::take_all_completed_buffers() { +BufferNodeList G1DirtyCardQueueSet::take_all_completed_buffers() { enqueue_all_paused_buffers(); verify_num_cards(); Pair pair = _completed.take_all(); size_t num_cards = Atomic::load(&_num_cards); Atomic::store(&_num_cards, size_t(0)); - return G1BufferNodeList(pair.first, pair.second, num_cards); + return BufferNodeList(pair.first, pair.second, num_cards); } class G1RefineBufferedCards : public StackObj { diff --git a/src/hotspot/share/gc/g1/g1DirtyCardQueue.hpp b/src/hotspot/share/gc/g1/g1DirtyCardQueue.hpp index 9e9ad0ee80cddb67a71c7818bb648108c0ebb9d3..051e29058ebd6af7cf00c473740888402c4d201d 100644 --- a/src/hotspot/share/gc/g1/g1DirtyCardQueue.hpp +++ b/src/hotspot/share/gc/g1/g1DirtyCardQueue.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2022, 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,10 +25,10 @@ #ifndef SHARE_GC_G1_G1DIRTYCARDQUEUE_HPP #define SHARE_GC_G1_G1DIRTYCARDQUEUE_HPP -#include "gc/g1/g1BufferNodeList.hpp" #include "gc/g1/g1FreeIdSet.hpp" #include "gc/g1/g1CardTable.hpp" #include "gc/g1/g1ConcurrentRefineStats.hpp" +#include "gc/shared/bufferNodeList.hpp" #include "gc/shared/ptrQueue.hpp" #include "memory/allocation.hpp" #include "memory/padded.hpp" @@ -69,7 +69,7 @@ public: class G1DirtyCardQueueSet: public PtrQueueSet { // Head and tail of a list of BufferNodes, linked through their next() - // fields. Similar to G1BufferNodeList, but without the _entry_count. + // fields. Similar to BufferNodeList, but without the _entry_count. struct HeadTail { BufferNode* _head; BufferNode* _tail; @@ -275,7 +275,7 @@ public: void merge_bufferlists(G1RedirtyCardsQueueSet* src); - G1BufferNodeList take_all_completed_buffers(); + BufferNodeList take_all_completed_buffers(); void flush_queue(G1DirtyCardQueue& queue); diff --git a/src/hotspot/share/gc/g1/g1EvacFailure.cpp b/src/hotspot/share/gc/g1/g1EvacFailure.cpp index f03d63172decab5a3d07baee9a677f43b235c9ff..dbad25955aef87a2065f5d546d8edd060a36bc8e 100644 --- a/src/hotspot/share/gc/g1/g1EvacFailure.cpp +++ b/src/hotspot/share/gc/g1/g1EvacFailure.cpp @@ -28,6 +28,7 @@ #include "gc/g1/g1ConcurrentMark.inline.hpp" #include "gc/g1/g1EvacFailure.hpp" #include "gc/g1/g1EvacFailureRegions.hpp" +#include "gc/g1/g1GCPhaseTimes.hpp" #include "gc/g1/g1HeapVerifier.hpp" #include "gc/g1/g1OopClosures.inline.hpp" #include "gc/g1/heapRegion.hpp" @@ -76,7 +77,6 @@ public: zap_dead_objects(_last_forwarded_object_end, obj_addr); - // Zapping clears the bitmap, make sure it didn't clear too much. assert(_cm->is_marked_in_prev_bitmap(obj), "should be correctly marked"); if (_during_concurrent_start) { // For the next marking info we'll only mark the @@ -103,7 +103,8 @@ public: } // Fill the memory area from start to end with filler objects, and update the BOT - // and the mark bitmap accordingly. + // accordingly. Since we clear and use the prev bitmap for marking objects that + // failed evacuation, there is no work to be done there. void zap_dead_objects(HeapWord* start, HeapWord* end) { if (start == end) { return; @@ -132,7 +133,7 @@ public: #endif } } - _cm->clear_range_in_prev_bitmap(mr); + assert(!_cm->is_marked_in_prev_bitmap(cast_to_oop(start)), "should not be marked in prev bitmap"); } void zap_remainder() { @@ -146,12 +147,15 @@ class RemoveSelfForwardPtrHRClosure: public HeapRegionClosure { G1EvacFailureRegions* _evac_failure_regions; + G1GCPhaseTimes* _phase_times; + public: RemoveSelfForwardPtrHRClosure(uint worker_id, G1EvacFailureRegions* evac_failure_regions) : _g1h(G1CollectedHeap::heap()), _worker_id(worker_id), - _evac_failure_regions(evac_failure_regions) { + _evac_failure_regions(evac_failure_regions), + _phase_times(G1CollectedHeap::heap()->phase_times()) { } size_t remove_self_forward_ptr_by_walking_hr(HeapRegion* hr, @@ -185,6 +189,11 @@ public: hr->reset_bot(); + _phase_times->record_or_add_thread_work_item(G1GCPhaseTimes::RestoreRetainedRegions, + _worker_id, + 1, + G1GCPhaseTimes::RestoreRetainedRegionsNum); + size_t live_bytes = remove_self_forward_ptr_by_walking_hr(hr, during_concurrent_start); hr->rem_set()->clean_strong_code_roots(hr); diff --git a/src/hotspot/share/gc/g1/g1FromCardCache.hpp b/src/hotspot/share/gc/g1/g1FromCardCache.hpp index b76d7b1b8633401ed719504a01779096c7a7b7ef..0a01e0102aed3e1b497bd6dbbd55c89018943f1a 100644 --- a/src/hotspot/share/gc/g1/g1FromCardCache.hpp +++ b/src/hotspot/share/gc/g1/g1FromCardCache.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2022, 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,7 +25,7 @@ #ifndef SHARE_GC_G1_G1FROMCARDCACHE_HPP #define SHARE_GC_G1_G1FROMCARDCACHE_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "utilities/ostream.hpp" // G1FromCardCache remembers the most recently processed card on the heap on diff --git a/src/hotspot/share/gc/g1/g1FullCollector.cpp b/src/hotspot/share/gc/g1/g1FullCollector.cpp index 603b381802903c1ff317cdd062b9f811b68b6e3a..37c1e1476eb8537ee2de058f28dcd9f9a65ca4ec 100644 --- a/src/hotspot/share/gc/g1/g1FullCollector.cpp +++ b/src/hotspot/share/gc/g1/g1FullCollector.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2022, 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 @@ -32,7 +32,7 @@ #include "gc/g1/g1FullGCCompactTask.hpp" #include "gc/g1/g1FullGCMarker.inline.hpp" #include "gc/g1/g1FullGCMarkTask.hpp" -#include "gc/g1/g1FullGCPrepareTask.hpp" +#include "gc/g1/g1FullGCPrepareTask.inline.hpp" #include "gc/g1/g1FullGCScope.hpp" #include "gc/g1/g1OopClosures.hpp" #include "gc/g1/g1Policy.hpp" @@ -294,17 +294,74 @@ void G1FullCollector::phase1_mark_live_objects() { } scope()->tracer()->report_object_count_after_gc(&_is_alive); +#if TASKQUEUE_STATS + oop_queue_set()->print_and_reset_taskqueue_stats("Oop Queue"); + array_queue_set()->print_and_reset_taskqueue_stats("ObjArrayOop Queue"); +#endif } void G1FullCollector::phase2_prepare_compaction() { - GCTraceTime(Info, gc, phases) info("Phase 2: Prepare for compaction", scope()->timer()); + GCTraceTime(Info, gc, phases) info("Phase 2: Prepare compaction", scope()->timer()); + + phase2a_determine_worklists(); + + bool has_free_compaction_targets = phase2b_forward_oops(); + + // Try to avoid OOM immediately after Full GC in case there are no free regions + // left after determining the result locations (i.e. this phase). Prepare to + // maximally compact the tail regions of the compaction queues serially. + if (!has_free_compaction_targets) { + phase2c_prepare_serial_compaction(); + } +} + +void G1FullCollector::phase2a_determine_worklists() { + GCTraceTime(Debug, gc, phases) debug("Phase 2: Determine work lists", scope()->timer()); + + G1DetermineCompactionQueueClosure cl(this); + _heap->heap_region_iterate(&cl); +} + +bool G1FullCollector::phase2b_forward_oops() { + GCTraceTime(Debug, gc, phases) debug("Phase 2: Prepare parallel compaction", scope()->timer()); + G1FullGCPrepareTask task(this); run_task(&task); - // To avoid OOM when there is memory left. - if (!task.has_freed_regions()) { - task.prepare_serial_compaction(); + return task.has_free_compaction_targets(); +} + +void G1FullCollector::phase2c_prepare_serial_compaction() { + GCTraceTime(Debug, gc, phases) debug("Phase 2: Prepare serial compaction", scope()->timer()); + // At this point we know that after parallel compaction there will be no + // completely free regions. That means that the last region of + // all compaction queues still have data in them. We try to compact + // these regions in serial to avoid a premature OOM when the mutator wants + // to allocate the first eden region after gc. + for (uint i = 0; i < workers(); i++) { + G1FullGCCompactionPoint* cp = compaction_point(i); + if (cp->has_regions()) { + serial_compaction_point()->add(cp->remove_last()); + } + } + + // Update the forwarding information for the regions in the serial + // compaction point. + G1FullGCCompactionPoint* cp = serial_compaction_point(); + for (GrowableArrayIterator it = cp->regions()->begin(); it != cp->regions()->end(); ++it) { + HeapRegion* current = *it; + if (!cp->is_initialized()) { + // Initialize the compaction point. Nothing more is needed for the first heap region + // since it is already prepared for compaction. + cp->initialize(current, false); + } else { + assert(!current->is_humongous(), "Should be no humongous regions in compaction queue"); + G1SerialRePrepareClosure re_prepare(cp, current); + current->set_compaction_top(current->bottom()); + current->apply_to_marked_objects(mark_bitmap(), &re_prepare); + } } + cp->update(); } void G1FullCollector::phase3_adjust_pointers() { diff --git a/src/hotspot/share/gc/g1/g1FullCollector.hpp b/src/hotspot/share/gc/g1/g1FullCollector.hpp index c4d019629dd89d8738ccd514439aa474f36f9cc6..f9087298b86003f8455024c7a9c56fc63cf41a88 100644 --- a/src/hotspot/share/gc/g1/g1FullCollector.hpp +++ b/src/hotspot/share/gc/g1/g1FullCollector.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2022, 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 @@ -110,7 +110,7 @@ public: G1FullGCCompactionPoint* serial_compaction_point() { return &_serial_compaction_point; } G1CMBitMap* mark_bitmap(); ReferenceProcessor* reference_processor(); - size_t live_words(uint region_index) { + size_t live_words(uint region_index) const { assert(region_index < _heap->max_regions(), "sanity"); return _live_stats[region_index]._live_words; } @@ -121,6 +121,9 @@ public: inline bool is_skip_compacting(uint region_index) const; inline bool is_skip_marking(oop obj) const; + // Are we (potentially) going to compact into this region? + inline bool is_compaction_target(uint region_index) const; + inline void set_free(uint region_idx); inline bool is_free(uint region_idx) const; inline void update_from_compacting_to_skip_compacting(uint region_idx); @@ -128,6 +131,11 @@ public: private: void phase1_mark_live_objects(); void phase2_prepare_compaction(); + + void phase2a_determine_worklists(); + bool phase2b_forward_oops(); + void phase2c_prepare_serial_compaction(); + void phase3_adjust_pointers(); void phase4_do_compaction(); diff --git a/src/hotspot/share/gc/g1/g1FullCollector.inline.hpp b/src/hotspot/share/gc/g1/g1FullCollector.inline.hpp index 5a0863b202a07a8131091de6bfafd949cb03dcd0..37e16fc6f78b9b0a512c3d5255283ae23f9d391d 100644 --- a/src/hotspot/share/gc/g1/g1FullCollector.inline.hpp +++ b/src/hotspot/share/gc/g1/g1FullCollector.inline.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2020, 2022, 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 @@ -43,6 +43,10 @@ bool G1FullCollector::is_skip_marking(oop obj) const { return _region_attr_table.is_skip_marking(cast_from_oop(obj)); } +bool G1FullCollector::is_compaction_target(uint region_index) const { + return _region_attr_table.is_compacting(region_index) || is_free(region_index); +} + void G1FullCollector::set_free(uint region_idx) { _region_attr_table.set_free(region_idx); } diff --git a/src/hotspot/share/gc/g1/g1FullGCCompactTask.cpp b/src/hotspot/share/gc/g1/g1FullGCCompactTask.cpp index 054227c214ac305dc285100a01f56d09c9032fb9..f484ee5133c7007f793b74a57e3edc851cbc8356 100644 --- a/src/hotspot/share/gc/g1/g1FullGCCompactTask.cpp +++ b/src/hotspot/share/gc/g1/g1FullGCCompactTask.cpp @@ -46,13 +46,23 @@ public: uint region_index = r->hrm_index(); // Only for skip-compaction regions; early return otherwise. if (!_collector->is_skip_compacting(region_index)) { - return false; } - assert(_collector->live_words(region_index) > _collector->scope()->region_compaction_threshold() || - !r->is_starts_humongous() || - _collector->mark_bitmap()->is_marked(cast_to_oop(r->bottom())), - "must be, otherwise reclaimed earlier"); +#ifdef ASSERT + if (r->is_humongous()) { + oop obj = cast_to_oop(r->humongous_start_region()->bottom()); + assert(_collector->mark_bitmap()->is_marked(obj), "must be live"); + } else if (r->is_open_archive()) { + bool is_empty = (_collector->live_words(r->hrm_index()) == 0); + assert(!is_empty, "should contain at least one live obj"); + } else if (r->is_closed_archive()) { + // should early-return above + ShouldNotReachHere(); + } else { + assert(_collector->live_words(region_index) > _collector->scope()->region_compaction_threshold(), + "should be quite full"); + } +#endif r->reset_skip_compacting_after_full_gc(); return false; } diff --git a/src/hotspot/share/gc/g1/g1FullGCHeapRegionAttr.hpp b/src/hotspot/share/gc/g1/g1FullGCHeapRegionAttr.hpp index ca2f970edde55f0eaf7ff136d89d30343286a454..017877785f41e3dbd9004173697117eff5c87c7a 100644 --- a/src/hotspot/share/gc/g1/g1FullGCHeapRegionAttr.hpp +++ b/src/hotspot/share/gc/g1/g1FullGCHeapRegionAttr.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2020, 2022, 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 @@ -70,6 +70,10 @@ public: return get_by_address(obj) == Compacting; } + bool is_compacting(uint idx) const { + return get_by_index(idx) == Compacting; + } + bool is_skip_compacting(uint idx) const { return get_by_index(idx) == SkipCompacting; } diff --git a/src/hotspot/share/gc/g1/g1FullGCMarker.hpp b/src/hotspot/share/gc/g1/g1FullGCMarker.hpp index ec7f029b7cee72ae6a4ec460c84197c241bd0618..2d935d863c5debe86f7fab6b57215ba20a2cc4a5 100644 --- a/src/hotspot/share/gc/g1/g1FullGCMarker.hpp +++ b/src/hotspot/share/gc/g1/g1FullGCMarker.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2022, 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 @@ -71,8 +71,6 @@ class G1FullGCMarker : public CHeapObj { G1RegionMarkStatsCache _mark_stats_cache; inline bool is_empty(); - inline bool pop_object(oop& obj); - inline bool pop_objarray(ObjArrayTask& array); inline void push_objarray(oop obj, size_t index); inline bool mark_object(oop obj); @@ -80,6 +78,14 @@ class G1FullGCMarker : public CHeapObj { inline void follow_object(oop obj); inline void follow_array(objArrayOop array); inline void follow_array_chunk(objArrayOop array, int index); + + inline void drain_oop_stack(); + // Transfer contents from the objArray task queue overflow stack to the shared + // objArray stack. + // Returns true and a valid task if there has not been enough space in the shared + // objArray stack, otherwise the task is invalid. + inline bool transfer_objArray_overflow_stack(ObjArrayTask& task); + public: G1FullGCMarker(G1FullCollector* collector, uint worker_id, diff --git a/src/hotspot/share/gc/g1/g1FullGCMarker.inline.hpp b/src/hotspot/share/gc/g1/g1FullGCMarker.inline.hpp index c261c150e4665802fb33a8c49c22c926ba195c74..a68bae5ced64f934b6bb7f5c22d67bc1bf81eae4 100644 --- a/src/hotspot/share/gc/g1/g1FullGCMarker.inline.hpp +++ b/src/hotspot/share/gc/g1/g1FullGCMarker.inline.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2022, 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 @@ -91,20 +91,12 @@ inline bool G1FullGCMarker::is_empty() { return _oop_stack.is_empty() && _objarray_stack.is_empty(); } -inline bool G1FullGCMarker::pop_object(oop& oop) { - return _oop_stack.pop_overflow(oop) || _oop_stack.pop_local(oop); -} - inline void G1FullGCMarker::push_objarray(oop obj, size_t index) { ObjArrayTask task(obj, index); assert(task.is_valid(), "bad ObjArrayTask"); _objarray_stack.push(task); } -inline bool G1FullGCMarker::pop_objarray(ObjArrayTask& arr) { - return _objarray_stack.pop_overflow(arr) || _objarray_stack.pop_local(arr); -} - inline void G1FullGCMarker::follow_array(objArrayOop array) { follow_klass(array->klass()); // Don't push empty arrays to avoid unnecessary work. @@ -159,16 +151,40 @@ inline void G1FullGCMarker::follow_object(oop obj) { } } -void G1FullGCMarker::drain_stack() { - do { - oop obj; - while (pop_object(obj)) { +inline void G1FullGCMarker::drain_oop_stack() { + oop obj; + while (_oop_stack.pop_overflow(obj)) { + if (!_oop_stack.try_push_to_taskqueue(obj)) { assert(_bitmap->is_marked(obj), "must be marked"); follow_object(obj); } - // Process ObjArrays one at a time to avoid marking stack bloat. + } + while (_oop_stack.pop_local(obj)) { + assert(_bitmap->is_marked(obj), "must be marked"); + follow_object(obj); + } +} + +inline bool G1FullGCMarker::transfer_objArray_overflow_stack(ObjArrayTask& task) { + // It is desirable to move as much as possible work from the overflow queue to + // the shared queue as quickly as possible. + while (_objarray_stack.pop_overflow(task)) { + if (!_objarray_stack.try_push_to_taskqueue(task)) { + return true; + } + } + return false; +} + +void G1FullGCMarker::drain_stack() { + do { + // First, drain regular oop stack. + drain_oop_stack(); + + // Then process ObjArrays one at a time to avoid marking stack bloat. ObjArrayTask task; - if (pop_objarray(task)) { + if (transfer_objArray_overflow_stack(task) || + _objarray_stack.pop_local(task)) { follow_array_chunk(objArrayOop(task.obj()), task.index()); } } while (!is_empty()); diff --git a/src/hotspot/share/gc/g1/g1FullGCPrepareTask.cpp b/src/hotspot/share/gc/g1/g1FullGCPrepareTask.cpp index ea7f94880c429fa27c668e73d25f1a97bccb058d..4ffe9329dc754a359281103b452f1b700b8a8c38 100644 --- a/src/hotspot/share/gc/g1/g1FullGCPrepareTask.cpp +++ b/src/hotspot/share/gc/g1/g1FullGCPrepareTask.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2022, 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,13 +23,13 @@ */ #include "precompiled.hpp" -#include "gc/g1/g1CollectedHeap.hpp" +#include "gc/g1/g1CollectedHeap.inline.hpp" #include "gc/g1/g1ConcurrentMarkBitMap.inline.hpp" #include "gc/g1/g1FullCollector.inline.hpp" #include "gc/g1/g1FullGCCompactionPoint.hpp" #include "gc/g1/g1FullGCMarker.hpp" #include "gc/g1/g1FullGCOopClosures.inline.hpp" -#include "gc/g1/g1FullGCPrepareTask.hpp" +#include "gc/g1/g1FullGCPrepareTask.inline.hpp" #include "gc/g1/g1HotCardCache.hpp" #include "gc/g1/heapRegion.inline.hpp" #include "gc/shared/gcTraceTime.inline.hpp" @@ -39,114 +39,84 @@ #include "oops/oop.inline.hpp" #include "utilities/ticks.hpp" -template -void G1FullGCPrepareTask::G1CalculatePointersClosure::free_pinned_region(HeapRegion* hr) { - _regions_freed = true; - if (is_humongous) { - _g1h->free_humongous_region(hr, nullptr); - } else { - _g1h->free_region(hr, nullptr); - } - _collector->set_free(hr->hrm_index()); - prepare_for_compaction(hr); -} +G1DetermineCompactionQueueClosure::G1DetermineCompactionQueueClosure(G1FullCollector* collector) : + _g1h(G1CollectedHeap::heap()), + _collector(collector), + _cur_worker(0) { } bool G1FullGCPrepareTask::G1CalculatePointersClosure::do_heap_region(HeapRegion* hr) { - bool force_not_compacted = false; - if (should_compact(hr)) { - assert(!hr->is_humongous(), "moving humongous objects not supported."); - prepare_for_compaction(hr); - } else { - // There is no need to iterate and forward objects in pinned regions ie. - // prepare them for compaction. The adjust pointers phase will skip - // work for them. - assert(hr->containing_set() == nullptr, "already cleared by PrepareRegionsClosure"); - if (hr->is_humongous()) { - oop obj = cast_to_oop(hr->humongous_start_region()->bottom()); - if (!_bitmap->is_marked(obj)) { - free_pinned_region(hr); - } - } else if (hr->is_open_archive()) { - bool is_empty = _collector->live_words(hr->hrm_index()) == 0; - if (is_empty) { - free_pinned_region(hr); - } - } else if (hr->is_closed_archive()) { - // nothing to do with closed archive region - } else { - assert(MarkSweepDeadRatio > 0, - "only skip compaction for other regions when MarkSweepDeadRatio > 0"); - - // Too many live objects; skip compacting it. - _collector->update_from_compacting_to_skip_compacting(hr->hrm_index()); - if (hr->is_young()) { - // G1 updates the BOT for old region contents incrementally, but young regions - // lack BOT information for performance reasons. - // Recreate BOT information of high live ratio young regions here to keep expected - // performance during scanning their card tables in the collection pauses later. - hr->update_bot(); - } - log_trace(gc, phases)("Phase 2: skip compaction region index: %u, live words: " SIZE_FORMAT, - hr->hrm_index(), _collector->live_words(hr->hrm_index())); - } - } + uint region_idx = hr->hrm_index(); + assert(_collector->is_compaction_target(region_idx), "must be"); - // Reset data structures not valid after Full GC. - reset_region_metadata(hr); + assert(!hr->is_pinned(), "must be"); + assert(!hr->is_closed_archive(), "must be"); + assert(!hr->is_open_archive(), "must be"); + + prepare_for_compaction(hr); return false; } G1FullGCPrepareTask::G1FullGCPrepareTask(G1FullCollector* collector) : G1FullGCTask("G1 Prepare Compact Task", collector), - _freed_regions(false), + _has_free_compaction_targets(false), _hrclaimer(collector->workers()) { } -void G1FullGCPrepareTask::set_freed_regions() { - if (!_freed_regions) { - _freed_regions = true; +void G1FullGCPrepareTask::set_has_free_compaction_targets() { + if (!_has_free_compaction_targets) { + _has_free_compaction_targets = true; } } -bool G1FullGCPrepareTask::has_freed_regions() { - return _freed_regions; +bool G1FullGCPrepareTask::has_free_compaction_targets() { + return _has_free_compaction_targets; } void G1FullGCPrepareTask::work(uint worker_id) { Ticks start = Ticks::now(); - G1FullGCCompactionPoint* compaction_point = collector()->compaction_point(worker_id); - G1CalculatePointersClosure closure(collector(), compaction_point); - G1CollectedHeap::heap()->heap_region_par_iterate_from_start(&closure, &_hrclaimer); - - compaction_point->update(); + // Calculate the target locations for the objects in the non-free regions of + // the compaction queues provided by the associate compaction point. + { + G1FullGCCompactionPoint* compaction_point = collector()->compaction_point(worker_id); + G1CalculatePointersClosure closure(collector(), compaction_point); + + for (GrowableArrayIterator it = compaction_point->regions()->begin(); + it != compaction_point->regions()->end(); + ++it) { + closure.do_heap_region(*it); + } + compaction_point->update(); + // Determine if there are any unused compaction targets. This is only the case if + // there are + // - any regions in queue, so no free ones either. + // - and the current region is not the last one in the list. + if (compaction_point->has_regions() && + compaction_point->current_region() != compaction_point->regions()->last()) { + set_has_free_compaction_targets(); + } + } - // Check if any regions was freed by this worker and store in task. - if (closure.freed_regions()) { - set_freed_regions(); + // Clear region metadata that is invalid after GC for all regions. + { + G1ResetMetadataClosure closure(collector()); + G1CollectedHeap::heap()->heap_region_par_iterate_from_start(&closure, &_hrclaimer); } log_task("Prepare compaction task", worker_id, start); } G1FullGCPrepareTask::G1CalculatePointersClosure::G1CalculatePointersClosure(G1FullCollector* collector, G1FullGCCompactionPoint* cp) : - _g1h(G1CollectedHeap::heap()), - _collector(collector), - _bitmap(collector->mark_bitmap()), - _cp(cp), - _regions_freed(false) { } - -bool G1FullGCPrepareTask::G1CalculatePointersClosure::should_compact(HeapRegion* hr) { - if (hr->is_pinned()) { - return false; - } - size_t live_words = _collector->live_words(hr->hrm_index()); - size_t live_words_threshold = _collector->scope()->region_compaction_threshold(); - // High live ratio region will not be compacted. - return live_words <= live_words_threshold; -} + _g1h(G1CollectedHeap::heap()), + _collector(collector), + _bitmap(collector->mark_bitmap()), + _cp(cp) { } -void G1FullGCPrepareTask::G1CalculatePointersClosure::reset_region_metadata(HeapRegion* hr) { +G1FullGCPrepareTask::G1ResetMetadataClosure::G1ResetMetadataClosure(G1FullCollector* collector) : + _g1h(G1CollectedHeap::heap()), + _collector(collector) { } + +void G1FullGCPrepareTask::G1ResetMetadataClosure::reset_region_metadata(HeapRegion* hr) { hr->rem_set()->clear(); hr->clear_cardtable(); @@ -156,6 +126,26 @@ void G1FullGCPrepareTask::G1CalculatePointersClosure::reset_region_metadata(Heap } } +bool G1FullGCPrepareTask::G1ResetMetadataClosure::do_heap_region(HeapRegion* hr) { + uint const region_idx = hr->hrm_index(); + if (!_collector->is_compaction_target(region_idx)) { + assert(!hr->is_free(), "all free regions should be compaction targets"); + assert(_collector->is_skip_compacting(region_idx) || hr->is_closed_archive(), "must be"); + if (hr->is_young()) { + // G1 updates the BOT for old region contents incrementally, but young regions + // lack BOT information for performance reasons. + // Recreate BOT information of high live ratio young regions here to keep expected + // performance during scanning their card tables in the collection pauses later. + hr->update_bot(); + } + } + + // Reset data structures not valid after Full GC. + reset_region_metadata(hr); + + return false; +} + G1FullGCPrepareTask::G1PrepareCompactLiveClosure::G1PrepareCompactLiveClosure(G1FullGCCompactionPoint* cp) : _cp(cp) { } @@ -165,87 +155,9 @@ size_t G1FullGCPrepareTask::G1PrepareCompactLiveClosure::apply(oop object) { return size; } -size_t G1FullGCPrepareTask::G1RePrepareClosure::apply(oop obj) { - // We only re-prepare objects forwarded within the current region, so - // skip objects that are already forwarded to another region. - if (obj->is_forwarded() && !_current->is_in(obj->forwardee())) { - return obj->size(); - } - - // Get size and forward. - size_t size = obj->size(); - _cp->forward(obj, size); - - return size; -} - -void G1FullGCPrepareTask::G1CalculatePointersClosure::prepare_for_compaction_work(G1FullGCCompactionPoint* cp, - HeapRegion* hr) { - hr->set_compaction_top(hr->bottom()); +void G1FullGCPrepareTask::G1CalculatePointersClosure::prepare_for_compaction(HeapRegion* hr) { if (!_collector->is_free(hr->hrm_index())) { - G1PrepareCompactLiveClosure prepare_compact(cp); + G1PrepareCompactLiveClosure prepare_compact(_cp); hr->apply_to_marked_objects(_bitmap, &prepare_compact); } } - -void G1FullGCPrepareTask::G1CalculatePointersClosure::prepare_for_compaction(HeapRegion* hr) { - if (!_cp->is_initialized()) { - hr->set_compaction_top(hr->bottom()); - _cp->initialize(hr, true); - } - // Add region to the compaction queue and prepare it. - _cp->add(hr); - prepare_for_compaction_work(_cp, hr); -} - -void G1FullGCPrepareTask::prepare_serial_compaction() { - GCTraceTime(Debug, gc, phases) debug("Phase 2: Prepare Serial Compaction", collector()->scope()->timer()); - // At this point we know that no regions were completely freed by - // the parallel compaction. That means that the last region of - // all compaction queues still have data in them. We try to compact - // these regions in serial to avoid a premature OOM. - for (uint i = 0; i < collector()->workers(); i++) { - G1FullGCCompactionPoint* cp = collector()->compaction_point(i); - if (cp->has_regions()) { - collector()->serial_compaction_point()->add(cp->remove_last()); - } - } - - // Update the forwarding information for the regions in the serial - // compaction point. - G1FullGCCompactionPoint* cp = collector()->serial_compaction_point(); - for (GrowableArrayIterator it = cp->regions()->begin(); it != cp->regions()->end(); ++it) { - HeapRegion* current = *it; - if (!cp->is_initialized()) { - // Initialize the compaction point. Nothing more is needed for the first heap region - // since it is already prepared for compaction. - cp->initialize(current, false); - } else { - assert(!current->is_humongous(), "Should be no humongous regions in compaction queue"); - G1RePrepareClosure re_prepare(cp, current); - current->set_compaction_top(current->bottom()); - current->apply_to_marked_objects(collector()->mark_bitmap(), &re_prepare); - } - } - cp->update(); -} - -bool G1FullGCPrepareTask::G1CalculatePointersClosure::freed_regions() { - if (_regions_freed) { - return true; - } - - if (!_cp->has_regions()) { - // No regions in queue, so no free ones either. - return false; - } - - if (_cp->current_region() != _cp->regions()->last()) { - // The current region used for compaction is not the last in the - // queue. That means there is at least one free region in the queue. - return true; - } - - // No free regions in the queue. - return false; -} diff --git a/src/hotspot/share/gc/g1/g1FullGCPrepareTask.hpp b/src/hotspot/share/gc/g1/g1FullGCPrepareTask.hpp index d694fc6ffcaf66fe13536561903eafbb6bfad658..41c0c67d87cf66482933081a88b11775a57c85f3 100644 --- a/src/hotspot/share/gc/g1/g1FullGCPrepareTask.hpp +++ b/src/hotspot/share/gc/g1/g1FullGCPrepareTask.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2022, 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,53 +25,81 @@ #ifndef SHARE_GC_G1_G1FULLGCPREPARETASK_HPP #define SHARE_GC_G1_G1FULLGCPREPARETASK_HPP -#include "gc/g1/g1FullGCCompactionPoint.hpp" -#include "gc/g1/g1FullGCScope.hpp" #include "gc/g1/g1FullGCTask.hpp" -#include "gc/g1/g1RootProcessor.hpp" -#include "gc/g1/heapRegionManager.hpp" -#include "gc/shared/referenceProcessor.hpp" +#include "gc/g1/heapRegion.hpp" +#include "memory/allocation.hpp" +class G1CollectedHeap; class G1CMBitMap; class G1FullCollector; +class G1FullGCCompactionPoint; +class HeapRegion; + +// Determines the regions in the heap that should be part of the compaction and +// distributes them among the compaction queues in round-robin fashion. +class G1DetermineCompactionQueueClosure : public HeapRegionClosure { + G1CollectedHeap* _g1h; + G1FullCollector* _collector; + uint _cur_worker; + + template + inline void free_pinned_region(HeapRegion* hr); + + inline bool should_compact(HeapRegion* hr) const; + + // Returns the current worker id to assign a compaction point to, and selects + // the next one round-robin style. + inline uint next_worker(); + + inline G1FullGCCompactionPoint* next_compaction_point(); + + inline void add_to_compaction_queue(HeapRegion* hr); + +public: + G1DetermineCompactionQueueClosure(G1FullCollector* collector); + + inline bool do_heap_region(HeapRegion* hr) override; +}; class G1FullGCPrepareTask : public G1FullGCTask { -protected: - volatile bool _freed_regions; + volatile bool _has_free_compaction_targets; HeapRegionClaimer _hrclaimer; - void set_freed_regions(); + void set_has_free_compaction_targets(); public: G1FullGCPrepareTask(G1FullCollector* collector); void work(uint worker_id); - void prepare_serial_compaction(); - bool has_freed_regions(); + // After the Prepare phase, are there any unused (empty) regions (compaction + // targets) at the end of any compaction queues? + bool has_free_compaction_targets(); -protected: +private: class G1CalculatePointersClosure : public HeapRegionClosure { - private: - template - void free_pinned_region(HeapRegion* hr); - protected: G1CollectedHeap* _g1h; G1FullCollector* _collector; G1CMBitMap* _bitmap; G1FullGCCompactionPoint* _cp; - bool _regions_freed; - bool should_compact(HeapRegion* hr); void prepare_for_compaction(HeapRegion* hr); - void prepare_for_compaction_work(G1FullGCCompactionPoint* cp, HeapRegion* hr); - - void reset_region_metadata(HeapRegion* hr); public: G1CalculatePointersClosure(G1FullCollector* collector, G1FullGCCompactionPoint* cp); bool do_heap_region(HeapRegion* hr); - bool freed_regions(); + }; + + class G1ResetMetadataClosure : public HeapRegionClosure { + G1CollectedHeap* _g1h; + G1FullCollector* _collector; + + void reset_region_metadata(HeapRegion* hr); + + public: + G1ResetMetadataClosure(G1FullCollector* collector); + + bool do_heap_region(HeapRegion* hr); }; class G1PrepareCompactLiveClosure : public StackObj { @@ -81,19 +109,20 @@ protected: G1PrepareCompactLiveClosure(G1FullGCCompactionPoint* cp); size_t apply(oop object); }; +}; - class G1RePrepareClosure : public StackObj { - G1FullGCCompactionPoint* _cp; - HeapRegion* _current; +// Closure to re-prepare objects in the serial compaction point queue regions for +// serial compaction. +class G1SerialRePrepareClosure : public StackObj { + G1FullGCCompactionPoint* _cp; + HeapRegion* _current; - public: - G1RePrepareClosure(G1FullGCCompactionPoint* hrcp, - HeapRegion* hr) : - _cp(hrcp), - _current(hr) { } +public: + G1SerialRePrepareClosure(G1FullGCCompactionPoint* hrcp, HeapRegion* hr) : + _cp(hrcp), + _current(hr) { } - size_t apply(oop object); - }; + inline size_t apply(oop obj); }; #endif // SHARE_GC_G1_G1FULLGCPREPARETASK_HPP diff --git a/src/hotspot/share/gc/g1/g1FullGCPrepareTask.inline.hpp b/src/hotspot/share/gc/g1/g1FullGCPrepareTask.inline.hpp new file mode 100644 index 0000000000000000000000000000000000000000..75493b7de4fbf7b7aafe9284937da3ad41639679 --- /dev/null +++ b/src/hotspot/share/gc/g1/g1FullGCPrepareTask.inline.hpp @@ -0,0 +1,126 @@ +/* + * Copyright (c) 2022, 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. + * + */ + +#ifndef SHARE_GC_G1_G1FULLGCPREPARETASK_INLINE_HPP +#define SHARE_GC_G1_G1FULLGCPREPARETASK_INLINE_HPP + +#include "gc/g1/g1FullGCPrepareTask.hpp" + +#include "gc/g1/g1CollectedHeap.inline.hpp" +#include "gc/g1/g1FullCollector.hpp" +#include "gc/g1/g1FullGCCompactionPoint.hpp" +#include "gc/g1/g1FullGCScope.hpp" +#include "gc/g1/heapRegion.inline.hpp" + +template +void G1DetermineCompactionQueueClosure::free_pinned_region(HeapRegion* hr) { + if (is_humongous) { + _g1h->free_humongous_region(hr, nullptr); + } else { + _g1h->free_region(hr, nullptr); + } + _collector->set_free(hr->hrm_index()); + add_to_compaction_queue(hr); +} + +inline bool G1DetermineCompactionQueueClosure::should_compact(HeapRegion* hr) const { + // There is no need to iterate and forward objects in pinned regions ie. + // prepare them for compaction. + if (hr->is_pinned()) { + return false; + } + size_t live_words = _collector->live_words(hr->hrm_index()); + size_t live_words_threshold = _collector->scope()->region_compaction_threshold(); + // High live ratio region will not be compacted. + return live_words <= live_words_threshold; +} + +inline uint G1DetermineCompactionQueueClosure::next_worker() { + uint result = _cur_worker; + _cur_worker = (_cur_worker + 1) % _collector->workers(); + return result; +} + +inline G1FullGCCompactionPoint* G1DetermineCompactionQueueClosure::next_compaction_point() { + return _collector->compaction_point(next_worker()); +} + +inline void G1DetermineCompactionQueueClosure::add_to_compaction_queue(HeapRegion* hr) { + hr->set_compaction_top(hr->bottom()); + G1FullGCCompactionPoint* cp = next_compaction_point(); + if (!cp->is_initialized()) { + cp->initialize(hr, true); + } + // Add region to the compaction queue. + cp->add(hr); +} + +inline bool G1DetermineCompactionQueueClosure::do_heap_region(HeapRegion* hr) { + if (should_compact(hr)) { + assert(!hr->is_humongous(), "moving humongous objects not supported."); + add_to_compaction_queue(hr); + } else { + assert(hr->containing_set() == nullptr, "already cleared by PrepareRegionsClosure"); + if (hr->is_humongous()) { + oop obj = cast_to_oop(hr->humongous_start_region()->bottom()); + bool is_empty = !_collector->mark_bitmap()->is_marked(obj); + if (is_empty) { + free_pinned_region(hr); + } + } else if (hr->is_open_archive()) { + bool is_empty = _collector->live_words(hr->hrm_index()) == 0; + if (is_empty) { + free_pinned_region(hr); + } + } else if (hr->is_closed_archive()) { + // nothing to do with closed archive region + } else { + assert(MarkSweepDeadRatio > 0, + "only skip compaction for other regions when MarkSweepDeadRatio > 0"); + + // Too many live objects in the region; skip compacting it. + _collector->update_from_compacting_to_skip_compacting(hr->hrm_index()); + log_trace(gc, phases)("Phase 2: skip compaction region index: %u, live words: " SIZE_FORMAT, + hr->hrm_index(), _collector->live_words(hr->hrm_index())); + } + } + + return false; +} + +inline size_t G1SerialRePrepareClosure::apply(oop obj) { + // We only re-prepare objects forwarded within the current region, so + // skip objects that are already forwarded to another region. + if (obj->is_forwarded() && !_current->is_in(obj->forwardee())) { + return obj->size(); + } + + // Get size and forward. + size_t size = obj->size(); + _cp->forward(obj, size); + + return size; +} + +#endif // SHARE_GC_G1_G1FULLGCPREPARETASK_INLINE_HPP diff --git a/src/hotspot/share/gc/g1/g1FullGCScope.cpp b/src/hotspot/share/gc/g1/g1FullGCScope.cpp index b4d3b3656034b5bc7cd6b3567494d25bfb9b0191..0437d157eb008aaa3d271393820798ae32a4e5de 100644 --- a/src/hotspot/share/gc/g1/g1FullGCScope.cpp +++ b/src/hotspot/share/gc/g1/g1FullGCScope.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2022, 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 @@ -70,6 +70,6 @@ G1FullGCTracer* G1FullGCScope::tracer() { return &_tracer; } -size_t G1FullGCScope::region_compaction_threshold() { +size_t G1FullGCScope::region_compaction_threshold() const { return _region_compaction_threshold; } diff --git a/src/hotspot/share/gc/g1/g1FullGCScope.hpp b/src/hotspot/share/gc/g1/g1FullGCScope.hpp index c0035b9052aa7e8136e3ef825f739629e6caeeb1..a6e079f4d63dde8ccc7dbd9207bf2218bf4ac6b4 100644 --- a/src/hotspot/share/gc/g1/g1FullGCScope.hpp +++ b/src/hotspot/share/gc/g1/g1FullGCScope.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2022, 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 @@ -71,7 +71,7 @@ public: STWGCTimer* timer(); G1FullGCTracer* tracer(); G1HeapTransition* heap_transition(); - size_t region_compaction_threshold(); + size_t region_compaction_threshold() const; }; #endif // SHARE_GC_G1_G1FULLGCSCOPE_HPP diff --git a/src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp b/src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp index 3495c22f84135fd760d959af88279e3d33800d00..4a45a3eca651b5a09e982c4abc5a500b66648fe3 100644 --- a/src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp +++ b/src/hotspot/share/gc/g1/g1GCPhaseTimes.cpp @@ -102,7 +102,7 @@ G1GCPhaseTimes::G1GCPhaseTimes(STWGCTimer* gc_timer, uint max_gc_threads) : _gc_par_phases[GCWorkerEnd] = new WorkerDataArray("GCWorkerEnd", "GC Worker End (ms):", max_gc_threads); _gc_par_phases[Other] = new WorkerDataArray("Other", "GC Worker Other (ms):", max_gc_threads); _gc_par_phases[MergePSS] = new WorkerDataArray("MergePSS", "Merge Per-Thread State (ms):", max_gc_threads); - _gc_par_phases[RemoveSelfForwardingPtr] = new WorkerDataArray("RemoveSelfForwardingPtr", "Remove Self Forwards (ms):", max_gc_threads); + _gc_par_phases[RestoreRetainedRegions] = new WorkerDataArray("RestoreRetainedRegions", "Restore Retained Regions (ms):", max_gc_threads); _gc_par_phases[ClearCardTable] = new WorkerDataArray("ClearLoggedCards", "Clear Logged Cards (ms):", max_gc_threads); _gc_par_phases[RecalculateUsed] = new WorkerDataArray("RecalculateUsed", "Recalculate Used Memory (ms):", max_gc_threads); _gc_par_phases[ResetHotCardCache] = new WorkerDataArray("ResetHotCardCache", "Reset Hot Card Cache (ms):", max_gc_threads); @@ -132,6 +132,8 @@ G1GCPhaseTimes::G1GCPhaseTimes(STWGCTimer* gc_timer, uint max_gc_threads) : _gc_par_phases[MergePSS]->create_thread_work_items("LAB Waste", MergePSSLABWasteBytes); _gc_par_phases[MergePSS]->create_thread_work_items("LAB Undo Waste", MergePSSLABUndoWasteBytes); + _gc_par_phases[RestoreRetainedRegions]->create_thread_work_items("Evacuation Failure Regions:", RestoreRetainedRegionsNum); + _gc_par_phases[EagerlyReclaimHumongousObjects]->create_thread_work_items("Humongous Total", EagerlyReclaimNumTotal); _gc_par_phases[EagerlyReclaimHumongousObjects]->create_thread_work_items("Humongous Candidates", EagerlyReclaimNumCandidates); _gc_par_phases[EagerlyReclaimHumongousObjects]->create_thread_work_items("Humongous Reclaimed", EagerlyReclaimNumReclaimed); @@ -480,7 +482,7 @@ double G1GCPhaseTimes::print_post_evacuate_collection_set(bool evacuation_failed debug_phase(_gc_par_phases[ClearCardTable], 1); debug_phase(_gc_par_phases[RecalculateUsed], 1); if (evacuation_failed) { - debug_phase(_gc_par_phases[RemoveSelfForwardingPtr], 1); + debug_phase(_gc_par_phases[RestoreRetainedRegions], 1); } trace_phase(_gc_par_phases[RedirtyCards]); diff --git a/src/hotspot/share/gc/g1/g1GCPhaseTimes.hpp b/src/hotspot/share/gc/g1/g1GCPhaseTimes.hpp index 9db7f18dd347469be15aacad9b0e47fac1fbdb65..0cd6aebc8ccec453d72e39774769f0d7ff8f1c6f 100644 --- a/src/hotspot/share/gc/g1/g1GCPhaseTimes.hpp +++ b/src/hotspot/share/gc/g1/g1GCPhaseTimes.hpp @@ -77,7 +77,7 @@ class G1GCPhaseTimes : public CHeapObj { RebuildFreeList, SampleCollectionSetCandidates, MergePSS, - RemoveSelfForwardingPtr, + RestoreRetainedRegions, ClearCardTable, RecalculateUsed, ResetHotCardCache, @@ -144,6 +144,10 @@ class G1GCPhaseTimes : public CHeapObj { MergePSSLABUndoWasteBytes }; + enum RestoreRetainedRegionsWorkItems { + RestoreRetainedRegionsNum, + }; + enum GCEagerlyReclaimHumongousObjectsItems { EagerlyReclaimNumTotal, EagerlyReclaimNumCandidates, diff --git a/src/hotspot/share/gc/g1/g1HeapRegionAttr.hpp b/src/hotspot/share/gc/g1/g1HeapRegionAttr.hpp index 2b8fb3532ee0ea574a32d4e546ddb21648b8eaa4..d59d7e1c0fbf25c21cce7046838ba32617fa6e08 100644 --- a/src/hotspot/share/gc/g1/g1HeapRegionAttr.hpp +++ b/src/hotspot/share/gc/g1/g1HeapRegionAttr.hpp @@ -32,13 +32,7 @@ // lookups for that information all over the place. struct G1HeapRegionAttr { public: -#if defined(_M_ARM64)&& defined(_MSC_VER) && _MSC_VER <= 1927 - // workaround for MSCV ARM64 bug - // https://developercommunity.visualstudio.com/content/problem/1079221/arm64-bad-code-generation-around-signed-char-arith.html - typedef int32_t region_type_t; -#else typedef int8_t region_type_t; -#endif // remset_is_tracked_t is essentially bool, but we need precise control // on the size, and sizeof(bool) is implementation specific. typedef uint8_t remset_is_tracked_t; diff --git a/src/hotspot/share/gc/g1/g1HeapRegionEventSender.hpp b/src/hotspot/share/gc/g1/g1HeapRegionEventSender.hpp index c8518a5172e2e31a0773e145b7f2d86a13e1be5e..eb3d60656d4a9c0c39d69d49d3a3ca2ad1a24341 100644 --- a/src/hotspot/share/gc/g1/g1HeapRegionEventSender.hpp +++ b/src/hotspot/share/gc/g1/g1HeapRegionEventSender.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2022, 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,7 +25,7 @@ #ifndef SHARE_GC_G1_G1HEAPREGIONEVENTSENDER_HPP #define SHARE_GC_G1_G1HEAPREGIONEVENTSENDER_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" class G1HeapRegionEventSender : public AllStatic { public: diff --git a/src/hotspot/share/gc/g1/g1HeapRegionTraceType.hpp b/src/hotspot/share/gc/g1/g1HeapRegionTraceType.hpp index ab3ee03137c76a661d859787218b5bed7b10886c..1c5690e566d8a1200e444f65fcab091654134988 100644 --- a/src/hotspot/share/gc/g1/g1HeapRegionTraceType.hpp +++ b/src/hotspot/share/gc/g1/g1HeapRegionTraceType.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2022, 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,7 +25,7 @@ #ifndef SHARE_GC_G1_G1HEAPREGIONTRACETYPE_HPP #define SHARE_GC_G1_G1HEAPREGIONTRACETYPE_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "utilities/debug.hpp" class G1HeapRegionTraceType : AllStatic { diff --git a/src/hotspot/share/gc/g1/g1OopClosures.inline.hpp b/src/hotspot/share/gc/g1/g1OopClosures.inline.hpp index 2cd41d4255f2df5edba66b269bc37849e417281a..c368130bfcae013dc6f8a32c90711fc4876a3740 100644 --- a/src/hotspot/share/gc/g1/g1OopClosures.inline.hpp +++ b/src/hotspot/share/gc/g1/g1OopClosures.inline.hpp @@ -274,7 +274,9 @@ template void G1RebuildRemSetClosure::do_oop_work(T* p) { HeapRegion* to = _g1h->heap_region_containing(obj); HeapRegionRemSet* rem_set = to->rem_set(); - rem_set->add_reference(p, _worker_id); + if (rem_set->is_tracked()) { + rem_set->add_reference(p, _worker_id); + } } #endif // SHARE_GC_G1_G1OOPCLOSURES_INLINE_HPP diff --git a/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.cpp b/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.cpp index 7a164e6461f43dd3176f37b7cc7b3e4e4566033e..94f51c8fdd1bb00d26f816bc7d9f9b25521ae064 100644 --- a/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.cpp +++ b/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2022, 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 @@ -178,13 +178,6 @@ char* G1PageBasedVirtualSpace::bounded_end_addr(size_t end_page) const { return MIN2(_high_boundary, page_start(end_page)); } -void G1PageBasedVirtualSpace::pretouch_internal(size_t start_page, size_t end_page) { - guarantee(start_page < end_page, - "Given start page " SIZE_FORMAT " is larger or equal to end page " SIZE_FORMAT, start_page, end_page); - - os::pretouch_memory(page_start(start_page), bounded_end_addr(end_page), _page_size); -} - bool G1PageBasedVirtualSpace::commit(size_t start_page, size_t size_in_pages) { // We need to make sure to commit all pages covered by the given area. guarantee(is_area_uncommitted(start_page, size_in_pages), diff --git a/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.hpp b/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.hpp index 8b68ad60e560a3e702ea2f4e50fa332f13e1585d..0b97656c883933abf603398c14a01f7727d948e7 100644 --- a/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.hpp +++ b/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2022, 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 @@ -87,9 +87,6 @@ class G1PageBasedVirtualSpace { // Uncommit the given memory range. void uncommit_internal(size_t start_page, size_t end_page); - // Pretouch the given memory range. - void pretouch_internal(size_t start_page, size_t end_page); - // Returns the index of the page which contains the given address. size_t addr_to_page_index(char* addr) const; diff --git a/src/hotspot/share/gc/g1/g1ParScanThreadState.cpp b/src/hotspot/share/gc/g1/g1ParScanThreadState.cpp index 2bfb36b151130d5b20d38b962bbe8197decd3ec3..f2889e787799182d25136a8af85c7ad0d5146352 100644 --- a/src/hotspot/share/gc/g1/g1ParScanThreadState.cpp +++ b/src/hotspot/share/gc/g1/g1ParScanThreadState.cpp @@ -434,6 +434,12 @@ void G1ParScanThreadState::undo_allocation(G1HeapRegionAttr dest_attr, _plab_allocator->undo_allocation(dest_attr, obj_ptr, word_sz, node_index); } +void G1ParScanThreadState::update_bot_after_copying(oop obj, size_t word_sz) { + HeapWord* obj_start = cast_from_oop(obj); + HeapRegion* region = _g1h->heap_region_containing(obj_start); + region->update_bot_if_crossing_boundary(obj_start, word_sz); +} + // Private inline function, for direct internal use and providing the // implementation of the public not-inline function. MAYBE_INLINE_EVACUATION @@ -503,10 +509,7 @@ oop G1ParScanThreadState::do_copy_to_survivor_space(G1HeapRegionAttr const regio } _age_table.add(age, word_sz); } else { - // Currently we only have two destinations and we only need BOT updates for - // old. If the current allocation was done outside the PLAB this call will - // have no effect since the _top of the PLAB has not changed. - _plab_allocator->update_bot_for_plab_allocation(dest_attr, word_sz, node_index); + update_bot_after_copying(obj, word_sz); } // Most objects are not arrays, so do one array check rather than diff --git a/src/hotspot/share/gc/g1/g1ParScanThreadState.hpp b/src/hotspot/share/gc/g1/g1ParScanThreadState.hpp index f40ca519268fb4f477cbfc9d00972af9f8dfee67..dab2d718b7cfd0625646e76c4fa867216492d04f 100644 --- a/src/hotspot/share/gc/g1/g1ParScanThreadState.hpp +++ b/src/hotspot/share/gc/g1/g1ParScanThreadState.hpp @@ -169,6 +169,8 @@ private: size_t word_sz, uint node_index); + void update_bot_after_copying(oop obj, size_t word_sz); + oop do_copy_to_survivor_space(G1HeapRegionAttr region_attr, oop obj, markWord old_mark); diff --git a/src/hotspot/share/gc/g1/g1RedirtyCardsQueue.cpp b/src/hotspot/share/gc/g1/g1RedirtyCardsQueue.cpp index a1802e01821fe75d5bacc28acdc99fe07922c9cd..d6c2ae148be5adb800b11f2820642e6e4b2ea2f8 100644 --- a/src/hotspot/share/gc/g1/g1RedirtyCardsQueue.cpp +++ b/src/hotspot/share/gc/g1/g1RedirtyCardsQueue.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2022, 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,7 +67,7 @@ void G1RedirtyCardsLocalQueueSet::enqueue(void* value) { void G1RedirtyCardsLocalQueueSet::flush() { flush_queue(_queue); _shared_qset->add_bufferlist(_buffers); - _buffers = G1BufferNodeList(); + _buffers = BufferNodeList(); } // G1RedirtyCardsLocalQueueSet::Queue @@ -109,9 +109,9 @@ BufferNode* G1RedirtyCardsQueueSet::all_completed_buffers() const { return _list.top(); } -G1BufferNodeList G1RedirtyCardsQueueSet::take_all_completed_buffers() { +BufferNodeList G1RedirtyCardsQueueSet::take_all_completed_buffers() { DEBUG_ONLY(_collecting = false;) - G1BufferNodeList result(_list.pop_all(), _tail, _entry_count); + BufferNodeList result(_list.pop_all(), _tail, _entry_count); _tail = NULL; _entry_count = 0; DEBUG_ONLY(_collecting = true;) @@ -135,7 +135,7 @@ void G1RedirtyCardsQueueSet::enqueue_completed_buffer(BufferNode* node) { update_tail(node); } -void G1RedirtyCardsQueueSet::add_bufferlist(const G1BufferNodeList& buffers) { +void G1RedirtyCardsQueueSet::add_bufferlist(const BufferNodeList& buffers) { assert(_collecting, "precondition"); if (buffers._head != NULL) { assert(buffers._tail != NULL, "invariant"); diff --git a/src/hotspot/share/gc/g1/g1RedirtyCardsQueue.hpp b/src/hotspot/share/gc/g1/g1RedirtyCardsQueue.hpp index 26bb78c4096e54a4d9f716256213a48e27ba0e8a..b464d3772985fd7afecd72da81e47d9002824623 100644 --- a/src/hotspot/share/gc/g1/g1RedirtyCardsQueue.hpp +++ b/src/hotspot/share/gc/g1/g1RedirtyCardsQueue.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2022, 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,7 +25,7 @@ #ifndef SHARE_GC_G1_G1REDIRTYCARDSQUEUE_HPP #define SHARE_GC_G1_G1REDIRTYCARDSQUEUE_HPP -#include "gc/g1/g1BufferNodeList.hpp" +#include "gc/shared/bufferNodeList.hpp" #include "gc/shared/ptrQueue.hpp" #include "memory/padded.hpp" #include "utilities/macros.hpp" @@ -42,7 +42,7 @@ class G1RedirtyCardsLocalQueueSet : private PtrQueueSet { }; G1RedirtyCardsQueueSet* _shared_qset; - G1BufferNodeList _buffers; + BufferNodeList _buffers; Queue _queue; // Add the buffer to the local list. @@ -84,12 +84,12 @@ public: // Collect buffers. These functions are thread-safe. // precondition: Must not be concurrent with buffer processing. virtual void enqueue_completed_buffer(BufferNode* node); - void add_bufferlist(const G1BufferNodeList& buffers); + void add_bufferlist(const BufferNodeList& buffers); // Processing phase operations. // precondition: Must not be concurrent with buffer collection. BufferNode* all_completed_buffers() const; - G1BufferNodeList take_all_completed_buffers(); + BufferNodeList take_all_completed_buffers(); }; #endif // SHARE_GC_G1_G1REDIRTYCARDSQUEUE_HPP diff --git a/src/hotspot/share/gc/g1/g1RemSet.cpp b/src/hotspot/share/gc/g1/g1RemSet.cpp index e321ff3519a71a81e4c2e7a1e31f1a9fad14b7c1..139773488252ceb903554058a7cc1c0159c61ea6 100644 --- a/src/hotspot/share/gc/g1/g1RemSet.cpp +++ b/src/hotspot/share/gc/g1/g1RemSet.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2022, 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 @@ -45,6 +45,7 @@ #include "gc/g1/heapRegion.inline.hpp" #include "gc/g1/heapRegionManager.inline.hpp" #include "gc/g1/heapRegionRemSet.inline.hpp" +#include "gc/shared/bufferNodeList.hpp" #include "gc/shared/gcTraceTime.inline.hpp" #include "gc/shared/ptrQueue.hpp" #include "gc/shared/suspendibleThreadSet.hpp" @@ -106,7 +107,7 @@ class G1RemSetScanState : public CHeapObj { // within a region to claim. Dependent on the region size as proxy for the heap // size, we limit the total number of chunks to limit memory usage and maintenance // effort of that table vs. granularity of distributing scanning work. - // Testing showed that 8 for 1M/2M region, 16 for 4M/8M regions, 32 for 16/32M regions, + // Testing showed that 64 for 1M/2M region, 128 for 4M/8M regions, 256 for 16/32M regions, // and so on seems to be such a good trade-off. static uint get_chunks_per_region(uint log_region_size) { // Limit the expected input values to current known possible values of the @@ -114,7 +115,7 @@ class G1RemSetScanState : public CHeapObj { // values for region size. assert(log_region_size >= 20 && log_region_size <= 29, "expected value in [20,29], but got %u", log_region_size); - return 1u << (log_region_size / 2 - 7); + return 1u << (log_region_size / 2 - 4); } uint _scan_chunks_per_region; // Number of chunks per region. @@ -1429,7 +1430,7 @@ public: { if (initial_evacuation) { G1DirtyCardQueueSet& dcqs = G1BarrierSet::dirty_card_queue_set(); - G1BufferNodeList buffers = dcqs.take_all_completed_buffers(); + BufferNodeList buffers = dcqs.take_all_completed_buffers(); if (buffers._entry_count != 0) { _dirty_card_buffers.prepend(*buffers._head, *buffers._tail); } @@ -1957,7 +1958,7 @@ public: HeapWord* const top_at_mark_start = hr->prev_top_at_mark_start(); HeapWord* cur = hr->bottom(); - while (cur < hr->end()) { + while (true) { // After every iteration (yield point) we need to check whether the region's // TARS changed due to e.g. eager reclaim. HeapWord* const top_at_rebuild_start = _cm->top_at_rebuild_start(region_idx); diff --git a/src/hotspot/share/gc/g1/g1SegmentedArray.inline.hpp b/src/hotspot/share/gc/g1/g1SegmentedArray.inline.hpp index 1829f47e2169df6c0a63ec12b21498a5e2240e5c..17be55fe6abeca85ff1cfbb51689f9cfffcd253a 100644 --- a/src/hotspot/share/gc/g1/g1SegmentedArray.inline.hpp +++ b/src/hotspot/share/gc/g1/g1SegmentedArray.inline.hpp @@ -34,12 +34,12 @@ template G1SegmentedArraySegment::G1SegmentedArraySegment(uint slot_size, uint num_slots, G1SegmentedArraySegment* next) : _slot_size(slot_size), _num_slots(num_slots), _next(next), _next_allocate(0) { - _segment = NEW_C_HEAP_ARRAY(char, (size_t)_num_slots * slot_size, mtGCCardSet); + _segment = NEW_C_HEAP_ARRAY(char, (size_t)_num_slots * slot_size, flag); } template G1SegmentedArraySegment::~G1SegmentedArraySegment() { - FREE_C_HEAP_ARRAY(mtGCCardSet, _segment); + FREE_C_HEAP_ARRAY(flag, _segment); } template diff --git a/src/hotspot/share/gc/g1/g1YoungCollector.cpp b/src/hotspot/share/gc/g1/g1YoungCollector.cpp index d476c981d7134782d1459bbc74bc6f52674e5712..1a73ed30e26c1481811a4a7f6315f26f41bc336c 100644 --- a/src/hotspot/share/gc/g1/g1YoungCollector.cpp +++ b/src/hotspot/share/gc/g1/g1YoungCollector.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2021, 2022, 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 @@ -59,47 +59,6 @@ #include "memory/resourceArea.hpp" #include "utilities/ticks.hpp" -#if TASKQUEUE_STATS -uint G1YoungCollector::num_task_queues() const { - return task_queues()->size(); -} - -void G1YoungCollector::print_taskqueue_stats_hdr(outputStream* const st) { - st->print_raw_cr("GC Task Stats"); - st->print_raw("thr "); TaskQueueStats::print_header(1, st); st->cr(); - st->print_raw("--- "); TaskQueueStats::print_header(2, st); st->cr(); -} - -void G1YoungCollector::print_taskqueue_stats() const { - if (!log_is_enabled(Trace, gc, task, stats)) { - return; - } - Log(gc, task, stats) log; - ResourceMark rm; - LogStream ls(log.trace()); - outputStream* st = &ls; - - print_taskqueue_stats_hdr(st); - - TaskQueueStats totals; - const uint n = num_task_queues(); - for (uint i = 0; i < n; ++i) { - st->print("%3u ", i); _g1h->task_queue(i)->stats.print(st); st->cr(); - totals += _g1h->task_queue(i)->stats; - } - st->print_raw("tot "); totals.print(st); st->cr(); - - DEBUG_ONLY(totals.verify()); -} - -void G1YoungCollector::reset_taskqueue_stats() { - const uint n = num_task_queues(); - for (uint i = 0; i < n; ++i) { - _g1h->task_queue(i)->stats.reset(); - } -} -#endif // TASKQUEUE_STATS - // GCTraceTime wrapper that constructs the message according to GC pause type and // GC cause. // The code relies on the fact that GCTraceTimeWrapper stores the string passed @@ -1147,6 +1106,5 @@ void G1YoungCollector::collect() { policy()->record_young_collection_end(_concurrent_operation_is_full_mark, evacuation_failed()); } - TASKQUEUE_STATS_ONLY(print_taskqueue_stats()); - TASKQUEUE_STATS_ONLY(reset_taskqueue_stats()); + TASKQUEUE_STATS_ONLY(_g1h->task_queues()->print_and_reset_taskqueue_stats("Oop Queue");) } diff --git a/src/hotspot/share/gc/g1/g1YoungCollector.hpp b/src/hotspot/share/gc/g1/g1YoungCollector.hpp index 055803a3352289117fadd975fbffaee5145c714f..c5ad5c452358ad2dec096d1d3bd3c79340647a40 100644 --- a/src/hotspot/share/gc/g1/g1YoungCollector.hpp +++ b/src/hotspot/share/gc/g1/g1YoungCollector.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2021, 2022, 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 @@ -134,13 +134,6 @@ class G1YoungCollector { // True iff an evacuation has failed in the most-recent collection. bool evacuation_failed() const; -#if TASKQUEUE_STATS - uint num_task_queues() const; - static void print_taskqueue_stats_hdr(outputStream* const st); - void print_taskqueue_stats() const; - void reset_taskqueue_stats(); -#endif // TASKQUEUE_STATS - public: G1YoungCollector(GCCause::Cause gc_cause, double target_pause_time_ms); diff --git a/src/hotspot/share/gc/g1/g1YoungGCPostEvacuateTasks.cpp b/src/hotspot/share/gc/g1/g1YoungGCPostEvacuateTasks.cpp index f8e260e21e69d3368c0c5b20949b6d59d9c859e3..669b3a8ae761ec207724f24fd1f2cb81cb442792 100644 --- a/src/hotspot/share/gc/g1/g1YoungGCPostEvacuateTasks.cpp +++ b/src/hotspot/share/gc/g1/g1YoungGCPostEvacuateTasks.cpp @@ -103,7 +103,7 @@ class G1PostEvacuateCollectionSetCleanupTask1::RemoveSelfForwardPtrsTask : publi public: RemoveSelfForwardPtrsTask(G1EvacFailureRegions* evac_failure_regions) : - G1AbstractSubTask(G1GCPhaseTimes::RemoveSelfForwardingPtr), + G1AbstractSubTask(G1GCPhaseTimes::RestoreRetainedRegions), _task(evac_failure_regions), _evac_failure_regions(evac_failure_regions) { } diff --git a/src/hotspot/share/gc/g1/heapRegion.cpp b/src/hotspot/share/gc/g1/heapRegion.cpp index e2d48b0f85281a4a68fad5b64db0847ee632236b..4994070eacabde1318b229fb57c63d7ad1196d76 100644 --- a/src/hotspot/share/gc/g1/heapRegion.cpp +++ b/src/hotspot/share/gc/g1/heapRegion.cpp @@ -810,7 +810,7 @@ void HeapRegion::object_iterate(ObjectClosure* blk) { void HeapRegion::fill_with_dummy_object(HeapWord* address, size_t word_size, bool zap) { // Keep the BOT in sync for old generation regions. if (is_old()) { - update_bot_at(address, word_size); + update_bot_if_crossing_boundary(address, word_size); } // Fill in the object. CollectedHeap::fill_with_object(address, word_size, zap); diff --git a/src/hotspot/share/gc/g1/heapRegion.hpp b/src/hotspot/share/gc/g1/heapRegion.hpp index 96cd44a3317be3fe8a436ab835fdc2bceee33411..782de66a1cb1744e500921b2ca273167c01992c7 100644 --- a/src/hotspot/share/gc/g1/heapRegion.hpp +++ b/src/hotspot/share/gc/g1/heapRegion.hpp @@ -162,13 +162,8 @@ public: inline HeapWord* allocate(size_t word_size); inline HeapWord* allocate(size_t min_word_size, size_t desired_word_size, size_t* actual_size); - // Update the BOT for the given address if it crosses the next - // BOT threshold at or after obj_start. - inline void update_bot_at(HeapWord* obj_start, size_t obj_size); - // Update BOT at the given threshold for the given object. The - // given object must cross the threshold. - inline void update_bot_crossing_threshold(HeapWord** threshold, HeapWord* obj_start, HeapWord* obj_end); - inline HeapWord* bot_threshold_for_addr(const void* addr); + // Update BOT if this obj is the first entering a new card (i.e. crossing the card boundary). + inline void update_bot_if_crossing_boundary(HeapWord* obj_start, size_t obj_size); // Full GC support methods. diff --git a/src/hotspot/share/gc/g1/heapRegion.inline.hpp b/src/hotspot/share/gc/g1/heapRegion.inline.hpp index 69da12e55bd624932d435296bfd273d85f12501d..2a47d92a475631f04f2b542b19d4fd18901eaa27 100644 --- a/src/hotspot/share/gc/g1/heapRegion.inline.hpp +++ b/src/hotspot/share/gc/g1/heapRegion.inline.hpp @@ -231,32 +231,27 @@ inline HeapWord* HeapRegion::allocate(size_t min_word_size, return allocate_impl(min_word_size, desired_word_size, actual_word_size); } -inline HeapWord* HeapRegion::bot_threshold_for_addr(const void* addr) { - HeapWord* threshold = _bot_part.threshold_for_addr(addr); - assert(threshold >= addr, - "threshold must be at or after given address. " PTR_FORMAT " >= " PTR_FORMAT, - p2i(threshold), p2i(addr)); - assert(is_old(), - "Should only calculate BOT threshold for old regions. addr: " PTR_FORMAT " region:" HR_FORMAT, - p2i(addr), HR_FORMAT_PARAMS(this)); - return threshold; -} - -inline void HeapRegion::update_bot_crossing_threshold(HeapWord** threshold, HeapWord* obj_start, HeapWord* obj_end) { +inline void HeapRegion::update_bot_if_crossing_boundary(HeapWord* obj_start, size_t obj_size) { assert(is_old(), "should only do BOT updates for old regions"); + + HeapWord* obj_end = obj_start + obj_size; + assert(is_in(obj_start), "obj_start must be in this region: " HR_FORMAT - " obj_start " PTR_FORMAT " obj_end " PTR_FORMAT " threshold " PTR_FORMAT, + " obj_start " PTR_FORMAT " obj_end " PTR_FORMAT, HR_FORMAT_PARAMS(this), - p2i(obj_start), p2i(obj_end), p2i(*threshold)); - _bot_part.alloc_block_work(threshold, obj_start, obj_end); -} + p2i(obj_start), p2i(obj_end)); + + HeapWord* cur_card_boundary = _bot_part.align_up_by_card_size(obj_start); -inline void HeapRegion::update_bot_at(HeapWord* obj_start, size_t obj_size) { - HeapWord* threshold = bot_threshold_for_addr(obj_start); - HeapWord* obj_end = obj_start + obj_size; + // strictly greater-than + bool cross_card_boundary = (obj_end > cur_card_boundary); - if (obj_end > threshold) { - update_bot_crossing_threshold(&threshold, obj_start, obj_end); + if (cross_card_boundary) { + // Creating a dummy variable inside this `if` as the arg of `&`; this + // avoids unnecessary loads in the assembly code on the fast path (the + // bot-not-updating case). + HeapWord* dummy = cur_card_boundary; + _bot_part.alloc_block_work(&dummy, obj_start, obj_end); } } diff --git a/src/hotspot/share/gc/g1/heapRegionBounds.hpp b/src/hotspot/share/gc/g1/heapRegionBounds.hpp index 5e748de59286b814d0c9fdc6aca41535f8b42144..5a6db9fac3b145a9706ce805d37ea0629e6dff41 100644 --- a/src/hotspot/share/gc/g1/heapRegionBounds.hpp +++ b/src/hotspot/share/gc/g1/heapRegionBounds.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2022, 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,7 +25,8 @@ #ifndef SHARE_GC_G1_HEAPREGIONBOUNDS_HPP #define SHARE_GC_G1_HEAPREGIONBOUNDS_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" +#include "utilities/globalDefinitions.hpp" class HeapRegionBounds : public AllStatic { private: diff --git a/src/hotspot/share/gc/g1/heapRegionRemSet.inline.hpp b/src/hotspot/share/gc/g1/heapRegionRemSet.inline.hpp index cd48da2a5bfec71c3bcbae36eb815deced4a3172..4bb8e6c4ff90212a5bcedd8a3e9b64d8c8c94b1d 100644 --- a/src/hotspot/share/gc/g1/heapRegionRemSet.inline.hpp +++ b/src/hotspot/share/gc/g1/heapRegionRemSet.inline.hpp @@ -123,10 +123,7 @@ void HeapRegionRemSet::split_card(OopOrNarrowOopStar from, uint& card_region, ui } void HeapRegionRemSet::add_reference(OopOrNarrowOopStar from, uint tid) { - RemSetState state = _state; - if (state == Untracked) { - return; - } + assert(_state != Untracked, "must be"); uint cur_idx = _hr->hrm_index(); uintptr_t from_card = uintptr_t(from) >> CardTable::card_shift(); diff --git a/src/hotspot/share/gc/g1/heapRegionTracer.hpp b/src/hotspot/share/gc/g1/heapRegionTracer.hpp index bdfcd1cfd8e2599016e0d79daeb25d0b3ed1a4a7..647744d0d5e2362029e285109e57a3d1216db05b 100644 --- a/src/hotspot/share/gc/g1/heapRegionTracer.hpp +++ b/src/hotspot/share/gc/g1/heapRegionTracer.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,8 @@ #define SHARE_GC_G1_HEAPREGIONTRACER_HPP #include "gc/g1/g1HeapRegionTraceType.hpp" -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" +#include "utilities/globalDefinitions.hpp" class HeapRegionTracer : AllStatic { public: diff --git a/src/hotspot/share/gc/g1/heapRegionType.hpp b/src/hotspot/share/gc/g1/heapRegionType.hpp index 74807c37746598eda34e1c32c53a8a87c1528333..9e1c79ea0d052433a7993249a89cfa97797cdf1b 100644 --- a/src/hotspot/share/gc/g1/heapRegionType.hpp +++ b/src/hotspot/share/gc/g1/heapRegionType.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,6 +26,7 @@ #define SHARE_GC_G1_HEAPREGIONTYPE_HPP #include "gc/g1/g1HeapRegionTraceType.hpp" +#include "utilities/globalDefinitions.hpp" #define hrt_assert_is_valid(tag) \ assert(is_valid((tag)), "invalid HR type: %u", (uint) (tag)) diff --git a/src/hotspot/share/gc/parallel/objectStartArray.cpp b/src/hotspot/share/gc/parallel/objectStartArray.cpp index 827ff73fb58c0f57d4cb32376e93a5bcad3490e3..3e4820aa9414f8b3e21d3af6fb6847928453d752 100644 --- a/src/hotspot/share/gc/parallel/objectStartArray.cpp +++ b/src/hotspot/share/gc/parallel/objectStartArray.cpp @@ -132,8 +132,15 @@ bool ObjectStartArray::object_starts_in_range(HeapWord* start_addr, "Range is wrong. start_addr (" PTR_FORMAT ") is after end_addr (" PTR_FORMAT ")", p2i(start_addr), p2i(end_addr)); + assert(is_aligned(start_addr, _card_size), "precondition"); + + if (start_addr == end_addr) { + // No objects in empty range. + return false; + } + jbyte* start_block = block_for_addr(start_addr); - jbyte* end_block = block_for_addr(end_addr); + jbyte* end_block = block_for_addr(end_addr - 1); for (jbyte* block = start_block; block <= end_block; block++) { if (*block != clean_block) { diff --git a/src/hotspot/share/gc/parallel/objectStartArray.hpp b/src/hotspot/share/gc/parallel/objectStartArray.hpp index be91b51cd9432c40b4f3681de8b0dfffe3c5578d..06005fc0075616cb5a7b4cfd790ff0f9336bc75b 100644 --- a/src/hotspot/share/gc/parallel/objectStartArray.hpp +++ b/src/hotspot/share/gc/parallel/objectStartArray.hpp @@ -165,9 +165,11 @@ class ObjectStartArray : public CHeapObj { return *block != clean_block; } - // Return true if an object starts in the range of heap addresses. - // If an object starts at an address corresponding to - // "start", the method will return true. + // Return true iff an object starts in + // [start_addr, end_addr_aligned_up) + // where + // end_addr_aligned_up = align_up(end_addr, _card_size) + // Precondition: start_addr is card-size aligned bool object_starts_in_range(HeapWord* start_addr, HeapWord* end_addr) const; }; diff --git a/src/hotspot/share/gc/parallel/psCardTable.cpp b/src/hotspot/share/gc/parallel/psCardTable.cpp index cecb3aa97cb164099d402e66757902f20a2368a3..8f851d9f26e8cca43d605751819ce443f1714a6f 100644 --- a/src/hotspot/share/gc/parallel/psCardTable.cpp +++ b/src/hotspot/share/gc/parallel/psCardTable.cpp @@ -411,284 +411,6 @@ bool PSCardTable::addr_is_marked_precise(void *addr) { return false; } -// Assumes that only the base or the end changes. This allows indentification -// of the region that is being resized. The -// CardTable::resize_covered_region() is used for the normal case -// where the covered regions are growing or shrinking at the high end. -// The method resize_covered_region_by_end() is analogous to -// CardTable::resize_covered_region() but -// for regions that grow or shrink at the low end. -void PSCardTable::resize_covered_region(MemRegion new_region) { - for (int i = 0; i < _cur_covered_regions; i++) { - if (_covered[i].start() == new_region.start()) { - // Found a covered region with the same start as the - // new region. The region is growing or shrinking - // from the start of the region. - resize_covered_region_by_start(new_region); - return; - } - if (_covered[i].start() > new_region.start()) { - break; - } - } - - int changed_region = -1; - for (int j = 0; j < _cur_covered_regions; j++) { - if (_covered[j].end() == new_region.end()) { - changed_region = j; - // This is a case where the covered region is growing or shrinking - // at the start of the region. - assert(changed_region != -1, "Don't expect to add a covered region"); - assert(_covered[changed_region].byte_size() != new_region.byte_size(), - "The sizes should be different here"); - resize_covered_region_by_end(changed_region, new_region); - return; - } - } - // This should only be a new covered region (where no existing - // covered region matches at the start or the end). - assert(_cur_covered_regions < _max_covered_regions, - "An existing region should have been found"); - resize_covered_region_by_start(new_region); -} - -void PSCardTable::resize_covered_region_by_start(MemRegion new_region) { - CardTable::resize_covered_region(new_region); - debug_only(verify_guard();) -} - -void PSCardTable::resize_covered_region_by_end(int changed_region, - MemRegion new_region) { - assert(SafepointSynchronize::is_at_safepoint(), - "Only expect an expansion at the low end at a GC"); - debug_only(verify_guard();) -#ifdef ASSERT - for (int k = 0; k < _cur_covered_regions; k++) { - if (_covered[k].end() == new_region.end()) { - assert(changed_region == k, "Changed region is incorrect"); - break; - } - } -#endif - - // Commit new or uncommit old pages, if necessary. - if (resize_commit_uncommit(changed_region, new_region)) { - // Set the new start of the committed region - resize_update_committed_table(changed_region, new_region); - } - - // Update card table entries - resize_update_card_table_entries(changed_region, new_region); - - // Update the covered region - resize_update_covered_table(changed_region, new_region); - - int ind = changed_region; - log_trace(gc, barrier)("CardTable::resize_covered_region: "); - log_trace(gc, barrier)(" _covered[%d].start(): " INTPTR_FORMAT " _covered[%d].last(): " INTPTR_FORMAT, - ind, p2i(_covered[ind].start()), ind, p2i(_covered[ind].last())); - log_trace(gc, barrier)(" _committed[%d].start(): " INTPTR_FORMAT " _committed[%d].last(): " INTPTR_FORMAT, - ind, p2i(_committed[ind].start()), ind, p2i(_committed[ind].last())); - log_trace(gc, barrier)(" byte_for(start): " INTPTR_FORMAT " byte_for(last): " INTPTR_FORMAT, - p2i(byte_for(_covered[ind].start())), p2i(byte_for(_covered[ind].last()))); - log_trace(gc, barrier)(" addr_for(start): " INTPTR_FORMAT " addr_for(last): " INTPTR_FORMAT, - p2i(addr_for((CardValue*) _committed[ind].start())), p2i(addr_for((CardValue*) _committed[ind].last()))); - - debug_only(verify_guard();) -} - -bool PSCardTable::resize_commit_uncommit(int changed_region, - MemRegion new_region) { - bool result = false; - // Commit new or uncommit old pages, if necessary. - MemRegion cur_committed = _committed[changed_region]; - assert(_covered[changed_region].end() == new_region.end(), - "The ends of the regions are expected to match"); - // Extend the start of this _committed region to - // to cover the start of any previous _committed region. - // This forms overlapping regions, but never interior regions. - HeapWord* min_prev_start = lowest_prev_committed_start(changed_region); - if (min_prev_start < cur_committed.start()) { - // Only really need to set start of "cur_committed" to - // the new start (min_prev_start) but assertion checking code - // below use cur_committed.end() so make it correct. - MemRegion new_committed = - MemRegion(min_prev_start, cur_committed.end()); - cur_committed = new_committed; - } -#ifdef ASSERT - ParallelScavengeHeap* heap = ParallelScavengeHeap::heap(); - assert(cur_committed.start() == align_up(cur_committed.start(), os::vm_page_size()), - "Starts should have proper alignment"); -#endif - - CardValue* new_start = byte_for(new_region.start()); - // Round down because this is for the start address - HeapWord* new_start_aligned = align_down((HeapWord*)new_start, os::vm_page_size()); - // The guard page is always committed and should not be committed over. - // This method is used in cases where the generation is growing toward - // lower addresses but the guard region is still at the end of the - // card table. That still makes sense when looking for writes - // off the end of the card table. - if (new_start_aligned < cur_committed.start()) { - // Expand the committed region - // - // Case A - // |+ guard +| - // |+ cur committed +++++++++| - // |+ new committed +++++++++++++++++| - // - // Case B - // |+ guard +| - // |+ cur committed +| - // |+ new committed +++++++| - // - // These are not expected because the calculation of the - // cur committed region and the new committed region - // share the same end for the covered region. - // Case C - // |+ guard +| - // |+ cur committed +| - // |+ new committed +++++++++++++++++| - // Case D - // |+ guard +| - // |+ cur committed +++++++++++| - // |+ new committed +++++++| - - HeapWord* new_end_for_commit = - MIN2(cur_committed.end(), _guard_region.start()); - if(new_start_aligned < new_end_for_commit) { - MemRegion new_committed = - MemRegion(new_start_aligned, new_end_for_commit); - os::commit_memory_or_exit((char*)new_committed.start(), - new_committed.byte_size(), !ExecMem, - "card table expansion"); - } - result = true; - } else if (new_start_aligned > cur_committed.start()) { - // Shrink the committed region -#if 0 // uncommitting space is currently unsafe because of the interactions - // of growing and shrinking regions. One region A can uncommit space - // that it owns but which is being used by another region B (maybe). - // Region B has not committed the space because it was already - // committed by region A. - MemRegion uncommit_region = committed_unique_to_self(changed_region, - MemRegion(cur_committed.start(), new_start_aligned)); - if (!uncommit_region.is_empty()) { - if (!os::uncommit_memory((char*)uncommit_region.start(), - uncommit_region.byte_size())) { - // If the uncommit fails, ignore it. Let the - // committed table resizing go even though the committed - // table will over state the committed space. - } - } -#else - assert(!result, "Should be false with current workaround"); -#endif - } - assert(_committed[changed_region].end() == cur_committed.end(), - "end should not change"); - return result; -} - -void PSCardTable::resize_update_committed_table(int changed_region, - MemRegion new_region) { - - CardValue* new_start = byte_for(new_region.start()); - // Set the new start of the committed region - HeapWord* new_start_aligned = align_down((HeapWord*)new_start, os::vm_page_size()); - MemRegion new_committed = MemRegion(new_start_aligned, - _committed[changed_region].end()); - _committed[changed_region] = new_committed; - _committed[changed_region].set_start(new_start_aligned); -} - -void PSCardTable::resize_update_card_table_entries(int changed_region, - MemRegion new_region) { - debug_only(verify_guard();) - MemRegion original_covered = _covered[changed_region]; - // Initialize the card entries. Only consider the - // region covered by the card table (_whole_heap) - CardValue* entry; - if (new_region.start() < _whole_heap.start()) { - entry = byte_for(_whole_heap.start()); - } else { - entry = byte_for(new_region.start()); - } - CardValue* end = byte_for(original_covered.start()); - // If _whole_heap starts at the original covered regions start, - // this loop will not execute. - while (entry < end) { *entry++ = clean_card; } -} - -void PSCardTable::resize_update_covered_table(int changed_region, - MemRegion new_region) { - // Update the covered region - _covered[changed_region].set_start(new_region.start()); - _covered[changed_region].set_word_size(new_region.word_size()); - - // reorder regions. There should only be at most 1 out - // of order. - for (int i = _cur_covered_regions-1 ; i > 0; i--) { - if (_covered[i].start() < _covered[i-1].start()) { - MemRegion covered_mr = _covered[i-1]; - _covered[i-1] = _covered[i]; - _covered[i] = covered_mr; - MemRegion committed_mr = _committed[i-1]; - _committed[i-1] = _committed[i]; - _committed[i] = committed_mr; - break; - } - } -#ifdef ASSERT - for (int m = 0; m < _cur_covered_regions-1; m++) { - assert(_covered[m].start() <= _covered[m+1].start(), - "Covered regions out of order"); - assert(_committed[m].start() <= _committed[m+1].start(), - "Committed regions out of order"); - } -#endif -} - -// Returns the start of any committed region that is lower than -// the target committed region (index ind) and that intersects the -// target region. If none, return start of target region. -// -// ------------- -// | | -// ------------- -// ------------ -// | target | -// ------------ -// ------------- -// | | -// ------------- -// ^ returns this -// -// ------------- -// | | -// ------------- -// ------------ -// | target | -// ------------ -// ------------- -// | | -// ------------- -// ^ returns this - -HeapWord* PSCardTable::lowest_prev_committed_start(int ind) const { - assert(_cur_covered_regions >= 0, "Expecting at least on region"); - HeapWord* min_start = _committed[ind].start(); - for (int j = 0; j < ind; j++) { - HeapWord* this_start = _committed[j].start(); - if ((this_start < min_start) && - !(_committed[j].intersection(_committed[ind])).is_empty()) { - min_start = this_start; - } - } - return min_start; -} - bool PSCardTable::is_in_young(oop obj) const { return ParallelScavengeHeap::heap()->is_in_young(obj); } diff --git a/src/hotspot/share/gc/parallel/psCardTable.hpp b/src/hotspot/share/gc/parallel/psCardTable.hpp index d912c6567412503e1c08ced94824b24d4b41c401..bfbaab7d7fc29e0f78e371bb2548a3bd2714f318 100644 --- a/src/hotspot/share/gc/parallel/psCardTable.hpp +++ b/src/hotspot/share/gc/parallel/psCardTable.hpp @@ -34,14 +34,6 @@ class PSPromotionManager; class PSCardTable: public CardTable { private: - // Support methods for resizing the card table. - // resize_commit_uncommit() returns true if the pages were committed or - // uncommitted - bool resize_commit_uncommit(int changed_region, MemRegion new_region); - void resize_update_card_table_entries(int changed_region, - MemRegion new_region); - void resize_update_committed_table(int changed_region, MemRegion new_region); - void resize_update_covered_table(int changed_region, MemRegion new_region); void verify_all_young_refs_precise_helper(MemRegion mr); @@ -84,19 +76,6 @@ class PSCardTable: public CardTable { // ReduceInitialCardMarks support bool is_in_young(oop obj) const; - // Adaptive size policy support - // Allows adjustment of the base and size of the covered regions - void resize_covered_region(MemRegion new_region); - // Finds the covered region to resize based on the start address - // of the covered regions. - void resize_covered_region_by_start(MemRegion new_region); - // Finds the covered region to resize based on the end address - // of the covered regions. - void resize_covered_region_by_end(int changed_region, MemRegion new_region); - // Finds the lowest start address of a covered region that is - // previous (i.e., lower index) to the covered region with index "ind". - HeapWord* lowest_prev_committed_start(int ind) const; - #ifdef ASSERT bool is_valid_card_address(CardValue* addr) { return (addr >= _byte_map) && (addr < _byte_map + _byte_map_size); diff --git a/src/hotspot/share/gc/parallel/psCompactionManager.cpp b/src/hotspot/share/gc/parallel/psCompactionManager.cpp index 0a71ec80e3bd5fc5ed035649b179597f1ef67a40..c6bb7bf1e996b85e2efb11bf54cbe83e6f9d0ef5 100644 --- a/src/hotspot/share/gc/parallel/psCompactionManager.cpp +++ b/src/hotspot/share/gc/parallel/psCompactionManager.cpp @@ -70,7 +70,7 @@ void ParCompactionManager::initialize(ParMarkBitMap* mbm) { uint parallel_gc_threads = ParallelScavengeHeap::heap()->workers().max_workers(); assert(_manager_array == NULL, "Attempt to initialize twice"); - _manager_array = NEW_C_HEAP_ARRAY(ParCompactionManager*, parallel_gc_threads+1, mtGC); + _manager_array = NEW_C_HEAP_ARRAY(ParCompactionManager*, parallel_gc_threads, mtGC); _oop_task_queues = new OopTaskQueueSet(parallel_gc_threads); _objarray_task_queues = new ObjArrayTaskQueueSet(parallel_gc_threads); @@ -84,9 +84,6 @@ void ParCompactionManager::initialize(ParMarkBitMap* mbm) { region_task_queues()->register_queue(i, _manager_array[i]->region_stack()); } - // The VMThread gets its own ParCompactionManager, which is not available - // for work stealing. - _manager_array[parallel_gc_threads] = new ParCompactionManager(); assert(ParallelScavengeHeap::heap()->workers().max_workers() != 0, "Not initialized?"); @@ -97,14 +94,14 @@ void ParCompactionManager::initialize(ParMarkBitMap* mbm) { void ParCompactionManager::reset_all_bitmap_query_caches() { uint parallel_gc_threads = ParallelScavengeHeap::heap()->workers().max_workers(); - for (uint i=0; i<=parallel_gc_threads; i++) { + for (uint i=0; ireset_bitmap_query_cache(); } } void ParCompactionManager::flush_all_string_dedup_requests() { uint parallel_gc_threads = ParallelScavengeHeap::heap()->workers().max_workers(); - for (uint i=0; i<=parallel_gc_threads; i++) { + for (uint i=0; iflush_string_dedup_requests(); } } @@ -116,12 +113,24 @@ ParCompactionManager::gc_thread_compaction_manager(uint index) { return _manager_array[index]; } +bool ParCompactionManager::transfer_from_overflow_stack(ObjArrayTask& task) { + while (_objarray_stack.pop_overflow(task)) { + if (!_objarray_stack.try_push_to_taskqueue(task)) { + return true; + } + } + return false; +} + void ParCompactionManager::follow_marking_stacks() { do { - // Drain the overflow stack first, to allow stealing from the marking stack. + // First, try to move tasks from the overflow stack into the shared buffer, so + // that other threads can steal. Otherwise process the overflow stack first. oop obj; while (marking_stack()->pop_overflow(obj)) { - follow_contents(obj); + if (!marking_stack()->try_push_to_taskqueue(obj)) { + follow_contents(obj); + } } while (marking_stack()->pop_local(obj)) { follow_contents(obj); @@ -129,7 +138,7 @@ void ParCompactionManager::follow_marking_stacks() { // Process ObjArrays one at a time to avoid marking stack bloat. ObjArrayTask task; - if (_objarray_stack.pop_overflow(task) || _objarray_stack.pop_local(task)) { + if (transfer_from_overflow_stack(task) || _objarray_stack.pop_local(task)) { follow_array((objArrayOop)task.obj(), task.index()); } } while (!marking_stacks_empty()); @@ -184,14 +193,14 @@ void ParCompactionManager::remove_all_shadow_regions() { #ifdef ASSERT void ParCompactionManager::verify_all_marking_stack_empty() { uint parallel_gc_threads = ParallelGCThreads; - for (uint i = 0; i <= parallel_gc_threads; i++) { + for (uint i = 0; i < parallel_gc_threads; i++) { assert(_manager_array[i]->marking_stacks_empty(), "Marking stack should be empty"); } } void ParCompactionManager::verify_all_region_stack_empty() { uint parallel_gc_threads = ParallelGCThreads; - for (uint i = 0; i <= parallel_gc_threads; i++) { + for (uint i = 0; i < parallel_gc_threads; i++) { assert(_manager_array[i]->region_stack()->is_empty(), "Region stack should be empty"); } } diff --git a/src/hotspot/share/gc/parallel/psCompactionManager.hpp b/src/hotspot/share/gc/parallel/psCompactionManager.hpp index 2e73da920b5f0f8bc16da9b21d16cdc10e6ed5ce..0cb5d33e0f5476b6c3b517ff04d87418bc0a1d3b 100644 --- a/src/hotspot/share/gc/parallel/psCompactionManager.hpp +++ b/src/hotspot/share/gc/parallel/psCompactionManager.hpp @@ -97,6 +97,7 @@ class ParCompactionManager : public CHeapObj { static void initialize(ParMarkBitMap* mbm); + bool transfer_from_overflow_stack(ObjArrayTask& task); protected: // Array of task queues. Needed by the task terminator. static RegionTaskQueueSet* region_task_queues() { return _region_task_queues; } @@ -147,7 +148,9 @@ class ParCompactionManager : public CHeapObj { RegionTaskQueue* region_stack() { return &_region_stack; } - static ParCompactionManager* get_vmthread_cm() { return _manager_array[ParallelGCThreads]; } + // Get the compaction manager when doing evacuation work from the VM thread. + // Simply use the first compaction manager here. + static ParCompactionManager* get_vmthread_cm() { return _manager_array[0]; } ParCompactionManager(); diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.cpp b/src/hotspot/share/gc/parallel/psParallelCompact.cpp index a28ebbf1510f11e7b68b6bfcdf857d387cba6731..d415de47ca5b0cd603d9c4a7a4461ed3a6ea12a2 100644 --- a/src/hotspot/share/gc/parallel/psParallelCompact.cpp +++ b/src/hotspot/share/gc/parallel/psParallelCompact.cpp @@ -1595,8 +1595,7 @@ void PSParallelCompact::summary_phase_msg(SpaceId dst_space_id, } #endif // #ifndef PRODUCT -void PSParallelCompact::summary_phase(ParCompactionManager* cm, - bool maximum_compaction) +void PSParallelCompact::summary_phase(bool maximum_compaction) { GCTraceTime(Info, gc, phases) tm("Summary Phase", &_gc_timer); @@ -1735,10 +1734,6 @@ bool PSParallelCompact::invoke_no_policy(bool maximum_heap_compaction) { _gc_timer.register_gc_start(); _gc_tracer.report_gc_start(heap->gc_cause(), _gc_timer.gc_start()); - TimeStamp marking_start; - TimeStamp compaction_start; - TimeStamp collection_exit; - GCCause::Cause gc_cause = heap->gc_cause(); PSYoungGen* young_gen = heap->young_gen(); PSOldGen* old_gen = heap->old_gen(); @@ -1760,9 +1755,6 @@ bool PSParallelCompact::invoke_no_policy(bool maximum_heap_compaction) { const PreGenGCValues pre_gc_values = heap->get_pre_gc_values(); - // Get the compaction manager reserved for the VM thread. - ParCompactionManager* const vmthread_cm = ParCompactionManager::get_vmthread_cm(); - { const uint active_workers = WorkerPolicy::calc_active_workers(ParallelScavengeHeap::heap()->workers().max_workers(), @@ -1791,12 +1783,11 @@ bool PSParallelCompact::invoke_no_policy(bool maximum_heap_compaction) { ref_processor()->start_discovery(maximum_heap_compaction); - marking_start.update(); - marking_phase(vmthread_cm, &_gc_tracer); + marking_phase(&_gc_tracer); bool max_on_system_gc = UseMaximumCompactionOnSystemGC && GCCause::is_user_requested_gc(gc_cause); - summary_phase(vmthread_cm, maximum_heap_compaction || max_on_system_gc); + summary_phase(maximum_heap_compaction || max_on_system_gc); #if COMPILER2_OR_JVMCI assert(DerivedPointerTable::is_active(), "Sanity"); @@ -1807,7 +1798,6 @@ bool PSParallelCompact::invoke_no_policy(bool maximum_heap_compaction) { // needed by the compaction for filling holes in the dense prefix. adjust_roots(); - compaction_start.update(); compact(); ParCompactionManager::verify_all_region_stack_empty(); @@ -1922,15 +1912,9 @@ bool PSParallelCompact::invoke_no_policy(bool maximum_heap_compaction) { old_gen->object_space()->check_mangled_unused_area_complete(); } - collection_exit.update(); - heap->print_heap_after_gc(); heap->trace_heap_after_gc(&_gc_tracer); - log_debug(gc, task, time)("VM-Thread " JLONG_FORMAT " " JLONG_FORMAT " " JLONG_FORMAT, - marking_start.ticks(), compaction_start.ticks(), - collection_exit.ticks()); - AdaptiveSizePolicyOutput::print(size_policy, heap->total_collections()); _gc_timer.register_gc_end(); @@ -2000,17 +1984,15 @@ void steal_marking_work(TaskTerminator& terminator, uint worker_id) { ParCompactionManager* cm = ParCompactionManager::gc_thread_compaction_manager(worker_id); - oop obj = NULL; - ObjArrayTask task; do { - while (ParCompactionManager::steal_objarray(worker_id, task)) { + oop obj = NULL; + ObjArrayTask task; + if (ParCompactionManager::steal_objarray(worker_id, task)) { cm->follow_array((objArrayOop)task.obj(), task.index()); - cm->follow_marking_stacks(); - } - while (ParCompactionManager::steal(worker_id, obj)) { + } else if (ParCompactionManager::steal(worker_id, obj)) { cm->follow_contents(obj); - cm->follow_marking_stacks(); } + cm->follow_marking_stacks(); } while (!terminator.offer_termination()); } @@ -2075,8 +2057,7 @@ public: } }; -void PSParallelCompact::marking_phase(ParCompactionManager* cm, - ParallelOldTracer *gc_tracer) { +void PSParallelCompact::marking_phase(ParallelOldTracer *gc_tracer) { // Recursively traverse all live objects and mark them GCTraceTime(Info, gc, phases) tm("Marking Phase", &_gc_timer); @@ -2135,20 +2116,11 @@ void PSParallelCompact::marking_phase(ParCompactionManager* cm, } _gc_tracer.report_object_count_after_gc(is_alive_closure()); -} - -#ifdef ASSERT -void PCAdjustPointerClosure::verify_cm(ParCompactionManager* cm) { - assert(cm != NULL, "associate ParCompactionManage should not be NULL"); - auto vmthread_cm = ParCompactionManager::get_vmthread_cm(); - if (Thread::current()->is_VM_thread()) { - assert(cm == vmthread_cm, "VM threads should use ParCompactionManager from get_vmthread_cm()"); - } else { - assert(Thread::current()->is_Worker_thread(), "Must be a GC thread"); - assert(cm != vmthread_cm, "GC threads should use ParCompactionManager from gc_thread_compaction_manager()"); - } -} +#if TASKQUEUE_STATS + ParCompactionManager::oop_task_queues()->print_and_reset_taskqueue_stats("Oop Queue"); + ParCompactionManager::_objarray_task_queues->print_and_reset_taskqueue_stats("ObjArrayOop Queue"); #endif +} class PSAdjustTask final : public WorkerTask { SubTasksDone _sub_tasks; @@ -2540,9 +2512,7 @@ void PSParallelCompact::compact() { { GCTraceTime(Trace, gc, phases) tm("Deferred Updates", &_gc_timer); - // Update the deferred objects, if any. In principle, any compaction - // manager can be used. However, since the current thread is VM thread, we - // use the rightful one to keep the verification logic happy. + // Update the deferred objects, if any. ParCompactionManager* cm = ParCompactionManager::get_vmthread_cm(); for (unsigned int id = old_space_id; id < last_space_id; ++id) { update_deferred_objects(cm, SpaceId(id)); diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.hpp b/src/hotspot/share/gc/parallel/psParallelCompact.hpp index 0b8eb6b01167513baf942aabe5e58a13b3915df8..77a9d44f9b6b44045c3cf41814c4a55369d03a5c 100644 --- a/src/hotspot/share/gc/parallel/psParallelCompact.hpp +++ b/src/hotspot/share/gc/parallel/psParallelCompact.hpp @@ -1062,8 +1062,7 @@ class PSParallelCompact : AllStatic { static void post_compact(); // Mark live objects - static void marking_phase(ParCompactionManager* cm, - ParallelOldTracer *gc_tracer); + static void marking_phase(ParallelOldTracer *gc_tracer); // Compute the dense prefix for the designated space. This is an experimental // implementation currently not used in production. @@ -1123,7 +1122,7 @@ class PSParallelCompact : AllStatic { static void summarize_spaces_quick(); static void summarize_space(SpaceId id, bool maximum_compaction); - static void summary_phase(ParCompactionManager* cm, bool maximum_compaction); + static void summary_phase(bool maximum_compaction); // Adjust addresses in roots. Does not adjust addresses in heap. static void adjust_roots(); diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.inline.hpp b/src/hotspot/share/gc/parallel/psParallelCompact.inline.hpp index 001f55c076a9f72ee5fc0109f5c4ed9f2a176600..48c5a98fd1a6447e0a8196876a3231f6872f248b 100644 --- a/src/hotspot/share/gc/parallel/psParallelCompact.inline.hpp +++ b/src/hotspot/share/gc/parallel/psParallelCompact.inline.hpp @@ -126,9 +126,7 @@ inline void PSParallelCompact::adjust_pointer(T* p, ParCompactionManager* cm) { class PCAdjustPointerClosure: public BasicOopIterateClosure { public: - PCAdjustPointerClosure(ParCompactionManager* cm) { - verify_cm(cm); - _cm = cm; + PCAdjustPointerClosure(ParCompactionManager* cm) : _cm(cm) { } template void do_oop_nv(T* p) { PSParallelCompact::adjust_pointer(p, _cm); } virtual void do_oop(oop* p) { do_oop_nv(p); } @@ -137,8 +135,6 @@ public: virtual ReferenceIterationMode reference_iteration_mode() { return DO_FIELDS; } private: ParCompactionManager* _cm; - - static void verify_cm(ParCompactionManager* cm) NOT_DEBUG_RETURN; }; #endif // SHARE_GC_PARALLEL_PSPARALLELCOMPACT_INLINE_HPP diff --git a/src/hotspot/share/gc/parallel/psPromotionManager.cpp b/src/hotspot/share/gc/parallel/psPromotionManager.cpp index 7ef706aba936b3fc251dc97b4e653fdb5b0640ec..0eef76678103ffaf4f98d0993dffc2675ab3c42f 100644 --- a/src/hotspot/share/gc/parallel/psPromotionManager.cpp +++ b/src/hotspot/share/gc/parallel/psPromotionManager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2022, 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 @@ -54,7 +54,7 @@ void PSPromotionManager::initialize() { _old_gen = heap->old_gen(); _young_space = heap->young_gen()->to_space(); - const uint promotion_manager_num = ParallelGCThreads + 1; + const uint promotion_manager_num = ParallelGCThreads; // To prevent false sharing, we pad the PSPromotionManagers // and make sure that the first instance starts at a cache line. @@ -95,7 +95,7 @@ PSPromotionManager* PSPromotionManager::gc_thread_promotion_manager(uint index) PSPromotionManager* PSPromotionManager::vm_thread_promotion_manager() { assert(_manager_array != NULL, "Sanity"); - return &_manager_array[ParallelGCThreads]; + return &_manager_array[0]; } void PSPromotionManager::pre_scavenge() { @@ -104,7 +104,7 @@ void PSPromotionManager::pre_scavenge() { _preserved_marks_set->assert_empty(); _young_space = heap->young_gen()->to_space(); - for(uint i=0; ireset(); } } @@ -113,7 +113,7 @@ bool PSPromotionManager::post_scavenge(YoungGCTracer& gc_tracer) { bool promotion_failure_occurred = false; TASKQUEUE_STATS_ONLY(print_taskqueue_stats()); - for (uint i = 0; i < ParallelGCThreads + 1; i++) { + for (uint i = 0; i < ParallelGCThreads; i++) { PSPromotionManager* manager = manager_array(i); assert(manager->claimed_stack_depth()->is_empty(), "should be empty"); if (manager->_promotion_failed_info.has_failed()) { @@ -147,37 +147,24 @@ static const char* const pm_stats_hdr[] = { "--- ---------- ---------- ---------- ----------" }; -void -PSPromotionManager::print_taskqueue_stats() { +void PSPromotionManager::print_taskqueue_stats() { if (!log_is_enabled(Trace, gc, task, stats)) { return; } Log(gc, task, stats) log; ResourceMark rm; LogStream ls(log.trace()); - outputStream* out = &ls; - out->print_cr("== GC Tasks Stats, GC %3d", - ParallelScavengeHeap::heap()->total_collections()); - - TaskQueueStats totals; - out->print("thr "); TaskQueueStats::print_header(1, out); out->cr(); - out->print("--- "); TaskQueueStats::print_header(2, out); out->cr(); - for (uint i = 0; i < ParallelGCThreads + 1; ++i) { - TaskQueueStats& next = manager_array(i)->_claimed_stack_depth.stats; - out->print("%3d ", i); next.print(out); out->cr(); - totals += next; - } - out->print("tot "); totals.print(out); out->cr(); + + stack_array_depth()->print_taskqueue_stats(&ls, "Oop Queue"); const uint hlines = sizeof(pm_stats_hdr) / sizeof(pm_stats_hdr[0]); - for (uint i = 0; i < hlines; ++i) out->print_cr("%s", pm_stats_hdr[i]); - for (uint i = 0; i < ParallelGCThreads + 1; ++i) { - manager_array(i)->print_local_stats(out, i); + for (uint i = 0; i < hlines; ++i) ls.print_cr("%s", pm_stats_hdr[i]); + for (uint i = 0; i < ParallelGCThreads; ++i) { + manager_array(i)->print_local_stats(&ls, i); } } -void -PSPromotionManager::reset_stats() { +void PSPromotionManager::reset_stats() { claimed_stack_depth()->stats.reset(); _array_chunk_pushes = _array_chunk_steals = 0; _arrays_chunked = _array_chunks_processed = 0; @@ -216,8 +203,6 @@ void PSPromotionManager::reset() { // We need to get an assert in here to make sure the labs are always flushed. - ParallelScavengeHeap* heap = ParallelScavengeHeap::heap(); - // Do not prefill the LAB's, save heap wastage! HeapWord* lab_base = young_space()->top(); _young_lab.initialize(MemRegion(lab_base, (size_t)0)); @@ -244,12 +229,6 @@ void PSPromotionManager::restore_preserved_marks() { void PSPromotionManager::drain_stacks_depth(bool totally_drain) { totally_drain = totally_drain || _totally_drain; -#ifdef ASSERT - ParallelScavengeHeap* heap = ParallelScavengeHeap::heap(); - MutableSpace* to_space = heap->young_gen()->to_space(); - MutableSpace* old_space = heap->old_gen()->object_space(); -#endif /* ASSERT */ - PSScannerTasksQueue* const tq = claimed_stack_depth(); do { ScannerTask task; diff --git a/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp b/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp index 733af9bee7f0bfb6e19d8387322bf849590e9245..b3f1c7297f40a2261ab9cba8ad8a27fcb00337e1 100644 --- a/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp +++ b/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp @@ -44,7 +44,7 @@ inline PSPromotionManager* PSPromotionManager::manager_array(uint index) { assert(_manager_array != NULL, "access of NULL manager_array"); - assert(index <= ParallelGCThreads, "out of range manager_array access"); + assert(index < ParallelGCThreads, "out of range manager_array access"); return &_manager_array[index]; } diff --git a/src/hotspot/share/gc/parallel/psRootType.hpp b/src/hotspot/share/gc/parallel/psRootType.hpp index 921bbfdd2b0f12b174da13ae090bd0e2023870a9..cbdc94dc9abe6fcc0b7c727497988545734d3861 100644 --- a/src/hotspot/share/gc/parallel/psRootType.hpp +++ b/src/hotspot/share/gc/parallel/psRootType.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2022, 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,7 +25,7 @@ #ifndef SHARE_GC_PARALLEL_PSROOTTYPE_HPP #define SHARE_GC_PARALLEL_PSROOTTYPE_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "utilities/macros.hpp" class ParallelRootType : public AllStatic { diff --git a/src/hotspot/share/gc/parallel/psScavenge.cpp b/src/hotspot/share/gc/parallel/psScavenge.cpp index e3b3e76ca470569f7815ba58da4d365627e37d3d..995c5157dfc2b8826f1f9e08f766173c755e58f8 100644 --- a/src/hotspot/share/gc/parallel/psScavenge.cpp +++ b/src/hotspot/share/gc/parallel/psScavenge.cpp @@ -70,8 +70,6 @@ #include "services/memoryService.hpp" #include "utilities/stack.inline.hpp" -HeapWord* PSScavenge::_to_space_top_before_gc = NULL; -int PSScavenge::_consecutive_skipped_scavenges = 0; SpanSubjectToDiscoveryClosure PSScavenge::_span_based_discoverer; ReferenceProcessor* PSScavenge::_ref_processor = NULL; PSCardTable* PSScavenge::_card_table = NULL; @@ -285,37 +283,30 @@ class ScavengeRootsTask : public WorkerTask { PSOldGen* _old_gen; HeapWord* _gen_top; uint _active_workers; - bool _is_empty; + bool _is_old_gen_empty; TaskTerminator _terminator; public: ScavengeRootsTask(PSOldGen* old_gen, - HeapWord* gen_top, - uint active_workers, - bool is_empty) : + uint active_workers) : WorkerTask("ScavengeRootsTask"), _strong_roots_scope(active_workers), _subtasks(ParallelRootType::sentinel), _old_gen(old_gen), - _gen_top(gen_top), + _gen_top(old_gen->object_space()->top()), _active_workers(active_workers), - _is_empty(is_empty), + _is_old_gen_empty(old_gen->object_space()->is_empty()), _terminator(active_workers, PSPromotionManager::vm_thread_promotion_manager()->stack_array_depth()) { + assert(_old_gen != NULL, "Sanity"); } virtual void work(uint worker_id) { + assert(worker_id < _active_workers, "Sanity"); ResourceMark rm; - if (!_is_empty) { + if (!_is_old_gen_empty) { // There are only old-to-young pointers if there are objects // in the old gen. - - assert(_old_gen != NULL, "Sanity"); - // There are no old-to-young pointers if the old gen is empty. - assert(!_old_gen->object_space()->is_empty(), "Should not be called is there is no work"); - assert(_old_gen->object_space()->contains(_gen_top) || _gen_top == _old_gen->object_space()->top(), "Sanity"); - assert(worker_id < ParallelGCThreads, "Sanity"); - { PSPromotionManager* pm = PSPromotionManager::gc_thread_promotion_manager(worker_id); PSCardTable* card_table = ParallelScavengeHeap::heap()->card_table(); @@ -367,12 +358,6 @@ bool PSScavenge::invoke_no_policy() { _gc_timer.register_gc_start(); - TimeStamp scavenge_entry; - TimeStamp scavenge_midpoint; - TimeStamp scavenge_exit; - - scavenge_entry.update(); - if (GCLocker::check_active_before_gc()) { return false; } @@ -444,8 +429,6 @@ bool PSScavenge::invoke_no_policy() { "Attempt to scavenge with live objects in to_space"); young_gen->to_space()->clear(SpaceDecorator::Mangle); - save_to_space_top_before_gc(); - #if COMPILER2_OR_JVMCI DerivedPointerTable::clear(); #endif @@ -457,12 +440,6 @@ bool PSScavenge::invoke_no_policy() { // Reset our survivor overflow. set_survivor_overflow(false); - // We need to save the old top values before - // creating the promotion_manager. We pass the top - // values to the card_table, to prevent it from - // straying into the promotion labs. - HeapWord* old_top = old_gen->object_space()->top(); - const uint active_workers = WorkerPolicy::calc_active_workers(ParallelScavengeHeap::heap()->workers().max_workers(), ParallelScavengeHeap::heap()->workers().active_workers(), @@ -476,12 +453,10 @@ bool PSScavenge::invoke_no_policy() { { GCTraceTime(Debug, gc, phases) tm("Scavenge", &_gc_timer); - ScavengeRootsTask task(old_gen, old_top, active_workers, old_gen->object_space()->is_empty()); + ScavengeRootsTask task(old_gen, active_workers); ParallelScavengeHeap::heap()->workers().run_task(&task); } - scavenge_midpoint.update(); - // Process reference objects discovered during scavenge { GCTraceTime(Debug, gc, phases) tm("Reference Processing", &_gc_timer); @@ -686,12 +661,6 @@ bool PSScavenge::invoke_no_policy() { heap->print_heap_after_gc(); heap->trace_heap_after_gc(&_gc_tracer); - scavenge_exit.update(); - - log_debug(gc, task, time)("VM-Thread " JLONG_FORMAT " " JLONG_FORMAT " " JLONG_FORMAT, - scavenge_entry.ticks(), scavenge_midpoint.ticks(), - scavenge_exit.ticks()); - AdaptiveSizePolicyOutput::print(size_policy, heap->total_collections()); _gc_timer.register_gc_end(); @@ -729,7 +698,6 @@ bool PSScavenge::should_attempt_scavenge() { // Do not attempt to promote unless to_space is empty if (!young_gen->to_space()->is_empty()) { - _consecutive_skipped_scavenges++; if (UsePerfData) { counters->update_scavenge_skipped(to_space_not_empty); } @@ -753,10 +721,7 @@ bool PSScavenge::should_attempt_scavenge() { log_trace(ergo)(" padded_promoted_average is greater than maximum promotion = " SIZE_FORMAT, young_gen->used_in_bytes()); } - if (result) { - _consecutive_skipped_scavenges = 0; - } else { - _consecutive_skipped_scavenges++; + if (!result) { if (UsePerfData) { counters->update_scavenge_skipped(promoted_too_large); } diff --git a/src/hotspot/share/gc/parallel/psScavenge.hpp b/src/hotspot/share/gc/parallel/psScavenge.hpp index 440519ff7076df79e823661980538135b6584195..c575e8a3f2ca4d8ad6250bbaa4539dacc27751d3 100644 --- a/src/hotspot/share/gc/parallel/psScavenge.hpp +++ b/src/hotspot/share/gc/parallel/psScavenge.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2022, 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 @@ -29,7 +29,7 @@ #include "gc/parallel/psVirtualspace.hpp" #include "gc/shared/collectorCounters.hpp" #include "gc/shared/gcTrace.hpp" -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "oops/oop.hpp" #include "utilities/stack.hpp" @@ -53,14 +53,6 @@ class PSScavenge: AllStatic { full_follows_scavenge }; - // Saved value of to_space->top(), used to prevent objects in to_space from - // being rescanned. - static HeapWord* _to_space_top_before_gc; - - // Number of consecutive attempts to scavenge that were skipped - static int _consecutive_skipped_scavenges; - - protected: // Flags/counters static SpanSubjectToDiscoveryClosure _span_based_discoverer; @@ -84,9 +76,6 @@ class PSScavenge: AllStatic { static bool should_attempt_scavenge(); - static HeapWord* to_space_top_before_gc() { return _to_space_top_before_gc; } - static inline void save_to_space_top_before_gc(); - // Private accessors static PSCardTable* const card_table() { assert(_card_table != NULL, "Sanity"); return _card_table; } static const ParallelScavengeTracer* gc_tracer() { return &_gc_tracer; } @@ -95,8 +84,6 @@ class PSScavenge: AllStatic { // Accessors static uint tenuring_threshold() { return _tenuring_threshold; } static elapsedTimer* accumulated_time() { return &_accumulated_time; } - static int consecutive_skipped_scavenges() - { return _consecutive_skipped_scavenges; } // Performance Counters static CollectorCounters* counters() { return _counters; } diff --git a/src/hotspot/share/gc/parallel/psScavenge.inline.hpp b/src/hotspot/share/gc/parallel/psScavenge.inline.hpp index 1fee9f08339ed8c5bf947e6c69b9be323f6ed310..af3ff4c616513e18bcfdedb2a28b5c58b8abb5f2 100644 --- a/src/hotspot/share/gc/parallel/psScavenge.inline.hpp +++ b/src/hotspot/share/gc/parallel/psScavenge.inline.hpp @@ -35,11 +35,6 @@ #include "oops/oop.inline.hpp" #include "utilities/globalDefinitions.hpp" -inline void PSScavenge::save_to_space_top_before_gc() { - ParallelScavengeHeap* heap = ParallelScavengeHeap::heap(); - _to_space_top_before_gc = heap->young_gen()->to_space()->top(); -} - template inline bool PSScavenge::should_scavenge(T* p) { T heap_oop = RawAccess<>::oop_load(p); return PSScavenge::is_obj_in_young(heap_oop); @@ -51,7 +46,7 @@ inline bool PSScavenge::should_scavenge(T* p, MutableSpace* to_space) { oop obj = RawAccess::oop_load(p); // Skip objects copied to to_space since the scavenge started. HeapWord* const addr = cast_from_oop(obj); - return addr < to_space_top_before_gc() || addr >= to_space->end(); + return addr < to_space->bottom() || addr >= to_space->end(); } return false; } diff --git a/src/hotspot/share/gc/serial/serialHeap.hpp b/src/hotspot/share/gc/serial/serialHeap.hpp index 208a997ad5fc85ce91cfc695892754a4b11dd721..0451a9679a4b0667463e5f17a17233149956ae69 100644 --- a/src/hotspot/share/gc/serial/serialHeap.hpp +++ b/src/hotspot/share/gc/serial/serialHeap.hpp @@ -35,6 +35,26 @@ class MemoryPool; class OopIterateClosure; class TenuredGeneration; +// SerialHeap is the implementation of CollectedHeap for Serial GC. +// +// The heap is reserved up-front in a single contiguous block, split into two +// parts, the young and old generation. The young generation resides at lower +// addresses, the old generation at higher addresses. The boundary address +// between the generations is fixed. Within a generation, committed memory +// grows towards higher addresses. +// +// +// low high +// +// +-- generation boundary (fixed after startup) +// | +// |<- young gen (reserved MaxNewSize) ->|<- old gen (reserved MaxOldSize) ->| +// +-----------------+--------+--------+--------+---------------+-------------------+ +// | eden | from | to | | old | | +// | | (to) | (from) | | | | +// +-----------------+--------+--------+--------+---------------+-------------------+ +// |<- committed ->| |<- committed ->| +// class SerialHeap : public GenCollectedHeap { private: MemoryPool* _eden_pool; diff --git a/src/hotspot/share/gc/serial/tenuredGeneration.cpp b/src/hotspot/share/gc/serial/tenuredGeneration.cpp index 1aec978b3820724b488cb725932773a618c3cbb6..fd135529157d1b4b1738d7b40578f43148df50d2 100644 --- a/src/hotspot/share/gc/serial/tenuredGeneration.cpp +++ b/src/hotspot/share/gc/serial/tenuredGeneration.cpp @@ -212,9 +212,6 @@ void TenuredGeneration::assert_correct_size_change_locking() { assert_locked_or_safepoint(ExpandHeap_lock); } -// Currently nothing to do. -void TenuredGeneration::prepare_for_verify() {} - void TenuredGeneration::object_iterate(ObjectClosure* blk) { _the_space->object_iterate(blk); } diff --git a/src/hotspot/share/gc/serial/tenuredGeneration.hpp b/src/hotspot/share/gc/serial/tenuredGeneration.hpp index 44153320f6c1fbd66251a0a6976e5a0ded107a6a..410981de7582192c85e7b07724a12e171494d2ad 100644 --- a/src/hotspot/share/gc/serial/tenuredGeneration.hpp +++ b/src/hotspot/share/gc/serial/tenuredGeneration.hpp @@ -97,8 +97,6 @@ class TenuredGeneration: public CardGeneration { HeapWord* expand_and_allocate(size_t size, bool is_tlab); - virtual void prepare_for_verify(); - virtual void gc_prologue(bool full); virtual void gc_epilogue(bool full); diff --git a/src/hotspot/share/gc/shared/accessBarrierSupport.hpp b/src/hotspot/share/gc/shared/accessBarrierSupport.hpp index 58bc562d988a8551efd3e127da497033f2c4ef04..ca3b4589224bf2233335d96fcebcf08311da183a 100644 --- a/src/hotspot/share/gc/shared/accessBarrierSupport.hpp +++ b/src/hotspot/share/gc/shared/accessBarrierSupport.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2022, 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,7 +25,7 @@ #ifndef SHARE_GC_SHARED_ACCESSBARRIERSUPPORT_HPP #define SHARE_GC_SHARED_ACCESSBARRIERSUPPORT_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "oops/access.hpp" class AccessBarrierSupport: AllStatic { diff --git a/src/hotspot/share/gc/shared/ageTableTracer.hpp b/src/hotspot/share/gc/shared/ageTableTracer.hpp index cca3f125bfd730f0ec0a74ca0b8ccad7d88a4e0c..02e1fe3338db210b82ed283646e3e3173da022d2 100644 --- a/src/hotspot/share/gc/shared/ageTableTracer.hpp +++ b/src/hotspot/share/gc/shared/ageTableTracer.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2022, 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,7 +25,8 @@ #ifndef SHARE_GC_SHARED_AGETABLETRACER_HPP #define SHARE_GC_SHARED_AGETABLETRACER_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" +#include "utilities/globalDefinitions.hpp" class AgeTableTracer : AllStatic { public: diff --git a/src/hotspot/share/gc/shared/allocTracer.hpp b/src/hotspot/share/gc/shared/allocTracer.hpp index c30628b2889705f37795fb0b7443891807c8fd68..273f20d70ea44d5e1161ff6ec1877c97d9d0f99b 100644 --- a/src/hotspot/share/gc/shared/allocTracer.hpp +++ b/src/hotspot/share/gc/shared/allocTracer.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2022, 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,7 +25,7 @@ #ifndef SHARE_GC_SHARED_ALLOCTRACER_HPP #define SHARE_GC_SHARED_ALLOCTRACER_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "runtime/handles.hpp" class AllocTracer : AllStatic { diff --git a/src/hotspot/share/gc/shared/blockOffsetTable.hpp b/src/hotspot/share/gc/shared/blockOffsetTable.hpp index 7d6ddfdf79998f49a3bc40311ddb20acdac51013..9a32594c123f666d233bf3033377faeaaab99054 100644 --- a/src/hotspot/share/gc/shared/blockOffsetTable.hpp +++ b/src/hotspot/share/gc/shared/blockOffsetTable.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2022, 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,7 +28,7 @@ #include "gc/shared/gc_globals.hpp" #include "gc/shared/memset_with_concurrent_readers.hpp" #include "gc/shared/cardTable.hpp" -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "memory/memRegion.hpp" #include "memory/virtualspace.hpp" #include "runtime/globals.hpp" diff --git a/src/hotspot/share/gc/g1/g1BufferNodeList.cpp b/src/hotspot/share/gc/shared/bufferNodeList.cpp similarity index 80% rename from src/hotspot/share/gc/g1/g1BufferNodeList.cpp rename to src/hotspot/share/gc/shared/bufferNodeList.cpp index 3b89b0c7cd7a72c7ecd5a4c6688b476706fb62a2..bcf4b42ec967bdb3cdc334dd8cebc69ff608d854 100644 --- a/src/hotspot/share/gc/g1/g1BufferNodeList.cpp +++ b/src/hotspot/share/gc/shared/bufferNodeList.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2022, 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,15 +23,15 @@ */ #include "precompiled.hpp" -#include "gc/g1/g1BufferNodeList.hpp" +#include "gc/shared/bufferNodeList.hpp" #include "utilities/debug.hpp" -G1BufferNodeList::G1BufferNodeList() : +BufferNodeList::BufferNodeList() : _head(NULL), _tail(NULL), _entry_count(0) {} -G1BufferNodeList::G1BufferNodeList(BufferNode* head, - BufferNode* tail, - size_t entry_count) : +BufferNodeList::BufferNodeList(BufferNode* head, + BufferNode* tail, + size_t entry_count) : _head(head), _tail(tail), _entry_count(entry_count) { assert((_head == NULL) == (_tail == NULL), "invariant"); diff --git a/src/hotspot/share/gc/g1/g1BufferNodeList.hpp b/src/hotspot/share/gc/shared/bufferNodeList.hpp similarity index 79% rename from src/hotspot/share/gc/g1/g1BufferNodeList.hpp rename to src/hotspot/share/gc/shared/bufferNodeList.hpp index 785c3118f9b8897420401d90fb2e79486c066d3b..ae66a1fcc7142f45e0f14f4452fb4f5131b467cf 100644 --- a/src/hotspot/share/gc/g1/g1BufferNodeList.hpp +++ b/src/hotspot/share/gc/shared/bufferNodeList.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2022, 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 @@ -22,21 +22,20 @@ * */ -#ifndef SHARE_GC_G1_G1BUFFERNODELIST_HPP -#define SHARE_GC_G1_G1BUFFERNODELIST_HPP +#ifndef SHARE_GC_SHARED_BUFFERNODELIST_HPP +#define SHARE_GC_SHARED_BUFFERNODELIST_HPP #include "utilities/globalDefinitions.hpp" class BufferNode; -struct G1BufferNodeList { +struct BufferNodeList { BufferNode* _head; // First node in list or NULL if empty. BufferNode* _tail; // Last node in list or NULL if empty. size_t _entry_count; // Sum of entries in nodes in list. - G1BufferNodeList(); - G1BufferNodeList(BufferNode* head, BufferNode* tail, size_t entry_count); + BufferNodeList(); + BufferNodeList(BufferNode* head, BufferNode* tail, size_t entry_count); }; -#endif // SHARE_GC_G1_G1BUFFERNODELIST_HPP - +#endif // SHARE_GC_SHARED_BUFFERNODELIST_HPP diff --git a/src/hotspot/share/gc/shared/c2/barrierSetC2.cpp b/src/hotspot/share/gc/shared/c2/barrierSetC2.cpp index c89643a78811d2d228cad39bc5a966032e61be25..a90565ef705ee4360d5d1ff07f4d50026ecf00dd 100644 --- a/src/hotspot/share/gc/shared/c2/barrierSetC2.cpp +++ b/src/hotspot/share/gc/shared/c2/barrierSetC2.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2022, 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 @@ -96,7 +96,7 @@ Node* BarrierSetC2::store_at_resolved(C2Access& access, C2AccessValue& val) cons GraphKit* kit = parse_access.kit(); if (access.type() == T_DOUBLE) { - Node* new_val = kit->dstore_rounding(val.node()); + Node* new_val = kit->dprecision_rounding(val.node()); val.set_node(new_val); } diff --git a/src/hotspot/share/gc/shared/cardGeneration.cpp b/src/hotspot/share/gc/shared/cardGeneration.cpp index 8f691c3c46cec80a7188b4fb6886f553b90fe8db..523f65c8cc3a5475b79d32b95f38da47017c1edf 100644 --- a/src/hotspot/share/gc/shared/cardGeneration.cpp +++ b/src/hotspot/share/gc/shared/cardGeneration.cpp @@ -174,11 +174,6 @@ void CardGeneration::shrink(size_t bytes) { name(), old_mem_size/K, new_mem_size/K); } -// No young generation references, clear this generation's cards. -void CardGeneration::clear_remembered_set() { - _rs->clear(reserved()); -} - // Objects in this generation may have moved, invalidate this // generation's cards. void CardGeneration::invalidate_remembered_set() { @@ -306,9 +301,6 @@ void CardGeneration::compute_new_size() { } } -// Currently nothing to do. -void CardGeneration::prepare_for_verify() {} - void CardGeneration::space_iterate(SpaceClosure* blk, bool usedOnly) { blk->do_space(space()); diff --git a/src/hotspot/share/gc/shared/cardGeneration.hpp b/src/hotspot/share/gc/shared/cardGeneration.hpp index 7ad58cf2b699c120ce4bb6832e453e06a29c3165..084737a61466d7adc3748dbc577a3dca1ad825a1 100644 --- a/src/hotspot/share/gc/shared/cardGeneration.hpp +++ b/src/hotspot/share/gc/shared/cardGeneration.hpp @@ -71,12 +71,8 @@ class CardGeneration: public Generation { virtual void compute_new_size(); - virtual void clear_remembered_set(); - virtual void invalidate_remembered_set(); - virtual void prepare_for_verify(); - // Grow generation with specified size (returns false if unable to grow) bool grow_by(size_t bytes); // Grow generation to reserved size. diff --git a/src/hotspot/share/gc/shared/cardTable.cpp b/src/hotspot/share/gc/shared/cardTable.cpp index 2ff5f8d31c38f9b5ccca5ac867a6475f1af71574..b7f7ab81c36d208308826806cd06e328f560cba5 100644 --- a/src/hotspot/share/gc/shared/cardTable.cpp +++ b/src/hotspot/share/gc/shared/cardTable.cpp @@ -162,16 +162,6 @@ int CardTable::find_covering_region_by_base(HeapWord* base) { return res; } -int CardTable::find_covering_region_containing(HeapWord* addr) { - for (int i = 0; i < _cur_covered_regions; i++) { - if (_covered[i].contains(addr)) { - return i; - } - } - assert(0, "address outside of heap?"); - return -1; -} - HeapWord* CardTable::largest_prev_committed_end(int ind) const { HeapWord* max_end = NULL; for (int j = 0; j < ind; j++) { diff --git a/src/hotspot/share/gc/shared/cardTable.hpp b/src/hotspot/share/gc/shared/cardTable.hpp index 075b961b3cd388fd826111aff1e42b84bc61f7c2..ca6d1ef51dda49a08b03e01e2ce838b1009385d7 100644 --- a/src/hotspot/share/gc/shared/cardTable.hpp +++ b/src/hotspot/share/gc/shared/cardTable.hpp @@ -78,10 +78,6 @@ protected: // covered regions defined in the constructor are ever in use. int find_covering_region_by_base(HeapWord* base); - // Same as above, but finds the region containing the given address - // instead of starting at a given base address. - int find_covering_region_containing(HeapWord* addr); - // Returns the leftmost end of a committed region corresponding to a // covered region before covered region "ind", or else "NULL" if "ind" is // the first covered region. diff --git a/src/hotspot/share/gc/shared/collectedHeap.hpp b/src/hotspot/share/gc/shared/collectedHeap.hpp index 84e545abd29a569eaa3a741aadcdc9a81517c5e0..89cca6777d64a8f3803b384f720942d877329f61 100644 --- a/src/hotspot/share/gc/shared/collectedHeap.hpp +++ b/src/hotspot/share/gc/shared/collectedHeap.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2022, 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 @@ -90,7 +90,7 @@ public: // ShenandoahHeap // ZCollectedHeap // -class CollectedHeap : public CHeapObj { +class CollectedHeap : public CHeapObj { friend class VMStructs; friend class JVMCIVMStructs; friend class IsGCActiveMark; // Block structured external access to _is_gc_active diff --git a/src/hotspot/share/gc/shared/concurrentGCBreakpoints.hpp b/src/hotspot/share/gc/shared/concurrentGCBreakpoints.hpp index c11c0e116c5886d2befc97a18c7c1552094c45bc..7af1b5746c3444136317ce3b52c531089999a955 100644 --- a/src/hotspot/share/gc/shared/concurrentGCBreakpoints.hpp +++ b/src/hotspot/share/gc/shared/concurrentGCBreakpoints.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ #define SHARE_GC_SHARED_CONCURRENTGCBREAKPOINTS_HPP #include "gc/shared/gcCause.hpp" -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "utilities/globalDefinitions.hpp" class Monitor; diff --git a/src/hotspot/share/gc/shared/gcCause.hpp b/src/hotspot/share/gc/shared/gcCause.hpp index 75f7dc73a8cbcb3262060dfae1b0270cb46cde6e..a3746fa8745dad097d036a79ba6f20429d2bcb28 100644 --- a/src/hotspot/share/gc/shared/gcCause.hpp +++ b/src/hotspot/share/gc/shared/gcCause.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2022, 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,7 +25,8 @@ #ifndef SHARE_GC_SHARED_GCCAUSE_HPP #define SHARE_GC_SHARED_GCCAUSE_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" +#include "utilities/debug.hpp" // // This class exposes implementation details of the various diff --git a/src/hotspot/share/gc/shared/gcConfig.hpp b/src/hotspot/share/gc/shared/gcConfig.hpp index 2dfbf186b7fd0bebeb3581fc99217835caa2a1ab..9b0da3ad528a87e41fcfc4f9e5d12cb403b78c47 100644 --- a/src/hotspot/share/gc/shared/gcConfig.hpp +++ b/src/hotspot/share/gc/shared/gcConfig.hpp @@ -26,7 +26,7 @@ #define SHARE_GC_SHARED_GCCONFIG_HPP #include "gc/shared/collectedHeap.hpp" -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" class GCArguments; diff --git a/src/hotspot/share/gc/shared/gcLocker.hpp b/src/hotspot/share/gc/shared/gcLocker.hpp index 91ed84c41a99b6ba7d8cbd5278380461686ca5e8..e567d0c1f1689b61a1ccd44eece5485206141bed 100644 --- a/src/hotspot/share/gc/shared/gcLocker.hpp +++ b/src/hotspot/share/gc/shared/gcLocker.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ #define SHARE_GC_SHARED_GCLOCKER_HPP #include "gc/shared/gcCause.hpp" -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "utilities/globalDefinitions.hpp" #include "utilities/macros.hpp" diff --git a/src/hotspot/share/gc/shared/gcLogPrecious.hpp b/src/hotspot/share/gc/shared/gcLogPrecious.hpp index 5f1158caca75a5f0115102534eb5aa7afe42a333..ec8b1c670f3216c69bddef99e68f0280a3be4cc6 100644 --- a/src/hotspot/share/gc/shared/gcLogPrecious.hpp +++ b/src/hotspot/share/gc/shared/gcLogPrecious.hpp @@ -26,7 +26,7 @@ #include "utilities/globalDefinitions.hpp" #include "logging/logHandle.hpp" -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "utilities/debug.hpp" class Mutex; diff --git a/src/hotspot/share/gc/shared/gcVMOperations.hpp b/src/hotspot/share/gc/shared/gcVMOperations.hpp index ce071ee16a73e6c00987ee6341d724832b611209..9144300565873b8282b28dbaca959ca1a310c1f1 100644 --- a/src/hotspot/share/gc/shared/gcVMOperations.hpp +++ b/src/hotspot/share/gc/shared/gcVMOperations.hpp @@ -42,7 +42,6 @@ // VM_GC_HeapInspection // VM_PopulateDynamicDumpSharedSpace // VM_GenCollectFull -// VM_GenCollectFullConcurrent // VM_ParallelGCSystemGC // VM_CollectForAllocation // VM_GenCollectForAllocation @@ -71,7 +70,6 @@ // allocate afterwards; // // VM_GenCollectFull -// VM_GenCollectFullConcurrent // VM_ParallelGCSystemGC // - these operations preform full collection of heaps of // different kind diff --git a/src/hotspot/share/gc/shared/gcWhen.hpp b/src/hotspot/share/gc/shared/gcWhen.hpp index ff489226f65b36759f8db765c5ed53347390448f..23e2ef6b229d745e45a5464fc9c4a7b8e4844a91 100644 --- a/src/hotspot/share/gc/shared/gcWhen.hpp +++ b/src/hotspot/share/gc/shared/gcWhen.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2022, 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,7 +25,7 @@ #ifndef SHARE_GC_SHARED_GCWHEN_HPP #define SHARE_GC_SHARED_GCWHEN_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "utilities/debug.hpp" class GCWhen : AllStatic { diff --git a/src/hotspot/share/gc/shared/gc_globals.hpp b/src/hotspot/share/gc/shared/gc_globals.hpp index 684357297d8c5fc852eceb1f23ceb420eee19e52..555170a091aac32f6d783a1ba73acf0a2eef8b8b 100644 --- a/src/hotspot/share/gc/shared/gc_globals.hpp +++ b/src/hotspot/share/gc/shared/gc_globals.hpp @@ -208,7 +208,7 @@ "Maximum size of marking stack") \ range(1, (max_jint - 1)) \ \ - product(size_t, MarkStackSize, NOT_LP64(32*K) LP64_ONLY(4*M), \ + product(size_t, MarkStackSize, NOT_LP64(64*K) LP64_ONLY(4*M), \ "Size of marking stack") \ constraint(MarkStackSizeConstraintFunc,AfterErgo) \ range(1, (max_jint - 1)) \ diff --git a/src/hotspot/share/gc/shared/genCollectedHeap.cpp b/src/hotspot/share/gc/shared/genCollectedHeap.cpp index 473e5abc1dff61bf87f1c837ad80e5b8a741da6d..c840e5a666790972d5b8c554b6c64e1b6c6e1fbf 100644 --- a/src/hotspot/share/gc/shared/genCollectedHeap.cpp +++ b/src/hotspot/share/gc/shared/genCollectedHeap.cpp @@ -1045,16 +1045,8 @@ void GenCollectedHeap::release_scratch() { _old_gen->reset_scratch(); } -class GenPrepareForVerifyClosure: public GenCollectedHeap::GenClosure { - void do_generation(Generation* gen) { - gen->prepare_for_verify(); - } -}; - void GenCollectedHeap::prepare_for_verify() { ensure_parsability(false); // no need to retire TLABs - GenPrepareForVerifyClosure blk; - generation_iterate(&blk, false); } void GenCollectedHeap::generation_iterate(GenClosure* cl, diff --git a/src/hotspot/share/gc/shared/genCollectedHeap.hpp b/src/hotspot/share/gc/shared/genCollectedHeap.hpp index 28ed627b80f205349ccc9efe855bbd8ba27aa19d..1cce08f4b0c99cbf4a27beffbad102b55c649f4f 100644 --- a/src/hotspot/share/gc/shared/genCollectedHeap.hpp +++ b/src/hotspot/share/gc/shared/genCollectedHeap.hpp @@ -48,7 +48,6 @@ class GenCollectedHeap : public CollectedHeap { friend class GenMarkSweep; friend class VM_GenCollectForAllocation; friend class VM_GenCollectFull; - friend class VM_GenCollectFullConcurrent; friend class VM_GC_HeapInspection; friend class VM_HeapDumper; friend class HeapInspection; diff --git a/src/hotspot/share/gc/shared/generation.hpp b/src/hotspot/share/gc/shared/generation.hpp index 216b38d38b7e5e24f2721327e7124c8894df5f10..b9183ec28987b5b3c1c63945acdec9decb39c417 100644 --- a/src/hotspot/share/gc/shared/generation.hpp +++ b/src/hotspot/share/gc/shared/generation.hpp @@ -364,10 +364,6 @@ class Generation: public CHeapObj { virtual void post_compact() { ShouldNotReachHere(); } #endif - // Some generations may require some cleanup actions before allowing - // a verification. - virtual void prepare_for_verify() {} - // Accessing "marks". // This function gives a generation a chance to note a point between @@ -422,11 +418,6 @@ class Generation: public CHeapObj { // each. virtual void object_iterate(ObjectClosure* cl); - // Inform a generation that it longer contains references to objects - // in any younger generation. [e.g. Because younger gens are empty, - // clear the card table.] - virtual void clear_remembered_set() { } - // Inform a generation that some of its objects have moved. [e.g. The // generation's spaces were compacted, invalidating the card table.] virtual void invalidate_remembered_set() { } diff --git a/src/hotspot/share/gc/shared/locationPrinter.hpp b/src/hotspot/share/gc/shared/locationPrinter.hpp index 2c99e4528453d62a5a46ec7f97b7aecb6222fd8a..2d5d997376d13c4741a134df010bb4e0beceefaf 100644 --- a/src/hotspot/share/gc/shared/locationPrinter.hpp +++ b/src/hotspot/share/gc/shared/locationPrinter.hpp @@ -25,7 +25,7 @@ #ifndef SHARE_GC_SHARED_LOCATIONPRINTER_HPP #define SHARE_GC_SHARED_LOCATIONPRINTER_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "oops/oopsHierarchy.hpp" #include "utilities/globalDefinitions.hpp" diff --git a/src/hotspot/share/gc/shared/objectCountEventSender.hpp b/src/hotspot/share/gc/shared/objectCountEventSender.hpp index 58e6da016daf8eb1f5e389aa8cd8c4f606761bbf..115fbfdaf7d3a01d40fbd408ead25482cbf863d1 100644 --- a/src/hotspot/share/gc/shared/objectCountEventSender.hpp +++ b/src/hotspot/share/gc/shared/objectCountEventSender.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ #define SHARE_GC_SHARED_OBJECTCOUNTEVENTSENDER_HPP #include "gc/shared/gcTrace.hpp" -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "utilities/globalDefinitions.hpp" #include "utilities/macros.hpp" #include "utilities/ticks.hpp" diff --git a/src/hotspot/share/gc/shared/plab.hpp b/src/hotspot/share/gc/shared/plab.hpp index 5599ba9a8fd0ec9092b753e610a98201937ed0c8..ebe788122ba4b2d5473044cc162e7832451f24f2 100644 --- a/src/hotspot/share/gc/shared/plab.hpp +++ b/src/hotspot/share/gc/shared/plab.hpp @@ -116,7 +116,7 @@ public: } // Sets the space of the buffer to be [buf, space+word_sz()). - virtual void set_buf(HeapWord* buf, size_t new_word_sz) { + void set_buf(HeapWord* buf, size_t new_word_sz) { assert(new_word_sz > AlignmentReserve, "Too small"); _word_sz = new_word_sz; diff --git a/src/hotspot/share/gc/shared/referenceProcessor.cpp b/src/hotspot/share/gc/shared/referenceProcessor.cpp index be8ea708ffa49ed1299d569175f48761bf0fd112..21b57621706ceff97280d9278d6766b1fbe30e0f 100644 --- a/src/hotspot/share/gc/shared/referenceProcessor.cpp +++ b/src/hotspot/share/gc/shared/referenceProcessor.cpp @@ -483,7 +483,7 @@ void RefProcTask::process_discovered_list(uint worker_id, keep_alive, enqueue, do_enqueue_and_clear); - _phase_times->add_ref_cleared(ref_type, removed); + _phase_times->add_ref_dropped(ref_type, removed); } } @@ -748,8 +748,6 @@ void ReferenceProcessor::process_soft_weak_final_refs(RefProcProxyTask& proxy_ta maybe_balance_queues(_discoveredFinalRefs); } - RefProcPhaseTimeTracker tt(SoftWeakFinalRefsPhase, &phase_times); - log_reflist("SoftWeakFinalRefsPhase Soft before", _discoveredSoftRefs, _max_num_queues); log_reflist("SoftWeakFinalRefsPhase Weak before", _discoveredWeakRefs, _max_num_queues); log_reflist("SoftWeakFinalRefsPhase Final before", _discoveredFinalRefs, _max_num_queues); @@ -780,7 +778,6 @@ void ReferenceProcessor::process_final_keep_alive(RefProcProxyTask& proxy_task, } // Traverse referents of final references and keep them and followers alive. - RefProcPhaseTimeTracker tt(KeepAliveFinalRefsPhase, &phase_times); RefProcKeepAliveFinalPhaseTask phase_task(*this, &phase_times); run_task(phase_task, proxy_task, true); @@ -804,9 +801,6 @@ void ReferenceProcessor::process_phantom_refs(RefProcProxyTask& proxy_task, maybe_balance_queues(_discoveredPhantomRefs); } - // Walk phantom references appropriately. - RefProcPhaseTimeTracker tt(PhantomRefsPhase, &phase_times); - log_reflist("PhantomRefsPhase Phantom before", _discoveredPhantomRefs, _max_num_queues); RefProcPhantomPhaseTask phase_task(*this, &phase_times); diff --git a/src/hotspot/share/gc/shared/referenceProcessorPhaseTimes.cpp b/src/hotspot/share/gc/shared/referenceProcessorPhaseTimes.cpp index 2c9df9f29650e1aa90d1afdaaacae0a5c9699a13..f3bfcc2269289d10c6a2c7ffa181e2c0366d0b62 100644 --- a/src/hotspot/share/gc/shared/referenceProcessorPhaseTimes.cpp +++ b/src/hotspot/share/gc/shared/referenceProcessorPhaseTimes.cpp @@ -143,16 +143,6 @@ RefProcBalanceQueuesTimeTracker::~RefProcBalanceQueuesTimeTracker() { phase_times()->set_balance_queues_time_ms(_phase_number, elapsed); } -RefProcPhaseTimeTracker::RefProcPhaseTimeTracker(ReferenceProcessor::RefProcPhases phase_number, - ReferenceProcessorPhaseTimes* phase_times) : - RefProcPhaseTimeBaseTracker(phase_enum_2_phase_string(phase_number), phase_number, phase_times) { -} - -RefProcPhaseTimeTracker::~RefProcPhaseTimeTracker() { - double elapsed = elapsed_time(); - phase_times()->set_phase_time_ms(_phase_number, elapsed); -} - RefProcTotalPhaseTimesTracker::RefProcTotalPhaseTimesTracker(ReferenceProcessor::RefProcPhases phase_number, ReferenceProcessorPhaseTimes* phase_times) : RefProcPhaseTimeBaseTracker(phase_enum_2_phase_string(phase_number), phase_number, phase_times) { @@ -207,7 +197,7 @@ void ReferenceProcessorPhaseTimes::reset() { _soft_weak_final_refs_phase_worker_time_sec->reset(); for (int i = 0; i < number_of_subclasses_of_ref; i++) { - _ref_cleared[i] = 0; + _ref_dropped[i] = 0; _ref_discovered[i] = 0; } @@ -223,9 +213,9 @@ ReferenceProcessorPhaseTimes::~ReferenceProcessorPhaseTimes() { delete _soft_weak_final_refs_phase_worker_time_sec; } -void ReferenceProcessorPhaseTimes::add_ref_cleared(ReferenceType ref_type, size_t count) { +void ReferenceProcessorPhaseTimes::add_ref_dropped(ReferenceType ref_type, size_t count) { ASSERT_REF_TYPE(ref_type); - Atomic::add(&_ref_cleared[ref_type_2_index(ref_type)], count, memory_order_relaxed); + Atomic::add(&_ref_dropped[ref_type_2_index(ref_type)], count, memory_order_relaxed); } void ReferenceProcessorPhaseTimes::set_ref_discovered(ReferenceType ref_type, size_t count) { @@ -280,13 +270,16 @@ void ReferenceProcessorPhaseTimes::print_reference(ReferenceType ref_type, uint LogStream ls(lt); ResourceMark rm; - ls.print_cr("%s%s:", Indents[base_indent], ref_type_2_string(ref_type)); - - uint const next_indent = base_indent + 1; int const ref_type_index = ref_type_2_index(ref_type); - ls.print_cr("%sDiscovered: " SIZE_FORMAT, Indents[next_indent], _ref_discovered[ref_type_index]); - ls.print_cr("%sCleared: " SIZE_FORMAT, Indents[next_indent], _ref_cleared[ref_type_index]); + size_t discovered = _ref_discovered[ref_type_index]; + size_t dropped = _ref_dropped[ref_type_index]; + assert(discovered >= dropped, "invariant"); + size_t processed = discovered - dropped; + + ls.print_cr("%s%s Discovered: %zu, Dropped: %zu, Processed: %zu", + Indents[base_indent], ref_type_2_string(ref_type), + discovered, dropped, processed); } } diff --git a/src/hotspot/share/gc/shared/referenceProcessorPhaseTimes.hpp b/src/hotspot/share/gc/shared/referenceProcessorPhaseTimes.hpp index 5b2e9e7bc7b786fadab5588dfe596e492b3cfe73..26ee4e2a918141816166d749cdee98f3f8c22f00 100644 --- a/src/hotspot/share/gc/shared/referenceProcessorPhaseTimes.hpp +++ b/src/hotspot/share/gc/shared/referenceProcessorPhaseTimes.hpp @@ -52,7 +52,7 @@ class ReferenceProcessorPhaseTimes : public CHeapObj { // Total spent time for reference processing. double _total_time_ms; - size_t _ref_cleared[number_of_subclasses_of_ref]; + size_t _ref_dropped[number_of_subclasses_of_ref]; size_t _ref_discovered[number_of_subclasses_of_ref]; bool _processing_is_mt; @@ -83,7 +83,7 @@ public: void set_total_time_ms(double total_time_ms) { _total_time_ms = total_time_ms; } - void add_ref_cleared(ReferenceType ref_type, size_t count); + void add_ref_dropped(ReferenceType ref_type, size_t count); void set_ref_discovered(ReferenceType ref_type, size_t count); size_t ref_discovered(ReferenceType ref_type); @@ -146,14 +146,6 @@ public: ~RefProcBalanceQueuesTimeTracker(); }; -// Updates phase time at ReferenceProcessorPhaseTimes and save it into GCTimer. -class RefProcPhaseTimeTracker : public RefProcPhaseTimeBaseTracker { -public: - RefProcPhaseTimeTracker(ReferenceProcessor::RefProcPhases phase_number, - ReferenceProcessorPhaseTimes* phase_times); - ~RefProcPhaseTimeTracker(); -}; - // Highest level time tracker. class RefProcTotalPhaseTimesTracker : public RefProcPhaseTimeBaseTracker { public: diff --git a/src/hotspot/share/gc/shared/scavengableNMethods.hpp b/src/hotspot/share/gc/shared/scavengableNMethods.hpp index 276ea9843c0f0b7bd596cfba3511660011c46533..4852e6d32fbf92f81579fa17f20dba5a72056164 100644 --- a/src/hotspot/share/gc/shared/scavengableNMethods.hpp +++ b/src/hotspot/share/gc/shared/scavengableNMethods.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2022, 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,7 +25,7 @@ #ifndef SHARE_GC_SHARED_SCAVENGABLENMETHODS_HPP #define SHARE_GC_SHARED_SCAVENGABLENMETHODS_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "utilities/macros.hpp" class BoolObjectClosure; diff --git a/src/hotspot/share/gc/shared/spaceDecorator.hpp b/src/hotspot/share/gc/shared/spaceDecorator.hpp index d421a2a40f5ca80e7c6f5292f6572480f4b53fd7..778881f75a1a2ea9bc56ea96e3b0ed37b1a3806c 100644 --- a/src/hotspot/share/gc/shared/spaceDecorator.hpp +++ b/src/hotspot/share/gc/shared/spaceDecorator.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2022, 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,7 +25,7 @@ #ifndef SHARE_GC_SHARED_SPACEDECORATOR_HPP #define SHARE_GC_SHARED_SPACEDECORATOR_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "memory/memRegion.hpp" #include "utilities/globalDefinitions.hpp" diff --git a/src/hotspot/share/gc/shared/taskqueue.cpp b/src/hotspot/share/gc/shared/taskqueue.cpp index 2ed1c613bc83f14de65c8dc439fa5f06cf89b4b3..1a11a536683674abccc9c11757670c728063b08e 100644 --- a/src/hotspot/share/gc/shared/taskqueue.cpp +++ b/src/hotspot/share/gc/shared/taskqueue.cpp @@ -34,7 +34,9 @@ #if TASKQUEUE_STATS const char * const TaskQueueStats::_names[last_stat_id] = { - "qpush", "qpop", "qpop-s", "qattempt", "qsteal", "opush", "omax" + "push", "pop", "pop-slow", + "st-attempt", "st-empty", "st-ctdd", "st-success", "st-ctdd-max", "st-biasdrop", + "ovflw-push", "ovflw-max" }; TaskQueueStats & TaskQueueStats::operator +=(const TaskQueueStats & addend) @@ -86,20 +88,29 @@ void TaskQueueStats::print(outputStream* stream, unsigned int width) const // quiescent; they do not hold at arbitrary times. void TaskQueueStats::verify() const { - assert(get(push) == get(pop) + get(steal), - "push=" SIZE_FORMAT " pop=" SIZE_FORMAT " steal=" SIZE_FORMAT, - get(push), get(pop), get(steal)); + assert(get(push) == get(pop) + get(steal_success), + "push=%zu pop=%zu steal=%zu", + get(push), get(pop), get(steal_success)); assert(get(pop_slow) <= get(pop), - "pop_slow=" SIZE_FORMAT " pop=" SIZE_FORMAT, + "pop_slow=%zu pop=%zu", get(pop_slow), get(pop)); - assert(get(steal) <= get(steal_attempt), - "steal=" SIZE_FORMAT " steal_attempt=" SIZE_FORMAT, - get(steal), get(steal_attempt)); + assert(get(steal_empty) <= get(steal_attempt), + "steal_empty=%zu steal_attempt=%zu", + get(steal_empty), get(steal_attempt)); + assert(get(steal_contended) <= get(steal_attempt), + "steal_contended=%zu steal_attempt=%zu", + get(steal_contended), get(steal_attempt)); + assert(get(steal_success) <= get(steal_attempt), + "steal_success=%zu steal_attempt=%zu", + get(steal_success), get(steal_attempt)); + assert(get(steal_empty) + get(steal_contended) + get(steal_success) == get(steal_attempt), + "steal_empty=%zu steal_contended=%zu steal_success=%zu steal_attempt=%zu", + get(steal_empty), get(steal_contended), get(steal_success), get(steal_attempt)); assert(get(overflow) == 0 || get(push) != 0, - "overflow=" SIZE_FORMAT " push=" SIZE_FORMAT, + "overflow=%zu push=%zu", get(overflow), get(push)); assert(get(overflow_max_len) == 0 || get(overflow) != 0, - "overflow_max_len=" SIZE_FORMAT " overflow=" SIZE_FORMAT, + "overflow_max_len=%zu overflow=%zu", get(overflow_max_len), get(overflow)); } #endif // ASSERT diff --git a/src/hotspot/share/gc/shared/taskqueue.hpp b/src/hotspot/share/gc/shared/taskqueue.hpp index e2c21f1dc6deb812f26f6019a4ae142133e31e63..d61326bd2fd51e5c9ced6791ba5be3db18eb0616 100644 --- a/src/hotspot/share/gc/shared/taskqueue.hpp +++ b/src/hotspot/share/gc/shared/taskqueue.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2022, 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 @@ -56,7 +56,11 @@ public: pop, // number of taskqueue pops pop_slow, // subset of taskqueue pops that were done slow-path steal_attempt, // number of taskqueue steal attempts - steal, // number of taskqueue steals + steal_empty, // number of empty taskqueues + steal_contended, // number of contended steals + steal_success, // number of successful steals + steal_max_contended_in_a_row, // maximum number of contended steals in a row + steal_bias_drop, // number of times the bias has been dropped overflow, // number of overflow pushes overflow_max_len, // max length of overflow stack last_stat_id @@ -68,8 +72,16 @@ public: inline void record_push() { ++_stats[push]; } inline void record_pop() { ++_stats[pop]; } inline void record_pop_slow() { record_pop(); ++_stats[pop_slow]; } - inline void record_steal_attempt() { ++_stats[steal_attempt]; } - inline void record_steal() { ++_stats[steal]; } + inline void record_steal_attempt(uint kind) { + ++_stats[steal_attempt]; + ++_stats[steal_empty + kind]; + } + inline void record_contended_in_a_row(uint in_a_row) { + if (_stats[steal_max_contended_in_a_row] < in_a_row) { + _stats[steal_max_contended_in_a_row] = in_a_row; + } + } + inline void record_bias_drop() { ++_stats[steal_bias_drop]; } inline void record_overflow(size_t new_length); TaskQueueStats & operator +=(const TaskQueueStats & addend); @@ -81,9 +93,9 @@ public: // Print the specified line of the header (does not include a line separator). static void print_header(unsigned int line, outputStream* const stream = tty, - unsigned int width = 10); + unsigned int width = 11); // Print the statistics (does not include a line separator). - void print(outputStream* const stream = tty, unsigned int width = 10) const; + void print(outputStream* const stream = tty, unsigned int width = 11) const; DEBUG_ONLY(void verify() const;) @@ -268,6 +280,16 @@ public: // in GenericTaskQueue. uint max_elems() const { return N - 2; } + // The result of a pop_global operation. The value order of this must correspond + // to the order in the corresponding TaskQueueStats StatId. + enum class PopResult : uint { + Empty = 0, // Queue has been empty. t is undefined. + Contended = 1, // Contention prevented successful retrieval, queue most likely contains elements. t is undefined. + Success = 2 // Successfully retrieved an element, t contains it. + }; + + TASKQUEUE_STATS_ONLY(void record_steal_attempt(PopResult kind) { stats.record_steal_attempt((uint)kind); }) + TASKQUEUE_STATS_ONLY(TaskQueueStats stats;) }; @@ -328,6 +350,8 @@ protected: using TaskQueueSuper::assert_not_underflow; public: + typedef typename TaskQueueSuper::PopResult PopResult; + using TaskQueueSuper::max_elems; using TaskQueueSuper::size; @@ -357,7 +381,7 @@ public: // Like pop_local(), but uses the "global" end of the queue (the least // recently pushed). - bool pop_global(E& t); + PopResult pop_global(E& t); // Delete any resource associated with the queue. ~GenericTaskQueue(); @@ -387,7 +411,10 @@ public: void set_last_stolen_queue_id(uint id) { _last_stolen_queue_id = id; } uint last_stolen_queue_id() const { return _last_stolen_queue_id; } bool is_last_stolen_queue_id_valid() const { return _last_stolen_queue_id != InvalidQueueId; } - void invalidate_last_stolen_queue_id() { _last_stolen_queue_id = InvalidQueueId; } + void invalidate_last_stolen_queue_id() { + TASKQUEUE_STATS_ONLY(stats.record_bias_drop();) + _last_stolen_queue_id = InvalidQueueId; + } }; // OverflowTaskQueue is a TaskQueue that also includes an overflow stack for @@ -447,12 +474,16 @@ template class GenericTaskQueueSet: public TaskQueueSetSuperImpl { public: typedef typename T::element_type E; + typedef typename T::PopResult PopResult; private: uint _n; T** _queues; - bool steal_best_of_2(uint queue_num, E& t); + // Attempts to steal an element from a foreign queue (!= queue_num), setting + // the result in t. Validity of this value and the return value is the same + // as for the last pop_global() operation. + PopResult steal_best_of_2(uint queue_num, E& t); public: GenericTaskQueueSet(uint n); @@ -473,6 +504,18 @@ public: virtual uint tasks() const; uint size() const { return _n; } + +#if TASKQUEUE_STATS +private: + static void print_taskqueue_stats_hdr(outputStream* const st, const char* label); +public: + void print_taskqueue_stats(outputStream* const st, const char* label); + void reset_taskqueue_stats(); + + // Prints taskqueue set statistics into gc+task+stats=trace and resets + // its statistics. + void print_and_reset_taskqueue_stats(const char* label); +#endif // TASKQUEUE_STATS }; template void diff --git a/src/hotspot/share/gc/shared/taskqueue.inline.hpp b/src/hotspot/share/gc/shared/taskqueue.inline.hpp index c0ea64ba165b9f2794541e4d318e387f5896bd7e..f544a24d5361526d4771cf64ace29cc0ed645881 100644 --- a/src/hotspot/share/gc/shared/taskqueue.inline.hpp +++ b/src/hotspot/share/gc/shared/taskqueue.inline.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2022, 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,15 @@ #include "gc/shared/taskqueue.hpp" +#include "logging/log.hpp" +#include "logging/logStream.hpp" #include "memory/allocation.inline.hpp" +#include "memory/resourceArea.hpp" #include "oops/oop.inline.hpp" #include "runtime/atomic.hpp" #include "runtime/orderAccess.hpp" #include "utilities/debug.hpp" +#include "utilities/ostream.hpp" #include "utilities/stack.inline.hpp" template @@ -48,6 +52,51 @@ inline GenericTaskQueueSet::~GenericTaskQueueSet() { FREE_C_HEAP_ARRAY(T*, _queues); } +#if TASKQUEUE_STATS +template +void GenericTaskQueueSet::print_taskqueue_stats_hdr(outputStream* const st, const char* label) { + st->print_cr("GC Task Stats %s", label); + st->print("thr "); TaskQueueStats::print_header(1, st); st->cr(); + st->print("--- "); TaskQueueStats::print_header(2, st); st->cr(); +} + +template +void GenericTaskQueueSet::print_taskqueue_stats(outputStream* const st, const char* label) { + print_taskqueue_stats_hdr(st, label); + + TaskQueueStats totals; + const uint n = size(); + for (uint i = 0; i < n; ++i) { + st->print("%3u ", i); queue(i)->stats.print(st); st->cr(); + totals += queue(i)->stats; + } + st->print_raw("tot "); totals.print(st); st->cr(); + + DEBUG_ONLY(totals.verify()); +} + +template +void GenericTaskQueueSet::reset_taskqueue_stats() { + const uint n = size(); + for (uint i = 0; i < n; ++i) { + queue(i)->stats.reset(); + } +} + +template +inline void GenericTaskQueueSet::print_and_reset_taskqueue_stats(const char* label) { + if (!log_is_enabled(Trace, gc, task, stats)) { + return; + } + Log(gc, task, stats) log; + ResourceMark rm; + LogStream ls(log.trace()); + + print_taskqueue_stats(&ls, label); + reset_taskqueue_stats(); +} +#endif // TASKQUEUE_STATS + template inline GenericTaskQueue::GenericTaskQueue() : _elems(ArrayAllocator::allocate(N, F)), @@ -205,7 +254,7 @@ bool OverflowTaskQueue::pop_overflow(E& t) // reads elems[oldAge.top]. The owner's bottom == the thief's oldAge.top. // (4) Thief will discard the read value, because its cmpxchg of age will fail. template -bool GenericTaskQueue::pop_global(E& t) { +typename GenericTaskQueue::PopResult GenericTaskQueue::pop_global(E& t) { Age oldAge = age_relaxed(); // Architectures with non-multi-copy-atomic memory model require a @@ -226,7 +275,7 @@ bool GenericTaskQueue::pop_global(E& t) { uint localBot = bottom_acquire(); uint n_elems = clean_size(localBot, oldAge.top()); if (n_elems == 0) { - return false; + return PopResult::Empty; } t = _elems[oldAge.top()]; @@ -240,7 +289,7 @@ bool GenericTaskQueue::pop_global(E& t) { // Note that using "bottom" here might fail, since a pop_local might // have decremented it. assert_not_underflow(localBot, newAge.top()); - return resAge == oldAge; + return resAge == oldAge ? PopResult::Success : PopResult::Contended; } inline int randomParkAndMiller(int *seed0) { @@ -267,10 +316,10 @@ int GenericTaskQueue::next_random_queue_id() { return randomParkAndMiller(&_seed); } -template bool -GenericTaskQueueSet::steal_best_of_2(uint queue_num, E& t) { +template +typename GenericTaskQueueSet::PopResult GenericTaskQueueSet::steal_best_of_2(uint queue_num, E& t) { + T* const local_queue = queue(queue_num); if (_n > 2) { - T* const local_queue = _queues[queue_num]; uint k1 = queue_num; if (local_queue->is_last_stolen_queue_id_valid()) { @@ -287,21 +336,23 @@ GenericTaskQueueSet::steal_best_of_2(uint queue_num, E& t) { k2 = local_queue->next_random_queue_id() % _n; } // Sample both and try the larger. - uint sz1 = _queues[k1]->size(); - uint sz2 = _queues[k2]->size(); + uint sz1 = queue(k1)->size(); + uint sz2 = queue(k2)->size(); uint sel_k = 0; - bool suc = false; + PopResult suc = PopResult::Empty; if (sz2 > sz1) { sel_k = k2; - suc = _queues[k2]->pop_global(t); + suc = queue(k2)->pop_global(t); + TASKQUEUE_STATS_ONLY(local_queue->record_steal_attempt(suc);) } else if (sz1 > 0) { sel_k = k1; - suc = _queues[k1]->pop_global(t); + suc = queue(k1)->pop_global(t); + TASKQUEUE_STATS_ONLY(local_queue->record_steal_attempt(suc);) } - if (suc) { + if (suc == PopResult::Success) { local_queue->set_last_stolen_queue_id(sel_k); } else { local_queue->invalidate_last_stolen_queue_id(); @@ -311,21 +362,33 @@ GenericTaskQueueSet::steal_best_of_2(uint queue_num, E& t) { } else if (_n == 2) { // Just try the other one. uint k = (queue_num + 1) % 2; - return _queues[k]->pop_global(t); + PopResult res = queue(k)->pop_global(t); + TASKQUEUE_STATS_ONLY(local_queue->record_steal_attempt(res);) + return res; } else { assert(_n == 1, "can't be zero."); - return false; + TASKQUEUE_STATS_ONLY(local_queue->record_steal_attempt(PopResult::Empty);) + return PopResult::Empty; } } -template bool -GenericTaskQueueSet::steal(uint queue_num, E& t) { - assert(queue_num < _n, "index out of range."); - for (uint i = 0; i < 2 * _n; i++) { - TASKQUEUE_STATS_ONLY(queue(queue_num)->stats.record_steal_attempt()); - if (steal_best_of_2(queue_num, t)) { - TASKQUEUE_STATS_ONLY(queue(queue_num)->stats.record_steal()); +template +bool GenericTaskQueueSet::steal(uint queue_num, E& t) { + uint const num_retries = 2 * _n; + + TASKQUEUE_STATS_ONLY(uint contended_in_a_row = 0;) + for (uint i = 0; i < num_retries; i++) { + PopResult sr = steal_best_of_2(queue_num, t); + if (sr == PopResult::Success) { return true; + } else if (sr == PopResult::Contended) { + TASKQUEUE_STATS_ONLY( + contended_in_a_row++; + queue(queue_num)->stats.record_contended_in_a_row(contended_in_a_row); + ) + } else { + assert(sr == PopResult::Empty, "must be"); + TASKQUEUE_STATS_ONLY(contended_in_a_row = 0;) } } return false; diff --git a/src/hotspot/share/gc/shared/weakProcessor.hpp b/src/hotspot/share/gc/shared/weakProcessor.hpp index 5eb2c59f3f2da460e757eb2f15e5ac6d240ef25d..b86129c9b93500abe98fbd704605bef90c3160d4 100644 --- a/src/hotspot/share/gc/shared/weakProcessor.hpp +++ b/src/hotspot/share/gc/shared/weakProcessor.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2022, 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,7 +28,7 @@ #include "gc/shared/oopStorageParState.hpp" #include "gc/shared/oopStorageSetParState.hpp" #include "gc/shared/workerThread.hpp" -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" class WeakProcessorTimes; class WorkerThreads; diff --git a/src/hotspot/share/gc/shared/workerPolicy.hpp b/src/hotspot/share/gc/shared/workerPolicy.hpp index 377c9135d29c5af619ab67cc525cd13eeb40185c..769b0e0ed8b3103bf56ca65a5d74b532ef0b2f9b 100644 --- a/src/hotspot/share/gc/shared/workerPolicy.hpp +++ b/src/hotspot/share/gc/shared/workerPolicy.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2022, 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,7 +25,7 @@ #ifndef SHARE_GC_SHARED_WORKERPOLICY_HPP #define SHARE_GC_SHARED_WORKERPOLICY_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "utilities/globalDefinitions.hpp" class WorkerPolicy : public AllStatic { diff --git a/src/hotspot/share/gc/shenandoah/shenandoahBreakpoint.hpp b/src/hotspot/share/gc/shenandoah/shenandoahBreakpoint.hpp index f8b7489a3bbd0e7aedc4d5b1fe599f531629aedc..acc497618c9c5289b68845417464318913705a3a 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahBreakpoint.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahBreakpoint.hpp @@ -1,6 +1,6 @@ /* - * Copyright (c) 2021, Red Hat, Inc. All rights reserved. - * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2021, 2022, Red Hat, Inc. All rights reserved. + * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ #ifndef SHARE_GC_SHENANDOAH_SHENANDOAHBREAKPOINT_HPP #define SHARE_GC_SHENANDOAH_SHENANDOAHBREAKPOINT_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" class ShenandoahBreakpoint : public AllStatic { private: diff --git a/src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.hpp b/src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.hpp index 17bc5b78934425b0a9582578a5c9c9f6a1ef249e..377d768833337e2d2bdeae1cf6e9e48239b26dc0 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2020, Red Hat, Inc. All rights reserved. + * Copyright (c) 2017, 2022, Red Hat, 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 @@ -29,7 +29,7 @@ #include "gc/shenandoah/shenandoahSharedVariables.hpp" #include "gc/shenandoah/shenandoahLock.hpp" #include "gc/shenandoah/shenandoahPadding.hpp" -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "memory/iterator.hpp" #include "utilities/globalDefinitions.hpp" diff --git a/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.cpp b/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.cpp index b134e4da146faeedafbda9dcad544a6d2f173868..21a21053c8973ba7fbc984fe61e38273085fba4b 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.cpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.cpp @@ -209,7 +209,6 @@ void ShenandoahRootAdjuster::roots_do(uint worker_id, OopClosure* oops) { static_cast(&blobs_and_disarm_Cl) : static_cast(&code_blob_cl); CLDToOopClosure adjust_cld_closure(oops, ClassLoaderData::_claim_strong); - AlwaysTrueClosure always_true; // Process light-weight/limited parallel roots then _vm_roots.oops_do(oops, worker_id); diff --git a/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.inline.hpp index e499c3543ff0623e7a030f75270e04b36b4ed1fc..5677f3daa60918982b729974110246b35c0a4326 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.inline.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.inline.hpp @@ -82,7 +82,7 @@ ShenandoahClassLoaderDataRoots::ShenandoahClassLoaderDataRoots(Shena if (heap_iteration) { ClassLoaderDataGraph::clear_claimed_marks(ClassLoaderData::_claim_other); } else { - ClassLoaderDataGraph::clear_claimed_marks(); + ClassLoaderDataGraph::clear_claimed_marks(ClassLoaderData::_claim_strong); } if (CONCURRENT) { diff --git a/src/hotspot/share/gc/shenandoah/shenandoahRuntime.hpp b/src/hotspot/share/gc/shenandoah/shenandoahRuntime.hpp index 788fe3fbeca7ee36ed7cf0dbb1729c25236e0e94..e187e4360b16b7d713149a7ee2fcc5d34753e2c1 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahRuntime.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahRuntime.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2019, Red Hat, Inc. All rights reserved. + * Copyright (c) 2018, 2022, Red Hat, 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 @@ -25,7 +25,7 @@ #ifndef SHARE_GC_SHENANDOAH_SHENANDOAHRUNTIME_HPP #define SHARE_GC_SHENANDOAH_SHENANDOAHRUNTIME_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "oops/oopsHierarchy.hpp" class JavaThread; diff --git a/src/hotspot/share/gc/shenandoah/shenandoahWorkerPolicy.hpp b/src/hotspot/share/gc/shenandoah/shenandoahWorkerPolicy.hpp index 10a6fec6535d5b800dec04d07f39dd03d85c6ec6..3f47822f2200b0e9675ed247630eaeea04c5c25b 100644 --- a/src/hotspot/share/gc/shenandoah/shenandoahWorkerPolicy.hpp +++ b/src/hotspot/share/gc/shenandoah/shenandoahWorkerPolicy.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2019, Red Hat, Inc. All rights reserved. + * Copyright (c) 2017, 2022, Red Hat, 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 @@ -25,7 +25,7 @@ #ifndef SHARE_GC_SHENANDOAH_SHENANDOAHWORKERPOLICY_HPP #define SHARE_GC_SHENANDOAH_SHENANDOAHWORKERPOLICY_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" class ShenandoahWorkerPolicy : AllStatic { private: diff --git a/src/hotspot/share/gc/z/zAbort.hpp b/src/hotspot/share/gc/z/zAbort.hpp index 1a5bcc15f1971516078644a4c34643e75ec00613..f87bca8c0a389d4b2e0333742d277da41a315b2e 100644 --- a/src/hotspot/share/gc/z/zAbort.hpp +++ b/src/hotspot/share/gc/z/zAbort.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2021, 2022, 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,7 +24,7 @@ #ifndef SHARE_GC_Z_ZABORT_HPP #define SHARE_GC_Z_ZABORT_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" class ZAbort : public AllStatic { private: diff --git a/src/hotspot/share/gc/z/zAddress.hpp b/src/hotspot/share/gc/z/zAddress.hpp index eddd104189e1e224ba9850155239ac233416713e..2908c37bbe6f1783529dbcda9921cd1f02d9dfc0 100644 --- a/src/hotspot/share/gc/z/zAddress.hpp +++ b/src/hotspot/share/gc/z/zAddress.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2022, 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,7 +24,8 @@ #ifndef SHARE_GC_Z_ZADDRESS_HPP #define SHARE_GC_Z_ZADDRESS_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" +#include "utilities/globalDefinitions.hpp" class ZAddress : public AllStatic { friend class ZAddressTest; diff --git a/src/hotspot/share/gc/z/zAddressSpaceLimit.hpp b/src/hotspot/share/gc/z/zAddressSpaceLimit.hpp index b6a03776f5cffaa52c423906c1836d58cc5dc7f5..ec0faf2c0870add95cb556592a9ee1e63f8c97b1 100644 --- a/src/hotspot/share/gc/z/zAddressSpaceLimit.hpp +++ b/src/hotspot/share/gc/z/zAddressSpaceLimit.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2022, 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,7 +24,8 @@ #ifndef SHARE_GC_Z_ZADDRESSSPACELIMIT_HPP #define SHARE_GC_Z_ZADDRESSSPACELIMIT_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" +#include "utilities/globalDefinitions.hpp" class ZAddressSpaceLimit : public AllStatic { public: diff --git a/src/hotspot/share/gc/z/zBarrier.hpp b/src/hotspot/share/gc/z/zBarrier.hpp index d57bef74f91737a2ae6b3014eea5c2b5e133d49c..2dfc1591888fa864ec883f0363093a2303256376 100644 --- a/src/hotspot/share/gc/z/zBarrier.hpp +++ b/src/hotspot/share/gc/z/zBarrier.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2022, 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,7 +24,7 @@ #ifndef SHARE_GC_Z_ZBARRIER_HPP #define SHARE_GC_Z_ZBARRIER_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "memory/iterator.hpp" #include "oops/oop.hpp" diff --git a/src/hotspot/share/gc/z/zBarrierSetRuntime.hpp b/src/hotspot/share/gc/z/zBarrierSetRuntime.hpp index f3d4fb9c6bd84391ea224609ce3a1860cba499ca..b3a143de3e97129b7a18eafaa0d089b220add38e 100644 --- a/src/hotspot/share/gc/z/zBarrierSetRuntime.hpp +++ b/src/hotspot/share/gc/z/zBarrierSetRuntime.hpp @@ -24,7 +24,7 @@ #ifndef SHARE_GC_Z_ZBARRIERSETRUNTIME_HPP #define SHARE_GC_Z_ZBARRIERSETRUNTIME_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "oops/accessDecorators.hpp" #include "utilities/globalDefinitions.hpp" diff --git a/src/hotspot/share/gc/z/zBitField.hpp b/src/hotspot/share/gc/z/zBitField.hpp index 4d7171c41ac1da525e03f20a1ff5ae2167b730ad..9bec4e05594cf21355d73f99afe1ec2eef5f6e31 100644 --- a/src/hotspot/share/gc/z/zBitField.hpp +++ b/src/hotspot/share/gc/z/zBitField.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2022, 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,9 @@ #ifndef SHARE_GC_Z_ZBITFIELD_HPP #define SHARE_GC_Z_ZBITFIELD_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "utilities/debug.hpp" +#include "utilities/globalDefinitions.hpp" // // Example diff --git a/src/hotspot/share/gc/z/zBreakpoint.hpp b/src/hotspot/share/gc/z/zBreakpoint.hpp index 14ba227e1895b8ae4d5a62aec41d172bb81ac69a..920169fb6a6716abb7db1588313f2691ee011807 100644 --- a/src/hotspot/share/gc/z/zBreakpoint.hpp +++ b/src/hotspot/share/gc/z/zBreakpoint.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2020, 2022, 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,7 +24,7 @@ #ifndef SHARE_GC_Z_ZBREAKPOINT_HPP #define SHARE_GC_Z_ZBREAKPOINT_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" class ZBreakpoint : public AllStatic { private: diff --git a/src/hotspot/share/gc/z/zCPU.hpp b/src/hotspot/share/gc/z/zCPU.hpp index 65e04cc75e3bd5854149bde8a2ea1732da51a239..0acc949e508b8f8cc569fd7acdc160f7126e3e0d 100644 --- a/src/hotspot/share/gc/z/zCPU.hpp +++ b/src/hotspot/share/gc/z/zCPU.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2022, 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,7 +24,7 @@ #ifndef SHARE_GC_Z_ZCPU_HPP #define SHARE_GC_Z_ZCPU_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "memory/padded.hpp" #include "utilities/globalDefinitions.hpp" diff --git a/src/hotspot/share/gc/z/zHash.hpp b/src/hotspot/share/gc/z/zHash.hpp index 5752d2abee3c9dbb5b741986ccb5e2eb5839273e..e6469698488901a322f6de54665af2a965ff303f 100644 --- a/src/hotspot/share/gc/z/zHash.hpp +++ b/src/hotspot/share/gc/z/zHash.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2022, 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,7 +24,7 @@ #ifndef SHARE_GC_Z_ZHASH_HPP #define SHARE_GC_Z_ZHASH_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "utilities/globalDefinitions.hpp" class ZHash : public AllStatic { diff --git a/src/hotspot/share/gc/z/zHeuristics.hpp b/src/hotspot/share/gc/z/zHeuristics.hpp index 5b810a84851cdddd361a78657d026800fd61bfcb..362fd775f0fa31ec0e1c01b41d901e49efe4480b 100644 --- a/src/hotspot/share/gc/z/zHeuristics.hpp +++ b/src/hotspot/share/gc/z/zHeuristics.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2022, 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,7 +24,7 @@ #ifndef SHARE_GC_Z_ZHEURISTICS_HPP #define SHARE_GC_Z_ZHEURISTICS_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" class ZHeuristics : public AllStatic { public: diff --git a/src/hotspot/share/gc/z/zLargePages.hpp b/src/hotspot/share/gc/z/zLargePages.hpp index 1201b4962661348583eba7b5000c0a4b6ceed3d1..9f7c8310e50f4fc03e1daa8feba81000e858c0ee 100644 --- a/src/hotspot/share/gc/z/zLargePages.hpp +++ b/src/hotspot/share/gc/z/zLargePages.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2022, 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,7 +24,7 @@ #ifndef SHARE_GC_Z_ZLARGEPAGES_HPP #define SHARE_GC_Z_ZLARGEPAGES_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" class ZLargePages : public AllStatic { private: diff --git a/src/hotspot/share/gc/z/zNMethod.hpp b/src/hotspot/share/gc/z/zNMethod.hpp index 40ac93adb8e12ef0e903014613efa39744b2aabf..117c5e34f4ecb54ff2982f5e45ed6b35a070afd2 100644 --- a/src/hotspot/share/gc/z/zNMethod.hpp +++ b/src/hotspot/share/gc/z/zNMethod.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2022, 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,7 +24,7 @@ #ifndef SHARE_GC_Z_ZNMETHOD_HPP #define SHARE_GC_Z_ZNMETHOD_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" class nmethod; class NMethodClosure; diff --git a/src/hotspot/share/gc/z/zNMethodTable.hpp b/src/hotspot/share/gc/z/zNMethodTable.hpp index 26ae2d2793332567cf1416801a1e765fb525f1c4..a1af8512f698b7c6a9a06e0899975a003cc1204b 100644 --- a/src/hotspot/share/gc/z/zNMethodTable.hpp +++ b/src/hotspot/share/gc/z/zNMethodTable.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ #include "gc/z/zNMethodTableIteration.hpp" #include "gc/z/zSafeDelete.hpp" -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" class nmethod; class NMethodClosure; diff --git a/src/hotspot/share/gc/z/zNUMA.hpp b/src/hotspot/share/gc/z/zNUMA.hpp index 0dc4390e8b475809cb809260e9d59ab62a65221a..fb29e1faaa733906983e82b62c56f7b2bea94064 100644 --- a/src/hotspot/share/gc/z/zNUMA.hpp +++ b/src/hotspot/share/gc/z/zNUMA.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2022, 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,7 +24,8 @@ #ifndef SHARE_GC_Z_ZNUMA_HPP #define SHARE_GC_Z_ZNUMA_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" +#include "utilities/globalDefinitions.hpp" class ZNUMA : public AllStatic { private: diff --git a/src/hotspot/share/gc/z/zOop.hpp b/src/hotspot/share/gc/z/zOop.hpp index cf752ba61c3aff076284280c1b016e6f639b338b..4fb0e6499e14a0c394f4074ca68cd6053d235616 100644 --- a/src/hotspot/share/gc/z/zOop.hpp +++ b/src/hotspot/share/gc/z/zOop.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2022, 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,7 +24,7 @@ #ifndef SHARE_GC_Z_ZOOP_HPP #define SHARE_GC_Z_ZOOP_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "oops/oopsHierarchy.hpp" class ZOop : public AllStatic { diff --git a/src/hotspot/share/gc/z/zResurrection.hpp b/src/hotspot/share/gc/z/zResurrection.hpp index a88b93544692307443f18edf81167315fbc4e2cd..3d6a8f95a1cd833893a7435cb88f66136ea45a0d 100644 --- a/src/hotspot/share/gc/z/zResurrection.hpp +++ b/src/hotspot/share/gc/z/zResurrection.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2022, 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,7 +24,7 @@ #ifndef SHARE_GC_Z_ZRESURRECTION_HPP #define SHARE_GC_Z_ZRESURRECTION_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" class ZResurrection : public AllStatic { private: diff --git a/src/hotspot/share/gc/z/zThread.hpp b/src/hotspot/share/gc/z/zThread.hpp index f98b7a05fb611ca9f09d77c5cab5c2cc94d32296..c67807ff96ecdfe07b7d825b336410acd5c7a249 100644 --- a/src/hotspot/share/gc/z/zThread.hpp +++ b/src/hotspot/share/gc/z/zThread.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2022, 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,7 +24,7 @@ #ifndef SHARE_GC_Z_ZTHREAD_HPP #define SHARE_GC_Z_ZTHREAD_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "utilities/globalDefinitions.hpp" class ZThread : public AllStatic { diff --git a/src/hotspot/share/gc/z/zThreadLocalAllocBuffer.hpp b/src/hotspot/share/gc/z/zThreadLocalAllocBuffer.hpp index d6693fceb0085b296625a70229336858aa11f884..086c8a5c351ce5b8d4ad90dc10b08732bd14bfbf 100644 --- a/src/hotspot/share/gc/z/zThreadLocalAllocBuffer.hpp +++ b/src/hotspot/share/gc/z/zThreadLocalAllocBuffer.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ #include "gc/shared/threadLocalAllocBuffer.hpp" #include "gc/z/zValue.hpp" -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" class JavaThread; diff --git a/src/hotspot/share/gc/z/zUtils.hpp b/src/hotspot/share/gc/z/zUtils.hpp index f4abea9c6feeed61f5f3a6a833fd35ad8fbc2d55..470329daf0d393f658315b7960421e34c9ac075f 100644 --- a/src/hotspot/share/gc/z/zUtils.hpp +++ b/src/hotspot/share/gc/z/zUtils.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2022, 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,7 +24,8 @@ #ifndef SHARE_GC_Z_ZUTILS_HPP #define SHARE_GC_Z_ZUTILS_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" +#include "utilities/globalDefinitions.hpp" class ZUtils : public AllStatic { public: diff --git a/src/hotspot/share/gc/z/zValue.hpp b/src/hotspot/share/gc/z/zValue.hpp index 281a2e48b8cbebb089fd8f8941be65fe3b1e60c5..e2c67e8c48d0f772a71aff833d9751e6d24454b9 100644 --- a/src/hotspot/share/gc/z/zValue.hpp +++ b/src/hotspot/share/gc/z/zValue.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2022, 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,7 +24,7 @@ #ifndef SHARE_GC_Z_ZVALUE_HPP #define SHARE_GC_Z_ZVALUE_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "utilities/globalDefinitions.hpp" // diff --git a/src/hotspot/share/gc/z/zVerify.hpp b/src/hotspot/share/gc/z/zVerify.hpp index db2d56d00951f5e92ebc3b9f883670385bc2b123..8d7abd4a8d53152ab1ac2e24bf18600f34a48660 100644 --- a/src/hotspot/share/gc/z/zVerify.hpp +++ b/src/hotspot/share/gc/z/zVerify.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2022, 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,7 +24,7 @@ #ifndef SHARE_GC_Z_ZVERIFY_HPP #define SHARE_GC_Z_ZVERIFY_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" class frame; class ZPageAllocator; diff --git a/src/hotspot/share/include/cds.h b/src/hotspot/share/include/cds.h index 0c020e436969d2e149e9b6f1f0432a529b142fb2..21a7a43b3af3c8aae189d34b09497a5f85340544 100644 --- a/src/hotspot/share/include/cds.h +++ b/src/hotspot/share/include/cds.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2022, 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 @@ -39,7 +39,7 @@ #define CDS_ARCHIVE_MAGIC 0xf00baba2 #define CDS_DYNAMIC_ARCHIVE_MAGIC 0xf00baba8 #define CDS_GENERIC_HEADER_SUPPORTED_MIN_VERSION 13 -#define CURRENT_CDS_ARCHIVE_VERSION 13 +#define CURRENT_CDS_ARCHIVE_VERSION 14 typedef struct CDSFileMapRegion { int _crc; // CRC checksum of this region. @@ -48,7 +48,7 @@ typedef struct CDSFileMapRegion { int _is_heap_region; // Used by SA and debug build. int _is_bitmap_region; // Relocation bitmap for RO/RW regions (used by SA and debug build). int _mapped_from_file; // Is this region mapped from a file? - // If false, this region was initialized using os::read(). + // If false, this region was initialized using ::read(). size_t _file_offset; // Data for this region starts at this offset in the archive file. size_t _mapping_offset; // This region should be mapped at this offset from the base address // - for non-heap regions, the base address is SharedBaseAddress diff --git a/src/hotspot/share/interpreter/bytecodeHistogram.hpp b/src/hotspot/share/interpreter/bytecodeHistogram.hpp index b919227702f8e7ba5d5c74183fe02b13a47e5c9a..44ddca074d06bbd26470c0d0de78980fd4c136b1 100644 --- a/src/hotspot/share/interpreter/bytecodeHistogram.hpp +++ b/src/hotspot/share/interpreter/bytecodeHistogram.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ #define SHARE_INTERPRETER_BYTECODEHISTOGRAM_HPP #include "interpreter/bytecodes.hpp" -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" // BytecodeCounter counts the number of bytecodes executed diff --git a/src/hotspot/share/interpreter/bytecodeTracer.hpp b/src/hotspot/share/interpreter/bytecodeTracer.hpp index 52e91a0e7128837f754b3d113cc553f3c55c8bf5..38c2b092ce3faa3b8d6155509f1aacb6e12d43ee 100644 --- a/src/hotspot/share/interpreter/bytecodeTracer.hpp +++ b/src/hotspot/share/interpreter/bytecodeTracer.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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,7 +25,7 @@ #ifndef SHARE_INTERPRETER_BYTECODETRACER_HPP #define SHARE_INTERPRETER_BYTECODETRACER_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "utilities/ostream.hpp" // The BytecodeTracer is a helper class used by the interpreter for run-time diff --git a/src/hotspot/share/interpreter/bytecodeUtils.hpp b/src/hotspot/share/interpreter/bytecodeUtils.hpp index ede99a995b7c92388e58939272a1d6a04ce52388..ff23b9c000f400f349bf79918144bf8d38488d19 100644 --- a/src/hotspot/share/interpreter/bytecodeUtils.hpp +++ b/src/hotspot/share/interpreter/bytecodeUtils.hpp @@ -1,6 +1,6 @@ /* - * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2019 SAP SE. All rights reserved. + * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2022 SAP SE. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ #ifndef SHARE_INTERPRETER_BYTECODEUTILS_HPP #define SHARE_INTERPRETER_BYTECODEUTILS_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "utilities/globalDefinitions.hpp" class Method; diff --git a/src/hotspot/share/interpreter/bytecodes.hpp b/src/hotspot/share/interpreter/bytecodes.hpp index 9a34a227c0472abc3a35eb96d5ab12a323b9a2fc..7c70518d2b155be71846b480bdb6cca795afe8d3 100644 --- a/src/hotspot/share/interpreter/bytecodes.hpp +++ b/src/hotspot/share/interpreter/bytecodes.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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,7 +25,8 @@ #ifndef SHARE_INTERPRETER_BYTECODES_HPP #define SHARE_INTERPRETER_BYTECODES_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" +#include "utilities/globalDefinitions.hpp" // Bytecodes specifies all bytecodes used in the VM and // provides utility functions to get bytecode attributes. diff --git a/src/hotspot/share/interpreter/templateTable.hpp b/src/hotspot/share/interpreter/templateTable.hpp index ff5d2c338803de2011a2589b3d2539b8ad7d63e2..e7575eeb40a7f4dbea87955de8735730dfb8bd8f 100644 --- a/src/hotspot/share/interpreter/templateTable.hpp +++ b/src/hotspot/share/interpreter/templateTable.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ #define SHARE_INTERPRETER_TEMPLATETABLE_HPP #include "interpreter/bytecodes.hpp" -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "runtime/frame.hpp" #include "utilities/macros.hpp" diff --git a/src/hotspot/share/interpreter/zero/bytecodeInterpreter.cpp b/src/hotspot/share/interpreter/zero/bytecodeInterpreter.cpp index a70b0092cba5e2741916aaee850c55e450aa5a81..4682c2b8129201e3ef2da800b3b369627c1bc170 100644 --- a/src/hotspot/share/interpreter/zero/bytecodeInterpreter.cpp +++ b/src/hotspot/share/interpreter/zero/bytecodeInterpreter.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2022, 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 @@ -99,6 +99,9 @@ #undef PREFETCH_OPCCODE #define PREFETCH_OPCCODE +JRT_ENTRY(void, at_safepoint(JavaThread* current)) {} +JRT_END + /* Interpreter safepoint: it is expected that the interpreter will have no live handles of its own creation live at an interpreter safepoint. Therefore we @@ -107,12 +110,10 @@ There really shouldn't be any handles remaining to trash but this is cheap in relation to a safepoint. */ -#define RETURN_SAFEPOINT \ - if (SafepointMechanism::should_process(THREAD)) { \ - HandleMarkCleaner __hmc(THREAD); \ - CALL_VM(SafepointMechanism::process_if_requested_with_exit_check(THREAD, true /* check asyncs */), \ - handle_exception); \ - } \ +#define RETURN_SAFEPOINT \ + if (SafepointMechanism::should_process(THREAD)) { \ + CALL_VM(at_safepoint(THREAD), handle_exception); \ + } /* * VM_JAVA_ERROR - Macro for throwing a java exception from @@ -1942,12 +1943,12 @@ run: Copy::fill_to_words(result + hdr_size, obj_size - hdr_size, 0); } - oop obj = cast_to_oop(result); + // Initialize header, mirrors MemAllocator. + oopDesc::set_mark(result, markWord::prototype()); + oopDesc::set_klass_gap(result, 0); + oopDesc::release_set_klass(result, ik); - // Initialize header - obj->set_mark(markWord::prototype()); - obj->set_klass_gap(0); - obj->set_klass(ik); + oop obj = cast_to_oop(result); // Must prevent reordering of stores for object initialization // with stores that publish the new object. diff --git a/src/hotspot/share/jfr/dcmd/jfrDcmds.cpp b/src/hotspot/share/jfr/dcmd/jfrDcmds.cpp index 319d1c1a4e88047675198413ceb489fda863715b..9b29553665716b08c51c884baee414a3f20532df 100644 --- a/src/hotspot/share/jfr/dcmd/jfrDcmds.cpp +++ b/src/hotspot/share/jfr/dcmd/jfrDcmds.cpp @@ -420,9 +420,6 @@ void JfrConfigureFlightRecorderDCmd::print_help(const char* name) const { out->print_cr(" performance and is not recommended. This value cannot be changed"); out->print_cr(" once JFR has been initialized. (STRING, 8k)"); out->print_cr(""); - out->print_cr(" samplethreads (Optional) Flag for activating thread sampling. This value cannot"); - out->print_cr(" be changed once JFR has been initialized. (BOOLEAN, true)"); - out->print_cr(""); out->print_cr("Options must be specified using the or = syntax."); out->print_cr(""); out->print_cr("Example usage:"); @@ -477,7 +474,6 @@ void JfrConfigureFlightRecorderDCmd::execute(DCmdSource source, TRAPS) { jobject thread_buffer_size = NULL; jobject max_chunk_size = NULL; jobject memory_size = NULL; - jobject sample_threads = NULL; if (!JfrRecorder::is_created()) { if (_stack_depth.is_set()) { @@ -499,7 +495,13 @@ void JfrConfigureFlightRecorderDCmd::execute(DCmdSource source, TRAPS) { memory_size = JfrJavaSupport::new_java_lang_Long(_memory_size.value()._size, CHECK); } if (_sample_threads.is_set()) { - sample_threads = JfrJavaSupport::new_java_lang_Boolean(_sample_threads.value(), CHECK); + bool startup = DCmd_Source_Internal == source; + if (startup) { + log_warning(jfr,startup)("%s", "Option samplethreads is deprecated. Use -XX:StartFlightRecording:method-profiling="); + } else { + output()->print_cr("%s", "Option samplethreads is deprecated. Use JFR.start method-profiling="); + output()->print_cr(""); + } } } @@ -507,7 +509,7 @@ void JfrConfigureFlightRecorderDCmd::execute(DCmdSource source, TRAPS) { static const char method[] = "execute"; static const char signature[] = "(ZLjava/lang/String;Ljava/lang/String;Ljava/lang/Integer;" "Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/Long;" - "Ljava/lang/Long;Ljava/lang/Boolean;)[Ljava/lang/String;"; + "Ljava/lang/Long;)[Ljava/lang/String;"; JfrJavaArguments execute_args(&result, klass, method, signature, CHECK); execute_args.set_receiver(h_dcmd_instance); @@ -522,7 +524,6 @@ void JfrConfigureFlightRecorderDCmd::execute(DCmdSource source, TRAPS) { execute_args.push_jobject(thread_buffer_size); execute_args.push_jobject(memory_size); execute_args.push_jobject(max_chunk_size); - execute_args.push_jobject(sample_threads); JfrJavaSupport::call_virtual(&execute_args, THREAD); handle_dcmd_result(output(), result.get_oop(), source, THREAD); diff --git a/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.hpp b/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.hpp index d34a4e57a78a0306726a54f35cf67f5a35087453..939c02bfdf4c113970d5b37293b01d1ec5dbd3e5 100644 --- a/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.hpp +++ b/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2022, 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,7 +25,7 @@ #ifndef SHARE_JFR_INSTRUMENTATION_JFREVENTCLASSTRANSFORMER_HPP #define SHARE_JFR_INSTRUMENTATION_JFREVENTCLASSTRANSFORMER_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "utilities/exceptions.hpp" class ClassFileParser; diff --git a/src/hotspot/share/jfr/jfr.hpp b/src/hotspot/share/jfr/jfr.hpp index c97cc807c3b7c2b0719b29874f248f656cf4b356..b4b1ae78adc78cd15ff37d4e8144f96ec833828e 100644 --- a/src/hotspot/share/jfr/jfr.hpp +++ b/src/hotspot/share/jfr/jfr.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,11 +26,13 @@ #define SHARE_JFR_JFR_HPP #include "jni.h" -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" +#include "utilities/globalDefinitions.hpp" class JavaThread; class Thread; class Klass; +class outputStream; extern "C" void JNICALL jfr_register_natives(JNIEnv*, jclass); diff --git a/src/hotspot/share/jfr/jni/jfrJniMethod.cpp b/src/hotspot/share/jfr/jni/jfrJniMethod.cpp index 690b02ef36d632f25b214d073f8f45fd1b3f30c3..afbfaec6a96f5129d97e3037eca2b66ff76192d7 100644 --- a/src/hotspot/share/jfr/jni/jfrJniMethod.cpp +++ b/src/hotspot/share/jfr/jni/jfrJniMethod.cpp @@ -121,10 +121,6 @@ NO_TRANSITION(void, jfr_set_file_notification(JNIEnv* env, jobject jvm, jlong th JfrChunkRotation::set_threshold(threshold); NO_TRANSITION_END -NO_TRANSITION(void, jfr_set_sample_threads(JNIEnv* env, jobject jvm, jboolean sampleThreads)) - JfrOptionSet::set_sample_threads(sampleThreads); -NO_TRANSITION_END - NO_TRANSITION(void, jfr_set_stack_depth(JNIEnv* env, jobject jvm, jint depth)) JfrOptionSet::set_stackdepth((jlong)depth); NO_TRANSITION_END diff --git a/src/hotspot/share/jfr/jni/jfrJniMethod.hpp b/src/hotspot/share/jfr/jni/jfrJniMethod.hpp index 946ef04470d6ef1f31251e5f31f10ef1a83fda4e..49286eed76f9d8951c52411ea71e39754efd834e 100644 --- a/src/hotspot/share/jfr/jni/jfrJniMethod.hpp +++ b/src/hotspot/share/jfr/jni/jfrJniMethod.hpp @@ -87,8 +87,6 @@ void JNICALL jfr_set_method_sampling_interval(JNIEnv* env, jobject jvm, jlong ty void JNICALL jfr_set_output(JNIEnv* env, jobject jvm, jstring path); -void JNICALL jfr_set_sample_threads(JNIEnv* env, jobject jvm, jboolean sampleThreads); - void JNICALL jfr_set_stack_depth(JNIEnv* env, jobject jvm, jint depth); void JNICALL jfr_set_stacktrace_enabled(JNIEnv* env, jobject jvm, jlong event_type_id, jboolean enabled); diff --git a/src/hotspot/share/jfr/jni/jfrJniMethodRegistration.cpp b/src/hotspot/share/jfr/jni/jfrJniMethodRegistration.cpp index 5bc8a95a826060ce9793e5ee67add7834a090baa..d71e2b4f25ac924d3568f974af00d4ad9a798c9c 100644 --- a/src/hotspot/share/jfr/jni/jfrJniMethodRegistration.cpp +++ b/src/hotspot/share/jfr/jni/jfrJniMethodRegistration.cpp @@ -59,7 +59,6 @@ JfrJniMethodRegistration::JfrJniMethodRegistration(JNIEnv* env) { (char*)"setGlobalBufferSize", (char*)"(J)V", (void*)jfr_set_global_buffer_size, (char*)"setMethodSamplingInterval", (char*)"(JJ)V", (void*)jfr_set_method_sampling_interval, (char*)"setOutput", (char*)"(Ljava/lang/String;)V", (void*)jfr_set_output, - (char*)"setSampleThreads", (char*)"(Z)V", (void*)jfr_set_sample_threads, (char*)"setStackDepth", (char*)"(I)V", (void*)jfr_set_stack_depth, (char*)"setStackTraceEnabled", (char*)"(JZ)V", (void*)jfr_set_stacktrace_enabled, (char*)"setThreadBufferSize", (char*)"(J)V", (void*)jfr_set_thread_buffer_size, diff --git a/src/hotspot/share/jfr/leakprofiler/chains/edgeUtils.hpp b/src/hotspot/share/jfr/leakprofiler/chains/edgeUtils.hpp index c9a169e6edb53cc6f8d3567927595fabea62495d..0f107e7c32e2568806e5cc1be7a2f34916feebec 100644 --- a/src/hotspot/share/jfr/leakprofiler/chains/edgeUtils.hpp +++ b/src/hotspot/share/jfr/leakprofiler/chains/edgeUtils.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2022, 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,7 +25,7 @@ #ifndef SHARE_JFR_LEAKPROFILER_CHAINS_EDGEUTILS_HPP #define SHARE_JFR_LEAKPROFILER_CHAINS_EDGEUTILS_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" class Edge; class Symbol; diff --git a/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleCheckpoint.hpp b/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleCheckpoint.hpp index 0ed82fd55c828ff949e8d76ac784e9a3b5a2452d..f9f928699e226e51ea9b6afff1a1ece6bc84a468 100644 --- a/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleCheckpoint.hpp +++ b/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleCheckpoint.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2022, 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,7 +25,7 @@ #ifndef SHARE_JFR_LEAKPROFILER_CHECKPOINT_OBJECTSAMPLECHECKPOINT_HPP #define SHARE_JFR_LEAKPROFILER_CHECKPOINT_OBJECTSAMPLECHECKPOINT_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "jfr/utilities/jfrTypes.hpp" class EdgeStore; diff --git a/src/hotspot/share/jfr/leakprofiler/checkpoint/rootResolver.hpp b/src/hotspot/share/jfr/leakprofiler/checkpoint/rootResolver.hpp index 63dca4afc72a1a0e52a3f0d989fac2dc04341080..279cb5032ff626e4ed1580be4e7c305940f39cfc 100644 --- a/src/hotspot/share/jfr/leakprofiler/checkpoint/rootResolver.hpp +++ b/src/hotspot/share/jfr/leakprofiler/checkpoint/rootResolver.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2022, 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,7 +27,7 @@ #include "jfr/leakprofiler/utilities/rootType.hpp" #include "jfr/leakprofiler/utilities/unifiedOopRef.hpp" -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "oops/oopsHierarchy.hpp" struct RootCallbackInfo { diff --git a/src/hotspot/share/jfr/leakprofiler/leakProfiler.hpp b/src/hotspot/share/jfr/leakprofiler/leakProfiler.hpp index c541ff1086db4c519e2ec3de694e5f43a5fcfec9..6290a10ff748b5401436c7c63dec60a6a128870a 100644 --- a/src/hotspot/share/jfr/leakprofiler/leakProfiler.hpp +++ b/src/hotspot/share/jfr/leakprofiler/leakProfiler.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2022, 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,7 +25,8 @@ #ifndef SHARE_JFR_LEAKPROFILER_LEAKPROFILER_HPP #define SHARE_JFR_LEAKPROFILER_LEAKPROFILER_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" +#include "utilities/globalDefinitions.hpp" class JavaThread; diff --git a/src/hotspot/share/jfr/leakprofiler/utilities/granularTimer.hpp b/src/hotspot/share/jfr/leakprofiler/utilities/granularTimer.hpp index 231c1b26df4764bd1fc5284a1a734f8088cbe36e..e42a815c10d21cd4f023c1e79e6a4f187c306089 100644 --- a/src/hotspot/share/jfr/leakprofiler/utilities/granularTimer.hpp +++ b/src/hotspot/share/jfr/leakprofiler/utilities/granularTimer.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ #define SHARE_JFR_LEAKPROFILER_UTILITIES_GRANULARTIMER_HPP #include "jfr/utilities/jfrTime.hpp" -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" class GranularTimer : public AllStatic { private: diff --git a/src/hotspot/share/jfr/leakprofiler/utilities/rootType.hpp b/src/hotspot/share/jfr/leakprofiler/utilities/rootType.hpp index ffc47c7b83391f80f953eeb9b3b20cc64cac3a33..ce975e9b802a34a0140cea166dad9e0ac10a5808 100644 --- a/src/hotspot/share/jfr/leakprofiler/utilities/rootType.hpp +++ b/src/hotspot/share/jfr/leakprofiler/utilities/rootType.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ #define SHARE_JFR_LEAKPROFILER_UTILITIES_ROOTTYPE_HPP #include "gc/shared/oopStorageSet.hpp" -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "utilities/enumIterator.hpp" class OldObjectRoot : public AllStatic { diff --git a/src/hotspot/share/jfr/periodic/jfrFinalizerStatisticsEvent.hpp b/src/hotspot/share/jfr/periodic/jfrFinalizerStatisticsEvent.hpp index fe739495718d43c682771a7fa934dbb69ba9d90b..756b531829879981b6fde99d3e0067403caedcb8 100644 --- a/src/hotspot/share/jfr/periodic/jfrFinalizerStatisticsEvent.hpp +++ b/src/hotspot/share/jfr/periodic/jfrFinalizerStatisticsEvent.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2021, 2022, 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,7 +25,7 @@ #ifndef SHARE_JFR_PERIODIC_JFRFINALIZERSTATISTICSEVENT_HPP #define SHARE_JFR_PERIODIC_JFRFINALIZERSTATISTICSEVENT_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" class InstanceKlass; diff --git a/src/hotspot/share/jfr/periodic/jfrModuleEvent.hpp b/src/hotspot/share/jfr/periodic/jfrModuleEvent.hpp index aec662be231172bdd5e6cc383af8048b1e8e5912..a417ab1bb48b37770be91adb1e3dc3c023dc2b14 100644 --- a/src/hotspot/share/jfr/periodic/jfrModuleEvent.hpp +++ b/src/hotspot/share/jfr/periodic/jfrModuleEvent.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2022, 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,7 +25,7 @@ #ifndef SHARE_JFR_PERIODIC_JFRMODULEEVENT_HPP #define SHARE_JFR_PERIODIC_JFRMODULEEVENT_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" class JfrModuleEvent : AllStatic { public: diff --git a/src/hotspot/share/jfr/periodic/jfrNetworkUtilization.hpp b/src/hotspot/share/jfr/periodic/jfrNetworkUtilization.hpp index b7a78498a9f5617d9287b3dc28cfc1b5d3ac67a3..0ec3de18dee28e610aa3a23dd79ff700a34cf09d 100644 --- a/src/hotspot/share/jfr/periodic/jfrNetworkUtilization.hpp +++ b/src/hotspot/share/jfr/periodic/jfrNetworkUtilization.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2022, 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,7 +25,7 @@ #ifndef SHARE_JFR_PERIODIC_JFRNETWORKUTILIZATION_HPP #define SHARE_JFR_PERIODIC_JFRNETWORKUTILIZATION_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" class NetworkInterface; diff --git a/src/hotspot/share/jfr/periodic/jfrThreadCPULoadEvent.hpp b/src/hotspot/share/jfr/periodic/jfrThreadCPULoadEvent.hpp index 84d3099e8255ac397a2c1e85f31747f764fb7455..d5bed0fd82181ac69277f74350f80a6c56d66b66 100644 --- a/src/hotspot/share/jfr/periodic/jfrThreadCPULoadEvent.hpp +++ b/src/hotspot/share/jfr/periodic/jfrThreadCPULoadEvent.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ #define SHARE_JFR_PERIODIC_JFRTHREADCPULOADEVENT_HPP #include "jni.h" -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" class JavaThread; class EventThreadCPULoad; diff --git a/src/hotspot/share/jfr/periodic/jfrThreadDumpEvent.hpp b/src/hotspot/share/jfr/periodic/jfrThreadDumpEvent.hpp index 23af6a3060b3b10f90f318c2dbf881aef68bfc0e..c00925903b112fa4c375c7a36ec7b93ee469995b 100644 --- a/src/hotspot/share/jfr/periodic/jfrThreadDumpEvent.hpp +++ b/src/hotspot/share/jfr/periodic/jfrThreadDumpEvent.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2022, 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,7 +25,7 @@ #ifndef SHARE_JFR_PERIODIC_JFRTHREADDUMPEVENT_HPP #define SHARE_JFR_PERIODIC_JFRTHREADDUMPEVENT_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" /* * Helper for generating jfr events using output data from Dcmd's. diff --git a/src/hotspot/share/jfr/recorder/checkpoint/jfrMetadataEvent.hpp b/src/hotspot/share/jfr/recorder/checkpoint/jfrMetadataEvent.hpp index 0111d3becbe8af7769b89cfd57387b87097baa8b..abadbfb0b131ae17f6a7f20b4b3725638bb889b6 100644 --- a/src/hotspot/share/jfr/recorder/checkpoint/jfrMetadataEvent.hpp +++ b/src/hotspot/share/jfr/recorder/checkpoint/jfrMetadataEvent.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ #define SHARE_JFR_RECORDER_CHECKPOINT_JFRMETADATAEVENT_HPP #include "jni.h" -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" class JfrChunkWriter; diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrThreadState.hpp b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrThreadState.hpp index 9421273dca7ea46fe46f8b1f2315d63dec085156..4fd519b50642ea791bd6bb2e92a750d9e5a9b3cf 100644 --- a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrThreadState.hpp +++ b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrThreadState.hpp @@ -1,5 +1,5 @@ /* -* Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. +* Copyright (c) 2016, 2022, 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,7 +25,7 @@ #ifndef SHARE_JFR_RECORDER_CHECKPOINT_TYPES_JFRTHREADSTATE_HPP #define SHARE_JFR_RECORDER_CHECKPOINT_TYPES_JFRTHREADSTATE_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" class JfrCheckpointWriter; class Thread; diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceId.hpp b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceId.hpp index 8136d125804afec332ccbfdb46bcfa8a64bd13a4..456599b45f3b770ac8643f85ca49e0912052842e 100644 --- a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceId.hpp +++ b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceId.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2022, 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,7 +27,7 @@ #include "jni.h" #include "jfr/utilities/jfrTypes.hpp" -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" class ClassLoaderData; class Klass; diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdBits.hpp b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdBits.hpp index 7fba5d8d1e8fc9c013b5a7efe7d86dff01be9f95..d7f7effdc3ec382d4c5c8fbcc4f39c9470e0f1c0 100644 --- a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdBits.hpp +++ b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdBits.hpp @@ -27,7 +27,7 @@ #include "jni.h" #include "jfr/utilities/jfrTypes.hpp" -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" class JfrTraceIdBits : AllStatic { public: diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdEpoch.hpp b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdEpoch.hpp index ba14919c9353be8a1fe8adabfb93278a8eb367ee..1216f6956ef8f712dcbc3bf594fb409c78cd9a9b 100644 --- a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdEpoch.hpp +++ b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdEpoch.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2022, 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,7 +27,7 @@ #include "jfr/utilities/jfrSignal.hpp" #include "jfr/utilities/jfrTypes.hpp" -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "runtime/atomic.hpp" #define BIT 1 diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdLoadBarrier.hpp b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdLoadBarrier.hpp index 7113a65bd42bb854e629726fd51fc9b155605ca1..e7b7e1a87804373aa076be08fc875a77530f6c50 100644 --- a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdLoadBarrier.hpp +++ b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdLoadBarrier.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ #define SHARE_JFR_RECORDER_CHECKPOINT_TYPES_TRACEID_JFRTRACEIDLOADBARRIER_HPP #include "jfr/utilities/jfrTypes.hpp" -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" class ClassLoaderData; class JfrBuffer; diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdLoadBarrier.inline.hpp b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdLoadBarrier.inline.hpp index 29bade3def6a34490ed25dd5d701253b0dc50209..9b7ddcd1273a276a51d22707876f6e150de20d60 100644 --- a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdLoadBarrier.inline.hpp +++ b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdLoadBarrier.inline.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2020, 2022, 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 @@ -109,7 +109,14 @@ inline traceid JfrTraceIdLoadBarrier::load(const PackageEntry* package) { inline traceid JfrTraceIdLoadBarrier::load(const ClassLoaderData* cld) { assert(cld != NULL, "invariant"); - return cld->has_class_mirror_holder() ? 0 : set_used_and_get(cld); + if (cld->has_class_mirror_holder()) { + return 0; + } + const Klass* const class_loader_klass = cld->class_loader_klass(); + if (class_loader_klass != nullptr && should_tag(class_loader_klass)) { + load_barrier(class_loader_klass); + } + return set_used_and_get(cld); } inline traceid JfrTraceIdLoadBarrier::load_leakp(const Klass* klass, const Method* method) { diff --git a/src/hotspot/share/jfr/recorder/repository/jfrChunkRotation.hpp b/src/hotspot/share/jfr/recorder/repository/jfrChunkRotation.hpp index 973fa6117181264d93689509bbf5e1cc45a66a01..76603b1cd5e5dfa26b149ee8042fd4907ba93eff 100644 --- a/src/hotspot/share/jfr/recorder/repository/jfrChunkRotation.hpp +++ b/src/hotspot/share/jfr/recorder/repository/jfrChunkRotation.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2022, 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,7 +25,7 @@ #ifndef SHARE_JFR_RECORDER_REPOSITORY_JFRCHUNKROTATION_HPP #define SHARE_JFR_RECORDER_REPOSITORY_JFRCHUNKROTATION_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" class JfrChunkWriter; diff --git a/src/hotspot/share/jfr/recorder/repository/jfrEmergencyDump.cpp b/src/hotspot/share/jfr/recorder/repository/jfrEmergencyDump.cpp index 1dac97034596fa6a57f93c7698a6e2240efa6a22..8aeea6bdb44a87c5b8a1ae12baa850e881c79c28 100644 --- a/src/hotspot/share/jfr/recorder/repository/jfrEmergencyDump.cpp +++ b/src/hotspot/share/jfr/recorder/repository/jfrEmergencyDump.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2022, 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 @@ -105,7 +105,7 @@ static bool open_emergency_dump_fd(const char* path) { static void close_emergency_dump_file() { if (is_emergency_dump_file_open()) { - os::close(emergency_fd); + ::close(emergency_fd); } } @@ -298,7 +298,7 @@ const char* RepositoryIterator::filter(const char* file_name) const { return NULL; } const int64_t size = file_size(fd); - os::close(fd); + ::close(fd); if (size <= chunk_file_header_size) { return NULL; } @@ -389,7 +389,7 @@ static void write_repository_files(const RepositoryIterator& iterator, char* con bytes_written += (int64_t)os::write(emergency_fd, copy_block, bytes_read - bytes_written); assert(bytes_read == bytes_written, "invariant"); } - os::close(current_fd); + ::close(current_fd); } } } diff --git a/src/hotspot/share/jfr/recorder/repository/jfrEmergencyDump.hpp b/src/hotspot/share/jfr/recorder/repository/jfrEmergencyDump.hpp index c96a7d802dc3039281bdb2a08909c1f23a295929..7912daf35c90864ba65a8ef92aa009a1045723d6 100644 --- a/src/hotspot/share/jfr/recorder/repository/jfrEmergencyDump.hpp +++ b/src/hotspot/share/jfr/recorder/repository/jfrEmergencyDump.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2022, 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,7 +25,7 @@ #ifndef SHARE_JFR_RECORDER_REPOSITORY_JFREMERGENCYDUMP_HPP #define SHARE_JFR_RECORDER_REPOSITORY_JFREMERGENCYDUMP_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "utilities/ostream.hpp" // diff --git a/src/hotspot/share/jfr/recorder/service/jfrMemorySizer.hpp b/src/hotspot/share/jfr/recorder/service/jfrMemorySizer.hpp index 8f056e95398e16c57ba56d7a8536e922497699b8..5e226437987a95555da55259e956c880d1c3a124 100644 --- a/src/hotspot/share/jfr/recorder/service/jfrMemorySizer.hpp +++ b/src/hotspot/share/jfr/recorder/service/jfrMemorySizer.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2022, 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,7 +25,7 @@ #ifndef SHARE_JFR_RECORDER_SERVICE_JFRMEMORYSIZER_HPP #define SHARE_JFR_RECORDER_SERVICE_JFRMEMORYSIZER_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "utilities/globalDefinitions.hpp" extern const julong MIN_BUFFER_COUNT; diff --git a/src/hotspot/share/jfr/recorder/service/jfrOptionSet.cpp b/src/hotspot/share/jfr/recorder/service/jfrOptionSet.cpp index 7f9dfcee4ff9d1cba0874e4d6d8abe755d5eb306..a23ab95acbe72b2c045b9543b6737277820980d8 100644 --- a/src/hotspot/share/jfr/recorder/service/jfrOptionSet.cpp +++ b/src/hotspot/share/jfr/recorder/service/jfrOptionSet.cpp @@ -118,14 +118,6 @@ void JfrOptionSet::set_stackdepth(u4 depth) { } } -bool JfrOptionSet::sample_threads() { - return _sample_threads == JNI_TRUE; -} - -void JfrOptionSet::set_sample_threads(jboolean sample) { - _sample_threads = sample; -} - bool JfrOptionSet::can_retransform() { return _retransform == JNI_TRUE; } @@ -315,7 +307,6 @@ jlong JfrOptionSet::_memory_size = 0; jlong JfrOptionSet::_num_global_buffers = 0; jlong JfrOptionSet::_old_object_queue_size = 0; u4 JfrOptionSet::_stack_depth = STACK_DEPTH_DEFAULT; -jboolean JfrOptionSet::_sample_threads = JNI_TRUE; jboolean JfrOptionSet::_retransform = JNI_TRUE; #ifdef ASSERT jboolean JfrOptionSet::_sample_protection = JNI_FALSE; diff --git a/src/hotspot/share/jfr/recorder/service/jfrOptionSet.hpp b/src/hotspot/share/jfr/recorder/service/jfrOptionSet.hpp index c0549e30e7b5e4ad73557b7d08bbd8e51b3f63e9..9ad810bc3cd9c8b8449603d7535dede35f244b83 100644 --- a/src/hotspot/share/jfr/recorder/service/jfrOptionSet.hpp +++ b/src/hotspot/share/jfr/recorder/service/jfrOptionSet.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ #define SHARE_JFR_RECORDER_SERVICE_JFROPTIONSET_HPP #include "jni.h" -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "utilities/exceptions.hpp" template @@ -45,7 +45,6 @@ class JfrOptionSet : public AllStatic { static jlong _num_global_buffers; static jlong _old_object_queue_size; static u4 _stack_depth; - static jboolean _sample_threads; static jboolean _retransform; static jboolean _sample_protection; @@ -68,8 +67,6 @@ class JfrOptionSet : public AllStatic { static void set_old_object_queue_size(jlong value); static u4 stackdepth(); static void set_stackdepth(u4 depth); - static bool sample_threads(); - static void set_sample_threads(jboolean sample); static bool can_retransform(); static void set_retransform(jboolean value); static bool compressed_integers(); diff --git a/src/hotspot/share/jfr/recorder/service/jfrRecorderThread.hpp b/src/hotspot/share/jfr/recorder/service/jfrRecorderThread.hpp index 736cc3508337ec910c19542b7427bbc45d4d3eee..ca8d3e878411c3a618e1eaffd4413f58ec5c5102 100644 --- a/src/hotspot/share/jfr/recorder/service/jfrRecorderThread.hpp +++ b/src/hotspot/share/jfr/recorder/service/jfrRecorderThread.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2022, 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,7 +25,7 @@ #ifndef SHARE_JFR_RECORDER_SERVICE_JFRRECORDERTHREAD_HPP #define SHARE_JFR_RECORDER_SERVICE_JFRRECORDERTHREAD_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "utilities/debug.hpp" class JavaThread; diff --git a/src/hotspot/share/jfr/support/jfrJdkJfrEvent.hpp b/src/hotspot/share/jfr/support/jfrJdkJfrEvent.hpp index 06dddd6d39ed413f090acecfe48e80f0c24138ff..3c3a6d69377eac1ef2c4c7aca06c9c8a4c078510 100644 --- a/src/hotspot/share/jfr/support/jfrJdkJfrEvent.hpp +++ b/src/hotspot/share/jfr/support/jfrJdkJfrEvent.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ #define SHARE_JFR_SUPPORT_JFRJDKJFREVENT_HPP #include "jni.h" -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "utilities/exceptions.hpp" class Klass; diff --git a/src/hotspot/share/jfr/support/jfrKlassUnloading.hpp b/src/hotspot/share/jfr/support/jfrKlassUnloading.hpp index dcbe11ab8f619136a7cb664bf53ac07fa6c39a9b..5d380df436cd8da1523d31611a04335028e3dc4c 100644 --- a/src/hotspot/share/jfr/support/jfrKlassUnloading.hpp +++ b/src/hotspot/share/jfr/support/jfrKlassUnloading.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ #define SHARE_JFR_SUPPORT_JFRKLASSUNLOADING_HPP #include "jfr/utilities/jfrTypes.hpp" -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" class Klass; diff --git a/src/hotspot/share/jfr/support/jfrMethodLookup.hpp b/src/hotspot/share/jfr/support/jfrMethodLookup.hpp index 2f998a9def345b45b58726d008e74a78c12bb73e..106648b25d71d1f7ee6fef58322dbd6d9614d714 100644 --- a/src/hotspot/share/jfr/support/jfrMethodLookup.hpp +++ b/src/hotspot/share/jfr/support/jfrMethodLookup.hpp @@ -26,7 +26,7 @@ #define SHARE_JFR_SUPPORT_JFRMETHODLOOKUP_HPP #include "jfr/utilities/jfrTypes.hpp" -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" class InstanceKlass; class Method; diff --git a/src/hotspot/share/jfr/support/jfrObjectAllocationSample.hpp b/src/hotspot/share/jfr/support/jfrObjectAllocationSample.hpp index 0902db68f5b4ef97ad282b3eb26470ea35f7d17a..f58caf3c2a6a52c76e1ca19a3ef662bfcd62f7d0 100644 --- a/src/hotspot/share/jfr/support/jfrObjectAllocationSample.hpp +++ b/src/hotspot/share/jfr/support/jfrObjectAllocationSample.hpp @@ -1,5 +1,5 @@ /* -* Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. +* Copyright (c) 2020, 2022, 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,7 +25,7 @@ #ifndef SHARE_JFR_SUPPORT_JFROBJECTALLOCATIONSAMPLE_HPP #define SHARE_JFR_SUPPORT_JFROBJECTALLOCATIONSAMPLE_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" class Klass; class Thread; diff --git a/src/hotspot/share/jfr/utilities/jfrBigEndian.hpp b/src/hotspot/share/jfr/utilities/jfrBigEndian.hpp index db2e7ebaad2f96bd6d34ac59609d20fea9d4a772..b2e641269e0cd588930a6298650228fb0ffbbdd0 100644 --- a/src/hotspot/share/jfr/utilities/jfrBigEndian.hpp +++ b/src/hotspot/share/jfr/utilities/jfrBigEndian.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2022, 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,7 +25,7 @@ #ifndef SHARE_JFR_UTILITIES_JFRBIGENDIAN_HPP #define SHARE_JFR_UTILITIES_JFRBIGENDIAN_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "utilities/bytes.hpp" #include "utilities/macros.hpp" diff --git a/src/hotspot/share/jfr/utilities/jfrJavaLog.hpp b/src/hotspot/share/jfr/utilities/jfrJavaLog.hpp index daef51ac81ec8461783846fb2a75efdd5037cdd7..3b5ccc661fea15c147d8b58202603a99257ff47b 100644 --- a/src/hotspot/share/jfr/utilities/jfrJavaLog.hpp +++ b/src/hotspot/share/jfr/utilities/jfrJavaLog.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2022, 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,7 +25,7 @@ #ifndef SHARE_JFR_UTILITIES_JFRJAVALOG_HPP #define SHARE_JFR_UTILITIES_JFRJAVALOG_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "utilities/exceptions.hpp" /* diff --git a/src/hotspot/share/jfr/utilities/jfrPredicate.hpp b/src/hotspot/share/jfr/utilities/jfrPredicate.hpp index b5f87b4c1e0f46ac0e70a3aa838139c4d057a63f..51ad1fec0c9bca0f46f42f1a342544482e6f13d9 100644 --- a/src/hotspot/share/jfr/utilities/jfrPredicate.hpp +++ b/src/hotspot/share/jfr/utilities/jfrPredicate.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2020, 2022, 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,7 +25,7 @@ #ifndef SHARE_JFR_UTILITIES_JFRPREDICATE_HPP #define SHARE_JFR_UTILITIES_JFRPREDICATE_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "utilities/growableArray.hpp" /* diff --git a/src/hotspot/share/jfr/utilities/jfrTimeConverter.hpp b/src/hotspot/share/jfr/utilities/jfrTimeConverter.hpp index 9ce2308a551a65fc03957070e50bac804c78ec3b..6871fbb54613ee7c99ea3f9f199ef7c3a42ee814 100644 --- a/src/hotspot/share/jfr/utilities/jfrTimeConverter.hpp +++ b/src/hotspot/share/jfr/utilities/jfrTimeConverter.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2022, 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,7 +25,7 @@ #ifndef SHARE_JFR_UTILITIES_JFRTIMECONVERTER_HPP #define SHARE_JFR_UTILITIES_JFRTIMECONVERTER_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "utilities/globalDefinitions.hpp" class JfrTimeConverter : AllStatic { diff --git a/src/hotspot/share/jfr/writers/jfrEncoding.hpp b/src/hotspot/share/jfr/writers/jfrEncoding.hpp index 4684cc4bc9d6a5883ddf10c725648110dfa39601..3d4c7c55e0e264774d73dde787d161f304a728ba 100644 --- a/src/hotspot/share/jfr/writers/jfrEncoding.hpp +++ b/src/hotspot/share/jfr/writers/jfrEncoding.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ #define SHARE_JFR_WRITERS_JFRENCODING_HPP #include "jfr/writers/jfrEncoders.hpp" -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "utilities/globalDefinitions.hpp" enum JfrStringEncoding { diff --git a/src/hotspot/share/jfr/writers/jfrJavaEventWriter.hpp b/src/hotspot/share/jfr/writers/jfrJavaEventWriter.hpp index 844ce51a3d979a6b361bdb30934e11e27d56fb0f..1159766428e3f5e811e87e0308f6f1e17d2a0829 100644 --- a/src/hotspot/share/jfr/writers/jfrJavaEventWriter.hpp +++ b/src/hotspot/share/jfr/writers/jfrJavaEventWriter.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ #define SHARE_JFR_WRITERS_JFRJAVAEVENTWRITER_HPP #include "jni.h" -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" class JavaThread; class Thread; diff --git a/src/hotspot/share/jfr/writers/jfrStreamWriterHost.inline.hpp b/src/hotspot/share/jfr/writers/jfrStreamWriterHost.inline.hpp index dd232fdd02648a7bc9085d393cf71247da95b851..3a7ec2863815958c9ad30a04d5462a272dc4ba95 100644 --- a/src/hotspot/share/jfr/writers/jfrStreamWriterHost.inline.hpp +++ b/src/hotspot/share/jfr/writers/jfrStreamWriterHost.inline.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2022, 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,7 @@ inline void StreamWriterHost::write_bytes(const u1* buf, intptr_t l assert(len >= 0, "invariant"); while (len > 0) { const unsigned int nBytes = len > INT_MAX ? INT_MAX : (unsigned int)len; - const ssize_t num_written = (ssize_t)os::write(_fd, buf, nBytes); + const ssize_t num_written = os::write(_fd, buf, nBytes); guarantee(num_written > 0, "Nothing got written, or os::write() failed"); _stream_pos += num_written; len -= num_written; @@ -135,7 +135,7 @@ inline bool StreamWriterHost::is_valid() const { template inline void StreamWriterHost::close_fd() { assert(this->has_valid_fd(), "closing invalid fd!"); - os::close(_fd); + ::close(_fd); _fd = invalid_fd; } diff --git a/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp b/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp index 4368e1fb5363f7efff94ad11fd647435e375b727..6f7269193f653332a5200a9a6efff5a4545b22f2 100644 --- a/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp +++ b/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2022, 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 @@ -2376,7 +2376,7 @@ C2V_VMENTRY_PREFIX(void, detachCurrentThread, (JNIEnv* env, jobject c2vm)) } C2V_END -C2V_VMENTRY_0(jlong, translate, (JNIEnv* env, jobject, jobject obj_handle)) +C2V_VMENTRY_0(jlong, translate, (JNIEnv* env, jobject, jobject obj_handle, jboolean callPostTranslation)) requireJVMCINativeLibrary(JVMCI_CHECK_0); if (obj_handle == NULL) { return 0L; @@ -2427,7 +2427,9 @@ C2V_VMENTRY_0(jlong, translate, (JNIEnv* env, jobject, jobject obj_handle)) const char* cstring = name_string.is_null() ? NULL : thisEnv->as_utf8_string(name_string); // Create a new HotSpotNmethod instance in the peer runtime result = peerEnv->new_HotSpotNmethod(mh, cstring, isDefault, compileIdSnapshot, JVMCI_CHECK_0); - if (nm == NULL) { + if (result.is_null()) { + // exception occurred (e.g. OOME) creating a new HotSpotNmethod + } else if (nm == NULL) { // nmethod must have been unloaded } else { // Link the new HotSpotNmethod to the nmethod @@ -2450,6 +2452,13 @@ C2V_VMENTRY_0(jlong, translate, (JNIEnv* env, jobject, jobject obj_handle)) JVMCI_THROW_MSG_0(IllegalArgumentException, err_msg("Cannot translate object of type: %s", thisEnv->klass_name(obj))); } + if (callPostTranslation) { + peerEnv->call_HotSpotJVMCIRuntime_postTranslation(result, JVMCI_CHECK_0); + } + // Propagate any exception that occurred while creating the translated object + if (peerEnv->transfer_pending_exception(thread, thisEnv)) { + return 0L; + } return (jlong) peerEnv->make_global(result).as_jobject(); } @@ -2790,7 +2799,7 @@ JNINativeMethod CompilerToVM::methods[] = { {CC "getCurrentJavaThread", CC "()J", FN_PTR(getCurrentJavaThread)}, {CC "attachCurrentThread", CC "([BZ)Z", FN_PTR(attachCurrentThread)}, {CC "detachCurrentThread", CC "()V", FN_PTR(detachCurrentThread)}, - {CC "translate", CC "(" OBJECT ")J", FN_PTR(translate)}, + {CC "translate", CC "(" OBJECT "Z)J", FN_PTR(translate)}, {CC "unhand", CC "(J)" OBJECT, FN_PTR(unhand)}, {CC "updateHotSpotNmethod", CC "(" HS_NMETHOD ")V", FN_PTR(updateHotSpotNmethod)}, {CC "getCode", CC "(" HS_INSTALLED_CODE ")[B", FN_PTR(getCode)}, diff --git a/src/hotspot/share/jvmci/jvmciEnv.cpp b/src/hotspot/share/jvmci/jvmciEnv.cpp index aaebf8dc111af75dd7a78b4fa433d412385bd620..aa4989acf2831684d07155e80bf0b94a7778a7f2 100644 --- a/src/hotspot/share/jvmci/jvmciEnv.cpp +++ b/src/hotspot/share/jvmci/jvmciEnv.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2022, 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 @@ -278,35 +278,141 @@ void JVMCIEnv::describe_pending_exception(bool clear) { } } -void JVMCIEnv::translate_hotspot_exception_to_jni_exception(JavaThread* THREAD, const Handle& throwable) { - assert(!is_hotspot(), "must_be"); - // Resolve HotSpotJVMCIRuntime class explicitly as HotSpotJVMCI::compute_offsets - // may not have been called. - Klass* runtimeKlass = SystemDictionary::resolve_or_fail(vmSymbols::jdk_vm_ci_hotspot_HotSpotJVMCIRuntime(), true, CHECK); - JavaCallArguments jargs; - jargs.push_oop(throwable); - JavaValue result(T_OBJECT); - JavaCalls::call_static(&result, - runtimeKlass, - vmSymbols::encodeThrowable_name(), - vmSymbols::encodeThrowable_signature(), &jargs, THREAD); - if (HAS_PENDING_EXCEPTION) { - JVMCIRuntime::fatal_exception(this, "HotSpotJVMCIRuntime.encodeThrowable should not throw an exception"); +// Shared code for translating an exception from HotSpot to libjvmci or vice versa. +class ExceptionTranslation: public StackObj { + protected: + JVMCIEnv* _from_env; // Source of translation. Can be nullptr. + JVMCIEnv* _to_env; // Destination of translation. Never nullptr. + + ExceptionTranslation(JVMCIEnv* from_env, JVMCIEnv* to_env) : _from_env(from_env), _to_env(to_env) {} + + // Encodes the exception in `_from_env` into `buffer`. + // Where N is the number of bytes needed for the encoding, returns N if N <= `buffer_size` + // and the encoding was written to `buffer` otherwise returns -N. + virtual int encode(JavaThread* THREAD, Klass* runtimeKlass, jlong buffer, int buffer_size) = 0; + + // Decodes the exception in `buffer` in `_to_env` and throws it. + virtual void decode(JavaThread* THREAD, Klass* runtimeKlass, jlong buffer) = 0; + + public: + void doit(JavaThread* THREAD) { + // Resolve HotSpotJVMCIRuntime class explicitly as HotSpotJVMCI::compute_offsets + // may not have been called. + Klass* runtimeKlass = SystemDictionary::resolve_or_fail(vmSymbols::jdk_vm_ci_hotspot_HotSpotJVMCIRuntime(), true, CHECK); + + int buffer_size = 2048; + while (true) { + ResourceMark rm; + jlong buffer = (jlong) NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, jbyte, buffer_size); + int res = encode(THREAD, runtimeKlass, buffer, buffer_size); + if ((_from_env != nullptr && _from_env->has_pending_exception()) || HAS_PENDING_EXCEPTION) { + JVMCIRuntime::fatal_exception(_from_env, "HotSpotJVMCIRuntime.encodeThrowable should not throw an exception"); + } + if (res < 0) { + int required_buffer_size = -res; + if (required_buffer_size > buffer_size) { + buffer_size = required_buffer_size; + } + } else { + decode(THREAD, runtimeKlass, buffer); + if (!_to_env->has_pending_exception()) { + JVMCIRuntime::fatal_exception(_to_env, "HotSpotJVMCIRuntime.decodeAndThrowThrowable should throw an exception"); + } + return; + } + } } +}; - oop encoded_throwable_string = result.get_oop(); +// Translates an exception on the HotSpot heap to an exception on the shared library heap. +class HotSpotToSharedLibraryExceptionTranslation : public ExceptionTranslation { + private: + const Handle& _throwable; - ResourceMark rm; - const char* encoded_throwable_chars = java_lang_String::as_utf8_string(encoded_throwable_string); + int encode(JavaThread* THREAD, Klass* runtimeKlass, jlong buffer, int buffer_size) { + JavaCallArguments jargs; + jargs.push_oop(_throwable); + jargs.push_long(buffer); + jargs.push_int(buffer_size); + JavaValue result(T_INT); + JavaCalls::call_static(&result, + runtimeKlass, + vmSymbols::encodeThrowable_name(), + vmSymbols::encodeThrowable_signature(), &jargs, THREAD); + return result.get_jint(); + } - JNIAccessMark jni(this, THREAD); - jobject jni_encoded_throwable_string = jni()->NewStringUTF(encoded_throwable_chars); - jthrowable jni_throwable = (jthrowable) jni()->CallStaticObjectMethod(JNIJVMCI::HotSpotJVMCIRuntime::clazz(), - JNIJVMCI::HotSpotJVMCIRuntime::decodeThrowable_method(), - jni_encoded_throwable_string); - jni()->Throw(jni_throwable); + void decode(JavaThread* THREAD, Klass* runtimeKlass, jlong buffer) { + JNIAccessMark jni(_to_env, THREAD); + jni()->CallStaticVoidMethod(JNIJVMCI::HotSpotJVMCIRuntime::clazz(), + JNIJVMCI::HotSpotJVMCIRuntime::decodeAndThrowThrowable_method(), + buffer); + } + public: + HotSpotToSharedLibraryExceptionTranslation(JVMCIEnv* hotspot_env, JVMCIEnv* jni_env, const Handle& throwable) : + ExceptionTranslation(hotspot_env, jni_env), _throwable(throwable) {} +}; + +// Translates an exception on the shared library heap to an exception on the HotSpot heap. +class SharedLibraryToHotSpotExceptionTranslation : public ExceptionTranslation { + private: + jthrowable _throwable; + + int encode(JavaThread* THREAD, Klass* runtimeKlass, jlong buffer, int buffer_size) { + JNIAccessMark jni(_from_env, THREAD); + return jni()->CallStaticIntMethod(JNIJVMCI::HotSpotJVMCIRuntime::clazz(), + JNIJVMCI::HotSpotJVMCIRuntime::encodeThrowable_method(), + _throwable, buffer, buffer_size); + } + + void decode(JavaThread* THREAD, Klass* runtimeKlass, jlong buffer) { + JavaCallArguments jargs; + jargs.push_long(buffer); + JavaValue result(T_VOID); + JavaCalls::call_static(&result, + runtimeKlass, + vmSymbols::decodeAndThrowThrowable_name(), + vmSymbols::long_void_signature(), &jargs, THREAD); + } + public: + SharedLibraryToHotSpotExceptionTranslation(JVMCIEnv* hotspot_env, JVMCIEnv* jni_env, jthrowable throwable) : + ExceptionTranslation(jni_env, hotspot_env), _throwable(throwable) {} +}; + +void JVMCIEnv::translate_to_jni_exception(JavaThread* THREAD, const Handle& throwable, JVMCIEnv* hotspot_env, JVMCIEnv* jni_env) { + HotSpotToSharedLibraryExceptionTranslation(hotspot_env, jni_env, throwable).doit(THREAD); } +void JVMCIEnv::translate_from_jni_exception(JavaThread* THREAD, jthrowable throwable, JVMCIEnv* hotspot_env, JVMCIEnv* jni_env) { + SharedLibraryToHotSpotExceptionTranslation(hotspot_env, jni_env, throwable).doit(THREAD); +} + +jboolean JVMCIEnv::transfer_pending_exception(JavaThread* THREAD, JVMCIEnv* peer_env) { + if (is_hotspot()) { + if (HAS_PENDING_EXCEPTION) { + Handle throwable = Handle(THREAD, PENDING_EXCEPTION); + CLEAR_PENDING_EXCEPTION; + translate_to_jni_exception(THREAD, throwable, this, peer_env); + return true; + } + } else { + jthrowable ex = nullptr; + { + JNIAccessMark jni(this, THREAD); + ex = jni()->ExceptionOccurred(); + if (ex != nullptr) { + jni()->ExceptionClear(); + } + } + if (ex != nullptr) { + translate_from_jni_exception(THREAD, ex, peer_env, this); + return true; + } + } + return false; +} + + JVMCIEnv::~JVMCIEnv() { if (_throw_to_caller) { if (is_hotspot()) { @@ -318,7 +424,7 @@ JVMCIEnv::~JVMCIEnv() { if (HAS_PENDING_EXCEPTION) { Handle throwable = Handle(THREAD, PENDING_EXCEPTION); CLEAR_PENDING_EXCEPTION; - translate_hotspot_exception_to_jni_exception(THREAD, throwable); + translate_to_jni_exception(THREAD, throwable, nullptr, this); } } } @@ -801,6 +907,23 @@ JVMCIObject JVMCIEnv::call_HotSpotJVMCIRuntime_callToString(JVMCIObject object, } } +void JVMCIEnv::call_HotSpotJVMCIRuntime_postTranslation(JVMCIObject object, JVMCIEnv* JVMCIENV) { + JavaThread* THREAD = JVMCI::compilation_tick(JavaThread::current()); // For exception macros. + if (is_hotspot()) { + JavaCallArguments jargs; + jargs.push_oop(Handle(THREAD, HotSpotJVMCI::resolve(object))); + JavaValue result(T_VOID); + JavaCalls::call_static(&result, + HotSpotJVMCI::HotSpotJVMCIRuntime::klass(), + vmSymbols::postTranslation_name(), + vmSymbols::object_void_signature(), &jargs, CHECK); + } else { + JNIAccessMark jni(this, THREAD); + jni()->CallStaticVoidMethod(JNIJVMCI::HotSpotJVMCIRuntime::clazz(), + JNIJVMCI::HotSpotJVMCIRuntime::postTranslation_method(), + object.as_jobject()); + } +} JVMCIObject JVMCIEnv::call_JavaConstant_forPrimitive(JVMCIObject kind, jlong value, JVMCI_TRAPS) { JavaThread* THREAD = JVMCI::compilation_tick(JavaThread::current()); // For exception macros. diff --git a/src/hotspot/share/jvmci/jvmciEnv.hpp b/src/hotspot/share/jvmci/jvmciEnv.hpp index 521da004b7c6169765151e79dca09b1668810a54..18a80accd8bc47cba7430185c4ec1aa4af2e5b37 100644 --- a/src/hotspot/share/jvmci/jvmciEnv.hpp +++ b/src/hotspot/share/jvmci/jvmciEnv.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2022, 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 @@ -171,11 +171,15 @@ class JVMCIEnv : public ResourceObj { const char* _file; // The file and ... int _line; // ... line where this JNIEnv was created - // Translates an exception on the HotSpot heap to an exception on - // the shared library heap. The translation includes the stack and - // causes of `throwable`. The translated exception is pending in the - // shared library thread upon returning. - void translate_hotspot_exception_to_jni_exception(JavaThread* THREAD, const Handle& throwable); + // Translates an exception on the HotSpot heap (i.e., hotspot_env) to an exception on + // the shared library heap (i.e., jni_env). The translation includes the stack and cause(s) of `throwable`. + // The translated exception is pending in jni_env upon returning. + static void translate_to_jni_exception(JavaThread* THREAD, const Handle& throwable, JVMCIEnv* hotspot_env, JVMCIEnv* jni_env); + + // Translates an exception on the shared library heap (i.e., jni_env) to an exception on + // the HotSpot heap (i.e., hotspot_env). The translation includes the stack and cause(s) of `throwable`. + // The translated exception is pending in hotspot_env upon returning. + static void translate_from_jni_exception(JavaThread* THREAD, jthrowable throwable, JVMCIEnv* hotspot_env, JVMCIEnv* jni_env); public: // Opens a JVMCIEnv scope for a Java to VM call (e.g., via CompilerToVM). @@ -225,6 +229,11 @@ public: jboolean has_pending_exception(); void clear_pending_exception(); + // If this env has a pending exception, it is translated to be a pending + // exception in `peer_env` and is cleared from this env. Returns true + // if a pending exception was transferred, false otherwise. + jboolean transfer_pending_exception(JavaThread* THREAD, JVMCIEnv* peer_env); + // Prints an exception and stack trace of a pending exception. void describe_pending_exception(bool clear); @@ -311,6 +320,8 @@ public: jboolean call_HotSpotJVMCIRuntime_isGCSupported(JVMCIObject runtime, jint gcIdentifier); + void call_HotSpotJVMCIRuntime_postTranslation(JVMCIObject object, JVMCI_TRAPS); + BasicType kindToBasicType(JVMCIObject kind, JVMCI_TRAPS); #define DO_THROW(name) \ diff --git a/src/hotspot/share/jvmci/jvmciJavaClasses.cpp b/src/hotspot/share/jvmci/jvmciJavaClasses.cpp index 32b1fdfcaabbd389adf00b5e54d8c6c8876149e3..286751b14c0eafa1915d81c822c850569aecf949 100644 --- a/src/hotspot/share/jvmci/jvmciJavaClasses.cpp +++ b/src/hotspot/share/jvmci/jvmciJavaClasses.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2022, 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 diff --git a/src/hotspot/share/jvmci/jvmciJavaClasses.hpp b/src/hotspot/share/jvmci/jvmciJavaClasses.hpp index bb951be4b197db6d4bc1fffebc89616bd57c7f21..eb21225335e3407a96899b610f2ab703e80c6160 100644 --- a/src/hotspot/share/jvmci/jvmciJavaClasses.hpp +++ b/src/hotspot/share/jvmci/jvmciJavaClasses.hpp @@ -349,13 +349,14 @@ objectarray_field(HotSpotJVMCIRuntime, excludeFromJVMCICompilation, "[Ljava/lang/Module;") \ jvmci_method(CallNonvirtualObjectMethod, GetMethodID, call_special, JVMCIObject, HotSpotJVMCIRuntime, compileMethod, compileMethod_signature, (JVMCIObject runtime, JVMCIObject method, int entry_bci, jlong env, int id)) \ jvmci_method(CallNonvirtualObjectMethod, GetMethodID, call_special, JVMCIObject, HotSpotJVMCIRuntime, isGCSupported, int_bool_signature, (JVMCIObject runtime, int gcIdentifier)) \ - jvmci_method(CallStaticObjectMethod, GetStaticMethodID, call_static, JVMCIObject, HotSpotJVMCIRuntime, encodeThrowable, encodeThrowable_signature, (JVMCIObject throwable)) \ - jvmci_method(CallStaticObjectMethod, GetStaticMethodID, call_static, JVMCIObject, HotSpotJVMCIRuntime, decodeThrowable, decodeThrowable_signature, (JVMCIObject encodedThrowable)) \ + jvmci_method(CallStaticBooleanMethod, GetStaticMethodID, call_static, bool, HotSpotJVMCIRuntime, encodeThrowable, encodeThrowable_signature, (JVMCIObject throwable, jlong buffer, int buffer_size)) \ + jvmci_method(CallStaticVoidMethod, GetStaticMethodID, call_static, void, HotSpotJVMCIRuntime, decodeAndThrowThrowable, long_void_signature, (jlong buffer)) \ jvmci_method(CallNonvirtualVoidMethod, GetMethodID, call_special, void, HotSpotJVMCIRuntime, bootstrapFinished, void_method_signature, (JVMCIObject runtime, JVMCI_TRAPS)) \ jvmci_method(CallNonvirtualVoidMethod, GetMethodID, call_special, void, HotSpotJVMCIRuntime, shutdown, void_method_signature, (JVMCIObject runtime)) \ jvmci_method(CallStaticObjectMethod, GetStaticMethodID, call_static, JVMCIObject, HotSpotJVMCIRuntime, runtime, runtime_signature, (JVMCI_TRAPS)) \ jvmci_method(CallObjectMethod, GetMethodID, call_virtual, JVMCIObject, HotSpotJVMCIRuntime, getCompiler, getCompiler_signature, (JVMCIObject runtime, JVMCI_TRAPS)) \ jvmci_method(CallStaticObjectMethod, GetStaticMethodID, call_static, JVMCIObject, HotSpotJVMCIRuntime, callToString, callToString_signature, (JVMCIObject object, JVMCI_TRAPS)) \ + jvmci_method(CallStaticVoidMethod, GetStaticMethodID, call_static, void, HotSpotJVMCIRuntime, postTranslation, object_void_signature, (JVMCIObject object, JVMCI_TRAPS)) \ end_class \ start_class(JVMCIError, jdk_vm_ci_common_JVMCIError) \ jvmci_constructor(JVMCIError, "(Ljava/lang/String;)V") \ diff --git a/src/hotspot/share/jvmci/vmSymbols_jvmci.hpp b/src/hotspot/share/jvmci/vmSymbols_jvmci.hpp index 5db711409766a7da460366ddb0d54077601a575d..f88f65bf69d035a5468cbb054bb3b4c54b163c93 100644 --- a/src/hotspot/share/jvmci/vmSymbols_jvmci.hpp +++ b/src/hotspot/share/jvmci/vmSymbols_jvmci.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2022, 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 @@ -105,9 +105,8 @@ template(compileMethod_signature, "(Ljdk/vm/ci/hotspot/HotSpotResolvedJavaMethod;IJI)Ljdk/vm/ci/hotspot/HotSpotCompilationRequestResult;") \ template(isGCSupported_name, "isGCSupported") \ template(encodeThrowable_name, "encodeThrowable") \ - template(encodeThrowable_signature, "(Ljava/lang/Throwable;)Ljava/lang/String;") \ - template(decodeThrowable_name, "decodeThrowable") \ - template(decodeThrowable_signature, "(Ljava/lang/String;)Ljava/lang/Throwable;") \ + template(encodeThrowable_signature, "(Ljava/lang/Throwable;JI)I") \ + template(decodeAndThrowThrowable_name, "decodeAndThrowThrowable") \ template(fromMetaspace_name, "fromMetaspace") \ template(method_fromMetaspace_signature, "(J)Ljdk/vm/ci/hotspot/HotSpotResolvedJavaMethod;") \ template(constantPool_fromMetaspace_signature, "(J)Ljdk/vm/ci/hotspot/HotSpotConstantPool;") \ @@ -123,6 +122,7 @@ template(getCompiler_signature, "()Ljdk/vm/ci/runtime/JVMCICompiler;") \ template(callToString_name, "callToString") \ template(callToString_signature, "(Ljava/lang/Object;)Ljava/lang/String;") \ + template(postTranslation_name, "postTranslation") \ template(getName_name, "getName") \ template(bootstrapFinished_name, "bootstrapFinished") \ template(forPrimitive_name, "forPrimitive") \ diff --git a/src/hotspot/share/logging/logConfiguration.hpp b/src/hotspot/share/logging/logConfiguration.hpp index 542aaa2433bc0d5e9f676aed781cf281b4e58a60..35491d7459bc145d7e549300acc2843128b800f3 100644 --- a/src/hotspot/share/logging/logConfiguration.hpp +++ b/src/hotspot/share/logging/logConfiguration.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2022, 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,12 +25,13 @@ #define SHARE_LOGGING_LOGCONFIGURATION_HPP #include "logging/logLevel.hpp" -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "utilities/globalDefinitions.hpp" class LogOutput; class LogDecorators; class LogSelectionList; +class outputStream; // Global configuration of logging. Handles parsing and configuration of the logging framework, // and manages the list of configured log outputs. The actual tag and level configuration is diff --git a/src/hotspot/share/logging/logLevel.hpp b/src/hotspot/share/logging/logLevel.hpp index 7fe2d31f9991c2e67ac425980919c3267f2c7b94..56ea7f5958a16e5ce85d64e4597feac4fa4e3555 100644 --- a/src/hotspot/share/logging/logLevel.hpp +++ b/src/hotspot/share/logging/logLevel.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2022, 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,7 +24,8 @@ #ifndef SHARE_LOGGING_LOGLEVEL_HPP #define SHARE_LOGGING_LOGLEVEL_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" +#include "utilities/debug.hpp" #include "utilities/macros.hpp" // The list of log levels: diff --git a/src/hotspot/share/logging/logPrefix.hpp b/src/hotspot/share/logging/logPrefix.hpp index 3411bfb7c790dba5e5a8335be3bfb26a4904542b..13650157303e555885220aec4912446bb975ca50 100644 --- a/src/hotspot/share/logging/logPrefix.hpp +++ b/src/hotspot/share/logging/logPrefix.hpp @@ -90,7 +90,6 @@ DEBUG_ONLY(size_t Test_log_prefix_prefixer(char* buf, size_t len);) LOG_PREFIX(GCId::print_prefix, LOG_TAGS(gc, task)) \ LOG_PREFIX(GCId::print_prefix, LOG_TAGS(gc, task, start)) \ LOG_PREFIX(GCId::print_prefix, LOG_TAGS(gc, task, stats)) \ - LOG_PREFIX(GCId::print_prefix, LOG_TAGS(gc, task, time)) \ DEBUG_ONLY(LOG_PREFIX(Test_log_prefix_prefixer, LOG_TAGS(logging, test))) \ LOG_PREFIX(GCId::print_prefix, LOG_TAGS(gc, tlab)) \ LOG_PREFIX(GCId::print_prefix, LOG_TAGS(gc, verify)) \ diff --git a/src/hotspot/share/logging/logTag.hpp b/src/hotspot/share/logging/logTag.hpp index 2042cf2b4d7e92f51323fdacf4b92fff9e75f887..9b216a9d35f45b0d74a75466433eac90ae0f6449 100644 --- a/src/hotspot/share/logging/logTag.hpp +++ b/src/hotspot/share/logging/logTag.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2022, 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,9 +24,11 @@ #ifndef SHARE_LOGGING_LOGTAG_HPP #define SHARE_LOGGING_LOGTAG_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "utilities/globalDefinitions.hpp" +class outputStream; + // List of available logging tags. New tags should be added here, in // alphabetical order. // (The tags 'all', 'disable' and 'help' are special tags that can @@ -183,7 +185,6 @@ DEBUG_ONLY(LOG_TAG(test)) \ LOG_TAG(thread) \ LOG_TAG(throttle) \ - LOG_TAG(time) \ LOG_TAG(timer) \ LOG_TAG(tlab) \ LOG_TAG(tracking) \ diff --git a/src/hotspot/share/memory/allocation.hpp b/src/hotspot/share/memory/allocation.hpp index 0562a44063d09cc1a647edae16a492a5e5b9bef4..8503942f21faa6d6b20efa9f0cc8f3ab42f24e8e 100644 --- a/src/hotspot/share/memory/allocation.hpp +++ b/src/hotspot/share/memory/allocation.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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 @@ -170,16 +170,8 @@ MEMORY_TYPES_DO(MEMORY_TYPE_SHORTNAME) // Make an int version of the sentinel end value. constexpr int mt_number_of_types = static_cast(MEMFLAGS::mt_number_of_types); -#if INCLUDE_NMT - extern bool NMT_track_callsite; -#else - -const bool NMT_track_callsite = false; - -#endif // INCLUDE_NMT - class NativeCallStack; diff --git a/src/hotspot/share/memory/metaspace/blockTree.cpp b/src/hotspot/share/memory/metaspace/blockTree.cpp index ed296453403a120621f67f2aedd967df02344dc0..056bc6e52d547dc0d2d14ea815d8cd853988eaa2 100644 --- a/src/hotspot/share/memory/metaspace/blockTree.cpp +++ b/src/hotspot/share/memory/metaspace/blockTree.cpp @@ -1,6 +1,6 @@ /* - * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2020 SAP SE. All rights reserved. + * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2020, 2022 SAP SE. 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 @@ -101,7 +101,6 @@ void BlockTree::verify() const { // Traverse the tree and test that all nodes are in the correct order. MemRangeCounter counter; - int longest_edge = 0; if (_root != NULL) { ResourceMark rm; diff --git a/src/hotspot/share/memory/metaspace/chunkManager.cpp b/src/hotspot/share/memory/metaspace/chunkManager.cpp index b2c4c5bd4526d18461df16a269256607ec8523e0..6c80ee8898b020ce9958adffe3a6ea735b2bb4e4 100644 --- a/src/hotspot/share/memory/metaspace/chunkManager.cpp +++ b/src/hotspot/share/memory/metaspace/chunkManager.cpp @@ -1,6 +1,6 @@ /* - * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2018, 2021 SAP SE. All rights reserved. + * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2022 SAP SE. 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,7 +88,6 @@ void ChunkManager::split_chunk_and_add_splinters(Metachunk* c, chunklevel_t targ DEBUG_ONLY(size_t committed_words_before = c->committed_words();) - const chunklevel_t orig_level = c->level(); c->vsnode()->split(target_level, c, &_chunks); // Splitting should never fail. diff --git a/src/hotspot/share/memory/metaspace/chunkManager.hpp b/src/hotspot/share/memory/metaspace/chunkManager.hpp index 93fe40c818a91a8139761dac18dbdf49cebd2fc8..979db86b206f12271efdd7fe49bb7f6533d52380 100644 --- a/src/hotspot/share/memory/metaspace/chunkManager.hpp +++ b/src/hotspot/share/memory/metaspace/chunkManager.hpp @@ -1,6 +1,6 @@ /* - * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2018, 2020 SAP SE. All rights reserved. + * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2022 SAP SE. 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,12 +95,6 @@ class ChunkManager : public CHeapObj { // chunks. void split_chunk_and_add_splinters(Metachunk* c, chunklevel_t target_level); - // See get_chunk(s,s,s) - Metachunk* get_chunk_locked(size_t preferred_word_size, size_t min_word_size, size_t min_committed_words); - - // Uncommit all chunks equal or below the given level. - void uncommit_free_chunks(chunklevel_t max_level); - // Return a single chunk to the freelist without doing any merging, and adjust accounting. void return_chunk_simple_locked(Metachunk* c); @@ -161,9 +155,6 @@ public: DEBUG_ONLY(void verify() const;) DEBUG_ONLY(void verify_locked() const;) - // Returns the name of this chunk manager. - const char* name() const { return _name; } - // Returns total number of chunks int total_num_chunks() const { return _chunks.num_chunks(); } diff --git a/src/hotspot/share/memory/metaspace/commitMask.hpp b/src/hotspot/share/memory/metaspace/commitMask.hpp index d1edc0282dd02569ea514d97a6b1d08d806b4901..15f7ab3244c2d35e44d46e76d627fd748a0e604f 100644 --- a/src/hotspot/share/memory/metaspace/commitMask.hpp +++ b/src/hotspot/share/memory/metaspace/commitMask.hpp @@ -1,6 +1,6 @@ /* - * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2020 SAP SE. All rights reserved. + * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2020, 2022 SAP SE. 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 @@ -94,7 +94,6 @@ public: const MetaWord* base() const { return _base; } size_t word_size() const { return _word_size; } - const MetaWord* end() const { return _base + word_size(); } // Given an address, returns true if the address is committed, false if not. bool is_committed_address(const MetaWord* p) const { diff --git a/src/hotspot/share/memory/metaspace/counters.hpp b/src/hotspot/share/memory/metaspace/counters.hpp index 066d36279a6fd97d8a7f4468eb7ba39dfd62a65d..163b33edca764d6ed844612b9c4d856f8887cedc 100644 --- a/src/hotspot/share/memory/metaspace/counters.hpp +++ b/src/hotspot/share/memory/metaspace/counters.hpp @@ -1,6 +1,6 @@ /* - * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2020 SAP SE. All rights reserved. + * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2020, 2022 SAP SE. 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 @@ -70,8 +70,6 @@ public: _c -= v; } - void reset() { _c = 0; } - #ifdef ASSERT void check(T expected) const { assert(_c == expected, "Counter mismatch: %d, expected: %d.", diff --git a/src/hotspot/share/memory/metaspace/freeChunkList.cpp b/src/hotspot/share/memory/metaspace/freeChunkList.cpp index 7c06c003e3a569ab89840030d68c810f7aef9140..62c67d595c8efc03ab41e1a180ad0141b3a532d3 100644 --- a/src/hotspot/share/memory/metaspace/freeChunkList.cpp +++ b/src/hotspot/share/memory/metaspace/freeChunkList.cpp @@ -1,6 +1,6 @@ /* - * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2020 SAP SE. All rights reserved. + * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2020, 2022 SAP SE. 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 @@ -70,7 +70,6 @@ void FreeChunkList::verify() const { } else { assert(_last != NULL, "Sanity"); int num = 0; - bool uncommitted = (_first->committed_words() == 0); for (Metachunk* c = _first; c != NULL; c = c->next()) { assert(c->is_free(), "Chunks in freelist should be free"); assert(c->used_words() == 0, "Chunk in freelist should have not used words."); diff --git a/src/hotspot/share/memory/metaspace/internalStats.hpp b/src/hotspot/share/memory/metaspace/internalStats.hpp index dff2534e3031657555c90483562d9c4db01e9ba4..9c127568e576d25248fa802e74b86ccfcd970aac 100644 --- a/src/hotspot/share/memory/metaspace/internalStats.hpp +++ b/src/hotspot/share/memory/metaspace/internalStats.hpp @@ -1,6 +1,6 @@ /* - * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2020 SAP SE. All rights reserved. + * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2020, 2022 SAP SE. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ #ifndef SHARE_MEMORY_METASPACE_INTERNALSTATS_HPP #define SHARE_MEMORY_METASPACE_INTERNALSTATS_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "runtime/atomic.hpp" #include "utilities/globalDefinitions.hpp" diff --git a/src/hotspot/share/memory/metaspace/metaspaceDCmd.cpp b/src/hotspot/share/memory/metaspace/metaspaceDCmd.cpp index 968147813777bec34d6c6e620e172de5a3933825..c4eea087b37f6804c2895776fbd9a68dfdba2efd 100644 --- a/src/hotspot/share/memory/metaspace/metaspaceDCmd.cpp +++ b/src/hotspot/share/memory/metaspace/metaspaceDCmd.cpp @@ -1,6 +1,6 @@ /* - * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2018, 2020 SAP SE. All rights reserved. + * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2022 SAP SE. 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,7 +77,7 @@ void MetaspaceDCmd::execute(DCmdSource source, TRAPS) { if (strcasecmp("dynamic", scale_value) == 0) { scale = 0; } else { - scale = NMT_ONLY(NMTUtil::scale_from_name(scale_value)) NOT_NMT(0); + scale = NMTUtil::scale_from_name(scale_value); if (scale == 0) { output()->print_cr("Invalid scale: \"%s\". Will use dynamic scaling.", scale_value); } diff --git a/src/hotspot/share/memory/metaspace/metaspaceReporter.hpp b/src/hotspot/share/memory/metaspace/metaspaceReporter.hpp index 2aab20633793d9be72feecc60a13aa6d413fd0db..acc5ca211e8d7f9413a1d0d01cbf6c7614e9f9fc 100644 --- a/src/hotspot/share/memory/metaspace/metaspaceReporter.hpp +++ b/src/hotspot/share/memory/metaspace/metaspaceReporter.hpp @@ -1,6 +1,6 @@ /* - * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2018, 2020 SAP SE. All rights reserved. + * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2022 SAP SE. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ #ifndef SHARE_MEMORY_METASPACE_METASPACEREPORTER_HPP #define SHARE_MEMORY_METASPACE_METASPACEREPORTER_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" namespace metaspace { diff --git a/src/hotspot/share/memory/metaspace/metaspaceSettings.hpp b/src/hotspot/share/memory/metaspace/metaspaceSettings.hpp index e6d47fec3f4d51cbe0cf94af213a696861c35802..d2dc3f974417aa5391c7e15767815b814a8eb350 100644 --- a/src/hotspot/share/memory/metaspace/metaspaceSettings.hpp +++ b/src/hotspot/share/memory/metaspace/metaspaceSettings.hpp @@ -1,6 +1,6 @@ /* - * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2020 SAP SE. All rights reserved. + * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2020, 2022 SAP SE. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ #ifndef SHARE_MEMORY_METASPACE_METASPACESETTINGS_HPP #define SHARE_MEMORY_METASPACE_METASPACESETTINGS_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "memory/metaspace/chunklevel.hpp" #include "utilities/globalDefinitions.hpp" diff --git a/src/hotspot/share/memory/metaspace/rootChunkArea.cpp b/src/hotspot/share/memory/metaspace/rootChunkArea.cpp index 0df97ef87ffc24f111bfd7f9b8c09ed0ed451da3..4c74fe3149aa7e17052f0e3255c278ad8d2c68eb 100644 --- a/src/hotspot/share/memory/metaspace/rootChunkArea.cpp +++ b/src/hotspot/share/memory/metaspace/rootChunkArea.cpp @@ -1,6 +1,6 @@ /* - * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2020, 2021 SAP SE. All rights reserved. + * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2020, 2022 SAP SE. 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 @@ -103,8 +103,6 @@ void RootChunkArea::split(chunklevel_t target_level, Metachunk* c, FreeChunkList DEBUG_ONLY(chunklevel::check_valid_level(target_level)); assert(target_level > c->level(), "Wrong target level"); - const chunklevel_t starting_level = c->level(); - while (c->level() < target_level) { log_trace(metaspace)("Splitting chunk: " METACHUNK_FULL_FORMAT ".", METACHUNK_FULL_FORMAT_ARGS(c)); @@ -199,8 +197,6 @@ Metachunk* RootChunkArea::merge(Metachunk* c, FreeChunkListVector* freelists) { log_trace(metaspace)("Attempting to merge chunk " METACHUNK_FORMAT ".", METACHUNK_FORMAT_ARGS(c)); - const chunklevel_t starting_level = c->level(); - bool stop = false; Metachunk* result = NULL; @@ -389,7 +385,6 @@ void RootChunkArea::verify() const { const Metachunk* c = _first_chunk; const MetaWord* expected_next_base = _base; - const MetaWord* const area_end = _base + word_size(); while (c != NULL) { assrt_(c->is_free() || c->is_in_use(), diff --git a/src/hotspot/share/memory/metaspace/runningCounters.hpp b/src/hotspot/share/memory/metaspace/runningCounters.hpp index 8ef751896d3e1104840f6dad1e80d11bde44cbb5..ff24ead7ebd39638e579c4858cb8f6ffe6dceff5 100644 --- a/src/hotspot/share/memory/metaspace/runningCounters.hpp +++ b/src/hotspot/share/memory/metaspace/runningCounters.hpp @@ -1,6 +1,6 @@ /* - * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2020 SAP SE. All rights reserved. + * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2020, 2022 SAP SE. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ #ifndef SHARE_MEMORY_METASPACE_RUNNINGCOUNTERS_HPP #define SHARE_MEMORY_METASPACE_RUNNINGCOUNTERS_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "memory/metaspace/counters.hpp" namespace metaspace { diff --git a/src/hotspot/share/memory/metaspaceCounters.hpp b/src/hotspot/share/memory/metaspaceCounters.hpp index 38d9c94ddb6d3d53795fd384fea1c31d8538219e..b83e1fdb1ba44d09c450cd1f5f95d2fa1573f442 100644 --- a/src/hotspot/share/memory/metaspaceCounters.hpp +++ b/src/hotspot/share/memory/metaspaceCounters.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2021 SAP SE. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -26,7 +26,7 @@ #ifndef SHARE_MEMORY_METASPACECOUNTERS_HPP #define SHARE_MEMORY_METASPACECOUNTERS_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" // Perf Counters for Metaspace diff --git a/src/hotspot/share/memory/metaspaceCriticalAllocation.hpp b/src/hotspot/share/memory/metaspaceCriticalAllocation.hpp index 71e8819aef338a52d01d07dc14b7cb03e476c3ce..bdc9ad8cf2c4ae031622b25922ee1190fc570bc5 100644 --- a/src/hotspot/share/memory/metaspaceCriticalAllocation.hpp +++ b/src/hotspot/share/memory/metaspaceCriticalAllocation.hpp @@ -25,7 +25,7 @@ #ifndef SHARE_MEMORY_METASPACECRITICALALLOCATION_HPP #define SHARE_MEMORY_METASPACECRITICALALLOCATION_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "memory/metaspace.hpp" class MetadataAllocationRequest; diff --git a/src/hotspot/share/memory/virtualspace.cpp b/src/hotspot/share/memory/virtualspace.cpp index c5f682bb31f5ec55dcfe5d96a3aaf764a2433dda..ad918dea29b2638f85edc2f7e17d5bff62dfd25f 100644 --- a/src/hotspot/share/memory/virtualspace.cpp +++ b/src/hotspot/share/memory/virtualspace.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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 @@ -628,7 +628,7 @@ ReservedHeapSpace::ReservedHeapSpace(size_t size, size_t alignment, size_t page_ } if (_fd_for_heap != -1) { - os::close(_fd_for_heap); + ::close(_fd_for_heap); } } diff --git a/src/hotspot/share/metaprogramming/conditional.hpp b/src/hotspot/share/metaprogramming/conditional.hpp index 2d4fe1a86e8f7cf4056a214905d3df5e75ff0e23..3ba2fb7594e06e3c8ee4cf4f0cb2460c8602a571 100644 --- a/src/hotspot/share/metaprogramming/conditional.hpp +++ b/src/hotspot/share/metaprogramming/conditional.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2022, 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,7 +25,7 @@ #ifndef SHARE_METAPROGRAMMING_CONDITIONAL_HPP #define SHARE_METAPROGRAMMING_CONDITIONAL_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" // This trait evaluates its typedef called "type" to TrueType iff the condition // is true. Otherwise it evaluates to FalseType. diff --git a/src/hotspot/share/metaprogramming/decay.hpp b/src/hotspot/share/metaprogramming/decay.hpp index 4dff0500f134d30f0d0306d14c5cb9cb6cea5662..f504c099e4d267edb73a91de71fcb5865c851a1e 100644 --- a/src/hotspot/share/metaprogramming/decay.hpp +++ b/src/hotspot/share/metaprogramming/decay.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2022, 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,7 +25,7 @@ #ifndef SHARE_METAPROGRAMMING_DECAY_HPP #define SHARE_METAPROGRAMMING_DECAY_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "metaprogramming/removeCV.hpp" #include "metaprogramming/removeReference.hpp" diff --git a/src/hotspot/share/metaprogramming/removeCV.hpp b/src/hotspot/share/metaprogramming/removeCV.hpp index 0c0b2f47fa777dd3285f24786f812b671578e76d..5ddafc547463fa37aa74de4be8db290c29becb14 100644 --- a/src/hotspot/share/metaprogramming/removeCV.hpp +++ b/src/hotspot/share/metaprogramming/removeCV.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2022, 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,7 +25,7 @@ #ifndef SHARE_METAPROGRAMMING_REMOVECV_HPP #define SHARE_METAPROGRAMMING_REMOVECV_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" template struct RemoveCV: AllStatic { diff --git a/src/hotspot/share/metaprogramming/removeExtent.hpp b/src/hotspot/share/metaprogramming/removeExtent.hpp index f188e0db264e45178fbe204c54980a6738ba5d07..3f93dd3eeb610db1185ef7854163fcc3cd19399d 100644 --- a/src/hotspot/share/metaprogramming/removeExtent.hpp +++ b/src/hotspot/share/metaprogramming/removeExtent.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2022, 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,7 +25,7 @@ #ifndef SHARE_METAPROGRAMMING_REMOVEEXTENT_HPP #define SHARE_METAPROGRAMMING_REMOVEEXTENT_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" template struct RemoveExtent: AllStatic { typedef T type; }; diff --git a/src/hotspot/share/metaprogramming/removePointer.hpp b/src/hotspot/share/metaprogramming/removePointer.hpp index be0f5b6e6fb7a12cfd9232787bbf2b6cd4c80cea..eb267c0702d6f73972b4216c04c4a1eb7a55fd47 100644 --- a/src/hotspot/share/metaprogramming/removePointer.hpp +++ b/src/hotspot/share/metaprogramming/removePointer.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2022, 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,7 +25,7 @@ #ifndef SHARE_METAPROGRAMMING_REMOVEPOINTER_HPP #define SHARE_METAPROGRAMMING_REMOVEPOINTER_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" // This metafunction returns for a type T either the underlying type behind // the pointer iff T is a pointer type (irrespective of CV qualifiers), diff --git a/src/hotspot/share/metaprogramming/removeReference.hpp b/src/hotspot/share/metaprogramming/removeReference.hpp index 274c327a0ade06be5a90e3162aee2027acd2b235..bd263d911a5cffc7b6453deae936e4d113e531a0 100644 --- a/src/hotspot/share/metaprogramming/removeReference.hpp +++ b/src/hotspot/share/metaprogramming/removeReference.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2022, 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,7 +25,7 @@ #ifndef SHARE_METAPROGRAMMING_REMOVEREFERENCE_HPP #define SHARE_METAPROGRAMMING_REMOVEREFERENCE_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" // This metafunction returns for a type T either the underlying type behind // the reference iff T is a reference type, or the same type T if T is not diff --git a/src/hotspot/share/oops/access.hpp b/src/hotspot/share/oops/access.hpp index c3f3d0ba45c40268b0939ec8fe38e1250294ee25..47e6bd27ea0c5c2a6cbe451be7db74a40980314d 100644 --- a/src/hotspot/share/oops/access.hpp +++ b/src/hotspot/share/oops/access.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2022, 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,7 +25,7 @@ #ifndef SHARE_OOPS_ACCESS_HPP #define SHARE_OOPS_ACCESS_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "oops/accessBackend.hpp" #include "oops/accessDecorators.hpp" #include "oops/oopsHierarchy.hpp" diff --git a/src/hotspot/share/oops/accessDecorators.hpp b/src/hotspot/share/oops/accessDecorators.hpp index 21bcff9113d311bb6d30ea4fe75aa7f2c097485c..976f2e355e1d6a68cde70a3d14f6d7605e3e1715 100644 --- a/src/hotspot/share/oops/accessDecorators.hpp +++ b/src/hotspot/share/oops/accessDecorators.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ #define SHARE_OOPS_ACCESSDECORATORS_HPP #include "gc/shared/barrierSetConfig.hpp" -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "metaprogramming/integralConstant.hpp" #include "utilities/globalDefinitions.hpp" diff --git a/src/hotspot/share/oops/compressedOops.hpp b/src/hotspot/share/oops/compressedOops.hpp index 83f18138b5ab9f950a6c48b0e03269d3e0e4bc55..2755b1eef9222001ec6589343f615ce29a993135 100644 --- a/src/hotspot/share/oops/compressedOops.hpp +++ b/src/hotspot/share/oops/compressedOops.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2022, 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,7 +25,7 @@ #ifndef SHARE_OOPS_COMPRESSEDOOPS_HPP #define SHARE_OOPS_COMPRESSEDOOPS_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "memory/memRegion.hpp" #include "oops/oopsHierarchy.hpp" #include "utilities/globalDefinitions.hpp" diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp index fafc58fa9fd3675d26247286afb60b6aefadeed8..e635b82f2cebe5c5b7f063fff1869a5fa12866ec 100644 --- a/src/hotspot/share/oops/instanceKlass.cpp +++ b/src/hotspot/share/oops/instanceKlass.cpp @@ -2417,7 +2417,9 @@ void InstanceKlass::metaspace_pointers_do(MetaspaceClosure* it) { } else { it->push(&_default_vtable_indices); } - it->push(&_fields); + + // _fields might be written into by Rewriter::scan_method() -> fd.set_has_initialized_final_update() + it->push(&_fields, MetaspaceClosure::_writable); if (itable_length() > 0) { itableOffsetEntry* ioe = (itableOffsetEntry*)start_of_itable(); diff --git a/src/hotspot/share/oops/method.cpp b/src/hotspot/share/oops/method.cpp index 5a503ddf207a07f1286ac7d3bb72d382ef23e6f8..04ccc8af829725dc5af8b7750a90d3fe0abdda90 100644 --- a/src/hotspot/share/oops/method.cpp +++ b/src/hotspot/share/oops/method.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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 @@ -1198,7 +1198,7 @@ void Method::unlink_method() { void Method::link_method(const methodHandle& h_method, TRAPS) { // If the code cache is full, we may reenter this function for the // leftover methods that weren't linked. - if (_i2i_entry != NULL) { + if (adapter() != NULL) { return; } assert( _code == NULL, "nothing compiled yet" ); diff --git a/src/hotspot/share/oops/oop.hpp b/src/hotspot/share/oops/oop.hpp index e7186b6a4ffbc981d7bc3218827ed955a00101f4..994bb67703292b7dcbd3fc78ebd709348a5f2c92 100644 --- a/src/hotspot/share/oops/oop.hpp +++ b/src/hotspot/share/oops/oop.hpp @@ -91,8 +91,6 @@ class oopDesc { static inline void release_set_klass(HeapWord* mem, Klass* k); // For klass field compression - inline int klass_gap() const; - inline void set_klass_gap(int z); static inline void set_klass_gap(HeapWord* mem, int z); // size of object header, aligned to platform wordSize diff --git a/src/hotspot/share/oops/oop.inline.hpp b/src/hotspot/share/oops/oop.inline.hpp index 371e97824f769635b1a822c83b62dc2a115aa89f..17ce5bed5613ce00cc22e5971ab902b19ff3a520 100644 --- a/src/hotspot/share/oops/oop.inline.hpp +++ b/src/hotspot/share/oops/oop.inline.hpp @@ -125,20 +125,12 @@ void oopDesc::release_set_klass(HeapWord* mem, Klass* k) { } } -int oopDesc::klass_gap() const { - return *(int*)(((intptr_t)this) + klass_gap_offset_in_bytes()); -} - void oopDesc::set_klass_gap(HeapWord* mem, int v) { if (UseCompressedClassPointers) { *(int*)(((char*)mem) + klass_gap_offset_in_bytes()) = v; } } -void oopDesc::set_klass_gap(int v) { - set_klass_gap((HeapWord*)this, v); -} - bool oopDesc::is_a(Klass* k) const { return klass()->is_subtype_of(k); } diff --git a/src/hotspot/share/opto/addnode.cpp b/src/hotspot/share/opto/addnode.cpp index e32c48b7041533819507c365abf043b3b610850b..9edb868b7bfafef44a212b029406e5d3fbe02ab4 100644 --- a/src/hotspot/share/opto/addnode.cpp +++ b/src/hotspot/share/opto/addnode.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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 @@ -367,12 +367,14 @@ Node* AddNode::IdealIL(PhaseGVN* phase, bool can_reshape, BasicType bt) { } } - // Convert (~x+1) into -x. Note there isn't a bitwise not bytecode, - // "~x" would typically represented as "x^(-1)", so (~x+1) will - // be (x^(-1))+1. - if (op1 == Op_Xor(bt) && phase->type(in2) == TypeInteger::one(bt) && + // Convert (~x+c) into (c-1)-x. Note there isn't a bitwise not + // bytecode, "~x" would typically represented as "x^(-1)", so (~x+c) + // will be (x^(-1))+c. + if (op1 == Op_Xor(bt) && + (in2->Opcode() == Op_ConI || in2->Opcode() == Op_ConL) && phase->type(in1->in(2)) == TypeInteger::minus_1(bt)) { - return SubNode::make(phase->makecon(TypeInteger::zero(bt)), in1->in(1), bt); + Node* c_minus_one = phase->makecon(add_ring(phase->type(in(2)), TypeInteger::minus_1(bt))); + return SubNode::make(c_minus_one, in1->in(1), bt); } return AddNode::Ideal(phase, can_reshape); } @@ -874,13 +876,14 @@ Node* XorINode::Ideal(PhaseGVN* phase, bool can_reshape) { Node* in1 = in(1); Node* in2 = in(2); int op1 = in1->Opcode(); - // Convert ~(x-1) into -x. Note there isn't a bitwise not bytecode, - // "~x" would typically represented as "x^(-1)", and "x-c0" would - // convert into "x+ -c0" in SubXNode::Ideal. So ~(x-1) will eventually - // be (x+(-1))^-1. + // Convert ~(x+c) into (-c-1)-x. Note there isn't a bitwise not + // bytecode, "~x" would typically represented as "x^(-1)", so ~(x+c) + // will eventually be (x+c)^-1. if (op1 == Op_AddI && phase->type(in2) == TypeInt::MINUS_1 && - phase->type(in1->in(2)) == TypeInt::MINUS_1) { - return new SubINode(phase->makecon(TypeInt::ZERO), in1->in(1)); + in1->in(2)->Opcode() == Op_ConI) { + jint c = phase->type(in1->in(2))->isa_int()->get_con(); + Node* neg_c_minus_one = phase->intcon(java_add(-c, -1)); + return new SubINode(neg_c_minus_one, in1->in(1)); } return AddNode::Ideal(phase, can_reshape); } @@ -953,13 +956,14 @@ Node* XorLNode::Ideal(PhaseGVN* phase, bool can_reshape) { Node* in1 = in(1); Node* in2 = in(2); int op1 = in1->Opcode(); - // Convert ~(x-1) into -x. Note there isn't a bitwise not bytecode, - // "~x" would typically represented as "x^(-1)", and "x-c0" would - // convert into "x+ -c0" in SubXNode::Ideal. So ~(x-1) will eventually - // be (x+(-1))^-1. + // Convert ~(x+c) into (-c-1)-x. Note there isn't a bitwise not + // bytecode, "~x" would typically represented as "x^(-1)", so ~(x+c) + // will eventually be (x+c)^-1. if (op1 == Op_AddL && phase->type(in2) == TypeLong::MINUS_1 && - phase->type(in1->in(2)) == TypeLong::MINUS_1) { - return new SubLNode(phase->makecon(TypeLong::ZERO), in1->in(1)); + in1->in(2)->Opcode() == Op_ConL) { + jlong c = phase->type(in1->in(2))->isa_long()->get_con(); + Node* neg_c_minus_one = phase->longcon(java_add(-c, (jlong)-1)); + return new SubLNode(neg_c_minus_one, in1->in(1)); } return AddNode::Ideal(phase, can_reshape); } diff --git a/src/hotspot/share/opto/bytecodeInfo.cpp b/src/hotspot/share/opto/bytecodeInfo.cpp index 40d09201530444683c214a03c7badd692b81a21b..2da95b4edcc2142e449f5f7d092e24d7d0c82e3f 100644 --- a/src/hotspot/share/opto/bytecodeInfo.cpp +++ b/src/hotspot/share/opto/bytecodeInfo.cpp @@ -319,14 +319,6 @@ bool InlineTree::should_not_inline(ciMethod* callee_method, ciMethod* caller_met return true; } } - - if (MinInliningThreshold > 0) { // Deprecated heuristic - intx counter_high_value = TieredCompilation ? InvocationCounter::count_limit / 2 : CompileThreshold / 2; - if (!callee_method->was_executed_more_than(MIN2(MinInliningThreshold, counter_high_value))) { - set_msg("executed < MinInliningThreshold times"); - return true; - } - } } return false; diff --git a/src/hotspot/share/opto/c2_globals.hpp b/src/hotspot/share/opto/c2_globals.hpp index cc6d1d762da63f52dd9cc95e777918ae07f103fc..0fcc3e92aff6ea1eeb8891cc8e564c6dacccd08d 100644 --- a/src/hotspot/share/opto/c2_globals.hpp +++ b/src/hotspot/share/opto/c2_globals.hpp @@ -112,6 +112,11 @@ notproduct(bool, PrintIdeal, false, \ "Print ideal graph before code generation") \ \ + notproduct(uintx, PrintIdealLevel, 0, \ + "Print ideal IR on stdout. " \ + "Same levels as PrintIdealGraphLevel") \ + range(0, 4) \ + \ notproduct(uintx, PrintIdealIndentThreshold, 0, \ "A depth threshold of ideal graph. Indentation is disabled " \ "when users attempt to dump an ideal graph deeper than it.") \ diff --git a/src/hotspot/share/opto/callGenerator.cpp b/src/hotspot/share/opto/callGenerator.cpp index 4336f842cf82afe705ed61a275f0a5da611c866a..9931f2562986a41668f7a5c1446590953663a5d7 100644 --- a/src/hotspot/share/opto/callGenerator.cpp +++ b/src/hotspot/share/opto/callGenerator.cpp @@ -420,7 +420,9 @@ bool LateInlineMHCallGenerator::do_late_inline_check(Compile* C, JVMState* jvms) // expression stacks which causes late inlining to break. The MH invoker is not expected to be called from a method wih // exception handlers. When there is no exception handler, GraphKit::builtin_throw() pops the stack which solves the issue // of late inlining with exceptions. - assert(!jvms->method()->has_exception_handlers(), "no exception handler expected"); + assert(!jvms->method()->has_exception_handlers() || + (method()->intrinsic_id() != vmIntrinsics::_linkToVirtual && + method()->intrinsic_id() != vmIntrinsics::_linkToInterface), "no exception handler expected"); // Even if inlining is not allowed, a virtual call can be strength-reduced to a direct call. bool allow_inline = C->inlining_incrementally(); bool input_not_const = true; diff --git a/src/hotspot/share/opto/classes.hpp b/src/hotspot/share/opto/classes.hpp index c4b7853d7b1d99caf9f8741b8993b896609aa83e..de6884deb9d4a407067e2f724c13f17a97f4efba 100644 --- a/src/hotspot/share/opto/classes.hpp +++ b/src/hotspot/share/opto/classes.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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 @@ -272,6 +272,7 @@ macro(Phi) macro(PopCountI) macro(PopCountL) macro(PopCountVI) +macro(PopCountVL) macro(PrefetchAllocation) macro(Proj) macro(RShiftI) diff --git a/src/hotspot/share/opto/compile.cpp b/src/hotspot/share/opto/compile.cpp index 2e74da81fbb4c0a4326b51cf7ca745614f57e7c8..9adda4961e53d87f73c7d65e7052d01c1b2ab1f3 100644 --- a/src/hotspot/share/opto/compile.cpp +++ b/src/hotspot/share/opto/compile.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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 @@ -535,6 +535,26 @@ void Compile::print_compile_messages() { #endif } +#ifndef PRODUCT +void Compile::print_ideal_ir(const char* phase_name) { + ttyLocker ttyl; + // keep the following output all in one block + // This output goes directly to the tty, not the compiler log. + // To enable tools to match it up with the compilation activity, + // be sure to tag this tty output with the compile ID. + if (xtty != NULL) { + xtty->head("ideal compile_id='%d'%s compile_phase='%s'", + compile_id(), + is_osr_compilation() ? " compile_kind='osr'" : "", + phase_name); + } + root()->dump(9999); + if (xtty != NULL) { + xtty->tail("ideal"); + } +} +#endif + // ============================================================================ //------------------------------Compile standard------------------------------- debug_only( int Compile::_debug_idx = 100000; ) @@ -563,7 +583,6 @@ Compile::Compile( ciEnv* ci_env, ciMethod* target, int osr_bci, #ifndef PRODUCT _igv_idx(0), _trace_opto_output(directive->TraceOptoOutputOption), - _print_ideal(directive->PrintIdealOption), #endif _has_method_handle_invokes(false), _clinit_barrier_on_entry(false), @@ -582,7 +601,7 @@ Compile::Compile( ciEnv* ci_env, ciMethod* target, int osr_bci, _for_post_loop_igvn(comp_arena(), 8, 0, NULL), _coarsened_locks (comp_arena(), 8, 0, NULL), _congraph(NULL), - NOT_PRODUCT(_printer(NULL) COMMA) + NOT_PRODUCT(_igv_printer(NULL) COMMA) _dead_node_list(comp_arena()), _dead_node_count(0), _node_arena(mtCompiler), @@ -764,8 +783,8 @@ Compile::Compile( ciEnv* ci_env, ciMethod* target, int osr_bci, set_default_node_notes(NULL); #ifndef PRODUCT - if (should_print(1)) { - _printer->print_inlining(); + if (should_print_igv(1)) { + _igv_printer->print_inlining(); } #endif @@ -792,20 +811,8 @@ Compile::Compile( ciEnv* ci_env, ciMethod* target, int osr_bci, NOT_PRODUCT( verify_graph_edges(); ) #ifndef PRODUCT - if (print_ideal()) { - ttyLocker ttyl; // keep the following output all in one block - // This output goes directly to the tty, not the compiler log. - // To enable tools to match it up with the compilation activity, - // be sure to tag this tty output with the compile ID. - if (xtty != NULL) { - xtty->head("ideal compile_id='%d'%s", compile_id(), - is_osr_compilation() ? " compile_kind='osr'" : - ""); - } - root()->dump(9999); - if (xtty != NULL) { - xtty->tail("ideal"); - } + if (should_print_ideal()) { + print_ideal_ir("print_ideal"); } #endif @@ -861,7 +868,6 @@ Compile::Compile( ciEnv* ci_env, #ifndef PRODUCT _igv_idx(0), _trace_opto_output(directive->TraceOptoOutputOption), - _print_ideal(directive->PrintIdealOption), #endif _has_method_handle_invokes(false), _clinit_barrier_on_entry(false), @@ -873,7 +879,7 @@ Compile::Compile( ciEnv* ci_env, _log(ci_env->log()), _failure_reason(NULL), _congraph(NULL), - NOT_PRODUCT(_printer(NULL) COMMA) + NOT_PRODUCT(_igv_printer(NULL) COMMA) _dead_node_list(comp_arena()), _dead_node_count(0), _node_arena(mtCompiler), @@ -1886,7 +1892,7 @@ bool Compile::inline_incrementally_one() { return false; } else if (inlining_progress()) { _late_inlines_pos = i+1; // restore the position in case new elements were inserted - print_method(PHASE_INCREMENTAL_INLINE_STEP, cg->call_node(), 3); + print_method(PHASE_INCREMENTAL_INLINE_STEP, 3, cg->call_node()); break; // process one call site at a time } } else { @@ -2080,7 +2086,7 @@ void Compile::Optimize() { NOT_PRODUCT( verify_graph_edges(); ) - print_method(PHASE_AFTER_PARSING); + print_method(PHASE_AFTER_PARSING, 1); { // Iterative Global Value Numbering, including ideal transforms @@ -2351,7 +2357,7 @@ void Compile::inline_vector_reboxing_calls() { CallGenerator* cg = _vector_reboxing_late_inlines.pop(); cg->do_late_inline(); if (failing()) return; - print_method(PHASE_INLINE_VECTOR_REBOX, cg->call_node()); + print_method(PHASE_INLINE_VECTOR_REBOX, 3, cg->call_node()); } _vector_reboxing_late_inlines.trunc_to(0); } @@ -2375,7 +2381,6 @@ bool Compile::has_vbox_nodes() { static bool is_vector_unary_bitwise_op(Node* n) { return n->Opcode() == Op_XorV && - n->req() == 2 && VectorNode::is_vector_bitwise_not_pattern(n); } @@ -2383,7 +2388,7 @@ static bool is_vector_binary_bitwise_op(Node* n) { switch (n->Opcode()) { case Op_AndV: case Op_OrV: - return n->req() == 2; + return true; case Op_XorV: return !is_vector_unary_bitwise_op(n); @@ -2415,11 +2420,12 @@ static bool is_vector_bitwise_cone_root(Node* n) { return true; } -static uint collect_unique_inputs(Node* n, Unique_Node_List& partition, Unique_Node_List& inputs) { +static uint collect_unique_inputs(Node* n, Unique_Node_List& inputs) { uint cnt = 0; if (is_vector_bitwise_op(n)) { + uint inp_cnt = n->is_predicated_vector() ? n->req()-1 : n->req(); if (VectorNode::is_vector_bitwise_not_pattern(n)) { - for (uint i = 1; i < n->req(); i++) { + for (uint i = 1; i < inp_cnt; i++) { Node* in = n->in(i); bool skip = VectorNode::is_all_ones_vector(in); if (!skip && !inputs.member(in)) { @@ -2429,9 +2435,9 @@ static uint collect_unique_inputs(Node* n, Unique_Node_List& partition, Unique_N } assert(cnt <= 1, "not unary"); } else { - uint last_req = n->req(); + uint last_req = inp_cnt; if (is_vector_ternary_bitwise_op(n)) { - last_req = n->req() - 1; // skip last input + last_req = inp_cnt - 1; // skip last input } for (uint i = 1; i < last_req; i++) { Node* def = n->in(i); @@ -2441,7 +2447,6 @@ static uint collect_unique_inputs(Node* n, Unique_Node_List& partition, Unique_N } } } - partition.push(n); } else { // not a bitwise operations if (!inputs.member(n)) { inputs.push(n); @@ -2476,7 +2481,10 @@ Node* Compile::xform_to_MacroLogicV(PhaseIterGVN& igvn, Node* in3 = (inputs.size() == 3 ? inputs.at(2) : in2); uint func = compute_truth_table(partition, inputs); - return igvn.transform(MacroLogicVNode::make(igvn, in3, in2, in1, func, vt)); + + Node* pn = partition.at(partition.size() - 1); + Node* mask = pn->is_predicated_vector() ? pn->in(pn->req()-1) : NULL; + return igvn.transform(MacroLogicVNode::make(igvn, in1, in2, in3, mask, func, vt)); } static uint extract_bit(uint func, uint pos) { @@ -2556,11 +2564,11 @@ uint Compile::compute_truth_table(Unique_Node_List& partition, Unique_Node_List& // Populate precomputed functions for inputs. // Each input corresponds to one column of 3 input truth-table. - uint input_funcs[] = { 0xAA, // (_, _, a) -> a + uint input_funcs[] = { 0xAA, // (_, _, c) -> c 0xCC, // (_, b, _) -> b - 0xF0 }; // (c, _, _) -> c + 0xF0 }; // (a, _, _) -> a for (uint i = 0; i < inputs.size(); i++) { - eval_map.put(inputs.at(i), input_funcs[i]); + eval_map.put(inputs.at(i), input_funcs[2-i]); } for (uint i = 0; i < partition.size(); i++) { @@ -2603,6 +2611,14 @@ uint Compile::compute_truth_table(Unique_Node_List& partition, Unique_Node_List& return res; } +// Criteria under which nodes gets packed into a macro logic node:- +// 1) Parent and both child nodes are all unmasked or masked with +// same predicates. +// 2) Masked parent can be packed with left child if it is predicated +// and both have same predicates. +// 3) Masked parent can be packed with right child if its un-predicated +// or has matching predication condition. +// 4) An unmasked parent can be packed with an unmasked child. bool Compile::compute_logic_cone(Node* n, Unique_Node_List& partition, Unique_Node_List& inputs) { assert(partition.size() == 0, "not empty"); assert(inputs.size() == 0, "not empty"); @@ -2612,37 +2628,65 @@ bool Compile::compute_logic_cone(Node* n, Unique_Node_List& partition, Unique_No bool is_unary_op = is_vector_unary_bitwise_op(n); if (is_unary_op) { - assert(collect_unique_inputs(n, partition, inputs) == 1, "not unary"); + assert(collect_unique_inputs(n, inputs) == 1, "not unary"); return false; // too few inputs } - assert(is_vector_binary_bitwise_op(n), "not binary"); - Node* in1 = n->in(1); - Node* in2 = n->in(2); + bool pack_left_child = true; + bool pack_right_child = true; + + bool left_child_LOP = is_vector_bitwise_op(n->in(1)); + bool right_child_LOP = is_vector_bitwise_op(n->in(2)); + + int left_child_input_cnt = 0; + int right_child_input_cnt = 0; - int in1_unique_inputs_cnt = collect_unique_inputs(in1, partition, inputs); - int in2_unique_inputs_cnt = collect_unique_inputs(in2, partition, inputs); - partition.push(n); + bool parent_is_predicated = n->is_predicated_vector(); + bool left_child_predicated = n->in(1)->is_predicated_vector(); + bool right_child_predicated = n->in(2)->is_predicated_vector(); - // Too many inputs? - if (inputs.size() > 3) { - partition.clear(); - inputs.clear(); - { // Recompute in2 inputs - Unique_Node_List not_used; - in2_unique_inputs_cnt = collect_unique_inputs(in2, not_used, not_used); + Node* parent_pred = parent_is_predicated ? n->in(n->req()-1) : NULL; + Node* left_child_pred = left_child_predicated ? n->in(1)->in(n->in(1)->req()-1) : NULL; + Node* right_child_pred = right_child_predicated ? n->in(1)->in(n->in(1)->req()-1) : NULL; + + do { + if (pack_left_child && left_child_LOP && + ((!parent_is_predicated && !left_child_predicated) || + ((parent_is_predicated && left_child_predicated && + parent_pred == left_child_pred)))) { + partition.push(n->in(1)); + left_child_input_cnt = collect_unique_inputs(n->in(1), inputs); + } else { + inputs.push(n->in(1)); + left_child_input_cnt = 1; } - // Pick the node with minimum number of inputs. - if (in1_unique_inputs_cnt >= 3 && in2_unique_inputs_cnt >= 3) { - return false; // still too many inputs + + if (pack_right_child && right_child_LOP && + (!right_child_predicated || + (right_child_predicated && parent_is_predicated && + parent_pred == right_child_pred))) { + partition.push(n->in(2)); + right_child_input_cnt = collect_unique_inputs(n->in(2), inputs); + } else { + inputs.push(n->in(2)); + right_child_input_cnt = 1; } - // Recompute partition & inputs. - Node* child = (in1_unique_inputs_cnt < in2_unique_inputs_cnt ? in1 : in2); - collect_unique_inputs(child, partition, inputs); - Node* other_input = (in1_unique_inputs_cnt < in2_unique_inputs_cnt ? in2 : in1); - inputs.push(other_input); + if (inputs.size() > 3) { + assert(partition.size() > 0, ""); + inputs.clear(); + partition.clear(); + if (left_child_input_cnt > right_child_input_cnt) { + pack_left_child = false; + } else { + pack_right_child = false; + } + } else { + break; + } + } while(true); + if(partition.size()) { partition.push(n); } @@ -2650,7 +2694,6 @@ bool Compile::compute_logic_cone(Node* n, Unique_Node_List& partition, Unique_No (inputs.size() == 2 || inputs.size() == 3); } - void Compile::process_logic_cone_root(PhaseIterGVN &igvn, Node *n, VectorSet &visited) { assert(is_vector_bitwise_op(n), "not a root"); @@ -2670,8 +2713,19 @@ void Compile::process_logic_cone_root(PhaseIterGVN &igvn, Node *n, VectorSet &vi Unique_Node_List inputs; if (compute_logic_cone(n, partition, inputs)) { const TypeVect* vt = n->bottom_type()->is_vect(); - Node* macro_logic = xform_to_MacroLogicV(igvn, vt, partition, inputs); - igvn.replace_node(n, macro_logic); + Node* pn = partition.at(partition.size() - 1); + Node* mask = pn->is_predicated_vector() ? pn->in(pn->req()-1) : NULL; + if (mask == NULL || + Matcher::match_rule_supported_vector_masked(Op_MacroLogicV, vt->length(), vt->element_basic_type())) { + Node* macro_logic = xform_to_MacroLogicV(igvn, vt, partition, inputs); +#ifdef ASSERT + if (TraceNewVectors) { + tty->print("new Vector node: "); + macro_logic->dump(); + } +#endif + igvn.replace_node(n, macro_logic); + } } } @@ -2798,7 +2852,7 @@ void Compile::Code_Gen() { output.install(); } - print_method(PHASE_FINAL_CODE); + print_method(PHASE_FINAL_CODE, 1); // He's dead, Jim. _cfg = (PhaseCFG*)((intptr_t)0xdeadbeef); @@ -4030,7 +4084,7 @@ void Compile::record_failure(const char* reason) { } if (!C->failure_reason_is(C2Compiler::retry_no_subsuming_loads())) { - C->print_method(PHASE_FAILURE); + C->print_method(PHASE_FAILURE, 1); } _root = NULL; // flush the graph, too } @@ -4760,56 +4814,70 @@ void Compile::sort_macro_nodes() { } } -void Compile::print_method(CompilerPhaseType cpt, const char *name, int level) { +void Compile::print_method(CompilerPhaseType cpt, int level, Node* n) { EventCompilerPhase event; if (event.should_commit()) { CompilerEvent::PhaseEvent::post(event, C->_latest_stage_start_counter, cpt, C->_compile_id, level); } #ifndef PRODUCT - if (should_print(level)) { - _printer->print_method(name, level); + ResourceMark rm; + stringStream ss; + ss.print_raw(CompilerPhaseTypeHelper::to_string(cpt)); + if (n != nullptr) { + ss.print(": %d %s ", n->_idx, NodeClassNames[n->Opcode()]); + } + + const char* name = ss.as_string(); + if (should_print_igv(level)) { + _igv_printer->print_method(name, level); + } + if (should_print_ideal(level)) { + print_ideal_ir(name); } #endif C->_latest_stage_start_counter.stamp(); } -void Compile::print_method(CompilerPhaseType cpt, int level, int idx) { - char output[1024]; +// Only used from CompileWrapper +void Compile::begin_method() { #ifndef PRODUCT - if (idx != 0) { - jio_snprintf(output, sizeof(output), "%s:%d", CompilerPhaseTypeHelper::to_string(cpt), idx); - } else { - jio_snprintf(output, sizeof(output), "%s", CompilerPhaseTypeHelper::to_string(cpt)); + if (_method != NULL && should_print_igv(1)) { + _igv_printer->begin_method(); } #endif - print_method(cpt, output, level); -} - -void Compile::print_method(CompilerPhaseType cpt, Node* n, int level) { - ResourceMark rm; - stringStream ss; - ss.print_raw(CompilerPhaseTypeHelper::to_string(cpt)); - if (n != NULL) { - ss.print(": %d %s ", n->_idx, NodeClassNames[n->Opcode()]); - } else { - ss.print_raw(": NULL"); - } - C->print_method(cpt, ss.as_string(), level); + C->_latest_stage_start_counter.stamp(); } -void Compile::end_method(int level) { +// Only used from CompileWrapper +void Compile::end_method() { EventCompilerPhase event; if (event.should_commit()) { - CompilerEvent::PhaseEvent::post(event, C->_latest_stage_start_counter, PHASE_END, C->_compile_id, level); + CompilerEvent::PhaseEvent::post(event, C->_latest_stage_start_counter, PHASE_END, C->_compile_id, 1); } #ifndef PRODUCT - if (_method != NULL && should_print(level)) { - _printer->end_method(); + if (_method != NULL && should_print_igv(1)) { + _igv_printer->end_method(); } #endif } +bool Compile::should_print_igv(int level) { +#ifndef PRODUCT + if (PrintIdealGraphLevel < 0) { // disabled by the user + return false; + } + + bool need = directive()->IGVPrintLevelOption >= level; + if (need && !_igv_printer) { + _igv_printer = IdealGraphPrinter::printer(); + _igv_printer->set_compile(this); + } + return need; +#else + return false; +#endif +} #ifndef PRODUCT IdealGraphPrinter* Compile::_debug_file_printer = NULL; diff --git a/src/hotspot/share/opto/compile.hpp b/src/hotspot/share/opto/compile.hpp index 175c49dd01678b15da03c26199d65850b9fd635a..70480b0d06e28a29eed76be9f4cde2d5397da231 100644 --- a/src/hotspot/share/opto/compile.hpp +++ b/src/hotspot/share/opto/compile.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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 @@ -327,7 +327,6 @@ class Compile : public Phase { #ifndef PRODUCT uint _igv_idx; // Counter for IGV node identifiers bool _trace_opto_output; - bool _print_ideal; bool _parsed_irreducible_loop; // True if ciTypeFlow detected irreducible loops during parsing #endif bool _has_irreducible_loop; // Found irreducible loops @@ -354,7 +353,7 @@ class Compile : public Phase { GrowableArray _coarsened_locks; // List of coarsened Lock and Unlock nodes ConnectionGraph* _congraph; #ifndef PRODUCT - IdealGraphPrinter* _printer; + IdealGraphPrinter* _igv_printer; static IdealGraphPrinter* _debug_file_printer; static IdealGraphPrinter* _debug_network_printer; #endif @@ -489,7 +488,7 @@ class Compile : public Phase { } #ifndef PRODUCT - IdealGraphPrinter* printer() { return _printer; } + IdealGraphPrinter* igv_printer() { return _igv_printer; } #endif void log_late_inline(CallGenerator* cg); @@ -636,7 +635,9 @@ class Compile : public Phase { #ifndef PRODUCT uint next_igv_idx() { return _igv_idx++; } bool trace_opto_output() const { return _trace_opto_output; } - bool print_ideal() const { return _print_ideal; } + void print_ideal_ir(const char* phase_name); + bool should_print_ideal() const { return _directive->PrintIdealOption; } + bool should_print_ideal(uint level) const { return _directive->PrintIdealLevelOption >= level; } bool parsed_irreducible_loop() const { return _parsed_irreducible_loop; } void set_parsed_irreducible_loop(bool z) { _parsed_irreducible_loop = z; } int _in_dump_cnt; // Required for dumping ir nodes. @@ -650,36 +651,11 @@ class Compile : public Phase { Ticks _latest_stage_start_counter; - void begin_method(int level = 1) { -#ifndef PRODUCT - if (_method != NULL && should_print(level)) { - _printer->begin_method(); - } -#endif - C->_latest_stage_start_counter.stamp(); - } + void begin_method(); + void end_method(); + bool should_print_igv(int level); - bool should_print(int level = 1) { -#ifndef PRODUCT - if (PrintIdealGraphLevel < 0) { // disabled by the user - return false; - } - - bool need = directive()->IGVPrintLevelOption >= level; - if (need && !_printer) { - _printer = IdealGraphPrinter::printer(); - assert(_printer != NULL, "_printer is NULL when we need it!"); - _printer->set_compile(this); - } - return need; -#else - return false; -#endif - } - - void print_method(CompilerPhaseType cpt, const char *name, int level = 1); - void print_method(CompilerPhaseType cpt, int level = 1, int idx = 0); - void print_method(CompilerPhaseType cpt, Node* n, int level = 3); + void print_method(CompilerPhaseType cpt, int level, Node* n = nullptr); #ifndef PRODUCT void igv_print_method_to_file(const char* phase_name = "Debug", bool append = false); @@ -688,8 +664,6 @@ class Compile : public Phase { static IdealGraphPrinter* debug_network_printer() { return _debug_network_printer; } #endif - void end_method(int level = 1); - int macro_count() const { return _macro_nodes.length(); } int predicate_count() const { return _predicate_opaqs.length(); } int skeleton_predicate_count() const { return _skeleton_predicate_opaqs.length(); } diff --git a/src/hotspot/share/opto/doCall.cpp b/src/hotspot/share/opto/doCall.cpp index 6746ce02967f4fb29267a4596920d23854e0850f..f034aacae62002bbcec6ddea9e0756073771d819 100644 --- a/src/hotspot/share/opto/doCall.cpp +++ b/src/hotspot/share/opto/doCall.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2022, 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,13 +67,17 @@ CallGenerator* Compile::call_generator(ciMethod* callee, int vtable_index, bool JVMState* jvms, bool allow_inline, float prof_factor, ciKlass* speculative_receiver_type, bool allow_intrinsics) { - ciMethod* caller = jvms->method(); - int bci = jvms->bci(); - Bytecodes::Code bytecode = caller->java_code_at_bci(bci); - guarantee(callee != NULL, "failed method resolution"); + assert(callee != NULL, "failed method resolution"); + + ciMethod* caller = jvms->method(); + int bci = jvms->bci(); + Bytecodes::Code bytecode = caller->java_code_at_bci(bci); + ciMethod* orig_callee = caller->get_method_at_bci(bci); const bool is_virtual_or_interface = (bytecode == Bytecodes::_invokevirtual) || - (bytecode == Bytecodes::_invokeinterface); + (bytecode == Bytecodes::_invokeinterface) || + (orig_callee->intrinsic_id() == vmIntrinsics::_linkToVirtual) || + (orig_callee->intrinsic_id() == vmIntrinsics::_linkToInterface); // Dtrace currently doesn't work unless all calls are vanilla if (env()->dtrace_method_probes()) { @@ -328,8 +332,10 @@ CallGenerator* Compile::call_generator(ciMethod* callee, int vtable_index, bool CallGenerator* miss_cg = CallGenerator::for_uncommon_trap(callee, Deoptimization::Reason_class_check, Deoptimization::Action_none); - CallGenerator* cg = CallGenerator::for_guarded_call(holder, miss_cg, hit_cg); + ciKlass* constraint = (holder->is_subclass_of(singleton) ? holder : singleton); // avoid upcasts + CallGenerator* cg = CallGenerator::for_guarded_call(constraint, miss_cg, hit_cg); if (hit_cg != NULL && cg != NULL) { + dependencies()->assert_unique_implementor(declared_interface, singleton); dependencies()->assert_unique_concrete_method(declared_interface, cha_monomorphic_target, declared_interface, callee); return cg; } diff --git a/src/hotspot/share/opto/graphKit.cpp b/src/hotspot/share/opto/graphKit.cpp index 8547f7fed90794cb03e1ac3f93af0d4f583ba68f..da96ebd91697b37c9412b62427b84b973ec905b3 100644 --- a/src/hotspot/share/opto/graphKit.cpp +++ b/src/hotspot/share/opto/graphKit.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2022, 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 @@ -2350,9 +2350,9 @@ void GraphKit::round_double_arguments(ciMethod* dest_method) { const Type *targ = tf->domain()->field_at(j + TypeFunc::Parms); if (targ->basic_type() == T_DOUBLE) { // If any parameters are doubles, they must be rounded before - // the call, dstore_rounding does gvn.transform + // the call, dprecision_rounding does gvn.transform Node *arg = argument(j); - arg = dstore_rounding(arg); + arg = dprecision_rounding(arg); set_argument(j, arg); } } @@ -2387,20 +2387,6 @@ Node* GraphKit::dprecision_rounding(Node *n) { return n; } -// rounding for non-strict double stores -Node* GraphKit::dstore_rounding(Node* n) { - if (Matcher::strict_fp_requires_explicit_rounding) { -#ifdef IA32 - if (UseSSE < 2) { - return _gvn.transform(new RoundDoubleNode(0, n)); - } -#else - Unimplemented(); -#endif // IA32 - } - return n; -} - //============================================================================= // Generate a fast path/slow path idiom. Graph looks like: // [foo] indicates that 'foo' is a parameter diff --git a/src/hotspot/share/opto/graphKit.hpp b/src/hotspot/share/opto/graphKit.hpp index d815e21956fc1bf0e56a6274e90817978f9ae64c..b2a85b84f03ac8d0ad425c769ea5ed29e9578195 100644 --- a/src/hotspot/share/opto/graphKit.hpp +++ b/src/hotspot/share/opto/graphKit.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2022, 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 @@ -790,9 +790,6 @@ class GraphKit : public Phase { // rounding for strict double precision conformance Node* dprecision_rounding(Node* n); - // rounding for non-strict double stores - Node* dstore_rounding(Node* n); - // Helper functions for fast/slow path codes Node* opt_iff(Node* region, Node* iff); Node* make_runtime_call(int flags, diff --git a/src/hotspot/share/opto/idealGraphPrinter.cpp b/src/hotspot/share/opto/idealGraphPrinter.cpp index cb403853f33c8c72bfda3c09e8405dee159e9b25..b5d1759dc4341dc1fb61512a780b4bbd798de12d 100644 --- a/src/hotspot/share/opto/idealGraphPrinter.cpp +++ b/src/hotspot/share/opto/idealGraphPrinter.cpp @@ -316,7 +316,9 @@ void IdealGraphPrinter::begin_method() { } if (C->is_osr_compilation()) { - print_prop(COMPILATION_OSR_PROPERTY, TRUE_VALUE); + stringStream ss; + ss.print("bci: %d, line: %d", C->entry_bci(), method->line_number_from_bci(C->entry_bci())); + print_prop(COMPILATION_OSR_PROPERTY, ss.as_string()); } print_prop(COMPILATION_ID_PROPERTY, C->compile_id()); @@ -480,6 +482,8 @@ void IdealGraphPrinter::visit_node(Node *n, bool edges, VectorSet* temp_set) { print_prop("idealOpcode", (const char *)NodeClassNames[node->as_Mach()->ideal_Opcode()]); } + print_field(node); + buffer[0] = 0; stringStream s2(buffer, sizeof(buffer) - 1); @@ -628,9 +632,96 @@ void IdealGraphPrinter::visit_node(Node *n, bool edges, VectorSet* temp_set) { } } -void IdealGraphPrinter::walk_nodes(Node *start, bool edges, VectorSet* temp_set) { +void IdealGraphPrinter::print_field(const Node* node) { + buffer[0] = 0; + stringStream ss(buffer, sizeof(buffer) - 1); + ciField* field = get_field(node); + uint depth = 0; + if (field == NULL) { + depth++; + field = find_source_field_of_array_access(node, depth); + } + + if (field != NULL) { + // Either direct field access or array access + field->print_name_on(&ss); + for (uint i = 0; i < depth; i++) { + // For arrays: Add [] for each dimension + ss.print("[]"); + } + if (node->is_Store()) { + print_prop("destination", buffer); + } else { + print_prop("source", buffer); + } + } +} + +ciField* IdealGraphPrinter::get_field(const Node* node) { + const TypePtr* adr_type = node->adr_type(); + Compile::AliasType* atp = NULL; + if (C->have_alias_type(adr_type)) { + atp = C->alias_type(adr_type); + } + if (atp != NULL) { + ciField* field = atp->field(); + if (field != NULL) { + // Found field associated with 'node'. + return field; + } + } + return NULL; +} + +// Try to find the field that is associated with a memory node belonging to an array access. +ciField* IdealGraphPrinter::find_source_field_of_array_access(const Node* node, uint& depth) { + if (!node->is_Mem()) { + // Not an array access + return NULL; + } + + do { + if (node->adr_type() != NULL && node->adr_type()->isa_aryptr()) { + // Only process array accesses. Pattern match to find actual field source access. + node = get_load_node(node); + if (node != NULL) { + ciField* field = get_field(node); + if (field != NULL) { + return field; + } + // Could be a multi-dimensional array. Repeat loop. + depth++; + continue; + } + } + // Not an array access with a field source. + break; + } while (depth < 256); // Cannot have more than 255 dimensions + return NULL; +} + +// Pattern match on the inputs of 'node' to find load node for the field access. +Node* IdealGraphPrinter::get_load_node(const Node* node) { + Node* load = NULL; + Node* addr = node->as_Mem()->in(MemNode::Address); + if (addr != NULL && addr->is_AddP()) { + Node* base = addr->as_AddP()->base_node(); + if (base != NULL) { + base = base->uncast(); + if (base->is_Load()) { + // Mem(AddP([ConstraintCast*](LoadP))) for non-compressed oops. + load = base; + } else if (base->is_DecodeN() && base->in(1)->is_Load()) { + // Mem(AddP([ConstraintCast*](DecodeN(LoadN)))) for compressed oops. + load = base->in(1); + } + } + } + return load; +} +void IdealGraphPrinter::walk_nodes(Node* start, bool edges, VectorSet* temp_set) { VectorSet visited; GrowableArray nodeStack(Thread::current()->resource_area(), 0, 0, NULL); nodeStack.push(start); @@ -671,7 +762,7 @@ void IdealGraphPrinter::walk_nodes(Node *start, bool edges, VectorSet* temp_set) } void IdealGraphPrinter::print_method(const char *name, int level) { - if (C->should_print(level)) { + if (C->should_print_igv(level)) { print(name, (Node *) C->root()); } } diff --git a/src/hotspot/share/opto/idealGraphPrinter.hpp b/src/hotspot/share/opto/idealGraphPrinter.hpp index c3c33e5b5c96262250e318780c79eafe3ddc9296..6f845d5b048b97d650bc10b42ee0e78168353a32 100644 --- a/src/hotspot/share/opto/idealGraphPrinter.hpp +++ b/src/hotspot/share/opto/idealGraphPrinter.hpp @@ -99,6 +99,10 @@ class IdealGraphPrinter : public CHeapObj { void print_method(ciMethod *method, int bci, InlineTree *tree); void print_inline_tree(InlineTree *tree); void visit_node(Node *n, bool edges, VectorSet* temp_set); + void print_field(const Node* node); + ciField* get_field(const Node* node); + ciField* find_source_field_of_array_access(const Node* node, uint& depth); + static Node* get_load_node(const Node* node); void walk_nodes(Node *start, bool edges, VectorSet* temp_set); void begin_elem(const char *s); void end_elem(); diff --git a/src/hotspot/share/opto/loopPredicate.cpp b/src/hotspot/share/opto/loopPredicate.cpp index c0396bbe95d1cd3684d07dedfd3250e002e9b623..b7f1ce6ff7e62cf28b7607622c3f987bfea788fa 100644 --- a/src/hotspot/share/opto/loopPredicate.cpp +++ b/src/hotspot/share/opto/loopPredicate.cpp @@ -1024,13 +1024,15 @@ private: GrowableArray _freqs; // cache frequencies PhaseIdealLoop* _phase; - void set_rounding(int mode) { - // fesetround is broken on windows - NOT_WINDOWS(fesetround(mode);) - } - - void check_frequency(float f) { - NOT_WINDOWS(assert(f <= 1 && f >= 0, "Incorrect frequency");) + float check_and_truncate_frequency(float f) { + assert(f >= 0, "Incorrect frequency"); + // We do not perform an exact (f <= 1) check + // this would be error prone with rounding of floats. + // Performing a check like (f <= 1+eps) would be of benefit, + // however, it is not evident how to determine such an eps, + // given that an arbitrary number of add/mul operations + // are performed on these frequencies. + return (f > 1) ? 1 : f; } public: @@ -1040,7 +1042,6 @@ public: float to(Node* n) { // post order walk on the CFG graph from n to _dom - set_rounding(FE_TOWARDZERO); // make sure rounding doesn't push frequency above 1 IdealLoopTree* loop = _phase->get_loop(_dom); Node* c = n; for (;;) { @@ -1067,14 +1068,12 @@ public: inner_head = inner_loop->_head->as_Loop(); inner_head->verify_strip_mined(1); } - set_rounding(FE_UPWARD); // make sure rounding doesn't push frequency above 1 float loop_exit_cnt = 0.0f; for (uint i = 0; i < inner_loop->_body.size(); i++) { Node *n = inner_loop->_body[i]; float c = inner_loop->compute_profile_trip_cnt_helper(n); loop_exit_cnt += c; } - set_rounding(FE_TOWARDZERO); float cnt = -1; if (n->in(0)->is_If()) { IfNode* iff = n->in(0)->as_If(); @@ -1094,9 +1093,9 @@ public: cnt = p * jmp->_fcnt; } float this_exit_f = cnt > 0 ? cnt / loop_exit_cnt : 0; - check_frequency(this_exit_f); + this_exit_f = check_and_truncate_frequency(this_exit_f); f = f * this_exit_f; - check_frequency(f); + f = check_and_truncate_frequency(f); } else { float p = -1; if (n->in(0)->is_If()) { @@ -1109,7 +1108,7 @@ public: p = n->in(0)->as_Jump()->_probs[n->as_JumpProj()->_con]; } f = f * p; - check_frequency(f); + f = check_and_truncate_frequency(f); } _freqs.at_put_grow(n->_idx, (float)f, -1); _stack.pop(); @@ -1117,7 +1116,7 @@ public: float prev_f = _freqs_stack.pop(); float new_f = f; f = new_f + prev_f; - check_frequency(f); + f = check_and_truncate_frequency(f); uint i = _stack.index(); if (i < n->req()) { c = n->in(i); @@ -1130,9 +1129,7 @@ public: } } if (_stack.size() == 0) { - set_rounding(FE_TONEAREST); - check_frequency(f); - return f; + return check_and_truncate_frequency(f); } } else if (c->is_Loop()) { ShouldNotReachHere(); @@ -1367,7 +1364,7 @@ bool PhaseIdealLoop::loop_predication_impl_helper(IdealLoopTree *loop, ProjNode* invar.map_ctrl(proj, new_predicate_proj); // so that invariance test can be appropriate // Eliminate the old If in the loop body - dominated_by( new_predicate_proj, iff, proj->_con != new_predicate_proj->_con ); + dominated_by( new_predicate_proj->as_IfProj(), iff, proj->_con != new_predicate_proj->_con ); C->set_major_progress(); return true; diff --git a/src/hotspot/share/opto/loopTransform.cpp b/src/hotspot/share/opto/loopTransform.cpp index 30562826eacc343dadcce50d28c4d9bace448357..033ab5d47abe199960730e2f270f858ed27dee6d 100644 --- a/src/hotspot/share/opto/loopTransform.cpp +++ b/src/hotspot/share/opto/loopTransform.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2022, 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 @@ -532,7 +532,7 @@ void PhaseIdealLoop::peeled_dom_test_elim(IdealLoopTree* loop, Node_List& old_ne if (n->is_If() && n->in(1) == test_cond) { // IfNode was dominated by version in peeled loop body progress = true; - dominated_by(old_new[prev->_idx], n); + dominated_by(old_new[prev->_idx]->as_IfProj(), n->as_If()); } } } @@ -899,15 +899,27 @@ bool IdealLoopTree::policy_unroll(PhaseIdealLoop *phase) { return false; } + bool should_unroll = true; + // When unroll count is greater than LoopUnrollMin, don't unroll if: // the residual iterations are more than 10% of the trip count // and rounds of "unroll,optimize" are not making significant progress // Progress defined as current size less than 20% larger than previous size. if (UseSuperWord && cl->node_count_before_unroll() > 0 && future_unroll_cnt > LoopUnrollMin && - (future_unroll_cnt - 1) * (100.0 / LoopPercentProfileLimit) > cl->profile_trip_cnt() && + is_residual_iters_large(future_unroll_cnt, cl) && 1.2 * cl->node_count_before_unroll() < (double)_body.size()) { - return false; + if ((cl->slp_max_unroll() == 0) && !is_residual_iters_large(cl->unrolled_count(), cl)) { + // cl->slp_max_unroll() = 0 means that the previous slp analysis never passed. + // slp analysis may fail due to the loop IR is too complicated especially during the early stage + // of loop unrolling analysis. But after several rounds of loop unrolling and other optimizations, + // it's possible that the loop IR becomes simple enough to pass the slp analysis. + // So we don't return immediately in hoping that the next slp analysis can succeed. + should_unroll = false; + future_unroll_cnt = cl->unrolled_count(); + } else { + return false; + } } Node *init_n = cl->init_trip(); @@ -985,7 +997,7 @@ bool IdealLoopTree::policy_unroll(PhaseIdealLoop *phase) { } // Only attempt slp analysis when user controls do not prohibit it - if (LoopMaxUnroll > _local_loop_unroll_factor) { + if (!cl->range_checks_present() && (LoopMaxUnroll > _local_loop_unroll_factor)) { // Once policy_slp_analysis succeeds, mark the loop with the // maximal unroll factor so that we minimize analysis passes if (future_unroll_cnt >= _local_loop_unroll_factor) { @@ -1003,7 +1015,7 @@ bool IdealLoopTree::policy_unroll(PhaseIdealLoop *phase) { if (cl->has_passed_slp()) { if (slp_max_unroll_factor >= future_unroll_cnt) { - return phase->may_require_nodes(estimate); + return should_unroll && phase->may_require_nodes(estimate); } return false; // Loop too big. } @@ -1011,7 +1023,7 @@ bool IdealLoopTree::policy_unroll(PhaseIdealLoop *phase) { // Check for being too big if (body_size > (uint)_local_loop_unroll_limit) { if ((cl->is_subword_loop() || xors_in_loop >= 4) && body_size < 4u * LoopUnrollLimit) { - return phase->may_require_nodes(estimate); + return should_unroll && phase->may_require_nodes(estimate); } return false; // Loop too big. } @@ -1024,7 +1036,7 @@ bool IdealLoopTree::policy_unroll(PhaseIdealLoop *phase) { } // Unroll once! (Each trip will soon do double iterations) - return phase->may_require_nodes(estimate); + return should_unroll && phase->may_require_nodes(estimate); } void IdealLoopTree::policy_unroll_slp_analysis(CountedLoopNode *cl, PhaseIdealLoop *phase, int future_unroll_cnt) { @@ -3425,6 +3437,11 @@ bool IdealLoopTree::do_one_iteration_loop(PhaseIdealLoop *phase) { //============================================================================= //------------------------------iteration_split_impl--------------------------- bool IdealLoopTree::iteration_split_impl(PhaseIdealLoop *phase, Node_List &old_new) { + if (!_head->is_Loop()) { + // Head could be a region with a NeverBranch that was added in beautify loops but the region was not + // yet transformed into a LoopNode. Bail out and wait until beautify loops turns it into a Loop node. + return false; + } // Compute loop trip count if possible. compute_trip_count(phase); @@ -3528,6 +3545,8 @@ bool IdealLoopTree::iteration_split_impl(PhaseIdealLoop *phase, Node_List &old_n if (should_rce) { if (phase->do_range_check(this, old_new) != 0) { cl->mark_has_range_checks(); + } else { + cl->clear_has_range_checks(); } } else if (PostLoopMultiversioning) { phase->has_range_checks(this); diff --git a/src/hotspot/share/opto/loopUnswitch.cpp b/src/hotspot/share/opto/loopUnswitch.cpp index abdc7e66a492b1e74996b5180d938e5d93e62c6e..a141b8e15aa126609a85b96507a320116512901c 100644 --- a/src/hotspot/share/opto/loopUnswitch.cpp +++ b/src/hotspot/share/opto/loopUnswitch.cpp @@ -213,11 +213,11 @@ void PhaseIdealLoop::do_unswitching(IdealLoopTree *loop, Node_List &old_new) { // Hardwire the control paths in the loops into if(true) and if(false) _igvn.rehash_node_delayed(unswitch_iff); - dominated_by(proj_true, unswitch_iff, false, false); + dominated_by(proj_true->as_IfProj(), unswitch_iff, false, false); IfNode* unswitch_iff_clone = old_new[unswitch_iff->_idx]->as_If(); _igvn.rehash_node_delayed(unswitch_iff_clone); - dominated_by(proj_false, unswitch_iff_clone, false, false); + dominated_by(proj_false->as_IfProj(), unswitch_iff_clone, false, false); // Reoptimize loops loop->record_for_igvn(); diff --git a/src/hotspot/share/opto/loopnode.hpp b/src/hotspot/share/opto/loopnode.hpp index b156ceb95b4825a813862013750f1131a5cf1088..f3eaabebae10222d366871769200c65d8b2c5d8e 100644 --- a/src/hotspot/share/opto/loopnode.hpp +++ b/src/hotspot/share/opto/loopnode.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2022, 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 @@ -114,6 +114,7 @@ public: void mark_loop_vectorized() { _loop_flags |= VectorizedLoop; } void mark_has_atomic_post_loop() { _loop_flags |= HasAtomicPostLoop; } void mark_has_range_checks() { _loop_flags |= HasRangeChecks; } + void clear_has_range_checks() { _loop_flags &= ~HasRangeChecks; } void mark_is_multiversioned() { _loop_flags |= IsMultiversioned; } void mark_strip_mined() { _loop_flags |= StripMined; } void clear_strip_mined() { _loop_flags &= ~StripMined; } @@ -773,6 +774,12 @@ public: // Estimate the number of nodes resulting from control and data flow merge. uint est_loop_flow_merge_sz() const; + + // Check if the number of residual iterations is large with unroll_cnt. + // Return true if the residual iterations are more than 10% of the trip count. + bool is_residual_iters_large(int unroll_cnt, CountedLoopNode *cl) const { + return (unroll_cnt - 1) * (100.0 / LoopPercentProfileLimit) > cl->profile_trip_cnt(); + } }; // -----------------------------PhaseIdealLoop--------------------------------- @@ -1442,7 +1449,8 @@ public: // Rework addressing expressions to get the most loop-invariant stuff // moved out. We'd like to do all associative operators, but it's especially // important (common) to do address expressions. - Node *remix_address_expressions( Node *n ); + Node* remix_address_expressions(Node* n); + Node* remix_address_expressions_add_left_shift(Node* n, IdealLoopTree* n_loop, Node* n_ctrl, BasicType bt); // Convert add to muladd to generate MuladdS2I under certain criteria Node * convert_add_to_muladd(Node * n); @@ -1464,15 +1472,15 @@ public: Node *has_local_phi_input( Node *n ); // Mark an IfNode as being dominated by a prior test, // without actually altering the CFG (and hence IDOM info). - void dominated_by( Node *prevdom, Node *iff, bool flip = false, bool exclude_loop_predicate = false ); + void dominated_by(IfProjNode* prevdom, IfNode* iff, bool flip = false, bool exclude_loop_predicate = false); // Split Node 'n' through merge point - Node *split_thru_region( Node *n, Node *region ); + RegionNode* split_thru_region(Node* n, RegionNode* region); // Split Node 'n' through merge point if there is enough win. Node *split_thru_phi( Node *n, Node *region, int policy ); // Found an If getting its condition-code input from a Phi in the // same block. Split thru the Region. - void do_split_if( Node *iff ); + void do_split_if(Node *iff, RegionNode** new_false_region = NULL, RegionNode** new_true_region = NULL); // Conversion of fill/copy patterns into intrinsic versions bool do_intrinsify_fill(); @@ -1647,6 +1655,9 @@ public: void strip_mined_nest_back_to_counted_loop(IdealLoopTree* loop, const BaseCountedLoopNode* head, Node* back_control, IfNode*&exit_test, SafePointNode*&safepoint); + void push_pinned_nodes_thru_region(IfNode* dom_if, Node* region); + + bool try_merge_identical_ifs(Node* n); }; diff --git a/src/hotspot/share/opto/loopopts.cpp b/src/hotspot/share/opto/loopopts.cpp index 65bb4f663a833bf7db58b7897dca0e015fd8c848..a7c82ad2ee15de8efaf9922b0ce6c2a4e02cab35 100644 --- a/src/hotspot/share/opto/loopopts.cpp +++ b/src/hotspot/share/opto/loopopts.cpp @@ -229,11 +229,10 @@ Node* PhaseIdealLoop::split_thru_phi(Node* n, Node* region, int policy) { // Replace the dominated test with an obvious true or false. Place it on the // IGVN worklist for later cleanup. Move control-dependent data Nodes on the // live path up to the dominating control. -void PhaseIdealLoop::dominated_by( Node *prevdom, Node *iff, bool flip, bool exclude_loop_predicate ) { +void PhaseIdealLoop::dominated_by(IfProjNode* prevdom, IfNode* iff, bool flip, bool exclude_loop_predicate) { if (VerifyLoopOptimizations && PrintOpto) { tty->print_cr("dominating test"); } // prevdom is the dominating projection of the dominating test. - assert(iff->is_If(), "must be"); assert(iff->Opcode() == Op_If || iff->Opcode() == Op_CountedLoopEnd || iff->Opcode() == Op_LongCountedLoopEnd || @@ -263,7 +262,7 @@ void PhaseIdealLoop::dominated_by( Node *prevdom, Node *iff, bool flip, bool exc // Make control-dependent data Nodes on the live path (path that will remain // once the dominated IF is removed) become control-dependent on the // dominating projection. - Node* dp = iff->as_If()->proj_out_or_null(pop == Op_IfTrue); + Node* dp = iff->proj_out_or_null(pop == Op_IfTrue); // Loop predicates may have depending checks which should not // be skipped. For example, range check predicate has two checks @@ -272,7 +271,7 @@ void PhaseIdealLoop::dominated_by( Node *prevdom, Node *iff, bool flip, bool exc return; ProjNode* dp_proj = dp->as_Proj(); - ProjNode* unc_proj = iff->as_If()->proj_out(1 - dp_proj->_con)->as_Proj(); + ProjNode* unc_proj = iff->proj_out(1 - dp_proj->_con)->as_Proj(); if (exclude_loop_predicate && (unc_proj->is_uncommon_trap_proj(Deoptimization::Reason_predicate) != NULL || unc_proj->is_uncommon_trap_proj(Deoptimization::Reason_profile_predicate) != NULL || @@ -353,139 +352,158 @@ Node *PhaseIdealLoop::has_local_phi_input( Node *n ) { return n_ctrl; } -//------------------------------remix_address_expressions---------------------- -// Rework addressing expressions to get the most loop-invariant stuff -// moved out. We'd like to do all associative operators, but it's especially -// important (common) to do address expressions. -Node *PhaseIdealLoop::remix_address_expressions( Node *n ) { - if (!has_ctrl(n)) return NULL; - Node *n_ctrl = get_ctrl(n); - IdealLoopTree *n_loop = get_loop(n_ctrl); - - // See if 'n' mixes loop-varying and loop-invariant inputs and - // itself is loop-varying. - - // Only interested in binary ops (and AddP) - if( n->req() < 3 || n->req() > 4 ) return NULL; - - Node *n1_ctrl = get_ctrl(n->in( 1)); - Node *n2_ctrl = get_ctrl(n->in( 2)); - Node *n3_ctrl = get_ctrl(n->in(n->req() == 3 ? 2 : 3)); - IdealLoopTree *n1_loop = get_loop( n1_ctrl ); - IdealLoopTree *n2_loop = get_loop( n2_ctrl ); - IdealLoopTree *n3_loop = get_loop( n3_ctrl ); - - // Does one of my inputs spin in a tighter loop than self? - if( (n_loop->is_member( n1_loop ) && n_loop != n1_loop) || - (n_loop->is_member( n2_loop ) && n_loop != n2_loop) || - (n_loop->is_member( n3_loop ) && n_loop != n3_loop) ) - return NULL; // Leave well enough alone - - // Is at least one of my inputs loop-invariant? - if( n1_loop == n_loop && - n2_loop == n_loop && - n3_loop == n_loop ) - return NULL; // No loop-invariant inputs - - +// Replace expressions like ((V+I) << 2) with (V<<2 + I<<2). +Node* PhaseIdealLoop::remix_address_expressions_add_left_shift(Node* n, IdealLoopTree* n_loop, Node* n_ctrl, BasicType bt) { + assert(bt == T_INT || bt == T_LONG, "only for integers"); int n_op = n->Opcode(); - // Replace expressions like ((V+I) << 2) with (V<<2 + I<<2). - if( n_op == Op_LShiftI ) { + if (n_op == Op_LShift(bt)) { // Scale is loop invariant - Node *scale = n->in(2); - Node *scale_ctrl = get_ctrl(scale); - IdealLoopTree *scale_loop = get_loop(scale_ctrl ); - if( n_loop == scale_loop || !scale_loop->is_member( n_loop ) ) + Node* scale = n->in(2); + Node* scale_ctrl = get_ctrl(scale); + IdealLoopTree* scale_loop = get_loop(scale_ctrl); + if (n_loop == scale_loop || !scale_loop->is_member(n_loop)) { return NULL; - const TypeInt *scale_t = scale->bottom_type()->isa_int(); - if( scale_t && scale_t->is_con() && scale_t->get_con() >= 16 ) + } + const TypeInt* scale_t = scale->bottom_type()->isa_int(); + if (scale_t != NULL && scale_t->is_con() && scale_t->get_con() >= 16) { return NULL; // Dont bother with byte/short masking + } // Add must vary with loop (else shift would be loop-invariant) - Node *add = n->in(1); - Node *add_ctrl = get_ctrl(add); - IdealLoopTree *add_loop = get_loop(add_ctrl); - //assert( n_loop == add_loop, "" ); - if( n_loop != add_loop ) return NULL; // happens w/ evil ZKM loops + Node* add = n->in(1); + Node* add_ctrl = get_ctrl(add); + IdealLoopTree* add_loop = get_loop(add_ctrl); + if (n_loop != add_loop) { + return NULL; // happens w/ evil ZKM loops + } // Convert I-V into I+ (0-V); same for V-I - if( add->Opcode() == Op_SubI && - _igvn.type( add->in(1) ) != TypeInt::ZERO ) { - Node *zero = _igvn.intcon(0); + if (add->Opcode() == Op_Sub(bt) && + _igvn.type(add->in(1)) != TypeInteger::zero(bt)) { + assert(add->Opcode() == Op_SubI || add->Opcode() == Op_SubL, ""); + Node* zero = _igvn.integercon(0, bt); set_ctrl(zero, C->root()); - Node *neg = new SubINode( _igvn.intcon(0), add->in(2) ); - register_new_node( neg, get_ctrl(add->in(2) ) ); - add = new AddINode( add->in(1), neg ); - register_new_node( add, add_ctrl ); + Node* neg = SubNode::make(zero, add->in(2), bt); + register_new_node(neg, get_ctrl(add->in(2))); + add = AddNode::make(add->in(1), neg, bt); + register_new_node(add, add_ctrl); } - if( add->Opcode() != Op_AddI ) return NULL; + if (add->Opcode() != Op_Add(bt)) return NULL; + assert(add->Opcode() == Op_AddI || add->Opcode() == Op_AddL, ""); // See if one add input is loop invariant - Node *add_var = add->in(1); - Node *add_var_ctrl = get_ctrl(add_var); - IdealLoopTree *add_var_loop = get_loop(add_var_ctrl ); - Node *add_invar = add->in(2); - Node *add_invar_ctrl = get_ctrl(add_invar); - IdealLoopTree *add_invar_loop = get_loop(add_invar_ctrl ); - if( add_var_loop == n_loop ) { - } else if( add_invar_loop == n_loop ) { + Node* add_var = add->in(1); + Node* add_var_ctrl = get_ctrl(add_var); + IdealLoopTree* add_var_loop = get_loop(add_var_ctrl); + Node* add_invar = add->in(2); + Node* add_invar_ctrl = get_ctrl(add_invar); + IdealLoopTree* add_invar_loop = get_loop(add_invar_ctrl); + if (add_invar_loop == n_loop) { // Swap to find the invariant part add_invar = add_var; add_invar_ctrl = add_var_ctrl; add_invar_loop = add_var_loop; add_var = add->in(2); - Node *add_var_ctrl = get_ctrl(add_var); - IdealLoopTree *add_var_loop = get_loop(add_var_ctrl ); - } else // Else neither input is loop invariant + } else if (add_var_loop != n_loop) { // Else neither input is loop invariant return NULL; - if( n_loop == add_invar_loop || !add_invar_loop->is_member( n_loop ) ) + } + if (n_loop == add_invar_loop || !add_invar_loop->is_member(n_loop)) { return NULL; // No invariant part of the add? + } // Yes! Reshape address expression! - Node *inv_scale = new LShiftINode( add_invar, scale ); - Node *inv_scale_ctrl = - dom_depth(add_invar_ctrl) > dom_depth(scale_ctrl) ? - add_invar_ctrl : scale_ctrl; - register_new_node( inv_scale, inv_scale_ctrl ); - Node *var_scale = new LShiftINode( add_var, scale ); - register_new_node( var_scale, n_ctrl ); - Node *var_add = new AddINode( var_scale, inv_scale ); - register_new_node( var_add, n_ctrl ); - _igvn.replace_node( n, var_add ); + Node* inv_scale = LShiftNode::make(add_invar, scale, bt); + Node* inv_scale_ctrl = + dom_depth(add_invar_ctrl) > dom_depth(scale_ctrl) ? + add_invar_ctrl : scale_ctrl; + register_new_node(inv_scale, inv_scale_ctrl); + Node* var_scale = LShiftNode::make(add_var, scale, bt); + register_new_node(var_scale, n_ctrl); + Node* var_add = AddNode::make(var_scale, inv_scale, bt); + register_new_node(var_add, n_ctrl); + _igvn.replace_node(n, var_add); return var_add; } + return NULL; +} +//------------------------------remix_address_expressions---------------------- +// Rework addressing expressions to get the most loop-invariant stuff +// moved out. We'd like to do all associative operators, but it's especially +// important (common) to do address expressions. +Node* PhaseIdealLoop::remix_address_expressions(Node* n) { + if (!has_ctrl(n)) return NULL; + Node* n_ctrl = get_ctrl(n); + IdealLoopTree* n_loop = get_loop(n_ctrl); + + // See if 'n' mixes loop-varying and loop-invariant inputs and + // itself is loop-varying. + + // Only interested in binary ops (and AddP) + if (n->req() < 3 || n->req() > 4) return NULL; + + Node* n1_ctrl = get_ctrl(n->in( 1)); + Node* n2_ctrl = get_ctrl(n->in( 2)); + Node* n3_ctrl = get_ctrl(n->in(n->req() == 3 ? 2 : 3)); + IdealLoopTree* n1_loop = get_loop(n1_ctrl); + IdealLoopTree* n2_loop = get_loop(n2_ctrl); + IdealLoopTree* n3_loop = get_loop(n3_ctrl); + + // Does one of my inputs spin in a tighter loop than self? + if ((n_loop->is_member(n1_loop) && n_loop != n1_loop) || + (n_loop->is_member(n2_loop) && n_loop != n2_loop) || + (n_loop->is_member(n3_loop) && n_loop != n3_loop)) { + return NULL; // Leave well enough alone + } + + // Is at least one of my inputs loop-invariant? + if (n1_loop == n_loop && + n2_loop == n_loop && + n3_loop == n_loop) { + return NULL; // No loop-invariant inputs + } + + Node* res = remix_address_expressions_add_left_shift(n, n_loop, n_ctrl, T_INT); + if (res != NULL) { + return res; + } + res = remix_address_expressions_add_left_shift(n, n_loop, n_ctrl, T_LONG); + if (res != NULL) { + return res; + } + + int n_op = n->Opcode(); // Replace (I+V) with (V+I) - if( n_op == Op_AddI || + if (n_op == Op_AddI || n_op == Op_AddL || n_op == Op_AddF || n_op == Op_AddD || n_op == Op_MulI || n_op == Op_MulL || n_op == Op_MulF || - n_op == Op_MulD ) { - if( n2_loop == n_loop ) { - assert( n1_loop != n_loop, "" ); + n_op == Op_MulD) { + if (n2_loop == n_loop) { + assert(n1_loop != n_loop, ""); n->swap_edges(1, 2); } } // Replace ((I1 +p V) +p I2) with ((I1 +p I2) +p V), // but not if I2 is a constant. - if( n_op == Op_AddP ) { - if( n2_loop == n_loop && n3_loop != n_loop ) { - if( n->in(2)->Opcode() == Op_AddP && !n->in(3)->is_Con() ) { - Node *n22_ctrl = get_ctrl(n->in(2)->in(2)); - Node *n23_ctrl = get_ctrl(n->in(2)->in(3)); - IdealLoopTree *n22loop = get_loop( n22_ctrl ); - IdealLoopTree *n23_loop = get_loop( n23_ctrl ); - if( n22loop != n_loop && n22loop->is_member(n_loop) && - n23_loop == n_loop ) { - Node *add1 = new AddPNode( n->in(1), n->in(2)->in(2), n->in(3) ); + if (n_op == Op_AddP) { + if (n2_loop == n_loop && n3_loop != n_loop) { + if (n->in(2)->Opcode() == Op_AddP && !n->in(3)->is_Con()) { + Node* n22_ctrl = get_ctrl(n->in(2)->in(2)); + Node* n23_ctrl = get_ctrl(n->in(2)->in(3)); + IdealLoopTree* n22loop = get_loop(n22_ctrl); + IdealLoopTree* n23_loop = get_loop(n23_ctrl); + if (n22loop != n_loop && n22loop->is_member(n_loop) && + n23_loop == n_loop) { + Node* add1 = new AddPNode(n->in(1), n->in(2)->in(2), n->in(3)); // Stuff new AddP in the loop preheader - register_new_node( add1, n_loop->_head->in(LoopNode::EntryControl) ); - Node *add2 = new AddPNode( n->in(1), add1, n->in(2)->in(3) ); - register_new_node( add2, n_ctrl ); - _igvn.replace_node( n, add2 ); + register_new_node(add1, n_loop->_head->in(LoopNode::EntryControl)); + Node* add2 = new AddPNode(n->in(1), add1, n->in(2)->in(3)); + register_new_node(add2, n_ctrl); + _igvn.replace_node(n, add2); return add2; } } @@ -494,17 +512,17 @@ Node *PhaseIdealLoop::remix_address_expressions( Node *n ) { // Replace (I1 +p (I2 + V)) with ((I1 +p I2) +p V) if (n2_loop != n_loop && n3_loop == n_loop) { if (n->in(3)->Opcode() == Op_AddX) { - Node *V = n->in(3)->in(1); - Node *I = n->in(3)->in(2); + Node* V = n->in(3)->in(1); + Node* I = n->in(3)->in(2); if (is_member(n_loop,get_ctrl(V))) { } else { Node *tmp = V; V = I; I = tmp; } if (!is_member(n_loop,get_ctrl(I))) { - Node *add1 = new AddPNode(n->in(1), n->in(2), I); + Node* add1 = new AddPNode(n->in(1), n->in(2), I); // Stuff new AddP in the loop preheader register_new_node(add1, n_loop->_head->in(LoopNode::EntryControl)); - Node *add2 = new AddPNode(n->in(1), add1, V); + Node* add2 = new AddPNode(n->in(1), add1, V); register_new_node(add2, n_ctrl); _igvn.replace_node(n, add2); return add2; @@ -1175,15 +1193,6 @@ bool PhaseIdealLoop::identical_backtoback_ifs(Node *n) { return false; } - IfNode* n_if = n->as_If(); - if (n_if->proj_out(0)->outcnt() > 1 || n_if->proj_out(1)->outcnt() > 1) { - // Removing the dominated If node by using the split-if optimization does not work if there are data dependencies. - // Some data dependencies depend on its immediate dominator If node and should not be separated from it (e.g. null - // checks, division by zero checks etc.). Bail out for now until data dependencies are correctly handled when - // optimizing back-to-back ifs. - return false; - } - Node* region = n->in(0); Node* dom = idom(region); if (!dom->is_If() || dom->in(1) != n->in(1)) { @@ -1359,28 +1368,7 @@ void PhaseIdealLoop::split_if_with_blocks_post(Node *n) { } // Two identical ifs back to back can be merged - if (identical_backtoback_ifs(n) && can_split_if(n->in(0))) { - Node *n_ctrl = n->in(0); - PhiNode* bolphi = PhiNode::make_blank(n_ctrl, n->in(1)); - IfNode* dom_if = idom(n_ctrl)->as_If(); - Node* proj_true = dom_if->proj_out(1); - Node* proj_false = dom_if->proj_out(0); - Node* con_true = _igvn.makecon(TypeInt::ONE); - Node* con_false = _igvn.makecon(TypeInt::ZERO); - - for (uint i = 1; i < n_ctrl->req(); i++) { - if (is_dominator(proj_true, n_ctrl->in(i))) { - bolphi->init_req(i, con_true); - } else { - assert(is_dominator(proj_false, n_ctrl->in(i)), "bad if"); - bolphi->init_req(i, con_false); - } - } - register_new_node(bolphi, n_ctrl); - _igvn.replace_input_of(n, 1, bolphi); - - // Now split the IF - do_split_if(n); + if (try_merge_identical_ifs(n)) { return; } @@ -1416,7 +1404,7 @@ void PhaseIdealLoop::split_if_with_blocks_post(Node *n) { // Replace the dominated test with an obvious true or false. // Place it on the IGVN worklist for later cleanup. C->set_major_progress(); - dominated_by(prevdom, n, false, true); + dominated_by(prevdom->as_IfProj(), n->as_If(), false, true); #ifndef PRODUCT if( VerifyLoopOptimizations ) verify(); #endif @@ -1441,6 +1429,118 @@ void PhaseIdealLoop::split_if_with_blocks_post(Node *n) { } } +// Tranform: +// +// if (some_condition) { +// // body 1 +// } else { +// // body 2 +// } +// if (some_condition) { +// // body 3 +// } else { +// // body 4 +// } +// +// into: +// +// +// if (some_condition) { +// // body 1 +// // body 3 +// } else { +// // body 2 +// // body 4 +// } +bool PhaseIdealLoop::try_merge_identical_ifs(Node* n) { + if (identical_backtoback_ifs(n) && can_split_if(n->in(0))) { + Node *n_ctrl = n->in(0); + IfNode* dom_if = idom(n_ctrl)->as_If(); + ProjNode* dom_proj_true = dom_if->proj_out(1); + ProjNode* dom_proj_false = dom_if->proj_out(0); + + // Now split the IF + RegionNode* new_false_region; + RegionNode* new_true_region; + do_split_if(n, &new_false_region, &new_true_region); + assert(new_false_region->req() == new_true_region->req(), ""); +#ifdef ASSERT + for (uint i = 1; i < new_false_region->req(); ++i) { + assert(new_false_region->in(i)->in(0) == new_true_region->in(i)->in(0), "unexpected shape following split if"); + assert(i == new_false_region->req() - 1 || new_false_region->in(i)->in(0)->in(1) == new_false_region->in(i + 1)->in(0)->in(1), "unexpected shape following split if"); + } +#endif + assert(new_false_region->in(1)->in(0)->in(1) == dom_if->in(1), "dominating if and dominated if after split must share test"); + + // We now have: + // if (some_condition) { + // // body 1 + // if (some_condition) { + // body3: // new_true_region + // // body3 + // } else { + // goto body4; + // } + // } else { + // // body 2 + // if (some_condition) { + // goto body3; + // } else { + // body4: // new_false_region + // // body4; + // } + // } + // + + // clone pinned nodes thru the resulting regions + push_pinned_nodes_thru_region(dom_if, new_true_region); + push_pinned_nodes_thru_region(dom_if, new_false_region); + + // Optimize out the cloned ifs. Because pinned nodes were cloned, this also allows a CastPP that would be dependent + // on a projection of n to have the dom_if as a control dependency. We don't want the CastPP to end up with an + // unrelated control dependency. + for (uint i = 1; i < new_false_region->req(); i++) { + if (is_dominator(dom_proj_true, new_false_region->in(i))) { + dominated_by(dom_proj_true->as_IfProj(), new_false_region->in(i)->in(0)->as_If(), false, false); + } else { + assert(is_dominator(dom_proj_false, new_false_region->in(i)), "bad if"); + dominated_by(dom_proj_false->as_IfProj(), new_false_region->in(i)->in(0)->as_If(), false, false); + } + } + return true; + } + return false; +} + +void PhaseIdealLoop::push_pinned_nodes_thru_region(IfNode* dom_if, Node* region) { + for (DUIterator i = region->outs(); region->has_out(i); i++) { + Node* u = region->out(i); + if (!has_ctrl(u) || u->is_Phi() || !u->depends_only_on_test() || !_igvn.no_dependent_zero_check(u)) { + continue; + } + assert(u->in(0) == region, "not a control dependent node?"); + uint j = 1; + for (; j < u->req(); ++j) { + Node* in = u->in(j); + if (!is_dominator(ctrl_or_self(in), dom_if)) { + break; + } + } + if (j == u->req()) { + Node *phi = PhiNode::make_blank(region, u); + for (uint k = 1; k < region->req(); ++k) { + Node* clone = u->clone(); + clone->set_req(0, region->in(k)); + register_new_node(clone, region->in(k)); + phi->init_req(k, clone); + } + register_new_node(phi, region); + _igvn.replace_node(u, phi); + --i; + } + } +} + bool PhaseIdealLoop::safe_for_if_replacement(const Node* dom) const { if (!dom->is_CountedLoopEnd()) { return true; diff --git a/src/hotspot/share/opto/matcher.cpp b/src/hotspot/share/opto/matcher.cpp index 21198087fd9b1654157788660c3cb794e0e6171c..35ccf26e7cb82ea01eaf2888d1a2de820eb42f14 100644 --- a/src/hotspot/share/opto/matcher.cpp +++ b/src/hotspot/share/opto/matcher.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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 @@ -322,7 +322,7 @@ void Matcher::match( ) { find_shared( C->root() ); find_shared( C->top() ); - C->print_method(PHASE_BEFORE_MATCHING); + C->print_method(PHASE_BEFORE_MATCHING, 1); // Create new ideal node ConP #NULL even if it does exist in old space // to avoid false sharing if the corresponding mach node is not used. @@ -2320,6 +2320,14 @@ void Matcher::find_shared_post_visit(Node* n, uint opcode) { n->set_req(2, new BinaryNode(n->in(3), n->in(4))); n->del_req(4); n->del_req(3); + } else if (n->req() == 6) { + Node* b3 = new BinaryNode(n->in(4), n->in(5)); + Node* b2 = new BinaryNode(n->in(3), b3); + Node* b1 = new BinaryNode(n->in(2), b2); + n->set_req(2, b1); + n->del_req(5); + n->del_req(4); + n->del_req(3); } return; } diff --git a/src/hotspot/share/opto/movenode.cpp b/src/hotspot/share/opto/movenode.cpp index d7b445ea7687f11bacec40bf456cc6d1551ebd7a..4e22a35aaec525d3ef840ce8cd7ea8b4f59a26e8 100644 --- a/src/hotspot/share/opto/movenode.cpp +++ b/src/hotspot/share/opto/movenode.cpp @@ -75,21 +75,25 @@ // Return a node which is more "ideal" than the current node. // Move constants to the right. Node *CMoveNode::Ideal(PhaseGVN *phase, bool can_reshape) { - if( in(0) && remove_dead_region(phase, can_reshape) ) return this; + if (in(0) != NULL && remove_dead_region(phase, can_reshape)) { + return this; + } // Don't bother trying to transform a dead node - if( in(0) && in(0)->is_top() ) return NULL; + if (in(0) != NULL && in(0)->is_top()) { + return NULL; + } assert(in(Condition) != this && - in(IfFalse) != this && - in(IfTrue) != this, "dead loop in CMoveNode::Ideal" ); - if( phase->type(in(Condition)) == Type::TOP ) - return NULL; // return NULL when Condition is dead - - if( in(IfFalse)->is_Con() && !in(IfTrue)->is_Con() ) { - if( in(Condition)->is_Bool() ) { - BoolNode* b = in(Condition)->as_Bool(); - BoolNode* b2 = b->negate(phase); - return make(in(Control), phase->transform(b2), in(IfTrue), in(IfFalse), _type); - } + in(IfFalse) != this && + in(IfTrue) != this, "dead loop in CMoveNode::Ideal"); + if (phase->type(in(Condition)) == Type::TOP || + phase->type(in(IfFalse)) == Type::TOP || + phase->type(in(IfTrue)) == Type::TOP) { + return NULL; + } + // Canonicalize the node by moving constants to the right input. + if (in(Condition)->is_Bool() && phase->type(in(IfFalse))->singleton() && !phase->type(in(IfTrue))->singleton()) { + BoolNode* b = in(Condition)->as_Bool()->negate(phase); + return make(in(Control), phase->transform(b), in(IfTrue), in(IfFalse), _type); } return NULL; } @@ -191,14 +195,10 @@ Node *CMoveINode::Ideal(PhaseGVN *phase, bool can_reshape) { // If zero is on the left (false-case, no-move-case) it must mean another // constant is on the right (otherwise the shared CMove::Ideal code would - // have moved the constant to the right). This situation is bad for Intel - // and a don't-care for Sparc. It's bad for Intel because the zero has to - // be manifested in a register with a XOR which kills flags, which are live - // on input to the CMoveI, leading to a situation which causes excessive - // spilling on Intel. For Sparc, if the zero in on the left the Sparc will - // zero a register via G0 and conditionally-move the other constant. If the - // zero is on the right, the Sparc will load the first constant with a - // 13-bit set-lo and conditionally move G0. See bug 4677505. + // have moved the constant to the right). This situation is bad for x86 because + // the zero has to be manifested in a register with a XOR which kills flags, + // which are live on input to the CMoveI, leading to a situation which causes + // excessive spilling. See bug 4677505. if( phase->type(in(IfFalse)) == TypeInt::ZERO && !(phase->type(in(IfTrue)) == TypeInt::ZERO) ) { if( in(Condition)->is_Bool() ) { BoolNode* b = in(Condition)->as_Bool(); diff --git a/src/hotspot/share/opto/mulnode.cpp b/src/hotspot/share/opto/mulnode.cpp index f6ce40d6f819f5fae5db825cdfb4061606c3ed32..11df86d19ffd39328dbf4310a106aa819c7785a6 100644 --- a/src/hotspot/share/opto/mulnode.cpp +++ b/src/hotspot/share/opto/mulnode.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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 @@ -738,6 +738,18 @@ Node *AndLNode::Ideal(PhaseGVN *phase, bool can_reshape) { return MulNode::Ideal(phase, can_reshape); } +LShiftNode* LShiftNode::make(Node* in1, Node* in2, BasicType bt) { + switch (bt) { + case T_INT: + return new LShiftINode(in1, in2); + case T_LONG: + return new LShiftLNode(in1, in2); + default: + fatal("Not implemented for %s", type2name(bt)); + } + return NULL; +} + //============================================================================= static bool const_shift_count(PhaseGVN* phase, Node* shiftNode, int* count) { @@ -789,16 +801,24 @@ Node *LShiftINode::Ideal(PhaseGVN *phase, bool can_reshape) { return NULL; } - // Left input is an add of a constant? + // Left input is an add? Node *add1 = in(1); int add1_op = add1->Opcode(); if( add1_op == Op_AddI ) { // Left input is an add? assert( add1 != add1->in(1), "dead loop in LShiftINode::Ideal" ); - const TypeInt *t12 = phase->type(add1->in(2))->isa_int(); - if( t12 && t12->is_con() ){ // Left input is an add of a con? - // Transform is legal, but check for profit. Avoid breaking 'i2s' - // and 'i2b' patterns which typically fold into 'StoreC/StoreB'. - if( con < 16 ) { + + // Transform is legal, but check for profit. Avoid breaking 'i2s' + // and 'i2b' patterns which typically fold into 'StoreC/StoreB'. + if( con < 16 ) { + // Left input is an add of the same number? + if (add1->in(1) == add1->in(2)) { + // Convert "(x + x) << c0" into "x << (c0 + 1)" + return new LShiftINode(add1->in(1), phase->intcon(con + 1)); + } + + // Left input is an add of a constant? + const TypeInt *t12 = phase->type(add1->in(2))->isa_int(); + if( t12 && t12->is_con() ){ // Left input is an add of a con? // Compute X << con0 Node *lsh = phase->transform( new LShiftINode( add1->in(1), in(2) ) ); // Compute X<Opcode(); if( add1_op == Op_AddL ) { // Left input is an add? // Avoid dead data cycles from dead loops assert( add1 != add1->in(1), "dead loop in LShiftLNode::Ideal" ); + + // Left input is an add of the same number? + if (add1->in(1) == add1->in(2)) { + // Convert "(x + x) << c0" into "x << (c0 + 1)" + return new LShiftLNode(add1->in(1), phase->intcon(con + 1)); + } + + // Left input is an add of a constant? const TypeLong *t12 = phase->type(add1->in(2))->isa_long(); if( t12 && t12->is_con() ){ // Left input is an add of a con? // Compute X << con0 diff --git a/src/hotspot/share/opto/mulnode.hpp b/src/hotspot/share/opto/mulnode.hpp index 29ce57db2eb21a5c74dd774969a37e120a37942c..a28f700da7a1ea5d2b9d5786f54c501337a55445 100644 --- a/src/hotspot/share/opto/mulnode.hpp +++ b/src/hotspot/share/opto/mulnode.hpp @@ -228,6 +228,8 @@ public: LShiftNode(Node *in1, Node *in2) : Node(NULL,in1,in2) { init_class_id(Class_LShift); } + + static LShiftNode* make(Node* in1, Node* in2, BasicType bt); }; //------------------------------LShiftINode------------------------------------ diff --git a/src/hotspot/share/opto/output.cpp b/src/hotspot/share/opto/output.cpp index 98f9fdec423e4a665c54b971c087e50297f78c5b..78d1c23a2ceed495f5213b31b97ddb9324aba5fa 100644 --- a/src/hotspot/share/opto/output.cpp +++ b/src/hotspot/share/opto/output.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2022, 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 @@ -96,10 +96,6 @@ private: // Free list for pinch nodes. Node_List _pinch_free_list; - // Latency from the beginning of the containing basic block (base 1) - // for each node. - unsigned short *_node_latency; - // Number of uses of this node within the containing basic block. short *_uses; @@ -162,10 +158,6 @@ public: // Do the scheduling void DoScheduling(); - // Compute the local latencies walking forward over the list of - // nodes for a basic block - void ComputeLocalLatenciesForward(const Block *bb); - // Compute the register antidependencies within a basic block void ComputeRegisterAntidependencies(Block *bb); void verify_do_def( Node *n, OptoReg::Name def, const char *msg ); @@ -2027,7 +2019,6 @@ Scheduling::Scheduling(Arena *arena, Compile &compile) _node_bundling_base = NEW_ARENA_ARRAY(compile.comp_arena(), Bundle, node_max); // Allocate space for fixed-size arrays - _node_latency = NEW_ARENA_ARRAY(arena, unsigned short, node_max); _uses = NEW_ARENA_ARRAY(arena, short, node_max); _current_latency = NEW_ARENA_ARRAY(arena, unsigned short, node_max); @@ -2035,7 +2026,6 @@ Scheduling::Scheduling(Arena *arena, Compile &compile) for (uint i = 0; i < node_max; i++) { ::new (&_node_bundling_base[i]) Bundle(); } - memset(_node_latency, 0, node_max * sizeof(unsigned short)); memset(_uses, 0, node_max * sizeof(short)); memset(_current_latency, 0, node_max * sizeof(unsigned short)); @@ -2141,54 +2131,6 @@ void PhaseOutput::ScheduleAndBundle() { #endif } -// Compute the latency of all the instructions. This is fairly simple, -// because we already have a legal ordering. Walk over the instructions -// from first to last, and compute the latency of the instruction based -// on the latency of the preceding instruction(s). -void Scheduling::ComputeLocalLatenciesForward(const Block *bb) { -#ifndef PRODUCT - if (_cfg->C->trace_opto_output()) - tty->print("# -> ComputeLocalLatenciesForward\n"); -#endif - - // Walk over all the schedulable instructions - for( uint j=_bb_start; j < _bb_end; j++ ) { - - // This is a kludge, forcing all latency calculations to start at 1. - // Used to allow latency 0 to force an instruction to the beginning - // of the bb - uint latency = 1; - Node *use = bb->get_node(j); - uint nlen = use->len(); - - // Walk over all the inputs - for ( uint k=0; k < nlen; k++ ) { - Node *def = use->in(k); - if (!def) - continue; - - uint l = _node_latency[def->_idx] + use->latency(k); - if (latency < l) - latency = l; - } - - _node_latency[use->_idx] = latency; - -#ifndef PRODUCT - if (_cfg->C->trace_opto_output()) { - tty->print("# latency %4d: ", latency); - use->dump(); - } -#endif - } - -#ifndef PRODUCT - if (_cfg->C->trace_opto_output()) - tty->print("# <- ComputeLocalLatenciesForward\n"); -#endif - -} // end ComputeLocalLatenciesForward - // See if this node fits into the present instruction bundle bool Scheduling::NodeFitsInBundle(Node *n) { uint n_idx = n->_idx; @@ -2764,9 +2706,6 @@ void Scheduling::DoScheduling() { ComputeRegisterAntidependencies(bb); if (C->failing()) return; // too many D-U pinch points - // Compute intra-bb latencies for the nodes - ComputeLocalLatenciesForward(bb); - // Compute the usage within the block, and set the list of all nodes // in the block that have no uses within the block. ComputeUseCount(bb); diff --git a/src/hotspot/share/opto/parse2.cpp b/src/hotspot/share/opto/parse2.cpp index ee9c67fa944c7d2f79217fa2033f61c4767748cc..7ad0884147620b2dbca7e446d227fd365d9d0b52 100644 --- a/src/hotspot/share/opto/parse2.cpp +++ b/src/hotspot/share/opto/parse2.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2022, 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 @@ -2004,19 +2004,19 @@ void Parse::do_one_bytecode() { // double stores case Bytecodes::_dstore_0: - set_pair_local( 0, dstore_rounding(pop_pair()) ); + set_pair_local( 0, dprecision_rounding(pop_pair()) ); break; case Bytecodes::_dstore_1: - set_pair_local( 1, dstore_rounding(pop_pair()) ); + set_pair_local( 1, dprecision_rounding(pop_pair()) ); break; case Bytecodes::_dstore_2: - set_pair_local( 2, dstore_rounding(pop_pair()) ); + set_pair_local( 2, dprecision_rounding(pop_pair()) ); break; case Bytecodes::_dstore_3: - set_pair_local( 3, dstore_rounding(pop_pair()) ); + set_pair_local( 3, dprecision_rounding(pop_pair()) ); break; case Bytecodes::_dstore: - set_pair_local( iter().get_index(), dstore_rounding(pop_pair()) ); + set_pair_local( iter().get_index(), dprecision_rounding(pop_pair()) ); break; case Bytecodes::_pop: dec_sp(1); break; @@ -2295,8 +2295,7 @@ void Parse::do_one_bytecode() { // out to memory to round, the machine instruction that implements // ConvL2D is responsible for rounding. // c = precision_rounding(b); - c = _gvn.transform(b); - push(c); + push(b); } else { l2f(); } @@ -2307,8 +2306,7 @@ void Parse::do_one_bytecode() { b = _gvn.transform( new ConvL2DNode(a)); // For x86_32.ad, rounding is always necessary (see _l2f above). // c = dprecision_rounding(b); - c = _gvn.transform(b); - push_pair(c); + push_pair(b); break; case Bytecodes::_f2l: @@ -2754,8 +2752,8 @@ void Parse::do_one_bytecode() { } #ifndef PRODUCT - if (C->should_print(1)) { - IdealGraphPrinter* printer = C->printer(); + if (C->should_print_igv(1)) { + IdealGraphPrinter* printer = C->igv_printer(); char buffer[256]; jio_snprintf(buffer, sizeof(buffer), "Bytecode %d: %s", bci(), Bytecodes::name(bc())); bool old = printer->traverse_outs(); diff --git a/src/hotspot/share/opto/split_if.cpp b/src/hotspot/share/opto/split_if.cpp index 6bf835926e5255c62c182aba5e915d997eb7e15e..060d346451422bbd9ff72c748f4be1d4bd1902e9 100644 --- a/src/hotspot/share/opto/split_if.cpp +++ b/src/hotspot/share/opto/split_if.cpp @@ -31,20 +31,19 @@ //------------------------------split_thru_region------------------------------ // Split Node 'n' through merge point. -Node *PhaseIdealLoop::split_thru_region( Node *n, Node *region ) { - uint wins = 0; - assert( n->is_CFG(), "" ); - assert( region->is_Region(), "" ); - Node *r = new RegionNode( region->req() ); - IdealLoopTree *loop = get_loop( n ); - for( uint i = 1; i < region->req(); i++ ) { - Node *x = n->clone(); - Node *in0 = n->in(0); - if( in0->in(0) == region ) x->set_req( 0, in0->in(i) ); - for( uint j = 1; j < n->req(); j++ ) { - Node *in = n->in(j); - if( get_ctrl(in) == region ) - x->set_req( j, in->in(i) ); +RegionNode* PhaseIdealLoop::split_thru_region(Node* n, RegionNode* region) { + assert(n->is_CFG(), ""); + RegionNode* r = new RegionNode(region->req()); + IdealLoopTree* loop = get_loop(n); + for (uint i = 1; i < region->req(); i++) { + Node* x = n->clone(); + Node* in0 = n->in(0); + if (in0->in(0) == region) x->set_req(0, in0->in(i)); + for (uint j = 1; j < n->req(); j++) { + Node* in = n->in(j); + if (get_ctrl(in) == region) { + x->set_req(j, in->in(i)); + } } _igvn.register_new_node_with_optimizer(x); set_loop(x, loop); @@ -56,8 +55,9 @@ Node *PhaseIdealLoop::split_thru_region( Node *n, Node *region ) { r->set_req(0,region); // Not a TRUE RegionNode _igvn.register_new_node_with_optimizer(r); set_loop(r, loop); - if( !loop->_child ) + if (!loop->_child) { loop->_body.push(r); + } return r; } @@ -433,7 +433,7 @@ void PhaseIdealLoop::handle_use( Node *use, Node *def, small_cache *cache, Node //------------------------------do_split_if------------------------------------ // Found an If getting its condition-code input from a Phi in the same block. // Split thru the Region. -void PhaseIdealLoop::do_split_if( Node *iff ) { +void PhaseIdealLoop::do_split_if(Node* iff, RegionNode** new_false_region, RegionNode** new_true_region) { if (PrintOpto && VerifyLoopOptimizations) { tty->print_cr("Split-if"); } @@ -442,7 +442,7 @@ void PhaseIdealLoop::do_split_if( Node *iff ) { } C->set_major_progress(); - Node *region = iff->in(0); + RegionNode *region = iff->in(0)->as_Region(); Node *region_dom = idom(region); // We are going to clone this test (and the control flow with it) up through @@ -491,17 +491,18 @@ void PhaseIdealLoop::do_split_if( Node *iff ) { // Now we have no instructions in the block containing the IF. // Split the IF. - Node *new_iff = split_thru_region( iff, region ); + RegionNode *new_iff = split_thru_region(iff, region); // Replace both uses of 'new_iff' with Regions merging True/False // paths. This makes 'new_iff' go dead. Node *old_false = NULL, *old_true = NULL; - Node *new_false = NULL, *new_true = NULL; + RegionNode* new_false = NULL; + RegionNode* new_true = NULL; for (DUIterator_Last j2min, j2 = iff->last_outs(j2min); j2 >= j2min; --j2) { Node *ifp = iff->last_out(j2); assert( ifp->Opcode() == Op_IfFalse || ifp->Opcode() == Op_IfTrue, "" ); ifp->set_req(0, new_iff); - Node *ifpx = split_thru_region( ifp, region ); + RegionNode* ifpx = split_thru_region(ifp, region); // Replace 'If' projection of a Region with a Region of // 'If' projections. @@ -577,6 +578,13 @@ void PhaseIdealLoop::do_split_if( Node *iff ) { _igvn.remove_dead_node(region); + if (new_false_region != NULL) { + *new_false_region = new_false; + } + if (new_true_region != NULL) { + *new_true_region = new_true; + } + #ifndef PRODUCT if( VerifyLoopOptimizations ) verify(); #endif diff --git a/src/hotspot/share/opto/subnode.cpp b/src/hotspot/share/opto/subnode.cpp index d7bcf7629d62883c84d0567055520eae5605d150..67b60f74c6098004f12e03ac1f7686122e2ec5f5 100644 --- a/src/hotspot/share/opto/subnode.cpp +++ b/src/hotspot/share/opto/subnode.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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 @@ -1847,6 +1847,64 @@ bool BoolNode::is_counted_loop_exit_test() { return false; } +//============================================================================= +//------------------------------Value------------------------------------------ +const Type* AbsNode::Value(PhaseGVN* phase) const { + const Type* t1 = phase->type(in(1)); + if (t1 == Type::TOP) return Type::TOP; + + switch (t1->base()) { + case Type::Int: { + const TypeInt* ti = t1->is_int(); + if (ti->is_con()) { + return TypeInt::make(uabs(ti->get_con())); + } + break; + } + case Type::Long: { + const TypeLong* tl = t1->is_long(); + if (tl->is_con()) { + return TypeLong::make(uabs(tl->get_con())); + } + break; + } + case Type::FloatCon: + return TypeF::make(abs(t1->getf())); + case Type::DoubleCon: + return TypeD::make(abs(t1->getd())); + default: + break; + } + + return bottom_type(); +} + +//------------------------------Identity---------------------------------------- +Node* AbsNode::Identity(PhaseGVN* phase) { + Node* in1 = in(1); + // No need to do abs for non-negative values + if (phase->type(in1)->higher_equal(TypeInt::POS) || + phase->type(in1)->higher_equal(TypeLong::POS)) { + return in1; + } + // Convert "abs(abs(x))" into "abs(x)" + if (in1->Opcode() == Opcode()) { + return in1; + } + return this; +} + +//------------------------------Ideal------------------------------------------ +Node* AbsNode::Ideal(PhaseGVN* phase, bool can_reshape) { + Node* in1 = in(1); + // Convert "abs(0-x)" into "abs(x)" + if (in1->is_Sub() && phase->type(in1->in(1))->is_zero_type()) { + set_req_X(1, in1->in(2), phase); + return this; + } + return NULL; +} + //============================================================================= //------------------------------Value------------------------------------------ // Compute sqrt diff --git a/src/hotspot/share/opto/subnode.hpp b/src/hotspot/share/opto/subnode.hpp index 398b219e646bc45721d5871a301f11d76e4e23a1..55b0e90a3875ec879d64b295d02edcfd7c490679 100644 --- a/src/hotspot/share/opto/subnode.hpp +++ b/src/hotspot/share/opto/subnode.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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 @@ -347,6 +347,9 @@ public: class AbsNode : public Node { public: AbsNode( Node *value ) : Node(0,value) {} + virtual Node* Identity(PhaseGVN* phase); + virtual Node* Ideal(PhaseGVN* phase, bool can_reshape); + virtual const Type* Value(PhaseGVN* phase) const; }; //------------------------------AbsINode--------------------------------------- diff --git a/src/hotspot/share/opto/superword.cpp b/src/hotspot/share/opto/superword.cpp index d488d0eba5f42fc4cef15c424fad1639164c2c10..1bf4c7a32828243548edf093076af625f9ac6179 100644 --- a/src/hotspot/share/opto/superword.cpp +++ b/src/hotspot/share/opto/superword.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2022, 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 @@ -2553,7 +2553,7 @@ void SuperWord::output() { opc == Op_AbsF || opc == Op_AbsD || opc == Op_AbsI || opc == Op_AbsL || opc == Op_NegF || opc == Op_NegD || - opc == Op_PopCountI) { + opc == Op_PopCountI || opc == Op_PopCountL) { assert(n->req() == 2, "only one input expected"); Node* in = vector_opd(p, 1); vn = VectorNode::make(opc, in, NULL, vlen, velt_basic_type(n)); @@ -2928,6 +2928,7 @@ bool SuperWord::is_vector_use(Node* use, int u_idx) { } return true; } + if (VectorNode::is_muladds2i(use)) { // MulAddS2I takes shorts and produces ints - hence the special checks // on alignment and size. @@ -2943,6 +2944,24 @@ bool SuperWord::is_vector_use(Node* use, int u_idx) { } return true; } + + if (VectorNode::is_vpopcnt_long(use)) { + // VPOPCNT_LONG takes long and produces int - hence the special checks + // on alignment and size. + if (u_pk->size() != d_pk->size()) { + return false; + } + for (uint i = 0; i < MIN2(d_pk->size(), u_pk->size()); i++) { + Node* ui = u_pk->at(i); + Node* di = d_pk->at(i); + if (alignment(ui) * 2 != alignment(di)) { + return false; + } + } + return true; + } + + if (u_pk->size() != d_pk->size()) return false; for (uint i = 0; i < u_pk->size(); i++) { diff --git a/src/hotspot/share/opto/type.hpp b/src/hotspot/share/opto/type.hpp index f525a75b14e66edfd22d6c523068b4a99e65478c..0007ed0c5e004b3b94e276ba4e735de31fb26427 100644 --- a/src/hotspot/share/opto/type.hpp +++ b/src/hotspot/share/opto/type.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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 @@ -593,7 +593,7 @@ public: // Check for single integer bool is_con() const { return _lo==_hi; } - bool is_con(int i) const { return is_con() && _lo == i; } + bool is_con(jint i) const { return is_con() && _lo == i; } jint get_con() const { assert(is_con(), "" ); return _lo; } virtual bool is_finite() const; // Has a finite value @@ -661,7 +661,7 @@ public: // Check for single integer bool is_con() const { return _lo==_hi; } - bool is_con(int i) const { return is_con() && _lo == i; } + bool is_con(jlong i) const { return is_con() && _lo == i; } jlong get_con() const { assert(is_con(), "" ); return _lo; } // Check for positive 32-bit value. diff --git a/src/hotspot/share/opto/vector.cpp b/src/hotspot/share/opto/vector.cpp index a1e324363db46da35b49bfb348d4e1c2c8ea387d..137990ddc7704e04b15ab5a41399f6afaa9fe9d4 100644 --- a/src/hotspot/share/opto/vector.cpp +++ b/src/hotspot/share/opto/vector.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2020, 2022, 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 @@ -96,7 +96,7 @@ void PhaseVector::scalarize_vbox_nodes() { VectorBoxNode* vbox = static_cast(n); scalarize_vbox_node(vbox); if (C->failing()) return; - C->print_method(PHASE_SCALARIZE_VBOX, vbox, 3); + C->print_method(PHASE_SCALARIZE_VBOX, 3, vbox); } if (C->failing()) return; macro_idx = MIN2(macro_idx - 1, C->macro_count() - 1); @@ -131,7 +131,7 @@ void PhaseVector::expand_vunbox_nodes() { VectorUnboxNode* vec_unbox = static_cast(n); expand_vunbox_node(vec_unbox); if (C->failing()) return; - C->print_method(PHASE_EXPAND_VUNBOX, vec_unbox, 3); + C->print_method(PHASE_EXPAND_VUNBOX, 3, vec_unbox); } if (C->failing()) return; macro_idx = MIN2(macro_idx - 1, C->macro_count() - 1); @@ -149,7 +149,7 @@ void PhaseVector::eliminate_vbox_alloc_nodes() { VectorBoxAllocateNode* vbox_alloc = static_cast(n); eliminate_vbox_alloc_node(vbox_alloc); if (C->failing()) return; - C->print_method(PHASE_ELIMINATE_VBOX_ALLOC, vbox_alloc, 3); + C->print_method(PHASE_ELIMINATE_VBOX_ALLOC, 3, vbox_alloc); } if (C->failing()) return; macro_idx = MIN2(macro_idx - 1, C->macro_count() - 1); @@ -297,7 +297,7 @@ void PhaseVector::expand_vbox_node(VectorBoxNode* vec_box) { Node* vect = vec_box->in(VectorBoxNode::Value); Node* result = expand_vbox_node_helper(vbox, vect, vec_box->box_type(), vec_box->vec_type()); C->gvn_replace_by(vec_box, result); - C->print_method(PHASE_EXPAND_VBOX, vec_box, 3); + C->print_method(PHASE_EXPAND_VBOX, 3, vec_box); } C->remove_macro_node(vec_box); } diff --git a/src/hotspot/share/opto/vectornode.cpp b/src/hotspot/share/opto/vectornode.cpp index d7ffa81c48b542d37a35b8d584a9bf9caa00989a..60415948b8a4bd62c7506e4254a2ce975877bf84 100644 --- a/src/hotspot/share/opto/vectornode.cpp +++ b/src/hotspot/share/opto/vectornode.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2022, 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 @@ -154,6 +154,8 @@ int VectorNode::opcode(int sopc, BasicType bt) { // Unimplemented for subword types since bit count changes // depending on size of lane (and sign bit). return (bt == T_INT ? Op_PopCountVI : 0); + case Op_PopCountL: + return Op_PopCountVL; case Op_LShiftI: switch (bt) { case T_BOOLEAN: @@ -297,6 +299,16 @@ bool VectorNode::is_muladds2i(Node* n) { return false; } +bool VectorNode::is_vpopcnt_long(Node* n) { + if (n->Opcode() == Op_PopCountL) { + return true; + } + return false; +} + + + + bool VectorNode::is_roundopD(Node* n) { if (n->Opcode() == Op_RoundDoubleMode) { return true; @@ -531,6 +543,7 @@ VectorNode* VectorNode::make(int vopc, Node* n1, Node* n2, const TypeVect* vt, b case Op_SqrtVD: return new SqrtVDNode(n1, vt); case Op_PopCountVI: return new PopCountVINode(n1, vt); + case Op_PopCountVL: return new PopCountVLNode(n1, vt); case Op_RotateLeftV: return new RotateLeftVNode(n1, n2, vt); case Op_RotateRightV: return new RotateRightVNode(n1, n2, vt); @@ -1201,13 +1214,14 @@ bool ReductionNode::implemented(int opc, uint vlen, BasicType bt) { } MacroLogicVNode* MacroLogicVNode::make(PhaseGVN& gvn, Node* in1, Node* in2, Node* in3, - uint truth_table, const TypeVect* vt) { + Node* mask, uint truth_table, const TypeVect* vt) { assert(truth_table <= 0xFF, "invalid"); assert(in1->bottom_type()->is_vect()->length_in_bytes() == vt->length_in_bytes(), "mismatch"); assert(in2->bottom_type()->is_vect()->length_in_bytes() == vt->length_in_bytes(), "mismatch"); assert(in3->bottom_type()->is_vect()->length_in_bytes() == vt->length_in_bytes(), "mismatch"); + assert(!mask || mask->bottom_type()->isa_vectmask(), "predicated register type expected"); Node* fn = gvn.intcon(truth_table); - return new MacroLogicVNode(in1, in2, in3, fn, vt); + return new MacroLogicVNode(in1, in2, in3, fn, mask, vt); } Node* VectorNode::degenerate_vector_rotate(Node* src, Node* cnt, bool is_rotate_left, diff --git a/src/hotspot/share/opto/vectornode.hpp b/src/hotspot/share/opto/vectornode.hpp index e52d4928a88119999fee7267f1f432064f2b5981..0bd131bc5a25aca7a16b0fdadb010d798600a563 100644 --- a/src/hotspot/share/opto/vectornode.hpp +++ b/src/hotspot/share/opto/vectornode.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2022, 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 @@ -93,6 +93,7 @@ class VectorNode : public TypeNode { static bool is_type_transition_short_to_int(Node* n); static bool is_type_transition_to_int(Node* n); static bool is_muladds2i(Node* n); + static bool is_vpopcnt_long(Node* n); static bool is_roundopD(Node* n); static bool is_scalar_rotate(Node* n); static bool is_vector_rotate_supported(int opc, uint vlen, BasicType bt); @@ -505,6 +506,14 @@ class PopCountVINode : public VectorNode { virtual int Opcode() const; }; +//------------------------------PopCountVLNode--------------------------------- +// Vector popcount long bits +class PopCountVLNode : public VectorNode { + public: + PopCountVLNode(Node* in, const TypeVect* vt) : VectorNode(in,vt) {} + virtual int Opcode() const; +}; + //------------------------------SqrtVFNode-------------------------------------- // Vector Sqrt float class SqrtVFNode : public VectorNode { @@ -532,7 +541,8 @@ class SqrtVDNode : public VectorNode { // Class ShiftV functionality. This covers the common behaviors for all kinds // of vector shifts. class ShiftVNode : public VectorNode { - bool _is_var_shift; + private: + bool _is_var_shift; public: ShiftVNode(Node* in1, Node* in2, const TypeVect* vt, bool is_var_shift) : VectorNode(in1,in2,vt), _is_var_shift(is_var_shift) { @@ -540,8 +550,12 @@ class ShiftVNode : public VectorNode { } virtual Node* Identity(PhaseGVN* phase); virtual int Opcode() const = 0; + virtual uint hash() const { return VectorNode::hash() + _is_var_shift; } + virtual bool cmp(const Node& n) const { + return VectorNode::cmp(n) && _is_var_shift == ((ShiftVNode&)n)._is_var_shift; + } bool is_var_shift() { return _is_var_shift;} - virtual uint size_of() const { return sizeof(ShiftVNode); } + virtual uint size_of() const { return sizeof(ShiftVNode); } }; //------------------------------LShiftVBNode----------------------------------- @@ -1275,13 +1289,19 @@ public: // Vector logical operations packing node. class MacroLogicVNode : public VectorNode { private: - MacroLogicVNode(Node* in1, Node* in2, Node* in3, Node* fn, const TypeVect* vt) - : VectorNode(in1, in2, in3, fn, vt) {} + MacroLogicVNode(Node* in1, Node* in2, Node* in3, Node* fn, Node* mask, const TypeVect* vt) + : VectorNode(in1, in2, in3, fn, vt) { + if (mask) { + this->add_req(mask); + this->add_flag(Node::Flag_is_predicated_vector); + } + } public: virtual int Opcode() const; - static MacroLogicVNode* make(PhaseGVN& igvn, Node* in1, Node* in2, Node* in3, uint truth_table, const TypeVect* vt); + static MacroLogicVNode* make(PhaseGVN& igvn, Node* in1, Node* in2, Node* in3, + Node* mask, uint truth_table, const TypeVect* vt); }; class VectorMaskCmpNode : public VectorNode { diff --git a/src/hotspot/share/prims/jniFastGetField.hpp b/src/hotspot/share/prims/jniFastGetField.hpp index 4673d2cb5c9a16b9bef3dfccd7fa8ece0c3797bf..525ff0aba8719c66a424229d034235280bf72186 100644 --- a/src/hotspot/share/prims/jniFastGetField.hpp +++ b/src/hotspot/share/prims/jniFastGetField.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2022, 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,7 +25,7 @@ #ifndef SHARE_PRIMS_JNIFASTGETFIELD_HPP #define SHARE_PRIMS_JNIFASTGETFIELD_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "prims/jvm_misc.hpp" // Basic logic of a fast version of jni_GetField: diff --git a/src/hotspot/share/prims/jvm.cpp b/src/hotspot/share/prims/jvm.cpp index a5c7e2ee58212f6c047e55325c5ada3003e2ce95..776e1d100113b0b394c0ea3dc52ef7c2a400fa1b 100644 --- a/src/hotspot/share/prims/jvm.cpp +++ b/src/hotspot/share/prims/jvm.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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 @@ -2836,7 +2836,7 @@ void jio_print(const char* s, size_t len) { jio_fprintf(defaultStream::output_stream(), "%.*s", (int)len, s); } else { // Make an unused local variable to avoid warning from gcc compiler. - size_t count = ::write(defaultStream::output_fd(), s, (int)len); + ssize_t count = os::write(defaultStream::output_fd(), s, (int)len); } } diff --git a/src/hotspot/share/prims/jvmtiEventController.hpp b/src/hotspot/share/prims/jvmtiEventController.hpp index 69156d2710841f8c59b7c68a02d9efce132b9d3c..06a3e8018766c6f4faa1d3d3fffef8b5861b3204 100644 --- a/src/hotspot/share/prims/jvmtiEventController.hpp +++ b/src/hotspot/share/prims/jvmtiEventController.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ #define SHARE_PRIMS_JVMTIEVENTCONTROLLER_HPP #include "jvmtifiles/jvmti.h" -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "utilities/globalDefinitions.hpp" // forward declaration diff --git a/src/hotspot/share/prims/jvmtiExtensions.hpp b/src/hotspot/share/prims/jvmtiExtensions.hpp index b1156b8be4936528a84b363d583f528b0ab7c0b3..d44c6dd4f5188bb6ec4abac3ea99b7660b242efb 100644 --- a/src/hotspot/share/prims/jvmtiExtensions.hpp +++ b/src/hotspot/share/prims/jvmtiExtensions.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2022, 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,7 +27,7 @@ #include "jvmtifiles/jvmti.h" #include "jvmtifiles/jvmtiEnv.hpp" -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" // JvmtiExtensions // diff --git a/src/hotspot/share/prims/jvmtiManageCapabilities.hpp b/src/hotspot/share/prims/jvmtiManageCapabilities.hpp index fc6ef884f07513e66ff4513a478d092f783e434c..e588be4fa157956462fc886e7cd25e148350e3eb 100644 --- a/src/hotspot/share/prims/jvmtiManageCapabilities.hpp +++ b/src/hotspot/share/prims/jvmtiManageCapabilities.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ #define SHARE_PRIMS_JVMTIMANAGECAPABILITIES_HPP #include "jvmtifiles/jvmti.h" -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" class JvmtiManageCapabilities : public AllStatic { diff --git a/src/hotspot/share/prims/nativeLookup.hpp b/src/hotspot/share/prims/nativeLookup.hpp index a00b16c2fa446b77230915415a122c2ccf2b9181..9aafed6f272dab3b0d331fc496d59ecd571c10e3 100644 --- a/src/hotspot/share/prims/nativeLookup.hpp +++ b/src/hotspot/share/prims/nativeLookup.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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,7 +25,7 @@ #ifndef SHARE_PRIMS_NATIVELOOKUP_HPP #define SHARE_PRIMS_NATIVELOOKUP_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "runtime/handles.hpp" // NativeLookup provides an interface for finding DLL entry points for diff --git a/src/hotspot/share/prims/resolvedMethodTable.hpp b/src/hotspot/share/prims/resolvedMethodTable.hpp index b89de0e419a320d1aeee16ff92457e12b929c12c..b437f012946511bf4f00dbe57ae580dc9872f152 100644 --- a/src/hotspot/share/prims/resolvedMethodTable.hpp +++ b/src/hotspot/share/prims/resolvedMethodTable.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2022, 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,7 +25,7 @@ #ifndef SHARE_PRIMS_RESOLVEDMETHODTABLE_HPP #define SHARE_PRIMS_RESOLVEDMETHODTABLE_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "oops/symbol.hpp" #include "oops/weakHandle.hpp" diff --git a/src/hotspot/share/prims/vectorSupport.cpp b/src/hotspot/share/prims/vectorSupport.cpp index 9b86962c21b034819399f85a66bcc3d36cb23f1d..59d8003db667b59df4b92ed3c89ac543b7cef1fd 100644 --- a/src/hotspot/share/prims/vectorSupport.cpp +++ b/src/hotspot/share/prims/vectorSupport.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2020, 2022, 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 @@ -172,17 +172,17 @@ Handle VectorSupport::allocate_vector_payload(InstanceKlass* ik, frame* fr, Regi return allocate_vector_payload_helper(ik, fr, reg_map, location, THREAD); // safepoint } #ifdef ASSERT - // Other payload values are: 'oop' type location and Scalar-replaced boxed vector representation. + // Other payload values are: 'oop' type location and scalar-replaced boxed vector representation. // They will be processed in Deoptimization::reassign_fields() after all objects are reallocated. else { Location::Type loc_type = location.type(); assert(loc_type == Location::oop || loc_type == Location::narrowoop, "expected 'oop'(%d) or 'narrowoop'(%d) types location but got: %d", Location::oop, Location::narrowoop, loc_type); } - } else if (!payload->is_object()) { + } else if (!payload->is_object() && !payload->is_constant_oop()) { stringStream ss; payload->print_on(&ss); - assert(payload->is_object(), "expected 'object' value for scalar-replaced boxed vector but got: %s", ss.as_string()); + assert(false, "expected 'object' value for scalar-replaced boxed vector but got: %s", ss.as_string()); #endif } return Handle(THREAD, nullptr); diff --git a/src/hotspot/share/prims/vectorSupport.hpp b/src/hotspot/share/prims/vectorSupport.hpp index 324400c198d04cf8f487fc66dbb580779968603a..ccae8bbcfc09e4d4aaec4a807631fb0768b1f92d 100644 --- a/src/hotspot/share/prims/vectorSupport.hpp +++ b/src/hotspot/share/prims/vectorSupport.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2021, 2022, 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,7 +27,7 @@ #include "jni.h" #include "code/debugInfo.hpp" -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "oops/typeArrayOop.hpp" #include "runtime/registerMap.hpp" #include "utilities/exceptions.hpp" diff --git a/src/hotspot/share/prims/whitebox.cpp b/src/hotspot/share/prims/whitebox.cpp index 3e569f8b8cdb68e39555584a7206817c888ded12..b990ea55640e6e1dfb979260711aa6781d978473 100644 --- a/src/hotspot/share/prims/whitebox.cpp +++ b/src/hotspot/share/prims/whitebox.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2022, 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 @@ -87,12 +87,15 @@ #include "runtime/threadSMR.hpp" #include "runtime/vframe.hpp" #include "runtime/vm_version.hpp" +#include "services/mallocSiteTable.hpp" #include "services/memoryService.hpp" +#include "services/memTracker.hpp" #include "utilities/align.hpp" #include "utilities/debug.hpp" #include "utilities/elfFile.hpp" #include "utilities/exceptions.hpp" #include "utilities/macros.hpp" +#include "utilities/nativeCallStack.hpp" #include "utilities/ostream.hpp" #if INCLUDE_G1GC #include "gc/g1/g1Arguments.hpp" @@ -105,11 +108,6 @@ #if INCLUDE_PARALLELGC #include "gc/parallel/parallelScavengeHeap.inline.hpp" #endif // INCLUDE_PARALLELGC -#if INCLUDE_NMT -#include "services/mallocSiteTable.hpp" -#include "services/memTracker.hpp" -#include "utilities/nativeCallStack.hpp" -#endif // INCLUDE_NMT #if INCLUDE_JVMCI #include "jvmci/jvmciEnv.hpp" #include "jvmci/jvmciRuntime.hpp" @@ -646,7 +644,6 @@ WB_END #endif // INCLUDE_G1GC -#if INCLUDE_NMT // Alloc memory using the test memory type so that we can use that to see if // NMT picks it up correctly WB_ENTRY(jlong, WB_NMTMalloc(JNIEnv* env, jobject o, jlong size)) @@ -724,7 +721,6 @@ WB_ENTRY(void, WB_NMTArenaMalloc(JNIEnv* env, jobject o, jlong arena, jlong size Arena* a = (Arena*)arena; a->Amalloc(size_t(size)); WB_END -#endif // INCLUDE_NMT static jmethodID reflected_method_to_jmid(JavaThread* thread, JNIEnv* env, jobject method) { assert(method != NULL, "method should not be null"); @@ -2545,7 +2541,6 @@ static JNINativeMethod methods[] = { {CC"psVirtualSpaceAlignment",CC"()J", (void*)&WB_PSVirtualSpaceAlignment}, {CC"psHeapGenerationAlignment",CC"()J", (void*)&WB_PSHeapGenerationAlignment}, #endif -#if INCLUDE_NMT {CC"NMTMalloc", CC"(J)J", (void*)&WB_NMTMalloc }, {CC"NMTMallocWithPseudoStack", CC"(JI)J", (void*)&WB_NMTMallocWithPseudoStack}, {CC"NMTMallocWithPseudoStackAndType", CC"(JII)J", (void*)&WB_NMTMallocWithPseudoStackAndType}, @@ -2559,7 +2554,6 @@ static JNINativeMethod methods[] = { {CC"NMTNewArena", CC"(J)J", (void*)&WB_NMTNewArena }, {CC"NMTFreeArena", CC"(J)V", (void*)&WB_NMTFreeArena }, {CC"NMTArenaMalloc", CC"(JJ)V", (void*)&WB_NMTArenaMalloc }, -#endif // INCLUDE_NMT {CC"deoptimizeFrames", CC"(Z)I", (void*)&WB_DeoptimizeFrames }, {CC"isFrameDeoptimized", CC"(I)Z", (void*)&WB_IsFrameDeoptimized}, {CC"deoptimizeAll", CC"()V", (void*)&WB_DeoptimizeAll }, diff --git a/src/hotspot/share/runtime/abstract_vm_version.cpp b/src/hotspot/share/runtime/abstract_vm_version.cpp index 5bb7cb80a28eed95466fed433a0d62b7c9968c35..bcde237bad7aa479d5de0166a1bb827ba3d1e270 100644 --- a/src/hotspot/share/runtime/abstract_vm_version.cpp +++ b/src/hotspot/share/runtime/abstract_vm_version.cpp @@ -318,7 +318,7 @@ void Abstract_VM_Version::insert_features_names(char* buf, size_t buflen, const bool Abstract_VM_Version::print_matching_lines_from_file(const char* filename, outputStream* st, const char* keywords_to_match[]) { char line[500]; - FILE* fp = fopen(filename, "r"); + FILE* fp = os::fopen(filename, "r"); if (fp == NULL) { return false; } diff --git a/src/hotspot/share/runtime/abstract_vm_version.hpp b/src/hotspot/share/runtime/abstract_vm_version.hpp index d2f210ca04d6044080437c7162dfeee1a16d5bed..a1dd51dad2c7bd7d61dce928c48ff15ac5b1a05c 100644 --- a/src/hotspot/share/runtime/abstract_vm_version.hpp +++ b/src/hotspot/share/runtime/abstract_vm_version.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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,7 +25,7 @@ #ifndef SHARE_RUNTIME_ABSTRACT_VM_VERSION_HPP #define SHARE_RUNTIME_ABSTRACT_VM_VERSION_HPP -#include "memory/allocation.hpp" // For declaration of class AllStatic +#include "memory/allStatic.hpp" // For declaration of class AllStatic #include "utilities/globalDefinitions.hpp" typedef enum { diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp index ea5b5d4dfd88efece44b899d1e3098cea38fcb4e..c0f78eaaccfa7ee0f7cdf6b6bd2b76c8bc981306 100644 --- a/src/hotspot/share/runtime/arguments.cpp +++ b/src/hotspot/share/runtime/arguments.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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 @@ -412,7 +412,7 @@ void Arguments::init_system_properties() { // It can only be set by either: // - -Xbootclasspath/a: // - AddToBootstrapClassLoaderSearch during JVMTI OnLoad phase - _jdk_boot_class_path_append = new SystemProperty("jdk.boot.class.path.append", "", false, true); + _jdk_boot_class_path_append = new SystemProperty("jdk.boot.class.path.append", NULL, false, true); // Add to System Property list. PropertyList_add(&_system_properties, _sun_boot_library_path); @@ -530,7 +530,6 @@ static SpecialFlag const special_jvm_flags[] = { { "InitialRAMFraction", JDK_Version::jdk(10), JDK_Version::undefined(), JDK_Version::undefined() }, { "AllowRedefinitionToAddDeleteMethods", JDK_Version::jdk(13), JDK_Version::undefined(), JDK_Version::undefined() }, { "FlightRecorder", JDK_Version::jdk(13), JDK_Version::undefined(), JDK_Version::undefined() }, - { "MinInliningThreshold", JDK_Version::jdk(18), JDK_Version::jdk(19), JDK_Version::jdk(20) }, { "DumpSharedSpaces", JDK_Version::jdk(18), JDK_Version::jdk(19), JDK_Version::undefined() }, { "DynamicDumpSharedSpaces", JDK_Version::jdk(18), JDK_Version::jdk(19), JDK_Version::undefined() }, { "RequireSharedSpaces", JDK_Version::jdk(18), JDK_Version::jdk(19), JDK_Version::undefined() }, @@ -547,6 +546,7 @@ static SpecialFlag const special_jvm_flags[] = { // -------------- Obsolete Flags - sorted by expired_in -------------- { "FilterSpuriousWakeups", JDK_Version::jdk(18), JDK_Version::jdk(19), JDK_Version::jdk(20) }, + { "MinInliningThreshold", JDK_Version::jdk(18), JDK_Version::jdk(19), JDK_Version::jdk(20) }, #ifdef ASSERT { "DummyObsoleteTestFlag", JDK_Version::undefined(), JDK_Version::jdk(18), JDK_Version::undefined() }, #endif @@ -1244,7 +1244,7 @@ bool Arguments::process_argument(const char* arg, } bool Arguments::process_settings_file(const char* file_name, bool should_exist, jboolean ignore_unrecognized) { - FILE* stream = fopen(file_name, "rb"); + FILE* stream = os::fopen(file_name, "rb"); if (stream == NULL) { if (should_exist) { jio_fprintf(defaultStream::error_stream(), @@ -2015,16 +2015,23 @@ bool Arguments::check_vm_args_consistency() { #if !defined(X86) && !defined(AARCH64) && !defined(PPC64) if (UseHeavyMonitors) { - warning("UseHeavyMonitors is not fully implemented on this architecture"); + jio_fprintf(defaultStream::error_stream(), + "UseHeavyMonitors is not fully implemented on this architecture"); + return false; } #endif #if (defined(X86) || defined(PPC64)) && !defined(ZERO) if (UseHeavyMonitors && UseRTMForStackLocks) { - fatal("-XX:+UseHeavyMonitors and -XX:+UseRTMForStackLocks are mutually exclusive"); + jio_fprintf(defaultStream::error_stream(), + "-XX:+UseHeavyMonitors and -XX:+UseRTMForStackLocks are mutually exclusive"); + + return false; } #endif if (VerifyHeavyMonitors && !UseHeavyMonitors) { - fatal("-XX:+VerifyHeavyMonitors requires -XX:+UseHeavyMonitors"); + jio_fprintf(defaultStream::error_stream(), + "-XX:+VerifyHeavyMonitors requires -XX:+UseHeavyMonitors"); + return false; } return status; @@ -3140,6 +3147,17 @@ jint Arguments::finalize_vm_init_args(bool patch_mod_javabase) { DynamicDumpSharedSpaces = true; } + if (AutoCreateSharedArchive) { + if (SharedArchiveFile == NULL) { + log_warning(cds)("-XX:+AutoCreateSharedArchive requires -XX:SharedArchiveFile"); + return JNI_ERR; + } + if (ArchiveClassesAtExit != NULL) { + log_warning(cds)("-XX:+AutoCreateSharedArchive does not work with ArchiveClassesAtExit"); + return JNI_ERR; + } + } + if (UseSharedSpaces && patch_mod_javabase) { no_shared_spaces("CDS is disabled when " JAVA_BASE_NAME " module is patched."); } @@ -3312,13 +3330,13 @@ jint Arguments::parse_vm_options_file(const char* file_name, ScopedVMInitArgs* v jio_fprintf(defaultStream::error_stream(), "Could not stat options file '%s'\n", file_name); - os::close(fd); + ::close(fd); return JNI_ERR; } if (stbuf.st_size == 0) { // tell caller there is no option data and that is ok - os::close(fd); + ::close(fd); return JNI_OK; } @@ -3329,15 +3347,15 @@ jint Arguments::parse_vm_options_file(const char* file_name, ScopedVMInitArgs* v if (NULL == buf) { jio_fprintf(defaultStream::error_stream(), "Could not allocate read buffer for options file parse\n"); - os::close(fd); + ::close(fd); return JNI_ENOMEM; } memset(buf, 0, bytes_alloc); // Fill buffer - ssize_t bytes_read = os::read(fd, (void *)buf, (unsigned)bytes_alloc); - os::close(fd); + ssize_t bytes_read = ::read(fd, (void *)buf, (unsigned)bytes_alloc); + ::close(fd); if (bytes_read < 0) { FREE_C_HEAP_ARRAY(char, buf); jio_fprintf(defaultStream::error_stream(), @@ -3487,9 +3505,6 @@ void Arguments::extract_shared_archive_paths(const char* archive_path, char* cur_path = NEW_C_HEAP_ARRAY(char, len + 1, mtInternal); strncpy(cur_path, begin_ptr, len); cur_path[len] = '\0'; - if (!FileMapInfo::check_archive((const char*)cur_path, true /*is_static*/)) { - return; - } *base_archive_path = cur_path; begin_ptr = ++end_ptr; @@ -3501,9 +3516,6 @@ void Arguments::extract_shared_archive_paths(const char* archive_path, len = end_ptr - begin_ptr; cur_path = NEW_C_HEAP_ARRAY(char, len + 1, mtInternal); strncpy(cur_path, begin_ptr, len + 1); - if (!FileMapInfo::check_archive((const char*)cur_path, false /*is_static*/)) { - return; - } *top_archive_path = cur_path; } @@ -3556,7 +3568,16 @@ void Arguments::init_shared_archive_paths() { bool success = FileMapInfo::get_base_archive_name_from_header(SharedArchiveFile, &base_archive_path); if (!success) { - no_shared_spaces("invalid archive"); + // If +AutoCreateSharedArchive and the specified shared archive does not exist, + // regenerate the dynamic archive base on default archive. + if (AutoCreateSharedArchive && !os::file_exists(SharedArchiveFile)) { + DynamicDumpSharedSpaces = true; + ArchiveClassesAtExit = const_cast(SharedArchiveFile); + SharedArchivePath = get_default_shared_archive_path(); + SharedArchiveFile = nullptr; + } else { + no_shared_spaces("invalid archive"); + } } else if (base_archive_path == NULL) { // User has specified a single archive, which is a static archive. SharedArchivePath = const_cast(SharedArchiveFile); @@ -3998,7 +4019,6 @@ jint Arguments::parse(const JavaVMInitArgs* initial_cmd_args) { no_shared_spaces("CDS Disabled"); #endif // INCLUDE_CDS -#if INCLUDE_NMT // Verify NMT arguments const NMT_TrackingLevel lvl = NMTUtil::parse_tracking_level(NativeMemoryTracking); if (lvl == NMT_unknown) { @@ -4010,13 +4030,6 @@ jint Arguments::parse(const JavaVMInitArgs* initial_cmd_args) { warning("PrintNMTStatistics is disabled, because native memory tracking is not enabled"); FLAG_SET_DEFAULT(PrintNMTStatistics, false); } -#else - if (!FLAG_IS_DEFAULT(NativeMemoryTracking) || PrintNMTStatistics) { - warning("Native Memory Tracking is not supported in this VM"); - FLAG_SET_DEFAULT(NativeMemoryTracking, "off"); - FLAG_SET_DEFAULT(PrintNMTStatistics, false); - } -#endif // INCLUDE_NMT if (TraceDependencies && VerifyDependencies) { if (!FLAG_IS_DEFAULT(TraceDependencies)) { diff --git a/src/hotspot/share/runtime/arguments.hpp b/src/hotspot/share/runtime/arguments.hpp index 40b9308c82b11ca2c6d0947ec1cdae0f8679497d..19bb12196e3fbb4cebb9be27773027f04f5d2d65 100644 --- a/src/hotspot/share/runtime/arguments.hpp +++ b/src/hotspot/share/runtime/arguments.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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,7 +27,7 @@ #include "logging/logLevel.hpp" #include "logging/logTag.hpp" -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "runtime/globals.hpp" #include "runtime/java.hpp" #include "runtime/os.hpp" @@ -109,7 +109,8 @@ class SystemProperty : public PathString { void set_next(SystemProperty* next) { _next = next; } bool is_readable() const { - return !_internal || strcmp(_key, "jdk.boot.class.path.append") == 0; + return !_internal || (strcmp(_key, "jdk.boot.class.path.append") == 0 && + value() != NULL); } // A system property should only have its value set diff --git a/src/hotspot/share/runtime/deoptimization.cpp b/src/hotspot/share/runtime/deoptimization.cpp index 7a89069a025188f114d9d8d2e885e323fc4c3365..206e5951304c20f30909123a24aefe823d6e55ed 100644 --- a/src/hotspot/share/runtime/deoptimization.cpp +++ b/src/hotspot/share/runtime/deoptimization.cpp @@ -165,9 +165,6 @@ JRT_BLOCK_ENTRY(Deoptimization::UnrollBlock*, Deoptimization::fetch_unroll_info( // handler. Note this fact before we start generating temporary frames // that can confuse an asynchronous stack walker. This counter is // decremented at the end of unpack_frames(). - if (TraceDeoptimization) { - tty->print_cr("Deoptimizing thread " INTPTR_FORMAT, p2i(current)); - } current->inc_in_deopt_handler(); if (exec_mode == Unpack_exception) { @@ -181,7 +178,6 @@ JRT_BLOCK_ENTRY(Deoptimization::UnrollBlock*, Deoptimization::fetch_unroll_info( JRT_END #if COMPILER2_OR_JVMCI -#ifndef PRODUCT // print information about reallocated objects static void print_objects(JavaThread* deoptee_thread, GrowableArray* objects, bool realloc_failures) { @@ -211,7 +207,6 @@ static void print_objects(JavaThread* deoptee_thread, } tty->print_raw(st.as_string()); } -#endif static bool rematerialize_objects(JavaThread* thread, int exec_mode, CompiledMethod* compiled_method, frame& deoptee, RegisterMap& map, GrowableArray* chunk, @@ -245,6 +240,7 @@ static bool rematerialize_objects(JavaThread* thread, int exec_mode, CompiledMet assert(Universe::heap()->is_in_or_null(result), "must be heap pointer"); if (TraceDeoptimization) { tty->print_cr("SAVED OOP RESULT " INTPTR_FORMAT " in thread " INTPTR_FORMAT, p2i(result), p2i(thread)); + tty->cr(); } } if (objects != NULL) { @@ -262,11 +258,9 @@ static bool rematerialize_objects(JavaThread* thread, int exec_mode, CompiledMet } bool skip_internal = (compiled_method != NULL) && !compiled_method->is_compiled_by_jvmci(); Deoptimization::reassign_fields(&deoptee, &map, objects, realloc_failures, skip_internal); -#ifndef PRODUCT if (TraceDeoptimization) { print_objects(deoptee_thread, objects, realloc_failures); } -#endif } if (save_oop_result) { // Restore result. @@ -283,7 +277,7 @@ static void restore_eliminated_locks(JavaThread* thread, GrowableArraylength(); i++) { compiledVFrame* cvf = chunk->at(i); assert (cvf->scope() != NULL,"expect only compiled java frames"); @@ -429,9 +423,12 @@ Deoptimization::UnrollBlock* Deoptimization::fetch_unroll_info_helper(JavaThread ScopeDesc* trap_scope = chunk->at(0)->scope(); Handle exceptionObject; if (trap_scope->rethrow_exception()) { +#ifndef PRODUCT if (PrintDeoptimizationDetails) { tty->print_cr("Exception to be rethrown in the interpreter for method %s::%s at bci %d", trap_scope->method()->method_holder()->name()->as_C_string(), trap_scope->method()->name()->as_C_string(), trap_scope->bci()); } +#endif // !PRODUCT + GrowableArray* expressions = trap_scope->expressions(); guarantee(expressions != NULL && expressions->length() > 0, "must have exception to throw"); ScopeValue* topOfStack = expressions->top(); @@ -727,16 +724,6 @@ JRT_LEAF(BasicType, Deoptimization::unpack_frames(JavaThread* thread, int exec_m // Since the frame to unpack is the top frame of this thread, the vframe_array_head // must point to the vframeArray for the unpack frame. vframeArray* array = thread->vframe_array_head(); - -#ifndef PRODUCT - if (TraceDeoptimization) { - tty->print_cr("DEOPT UNPACKING thread " INTPTR_FORMAT " vframeArray " INTPTR_FORMAT " mode %d", - p2i(thread), p2i(array), exec_mode); - } -#endif - Events::log_deopt_message(thread, "DEOPT UNPACKING pc=" INTPTR_FORMAT " sp=" INTPTR_FORMAT " mode %d", - p2i(stub_frame.pc()), p2i(stub_frame.sp()), exec_mode); - UnrollBlock* info = array->unroll_block(); // We set the last_Java frame. But the stack isn't really parsable here. So we @@ -886,7 +873,7 @@ JRT_LEAF(BasicType, Deoptimization::unpack_frames(JavaThread* thread, int exec_m is_top_frame = false; } } -#endif /* !PRODUCT */ +#endif // !PRODUCT return bt; JRT_END @@ -1413,9 +1400,12 @@ void Deoptimization::reassign_fields(frame* fr, RegisterMap* reg_map, GrowableAr Klass* k = java_lang_Class::as_Klass(sv->klass()->as_ConstantOopReadValue()->value()()); Handle obj = sv->value(); assert(obj.not_null() || realloc_failures, "reallocation was missed"); +#ifndef PRODUCT if (PrintDeoptimizationDetails) { tty->print_cr("reassign fields for object of type %s!", k->name()->as_C_string()); } +#endif // !PRODUCT + if (obj.is_null()) { continue; } @@ -1430,6 +1420,7 @@ void Deoptimization::reassign_fields(frame* fr, RegisterMap* reg_map, GrowableAr ScopeValue* payload = sv->field_at(0); if (payload->is_location() && payload->as_LocationValue()->location().type() == Location::vector) { +#ifndef PRODUCT if (PrintDeoptimizationDetails) { tty->print_cr("skip field reassignment for this vector - it should be assigned already"); if (Verbose) { @@ -1437,12 +1428,13 @@ void Deoptimization::reassign_fields(frame* fr, RegisterMap* reg_map, GrowableAr k->oop_print_on(obj(), tty); } } +#endif // !PRODUCT continue; // Such vector's value was already restored in VectorSupport::allocate_vector(). } // Else fall-through to do assignment for scalar-replaced boxed vector representation // which could be restored after vector object allocation. } -#endif +#endif /* !COMPILER2 */ if (k->is_instance_klass()) { InstanceKlass* ik = InstanceKlass::cast(k); reassign_fields_by_klass(ik, fr, reg_map, sv, 0, obj(), skip_internal); @@ -1500,36 +1492,6 @@ bool Deoptimization::relock_objects(JavaThread* thread, GrowableArray* chunk, bool realloc_failures) { Events::log_deopt_message(thread, "DEOPT PACKING pc=" INTPTR_FORMAT " sp=" INTPTR_FORMAT, p2i(fr.pc()), p2i(fr.sp())); -#ifndef PRODUCT - if (PrintDeoptimizationDetails) { - ResourceMark rm; - stringStream st; - st.print("DEOPT PACKING thread " INTPTR_FORMAT " ", p2i(thread)); - fr.print_on(&st); - st.print_cr(" Virtual frames (innermost first):"); - for (int index = 0; index < chunk->length(); index++) { - compiledVFrame* vf = chunk->at(index); - st.print(" %2d - ", index); - vf->print_value_on(&st); - int bci = chunk->at(index)->raw_bci(); - const char* code_name; - if (bci == SynchronizationEntryBCI) { - code_name = "sync entry"; - } else { - Bytecodes::Code code = vf->method()->code_at(bci); - code_name = Bytecodes::name(code); - } - st.print(" - %s", code_name); - st.print_cr(" @ bci %d ", bci); - if (Verbose) { - vf->print_on(&st); - st.cr(); - } - } - tty->print_raw(st.as_string()); - } -#endif - // Register map for next frame (used for stack crawl). We capture // the state of the deopt'ing frame's caller. Thus if we need to // stuff a C2I adapter we can properly fill in the callee-save @@ -1547,11 +1509,32 @@ vframeArray* Deoptimization::create_vframeArray(JavaThread* thread, frame fr, Re // Compare the vframeArray to the collected vframes assert(array->structural_compare(thread, chunk), "just checking"); -#ifndef PRODUCT - if (PrintDeoptimizationDetails) { - tty->print_cr(" Created vframeArray " INTPTR_FORMAT, p2i(array)); + if (TraceDeoptimization) { + ResourceMark rm; + stringStream st; + st.print_cr("DEOPT PACKING thread=" INTPTR_FORMAT " vframeArray=" INTPTR_FORMAT, p2i(thread), p2i(array)); + st.print(" "); + fr.print_on(&st); + st.print_cr(" Virtual frames (innermost/newest first):"); + for (int index = 0; index < chunk->length(); index++) { + compiledVFrame* vf = chunk->at(index); + int bci = vf->raw_bci(); + const char* code_name; + if (bci == SynchronizationEntryBCI) { + code_name = "sync entry"; + } else { + Bytecodes::Code code = vf->method()->code_at(bci); + code_name = Bytecodes::name(code); + } + + st.print(" VFrame %d (" INTPTR_FORMAT ")", index, p2i(vf)); + st.print(" - %s", vf->method()->name_and_sig_as_C_string()); + st.print(" - %s", code_name); + st.print_cr(" @ bci=%d ", bci); + } + tty->print_raw(st.as_string()); + tty->cr(); } -#endif // PRODUCT return array; } @@ -1818,6 +1801,7 @@ JRT_ENTRY(void, Deoptimization::uncommon_trap_inner(JavaThread* current, jint tr // handler. Note this fact before we start generating temporary frames // that can confuse an asynchronous stack walker. This counter is // decremented at the end of unpack_frames(). + current->inc_in_deopt_handler(); #if INCLUDE_JVMCI @@ -1855,12 +1839,10 @@ JRT_ENTRY(void, Deoptimization::uncommon_trap_inner(JavaThread* current, jint tr bool is_receiver_constraint_failure = COMPILER2_PRESENT(VerifyReceiverTypes &&) (reason == Deoptimization::Reason_receiver_constraint); - if (TraceDeoptimization || is_receiver_constraint_failure) { - tty->print_cr(" bci=%d pc=" INTPTR_FORMAT ", relative_pc=" INTPTR_FORMAT ", method=%s" JVMCI_ONLY(", debug_id=%d"), trap_scope->bci(), p2i(fr.pc()), fr.pc() - nm->code_begin(), trap_scope->method()->name_and_sig_as_C_string() -#if INCLUDE_JVMCI - , debug_id -#endif - ); + if (is_receiver_constraint_failure) { + tty->print_cr(" bci=%d pc=" INTPTR_FORMAT ", relative_pc=" INTPTR_FORMAT ", method=%s" JVMCI_ONLY(", debug_id=%d"), + trap_scope->bci(), p2i(fr.pc()), fr.pc() - nm->code_begin(), trap_scope->method()->name_and_sig_as_C_string() + JVMCI_ONLY(COMMA debug_id)); } methodHandle trap_method(current, trap_scope->method()); @@ -1966,18 +1948,20 @@ JRT_ENTRY(void, Deoptimization::uncommon_trap_inner(JavaThread* current, jint tr xtty->end_head(); } if (TraceDeoptimization) { // make noise on the tty - tty->print("Uncommon trap occurred in"); - nm->method()->print_short_name(tty); - tty->print(" compiler=%s compile_id=%d", nm->compiler_name(), nm->compile_id()); + stringStream st; + st.print("UNCOMMON TRAP method=%s", trap_scope->method()->name_and_sig_as_C_string()); + st.print(" bci=%d pc=" INTPTR_FORMAT ", relative_pc=" INTPTR_FORMAT JVMCI_ONLY(", debug_id=%d"), + trap_scope->bci(), p2i(fr.pc()), fr.pc() - nm->code_begin() JVMCI_ONLY(COMMA debug_id)); + st.print(" compiler=%s compile_id=%d", nm->compiler_name(), nm->compile_id()); #if INCLUDE_JVMCI if (nm->is_nmethod()) { const char* installed_code_name = nm->as_nmethod()->jvmci_name(); if (installed_code_name != NULL) { - tty->print(" (JVMCI: installed code name=%s) ", installed_code_name); + st.print(" (JVMCI: installed code name=%s) ", installed_code_name); } } #endif - tty->print(" (@" INTPTR_FORMAT ") thread=" UINTX_FORMAT " reason=%s action=%s unloaded_class_index=%d" JVMCI_ONLY(" debug_id=%d"), + st.print(" (@" INTPTR_FORMAT ") thread=" UINTX_FORMAT " reason=%s action=%s unloaded_class_index=%d" JVMCI_ONLY(" debug_id=%d"), p2i(fr.pc()), os::current_thread_id(), trap_reason_name(reason), @@ -1988,10 +1972,11 @@ JRT_ENTRY(void, Deoptimization::uncommon_trap_inner(JavaThread* current, jint tr #endif ); if (class_name != NULL) { - tty->print(unresolved ? " unresolved class: " : " symbol: "); - class_name->print_symbol_on(tty); + st.print(unresolved ? " unresolved class: " : " symbol: "); + class_name->print_symbol_on(&st); } - tty->cr(); + st.cr(); + tty->print_raw(st.as_string()); } if (xtty != NULL) { // Log the precise location of the trap. @@ -2370,9 +2355,6 @@ Deoptimization::UnrollBlock* Deoptimization::uncommon_trap(JavaThread* current, // Enable WXWrite: current function is called from methods compiled by C2 directly MACOS_AARCH64_ONLY(ThreadWXEnable wx(WXWrite, current)); - if (TraceDeoptimization) { - tty->print("Uncommon trap "); - } // Still in Java no safepoints { // This enters VM and may safepoint diff --git a/src/hotspot/share/runtime/frame.cpp b/src/hotspot/share/runtime/frame.cpp index 528fb904c3a9a057f7d03a92340a65a1478f9aa8..7a6456ef658a6e04d56f8257a598ad5e16c7cae6 100644 --- a/src/hotspot/share/runtime/frame.cpp +++ b/src/hotspot/share/runtime/frame.cpp @@ -442,16 +442,13 @@ void frame::print_value_on(outputStream* st, JavaThread *thread) const { if (sp() != NULL) st->print(", fp=" INTPTR_FORMAT ", real_fp=" INTPTR_FORMAT ", pc=" INTPTR_FORMAT, p2i(fp()), p2i(real_fp()), p2i(pc())); + st->print_cr(")"); if (StubRoutines::contains(pc())) { - st->print_cr(")"); - st->print("("); StubCodeDesc* desc = StubCodeDesc::desc_for(pc()); st->print("~Stub::%s", desc->name()); NOT_PRODUCT(begin = desc->begin(); end = desc->end();) } else if (Interpreter::contains(pc())) { - st->print_cr(")"); - st->print("("); InterpreterCodelet* desc = Interpreter::codelet_containing(pc()); if (desc != NULL) { st->print("~"); @@ -461,20 +458,18 @@ void frame::print_value_on(outputStream* st, JavaThread *thread) const { st->print("~interpreter"); } } - st->print_cr(")"); +#ifndef PRODUCT if (_cb != NULL) { st->print(" "); _cb->print_value_on(st); - st->cr(); -#ifndef PRODUCT if (end == NULL) { begin = _cb->code_begin(); end = _cb->code_end(); } -#endif } - NOT_PRODUCT(if (WizardMode && Verbose) Disassembler::decode(begin, end);) + if (WizardMode && Verbose) Disassembler::decode(begin, end); +#endif } diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp index e6ccef47a827928ebf584dfdc3466d134fb04b6e..bc80a2eb45fbc584dfae3d4135a62f71aa856efb 100644 --- a/src/hotspot/share/runtime/globals.hpp +++ b/src/hotspot/share/runtime/globals.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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 @@ -543,7 +543,7 @@ const intx ObjectAlignmentInBytes = 8; "compression. Otherwise the level must be between 1 and 9.") \ range(0, 9) \ \ - product(ccstr, NativeMemoryTracking, "off", \ + product(ccstr, NativeMemoryTracking, DEBUG_ONLY("summary") NOT_DEBUG("off"), \ "Native memory tracking options") \ \ product(bool, PrintNMTStatistics, false, DIAGNOSTIC, \ @@ -1191,10 +1191,6 @@ const intx ObjectAlignmentInBytes = 8; develop(bool, VerifyJNIFields, trueInDebug, \ "Verify jfieldIDs for instance fields") \ \ - notproduct(bool, VerifyJNIEnvThread, false, \ - "Verify JNIEnv.thread == Thread::current() when entering VM " \ - "from JNI") \ - \ develop(bool, VerifyFPU, false, \ "Verify FPU state (check for NaN's, etc.)") \ \ @@ -1346,11 +1342,6 @@ const intx ObjectAlignmentInBytes = 8; "(using CompileCommand or marked w/ @ForceInline)") \ range(0, max_jint) \ \ - product(intx, MinInliningThreshold, 0, \ - "(Deprecated) The minimum invocation count a method needs to" \ - "have to be inlined") \ - range(0, max_jint) \ - \ develop(intx, MethodHistogramCutoff, 100, \ "The cutoff value for method invocation histogram (+CountCalls)") \ \ @@ -1807,6 +1798,9 @@ const intx ObjectAlignmentInBytes = 8; product(bool, RecordDynamicDumpInfo, false, \ "Record class info for jcmd VM.cds dynamic_dump") \ \ + product(bool, AutoCreateSharedArchive, false, \ + "Create shared archive at exit if cds mapping failed") \ + \ product(bool, PrintSharedArchiveAndExit, false, \ "Print shared archive file contents") \ \ diff --git a/src/hotspot/share/runtime/handshake.cpp b/src/hotspot/share/runtime/handshake.cpp index 2605cee98fd17de8559e22022c63e06f7ef9f36e..05306bd6f3ab6ee5c6cc188cc8a2cfb813fb3eba 100644 --- a/src/hotspot/share/runtime/handshake.cpp +++ b/src/hotspot/share/runtime/handshake.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2022, 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 @@ -488,10 +488,11 @@ void HandshakeState::remove_op(HandshakeOperation* op) { bool HandshakeState::process_by_self(bool allow_suspend) { assert(Thread::current() == _handshakee, "should call from _handshakee"); assert(!_handshakee->is_terminated(), "should not be a terminated thread"); - assert(_handshakee->thread_state() != _thread_blocked, "should not be in a blocked state"); - assert(_handshakee->thread_state() != _thread_in_native, "should not be in native"); - ThreadInVMForHandshake tivm(_handshakee); + _handshakee->frame_anchor()->make_walkable(_handshakee); + // Threads shouldn't block if they are in the middle of printing, but... + ttyLocker::break_tty_lock_for_safepoint(os::current_thread_id()); + // Handshakes cannot safely safepoint. // The exception to this rule is the asynchronous suspension handshake. // It by-passes the NSV by manually doing the transition. diff --git a/src/hotspot/share/runtime/handshake.hpp b/src/hotspot/share/runtime/handshake.hpp index f66c731cc2dc1c3c78e05b7134aa70a0e1614a37..f6a8e28a0378a6e26e8e2a4b6a7f304283ac183b 100644 --- a/src/hotspot/share/runtime/handshake.hpp +++ b/src/hotspot/share/runtime/handshake.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2022, 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,7 +25,7 @@ #ifndef SHARE_RUNTIME_HANDSHAKE_HPP #define SHARE_RUNTIME_HANDSHAKE_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "memory/iterator.hpp" #include "runtime/flags/flagSetting.hpp" #include "runtime/mutex.hpp" diff --git a/src/hotspot/share/runtime/icache.hpp b/src/hotspot/share/runtime/icache.hpp index 522fc5ed1fed6cf196ca9c40b399c4b56f487f5a..d273372a877d6f1825848397fb5e045b2661170e 100644 --- a/src/hotspot/share/runtime/icache.hpp +++ b/src/hotspot/share/runtime/icache.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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,7 +25,7 @@ #ifndef SHARE_RUNTIME_ICACHE_HPP #define SHARE_RUNTIME_ICACHE_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "runtime/stubCodeGenerator.hpp" #include "utilities/macros.hpp" diff --git a/src/hotspot/share/runtime/interfaceSupport.inline.hpp b/src/hotspot/share/runtime/interfaceSupport.inline.hpp index efa794c481b0a89f689c5359f18e3a42384d6e9e..13ecf2d80cec7a86fa5f89c92a3a99208d4cabed 100644 --- a/src/hotspot/share/runtime/interfaceSupport.inline.hpp +++ b/src/hotspot/share/runtime/interfaceSupport.inline.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2021, Azul Systems, Inc. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -120,29 +120,6 @@ class ThreadStateTransition : public StackObj { } }; -class ThreadInVMForHandshake : public ThreadStateTransition { - const JavaThreadState _original_state; - public: - ThreadInVMForHandshake(JavaThread* thread) : ThreadStateTransition(thread), - _original_state(thread->thread_state()) { - - if (thread->has_last_Java_frame()) { - thread->frame_anchor()->make_walkable(thread); - } - - thread->set_thread_state(_thread_in_vm); - - // Threads shouldn't block if they are in the middle of printing, but... - ttyLocker::break_tty_lock_for_safepoint(os::current_thread_id()); - } - - ~ThreadInVMForHandshake() { - assert(_thread->thread_state() == _thread_in_vm, "should only call when leaving VM after handshake"); - _thread->set_thread_state(_original_state); - } - -}; - class ThreadInVMfromJava : public ThreadStateTransition { bool _check_asyncs; public: @@ -222,7 +199,7 @@ class ThreadBlockInVMPreprocess : public ThreadStateTransition { PRE_PROC& _pr; bool _allow_suspend; public: - ThreadBlockInVMPreprocess(JavaThread* thread, PRE_PROC& pr = emptyOp, bool allow_suspend = false) + ThreadBlockInVMPreprocess(JavaThread* thread, PRE_PROC& pr, bool allow_suspend = false) : ThreadStateTransition(thread), _pr(pr), _allow_suspend(allow_suspend) { transition_from_vm(thread, _thread_blocked); } @@ -236,12 +213,16 @@ class ThreadBlockInVMPreprocess : public ThreadStateTransition { SafepointMechanism::process_if_requested(_thread, _allow_suspend); } } +}; +class ThreadBlockInVM : public ThreadBlockInVMPreprocess<> { + public: + ThreadBlockInVM(JavaThread* thread, bool allow_suspend = false) + : ThreadBlockInVMPreprocess(thread, emptyOp, allow_suspend) {} + private: static void emptyOp(JavaThread* current) {} }; -typedef ThreadBlockInVMPreprocess<> ThreadBlockInVM; - // Debug class instantiated in JRT_ENTRY macro. // Can be used to verify properties on enter/exit of the VM. @@ -359,6 +340,11 @@ class VMNativeEntryWrapper { #define JRT_END } // Definitions for JNI +// +// As the JNIEnv can be passed from external native code we validate +// it in debug builds, primarily for our own testing. In general JNI +// does not attempt to detect programming errors and a bad JNIEnv may +// not even be readable. #define JNI_ENTRY(result_type, header) \ JNI_ENTRY_NO_PRESERVE(result_type, header) \ @@ -368,7 +354,7 @@ class VMNativeEntryWrapper { extern "C" { \ result_type JNICALL header { \ JavaThread* thread=JavaThread::thread_from_jni_environment(env); \ - assert( !VerifyJNIEnvThread || (thread == Thread::current()), "JNIEnv is only valid in same thread"); \ + assert(thread == Thread::current(), "JNIEnv is only valid in same thread"); \ MACOS_AARCH64_ONLY(ThreadWXEnable __wx(WXWrite, thread)); \ ThreadInVMfromNative __tiv(thread); \ debug_only(VMNativeEntryWrapper __vew;) \ @@ -379,7 +365,7 @@ extern "C" { \ extern "C" { \ result_type JNICALL header { \ JavaThread* thread=JavaThread::thread_from_jni_environment(env); \ - assert( !VerifyJNIEnvThread || (thread == Thread::current()), "JNIEnv is only valid in same thread"); \ + assert(thread == Thread::current(), "JNIEnv is only valid in same thread"); \ VM_LEAF_BASE(result_type, header) diff --git a/src/hotspot/share/runtime/jniHandles.cpp b/src/hotspot/share/runtime/jniHandles.cpp index 772f4012996d2223ecebf69a98e4d3ab95612031..1e8f597b9d5d0144b628e1bb27ff0ce182de0dcb 100644 --- a/src/hotspot/share/runtime/jniHandles.cpp +++ b/src/hotspot/share/runtime/jniHandles.cpp @@ -168,11 +168,6 @@ void JNIHandles::oops_do(OopClosure* f) { } -void JNIHandles::weak_oops_do(BoolObjectClosure* is_alive, OopClosure* f) { - weak_global_handles()->weak_oops_do(is_alive, f); -} - - void JNIHandles::weak_oops_do(OopClosure* f) { weak_global_handles()->weak_oops_do(f); } diff --git a/src/hotspot/share/runtime/jniHandles.hpp b/src/hotspot/share/runtime/jniHandles.hpp index c36b761008ad3cee1e8807a3b7629d021263f67f..f1d9ee43529d9937c1369850e705ca32c25249e7 100644 --- a/src/hotspot/share/runtime/jniHandles.hpp +++ b/src/hotspot/share/runtime/jniHandles.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2022, 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,7 +25,7 @@ #ifndef SHARE_RUNTIME_JNIHANDLES_HPP #define SHARE_RUNTIME_JNIHANDLES_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "runtime/handles.hpp" class JavaThread; @@ -117,8 +117,6 @@ class JNIHandles : AllStatic { // Garbage collection support(global handles only, local handles are traversed from thread) // Traversal of regular global handles static void oops_do(OopClosure* f); - // Traversal of weak global handles. Unreachable oops are cleared. - static void weak_oops_do(BoolObjectClosure* is_alive, OopClosure* f); // Traversal of weak global handles. static void weak_oops_do(OopClosure* f); diff --git a/src/hotspot/share/runtime/mutexLocker.cpp b/src/hotspot/share/runtime/mutexLocker.cpp index 257f853fb92ad45e92c3175e1429825763ec1f28..2d5c34cd21563c5536b95df6d61994b979128f81 100644 --- a/src/hotspot/share/runtime/mutexLocker.cpp +++ b/src/hotspot/share/runtime/mutexLocker.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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 @@ -137,9 +137,8 @@ Monitor* ThreadsSMRDelete_lock = NULL; Mutex* ThreadIdTableCreate_lock = NULL; Mutex* SharedDecoder_lock = NULL; Mutex* DCmdFactory_lock = NULL; -#if INCLUDE_NMT Mutex* NMTQuery_lock = NULL; -#endif + #if INCLUDE_CDS #if INCLUDE_JVMTI Mutex* CDSClassFileStream_lock = NULL; @@ -320,9 +319,7 @@ void mutex_init() { def(ThreadIdTableCreate_lock , PaddedMutex , safepoint); def(SharedDecoder_lock , PaddedMutex , tty-1); def(DCmdFactory_lock , PaddedMutex , nosafepoint); -#if INCLUDE_NMT def(NMTQuery_lock , PaddedMutex , safepoint); -#endif #if INCLUDE_CDS #if INCLUDE_JVMTI def(CDSClassFileStream_lock , PaddedMutex , safepoint); diff --git a/src/hotspot/share/runtime/mutexLocker.hpp b/src/hotspot/share/runtime/mutexLocker.hpp index a40b0592cc44d6c1d291c6da32e57a077a367379..cd415e945a578477db96be48243a413b6b4a9f9d 100644 --- a/src/hotspot/share/runtime/mutexLocker.hpp +++ b/src/hotspot/share/runtime/mutexLocker.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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 @@ -114,9 +114,7 @@ extern Monitor* ThreadsSMRDelete_lock; // Used by ThreadsSMRSupport to extern Mutex* ThreadIdTableCreate_lock; // Used by ThreadIdTable to lazily create the thread id table extern Mutex* SharedDecoder_lock; // serializes access to the decoder during normal (not error reporting) use extern Mutex* DCmdFactory_lock; // serialize access to DCmdFactory information -#if INCLUDE_NMT extern Mutex* NMTQuery_lock; // serialize NMT Dcmd queries -#endif #if INCLUDE_CDS #if INCLUDE_JVMTI extern Mutex* CDSClassFileStream_lock; // FileMapInfo::open_stream_for_jvmti diff --git a/src/hotspot/share/runtime/orderAccess.hpp b/src/hotspot/share/runtime/orderAccess.hpp index 8e5944916f94930ab4ed18156c290470e584f57e..159fbd9038db7f9f5803a4c69c0c5864f28cfebf 100644 --- a/src/hotspot/share/runtime/orderAccess.hpp +++ b/src/hotspot/share/runtime/orderAccess.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2022, 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,7 +25,7 @@ #ifndef SHARE_RUNTIME_ORDERACCESS_HPP #define SHARE_RUNTIME_ORDERACCESS_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "runtime/vm_version.hpp" #include "utilities/macros.hpp" diff --git a/src/hotspot/share/runtime/os.cpp b/src/hotspot/share/runtime/os.cpp index 8263480c11d9d31728aec7874942177c572c8e3a..29a3d7622f630c8d3da3af1ddc20367f5c2197e5 100644 --- a/src/hotspot/share/runtime/os.cpp +++ b/src/hotspot/share/runtime/os.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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 @@ -38,7 +38,6 @@ #include "logging/log.hpp" #include "logging/logStream.hpp" #include "memory/allocation.inline.hpp" -#include "memory/guardedMemory.hpp" #include "memory/resourceArea.hpp" #include "memory/universe.hpp" #include "oops/compressedOops.inline.hpp" @@ -83,13 +82,6 @@ int os::_processor_count = 0; int os::_initial_active_processor_count = 0; os::PageSizes os::_page_sizes; -#ifndef PRODUCT -julong os::num_mallocs = 0; // # of calls to malloc/realloc -julong os::alloc_bytes = 0; // # of bytes allocated -julong os::num_frees = 0; // # of calls to free -julong os::free_bytes = 0; // # of bytes freed -#endif - static size_t cur_malloc_words = 0; // current size for MallocMaxTestWords DEBUG_ONLY(bool os::_mutex_init_done = false;) @@ -603,30 +595,11 @@ char* os::strdup_check_oom(const char* str, MEMFLAGS flags) { return p; } - -#define paranoid 0 /* only set to 1 if you suspect checking code has bug */ - -#ifdef ASSERT - -static void verify_memory(void* ptr) { - GuardedMemory guarded(ptr); - if (!guarded.verify_guards()) { - LogTarget(Warning, malloc, free) lt; - ResourceMark rm; - LogStream ls(lt); - ls.print_cr("## nof_mallocs = " UINT64_FORMAT ", nof_frees = " UINT64_FORMAT, os::num_mallocs, os::num_frees); - ls.print_cr("## memory stomp:"); - guarded.print_on(&ls); - fatal("memory stomping error"); - } -} - -#endif - // // This function supports testing of the malloc out of memory // condition without really running the system out of memory. // + static bool has_reached_max_malloc_test_peak(size_t alloc_size) { if (MallocMaxTestWords > 0) { size_t words = (alloc_size / BytesPerWord); @@ -639,75 +612,60 @@ static bool has_reached_max_malloc_test_peak(size_t alloc_size) { return false; } +#ifdef ASSERT +static void check_crash_protection() { + assert(!os::ThreadCrashProtection::is_crash_protected(Thread::current_or_null()), + "not allowed when crash protection is set"); +} +static void break_if_ptr_caught(void* ptr) { + if (p2i(ptr) == (intptr_t)MallocCatchPtr) { + log_warning(malloc, free)("ptr caught: " PTR_FORMAT, p2i(ptr)); + breakpoint(); + } +} +#endif // ASSERT + void* os::malloc(size_t size, MEMFLAGS flags) { return os::malloc(size, flags, CALLER_PC); } void* os::malloc(size_t size, MEMFLAGS memflags, const NativeCallStack& stack) { - NOT_PRODUCT(inc_stat_counter(&num_mallocs, 1)); - NOT_PRODUCT(inc_stat_counter(&alloc_bytes, size)); - -#if INCLUDE_NMT - { - void* rc = NULL; - if (NMTPreInit::handle_malloc(&rc, size)) { - return rc; - } - } -#endif - - // Since os::malloc can be called when the libjvm.{dll,so} is - // first loaded and we don't have a thread yet we must accept NULL also here. - assert(!os::ThreadCrashProtection::is_crash_protected(Thread::current_or_null()), - "malloc() not allowed when crash protection is set"); - if (size == 0) { - // return a valid pointer if size is zero - // if NULL is returned the calling functions assume out of memory. - size = 1; + // Special handling for NMT preinit phase before arguments are parsed + void* rc = NULL; + if (NMTPreInit::handle_malloc(&rc, size)) { + return rc; } - // NMT support - NMT_TrackingLevel level = MemTracker::tracking_level(); - const size_t nmt_overhead = - MemTracker::malloc_header_size(level) + MemTracker::malloc_footer_size(level); + DEBUG_ONLY(check_crash_protection()); -#ifndef ASSERT - const size_t alloc_size = size + nmt_overhead; -#else - const size_t alloc_size = GuardedMemory::get_total_size(size + nmt_overhead); - if (size + nmt_overhead > alloc_size) { // Check for rollover. - return NULL; - } -#endif + // On malloc(0), implementators of malloc(3) have the choice to return either + // NULL or a unique non-NULL pointer. To unify libc behavior across our platforms + // we chose the latter. + size = MAX2((size_t)1, size); // For the test flag -XX:MallocMaxTestWords if (has_reached_max_malloc_test_peak(size)) { return NULL; } - u_char* ptr; - ptr = (u_char*)::malloc(alloc_size); + const NMT_TrackingLevel level = MemTracker::tracking_level(); + const size_t nmt_overhead = + MemTracker::malloc_header_size(level) + MemTracker::malloc_footer_size(level); -#ifdef ASSERT - if (ptr == NULL) { + const size_t outer_size = size + nmt_overhead; + + void* const outer_ptr = (u_char*)::malloc(outer_size); + if (outer_ptr == NULL) { return NULL; } - // Wrap memory with guard - GuardedMemory guarded(ptr, size + nmt_overhead); - ptr = guarded.get_user_ptr(); - if ((intptr_t)ptr == (intptr_t)MallocCatchPtr) { - log_warning(malloc, free)("os::malloc caught, " SIZE_FORMAT " bytes --> " PTR_FORMAT, size, p2i(ptr)); - breakpoint(); - } - if (paranoid) { - verify_memory(ptr); - } -#endif + void* inner_ptr = MemTracker::record_malloc((address)outer_ptr, size, memflags, stack, level); + + DEBUG_ONLY(::memset(inner_ptr, uninitBlockPad, size);) + DEBUG_ONLY(break_if_ptr_caught(inner_ptr);) - // we do not track guard memory - return MemTracker::record_malloc((address)ptr, size, memflags, stack, level); + return inner_ptr; } void* os::realloc(void *memblock, size_t size, MEMFLAGS flags) { @@ -716,95 +674,65 @@ void* os::realloc(void *memblock, size_t size, MEMFLAGS flags) { void* os::realloc(void *memblock, size_t size, MEMFLAGS memflags, const NativeCallStack& stack) { -#if INCLUDE_NMT - { - void* rc = NULL; - if (NMTPreInit::handle_realloc(&rc, memblock, size)) { - return rc; - } + // Special handling for NMT preinit phase before arguments are parsed + void* rc = NULL; + if (NMTPreInit::handle_realloc(&rc, memblock, size)) { + return rc; } -#endif + + if (memblock == NULL) { + return os::malloc(size, memflags, stack); + } + + DEBUG_ONLY(check_crash_protection()); + + // On realloc(p, 0), implementators of realloc(3) have the choice to return either + // NULL or a unique non-NULL pointer. To unify libc behavior across our platforms + // we chose the latter. + size = MAX2((size_t)1, size); // For the test flag -XX:MallocMaxTestWords if (has_reached_max_malloc_test_peak(size)) { return NULL; } - if (size == 0) { - // return a valid pointer if size is zero - // if NULL is returned the calling functions assume out of memory. - size = 1; - } - -#ifndef ASSERT - NOT_PRODUCT(inc_stat_counter(&num_mallocs, 1)); - NOT_PRODUCT(inc_stat_counter(&alloc_bytes, size)); - // NMT support - NMT_TrackingLevel level = MemTracker::tracking_level(); - void* membase = MemTracker::record_free(memblock, level); + const NMT_TrackingLevel level = MemTracker::tracking_level(); const size_t nmt_overhead = MemTracker::malloc_header_size(level) + MemTracker::malloc_footer_size(level); - void* ptr = ::realloc(membase, size + nmt_overhead); - return MemTracker::record_malloc(ptr, size, memflags, stack, level); -#else - if (memblock == NULL) { - return os::malloc(size, memflags, stack); - } - if ((intptr_t)memblock == (intptr_t)MallocCatchPtr) { - log_warning(malloc, free)("os::realloc caught " PTR_FORMAT, p2i(memblock)); - breakpoint(); - } - // NMT support - void* membase = MemTracker::malloc_base(memblock); - verify_memory(membase); - // always move the block - void* ptr = os::malloc(size, memflags, stack); - // Copy to new memory if malloc didn't fail - if (ptr != NULL ) { - GuardedMemory guarded(MemTracker::malloc_base(memblock)); - // Guard's user data contains NMT header - NMT_TrackingLevel level = MemTracker::tracking_level(); - const size_t nmt_overhead = - MemTracker::malloc_header_size(level) + MemTracker::malloc_footer_size(level); - size_t memblock_size = guarded.get_user_size() - nmt_overhead; - memcpy(ptr, memblock, MIN2(size, memblock_size)); - if (paranoid) { - verify_memory(MemTracker::malloc_base(ptr)); - } - os::free(memblock); - } - return ptr; -#endif + + const size_t new_outer_size = size + nmt_overhead; + + // If NMT is enabled, this checks for heap overwrites, then de-accounts the old block. + void* const old_outer_ptr = MemTracker::record_free(memblock, level); + + void* const new_outer_ptr = ::realloc(old_outer_ptr, new_outer_size); + + // If NMT is enabled, this checks for heap overwrites, then de-accounts the old block. + void* const new_inner_ptr = MemTracker::record_malloc(new_outer_ptr, size, memflags, stack, level); + + DEBUG_ONLY(break_if_ptr_caught(new_inner_ptr);) + + return new_inner_ptr; } -// handles NULL pointers void os::free(void *memblock) { -#if INCLUDE_NMT + // Special handling for NMT preinit phase before arguments are parsed if (NMTPreInit::handle_free(memblock)) { return; } -#endif - NOT_PRODUCT(inc_stat_counter(&num_frees, 1)); -#ifdef ASSERT - if (memblock == NULL) return; - if ((intptr_t)memblock == (intptr_t)MallocCatchPtr) { - log_warning(malloc, free)("os::free caught " PTR_FORMAT, p2i(memblock)); - breakpoint(); + if (memblock == NULL) { + return; } - void* membase = MemTracker::record_free(memblock, MemTracker::tracking_level()); - verify_memory(membase); - GuardedMemory guarded(membase); - size_t size = guarded.get_user_size(); - inc_stat_counter(&free_bytes, size); - membase = guarded.release_for_freeing(); - ::free(membase); -#else - void* membase = MemTracker::record_free(memblock, MemTracker::tracking_level()); - ::free(membase); -#endif + DEBUG_ONLY(break_if_ptr_caught(memblock);) + + const NMT_TrackingLevel level = MemTracker::tracking_level(); + + // If NMT is enabled, this checks for heap overwrites, then de-accounts the old block. + void* const old_outer_ptr = MemTracker::record_free(memblock, level); + ::free(old_outer_ptr); } void os::init_random(unsigned int initval) { @@ -1359,10 +1287,6 @@ FILE* os::fopen(const char* path, const char* mode) { return file; } -ssize_t os::read(int fd, void *buf, unsigned int nBytes) { - return ::read(fd, buf, nBytes); -} - bool os::set_boot_path(char fileSep, char pathSep) { const char* home = Arguments::get_java_home(); int home_len = (int)strlen(home); diff --git a/src/hotspot/share/runtime/os.hpp b/src/hotspot/share/runtime/os.hpp index 45ed150ec7a80a67a651bba8c3c097ca3fac8f12..b63637e35767bf02653a58a65c94bca9398e76a9 100644 --- a/src/hotspot/share/runtime/os.hpp +++ b/src/hotspot/share/runtime/os.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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 @@ -541,9 +541,8 @@ class os: AllStatic { // File i/o operations static int open(const char *path, int oflag, int mode); - static FILE* open(int fd, const char* mode); + static FILE* fdopen(int fd, const char* mode); static FILE* fopen(const char* path, const char* mode); - static int close(int fd); static jlong lseek(int fd, jlong offset, int whence); static bool file_exists(const char* file); // This function, on Windows, canonicalizes a given path (see os_windows.cpp for details). @@ -563,9 +562,8 @@ class os: AllStatic { //File i/o operations - static ssize_t read(int fd, void *buf, unsigned int nBytes); static ssize_t read_at(int fd, void *buf, unsigned int nBytes, jlong offset); - static size_t write(int fd, const void *buf, unsigned int nBytes); + static ssize_t write(int fd, const void *buf, unsigned int nBytes); // Reading directories. static DIR* opendir(const char* dirname); @@ -784,15 +782,7 @@ class os: AllStatic { // Like strdup, but exit VM when strdup() returns NULL static char* strdup_check_oom(const char*, MEMFLAGS flags = mtInternal); -#ifndef PRODUCT - static julong num_mallocs; // # of calls to malloc/realloc - static julong alloc_bytes; // # of bytes allocated - static julong num_frees; // # of calls to free - static julong free_bytes; // # of bytes freed -#endif - // SocketInterface (ex HPI SocketInterface ) - static int socket(int domain, int type, int protocol); static int socket_close(int fd); static int recv(int fd, char* buf, size_t nBytes, uint flags); static int send(int fd, char* buf, size_t nBytes, uint flags); diff --git a/src/hotspot/share/runtime/prefetch.hpp b/src/hotspot/share/runtime/prefetch.hpp index dac34f6cd26634a93b0ed6c19fb5e5a4cea546c3..d949899813c77ef7be07fb3c316c7e8a7f6d6a72 100644 --- a/src/hotspot/share/runtime/prefetch.hpp +++ b/src/hotspot/share/runtime/prefetch.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2022, 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,7 +25,7 @@ #ifndef SHARE_RUNTIME_PREFETCH_HPP #define SHARE_RUNTIME_PREFETCH_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" // If calls to prefetch methods are in a loop, the loop should be cloned // such that if Prefetch{Scan,Copy}Interval and/or PrefetchFieldInterval diff --git a/src/hotspot/share/runtime/reflectionUtils.hpp b/src/hotspot/share/runtime/reflectionUtils.hpp index a928c50596e82ef298a2ea045f26cdf77b0ee0fc..ef9f8bbd62e7de5fd70fcf0e995d4010f8def361 100644 --- a/src/hotspot/share/runtime/reflectionUtils.hpp +++ b/src/hotspot/share/runtime/reflectionUtils.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2022, 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,7 +25,7 @@ #ifndef SHARE_RUNTIME_REFLECTIONUTILS_HPP #define SHARE_RUNTIME_REFLECTIONUTILS_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "oops/instanceKlass.hpp" #include "oops/objArrayOop.hpp" #include "oops/oopsHierarchy.hpp" diff --git a/src/hotspot/share/runtime/safepoint.cpp b/src/hotspot/share/runtime/safepoint.cpp index 064a9f64b75930e022e5f261a2d8d36acec0cd79..44240f85b71cc92bb20d9b26e9651c1e3313303d 100644 --- a/src/hotspot/share/runtime/safepoint.cpp +++ b/src/hotspot/share/runtime/safepoint.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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 @@ -754,6 +754,7 @@ void SafepointSynchronize::block(JavaThread *thread) { void SafepointSynchronize::handle_polling_page_exception(JavaThread *thread) { assert(thread->thread_state() == _thread_in_Java, "should come from Java code"); + thread->set_thread_state(_thread_in_vm); // Enable WXWrite: the function is called implicitly from java code. MACOS_AARCH64_ONLY(ThreadWXEnable wx(WXWrite, thread)); @@ -765,6 +766,8 @@ void SafepointSynchronize::handle_polling_page_exception(JavaThread *thread) { ThreadSafepointState* state = thread->safepoint_state(); state->handle_polling_page_exception(); + + thread->set_thread_state(_thread_in_Java); } @@ -970,7 +973,6 @@ void ThreadSafepointState::handle_polling_page_exception() { // If we have a pending async exception deoptimize the frame // as otherwise we may never deliver it. if (self->has_async_exception_condition()) { - ThreadInVMfromJava __tiv(self, false /* check asyncs */); Deoptimization::deoptimize_frame(self, caller_fr.id()); } diff --git a/src/hotspot/share/runtime/safepoint.hpp b/src/hotspot/share/runtime/safepoint.hpp index 268a315dd7bf0adf7f65c0bb63e2fd45da838475..e67c960626ba3d9ace17807fa5b66b48544358ff 100644 --- a/src/hotspot/share/runtime/safepoint.hpp +++ b/src/hotspot/share/runtime/safepoint.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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,7 +25,7 @@ #ifndef SHARE_RUNTIME_SAFEPOINT_HPP #define SHARE_RUNTIME_SAFEPOINT_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "runtime/os.hpp" #include "runtime/thread.hpp" #include "runtime/vmOperation.hpp" @@ -126,10 +126,6 @@ class SafepointSynchronize : AllStatic { JavaThread *thread, uint64_t safepoint_count); - static bool is_a_block_safe_state(JavaThreadState state) { - // Check that we have a valid thread_state before blocking for safepoints - return state == _thread_in_vm || state == _thread_in_Java; - } // Called when a thread voluntarily blocks static void block(JavaThread *thread); diff --git a/src/hotspot/share/runtime/safepointMechanism.cpp b/src/hotspot/share/runtime/safepointMechanism.cpp index b092f050539bc3cbd3d87d2eed8a7caaa49b4ac6..0a4d9a436c05871182d1686109ebfc90bdd7036e 100644 --- a/src/hotspot/share/runtime/safepointMechanism.cpp +++ b/src/hotspot/share/runtime/safepointMechanism.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2022, 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 @@ -119,7 +119,7 @@ void SafepointMechanism::process(JavaThread *thread, bool allow_suspend) { bool need_rechecking; do { JavaThreadState state = thread->thread_state(); - guarantee(SafepointSynchronize::is_a_block_safe_state(state), "Illegal threadstate encountered: %d", state); + guarantee(state == _thread_in_vm, "Illegal threadstate encountered: %d", state); if (global_poll()) { // Any load in ::block() must not pass the global poll load. // Otherwise we might load an old safepoint counter (for example). diff --git a/src/hotspot/share/runtime/sharedRuntime.hpp b/src/hotspot/share/runtime/sharedRuntime.hpp index 1adc96619855c5c6a18bb794fdd78980e087254a..10e4b0ec0af8cad5796a8bfbca8f4576b642bde4 100644 --- a/src/hotspot/share/runtime/sharedRuntime.hpp +++ b/src/hotspot/share/runtime/sharedRuntime.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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 @@ -29,7 +29,7 @@ #include "code/vmreg.hpp" #include "interpreter/bytecodeTracer.hpp" #include "interpreter/linkResolver.hpp" -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "memory/resourceArea.hpp" #include "utilities/hashtable.hpp" #include "utilities/macros.hpp" diff --git a/src/hotspot/share/runtime/stackWatermark.hpp b/src/hotspot/share/runtime/stackWatermark.hpp index 3cf7ce59cd98e1c7c0f3c946859fda743c3bc732..6210a0bc2bf3a79491dcfb447e18fcdc52e1b47e 100644 --- a/src/hotspot/share/runtime/stackWatermark.hpp +++ b/src/hotspot/share/runtime/stackWatermark.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2020, 2022, 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,7 +25,7 @@ #ifndef SHARE_RUNTIME_STACKWATERMARK_HPP #define SHARE_RUNTIME_STACKWATERMARK_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "runtime/mutex.hpp" #include "runtime/stackWatermarkKind.hpp" diff --git a/src/hotspot/share/runtime/thread.cpp b/src/hotspot/share/runtime/thread.cpp index cb86541b81052979ceb985d3d33a6ae0e32c7137..0ec50849f5a5f6936e964268cb2babd4ecd63e61 100644 --- a/src/hotspot/share/runtime/thread.cpp +++ b/src/hotspot/share/runtime/thread.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2021, Azul Systems, Inc. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -317,7 +317,6 @@ void Thread::record_stack_base_and_size() { } } -#if INCLUDE_NMT void Thread::register_thread_stack_with_NMT() { MemTracker::record_thread_stack(stack_end(), stack_size()); } @@ -325,7 +324,6 @@ void Thread::register_thread_stack_with_NMT() { void Thread::unregister_thread_stack_with_NMT() { MemTracker::release_thread_stack(stack_end(), stack_size()); } -#endif // INCLUDE_NMT void Thread::call_run() { DEBUG_ONLY(_run_state = CALL_RUN;) @@ -1646,24 +1644,10 @@ void JavaThread::check_and_handle_async_exceptions() { // We may be at method entry which requires we save the do-not-unlock flag. UnlockFlagSaver fs(this); - switch (thread_state()) { - case _thread_in_vm: { - JavaThread* THREAD = this; - Exceptions::throw_unsafe_access_internal_error(THREAD, __FILE__, __LINE__, "a fault occurred in an unsafe memory access operation"); - // We might have blocked in a ThreadBlockInVM wrapper in the call above so make sure we process pending - // suspend requests and object reallocation operations if any since we might be going to Java after this. - SafepointMechanism::process_if_requested_with_exit_check(this, true /* check asyncs */); - return; - } - case _thread_in_Java: { - ThreadInVMfromJava tiv(this); - JavaThread* THREAD = this; - Exceptions::throw_unsafe_access_internal_error(THREAD, __FILE__, __LINE__, "a fault occurred in an unsafe memory access operation in compiled Java code"); - return; - } - default: - ShouldNotReachHere(); - } + Exceptions::throw_unsafe_access_internal_error(this, __FILE__, __LINE__, "a fault occurred in an unsafe memory access operation"); + // We might have blocked in a ThreadBlockInVM wrapper in the call above so make sure we process pending + // suspend requests and object reallocation operations if any since we might be going to Java after this. + SafepointMechanism::process_if_requested_with_exit_check(this, true /* check asyncs */); } } @@ -1770,27 +1754,19 @@ bool JavaThread::java_resume() { } // Wait for another thread to perform object reallocation and relocking on behalf of -// this thread. -// Raw thread state transition to _thread_blocked and back again to the original -// state before returning are performed. The current thread is required to -// change to _thread_blocked in order to be seen to be safepoint/handshake safe -// whilst suspended and only after becoming handshake safe, the other thread can -// complete the handshake used to synchronize with this thread and then perform -// the reallocation and relocking. We cannot use the thread state transition -// helpers because we arrive here in various states and also because the helpers -// indirectly call this method. After leaving _thread_blocked we have to check -// for safepoint/handshake, except if _thread_in_native. The thread is safe -// without blocking then. Allowed states are enumerated in -// SafepointSynchronize::block(). See also EscapeBarrier::sync_and_suspend_*() +// this thread. The current thread is required to change to _thread_blocked in order +// to be seen to be safepoint/handshake safe whilst suspended and only after becoming +// handshake safe, the other thread can complete the handshake used to synchronize +// with this thread and then perform the reallocation and relocking. +// See EscapeBarrier::sync_and_suspend_*() void JavaThread::wait_for_object_deoptimization() { assert(!has_last_Java_frame() || frame_anchor()->walkable(), "should have walkable stack"); assert(this == Thread::current(), "invariant"); - JavaThreadState state = thread_state(); bool spin_wait = os::is_MP(); do { - set_thread_state(_thread_blocked); + ThreadBlockInVM tbivm(this, true /* allow_suspend */); // Wait for object deoptimization if requested. if (spin_wait) { // A single deoptimization is typically very short. Microbenchmarks @@ -1808,14 +1784,6 @@ void JavaThread::wait_for_object_deoptimization() { ml.wait(); } } - // The current thread could have been suspended again. We have to check for - // suspend after restoring the saved state. Without this the current thread - // might return to _thread_in_Java and execute bytecode. - set_thread_state_fence(state); - - if (state != _thread_in_native) { - SafepointMechanism::process_if_requested(this); - } // A handshake for obj. deoptimization suspend could have been processed so // we must check after processing. } while (is_obj_deopt_suspend()); @@ -2734,10 +2702,8 @@ jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) { jint parse_result = Arguments::parse(args); if (parse_result != JNI_OK) return parse_result; -#if INCLUDE_NMT // Initialize NMT right after argument parsing to keep the pre-NMT-init window small. MemTracker::initialize(); -#endif // INCLUDE_NMT os::init_before_ergo(); diff --git a/src/hotspot/share/runtime/thread.hpp b/src/hotspot/share/runtime/thread.hpp index 74916b982759d81b8c2e0ad17320696cbf356262..9ceb17f7af16be01dc8796aef6c574fc8e3366af 100644 --- a/src/hotspot/share/runtime/thread.hpp +++ b/src/hotspot/share/runtime/thread.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2021, Azul Systems, Inc. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -550,8 +550,8 @@ protected: void set_stack_size(size_t size) { _stack_size = size; } address stack_end() const { return stack_base() - stack_size(); } void record_stack_base_and_size(); - void register_thread_stack_with_NMT() NOT_NMT_RETURN; - void unregister_thread_stack_with_NMT() NOT_NMT_RETURN; + void register_thread_stack_with_NMT(); + void unregister_thread_stack_with_NMT(); int lgrp_id() const { return _lgrp_id; } void set_lgrp_id(int value) { _lgrp_id = value; } @@ -1312,16 +1312,21 @@ class JavaThread: public Thread { // Returns the jni environment for this thread JNIEnv* jni_environment() { return &_jni_environment; } + // Returns the current thread as indicated by the given JNIEnv. + // We don't assert it is Thread::current here as that is done at the + // external JNI entry points where the JNIEnv is passed into the VM. static JavaThread* thread_from_jni_environment(JNIEnv* env) { - JavaThread *thread_from_jni_env = (JavaThread*)((intptr_t)env - in_bytes(jni_environment_offset())); - // Only return NULL if thread is off the thread list; starting to - // exit should not return NULL. - if (thread_from_jni_env->is_terminated()) { - thread_from_jni_env->block_if_vm_exited(); - return NULL; - } else { - return thread_from_jni_env; + JavaThread* current = (JavaThread*)((intptr_t)env - in_bytes(jni_environment_offset())); + // We can't get here in a thread that has completed its execution and so + // "is_terminated", but a thread is also considered terminated if the VM + // has exited, so we have to check this and block in case this is a daemon + // thread returning to the VM (the JNI DirectBuffer entry points rely on + // this). + if (current->is_terminated()) { + current->block_if_vm_exited(); + ShouldNotReachHere(); } + return current; } // JNI critical regions. These can nest. diff --git a/src/hotspot/share/runtime/threadLocalStorage.hpp b/src/hotspot/share/runtime/threadLocalStorage.hpp index 93607612a4dc38751e9e0130eadfd70076e3f919..604b624757e6f5dd3ca19742c4313ba157136a02 100644 --- a/src/hotspot/share/runtime/threadLocalStorage.hpp +++ b/src/hotspot/share/runtime/threadLocalStorage.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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,7 +25,7 @@ #ifndef SHARE_RUNTIME_THREADLOCALSTORAGE_HPP #define SHARE_RUNTIME_THREADLOCALSTORAGE_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" // forward-decl as we can't have an include cycle class Thread; diff --git a/src/hotspot/share/runtime/vframe.cpp b/src/hotspot/share/runtime/vframe.cpp index adf3c938d8d609d7571d39029011de3b25405dfe..14f4ee3a28c8c34ef976f23416a00e93179d8e21 100644 --- a/src/hotspot/share/runtime/vframe.cpp +++ b/src/hotspot/share/runtime/vframe.cpp @@ -608,13 +608,11 @@ javaVFrame* vframeStreamCommon::asJavaVFrame() { return result; } - #ifndef PRODUCT void vframe::print() { if (WizardMode) _fr.print_value_on(tty,NULL); } - void vframe::print_value() const { ((vframe*)this)->print(); } diff --git a/src/hotspot/share/runtime/vframeArray.cpp b/src/hotspot/share/runtime/vframeArray.cpp index 0d6417037c68ba64483275b30d45ee5f2f1e918d..2106ed7ef7c75a9e20ab9be308458c0aed1318c9 100644 --- a/src/hotspot/share/runtime/vframeArray.cpp +++ b/src/hotspot/share/runtime/vframeArray.cpp @@ -324,9 +324,11 @@ void vframeArrayElement::unpack_on_stack(int caller_actual_parameters, } } +#ifndef PRODUCT if (PrintDeoptimizationDetails) { tty->print_cr("Expressions size: %d", expressions()->size()); } +#endif // !PRODUCT // Unpack expression stack // If this is an intermediate frame (i.e. not top frame) then this @@ -343,15 +345,15 @@ void vframeArrayElement::unpack_on_stack(int caller_actual_parameters, *addr = value->get_int(); #ifndef PRODUCT if (PrintDeoptimizationDetails) { - tty->print_cr("Reconstructed expression %d (INT): %d", i, (int)(*addr)); + tty->print_cr(" - Reconstructed expression %d (INT): %d", i, (int)(*addr)); } -#endif +#endif // !PRODUCT break; case T_OBJECT: *addr = value->get_int(T_OBJECT); #ifndef PRODUCT if (PrintDeoptimizationDetails) { - tty->print("Reconstructed expression %d (OBJECT): ", i); + tty->print(" - Reconstructed expression %d (OBJECT): ", i); oop o = cast_to_oop((address)(*addr)); if (o == NULL) { tty->print_cr("NULL"); @@ -360,7 +362,7 @@ void vframeArrayElement::unpack_on_stack(int caller_actual_parameters, tty->print_raw_cr(o->klass()->name()->as_C_string()); } } -#endif +#endif // !PRODUCT break; case T_CONFLICT: // A dead stack slot. Initialize to null in case it is an oop. @@ -371,6 +373,11 @@ void vframeArrayElement::unpack_on_stack(int caller_actual_parameters, } } +#ifndef PRODUCT + if (PrintDeoptimizationDetails) { + tty->print_cr("Locals size: %d", locals()->size()); + } +#endif // !PRODUCT // Unpack the locals for(i = 0; i < locals()->size(); i++) { @@ -382,15 +389,15 @@ void vframeArrayElement::unpack_on_stack(int caller_actual_parameters, *addr = value->get_int(); #ifndef PRODUCT if (PrintDeoptimizationDetails) { - tty->print_cr("Reconstructed local %d (INT): %d", i, (int)(*addr)); + tty->print_cr(" - Reconstructed local %d (INT): %d", i, (int)(*addr)); } -#endif +#endif // !PRODUCT break; case T_OBJECT: *addr = value->get_int(T_OBJECT); #ifndef PRODUCT if (PrintDeoptimizationDetails) { - tty->print("Reconstructed local %d (OBJECT): ", i); + tty->print(" - Reconstructed local %d (OBJECT): ", i); oop o = cast_to_oop((address)(*addr)); if (o == NULL) { tty->print_cr("NULL"); @@ -399,7 +406,7 @@ void vframeArrayElement::unpack_on_stack(int caller_actual_parameters, tty->print_raw_cr(o->klass()->name()->as_C_string()); } } -#endif +#endif // !PRODUCT break; case T_CONFLICT: // A dead location. If it is an oop then we need a NULL to prevent GC from following it @@ -443,28 +450,15 @@ void vframeArrayElement::unpack_on_stack(int caller_actual_parameters, #ifndef PRODUCT if (PrintDeoptimizationDetails) { ttyLocker ttyl; - tty->print_cr("[%d Interpreted Frame]", ++unpack_counter); + tty->print_cr("[%d. Interpreted Frame]", ++unpack_counter); iframe()->print_on(tty); RegisterMap map(thread); vframe* f = vframe::new_vframe(iframe(), &map, thread); f->print(); - - tty->print_cr("locals size %d", locals()->size()); - tty->print_cr("expression size %d", expressions()->size()); - - method()->print_value(); + if (WizardMode && Verbose) method()->print_codes(); tty->cr(); - // method()->print_codes(); - } else if (TraceDeoptimization) { - tty->print(" "); - method()->print_value(); - Bytecodes::Code code = Bytecodes::java_code_at(method(), bcp); - int bci = method()->bci_from(bcp); - tty->print(" - %s", Bytecodes::name(code)); - tty->print(" @ bci %d ", bci); - tty->print_cr("sp = " PTR_FORMAT, p2i(iframe()->sp())); } -#endif // PRODUCT +#endif // !PRODUCT // The expression stack and locals are in the resource area don't leave // a dangling pointer in the vframeArray we leave around for debug @@ -571,6 +565,7 @@ void vframeArray::unpack_to_stack(frame &unpack_frame, int exec_mode, int caller // Find the skeletal interpreter frames to unpack into JavaThread* current = JavaThread::current(); + RegisterMap map(current, false); // Get the youngest frame we will unpack (last to be unpacked) frame me = unpack_frame.sender(&map); @@ -581,6 +576,18 @@ void vframeArray::unpack_to_stack(frame &unpack_frame, int exec_mode, int caller me = me.sender(&map); } + Events::log_deopt_message(current, "DEOPT UNPACKING pc=" INTPTR_FORMAT " sp=" INTPTR_FORMAT " mode %d", + p2i(unpack_frame.pc()), p2i(unpack_frame.sp()), exec_mode); + + if (TraceDeoptimization) { + ResourceMark rm; + stringStream st; + st.print_cr("DEOPT UNPACKING thread=" INTPTR_FORMAT " vframeArray=" INTPTR_FORMAT " mode=%d", + p2i(current), p2i(this), exec_mode); + st.print_cr(" Virtual frames (outermost/oldest first):"); + tty->print_raw(st.as_string()); + } + // Do the unpacking of interpreter frames; the frame at index 0 represents the top activation, so it has no callee // Unpack the frames from the oldest (frames() -1) to the youngest (0) frame* caller_frame = &me; @@ -600,6 +607,24 @@ void vframeArray::unpack_to_stack(frame &unpack_frame, int exec_mode, int caller callee_parameters = callee->size_of_parameters() + (has_member_arg ? 1 : 0); callee_locals = callee->max_locals(); } + if (TraceDeoptimization) { + ResourceMark rm; + stringStream st; + st.print(" VFrame %d (" INTPTR_FORMAT ")", index, p2i(elem)); + st.print(" - %s", elem->method()->name_and_sig_as_C_string()); + int bci = elem->raw_bci(); + const char* code_name; + if (bci == SynchronizationEntryBCI) { + code_name = "sync entry"; + } else { + Bytecodes::Code code = elem->method()->code_at(bci); + code_name = Bytecodes::name(code); + } + st.print(" - %s", code_name); + st.print(" @ bci=%d ", bci); + st.print_cr("sp=" PTR_FORMAT, p2i(elem->iframe()->sp())); + tty->print_raw(st.as_string()); + } elem->unpack_on_stack(caller_actual_parameters, callee_parameters, callee_locals, @@ -614,6 +639,9 @@ void vframeArray::unpack_to_stack(frame &unpack_frame, int exec_mode, int caller caller_actual_parameters = callee_parameters; } deallocate_monitor_chunks(); + if (TraceDeoptimization) { + tty->cr(); + } } void vframeArray::deallocate_monitor_chunks() { @@ -641,7 +669,7 @@ bool vframeArray::structural_compare(JavaThread* thread, GrowableArrayprint_cr("Invalid parallel thread number: [%s]", num_str); + delete fs; return JNI_ERR; } parallel_thread_num = num == 0 ? parallel_thread_num : (uint)num; diff --git a/src/hotspot/share/services/attachListener.hpp b/src/hotspot/share/services/attachListener.hpp index 25fad127d0f71f19aff92d064ab5b806c4b78c7a..5765240c16c36c95a01719f544c143b6ae269c30 100644 --- a/src/hotspot/share/services/attachListener.hpp +++ b/src/hotspot/share/services/attachListener.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2022, 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,7 +25,7 @@ #ifndef SHARE_SERVICES_ATTACHLISTENER_HPP #define SHARE_SERVICES_ATTACHLISTENER_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "runtime/atomic.hpp" #include "runtime/globals.hpp" #include "utilities/debug.hpp" diff --git a/src/hotspot/share/services/diagnosticArgument.cpp b/src/hotspot/share/services/diagnosticArgument.cpp index f10fe6c4641560b0cc7f9ec8b1da0022b61b88e3..3dd75009175e86a0c2422de3b67704cdea212926 100644 --- a/src/hotspot/share/services/diagnosticArgument.cpp +++ b/src/hotspot/share/services/diagnosticArgument.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2022, 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,6 +28,7 @@ #include "memory/resourceArea.hpp" #include "runtime/thread.hpp" #include "services/diagnosticArgument.hpp" +#include "utilities/globalDefinitions.hpp" StringArrayArgument::StringArrayArgument() { _array = new (ResourceObj::C_HEAP, mtServiceability) GrowableArray(32, mtServiceability); @@ -114,13 +115,12 @@ template <> void DCmdArgument::parse_value(const char* str, || sscanf(str, JLONG_FORMAT "%n", &_value, &scanned) != 1 || (size_t)scanned != len) { - ResourceMark rm; - - char* buf = NEW_RESOURCE_ARRAY(char, len + 1); - strncpy(buf, str, len); - buf[len] = '\0'; + const int maxprint = 64; Exceptions::fthrow(THREAD_AND_LOCATION, vmSymbols::java_lang_IllegalArgumentException(), - "Integer parsing error in command argument '%s'. Could not parse: %s.\n", _name, buf); + "Integer parsing error in command argument '%s'. Could not parse: %.*s%s.\n", _name, + MIN2((int)len, maxprint), + (str == NULL ? "" : str), + (len > maxprint ? "..." : "")); } } diff --git a/src/hotspot/share/services/gcNotifier.hpp b/src/hotspot/share/services/gcNotifier.hpp index a13b85e0e69b0deaad5aec15aee8cb368da7b2ec..1a4582025c42949bd2947e08dd32719ea785e015 100644 --- a/src/hotspot/share/services/gcNotifier.hpp +++ b/src/hotspot/share/services/gcNotifier.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2022, 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,7 +25,7 @@ #ifndef SHARE_SERVICES_GCNOTIFIER_HPP #define SHARE_SERVICES_GCNOTIFIER_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "services/memoryPool.hpp" #include "services/memoryService.hpp" #include "services/memoryManager.hpp" diff --git a/src/hotspot/share/services/heapDumperCompression.cpp b/src/hotspot/share/services/heapDumperCompression.cpp index 0d6426017974012c0918d745672dcb3403c1c704..0c9958077d225f47cb8f26dd21cf0021ce38fd8c 100644 --- a/src/hotspot/share/services/heapDumperCompression.cpp +++ b/src/hotspot/share/services/heapDumperCompression.cpp @@ -1,4 +1,5 @@ /* + * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2020 SAP SE. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -45,7 +46,7 @@ char const* FileWriter::open_writer() { FileWriter::~FileWriter() { if (_fd >= 0) { - os::close(_fd); + ::close(_fd); _fd = -1; } } @@ -54,7 +55,7 @@ char const* FileWriter::write_buf(char* buf, ssize_t size) { assert(_fd >= 0, "Must be open"); assert(size > 0, "Must write at least one byte"); - ssize_t n = (ssize_t) os::write(_fd, buf, (uint) size); + ssize_t n = os::write(_fd, buf, (uint) size); if (n <= 0) { return os::strerror(errno); diff --git a/src/hotspot/share/services/lowMemoryDetector.hpp b/src/hotspot/share/services/lowMemoryDetector.hpp index 09bb1ce640681cbf4a5f10a4c69c4ce81d5b861f..3070eb00ab7af8db4a41dce792078dcc6b79ff89 100644 --- a/src/hotspot/share/services/lowMemoryDetector.hpp +++ b/src/hotspot/share/services/lowMemoryDetector.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2022, 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,7 +25,7 @@ #ifndef SHARE_SERVICES_LOWMEMORYDETECTOR_HPP #define SHARE_SERVICES_LOWMEMORYDETECTOR_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "oops/oopHandle.hpp" #include "runtime/atomic.hpp" #include "services/memoryPool.hpp" diff --git a/src/hotspot/share/services/mallocSiteTable.hpp b/src/hotspot/share/services/mallocSiteTable.hpp index 6e026f9704c869878c7b789edab38b2e63f888c3..814b70c6473a5dba8fecf56892c3295b5413844e 100644 --- a/src/hotspot/share/services/mallocSiteTable.hpp +++ b/src/hotspot/share/services/mallocSiteTable.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2022, 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,15 +25,12 @@ #ifndef SHARE_SERVICES_MALLOCSITETABLE_HPP #define SHARE_SERVICES_MALLOCSITETABLE_HPP -#include "utilities/macros.hpp" - -#if INCLUDE_NMT - #include "memory/allocation.hpp" #include "runtime/atomic.hpp" #include "services/allocationSite.hpp" #include "services/mallocTracker.hpp" #include "services/nmtCommon.hpp" +#include "utilities/macros.hpp" #include "utilities/nativeCallStack.hpp" // MallocSite represents a code path that eventually calls @@ -199,5 +196,4 @@ class MallocSiteTable : AllStatic { static const MallocSiteHashtableEntry* _hash_entry_allocation_site; }; -#endif // INCLUDE_NMT #endif // SHARE_SERVICES_MALLOCSITETABLE_HPP diff --git a/src/hotspot/share/services/mallocTracker.cpp b/src/hotspot/share/services/mallocTracker.cpp index 285a60d853f953b0f0787f7d87e6ed78c38a0462..e27d312ad817789a18348f39815a787f7d27eb4c 100644 --- a/src/hotspot/share/services/mallocTracker.cpp +++ b/src/hotspot/share/services/mallocTracker.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2022, 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 @@ -31,6 +31,8 @@ #include "utilities/debug.hpp" #include "utilities/ostream.hpp" +#include "jvm_io.h" + size_t MallocMemorySummary::_snapshot[CALC_OBJ_SIZE_IN_TYPE(MallocMemorySnapshot, size_t)]; #ifdef ASSERT @@ -115,7 +117,7 @@ void MallocHeader::mark_block_as_dead() { void MallocHeader::release() { assert(MemTracker::enabled(), "Sanity"); - check_block_integrity(); + assert_block_integrity(); MallocMemorySummary::record_free(size(), flags()); MallocMemorySummary::record_free_malloc_header(sizeof(MallocHeader)); @@ -153,13 +155,18 @@ void MallocHeader::print_block_on_error(outputStream* st, address bad_address) c os::print_hex_dump(st, from1, to2, 1); } } +void MallocHeader::assert_block_integrity() const { + char msg[256]; + address corruption = NULL; + if (!check_block_integrity(msg, sizeof(msg), &corruption)) { + if (corruption != NULL) { + print_block_on_error(tty, (address)this); + } + fatal("NMT corruption: Block at " PTR_FORMAT ": %s", p2i(this), msg); + } +} -// Check block integrity. If block is broken, print out a report -// to tty (optionally with hex dump surrounding the broken block), -// then trigger a fatal error. -void MallocHeader::check_block_integrity() const { - -#define PREFIX "NMT corruption: " +bool MallocHeader::check_block_integrity(char* msg, size_t msglen, address* p_corruption) const { // Note: if you modify the error messages here, make sure you // adapt the associated gtests too. @@ -167,7 +174,8 @@ void MallocHeader::check_block_integrity() const { // values. Note that we should not call this for ::free(NULL), // which should be handled by os::free() above us. if (((size_t)p2i(this)) < K) { - fatal(PREFIX "Block at " PTR_FORMAT ": invalid block address", p2i(this)); + jio_snprintf(msg, msglen, "invalid block address"); + return false; } // From here on we assume the block pointer to be valid. We could @@ -186,37 +194,42 @@ void MallocHeader::check_block_integrity() const { // Should we ever start using std::max_align_t, this would be one place to // fix up. if (!is_aligned(this, sizeof(uint64_t))) { - print_block_on_error(tty, (address)this); - fatal(PREFIX "Block at " PTR_FORMAT ": block address is unaligned", p2i(this)); + *p_corruption = (address)this; + jio_snprintf(msg, msglen, "block address is unaligned"); + return false; } // Check header canary if (_canary != _header_canary_life_mark) { - print_block_on_error(tty, (address)this); - fatal(PREFIX "Block at " PTR_FORMAT ": header canary broken.", p2i(this)); + *p_corruption = (address)this; + jio_snprintf(msg, msglen, "header canary broken"); + return false; } #ifndef _LP64 // On 32-bit we have a second canary, check that one too. if (_alt_canary != _header_alt_canary_life_mark) { - print_block_on_error(tty, (address)this); - fatal(PREFIX "Block at " PTR_FORMAT ": header alternate canary broken.", p2i(this)); + *p_corruption = (address)this; + jio_snprintf(msg, msglen, "header canary broken"); + return false; } #endif // Does block size seems reasonable? if (_size >= max_reasonable_malloc_size) { - print_block_on_error(tty, (address)this); - fatal(PREFIX "Block at " PTR_FORMAT ": header looks invalid (weirdly large block size)", p2i(this)); + *p_corruption = (address)this; + jio_snprintf(msg, msglen, "header looks invalid (weirdly large block size)"); + return false; } // Check footer canary if (get_footer() != _footer_canary_life_mark) { - print_block_on_error(tty, footer_address()); - fatal(PREFIX "Block at " PTR_FORMAT ": footer canary broken at " PTR_FORMAT " (buffer overflow?)", - p2i(this), p2i(footer_address())); + *p_corruption = footer_address(); + jio_snprintf(msg, msglen, "footer canary broken at " PTR_FORMAT " (buffer overflow?)", + p2i(footer_address())); + return false; } -#undef PREFIX + return true; } bool MallocHeader::record_malloc_site(const NativeCallStack& stack, size_t size, diff --git a/src/hotspot/share/services/mallocTracker.hpp b/src/hotspot/share/services/mallocTracker.hpp index 6490b3d53ffd2024df763fe9a31e74c47c651aa0..ac8eaf17c5c65c0855ba8138f98b4847e5d4ea1e 100644 --- a/src/hotspot/share/services/mallocTracker.hpp +++ b/src/hotspot/share/services/mallocTracker.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2022, 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 @@ #ifndef SHARE_SERVICES_MALLOCTRACKER_HPP #define SHARE_SERVICES_MALLOCTRACKER_HPP -#if INCLUDE_NMT - #include "memory/allocation.hpp" #include "runtime/atomic.hpp" #include "runtime/threadCritical.hpp" @@ -314,10 +312,9 @@ class MallocHeader { // We discount sizes larger than these static const size_t max_reasonable_malloc_size = LP64_ONLY(256 * G) NOT_LP64(3500 * M); - // Check block integrity. If block is broken, print out a report - // to tty (optionally with hex dump surrounding the broken block), - // then trigger a fatal error. - void check_block_integrity() const; + // If block is broken, print out a report to tty (optionally with + // hex dump surrounding the broken block), then trigger a fatal error + void assert_block_integrity() const; void print_block_on_error(outputStream* st, address bad_address) const; void mark_block_as_dead(); @@ -363,6 +360,11 @@ class MallocHeader { // Cleanup tracking information and mark block as dead before the memory is released. void release(); + // If block is broken, fill in a short descriptive text in out, + // an option pointer to the corruption in p_corruption, and return false. + // Return true if block is fine. + bool check_block_integrity(char* msg, size_t msglen, address* p_corruption) const; + private: inline void set_size(size_t size) { _size = size; @@ -444,7 +446,4 @@ class MallocTracker : AllStatic { } }; -#endif // INCLUDE_NMT - - #endif // SHARE_SERVICES_MALLOCTRACKER_HPP diff --git a/src/hotspot/share/services/memBaseline.hpp b/src/hotspot/share/services/memBaseline.hpp index c43c937abb107648d4bd1e031aba0961d4972632..ef8013734649ab6ebc6b6ea2f04e43626aa5b36a 100644 --- a/src/hotspot/share/services/memBaseline.hpp +++ b/src/hotspot/share/services/memBaseline.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2022, 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 @@ #ifndef SHARE_SERVICES_MEMBASELINE_HPP #define SHARE_SERVICES_MEMBASELINE_HPP -#if INCLUDE_NMT - #include "memory/metaspaceStats.hpp" #include "runtime/mutex.hpp" #include "services/mallocSiteTable.hpp" @@ -212,6 +210,4 @@ class MemBaseline { void virtual_memory_sites_to_reservation_site_order(); }; -#endif // INCLUDE_NMT - #endif // SHARE_SERVICES_MEMBASELINE_HPP diff --git a/src/hotspot/share/services/memReporter.hpp b/src/hotspot/share/services/memReporter.hpp index 77fb1d70a00a84d3fc719d428cf3f45ad360f98a..2051ab88e3cd7f48493a30a9cb02782fcbe2e61b 100644 --- a/src/hotspot/share/services/memReporter.hpp +++ b/src/hotspot/share/services/memReporter.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2022, 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 @@ #ifndef SHARE_SERVICES_MEMREPORTER_HPP #define SHARE_SERVICES_MEMREPORTER_HPP -#if INCLUDE_NMT - #include "memory/metaspace.hpp" #include "oops/instanceKlass.hpp" #include "services/memBaseline.hpp" @@ -239,6 +237,4 @@ class MemDetailDiffReporter : public MemSummaryDiffReporter { size_t current_committed, size_t early_reserved, size_t early_committed, MEMFLAGS flag) const; }; -#endif // INCLUDE_NMT - #endif // SHARE_SERVICES_MEMREPORTER_HPP diff --git a/src/hotspot/share/services/memTracker.hpp b/src/hotspot/share/services/memTracker.hpp index 1c81c3f7928bcc56fbe6a18a7eb5e0f1aa46b0c5..06d5c0c94a892813c95ac3c62ae0b3a12aff943e 100644 --- a/src/hotspot/share/services/memTracker.hpp +++ b/src/hotspot/share/services/memTracker.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2022, 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,67 +25,13 @@ #ifndef SHARE_SERVICES_MEMTRACKER_HPP #define SHARE_SERVICES_MEMTRACKER_HPP -#include "services/nmtCommon.hpp" -#include "utilities/nativeCallStack.hpp" - - -#if !INCLUDE_NMT - -#define CURRENT_PC NativeCallStack::empty_stack() -#define CALLER_PC NativeCallStack::empty_stack() - -class Tracker : public StackObj { - public: - enum TrackerType { - uncommit, - release - }; - Tracker(enum TrackerType type) : _type(type) { } - void record(address addr, size_t size) { } - private: - enum TrackerType _type; -}; - -class MemTracker : AllStatic { - public: - static inline NMT_TrackingLevel tracking_level() { return NMT_off; } - static inline bool enabled() { return false; } - static inline void init() { } - static bool check_launcher_nmt_support(const char* value) { return true; } - static bool verify_nmt_option() { return true; } - - static inline void* record_malloc(void* mem_base, size_t size, MEMFLAGS flag, - const NativeCallStack& stack, NMT_TrackingLevel level) { return mem_base; } - static inline size_t malloc_header_size(NMT_TrackingLevel level) { return 0; } - static inline size_t malloc_header_size(void* memblock) { return 0; } - static inline size_t malloc_footer_size(NMT_TrackingLevel level) { return 0; } - static inline void* malloc_base(void* memblock) { return memblock; } - static inline void* record_free(void* memblock, NMT_TrackingLevel level) { return memblock; } - - static inline void record_new_arena(MEMFLAGS flag) { } - static inline void record_arena_free(MEMFLAGS flag) { } - static inline void record_arena_size_change(ssize_t diff, MEMFLAGS flag) { } - static inline void record_virtual_memory_reserve(void* addr, size_t size, const NativeCallStack& stack, - MEMFLAGS flag = mtNone) { } - static inline void record_virtual_memory_reserve_and_commit(void* addr, size_t size, - const NativeCallStack& stack, MEMFLAGS flag = mtNone) { } - static inline void record_virtual_memory_split_reserved(void* addr, size_t size, size_t split) { } - static inline void record_virtual_memory_commit(void* addr, size_t size, const NativeCallStack& stack) { } - static inline void record_virtual_memory_type(void* addr, MEMFLAGS flag) { } - static inline void record_thread_stack(void* addr, size_t size) { } - static inline void release_thread_stack(void* addr, size_t size) { } - - static void final_report(outputStream*) { } - static void error_report(outputStream*) { } -}; - -#else - #include "runtime/mutexLocker.hpp" #include "runtime/threadCritical.hpp" #include "services/mallocTracker.hpp" +#include "services/nmtCommon.hpp" #include "services/threadStackTracker.hpp" #include "services/virtualMemoryTracker.hpp" +#include "utilities/nativeCallStack.hpp" #define CURRENT_PC ((MemTracker::tracking_level() == NMT_detail) ? \ NativeCallStack(0) : NativeCallStack::empty_stack()) @@ -309,6 +255,4 @@ class MemTracker : AllStatic { static Mutex* _query_lock; }; -#endif // INCLUDE_NMT - #endif // SHARE_SERVICES_MEMTRACKER_HPP diff --git a/src/hotspot/share/services/nmtCommon.hpp b/src/hotspot/share/services/nmtCommon.hpp index b573fb6b7dfa7b9db2a87efa44ad0cf6c270e8fc..dc85338c025a0fe74efc0c406210d51b7cd8593d 100644 --- a/src/hotspot/share/services/nmtCommon.hpp +++ b/src/hotspot/share/services/nmtCommon.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2022, 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,7 +25,7 @@ #ifndef SHARE_SERVICES_NMTCOMMON_HPP #define SHARE_SERVICES_NMTCOMMON_HPP -#include "memory/allocation.hpp" +#include "memory/allocation.hpp" // for MEMFLAGS only #include "utilities/align.hpp" #include "utilities/globalDefinitions.hpp" diff --git a/src/hotspot/share/services/nmtDCmd.hpp b/src/hotspot/share/services/nmtDCmd.hpp index 52c61d34c0c138d8fc25151454ae70e3cfa76ed0..23302b790a6bf65869207bbbb53be5dae857944f 100644 --- a/src/hotspot/share/services/nmtDCmd.hpp +++ b/src/hotspot/share/services/nmtDCmd.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2022, 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 @@ #ifndef SHARE_SERVICES_NMTDCMD_HPP #define SHARE_SERVICES_NMTDCMD_HPP -#if INCLUDE_NMT - #include "services/diagnosticArgument.hpp" #include "services/diagnosticFramework.hpp" #include "services/memBaseline.hpp" @@ -71,6 +69,4 @@ class NMTDCmd: public DCmdWithParser { bool check_detail_tracking_level(outputStream* out); }; -#endif // INCLUDE_NMT - #endif // SHARE_SERVICES_NMTDCMD_HPP diff --git a/src/hotspot/share/services/nmtPreInit.cpp b/src/hotspot/share/services/nmtPreInit.cpp index 1fdf4ba9d9f572d1cf5fb818debe1b8c8f397ded..67eb3eef41f6abf85e20b4057fedde326d08420b 100644 --- a/src/hotspot/share/services/nmtPreInit.cpp +++ b/src/hotspot/share/services/nmtPreInit.cpp @@ -1,6 +1,6 @@ /* - * Copyright (c) 2021 SAP SE. All rights reserved. - * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022 SAP SE. All rights reserved. + * Copyright (c) 2022, 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 @@ -31,8 +31,6 @@ #include "utilities/ostream.hpp" #include "utilities/globalDefinitions.hpp" -#if INCLUDE_NMT - // Obviously we cannot use os::malloc for any dynamic allocation during pre-NMT-init, so we must use // raw malloc; to make this very clear, wrap them. static void* raw_malloc(size_t s) { return ::malloc(s); } @@ -190,5 +188,3 @@ void NMTPreInit::print_state(outputStream* st) { st->print_cr("pre-init mallocs: %u, pre-init reallocs: %u, pre-init frees: %u", _num_mallocs_pre, _num_reallocs_pre, _num_frees_pre); } - -#endif // INCLUDE_NMT diff --git a/src/hotspot/share/services/nmtPreInit.hpp b/src/hotspot/share/services/nmtPreInit.hpp index eed2519113554db9f37ad3c53b8a4401d49fa892..d65ebaf5dc3bd22d932d690158c5ee0f6834adcd 100644 --- a/src/hotspot/share/services/nmtPreInit.hpp +++ b/src/hotspot/share/services/nmtPreInit.hpp @@ -1,6 +1,6 @@ /* - * Copyright (c) 2021 SAP SE. All rights reserved. - * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2022 SAP SE. All rights reserved. + * Copyright (c) 2022, 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 @@ -34,8 +34,6 @@ #include "utilities/globalDefinitions.hpp" #include "utilities/macros.hpp" -#if INCLUDE_NMT - class outputStream; // NMTPreInit is the solution to a specific problem: @@ -353,7 +351,5 @@ public: DEBUG_ONLY(static void verify();) }; -#endif // INCLUDE_NMT - #endif // SHARE_SERVICES_NMT_PREINIT_HPP diff --git a/src/hotspot/share/services/threadIdTable.hpp b/src/hotspot/share/services/threadIdTable.hpp index 223b57fcecbf5597cc6893a6b398522a58e0940d..12772aed88c0b62c457ca0903bcd6d6b1ebeabdb 100644 --- a/src/hotspot/share/services/threadIdTable.hpp +++ b/src/hotspot/share/services/threadIdTable.hpp @@ -26,7 +26,7 @@ #ifndef SHARE_SERVICES_THREADIDTABLE_HPP #define SHARE_SERVICES_THREADIDTABLE_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" class JavaThread; class ThreadsList; diff --git a/src/hotspot/share/services/threadStackTracker.hpp b/src/hotspot/share/services/threadStackTracker.hpp index 74e2311b7633e7628a563c326d7a2a434d3000a8..db7fc0e8569f4e84960b958ff51e496a5e48c3ff 100644 --- a/src/hotspot/share/services/threadStackTracker.hpp +++ b/src/hotspot/share/services/threadStackTracker.hpp @@ -25,8 +25,6 @@ #ifndef SHARE_SERVICES_THREADSTACKTRACKER_HPP #define SHARE_SERVICES_THREADSTACKTRACKER_HPP -#if INCLUDE_NMT - #include "services/allocationSite.hpp" #include "services/mallocSiteTable.hpp" #include "services/nmtCommon.hpp" @@ -84,5 +82,5 @@ public: static bool walk_simple_thread_stack_site(MallocSiteWalker* walker); }; -#endif // INCLUDE_NMT #endif // SHARE_SERVICES_THREADSTACKTRACKER_HPP + diff --git a/src/hotspot/share/services/virtualMemoryTracker.cpp b/src/hotspot/share/services/virtualMemoryTracker.cpp index 77fb24927f5fee383a934315a3b20c35c6db6947..53a2cf106427a65848a10282e16d776e5a8710e7 100644 --- a/src/hotspot/share/services/virtualMemoryTracker.cpp +++ b/src/hotspot/share/services/virtualMemoryTracker.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2022, 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 @@ -671,3 +671,29 @@ bool VirtualMemoryTracker::walk_virtual_memory(VirtualMemoryWalker* walker) { } return true; } + +class FindAndSnapshotRegionWalker : public VirtualMemoryWalker { +private: + ReservedMemoryRegion& _region; + const address _p; + bool _found_region; +public: + FindAndSnapshotRegionWalker(void* p, ReservedMemoryRegion& region) : + _region(region), _p((address)p), _found_region(false) { } + + bool do_allocation_site(const ReservedMemoryRegion* rgn) { + if (rgn->contain_address(_p)) { + _region = *rgn; + _found_region = true; + return false; + } + return true; + } + bool found_region() const { return _found_region; } +}; + +const bool VirtualMemoryTracker::snapshot_region_contains(void* p, ReservedMemoryRegion& region) { + FindAndSnapshotRegionWalker walker(p, region); + walk_virtual_memory(&walker); + return walker.found_region(); +} diff --git a/src/hotspot/share/services/virtualMemoryTracker.hpp b/src/hotspot/share/services/virtualMemoryTracker.hpp index c96af6b838792b7ec97ff7b27b6898d2fb58cb50..15627470f7820101b7208ee4bf051ab4f66fe4d6 100644 --- a/src/hotspot/share/services/virtualMemoryTracker.hpp +++ b/src/hotspot/share/services/virtualMemoryTracker.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2022, 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 @@ #ifndef SHARE_SERVICES_VIRTUALMEMORYTRACKER_HPP #define SHARE_SERVICES_VIRTUALMEMORYTRACKER_HPP -#if INCLUDE_NMT - #include "memory/allocation.hpp" #include "memory/metaspace.hpp" // For MetadataType #include "memory/metaspaceStats.hpp" @@ -341,7 +339,7 @@ class ReservedMemoryRegion : public VirtualMemoryRegion { return *this; } - const char* flag_name() { return NMTUtil::flag_to_name(_flag); } + const char* flag_name() const { return NMTUtil::flag_to_name(_flag); } private: // The committed region contains the uncommitted region, subtract the uncommitted @@ -387,6 +385,8 @@ class VirtualMemoryTracker : AllStatic { // Walk virtual memory data structure for creating baseline, etc. static bool walk_virtual_memory(VirtualMemoryWalker* walker); + static const bool snapshot_region_contains(void* p, ReservedMemoryRegion& region); + // Snapshot current thread stacks static void snapshot_thread_stacks(); @@ -394,6 +394,5 @@ class VirtualMemoryTracker : AllStatic { static SortedLinkedList* _reserved_regions; }; -#endif // INCLUDE_NMT - #endif // SHARE_SERVICES_VIRTUALMEMORYTRACKER_HPP + diff --git a/src/hotspot/share/utilities/copy.hpp b/src/hotspot/share/utilities/copy.hpp index bd502d5313d27b7cd712c097d9eea082df13075a..12f59ad1311b3c9d481e761a08b92e5eb5b6ee5f 100644 --- a/src/hotspot/share/utilities/copy.hpp +++ b/src/hotspot/share/utilities/copy.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2022, 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,15 +37,6 @@ extern "C" { void _Copy_conjoint_words(const HeapWord* from, HeapWord* to, size_t count); void _Copy_disjoint_words(const HeapWord* from, HeapWord* to, size_t count); - void _Copy_conjoint_words_atomic(const HeapWord* from, HeapWord* to, size_t count); - void _Copy_disjoint_words_atomic(const HeapWord* from, HeapWord* to, size_t count); - - void _Copy_aligned_conjoint_words(const HeapWord* from, HeapWord* to, size_t count); - void _Copy_aligned_disjoint_words(const HeapWord* from, HeapWord* to, size_t count); - - void _Copy_conjoint_bytes(const void* from, void* to, size_t count); - - void _Copy_conjoint_bytes_atomic (const void* from, void* to, size_t count); void _Copy_conjoint_jshorts_atomic(const jshort* from, jshort* to, size_t count); void _Copy_conjoint_jints_atomic (const jint* from, jint* to, size_t count); void _Copy_conjoint_jlongs_atomic (const jlong* from, jlong* to, size_t count); @@ -55,7 +46,6 @@ extern "C" { void _Copy_arrayof_conjoint_jshorts(const HeapWord* from, HeapWord* to, size_t count); void _Copy_arrayof_conjoint_jints (const HeapWord* from, HeapWord* to, size_t count); void _Copy_arrayof_conjoint_jlongs (const HeapWord* from, HeapWord* to, size_t count); - void _Copy_arrayof_conjoint_oops (const HeapWord* from, HeapWord* to, size_t count); } class Copy : AllStatic { diff --git a/src/hotspot/share/utilities/debug.cpp b/src/hotspot/share/utilities/debug.cpp index 1a0c3a84647fe1b9c5136304d91da76ad29a74a5..bb2a0446aee60ba7ef1ef90dca80af09b30aed0f 100644 --- a/src/hotspot/share/utilities/debug.cpp +++ b/src/hotspot/share/utilities/debug.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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 @@ #include "runtime/handles.inline.hpp" #include "runtime/java.hpp" #include "runtime/os.hpp" +#include "runtime/safefetch.inline.hpp" #include "runtime/sharedRuntime.hpp" #include "runtime/stubCodeGenerator.hpp" #include "runtime/stubRoutines.hpp" @@ -51,7 +52,9 @@ #include "runtime/vframe.hpp" #include "runtime/vm_version.hpp" #include "services/heapDumper.hpp" +#include "services/mallocTracker.hpp" #include "services/memTracker.hpp" +#include "services/virtualMemoryTracker.hpp" #include "utilities/defaultStream.hpp" #include "utilities/events.hpp" #include "utilities/formatBuffer.hpp" @@ -480,6 +483,38 @@ extern "C" JNIEXPORT void pp(void* p) { oop obj = cast_to_oop(p); obj->print(); } else { + if (MemTracker::enabled()) { + const NMT_TrackingLevel tracking_level = MemTracker::tracking_level(); + ReservedMemoryRegion region(0, 0); + // Check and snapshot a mmap'd region that contains the pointer + if (VirtualMemoryTracker::snapshot_region_contains(p, region)) { + tty->print_cr(PTR_FORMAT " in mmap'd memory region [" PTR_FORMAT " - " PTR_FORMAT "] by %s", + p2i(p), p2i(region.base()), p2i(region.base() + region.size()), region.flag_name()); + if (tracking_level == NMT_detail) { + region.call_stack()->print_on(tty); + tty->cr(); + } + return; + } + // Check if it is a malloc'd memory block + if (CanUseSafeFetchN() && SafeFetchN((intptr_t*)p, 0) != 0) { + const MallocHeader* mhdr = (const MallocHeader*)MallocTracker::get_base(p, tracking_level); + char msg[256]; + address p_corrupted; + if (SafeFetchN((intptr_t*)mhdr, 0) != 0 && mhdr->check_block_integrity(msg, sizeof(msg), &p_corrupted)) { + tty->print_cr(PTR_FORMAT " malloc'd " SIZE_FORMAT " bytes by %s", + p2i(p), mhdr->size(), NMTUtil::flag_to_name(mhdr->flags())); + if (tracking_level == NMT_detail) { + NativeCallStack ncs; + if (mhdr->get_stack(ncs)) { + ncs.print_on(tty); + tty->cr(); + } + } + return; + } + } + } tty->print(PTR_FORMAT, p2i(p)); } } diff --git a/src/hotspot/share/utilities/decoder.hpp b/src/hotspot/share/utilities/decoder.hpp index ccf3ac4ba3cfb8a2428cdd3874463a5ac8761d95..b0a368fd058ebca5c01aa127e0b7d0e0b4e79938 100644 --- a/src/hotspot/share/utilities/decoder.hpp +++ b/src/hotspot/share/utilities/decoder.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ #ifndef SHARE_UTILITIES_DECODER_HPP #define SHARE_UTILITIES_DECODER_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "runtime/mutex.hpp" #include "runtime/mutexLocker.hpp" #include "utilities/ostream.hpp" diff --git a/src/hotspot/share/utilities/elfFile.cpp b/src/hotspot/share/utilities/elfFile.cpp index 1e2a6a5279f868585da3c70fbd0b5bafbcfdcf76..2198d2943c17e32ef10534910bd3df8d2abc1187 100644 --- a/src/hotspot/share/utilities/elfFile.cpp +++ b/src/hotspot/share/utilities/elfFile.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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 @@ -168,7 +168,7 @@ void ElfFile::cleanup_tables() { NullDecoder::decoder_status ElfFile::parse_elf(const char* filepath) { assert(filepath, "null file path"); - _file = fopen(filepath, "r"); + _file = os::fopen(filepath, "r"); if (_file != NULL) { return load_tables(); } else { diff --git a/src/hotspot/share/utilities/exceptions.cpp b/src/hotspot/share/utilities/exceptions.cpp index d7de88b9c50d1beb8dc1667b61aa6cc70da24b94..4ddc8e18ae6620bab8d8a8108f04a2585a3e14c5 100644 --- a/src/hotspot/share/utilities/exceptions.cpp +++ b/src/hotspot/share/utilities/exceptions.cpp @@ -463,7 +463,7 @@ volatile int Exceptions::_out_of_memory_error_class_metaspace_errors = 0; void Exceptions::count_out_of_memory_exceptions(Handle exception) { if (Universe::is_out_of_memory_error_metaspace(exception())) { Atomic::inc(&_out_of_memory_error_metaspace_errors, memory_order_relaxed); - } else if (Universe::is_out_of_memory_error_metaspace(exception())) { + } else if (Universe::is_out_of_memory_error_class_metaspace(exception())) { Atomic::inc(&_out_of_memory_error_class_metaspace_errors, memory_order_relaxed); } else { // everything else reported as java heap OOM diff --git a/src/hotspot/share/utilities/globalCounter.hpp b/src/hotspot/share/utilities/globalCounter.hpp index beba72a954a1a0115d8ae4acf05d59c69d9d659f..5f5eba263b98012992538de5027fa1c741b79ce0 100644 --- a/src/hotspot/share/utilities/globalCounter.hpp +++ b/src/hotspot/share/utilities/globalCounter.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2022, 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,7 +25,7 @@ #ifndef SHARE_UTILITIES_GLOBALCOUNTER_HPP #define SHARE_UTILITIES_GLOBALCOUNTER_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "memory/padded.hpp" class Thread; diff --git a/src/hotspot/share/utilities/macros.hpp b/src/hotspot/share/utilities/macros.hpp index 9b362b88c11911a2c89360d0c7e08cc5d4678523..9207e8a1739c8b2a8e75ee9b71a3711a993c398a 100644 --- a/src/hotspot/share/utilities/macros.hpp +++ b/src/hotspot/share/utilities/macros.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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 @@ -241,22 +241,6 @@ #define NOT_ZGC_RETURN_(code) { return code; } #endif // INCLUDE_ZGC -#ifndef INCLUDE_NMT -#define INCLUDE_NMT 1 -#endif // INCLUDE_NMT - -#if INCLUDE_NMT -#define NOT_NMT_RETURN /* next token must be ; */ -#define NOT_NMT_RETURN_(code) /* next token must be ; */ -#define NMT_ONLY(x) x -#define NOT_NMT(x) -#else -#define NOT_NMT_RETURN {} -#define NOT_NMT_RETURN_(code) { return code; } -#define NMT_ONLY(x) -#define NOT_NMT(x) x -#endif // INCLUDE_NMT - #ifndef INCLUDE_JFR #define INCLUDE_JFR 1 #endif diff --git a/src/hotspot/share/utilities/nonblockingQueue.inline.hpp b/src/hotspot/share/utilities/nonblockingQueue.inline.hpp index 355b21209021c703585478c9c3732b8842fb9194..2fbd26f2dca91e47f5e17d998beba8981b1b1852 100644 --- a/src/hotspot/share/utilities/nonblockingQueue.inline.hpp +++ b/src/hotspot/share/utilities/nonblockingQueue.inline.hpp @@ -135,28 +135,46 @@ bool NonblockingQueue::try_pop(T** node_ptr) { } T* next_node = Atomic::load_acquire(next_ptr(*result)); - if (next_node == NULL) { - // A concurrent try_pop already claimed what was the last entry. That - // operation may not have cleared queue head yet, but we should still - // treat the queue as empty until a push/append operation changes head - // to an entry with a non-NULL next value. - *node_ptr = NULL; - return true; - - } else if (!is_end(next_node)) { - // The next_node is not at the end of the queue's list. Use the "usual" - // lock-free pop from the head of a singly linked list to try to take it. - if (result == Atomic::cmpxchg(&_head, result, next_node)) { - // Former head successfully taken. + if (!is_end(next_node)) { + // [Clause 1] + // There are several cases for next_node. + // (1) next_node is the extension of the queue's list. + // (2) next_node is NULL, because a competing try_pop took result. + // (3) next_node is the extension of some unrelated list, because a + // competing try_pop took result and put it in some other list. + // + // Attempt to advance the list, replacing result with next_node in + // _head. The success or failure of that attempt, along with the value + // of next_node, are used to partially determine which case we're in and + // how to proceed. In particular, advancement will fail for case (3). + if (result != Atomic::cmpxchg(&_head, result, next_node)) { + // [Clause 1a] + // The cmpxchg to advance the list failed; a concurrent try_pop won + // the race and claimed result. This can happen for any of the + // next_node cases. + return false; + } else if (next_node == NULL) { + // [Clause 1b] + // The cmpxchg to advance the list succeeded, but a concurrent try_pop + // has already claimed result (see [Clause 2] - result was the last + // entry in the list) by nulling result's next field. The advance set + // _head to NULL, "helping" the competing try_pop. _head will remain + // NULL until a subsequent push/append. This is a lost race, and we + // report it as such for consistency, though we could report the queue + // was empty. + return false; + } else { + // [Clause 1c] + // Successfully advanced the list and claimed result. next_node was + // in the extension of the queue's list. Return result after + // unlinking it from next_node. set_next(*result, NULL); *node_ptr = result; return true; - } else { - // Lost race to take result from the head of the list. - return false; } - } else if (is_end(Atomic::cmpxchg(next_ptr(*result), end_marker(), (T*)NULL))) { + } else if (is_end(Atomic::cmpxchg(next_ptr(*result), next_node, (T*)NULL))) { + // [Clause 2] // Result was the last entry and we've claimed it by setting its next // value to NULL. However, this leaves the queue in disarray. Fix up // the queue, possibly in conjunction with other concurrent operations. @@ -170,7 +188,8 @@ bool NonblockingQueue::try_pop(T** node_ptr) { Atomic::cmpxchg(&_tail, result, (T*)NULL); // Attempt to change the queue head from result to NULL. Failure of the - // cmpxchg indicates a concurrent push/append updated the head first. + // cmpxchg indicates a concurrent operation updated _head first. That + // could be either a push/extend or a try_pop in [Clause 1b]. Atomic::cmpxchg(&_head, result, (T*)NULL); // The queue has been restored to order, and we can return the result. @@ -178,9 +197,10 @@ bool NonblockingQueue::try_pop(T** node_ptr) { return true; } else { - // Result was the last entry in the list, but either a concurrent pop - // claimed it first or a concurrent push/append extended the list from - // it. Either way, we lost the race. + // [Clause 3] + // Result was the last entry in the list, but either a concurrent + // try_pop claimed it first or a concurrent push/append extended the + // list from it. Either way, we lost the race to claim it. return false; } } diff --git a/src/hotspot/share/utilities/ostream.cpp b/src/hotspot/share/utilities/ostream.cpp index 04995064fe3a98489bebb3605ceadc9d02b38f95..efb6a4ac7e6b77a51a03eb58f79428b9aa199ed1 100644 --- a/src/hotspot/share/utilities/ostream.cpp +++ b/src/hotspot/share/utilities/ostream.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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 @@ -545,7 +545,7 @@ const char* make_log_name(const char* log_name, const char* force_directory) { } fileStream::fileStream(const char* file_name) { - _file = fopen(file_name, "w"); + _file = os::fopen(file_name, "w"); if (_file != NULL) { _need_close = true; } else { @@ -555,7 +555,7 @@ fileStream::fileStream(const char* file_name) { } fileStream::fileStream(const char* file_name, const char* opentype) { - _file = fopen(file_name, opentype); + _file = os::fopen(file_name, opentype); if (_file != NULL) { _need_close = true; } else { @@ -614,7 +614,7 @@ void fileStream::flush() { void fdStream::write(const char* s, size_t len) { if (_fd != -1) { // Make an unused local variable to avoid warning from gcc compiler. - size_t count = ::write(_fd, s, (int)len); + ssize_t count = ::write(_fd, s, (int)len); update_position(s, len); } } @@ -1079,7 +1079,7 @@ networkStream::networkStream() : bufferedStream(1024*10, 1024*10) { _socket = -1; - int result = os::socket(AF_INET, SOCK_STREAM, 0); + int result = ::socket(AF_INET, SOCK_STREAM, 0); if (result <= 0) { assert(false, "Socket could not be created!"); } else { diff --git a/src/hotspot/share/utilities/quickSort.hpp b/src/hotspot/share/utilities/quickSort.hpp index 000f1bf4f4283bb65361d4358d6ca30ff3a751c0..a94a7cd8b6ce14d601f1a60236b2731c6dbd683a 100644 --- a/src/hotspot/share/utilities/quickSort.hpp +++ b/src/hotspot/share/utilities/quickSort.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2022, 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,7 +25,7 @@ #ifndef SHARE_UTILITIES_QUICKSORT_HPP #define SHARE_UTILITIES_QUICKSORT_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" #include "runtime/globals.hpp" #include "utilities/debug.hpp" diff --git a/src/hotspot/share/utilities/stringUtils.cpp b/src/hotspot/share/utilities/stringUtils.cpp index 21fb7a6e8d32e7428679ce915cb1189ba9c2e683..0ee73de809a9ecba6840809064a53ccdc6909484 100644 --- a/src/hotspot/share/utilities/stringUtils.cpp +++ b/src/hotspot/share/utilities/stringUtils.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,6 +26,8 @@ #include "utilities/debug.hpp" #include "utilities/stringUtils.hpp" +#include + int StringUtils::replace_no_expand(char* string, const char* from, const char* to) { int replace_count = 0; size_t from_len = strlen(from); diff --git a/src/hotspot/share/utilities/stringUtils.hpp b/src/hotspot/share/utilities/stringUtils.hpp index 372222d7c70ff8b00a93b67330c9f172140722e5..54d6847a4c4dfa267ff8f3a6fd442a453022735e 100644 --- a/src/hotspot/share/utilities/stringUtils.hpp +++ b/src/hotspot/share/utilities/stringUtils.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2022, 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,7 +25,7 @@ #ifndef SHARE_UTILITIES_STRINGUTILS_HPP #define SHARE_UTILITIES_STRINGUTILS_HPP -#include "memory/allocation.hpp" +#include "memory/allStatic.hpp" class StringUtils : AllStatic { public: diff --git a/src/hotspot/share/utilities/utf8.cpp b/src/hotspot/share/utilities/utf8.cpp index 6ebeb9a6c9b21d4f688f60a1b0f02d162ef805a3..81ad02a9ba608efa17a6047998a71ec74b2f108d 100644 --- a/src/hotspot/share/utilities/utf8.cpp +++ b/src/hotspot/share/utilities/utf8.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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,12 @@ */ #include "precompiled.hpp" +#include "memory/allocation.hpp" +#include "utilities/debug.hpp" +#include "utilities/globalDefinitions.hpp" #include "utilities/utf8.hpp" + // Assume the utf8 string is in legal form and has been // checked in the class file parser/format checker. template char* UTF8::next(const char* str, T* value) { diff --git a/src/hotspot/share/utilities/utf8.hpp b/src/hotspot/share/utilities/utf8.hpp index 0ebd65b0658aa60a329a2a29cb35e259c250480d..e7b2905e04614adeed4b6535095207cda2039871 100644 --- a/src/hotspot/share/utilities/utf8.hpp +++ b/src/hotspot/share/utilities/utf8.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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,7 +25,9 @@ #ifndef SHARE_UTILITIES_UTF8_HPP #define SHARE_UTILITIES_UTF8_HPP -#include "memory/allocation.hpp" +#include "jni.h" +#include "memory/allStatic.hpp" +#include "utilities/debug.hpp" // Low-level interface for UTF8 strings diff --git a/src/hotspot/share/utilities/vmError.cpp b/src/hotspot/share/utilities/vmError.cpp index 4ae43cedf5215da88c240c1fa05569b0e58940cc..1d72092f8ae6f52592715565f13b9f5a6a18fe5f 100644 --- a/src/hotspot/share/utilities/vmError.cpp +++ b/src/hotspot/share/utilities/vmError.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2017, 2020 SAP SE. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -1654,7 +1654,7 @@ void VMError::report_and_die(int id, const char* message, const char* detail_fmt _current_step_info = ""; if (fd_log > 3) { - close(fd_log); + ::close(fd_log); fd_log = -1; } @@ -1676,7 +1676,7 @@ void VMError::report_and_die(int id, const char* message, const char* detail_fmt const bool overwrite = false; // We do not overwrite an existing replay file. int fd = prepare_log_file(ReplayDataFile, "replay_pid%p.log", overwrite, buffer, sizeof(buffer)); if (fd != -1) { - FILE* replay_data_file = os::open(fd, "w"); + FILE* replay_data_file = os::fdopen(fd, "w"); if (replay_data_file != NULL) { fileStream replay_data_stream(replay_data_file, /*need_close=*/true); env->dump_replay_data_unsafe(&replay_data_stream); diff --git a/src/java.base/linux/classes/sun/nio/fs/LinuxFileStore.java b/src/java.base/linux/classes/sun/nio/fs/LinuxFileStore.java index 1b6fce47fc718bcd282549d492c5dcc32012cceb..6ff8fe4bbf8012d765ebb606bdd803c4bcf15a8c 100644 --- a/src/java.base/linux/classes/sun/nio/fs/LinuxFileStore.java +++ b/src/java.base/linux/classes/sun/nio/fs/LinuxFileStore.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2021, 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 @@ -112,7 +112,7 @@ class LinuxFileStore int[] majorMinorMicro = new int[3]; int length = Math.min(matches.length, majorMinorMicro.length); for (int i = 0; i < length; i++) { - majorMinorMicro[i] = Integer.valueOf(matches[i]); + majorMinorMicro[i] = Integer.parseInt(matches[i]); } return majorMinorMicro; } diff --git a/src/java.base/macosx/classes/apple/security/KeychainStore.java b/src/java.base/macosx/classes/apple/security/KeychainStore.java index cf97d4e04c0e90a96604197ee3164db16d0b87c1..688d280f83812cde0d5aea750664a2d156b623a0 100644 --- a/src/java.base/macosx/classes/apple/security/KeychainStore.java +++ b/src/java.base/macosx/classes/apple/security/KeychainStore.java @@ -945,7 +945,6 @@ public final class KeychainStore extends KeyStoreSpi { byte[] safeContentsData; ContentInfo safeContents; DerInputStream sci; - byte[] eAlgId = null; sci = new DerInputStream(safeContentsArray[i].toByteArray()); safeContents = new ContentInfo(sci); @@ -984,7 +983,6 @@ public final class KeychainStore extends KeyStoreSpi { ObjectIdentifier bagId; DerInputStream sbi; DerValue bagValue; - Object bagItem = null; sbi = safeBags[i].toDerInputStream(); bagId = sbi.getOID(); diff --git a/src/java.base/share/classes/com/sun/crypto/provider/BlockCipherParamsCore.java b/src/java.base/share/classes/com/sun/crypto/provider/BlockCipherParamsCore.java index 20af0c78309c70f0d45084b8b292820845865bd4..738b34d3aeb41b0d46526f32a6ecce12ec3f0045 100644 --- a/src/java.base/share/classes/com/sun/crypto/provider/BlockCipherParamsCore.java +++ b/src/java.base/share/classes/com/sun/crypto/provider/BlockCipherParamsCore.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2022, 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,7 @@ final class BlockCipherParamsCore { T getParameterSpec(Class paramSpec) throws InvalidParameterSpecException { - if (IvParameterSpec.class.isAssignableFrom(paramSpec)) { + if (paramSpec.isAssignableFrom(IvParameterSpec.class)) { return paramSpec.cast(new IvParameterSpec(this.iv)); } else { throw new InvalidParameterSpecException diff --git a/src/java.base/share/classes/com/sun/crypto/provider/BlowfishCrypt.java b/src/java.base/share/classes/com/sun/crypto/provider/BlowfishCrypt.java index f5483f7deff51dfc93b8d808aa6708ff7c7e37de..5fde830e519fa337945343e42ba1883fdc668258 100644 --- a/src/java.base/share/classes/com/sun/crypto/provider/BlowfishCrypt.java +++ b/src/java.base/share/classes/com/sun/crypto/provider/BlowfishCrypt.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2021, 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 @@ -64,7 +64,7 @@ final class BlowfishCrypt extends SymmetricCipher throw new InvalidKeyException("Key too long (> 448 bits)"); } // Step 1: Init P and then S arrays from pi bytes - int i, j, count; + int i, j; System.arraycopy(pi, 0, p, 0, 18); System.arraycopy(pi, 18, s0, 0, 256); diff --git a/src/java.base/share/classes/com/sun/crypto/provider/ChaCha20Poly1305Parameters.java b/src/java.base/share/classes/com/sun/crypto/provider/ChaCha20Poly1305Parameters.java index ad31fb6f6914fd74e4dbf96b9fb84e55b808953f..762827d0152ff705411f67be7affd0123c01fd6e 100644 --- a/src/java.base/share/classes/com/sun/crypto/provider/ChaCha20Poly1305Parameters.java +++ b/src/java.base/share/classes/com/sun/crypto/provider/ChaCha20Poly1305Parameters.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2022, 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 @@ -147,7 +147,7 @@ public final class ChaCha20Poly1305Parameters extends AlgorithmParametersSpi { T engineGetParameterSpec(Class paramSpec) throws InvalidParameterSpecException { - if (IvParameterSpec.class.isAssignableFrom(paramSpec)) { + if (paramSpec.isAssignableFrom(IvParameterSpec.class)) { return paramSpec.cast(new IvParameterSpec(nonce)); } else { throw new InvalidParameterSpecException diff --git a/src/java.base/share/classes/com/sun/crypto/provider/CipherCore.java b/src/java.base/share/classes/com/sun/crypto/provider/CipherCore.java index 93eede032f1a586c73f500d6c616f7bee389c1d5..64ce01c53ab5bd6a11d370ab7e749bf558bb681a 100644 --- a/src/java.base/share/classes/com/sun/crypto/provider/CipherCore.java +++ b/src/java.base/share/classes/com/sun/crypto/provider/CipherCore.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2022, 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 @@ -812,10 +812,13 @@ final class CipherCore { if (outputCapacity < estOutSize) { cipher.save(); } - // create temporary output buffer if the estimated size is larger - // than the user-provided buffer. - internalOutput = new byte[estOutSize]; - offset = 0; + if (outputCapacity < estOutSize || padding != null) { + // create temporary output buffer if the estimated size is larger + // than the user-provided buffer or a padding needs to be removed + // before copying the unpadded result to the output buffer + internalOutput = new byte[estOutSize]; + offset = 0; + } } byte[] outBuffer = (internalOutput != null) ? internalOutput : output; diff --git a/src/java.base/share/classes/com/sun/crypto/provider/DHParameters.java b/src/java.base/share/classes/com/sun/crypto/provider/DHParameters.java index da3129805b635d36597f1828cf8aa3ec6fa4270c..859c64dc4054266f76328f6ba38a64f452ab27e0 100644 --- a/src/java.base/share/classes/com/sun/crypto/provider/DHParameters.java +++ b/src/java.base/share/classes/com/sun/crypto/provider/DHParameters.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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 @@ -98,7 +98,7 @@ public final class DHParameters extends AlgorithmParametersSpi { T engineGetParameterSpec(Class paramSpec) throws InvalidParameterSpecException { - if (DHParameterSpec.class.isAssignableFrom(paramSpec)) { + if (paramSpec.isAssignableFrom(DHParameterSpec.class)) { return paramSpec.cast(new DHParameterSpec(this.p, this.g, this.l)); } else { throw new InvalidParameterSpecException diff --git a/src/java.base/share/classes/com/sun/crypto/provider/GCMParameters.java b/src/java.base/share/classes/com/sun/crypto/provider/GCMParameters.java index 911ccc558241bc9b9a2de463bf7d807523e88fb2..8060ca9b7de4d59b9f2b2f448a1cac2bd98f90e4 100644 --- a/src/java.base/share/classes/com/sun/crypto/provider/GCMParameters.java +++ b/src/java.base/share/classes/com/sun/crypto/provider/GCMParameters.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2022, 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 @@ -107,7 +107,7 @@ public final class GCMParameters extends AlgorithmParametersSpi { T engineGetParameterSpec(Class paramSpec) throws InvalidParameterSpecException { - if (GCMParameterSpec.class.isAssignableFrom(paramSpec)) { + if (paramSpec.isAssignableFrom(GCMParameterSpec.class)) { return paramSpec.cast(new GCMParameterSpec(tLen * 8, iv)); } else { throw new InvalidParameterSpecException diff --git a/src/java.base/share/classes/com/sun/crypto/provider/KeyProtector.java b/src/java.base/share/classes/com/sun/crypto/provider/KeyProtector.java index b13a1a905d7ccf1091b26ceb0863ab2530c66cb3..570aca63e09b241d407dcdf63dde12055e173822 100644 --- a/src/java.base/share/classes/com/sun/crypto/provider/KeyProtector.java +++ b/src/java.base/share/classes/com/sun/crypto/provider/KeyProtector.java @@ -177,6 +177,10 @@ final class KeyProtector { byte[] encodedParams = encrInfo.getAlgorithm().getEncodedParams(); + if (encodedParams == null) { + throw new IOException("Missing PBE parameters"); + } + // parse the PBE parameters into the corresponding spec AlgorithmParameters pbeParams = AlgorithmParameters.getInstance("PBE"); diff --git a/src/java.base/share/classes/com/sun/crypto/provider/OAEPParameters.java b/src/java.base/share/classes/com/sun/crypto/provider/OAEPParameters.java index bdb1da97b63c7f52315fa5340671463f15ba9d9a..d8bf4386455ead620155807c1c266154f1852ab4 100644 --- a/src/java.base/share/classes/com/sun/crypto/provider/OAEPParameters.java +++ b/src/java.base/share/classes/com/sun/crypto/provider/OAEPParameters.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2022, 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 @@ -107,8 +107,12 @@ public final class OAEPParameters extends AlgorithmParametersSpi { if (!val.getOID().equals(OID_MGF1)) { throw new IOException("Only MGF1 mgf is supported"); } + byte[] encodedParams = val.getEncodedParams(); + if (encodedParams == null) { + throw new IOException("Missing MGF1 parameters"); + } AlgorithmId params = AlgorithmId.parse( - new DerValue(val.getEncodedParams())); + new DerValue(encodedParams)); mgfSpec = switch (params.getName()) { case "SHA-1" -> MGF1ParameterSpec.SHA1; case "SHA-224" -> MGF1ParameterSpec.SHA224; @@ -129,7 +133,12 @@ public final class OAEPParameters extends AlgorithmParametersSpi { if (!val.getOID().equals(OID_PSpecified)) { throw new IOException("Wrong OID for pSpecified"); } - p = DerValue.wrap(val.getEncodedParams()).getOctetString(); + byte[] encodedParams = val.getEncodedParams(); + if (encodedParams == null) { + throw new IOException("Missing pSpecified label"); + } + + p = DerValue.wrap(encodedParams).getOctetString(); } else { p = new byte[0]; } @@ -148,7 +157,7 @@ public final class OAEPParameters extends AlgorithmParametersSpi { protected T engineGetParameterSpec(Class paramSpec) throws InvalidParameterSpecException { - if (OAEPParameterSpec.class.isAssignableFrom(paramSpec)) { + if (paramSpec.isAssignableFrom(OAEPParameterSpec.class)) { return paramSpec.cast( new OAEPParameterSpec(mdName, "MGF1", mgfSpec, new PSource.PSpecified(p))); diff --git a/src/java.base/share/classes/com/sun/crypto/provider/PBEKeyFactory.java b/src/java.base/share/classes/com/sun/crypto/provider/PBEKeyFactory.java index ea2dfbf31aed646f6d1ef3781b31345f2548bf37..ed09fe94118bcd50a3682eec9218d1110e864e4b 100644 --- a/src/java.base/share/classes/com/sun/crypto/provider/PBEKeyFactory.java +++ b/src/java.base/share/classes/com/sun/crypto/provider/PBEKeyFactory.java @@ -243,7 +243,7 @@ abstract class PBEKeyFactory extends SecretKeyFactorySpi { // Check if requested key spec is amongst the valid ones if ((keySpecCl != null) - && PBEKeySpec.class.isAssignableFrom(keySpecCl)) { + && keySpecCl.isAssignableFrom(PBEKeySpec.class)) { byte[] passwdBytes = key.getEncoded(); char[] passwdChars = new char[passwdBytes.length]; for (int i=0; i paramSpec) throws InvalidParameterSpecException { - if (PBEParameterSpec.class.isAssignableFrom(paramSpec)) { + if (paramSpec.isAssignableFrom(PBEParameterSpec.class)) { return paramSpec.cast( new PBEParameterSpec(this.salt, this.iCount, this.cipherParam)); } else { diff --git a/src/java.base/share/classes/com/sun/crypto/provider/PBES2Parameters.java b/src/java.base/share/classes/com/sun/crypto/provider/PBES2Parameters.java index a26c95b16d3703960700b709fd830cd11932e391..4e3c7e44a3837beb2ec5e27e5098e9db82404f73 100644 --- a/src/java.base/share/classes/com/sun/crypto/provider/PBES2Parameters.java +++ b/src/java.base/share/classes/com/sun/crypto/provider/PBES2Parameters.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2022, 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 @@ -334,7 +334,7 @@ abstract class PBES2Parameters extends AlgorithmParametersSpi { T engineGetParameterSpec(Class paramSpec) throws InvalidParameterSpecException { - if (PBEParameterSpec.class.isAssignableFrom(paramSpec)) { + if (paramSpec.isAssignableFrom(PBEParameterSpec.class)) { return paramSpec.cast( new PBEParameterSpec(this.salt, this.iCount, this.cipherParam)); } else { diff --git a/src/java.base/share/classes/com/sun/crypto/provider/PBKDF2Core.java b/src/java.base/share/classes/com/sun/crypto/provider/PBKDF2Core.java index 87207c778ecb43e3684219296d0ffdcac46a7c92..c9e754685828e51c2cecd8b1c4699da019723616 100644 --- a/src/java.base/share/classes/com/sun/crypto/provider/PBKDF2Core.java +++ b/src/java.base/share/classes/com/sun/crypto/provider/PBKDF2Core.java @@ -92,7 +92,7 @@ abstract class PBKDF2Core extends SecretKeyFactorySpi { if (key instanceof javax.crypto.interfaces.PBEKey) { // Check if requested key spec is amongst the valid ones if ((keySpecCl != null) - && PBEKeySpec.class.isAssignableFrom(keySpecCl)) { + && keySpecCl.isAssignableFrom(PBEKeySpec.class)) { javax.crypto.interfaces.PBEKey pKey = (javax.crypto.interfaces.PBEKey) key; char[] passwd = pKey.getPassword(); diff --git a/src/java.base/share/classes/com/sun/crypto/provider/PBKDF2HmacSHA1Factory.java b/src/java.base/share/classes/com/sun/crypto/provider/PBKDF2HmacSHA1Factory.java deleted file mode 100644 index d8070e968b66e18625173781a95221a0c4c55a42..0000000000000000000000000000000000000000 --- a/src/java.base/share/classes/com/sun/crypto/provider/PBKDF2HmacSHA1Factory.java +++ /dev/null @@ -1,167 +0,0 @@ -/* - * Copyright (c) 2005, 2021, 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.crypto.provider; - -import java.security.InvalidKeyException; -import java.security.spec.KeySpec; -import java.security.spec.InvalidKeySpecException; -import java.util.Arrays; -import javax.crypto.SecretKey; -import javax.crypto.SecretKeyFactorySpi; -import javax.crypto.spec.PBEKeySpec; - -/** - * This class implements a key factory for PBE keys derived using - * PBKDF2 with HmacSHA1 psuedo random function(PRF) as defined in - * PKCS#5 v2.0. - * - * @author Valerie Peng - * - */ -public final class PBKDF2HmacSHA1Factory extends SecretKeyFactorySpi { - - /** - * Empty constructor - */ - public PBKDF2HmacSHA1Factory() { - } - - /** - * Generates a SecretKey object from the provided key - * specification (key material). - * - * @param keySpec the specification (key material) of the secret key - * - * @return the secret key - * - * @exception InvalidKeySpecException if the given key specification - * is inappropriate for this key factory to produce a public key. - */ - protected SecretKey engineGenerateSecret(KeySpec keySpec) - throws InvalidKeySpecException - { - if (!(keySpec instanceof PBEKeySpec)) { - throw new InvalidKeySpecException("Invalid key spec"); - } - PBEKeySpec ks = (PBEKeySpec) keySpec; - return new PBKDF2KeyImpl(ks, "HmacSHA1"); - } - - /** - * Returns a specification (key material) of the given key - * in the requested format. - * - * @param key the key - * - * @param keySpecCl the requested format in which the key material shall be - * returned - * - * @return the underlying key specification (key material) in the - * requested format - * - * @exception InvalidKeySpecException if the requested key - * specification is inappropriate for the given key, or the - * given key cannot be processed (e.g., the given key has an - * unrecognized algorithm or format). - */ - protected KeySpec engineGetKeySpec(SecretKey key, Class keySpecCl) - throws InvalidKeySpecException { - if (key instanceof javax.crypto.interfaces.PBEKey) { - // Check if requested key spec is amongst the valid ones - if ((keySpecCl != null) - && PBEKeySpec.class.isAssignableFrom(keySpecCl)) { - javax.crypto.interfaces.PBEKey pKey = - (javax.crypto.interfaces.PBEKey) key; - char[] passwd = pKey.getPassword(); - byte[] encoded = pKey.getEncoded(); - try { - return new PBEKeySpec(passwd, pKey.getSalt(), - pKey.getIterationCount(), encoded.length * 8); - } finally { - if (passwd != null) { - Arrays.fill(passwd, (char) 0); - } - Arrays.fill(encoded, (byte)0); - } - } else { - throw new InvalidKeySpecException("Invalid key spec"); - } - } else { - throw new InvalidKeySpecException("Invalid key " + - "format/algorithm"); - } - } - - /** - * Translates a SecretKey object, whose provider may be - * unknown or potentially untrusted, into a corresponding - * SecretKey object of this key factory. - * - * @param key the key whose provider is unknown or untrusted - * - * @return the translated key - * - * @exception InvalidKeyException if the given key cannot be processed by - * this key factory. - */ - protected SecretKey engineTranslateKey(SecretKey key) - throws InvalidKeyException { - if ((key != null) && - (key.getAlgorithm().equalsIgnoreCase("PBKDF2WithHmacSHA1")) && - (key.getFormat().equalsIgnoreCase("RAW"))) { - - // Check if key originates from this factory - if (key instanceof com.sun.crypto.provider.PBKDF2KeyImpl) { - return key; - } - // Check if key implements the PBEKey - if (key instanceof javax.crypto.interfaces.PBEKey) { - javax.crypto.interfaces.PBEKey pKey = - (javax.crypto.interfaces.PBEKey) key; - char[] password = pKey.getPassword(); - byte[] encoding = pKey.getEncoded(); - PBEKeySpec spec = - new PBEKeySpec(password, - pKey.getSalt(), - pKey.getIterationCount(), - encoding.length*8); - try { - return new PBKDF2KeyImpl(spec, "HmacSHA1"); - } catch (InvalidKeySpecException re) { - throw new InvalidKeyException - ("Invalid key component(s)", re); - } finally { - if (password != null) { - Arrays.fill(password, (char) 0); - spec.clearPassword(); - } - Arrays.fill(encoding, (byte)0); - } - } - } - throw new InvalidKeyException("Invalid key format/algorithm"); - } -} diff --git a/src/java.base/share/classes/com/sun/crypto/provider/RC2Parameters.java b/src/java.base/share/classes/com/sun/crypto/provider/RC2Parameters.java index e33ab101d707844eaae6fb19c3d0ff60ba64ea4f..919e1e7b2e93aef78b7400228ae23c4d434c7762 100644 --- a/src/java.base/share/classes/com/sun/crypto/provider/RC2Parameters.java +++ b/src/java.base/share/classes/com/sun/crypto/provider/RC2Parameters.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2022, 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 @@ -180,7 +180,7 @@ public final class RC2Parameters extends AlgorithmParametersSpi { T engineGetParameterSpec(Class paramSpec) throws InvalidParameterSpecException { - if (RC2ParameterSpec.class.isAssignableFrom(paramSpec)) { + if (paramSpec.isAssignableFrom(RC2ParameterSpec.class)) { return paramSpec.cast((iv == null ? new RC2ParameterSpec(effectiveKeySize) : new RC2ParameterSpec(effectiveKeySize, iv))); diff --git a/src/java.base/share/classes/java/io/ClassCache.java b/src/java.base/share/classes/java/io/ClassCache.java index a3901d479ef12e933ab6bcc1ae9f3a0d87b070be..48e7a36c05ab60bbeed37a9ab40adfa111e4d192 100644 --- a/src/java.base/share/classes/java/io/ClassCache.java +++ b/src/java.base/share/classes/java/io/ClassCache.java @@ -28,6 +28,7 @@ package java.io; import java.lang.ref.Reference; import java.lang.ref.ReferenceQueue; import java.lang.ref.SoftReference; +import java.util.Objects; // Maps Class instances to values of type T. Under memory pressure, the // mapping is released (under soft references GC policy) and would be @@ -38,19 +39,29 @@ abstract class ClassCache { private static class CacheRef extends SoftReference { private final Class type; + private T strongReferent; CacheRef(T referent, ReferenceQueue queue, Class type) { super(referent, queue); this.type = type; + this.strongReferent = referent; } Class getType() { return type; } + + T getStrong() { + return strongReferent; + } + + void clearStrong() { + strongReferent = null; + } } private final ReferenceQueue queue; - private final ClassValue> map; + private final ClassValue> map; protected abstract T computeValue(Class cl); @@ -58,23 +69,41 @@ abstract class ClassCache { queue = new ReferenceQueue<>(); map = new ClassValue<>() { @Override - protected SoftReference computeValue(Class type) { - return new CacheRef<>(ClassCache.this.computeValue(type), queue, type); + protected CacheRef computeValue(Class type) { + T v = ClassCache.this.computeValue(type); + Objects.requireNonNull(v); + return new CacheRef<>(v, queue, type); } }; } T get(Class cl) { - processQueue(); - T val; - do { - SoftReference ref = map.get(cl); - val = ref.get(); - if (val == null) { - map.remove(cl); + while (true) { + processQueue(); + + CacheRef ref = map.get(cl); + + // Case 1: A recently created CacheRef. + // We might still have strong referent, and can return it. + // This guarantees progress for at least one thread on every CacheRef. + // Clear the strong referent before returning to make the cache soft. + T strongVal = ref.getStrong(); + if (strongVal != null) { + ref.clearStrong(); + return strongVal; + } + + // Case 2: Older or recently cleared CacheRef. + // Check if its soft referent is still available, and return it. + T val = ref.get(); + if (val != null) { + return val; } - } while (val == null); - return val; + + // Case 3: The reference was cleared. + // Clear the mapping and retry. + map.remove(cl); + } } private void processQueue() { diff --git a/src/java.base/share/classes/java/io/DataInput.java b/src/java.base/share/classes/java/io/DataInput.java index b8088ff78da2a6ee43839a670b49543327ebf00e..9fdc6bbaf52f68234dda4c96d93b5725ddf2fcdb 100644 --- a/src/java.base/share/classes/java/io/DataInput.java +++ b/src/java.base/share/classes/java/io/DataInput.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2022, 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 @@ -493,7 +493,7 @@ public interface DataInput { * is encountered, it is discarded and reading * ceases. If the character {@code '\r'} * is encountered, it is discarded and, if - * the following byte converts to the + * the following byte converts to the * character {@code '\n'}, then that is * discarded also; reading then ceases. If * end of file is encountered before either diff --git a/src/java.base/share/classes/java/io/FilenameFilter.java b/src/java.base/share/classes/java/io/FilenameFilter.java index fcd81479ee12eaa4ad2e1a4a1d8caa1138039daa..43e041d546d0d1b3bd2ea5f305163f7bac4e478e 100644 --- a/src/java.base/share/classes/java/io/FilenameFilter.java +++ b/src/java.base/share/classes/java/io/FilenameFilter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1994, 2022, 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 @@ -34,11 +34,12 @@ package java.io; * * @author Arthur van Hoff * @author Jonathan Payne - * @see java.awt.FileDialog#setFilenameFilter(java.io.FilenameFilter) + * @see java.desktop/java.awt.FileDialog#setFilenameFilter(java.io.FilenameFilter) * @see java.io.File * @see java.io.File#list(java.io.FilenameFilter) * @since 1.0 */ +@SuppressWarnings("doclint:reference") // cross-module links @FunctionalInterface public interface FilenameFilter { /** diff --git a/src/java.base/share/classes/java/io/ObjectInputStream.java b/src/java.base/share/classes/java/io/ObjectInputStream.java index de339627d5bad77e041a4b913ee89e4d2cdba7d8..dec50deb9c9bec68729d705864491234fd25c266 100644 --- a/src/java.base/share/classes/java/io/ObjectInputStream.java +++ b/src/java.base/share/classes/java/io/ObjectInputStream.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,11 +26,9 @@ package java.io; import java.io.ObjectInputFilter.Config; -import java.io.ObjectStreamClass.WeakClassKey; import java.io.ObjectStreamClass.RecordSupport; import java.lang.System.Logger; import java.lang.invoke.MethodHandle; -import java.lang.ref.ReferenceQueue; import java.lang.reflect.Array; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Modifier; @@ -43,10 +41,6 @@ import java.security.PrivilegedExceptionAction; import java.util.Arrays; import java.util.Map; import java.util.Objects; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; - -import static java.io.ObjectStreamClass.processQueue; import jdk.internal.access.SharedSecrets; import jdk.internal.event.DeserializationEvent; @@ -282,12 +276,13 @@ public class ObjectInputStream private static class Caches { /** cache of subclass security audit results */ - static final ConcurrentMap subclassAudits = - new ConcurrentHashMap<>(); - - /** queue for WeakReferences to audited subclasses */ - static final ReferenceQueue> subclassAuditsQueue = - new ReferenceQueue<>(); + static final ClassValue subclassAudits = + new ClassValue<>() { + @Override + protected Boolean computeValue(Class type) { + return auditSubclass(type); + } + }; /** * Property to permit setting a filter after objects @@ -743,7 +738,7 @@ public class ObjectInputStream * restored a final set of validations can be performed. * * @param obj the object to receive the validation callback. - * @param prio controls the order of callbacks;zero is a good default. + * @param prio controls the order of callbacks; zero is a good default. * Use higher numbers to be called back earlier, lower numbers for * later callbacks. Within a priority, callbacks are processed in * no particular order. @@ -1320,6 +1315,8 @@ public class ObjectInputStream *
  • each object reference previously deserialized from the stream * (class is {@code null}, arrayLength is -1), *
  • each regular class (class is not {@code null}, arrayLength is -1), + *
  • each interface class explicitly referenced in the stream + * (it is not called for interfaces implemented by classes in the stream), *
  • each interface of a dynamic proxy and the dynamic proxy class itself * (class is not {@code null}, arrayLength is -1), *
  • each array is filtered using the array type and length of the array @@ -1638,13 +1635,7 @@ public class ObjectInputStream if (sm == null) { return; } - processQueue(Caches.subclassAuditsQueue, Caches.subclassAudits); - WeakClassKey key = new WeakClassKey(cl, Caches.subclassAuditsQueue); - Boolean result = Caches.subclassAudits.get(key); - if (result == null) { - result = auditSubclass(cl); - Caches.subclassAudits.putIfAbsent(key, result); - } + boolean result = Caches.subclassAudits.get(cl); if (!result) { sm.checkPermission(SUBCLASS_IMPLEMENTATION_PERMISSION); } @@ -2082,6 +2073,30 @@ public class ObjectInputStream totalObjectRefs++; depth++; desc.initNonProxy(readDesc, cl, resolveEx, readClassDesc(false)); + + if (cl != null) { + // Check that serial filtering has been done on the local class descriptor's superclass, + // in case it does not appear in the stream. + + // Find the next super descriptor that has a local class descriptor. + // Descriptors for which there is no local class are ignored. + ObjectStreamClass superLocal = null; + for (ObjectStreamClass sDesc = desc.getSuperDesc(); sDesc != null; sDesc = sDesc.getSuperDesc()) { + if ((superLocal = sDesc.getLocalDesc()) != null) { + break; + } + } + + // Scan local descriptor superclasses for a match with the local descriptor of the super found above. + // For each super descriptor before the match, invoke the serial filter on the class. + // The filter is invoked for each class that has not already been filtered + // but would be filtered if the instance had been serialized by this Java runtime. + for (ObjectStreamClass lDesc = desc.getLocalDesc().getSuperDesc(); + lDesc != null && lDesc != superLocal; + lDesc = lDesc.getSuperDesc()) { + filterCheck(lDesc.forClass(), -1); + } + } } finally { depth--; } @@ -2540,6 +2555,13 @@ public class ObjectInputStream throw new InternalError(); } clear(); + // Check that an object follows the TC_EXCEPTION typecode + byte tc = bin.peekByte(); + if (tc != TC_OBJECT && + tc != TC_REFERENCE) { + throw new StreamCorruptedException( + String.format("invalid type code: %02X", tc)); + } return (IOException) readObject0(Object.class, false); } diff --git a/src/java.base/share/classes/java/io/ObjectOutputStream.java b/src/java.base/share/classes/java/io/ObjectOutputStream.java index 2a4d455c3a042539fa322f984e49c40fb0ff0b79..811ef3bcc20c26cdffcec150ff5171e357edf7e9 100644 --- a/src/java.base/share/classes/java/io/ObjectOutputStream.java +++ b/src/java.base/share/classes/java/io/ObjectOutputStream.java @@ -25,8 +25,6 @@ package java.io; -import java.io.ObjectStreamClass.WeakClassKey; -import java.lang.ref.ReferenceQueue; import java.security.AccessController; import java.security.PrivilegedAction; import java.util.ArrayList; @@ -34,9 +32,6 @@ import java.util.Arrays; import java.util.List; import java.util.Objects; import java.util.StringJoiner; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; -import static java.io.ObjectStreamClass.processQueue; import sun.reflect.misc.ReflectUtil; /** @@ -177,12 +172,13 @@ public class ObjectOutputStream private static class Caches { /** cache of subclass security audit results */ - static final ConcurrentMap subclassAudits = - new ConcurrentHashMap<>(); - - /** queue for WeakReferences to audited subclasses */ - static final ReferenceQueue> subclassAuditsQueue = - new ReferenceQueue<>(); + static final ClassValue subclassAudits = + new ClassValue<>() { + @Override + protected Boolean computeValue(Class type) { + return auditSubclass(type); + } + }; } /** filter stream for handling block data conversion */ @@ -1065,13 +1061,7 @@ public class ObjectOutputStream if (sm == null) { return; } - processQueue(Caches.subclassAuditsQueue, Caches.subclassAudits); - WeakClassKey key = new WeakClassKey(cl, Caches.subclassAuditsQueue); - Boolean result = Caches.subclassAudits.get(key); - if (result == null) { - result = auditSubclass(cl); - Caches.subclassAudits.putIfAbsent(key, result); - } + boolean result = Caches.subclassAudits.get(cl); if (!result) { sm.checkPermission(SUBCLASS_IMPLEMENTATION_PERMISSION); } diff --git a/src/java.base/share/classes/java/io/ObjectStreamClass.java b/src/java.base/share/classes/java/io/ObjectStreamClass.java index 343499863f05665f37dcf4b4531e1e77e6573922..86ed2b839d13727791114e7cc6f816147243bc97 100644 --- a/src/java.base/share/classes/java/io/ObjectStreamClass.java +++ b/src/java.base/share/classes/java/io/ObjectStreamClass.java @@ -28,9 +28,6 @@ package java.io; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodType; -import java.lang.ref.Reference; -import java.lang.ref.ReferenceQueue; -import java.lang.ref.WeakReference; import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; @@ -58,7 +55,6 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; import jdk.internal.misc.Unsafe; import jdk.internal.reflect.CallerSensitive; import jdk.internal.reflect.Reflection; @@ -2227,68 +2223,6 @@ public class ObjectStreamClass implements Serializable { return matches; } - /** - * Removes from the specified map any keys that have been enqueued - * on the specified reference queue. - */ - static void processQueue(ReferenceQueue> queue, - ConcurrentMap>, ?> map) - { - Reference> ref; - while((ref = queue.poll()) != null) { - map.remove(ref); - } - } - - /** - * Weak key for Class objects. - * - **/ - static class WeakClassKey extends WeakReference> { - /** - * saved value of the referent's identity hash code, to maintain - * a consistent hash code after the referent has been cleared - */ - private final int hash; - - /** - * Create a new WeakClassKey to the given object, registered - * with a queue. - */ - WeakClassKey(Class cl, ReferenceQueue> refQueue) { - super(cl, refQueue); - hash = System.identityHashCode(cl); - } - - /** - * Returns the identity hash code of the original referent. - */ - public int hashCode() { - return hash; - } - - /** - * Returns true if the given object is this identical - * WeakClassKey instance, or, if this object's referent has not - * been cleared, if the given object is another WeakClassKey - * instance with the identical non-null referent as this one. - */ - public boolean equals(Object obj) { - if (obj == this) { - return true; - } - - if (obj instanceof WeakClassKey) { - Class referent = get(); - return (referent != null) && - (((WeakClassKey) obj).refersTo(referent)); - } else { - return false; - } - } - } - /** * A LRA cache of record deserialization constructors. */ diff --git a/src/java.base/share/classes/java/io/PipedInputStream.java b/src/java.base/share/classes/java/io/PipedInputStream.java index c6034e193cf0fd0abf674e6d4cfc37effcbc20cb..0d733fa4c748a0a939107f26374db5ffba31f82f 100644 --- a/src/java.base/share/classes/java/io/PipedInputStream.java +++ b/src/java.base/share/classes/java/io/PipedInputStream.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2022, 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 @@ -222,7 +222,7 @@ public class PipedInputStream extends InputStream { * @param len the maximum number of bytes received * @throws IOException If the pipe is broken, * {@link #connect(java.io.PipedOutputStream) unconnected}, - * closed,or if an I/O error occurs. + * closed, or if an I/O error occurs. */ synchronized void receive(byte[] b, int off, int len) throws IOException { checkStateForReceive(); diff --git a/src/java.base/share/classes/java/lang/Character.java b/src/java.base/share/classes/java/lang/Character.java index 4a5d9afb5856e415f2cd1bd31a4b10403155057a..92e9b5b43f5688cf3bb9efa575a5de47f8f74fd7 100644 --- a/src/java.base/share/classes/java/lang/Character.java +++ b/src/java.base/share/classes/java/lang/Character.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2022, 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,7 @@ import static java.lang.constant.ConstantDescs.DEFAULT_NAME; * from the Unicode Consortium at * http://www.unicode.org. *

    - * Character information is based on the Unicode Standard, version 13.0. + * Character information is based on the Unicode Standard, version 14.0. *

    * The Java platform has supported different versions of the Unicode * Standard over time. Upgrades to newer versions of the Unicode Standard @@ -75,6 +75,8 @@ import static java.lang.constant.ConstantDescs.DEFAULT_NAME; * Unicode version * * + * Java SE 19 + * Unicode 14.0 * Java SE 15 * Unicode 13.0 * Java SE 13 @@ -735,10 +737,10 @@ class Character implements java.io.Serializable, Comparable, Constabl */ public static final class UnicodeBlock extends Subset { /** - * 684 - the expected number of entities + * 696 - the expected number of entities * 0.75 - the default load factor of HashMap */ - private static final int NUM_ENTITIES = 684; + private static final int NUM_ENTITIES = 696; private static Map map = new HashMap<>((int)(NUM_ENTITIES / 0.75f + 1.0f)); @@ -3424,6 +3426,120 @@ class Character implements java.io.Serializable, Comparable, Constabl "CJK UNIFIED IDEOGRAPHS EXTENSION G", "CJKUNIFIEDIDEOGRAPHSEXTENSIONG"); + /** + * Constant for the "Arabic Extended-B" Unicode + * character block. + * @since 19 + */ + public static final UnicodeBlock ARABIC_EXTENDED_B = + new UnicodeBlock("ARABIC_EXTENDED_B", + "ARABIC EXTENDED-B", + "ARABICEXTENDED-B"); + + /** + * Constant for the "Vithkuqi" Unicode + * character block. + * @since 19 + */ + public static final UnicodeBlock VITHKUQI = + new UnicodeBlock("VITHKUQI"); + + /** + * Constant for the "Latin Extended-F" Unicode + * character block. + * @since 19 + */ + public static final UnicodeBlock LATIN_EXTENDED_F = + new UnicodeBlock("LATIN_EXTENDED_F", + "LATIN EXTENDED-F", + "LATINEXTENDED-F"); + + /** + * Constant for the "Old Uyghur" Unicode + * character block. + * @since 19 + */ + public static final UnicodeBlock OLD_UYGHUR = + new UnicodeBlock("OLD_UYGHUR", + "OLD UYGHUR", + "OLDUYGHUR"); + + /** + * Constant for the "Unified Canadian Aboriginal Syllabics Extended-A" Unicode + * character block. + * @since 19 + */ + public static final UnicodeBlock UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_EXTENDED_A = + new UnicodeBlock("UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_EXTENDED_A", + "UNIFIED CANADIAN ABORIGINAL SYLLABICS EXTENDED-A", + "UNIFIEDCANADIANABORIGINALSYLLABICSEXTENDED-A"); + + /** + * Constant for the "Cypro-Minoan" Unicode + * character block. + * @since 19 + */ + public static final UnicodeBlock CYPRO_MINOAN = + new UnicodeBlock("CYPRO_MINOAN", + "CYPRO-MINOAN", + "CYPRO-MINOAN"); + + /** + * Constant for the "Tangsa" Unicode + * character block. + * @since 19 + */ + public static final UnicodeBlock TANGSA = + new UnicodeBlock("TANGSA"); + + /** + * Constant for the "Kana Extended-B" Unicode + * character block. + * @since 19 + */ + public static final UnicodeBlock KANA_EXTENDED_B = + new UnicodeBlock("KANA_EXTENDED_B", + "KANA EXTENDED-B", + "KANAEXTENDED-B"); + + /** + * Constant for the "Znamenny Musical Notation" Unicode + * character block. + * @since 19 + */ + public static final UnicodeBlock ZNAMENNY_MUSICAL_NOTATION = + new UnicodeBlock("ZNAMENNY_MUSICAL_NOTATION", + "ZNAMENNY MUSICAL NOTATION", + "ZNAMENNYMUSICALNOTATION"); + + /** + * Constant for the "Latin Extended-G" Unicode + * character block. + * @since 19 + */ + public static final UnicodeBlock LATIN_EXTENDED_G = + new UnicodeBlock("LATIN_EXTENDED_G", + "LATIN EXTENDED-G", + "LATINEXTENDED-G"); + + /** + * Constant for the "Toto" Unicode + * character block. + * @since 19 + */ + public static final UnicodeBlock TOTO = + new UnicodeBlock("TOTO"); + + /** + * Constant for the "Ethiopic Extended-B" Unicode + * character block. + * @since 19 + */ + public static final UnicodeBlock ETHIOPIC_EXTENDED_B = + new UnicodeBlock("ETHIOPIC_EXTENDED_B", + "ETHIOPIC EXTENDED-B", + "ETHIOPICEXTENDED-B"); + private static final int[] blockStarts = { 0x0000, // 0000..007F; Basic Latin 0x0080, // 0080..00FF; Latin-1 Supplement @@ -3445,7 +3561,7 @@ class Character implements java.io.Serializable, Comparable, Constabl 0x0800, // 0800..083F; Samaritan 0x0840, // 0840..085F; Mandaic 0x0860, // 0860..086F; Syriac Supplement - 0x0870, // unassigned + 0x0870, // 0870..089F; Arabic Extended-B 0x08A0, // 08A0..08FF; Arabic Extended-A 0x0900, // 0900..097F; Devanagari 0x0980, // 0980..09FF; Bengali @@ -3612,9 +3728,11 @@ class Character implements java.io.Serializable, Comparable, Constabl 0x104B0, // 104B0..104FF; Osage 0x10500, // 10500..1052F; Elbasan 0x10530, // 10530..1056F; Caucasian Albanian - 0x10570, // unassigned + 0x10570, // 10570..105BF; Vithkuqi + 0x105C0, // unassigned 0x10600, // 10600..1077F; Linear A - 0x10780, // unassigned + 0x10780, // 10780..107BF; Latin Extended-F + 0x107C0, // unassigned 0x10800, // 10800..1083F; Cypriot Syllabary 0x10840, // 10840..1085F; Imperial Aramaic 0x10860, // 10860..1087F; Palmyrene @@ -3646,7 +3764,7 @@ class Character implements java.io.Serializable, Comparable, Constabl 0x10EC0, // unassigned 0x10F00, // 10F00..10F2F; Old Sogdian 0x10F30, // 10F30..10F6F; Sogdian - 0x10F70, // unassigned + 0x10F70, // 10F70..10FAF; Old Uyghur 0x10FB0, // 10FB0..10FDF; Chorasmian 0x10FE0, // 10FE0..10FFF; Elymaic 0x11000, // 11000..1107F; Brahmi @@ -3670,8 +3788,8 @@ class Character implements java.io.Serializable, Comparable, Constabl 0x11660, // 11660..1167F; Mongolian Supplement 0x11680, // 11680..116CF; Takri 0x116D0, // unassigned - 0x11700, // 11700..1173F; Ahom - 0x11740, // unassigned + 0x11700, // 11700..1174F; Ahom + 0x11750, // unassigned 0x11800, // 11800..1184F; Dogra 0x11850, // unassigned 0x118A0, // 118A0..118FF; Warang Citi @@ -3680,7 +3798,7 @@ class Character implements java.io.Serializable, Comparable, Constabl 0x119A0, // 119A0..119FF; Nandinagari 0x11A00, // 11A00..11A4F; Zanabazar Square 0x11A50, // 11A50..11AAF; Soyombo - 0x11AB0, // unassigned + 0x11AB0, // 11AB0..11ABF; Unified Canadian Aboriginal Syllabics Extended-A 0x11AC0, // 11AC0..11AFF; Pau Cin Hau 0x11B00, // unassigned 0x11C00, // 11C00..11C6F; Bhaiksuki @@ -3697,6 +3815,7 @@ class Character implements java.io.Serializable, Comparable, Constabl 0x12400, // 12400..1247F; Cuneiform Numbers and Punctuation 0x12480, // 12480..1254F; Early Dynastic Cuneiform 0x12550, // unassigned + 0x12F90, // 12F90..12FFF; Cypro-Minoan 0x13000, // 13000..1342F; Egyptian Hieroglyphs 0x13430, // 13430..1343F; Egyptian Hieroglyph Format Controls 0x13440, // unassigned @@ -3704,7 +3823,7 @@ class Character implements java.io.Serializable, Comparable, Constabl 0x14680, // unassigned 0x16800, // 16800..16A3F; Bamum Supplement 0x16A40, // 16A40..16A6F; Mro - 0x16A70, // unassigned + 0x16A70, // 16A70..16ACF; Tangsa 0x16AD0, // 16AD0..16AFF; Bassa Vah 0x16B00, // 16B00..16B8F; Pahawh Hmong 0x16B90, // unassigned @@ -3716,8 +3835,9 @@ class Character implements java.io.Serializable, Comparable, Constabl 0x17000, // 17000..187FF; Tangut 0x18800, // 18800..18AFF; Tangut Components 0x18B00, // 18B00..18CFF; Khitan Small Script - 0x18D00, // 18D00..18D8F; Tangut Supplement - 0x18D90, // unassigned + 0x18D00, // 18D00..18D7F; Tangut Supplement + 0x18D80, // unassigned + 0x1AFF0, // 1AFF0..1AFFF; Kana Extended-B 0x1B000, // 1B000..1B0FF; Kana Supplement 0x1B100, // 1B100..1B12F; Kana Extended-A 0x1B130, // 1B130..1B16F; Small Kana Extension @@ -3726,6 +3846,8 @@ class Character implements java.io.Serializable, Comparable, Constabl 0x1BC00, // 1BC00..1BC9F; Duployan 0x1BCA0, // 1BCA0..1BCAF; Shorthand Format Controls 0x1BCB0, // unassigned + 0x1CF00, // 1CF00..1CFCF; Znamenny Musical Notation + 0x1CFD0, // unassigned 0x1D000, // 1D000..1D0FF; Byzantine Musical Symbols 0x1D100, // 1D100..1D1FF; Musical Symbols 0x1D200, // 1D200..1D24F; Ancient Greek Musical Notation @@ -3737,12 +3859,15 @@ class Character implements java.io.Serializable, Comparable, Constabl 0x1D400, // 1D400..1D7FF; Mathematical Alphanumeric Symbols 0x1D800, // 1D800..1DAAF; Sutton SignWriting 0x1DAB0, // unassigned + 0x1DF00, // 1DF00..1DFFF; Latin Extended-G 0x1E000, // 1E000..1E02F; Glagolitic Supplement 0x1E030, // unassigned 0x1E100, // 1E100..1E14F; Nyiakeng Puachue Hmong 0x1E150, // unassigned + 0x1E290, // 1E290..1E2BF; Toto 0x1E2C0, // 1E2C0..1E2FF; Wancho 0x1E300, // unassigned + 0x1E7E0, // 1E7E0..1E7FF; Ethiopic Extended-B 0x1E800, // 1E800..1E8DF; Mende Kikakui 0x1E8E0, // unassigned 0x1E900, // 1E900..1E95F; Adlam @@ -3810,7 +3935,7 @@ class Character implements java.io.Serializable, Comparable, Constabl SAMARITAN, MANDAIC, SYRIAC_SUPPLEMENT, - null, + ARABIC_EXTENDED_B, ARABIC_EXTENDED_A, DEVANAGARI, BENGALI, @@ -3977,8 +4102,10 @@ class Character implements java.io.Serializable, Comparable, Constabl OSAGE, ELBASAN, CAUCASIAN_ALBANIAN, + VITHKUQI, null, LINEAR_A, + LATIN_EXTENDED_F, null, CYPRIOT_SYLLABARY, IMPERIAL_ARAMAIC, @@ -4011,7 +4138,7 @@ class Character implements java.io.Serializable, Comparable, Constabl null, OLD_SOGDIAN, SOGDIAN, - null, + OLD_UYGHUR, CHORASMIAN, ELYMAIC, BRAHMI, @@ -4045,7 +4172,7 @@ class Character implements java.io.Serializable, Comparable, Constabl NANDINAGARI, ZANABAZAR_SQUARE, SOYOMBO, - null, + UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_EXTENDED_A, PAU_CIN_HAU, null, BHAIKSUKI, @@ -4062,6 +4189,7 @@ class Character implements java.io.Serializable, Comparable, Constabl CUNEIFORM_NUMBERS_AND_PUNCTUATION, EARLY_DYNASTIC_CUNEIFORM, null, + CYPRO_MINOAN, EGYPTIAN_HIEROGLYPHS, EGYPTIAN_HIEROGLYPH_FORMAT_CONTROLS, null, @@ -4069,7 +4197,7 @@ class Character implements java.io.Serializable, Comparable, Constabl null, BAMUM_SUPPLEMENT, MRO, - null, + TANGSA, BASSA_VAH, PAHAWH_HMONG, null, @@ -4083,6 +4211,7 @@ class Character implements java.io.Serializable, Comparable, Constabl KHITAN_SMALL_SCRIPT, TANGUT_SUPPLEMENT, null, + KANA_EXTENDED_B, KANA_SUPPLEMENT, KANA_EXTENDED_A, SMALL_KANA_EXTENSION, @@ -4091,6 +4220,8 @@ class Character implements java.io.Serializable, Comparable, Constabl DUPLOYAN, SHORTHAND_FORMAT_CONTROLS, null, + ZNAMENNY_MUSICAL_NOTATION, + null, BYZANTINE_MUSICAL_SYMBOLS, MUSICAL_SYMBOLS, ANCIENT_GREEK_MUSICAL_NOTATION, @@ -4102,12 +4233,15 @@ class Character implements java.io.Serializable, Comparable, Constabl MATHEMATICAL_ALPHANUMERIC_SYMBOLS, SUTTON_SIGNWRITING, null, + LATIN_EXTENDED_G, GLAGOLITIC_SUPPLEMENT, null, NYIAKENG_PUACHUE_HMONG, null, + TOTO, WANCHO, null, + ETHIOPIC_EXTENDED_B, MENDE_KIKAKUI, null, ADLAM, @@ -4217,7 +4351,7 @@ class Character implements java.io.Serializable, Comparable, Constabl /** * Returns the UnicodeBlock with the given name. Block * names are determined by The Unicode Standard. The file - * {@code Blocks-.txt} defines blocks for a particular + * {@code Blocks.txt} defines blocks for a particular * version of the standard. The {@link Character} class specifies * the version of the standard that it supports. *

    @@ -5116,6 +5250,36 @@ class Character implements java.io.Serializable, Comparable, Constabl */ KHITAN_SMALL_SCRIPT, + /** + * Unicode script "Vithkuqi". + * @since 19 + */ + VITHKUQI, + + /** + * Unicode script "Old Uyghur". + * @since 19 + */ + OLD_UYGHUR, + + /** + * Unicode script "Cypro Minoan". + * @since 19 + */ + CYPRO_MINOAN, + + /** + * Unicode script "Tangsa". + * @since 19 + */ + TANGSA, + + /** + * Unicode script "Toto". + * @since 19 + */ + TOTO, + /** * Unicode script "Unknown". */ @@ -5185,9 +5349,7 @@ class Character implements java.io.Serializable, Comparable, Constabl 0x060C, // 060C ; COMMON 0x060D, // 060D..061A; ARABIC 0x061B, // 061B ; COMMON - 0x061C, // 061C ; ARABIC - 0x061D, // 061D ; UNKNOWN - 0x061E, // 061E ; ARABIC + 0x061C, // 061C..061E; ARABIC 0x061F, // 061F ; COMMON 0x0620, // 0620..063F; ARABIC 0x0640, // 0640 ; COMMON @@ -5218,12 +5380,12 @@ class Character implements java.io.Serializable, Comparable, Constabl 0x085E, // 085E ; MANDAIC 0x085F, // 085F ; UNKNOWN 0x0860, // 0860..086A; SYRIAC - 0x086B, // 086B..089F; UNKNOWN - 0x08A0, // 08A0..08B4; ARABIC - 0x08B5, // 08B5 ; UNKNOWN - 0x08B6, // 08B6..08C7; ARABIC - 0x08C8, // 08C8..08D2; UNKNOWN - 0x08D3, // 08D3..08E1; ARABIC + 0x086B, // 086B..086F; UNKNOWN + 0x0870, // 0870..088E; ARABIC + 0x088F, // 088F ; UNKNOWN + 0x0890, // 0890..0891; ARABIC + 0x0892, // 0892..0897; UNKNOWN + 0x0898, // 0898..08E1; ARABIC 0x08E2, // 08E2 ; COMMON 0x08E3, // 08E3..08FF; ARABIC 0x0900, // 0900..0950; DEVANAGARI @@ -5386,8 +5548,8 @@ class Character implements java.io.Serializable, Comparable, Constabl 0x0C12, // 0C12..0C28; TELUGU 0x0C29, // 0C29 ; UNKNOWN 0x0C2A, // 0C2A..0C39; TELUGU - 0x0C3A, // 0C3A..0C3C; UNKNOWN - 0x0C3D, // 0C3D..0C44; TELUGU + 0x0C3A, // 0C3A..0C3B; UNKNOWN + 0x0C3C, // 0C3C..0C44; TELUGU 0x0C45, // 0C45 ; UNKNOWN 0x0C46, // 0C46..0C48; TELUGU 0x0C49, // 0C49 ; UNKNOWN @@ -5396,7 +5558,9 @@ class Character implements java.io.Serializable, Comparable, Constabl 0x0C55, // 0C55..0C56; TELUGU 0x0C57, // 0C57 ; UNKNOWN 0x0C58, // 0C58..0C5A; TELUGU - 0x0C5B, // 0C5B..0C5F; UNKNOWN + 0x0C5B, // 0C5B..0C5C; UNKNOWN + 0x0C5D, // 0C5D ; TELUGU + 0x0C5E, // 0C5E..0C5F; UNKNOWN 0x0C60, // 0C60..0C63; TELUGU 0x0C64, // 0C64..0C65; UNKNOWN 0x0C66, // 0C66..0C6F; TELUGU @@ -5419,8 +5583,8 @@ class Character implements java.io.Serializable, Comparable, Constabl 0x0CCA, // 0CCA..0CCD; KANNADA 0x0CCE, // 0CCE..0CD4; UNKNOWN 0x0CD5, // 0CD5..0CD6; KANNADA - 0x0CD7, // 0CD7..0CDD; UNKNOWN - 0x0CDE, // 0CDE ; KANNADA + 0x0CD7, // 0CD7..0CDC; UNKNOWN + 0x0CDD, // 0CDD..0CDE; KANNADA 0x0CDF, // 0CDF ; UNKNOWN 0x0CE0, // 0CE0..0CE3; KANNADA 0x0CE4, // 0CE4..0CE5; UNKNOWN @@ -5565,10 +5729,9 @@ class Character implements java.io.Serializable, Comparable, Constabl 0x16EB, // 16EB..16ED; COMMON 0x16EE, // 16EE..16F8; RUNIC 0x16F9, // 16F9..16FF; UNKNOWN - 0x1700, // 1700..170C; TAGALOG - 0x170D, // 170D ; UNKNOWN - 0x170E, // 170E..1714; TAGALOG - 0x1715, // 1715..171F; UNKNOWN + 0x1700, // 1700..1715; TAGALOG + 0x1716, // 1716..171E; UNKNOWN + 0x171F, // 171F ; TAGALOG 0x1720, // 1720..1734; HANUNOO 0x1735, // 1735..1736; COMMON 0x1737, // 1737..173F; UNKNOWN @@ -5590,9 +5753,7 @@ class Character implements java.io.Serializable, Comparable, Constabl 0x1802, // 1802..1803; COMMON 0x1804, // 1804 ; MONGOLIAN 0x1805, // 1805 ; COMMON - 0x1806, // 1806..180E; MONGOLIAN - 0x180F, // 180F ; UNKNOWN - 0x1810, // 1810..1819; MONGOLIAN + 0x1806, // 1806..1819; MONGOLIAN 0x181A, // 181A..181F; UNKNOWN 0x1820, // 1820..1878; MONGOLIAN 0x1879, // 1879..187F; UNKNOWN @@ -5634,12 +5795,12 @@ class Character implements java.io.Serializable, Comparable, Constabl 0x1A9A, // 1A9A..1A9F; UNKNOWN 0x1AA0, // 1AA0..1AAD; TAI_THAM 0x1AAE, // 1AAE..1AAF; UNKNOWN - 0x1AB0, // 1AB0..1AC0; INHERITED - 0x1AC1, // 1AC1..1AFF; UNKNOWN - 0x1B00, // 1B00..1B4B; BALINESE - 0x1B4C, // 1B4C..1B4F; UNKNOWN - 0x1B50, // 1B50..1B7C; BALINESE - 0x1B7D, // 1B7D..1B7F; UNKNOWN + 0x1AB0, // 1AB0..1ACE; INHERITED + 0x1ACF, // 1ACF..1AFF; UNKNOWN + 0x1B00, // 1B00..1B4C; BALINESE + 0x1B4D, // 1B4D..1B4F; UNKNOWN + 0x1B50, // 1B50..1B7E; BALINESE + 0x1B7F, // 1B7F ; UNKNOWN 0x1B80, // 1B80..1BBF; SUNDANESE 0x1BC0, // 1BC0..1BF3; BATAK 0x1BF4, // 1BF4..1BFB; UNKNOWN @@ -5681,9 +5842,7 @@ class Character implements java.io.Serializable, Comparable, Constabl 0x1D78, // 1D78 ; CYRILLIC 0x1D79, // 1D79..1DBE; LATIN 0x1DBF, // 1DBF ; GREEK - 0x1DC0, // 1DC0..1DF9; INHERITED - 0x1DFA, // 1DFA ; UNKNOWN - 0x1DFB, // 1DFB..1DFF; INHERITED + 0x1DC0, // 1DC0..1DFF; INHERITED 0x1E00, // 1E00..1EFF; LATIN 0x1F00, // 1F00..1F15; GREEK 0x1F16, // 1F16..1F17; UNKNOWN @@ -5730,8 +5889,8 @@ class Character implements java.io.Serializable, Comparable, Constabl 0x208F, // 208F ; UNKNOWN 0x2090, // 2090..209C; LATIN 0x209D, // 209D..209F; UNKNOWN - 0x20A0, // 20A0..20BF; COMMON - 0x20C0, // 20C0..20CF; UNKNOWN + 0x20A0, // 20A0..20C0; COMMON + 0x20C1, // 20C1..20CF; UNKNOWN 0x20D0, // 20D0..20F0; INHERITED 0x20F1, // 20F1..20FF; UNKNOWN 0x2100, // 2100..2125; COMMON @@ -5757,10 +5916,7 @@ class Character implements java.io.Serializable, Comparable, Constabl 0x2B76, // 2B76..2B95; COMMON 0x2B96, // 2B96 ; UNKNOWN 0x2B97, // 2B97..2BFF; COMMON - 0x2C00, // 2C00..2C2E; GLAGOLITIC - 0x2C2F, // 2C2F ; UNKNOWN - 0x2C30, // 2C30..2C5E; GLAGOLITIC - 0x2C5F, // 2C5F ; UNKNOWN + 0x2C00, // 2C00..2C5F; GLAGOLITIC 0x2C60, // 2C60..2C7F; LATIN 0x2C80, // 2C80..2CF3; COPTIC 0x2CF4, // 2CF4..2CF8; UNKNOWN @@ -5795,8 +5951,8 @@ class Character implements java.io.Serializable, Comparable, Constabl 0x2DD8, // 2DD8..2DDE; ETHIOPIC 0x2DDF, // 2DDF ; UNKNOWN 0x2DE0, // 2DE0..2DFF; CYRILLIC - 0x2E00, // 2E00..2E52; COMMON - 0x2E53, // 2E53..2E7F; UNKNOWN + 0x2E00, // 2E00..2E5D; COMMON + 0x2E5E, // 2E5E..2E7F; UNKNOWN 0x2E80, // 2E80..2E99; HAN 0x2E9A, // 2E9A ; UNKNOWN 0x2E9B, // 2E9B..2EF3; HAN @@ -5847,8 +6003,7 @@ class Character implements java.io.Serializable, Comparable, Constabl 0x3358, // 3358..33FF; COMMON 0x3400, // 3400..4DBF; HAN 0x4DC0, // 4DC0..4DFF; COMMON - 0x4E00, // 4E00..9FFC; HAN - 0x9FFD, // 9FFD..9FFF; UNKNOWN + 0x4E00, // 4E00..9FFF; HAN 0xA000, // A000..A48C; YI 0xA48D, // A48D..A48F; UNKNOWN 0xA490, // A490..A4C6; YI @@ -5862,11 +6017,15 @@ class Character implements java.io.Serializable, Comparable, Constabl 0xA700, // A700..A721; COMMON 0xA722, // A722..A787; LATIN 0xA788, // A788..A78A; COMMON - 0xA78B, // A78B..A7BF; LATIN - 0xA7C0, // A7C0..A7C1; UNKNOWN - 0xA7C2, // A7C2..A7CA; LATIN - 0xA7CB, // A7CB..A7F4; UNKNOWN - 0xA7F5, // A7F5..A7FF; LATIN + 0xA78B, // A78B..A7CA; LATIN + 0xA7CB, // A7CB..A7CF; UNKNOWN + 0xA7D0, // A7D0..A7D1; LATIN + 0xA7D2, // A7D2 ; UNKNOWN + 0xA7D3, // A7D3 ; LATIN + 0xA7D4, // A7D4 ; UNKNOWN + 0xA7D5, // A7D5..A7D9; LATIN + 0xA7DA, // A7DA..A7F1; UNKNOWN + 0xA7F2, // A7F2..A7FF; LATIN 0xA800, // A800..A82C; SYLOTI_NAGRI 0xA82D, // A82D..A82F; UNKNOWN 0xA830, // A830..A839; COMMON @@ -5954,17 +6113,17 @@ class Character implements java.io.Serializable, Comparable, Constabl 0xFB43, // FB43..FB44; HEBREW 0xFB45, // FB45 ; UNKNOWN 0xFB46, // FB46..FB4F; HEBREW - 0xFB50, // FB50..FBC1; ARABIC - 0xFBC2, // FBC2..FBD2; UNKNOWN + 0xFB50, // FB50..FBC2; ARABIC + 0xFBC3, // FBC3..FBD2; UNKNOWN 0xFBD3, // FBD3..FD3D; ARABIC 0xFD3E, // FD3E..FD3F; COMMON - 0xFD40, // FD40..FD4F; UNKNOWN - 0xFD50, // FD50..FD8F; ARABIC + 0xFD40, // FD40..FD8F; ARABIC 0xFD90, // FD90..FD91; UNKNOWN 0xFD92, // FD92..FDC7; ARABIC - 0xFDC8, // FDC8..FDEF; UNKNOWN - 0xFDF0, // FDF0..FDFD; ARABIC - 0xFDFE, // FDFE..FDFF; UNKNOWN + 0xFDC8, // FDC8..FDCE; UNKNOWN + 0xFDCF, // FDCF ; ARABIC + 0xFDD0, // FDD0..FDEF; UNKNOWN + 0xFDF0, // FDF0..FDFF; ARABIC 0xFE00, // FE00..FE0F; INHERITED 0xFE10, // FE10..FE19; COMMON 0xFE1A, // FE1A..FE1F; UNKNOWN @@ -6071,13 +6230,34 @@ class Character implements java.io.Serializable, Comparable, Constabl 0x10530, // 10530..10563; CAUCASIAN_ALBANIAN 0x10564, // 10564..1056E; UNKNOWN 0x1056F, // 1056F ; CAUCASIAN_ALBANIAN - 0x10570, // 10570..105FF; UNKNOWN + 0x10570, // 10570..1057A; VITHKUQI + 0x1057B, // 1057B ; UNKNOWN + 0x1057C, // 1057C..1058A; VITHKUQI + 0x1058B, // 1058B ; UNKNOWN + 0x1058C, // 1058C..10592; VITHKUQI + 0x10593, // 10593 ; UNKNOWN + 0x10594, // 10594..10595; VITHKUQI + 0x10596, // 10596 ; UNKNOWN + 0x10597, // 10597..105A1; VITHKUQI + 0x105A2, // 105A2 ; UNKNOWN + 0x105A3, // 105A3..105B1; VITHKUQI + 0x105B2, // 105B2 ; UNKNOWN + 0x105B3, // 105B3..105B9; VITHKUQI + 0x105BA, // 105BA ; UNKNOWN + 0x105BB, // 105BB..105BC; VITHKUQI + 0x105BD, // 105BD..105FF; UNKNOWN 0x10600, // 10600..10736; LINEAR_A 0x10737, // 10737..1073F; UNKNOWN 0x10740, // 10740..10755; LINEAR_A 0x10756, // 10756..1075F; UNKNOWN 0x10760, // 10760..10767; LINEAR_A - 0x10768, // 10768..107FF; UNKNOWN + 0x10768, // 10768..1077F; UNKNOWN + 0x10780, // 10780..10785; LATIN + 0x10786, // 10786 ; UNKNOWN + 0x10787, // 10787..107B0; LATIN + 0x107B1, // 107B1 ; UNKNOWN + 0x107B2, // 107B2..107BA; LATIN + 0x107BB, // 107BB..107FF; UNKNOWN 0x10800, // 10800..10805; CYPRIOT 0x10806, // 10806..10807; UNKNOWN 0x10808, // 10808 ; CYPRIOT @@ -6175,18 +6355,20 @@ class Character implements java.io.Serializable, Comparable, Constabl 0x10F00, // 10F00..10F27; OLD_SOGDIAN 0x10F28, // 10F28..10F2F; UNKNOWN 0x10F30, // 10F30..10F59; SOGDIAN - 0x10F5A, // 10F5A..10FAF; UNKNOWN + 0x10F5A, // 10F5A..10F6F; UNKNOWN + 0x10F70, // 10F70..10F89; OLD_UYGHUR + 0x10F8A, // 10F8A..10FAF; UNKNOWN 0x10FB0, // 10FB0..10FCB; CHORASMIAN 0x10FCC, // 10FCC..10FDF; UNKNOWN 0x10FE0, // 10FE0..10FF6; ELYMAIC 0x10FF7, // 10FF7..10FFF; UNKNOWN 0x11000, // 11000..1104D; BRAHMI 0x1104E, // 1104E..11051; UNKNOWN - 0x11052, // 11052..1106F; BRAHMI - 0x11070, // 11070..1107E; UNKNOWN + 0x11052, // 11052..11075; BRAHMI + 0x11076, // 11076..1107E; UNKNOWN 0x1107F, // 1107F ; BRAHMI - 0x11080, // 11080..110C1; KAITHI - 0x110C2, // 110C2..110CC; UNKNOWN + 0x11080, // 11080..110C2; KAITHI + 0x110C3, // 110C3..110CC; UNKNOWN 0x110CD, // 110CD ; KAITHI 0x110CE, // 110CE..110CF; UNKNOWN 0x110D0, // 110D0..110E8; SORA_SOMPENG @@ -6270,16 +6452,16 @@ class Character implements java.io.Serializable, Comparable, Constabl 0x1165A, // 1165A..1165F; UNKNOWN 0x11660, // 11660..1166C; MONGOLIAN 0x1166D, // 1166D..1167F; UNKNOWN - 0x11680, // 11680..116B8; TAKRI - 0x116B9, // 116B9..116BF; UNKNOWN + 0x11680, // 11680..116B9; TAKRI + 0x116BA, // 116BA..116BF; UNKNOWN 0x116C0, // 116C0..116C9; TAKRI 0x116CA, // 116CA..116FF; UNKNOWN 0x11700, // 11700..1171A; AHOM 0x1171B, // 1171B..1171C; UNKNOWN 0x1171D, // 1171D..1172B; AHOM 0x1172C, // 1172C..1172F; UNKNOWN - 0x11730, // 11730..1173F; AHOM - 0x11740, // 11740..117FF; UNKNOWN + 0x11730, // 11730..11746; AHOM + 0x11747, // 11747..117FF; UNKNOWN 0x11800, // 11800..1183B; DOGRA 0x1183C, // 1183C..1189F; UNKNOWN 0x118A0, // 118A0..118F2; WARANG_CITI @@ -6310,7 +6492,8 @@ class Character implements java.io.Serializable, Comparable, Constabl 0x11A00, // 11A00..11A47; ZANABAZAR_SQUARE 0x11A48, // 11A48..11A4F; UNKNOWN 0x11A50, // 11A50..11AA2; SOYOMBO - 0x11AA3, // 11AA3..11ABF; UNKNOWN + 0x11AA3, // 11AA3..11AAF; UNKNOWN + 0x11AB0, // 11AB0..11ABF; CANADIAN_ABORIGINAL 0x11AC0, // 11AC0..11AF8; PAU_CIN_HAU 0x11AF9, // 11AF9..11BFF; UNKNOWN 0x11C00, // 11C00..11C08; BHAIKSUKI @@ -6367,7 +6550,9 @@ class Character implements java.io.Serializable, Comparable, Constabl 0x12470, // 12470..12474; CUNEIFORM 0x12475, // 12475..1247F; UNKNOWN 0x12480, // 12480..12543; CUNEIFORM - 0x12544, // 12544..12FFF; UNKNOWN + 0x12544, // 12544..12F8F; UNKNOWN + 0x12F90, // 12F90..12FF2; CYPRO_MINOAN + 0x12FF3, // 12FF3..12FFF; UNKNOWN 0x13000, // 13000..1342E; EGYPTIAN_HIEROGLYPHS 0x1342F, // 1342F ; UNKNOWN 0x13430, // 13430..13438; EGYPTIAN_HIEROGLYPHS @@ -6381,7 +6566,10 @@ class Character implements java.io.Serializable, Comparable, Constabl 0x16A60, // 16A60..16A69; MRO 0x16A6A, // 16A6A..16A6D; UNKNOWN 0x16A6E, // 16A6E..16A6F; MRO - 0x16A70, // 16A70..16ACF; UNKNOWN + 0x16A70, // 16A70..16ABE; TANGSA + 0x16ABF, // 16ABF ; UNKNOWN + 0x16AC0, // 16AC0..16AC9; TANGSA + 0x16ACA, // 16ACA..16ACF; UNKNOWN 0x16AD0, // 16AD0..16AED; BASSA_VAH 0x16AEE, // 16AEE..16AEF; UNKNOWN 0x16AF0, // 16AF0..16AF5; BASSA_VAH @@ -6406,7 +6594,7 @@ class Character implements java.io.Serializable, Comparable, Constabl 0x16FA0, // 16FA0..16FDF; UNKNOWN 0x16FE0, // 16FE0 ; TANGUT 0x16FE1, // 16FE1 ; NUSHU - 0x16FE2, // 16FE2..16FE3; COMMON + 0x16FE2, // 16FE2..16FE3; HAN 0x16FE4, // 16FE4 ; KHITAN_SMALL_SCRIPT 0x16FE5, // 16FE5..16FEF; UNKNOWN 0x16FF0, // 16FF0..16FF1; HAN @@ -6417,10 +6605,17 @@ class Character implements java.io.Serializable, Comparable, Constabl 0x18B00, // 18B00..18CD5; KHITAN_SMALL_SCRIPT 0x18CD6, // 18CD6..18CFF; UNKNOWN 0x18D00, // 18D00..18D08; TANGUT - 0x18D09, // 18D09..1AFFF; UNKNOWN + 0x18D09, // 18D09..1AFEF; UNKNOWN + 0x1AFF0, // 1AFF0..1AFF3; KATAKANA + 0x1AFF4, // 1AFF4 ; UNKNOWN + 0x1AFF5, // 1AFF5..1AFFB; KATAKANA + 0x1AFFC, // 1AFFC ; UNKNOWN + 0x1AFFD, // 1AFFD..1AFFE; KATAKANA + 0x1AFFF, // 1AFFF ; UNKNOWN 0x1B000, // 1B000 ; KATAKANA - 0x1B001, // 1B001..1B11E; HIRAGANA - 0x1B11F, // 1B11F..1B14F; UNKNOWN + 0x1B001, // 1B001..1B11F; HIRAGANA + 0x1B120, // 1B120..1B122; KATAKANA + 0x1B123, // 1B123..1B14F; UNKNOWN 0x1B150, // 1B150..1B152; HIRAGANA 0x1B153, // 1B153..1B163; UNKNOWN 0x1B164, // 1B164..1B167; KATAKANA @@ -6437,7 +6632,13 @@ class Character implements java.io.Serializable, Comparable, Constabl 0x1BC9A, // 1BC9A..1BC9B; UNKNOWN 0x1BC9C, // 1BC9C..1BC9F; DUPLOYAN 0x1BCA0, // 1BCA0..1BCA3; COMMON - 0x1BCA4, // 1BCA4..1CFFF; UNKNOWN + 0x1BCA4, // 1BCA4..1CEFF; UNKNOWN + 0x1CF00, // 1CF00..1CF2D; INHERITED + 0x1CF2E, // 1CF2E..1CF2F; UNKNOWN + 0x1CF30, // 1CF30..1CF46; INHERITED + 0x1CF47, // 1CF47..1CF4F; UNKNOWN + 0x1CF50, // 1CF50..1CFC3; COMMON + 0x1CFC4, // 1CFC4..1CFFF; UNKNOWN 0x1D000, // 1D000..1D0F5; COMMON 0x1D0F6, // 1D0F6..1D0FF; UNKNOWN 0x1D100, // 1D100..1D126; COMMON @@ -6450,8 +6651,8 @@ class Character implements java.io.Serializable, Comparable, Constabl 0x1D185, // 1D185..1D18B; INHERITED 0x1D18C, // 1D18C..1D1A9; COMMON 0x1D1AA, // 1D1AA..1D1AD; INHERITED - 0x1D1AE, // 1D1AE..1D1E8; COMMON - 0x1D1E9, // 1D1E9..1D1FF; UNKNOWN + 0x1D1AE, // 1D1AE..1D1EA; COMMON + 0x1D1EB, // 1D1EB..1D1FF; UNKNOWN 0x1D200, // 1D200..1D245; GREEK 0x1D246, // 1D246..1D2DF; UNKNOWN 0x1D2E0, // 1D2E0..1D2F3; COMMON @@ -6506,7 +6707,9 @@ class Character implements java.io.Serializable, Comparable, Constabl 0x1DA9B, // 1DA9B..1DA9F; SIGNWRITING 0x1DAA0, // 1DAA0 ; UNKNOWN 0x1DAA1, // 1DAA1..1DAAF; SIGNWRITING - 0x1DAB0, // 1DAB0..1DFFF; UNKNOWN + 0x1DAB0, // 1DAB0..1DEFF; UNKNOWN + 0x1DF00, // 1DF00..1DF1E; LATIN + 0x1DF1F, // 1DF1F..1DFFF; UNKNOWN 0x1E000, // 1E000..1E006; GLAGOLITIC 0x1E007, // 1E007 ; UNKNOWN 0x1E008, // 1E008..1E018; GLAGOLITIC @@ -6524,11 +6727,21 @@ class Character implements java.io.Serializable, Comparable, Constabl 0x1E140, // 1E140..1E149; NYIAKENG_PUACHUE_HMONG 0x1E14A, // 1E14A..1E14D; UNKNOWN 0x1E14E, // 1E14E..1E14F; NYIAKENG_PUACHUE_HMONG - 0x1E150, // 1E150..1E2BF; UNKNOWN + 0x1E150, // 1E150..1E28F; UNKNOWN + 0x1E290, // 1E290..1E2AE; TOTO + 0x1E2AF, // 1E2AF..1E2BF; UNKNOWN 0x1E2C0, // 1E2C0..1E2F9; WANCHO 0x1E2FA, // 1E2FA..1E2FE; UNKNOWN 0x1E2FF, // 1E2FF ; WANCHO - 0x1E300, // 1E300..1E7FF; UNKNOWN + 0x1E300, // 1E300..1E7DF; UNKNOWN + 0x1E7E0, // 1E7E0..1E7E6; ETHIOPIC + 0x1E7E7, // 1E7E7 ; UNKNOWN + 0x1E7E8, // 1E7E8..1E7EB; ETHIOPIC + 0x1E7EC, // 1E7EC ; UNKNOWN + 0x1E7ED, // 1E7ED..1E7EE; ETHIOPIC + 0x1E7EF, // 1E7EF ; UNKNOWN + 0x1E7F0, // 1E7F0..1E7FE; ETHIOPIC + 0x1E7FF, // 1E7FF ; UNKNOWN 0x1E800, // 1E800..1E8C4; MENDE_KIKAKUI 0x1E8C5, // 1E8C5..1E8C6; UNKNOWN 0x1E8C7, // 1E8C7..1E8D6; MENDE_KIKAKUI @@ -6638,8 +6851,8 @@ class Character implements java.io.Serializable, Comparable, Constabl 0x1F260, // 1F260..1F265; COMMON 0x1F266, // 1F266..1F2FF; UNKNOWN 0x1F300, // 1F300..1F6D7; COMMON - 0x1F6D8, // 1F6D8..1F6DF; UNKNOWN - 0x1F6E0, // 1F6E0..1F6EC; COMMON + 0x1F6D8, // 1F6D8..1F6DC; UNKNOWN + 0x1F6DD, // 1F6DD..1F6EC; COMMON 0x1F6ED, // 1F6ED..1F6EF; UNKNOWN 0x1F6F0, // 1F6F0..1F6FC; COMMON 0x1F6FD, // 1F6FD..1F6FF; UNKNOWN @@ -6648,7 +6861,9 @@ class Character implements java.io.Serializable, Comparable, Constabl 0x1F780, // 1F780..1F7D8; COMMON 0x1F7D9, // 1F7D9..1F7DF; UNKNOWN 0x1F7E0, // 1F7E0..1F7EB; COMMON - 0x1F7EC, // 1F7EC..1F7FF; UNKNOWN + 0x1F7EC, // 1F7EC..1F7EF; UNKNOWN + 0x1F7F0, // 1F7F0 ; COMMON + 0x1F7F1, // 1F7F1..1F7FF; UNKNOWN 0x1F800, // 1F800..1F80B; COMMON 0x1F80C, // 1F80C..1F80F; UNKNOWN 0x1F810, // 1F810..1F847; COMMON @@ -6661,38 +6876,38 @@ class Character implements java.io.Serializable, Comparable, Constabl 0x1F8AE, // 1F8AE..1F8AF; UNKNOWN 0x1F8B0, // 1F8B0..1F8B1; COMMON 0x1F8B2, // 1F8B2..1F8FF; UNKNOWN - 0x1F900, // 1F900..1F978; COMMON - 0x1F979, // 1F979 ; UNKNOWN - 0x1F97A, // 1F97A..1F9CB; COMMON - 0x1F9CC, // 1F9CC ; UNKNOWN - 0x1F9CD, // 1F9CD..1FA53; COMMON + 0x1F900, // 1F900..1FA53; COMMON 0x1FA54, // 1FA54..1FA5F; UNKNOWN 0x1FA60, // 1FA60..1FA6D; COMMON 0x1FA6E, // 1FA6E..1FA6F; UNKNOWN 0x1FA70, // 1FA70..1FA74; COMMON 0x1FA75, // 1FA75..1FA77; UNKNOWN - 0x1FA78, // 1FA78..1FA7A; COMMON - 0x1FA7B, // 1FA7B..1FA7F; UNKNOWN + 0x1FA78, // 1FA78..1FA7C; COMMON + 0x1FA7D, // 1FA7D..1FA7F; UNKNOWN 0x1FA80, // 1FA80..1FA86; COMMON 0x1FA87, // 1FA87..1FA8F; UNKNOWN - 0x1FA90, // 1FA90..1FAA8; COMMON - 0x1FAA9, // 1FAA9..1FAAF; UNKNOWN - 0x1FAB0, // 1FAB0..1FAB6; COMMON - 0x1FAB7, // 1FAB7..1FABF; UNKNOWN - 0x1FAC0, // 1FAC0..1FAC2; COMMON - 0x1FAC3, // 1FAC3..1FACF; UNKNOWN - 0x1FAD0, // 1FAD0..1FAD6; COMMON - 0x1FAD7, // 1FAD7..1FAFF; UNKNOWN + 0x1FA90, // 1FA90..1FAAC; COMMON + 0x1FAAD, // 1FAAD..1FAAF; UNKNOWN + 0x1FAB0, // 1FAB0..1FABA; COMMON + 0x1FABB, // 1FABB..1FABF; UNKNOWN + 0x1FAC0, // 1FAC0..1FAC5; COMMON + 0x1FAC6, // 1FAC6..1FACF; UNKNOWN + 0x1FAD0, // 1FAD0..1FAD9; COMMON + 0x1FADA, // 1FADA..1FADF; UNKNOWN + 0x1FAE0, // 1FAE0..1FAE7; COMMON + 0x1FAE8, // 1FAE8..1FAEF; UNKNOWN + 0x1FAF0, // 1FAF0..1FAF6; COMMON + 0x1FAF7, // 1FAF7..1FAFF; UNKNOWN 0x1FB00, // 1FB00..1FB92; COMMON 0x1FB93, // 1FB93 ; UNKNOWN 0x1FB94, // 1FB94..1FBCA; COMMON 0x1FBCB, // 1FBCB..1FBEF; UNKNOWN 0x1FBF0, // 1FBF0..1FBF9; COMMON 0x1FBFA, // 1FBFA..1FFFF; UNKNOWN - 0x20000, // 20000..2A6DD; HAN - 0x2A6DE, // 2A6DE..2A6FF; UNKNOWN - 0x2A700, // 2A700..2B734; HAN - 0x2B735, // 2B735..2B73F; UNKNOWN + 0x20000, // 20000..2A6DF; HAN + 0x2A6E0, // 2A6E0..2A6FF; UNKNOWN + 0x2A700, // 2A700..2B738; HAN + 0x2B739, // 2B739..2B73F; UNKNOWN 0x2B740, // 2B740..2B81D; HAN 0x2B81E, // 2B81E..2B81F; UNKNOWN 0x2B820, // 2B820..2CEA1; HAN @@ -6775,9 +6990,7 @@ class Character implements java.io.Serializable, Comparable, Constabl COMMON, // 060C ARABIC, // 060D..061A COMMON, // 061B - ARABIC, // 061C - UNKNOWN, // 061D - ARABIC, // 061E + ARABIC, // 061C..061E COMMON, // 061F ARABIC, // 0620..063F COMMON, // 0640 @@ -6808,12 +7021,12 @@ class Character implements java.io.Serializable, Comparable, Constabl MANDAIC, // 085E UNKNOWN, // 085F SYRIAC, // 0860..086A - UNKNOWN, // 086B..089F - ARABIC, // 08A0..08B4 - UNKNOWN, // 08B5 - ARABIC, // 08B6..08C7 - UNKNOWN, // 08C8..08D2 - ARABIC, // 08D3..08E1 + UNKNOWN, // 086B..086F + ARABIC, // 0870..088E + UNKNOWN, // 088F + ARABIC, // 0890..0891 + UNKNOWN, // 0892..0897 + ARABIC, // 0898..08E1 COMMON, // 08E2 ARABIC, // 08E3..08FF DEVANAGARI, // 0900..0950 @@ -6976,8 +7189,8 @@ class Character implements java.io.Serializable, Comparable, Constabl TELUGU, // 0C12..0C28 UNKNOWN, // 0C29 TELUGU, // 0C2A..0C39 - UNKNOWN, // 0C3A..0C3C - TELUGU, // 0C3D..0C44 + UNKNOWN, // 0C3A..0C3B + TELUGU, // 0C3C..0C44 UNKNOWN, // 0C45 TELUGU, // 0C46..0C48 UNKNOWN, // 0C49 @@ -6986,7 +7199,9 @@ class Character implements java.io.Serializable, Comparable, Constabl TELUGU, // 0C55..0C56 UNKNOWN, // 0C57 TELUGU, // 0C58..0C5A - UNKNOWN, // 0C5B..0C5F + UNKNOWN, // 0C5B..0C5C + TELUGU, // 0C5D + UNKNOWN, // 0C5E..0C5F TELUGU, // 0C60..0C63 UNKNOWN, // 0C64..0C65 TELUGU, // 0C66..0C6F @@ -7009,8 +7224,8 @@ class Character implements java.io.Serializable, Comparable, Constabl KANNADA, // 0CCA..0CCD UNKNOWN, // 0CCE..0CD4 KANNADA, // 0CD5..0CD6 - UNKNOWN, // 0CD7..0CDD - KANNADA, // 0CDE + UNKNOWN, // 0CD7..0CDC + KANNADA, // 0CDD..0CDE UNKNOWN, // 0CDF KANNADA, // 0CE0..0CE3 UNKNOWN, // 0CE4..0CE5 @@ -7155,10 +7370,9 @@ class Character implements java.io.Serializable, Comparable, Constabl COMMON, // 16EB..16ED RUNIC, // 16EE..16F8 UNKNOWN, // 16F9..16FF - TAGALOG, // 1700..170C - UNKNOWN, // 170D - TAGALOG, // 170E..1714 - UNKNOWN, // 1715..171F + TAGALOG, // 1700..1715 + UNKNOWN, // 1716..171E + TAGALOG, // 171F HANUNOO, // 1720..1734 COMMON, // 1735..1736 UNKNOWN, // 1737..173F @@ -7180,9 +7394,7 @@ class Character implements java.io.Serializable, Comparable, Constabl COMMON, // 1802..1803 MONGOLIAN, // 1804 COMMON, // 1805 - MONGOLIAN, // 1806..180E - UNKNOWN, // 180F - MONGOLIAN, // 1810..1819 + MONGOLIAN, // 1806..1819 UNKNOWN, // 181A..181F MONGOLIAN, // 1820..1878 UNKNOWN, // 1879..187F @@ -7224,12 +7436,12 @@ class Character implements java.io.Serializable, Comparable, Constabl UNKNOWN, // 1A9A..1A9F TAI_THAM, // 1AA0..1AAD UNKNOWN, // 1AAE..1AAF - INHERITED, // 1AB0..1AC0 - UNKNOWN, // 1AC1..1AFF - BALINESE, // 1B00..1B4B - UNKNOWN, // 1B4C..1B4F - BALINESE, // 1B50..1B7C - UNKNOWN, // 1B7D..1B7F + INHERITED, // 1AB0..1ACE + UNKNOWN, // 1ACF..1AFF + BALINESE, // 1B00..1B4C + UNKNOWN, // 1B4D..1B4F + BALINESE, // 1B50..1B7E + UNKNOWN, // 1B7F SUNDANESE, // 1B80..1BBF BATAK, // 1BC0..1BF3 UNKNOWN, // 1BF4..1BFB @@ -7271,9 +7483,7 @@ class Character implements java.io.Serializable, Comparable, Constabl CYRILLIC, // 1D78 LATIN, // 1D79..1DBE GREEK, // 1DBF - INHERITED, // 1DC0..1DF9 - UNKNOWN, // 1DFA - INHERITED, // 1DFB..1DFF + INHERITED, // 1DC0..1DFF LATIN, // 1E00..1EFF GREEK, // 1F00..1F15 UNKNOWN, // 1F16..1F17 @@ -7320,8 +7530,8 @@ class Character implements java.io.Serializable, Comparable, Constabl UNKNOWN, // 208F LATIN, // 2090..209C UNKNOWN, // 209D..209F - COMMON, // 20A0..20BF - UNKNOWN, // 20C0..20CF + COMMON, // 20A0..20C0 + UNKNOWN, // 20C1..20CF INHERITED, // 20D0..20F0 UNKNOWN, // 20F1..20FF COMMON, // 2100..2125 @@ -7347,10 +7557,7 @@ class Character implements java.io.Serializable, Comparable, Constabl COMMON, // 2B76..2B95 UNKNOWN, // 2B96 COMMON, // 2B97..2BFF - GLAGOLITIC, // 2C00..2C2E - UNKNOWN, // 2C2F - GLAGOLITIC, // 2C30..2C5E - UNKNOWN, // 2C5F + GLAGOLITIC, // 2C00..2C5F LATIN, // 2C60..2C7F COPTIC, // 2C80..2CF3 UNKNOWN, // 2CF4..2CF8 @@ -7385,8 +7592,8 @@ class Character implements java.io.Serializable, Comparable, Constabl ETHIOPIC, // 2DD8..2DDE UNKNOWN, // 2DDF CYRILLIC, // 2DE0..2DFF - COMMON, // 2E00..2E52 - UNKNOWN, // 2E53..2E7F + COMMON, // 2E00..2E5D + UNKNOWN, // 2E5E..2E7F HAN, // 2E80..2E99 UNKNOWN, // 2E9A HAN, // 2E9B..2EF3 @@ -7437,8 +7644,7 @@ class Character implements java.io.Serializable, Comparable, Constabl COMMON, // 3358..33FF HAN, // 3400..4DBF COMMON, // 4DC0..4DFF - HAN, // 4E00..9FFC - UNKNOWN, // 9FFD..9FFF + HAN, // 4E00..9FFF YI, // A000..A48C UNKNOWN, // A48D..A48F YI, // A490..A4C6 @@ -7452,11 +7658,15 @@ class Character implements java.io.Serializable, Comparable, Constabl COMMON, // A700..A721 LATIN, // A722..A787 COMMON, // A788..A78A - LATIN, // A78B..A7BF - UNKNOWN, // A7C0..A7C1 - LATIN, // A7C2..A7CA - UNKNOWN, // A7CB..A7F4 - LATIN, // A7F5..A7FF + LATIN, // A78B..A7CA + UNKNOWN, // A7CB..A7CF + LATIN, // A7D0..A7D1 + UNKNOWN, // A7D2 + LATIN, // A7D3 + UNKNOWN, // A7D4 + LATIN, // A7D5..A7D9 + UNKNOWN, // A7DA..A7F1 + LATIN, // A7F2..A7FF SYLOTI_NAGRI, // A800..A82C UNKNOWN, // A82D..A82F COMMON, // A830..A839 @@ -7544,17 +7754,17 @@ class Character implements java.io.Serializable, Comparable, Constabl HEBREW, // FB43..FB44 UNKNOWN, // FB45 HEBREW, // FB46..FB4F - ARABIC, // FB50..FBC1 - UNKNOWN, // FBC2..FBD2 + ARABIC, // FB50..FBC2 + UNKNOWN, // FBC3..FBD2 ARABIC, // FBD3..FD3D COMMON, // FD3E..FD3F - UNKNOWN, // FD40..FD4F - ARABIC, // FD50..FD8F + ARABIC, // FD40..FD8F UNKNOWN, // FD90..FD91 ARABIC, // FD92..FDC7 - UNKNOWN, // FDC8..FDEF - ARABIC, // FDF0..FDFD - UNKNOWN, // FDFE..FDFF + UNKNOWN, // FDC8..FDCE + ARABIC, // FDCF + UNKNOWN, // FDD0..FDEF + ARABIC, // FDF0..FDFF INHERITED, // FE00..FE0F COMMON, // FE10..FE19 UNKNOWN, // FE1A..FE1F @@ -7661,13 +7871,34 @@ class Character implements java.io.Serializable, Comparable, Constabl CAUCASIAN_ALBANIAN, // 10530..10563 UNKNOWN, // 10564..1056E CAUCASIAN_ALBANIAN, // 1056F - UNKNOWN, // 10570..105FF + VITHKUQI, // 10570..1057A + UNKNOWN, // 1057B + VITHKUQI, // 1057C..1058A + UNKNOWN, // 1058B + VITHKUQI, // 1058C..10592 + UNKNOWN, // 10593 + VITHKUQI, // 10594..10595 + UNKNOWN, // 10596 + VITHKUQI, // 10597..105A1 + UNKNOWN, // 105A2 + VITHKUQI, // 105A3..105B1 + UNKNOWN, // 105B2 + VITHKUQI, // 105B3..105B9 + UNKNOWN, // 105BA + VITHKUQI, // 105BB..105BC + UNKNOWN, // 105BD..105FF LINEAR_A, // 10600..10736 UNKNOWN, // 10737..1073F LINEAR_A, // 10740..10755 UNKNOWN, // 10756..1075F LINEAR_A, // 10760..10767 - UNKNOWN, // 10768..107FF + UNKNOWN, // 10768..1077F + LATIN, // 10780..10785 + UNKNOWN, // 10786 + LATIN, // 10787..107B0 + UNKNOWN, // 107B1 + LATIN, // 107B2..107BA + UNKNOWN, // 107BB..107FF CYPRIOT, // 10800..10805 UNKNOWN, // 10806..10807 CYPRIOT, // 10808 @@ -7765,18 +7996,20 @@ class Character implements java.io.Serializable, Comparable, Constabl OLD_SOGDIAN, // 10F00..10F27 UNKNOWN, // 10F28..10F2F SOGDIAN, // 10F30..10F59 - UNKNOWN, // 10F5A..10FAF + UNKNOWN, // 10F5A..10F6F + OLD_UYGHUR, // 10F70..10F89 + UNKNOWN, // 10F8A..10FAF CHORASMIAN, // 10FB0..10FCB UNKNOWN, // 10FCC..10FDF ELYMAIC, // 10FE0..10FF6 UNKNOWN, // 10FF7..10FFF BRAHMI, // 11000..1104D UNKNOWN, // 1104E..11051 - BRAHMI, // 11052..1106F - UNKNOWN, // 11070..1107E + BRAHMI, // 11052..11075 + UNKNOWN, // 11076..1107E BRAHMI, // 1107F - KAITHI, // 11080..110C1 - UNKNOWN, // 110C2..110CC + KAITHI, // 11080..110C2 + UNKNOWN, // 110C3..110CC KAITHI, // 110CD UNKNOWN, // 110CE..110CF SORA_SOMPENG, // 110D0..110E8 @@ -7860,16 +8093,16 @@ class Character implements java.io.Serializable, Comparable, Constabl UNKNOWN, // 1165A..1165F MONGOLIAN, // 11660..1166C UNKNOWN, // 1166D..1167F - TAKRI, // 11680..116B8 - UNKNOWN, // 116B9..116BF + TAKRI, // 11680..116B9 + UNKNOWN, // 116BA..116BF TAKRI, // 116C0..116C9 UNKNOWN, // 116CA..116FF AHOM, // 11700..1171A UNKNOWN, // 1171B..1171C AHOM, // 1171D..1172B UNKNOWN, // 1172C..1172F - AHOM, // 11730..1173F - UNKNOWN, // 11740..117FF + AHOM, // 11730..11746 + UNKNOWN, // 11747..117FF DOGRA, // 11800..1183B UNKNOWN, // 1183C..1189F WARANG_CITI, // 118A0..118F2 @@ -7900,7 +8133,8 @@ class Character implements java.io.Serializable, Comparable, Constabl ZANABAZAR_SQUARE, // 11A00..11A47 UNKNOWN, // 11A48..11A4F SOYOMBO, // 11A50..11AA2 - UNKNOWN, // 11AA3..11ABF + UNKNOWN, // 11AA3..11AAF + CANADIAN_ABORIGINAL, // 11AB0..11ABF PAU_CIN_HAU, // 11AC0..11AF8 UNKNOWN, // 11AF9..11BFF BHAIKSUKI, // 11C00..11C08 @@ -7957,7 +8191,9 @@ class Character implements java.io.Serializable, Comparable, Constabl CUNEIFORM, // 12470..12474 UNKNOWN, // 12475..1247F CUNEIFORM, // 12480..12543 - UNKNOWN, // 12544..12FFF + UNKNOWN, // 12544..12F8F + CYPRO_MINOAN, // 12F90..12FF2 + UNKNOWN, // 12FF3..12FFF EGYPTIAN_HIEROGLYPHS, // 13000..1342E UNKNOWN, // 1342F EGYPTIAN_HIEROGLYPHS, // 13430..13438 @@ -7971,7 +8207,10 @@ class Character implements java.io.Serializable, Comparable, Constabl MRO, // 16A60..16A69 UNKNOWN, // 16A6A..16A6D MRO, // 16A6E..16A6F - UNKNOWN, // 16A70..16ACF + TANGSA, // 16A70..16ABE + UNKNOWN, // 16ABF + TANGSA, // 16AC0..16AC9 + UNKNOWN, // 16ACA..16ACF BASSA_VAH, // 16AD0..16AED UNKNOWN, // 16AEE..16AEF BASSA_VAH, // 16AF0..16AF5 @@ -7996,7 +8235,7 @@ class Character implements java.io.Serializable, Comparable, Constabl UNKNOWN, // 16FA0..16FDF TANGUT, // 16FE0 NUSHU, // 16FE1 - COMMON, // 16FE2..16FE3 + HAN, // 16FE2..16FE3 KHITAN_SMALL_SCRIPT, // 16FE4 UNKNOWN, // 16FE5..16FEF HAN, // 16FF0..16FF1 @@ -8007,10 +8246,17 @@ class Character implements java.io.Serializable, Comparable, Constabl KHITAN_SMALL_SCRIPT, // 18B00..18CD5 UNKNOWN, // 18CD6..18CFF TANGUT, // 18D00..18D08 - UNKNOWN, // 18D09..1AFFF + UNKNOWN, // 18D09..1AFEF + KATAKANA, // 1AFF0..1AFF3 + UNKNOWN, // 1AFF4 + KATAKANA, // 1AFF5..1AFFB + UNKNOWN, // 1AFFC + KATAKANA, // 1AFFD..1AFFE + UNKNOWN, // 1AFFF KATAKANA, // 1B000 - HIRAGANA, // 1B001..1B11E - UNKNOWN, // 1B11F..1B14F + HIRAGANA, // 1B001..1B11F + KATAKANA, // 1B120..1B122 + UNKNOWN, // 1B123..1B14F HIRAGANA, // 1B150..1B152 UNKNOWN, // 1B153..1B163 KATAKANA, // 1B164..1B167 @@ -8027,7 +8273,13 @@ class Character implements java.io.Serializable, Comparable, Constabl UNKNOWN, // 1BC9A..1BC9B DUPLOYAN, // 1BC9C..1BC9F COMMON, // 1BCA0..1BCA3 - UNKNOWN, // 1BCA4..1CFFF + UNKNOWN, // 1BCA4..1CEFF + INHERITED, // 1CF00..1CF2D + UNKNOWN, // 1CF2E..1CF2F + INHERITED, // 1CF30..1CF46 + UNKNOWN, // 1CF47..1CF4F + COMMON, // 1CF50..1CFC3 + UNKNOWN, // 1CFC4..1CFFF COMMON, // 1D000..1D0F5 UNKNOWN, // 1D0F6..1D0FF COMMON, // 1D100..1D126 @@ -8040,8 +8292,8 @@ class Character implements java.io.Serializable, Comparable, Constabl INHERITED, // 1D185..1D18B COMMON, // 1D18C..1D1A9 INHERITED, // 1D1AA..1D1AD - COMMON, // 1D1AE..1D1E8 - UNKNOWN, // 1D1E9..1D1FF + COMMON, // 1D1AE..1D1EA + UNKNOWN, // 1D1EB..1D1FF GREEK, // 1D200..1D245 UNKNOWN, // 1D246..1D2DF COMMON, // 1D2E0..1D2F3 @@ -8096,7 +8348,9 @@ class Character implements java.io.Serializable, Comparable, Constabl SIGNWRITING, // 1DA9B..1DA9F UNKNOWN, // 1DAA0 SIGNWRITING, // 1DAA1..1DAAF - UNKNOWN, // 1DAB0..1DFFF + UNKNOWN, // 1DAB0..1DEFF + LATIN, // 1DF00..1DF1E + UNKNOWN, // 1DF1F..1DFFF GLAGOLITIC, // 1E000..1E006 UNKNOWN, // 1E007 GLAGOLITIC, // 1E008..1E018 @@ -8114,11 +8368,21 @@ class Character implements java.io.Serializable, Comparable, Constabl NYIAKENG_PUACHUE_HMONG, // 1E140..1E149 UNKNOWN, // 1E14A..1E14D NYIAKENG_PUACHUE_HMONG, // 1E14E..1E14F - UNKNOWN, // 1E150..1E2BF + UNKNOWN, // 1E150..1E28F + TOTO, // 1E290..1E2AE + UNKNOWN, // 1E2AF..1E2BF WANCHO, // 1E2C0..1E2F9 UNKNOWN, // 1E2FA..1E2FE WANCHO, // 1E2FF - UNKNOWN, // 1E300..1E7FF + UNKNOWN, // 1E300..1E7DF + ETHIOPIC, // 1E7E0..1E7E6 + UNKNOWN, // 1E7E7 + ETHIOPIC, // 1E7E8..1E7EB + UNKNOWN, // 1E7EC + ETHIOPIC, // 1E7ED..1E7EE + UNKNOWN, // 1E7EF + ETHIOPIC, // 1E7F0..1E7FE + UNKNOWN, // 1E7FF MENDE_KIKAKUI, // 1E800..1E8C4 UNKNOWN, // 1E8C5..1E8C6 MENDE_KIKAKUI, // 1E8C7..1E8D6 @@ -8228,8 +8492,8 @@ class Character implements java.io.Serializable, Comparable, Constabl COMMON, // 1F260..1F265 UNKNOWN, // 1F266..1F2FF COMMON, // 1F300..1F6D7 - UNKNOWN, // 1F6D8..1F6DF - COMMON, // 1F6E0..1F6EC + UNKNOWN, // 1F6D8..1F6DC + COMMON, // 1F6DD..1F6EC UNKNOWN, // 1F6ED..1F6EF COMMON, // 1F6F0..1F6FC UNKNOWN, // 1F6FD..1F6FF @@ -8238,7 +8502,9 @@ class Character implements java.io.Serializable, Comparable, Constabl COMMON, // 1F780..1F7D8 UNKNOWN, // 1F7D9..1F7DF COMMON, // 1F7E0..1F7EB - UNKNOWN, // 1F7EC..1F7FF + UNKNOWN, // 1F7EC..1F7EF + COMMON, // 1F7F0 + UNKNOWN, // 1F7F1..1F7FF COMMON, // 1F800..1F80B UNKNOWN, // 1F80C..1F80F COMMON, // 1F810..1F847 @@ -8251,38 +8517,38 @@ class Character implements java.io.Serializable, Comparable, Constabl UNKNOWN, // 1F8AE..1F8AF COMMON, // 1F8B0..1F8B1 UNKNOWN, // 1F8B2..1F8FF - COMMON, // 1F900..1F978 - UNKNOWN, // 1F979 - COMMON, // 1F97A..1F9CB - UNKNOWN, // 1F9CC - COMMON, // 1F9CD..1FA53 + COMMON, // 1F900..1FA53 UNKNOWN, // 1FA54..1FA5F COMMON, // 1FA60..1FA6D UNKNOWN, // 1FA6E..1FA6F COMMON, // 1FA70..1FA74 UNKNOWN, // 1FA75..1FA77 - COMMON, // 1FA78..1FA7A - UNKNOWN, // 1FA7B..1FA7F + COMMON, // 1FA78..1FA7C + UNKNOWN, // 1FA7D..1FA7F COMMON, // 1FA80..1FA86 UNKNOWN, // 1FA87..1FA8F - COMMON, // 1FA90..1FAA8 - UNKNOWN, // 1FAA9..1FAAF - COMMON, // 1FAB0..1FAB6 - UNKNOWN, // 1FAB7..1FABF - COMMON, // 1FAC0..1FAC2 - UNKNOWN, // 1FAC3..1FACF - COMMON, // 1FAD0..1FAD6 - UNKNOWN, // 1FAD7..1FAFF + COMMON, // 1FA90..1FAAC + UNKNOWN, // 1FAAD..1FAAF + COMMON, // 1FAB0..1FABA + UNKNOWN, // 1FABB..1FABF + COMMON, // 1FAC0..1FAC5 + UNKNOWN, // 1FAC6..1FACF + COMMON, // 1FAD0..1FAD9 + UNKNOWN, // 1FADA..1FADF + COMMON, // 1FAE0..1FAE7 + UNKNOWN, // 1FAE8..1FAEF + COMMON, // 1FAF0..1FAF6 + UNKNOWN, // 1FAF7..1FAFF COMMON, // 1FB00..1FB92 UNKNOWN, // 1FB93 COMMON, // 1FB94..1FBCA UNKNOWN, // 1FBCB..1FBEF COMMON, // 1FBF0..1FBF9 UNKNOWN, // 1FBFA..1FFFF - HAN, // 20000..2A6DD - UNKNOWN, // 2A6DE..2A6FF - HAN, // 2A700..2B734 - UNKNOWN, // 2B735..2B73F + HAN, // 20000..2A6DF + UNKNOWN, // 2A6E0..2A6FF + HAN, // 2A700..2B738 + UNKNOWN, // 2B739..2B73F HAN, // 2B740..2B81D UNKNOWN, // 2B81E..2B81F HAN, // 2B820..2CEA1 @@ -8303,7 +8569,7 @@ class Character implements java.io.Serializable, Comparable, Constabl private static final HashMap aliases; static { - aliases = new HashMap<>((int)(157 / 0.75f + 1.0f)); + aliases = new HashMap<>((int)(162 / 0.75f + 1.0f)); aliases.put("ADLM", ADLAM); aliases.put("AGHB", CAUCASIAN_ALBANIAN); aliases.put("AHOM", AHOM); @@ -8329,6 +8595,7 @@ class Character implements java.io.Serializable, Comparable, Constabl aliases.put("CHER", CHEROKEE); aliases.put("CHRS", CHORASMIAN); aliases.put("COPT", COPTIC); + aliases.put("CPMN", CYPRO_MINOAN); aliases.put("CPRT", CYPRIOT); aliases.put("CYRL", CYRILLIC); aliases.put("DEVA", DEVANAGARI); @@ -8409,6 +8676,7 @@ class Character implements java.io.Serializable, Comparable, Constabl aliases.put("ORYA", ORIYA); aliases.put("OSGE", OSAGE); aliases.put("OSMA", OSMANYA); + aliases.put("OUGR", OLD_UYGHUR); aliases.put("PALM", PALMYRENE); aliases.put("PAUC", PAU_CIN_HAU); aliases.put("PERM", OLD_PERMIC); @@ -8451,8 +8719,11 @@ class Character implements java.io.Serializable, Comparable, Constabl aliases.put("THAI", THAI); aliases.put("TIBT", TIBETAN); aliases.put("TIRH", TIRHUTA); + aliases.put("TNSA", TANGSA); + aliases.put("TOTO", TOTO); aliases.put("UGAR", UGARITIC); aliases.put("VAII", VAI); + aliases.put("VITH", VITHKUQI); aliases.put("WARA", WARANG_CITI); aliases.put("WCHO", WANCHO); aliases.put("XPEO", OLD_PERSIAN); @@ -8495,8 +8766,8 @@ class Character implements java.io.Serializable, Comparable, Constabl /** * Returns the UnicodeScript constant with the given Unicode script * name or the script name alias. Script names and their aliases are - * determined by The Unicode Standard. The files {@code Scripts.txt} - * and {@code PropertyValueAliases.txt} define script names + * determined by The Unicode Standard. The files {@code Scripts.txt} + * and {@code PropertyValueAliases.txt} define script names * and the script name aliases for a particular version of the * standard. The {@link Character} class specifies the version of * the standard that it supports. @@ -10031,9 +10302,10 @@ class Character implements java.io.Serializable, Comparable, Constabl * @see Character#isJavaIdentifierPart(char) * @see Character#isLetter(char) * @see Character#isUnicodeIdentifierStart(char) - * @see javax.lang.model.SourceVersion#isIdentifier(CharSequence) + * @see java.compiler/javax.lang.model.SourceVersion#isIdentifier(CharSequence) * @since 1.1 */ + @SuppressWarnings("doclint:reference") // cross-module links public static boolean isJavaIdentifierStart(char ch) { return isJavaIdentifierStart((int)ch); } @@ -10060,9 +10332,10 @@ class Character implements java.io.Serializable, Comparable, Constabl * @see Character#isJavaIdentifierPart(int) * @see Character#isLetter(int) * @see Character#isUnicodeIdentifierStart(int) - * @see javax.lang.model.SourceVersion#isIdentifier(CharSequence) + * @see java.compiler/javax.lang.model.SourceVersion#isIdentifier(CharSequence) * @since 1.5 */ + @SuppressWarnings("doclint:reference") // cross-module links public static boolean isJavaIdentifierStart(int codePoint) { return CharacterData.of(codePoint).isJavaIdentifierStart(codePoint); } @@ -10097,9 +10370,10 @@ class Character implements java.io.Serializable, Comparable, Constabl * @see Character#isJavaIdentifierStart(char) * @see Character#isLetterOrDigit(char) * @see Character#isUnicodeIdentifierPart(char) - * @see javax.lang.model.SourceVersion#isIdentifier(CharSequence) + * @see java.compiler/javax.lang.model.SourceVersion#isIdentifier(CharSequence) * @since 1.1 */ + @SuppressWarnings("doclint:reference") // cross-module links public static boolean isJavaIdentifierPart(char ch) { return isJavaIdentifierPart((int)ch); } @@ -10130,9 +10404,10 @@ class Character implements java.io.Serializable, Comparable, Constabl * @see Character#isJavaIdentifierStart(int) * @see Character#isLetterOrDigit(int) * @see Character#isUnicodeIdentifierPart(int) - * @see javax.lang.model.SourceVersion#isIdentifier(CharSequence) + * @see java.compiler/javax.lang.model.SourceVersion#isIdentifier(CharSequence) * @since 1.5 */ + @SuppressWarnings("doclint:reference") // cross-module links public static boolean isJavaIdentifierPart(int codePoint) { return CharacterData.of(codePoint).isJavaIdentifierPart(codePoint); } diff --git a/src/java.base/share/classes/java/lang/Class.java b/src/java.base/share/classes/java/lang/Class.java index 670321ccca9f1a8e217bc647f608a93b5f33dc98..fb936b149891d9f3a4cd4a7059dda3d808bd579e 100644 --- a/src/java.base/share/classes/java/lang/Class.java +++ b/src/java.base/share/classes/java/lang/Class.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1994, 2022, 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 @@ -1582,7 +1582,7 @@ public final class Class implements java.io.Serializable, * representing the class in which it was declared. This method returns * null if this class or interface is not a member of any other class. If * this {@code Class} object represents an array class, a primitive - * type, or void,then this method returns null. + * type, or void, then this method returns null. * * @return the declaring class for this class * @throws SecurityException diff --git a/src/java.base/share/classes/java/lang/Integer.java b/src/java.base/share/classes/java/lang/Integer.java index 7d200e7edf531b224cc00c143d748dfbcbab4a91..9ec9d3941f898be8868cd8772a684db155db96c0 100644 --- a/src/java.base/share/classes/java/lang/Integer.java +++ b/src/java.base/share/classes/java/lang/Integer.java @@ -517,13 +517,9 @@ public final class Integer extends Number } // We know there are at most two digits left at this point. - q = i / 10; - r = (q * 10) - i; - buf[--charPos] = (byte)('0' + r); - - // Whatever left is the remaining digit. - if (q < 0) { - buf[--charPos] = (byte)('0' - q); + buf[--charPos] = DigitOnes[-i]; + if (i < -9) { + buf[--charPos] = DigitTens[-i]; } if (negative) { diff --git a/src/java.base/share/classes/java/lang/Long.java b/src/java.base/share/classes/java/lang/Long.java index 630b9e242b89c841e2c0bcb67432db6fd40d1301..2a5a230b321ca1146f0b7cc769d85aaa101600d7 100644 --- a/src/java.base/share/classes/java/lang/Long.java +++ b/src/java.base/share/classes/java/lang/Long.java @@ -565,13 +565,9 @@ public final class Long extends Number } // We know there are at most two digits left at this point. - q2 = i2 / 10; - r = (q2 * 10) - i2; - buf[--charPos] = (byte)('0' + r); - - // Whatever left is the remaining digit. - if (q2 < 0) { - buf[--charPos] = (byte)('0' - q2); + buf[--charPos] = Integer.DigitOnes[-i2]; + if (i2 < -9) { + buf[--charPos] = Integer.DigitTens[-i2]; } if (negative) { diff --git a/src/java.base/share/classes/java/lang/String.java b/src/java.base/share/classes/java/lang/String.java index abb35ebaeb16cc81bca8404eecfb0c9dd9ac571e..43c76d5eb3e871b87cc57595a75e08a58d2011b6 100644 --- a/src/java.base/share/classes/java/lang/String.java +++ b/src/java.base/share/classes/java/lang/String.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1994, 2022, 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 @@ -541,8 +541,7 @@ public final class String offset++; continue; } - if ((b1 == (byte)0xc2 || b1 == (byte)0xc3) && - offset + 1 < sl) { + if ((b1 & 0xfe) == 0xc2 && offset + 1 < sl) { // b1 either 0xc2 or 0xc3 int b2 = bytes[offset + 1]; if (!isNotContinuation(b2)) { dst[dp++] = (byte)decode2(b1, b2); @@ -698,8 +697,7 @@ public final class String offset++; continue; } - if ((b1 == (byte) 0xc2 || b1 == (byte) 0xc3) && - offset + 1 < sl) { + if ((b1 & 0xfe) == 0xc2 && offset + 1 < sl) { // b1 either 0xc2 or 0xc3 int b2 = bytes[offset + 1]; if (!isNotContinuation(b2)) { dst[dp++] = (byte) decode2(b1, b2); @@ -1284,14 +1282,17 @@ public final class String int sp = 0; int sl = val.length >> 1; byte[] dst = new byte[sl * 3]; - char c; - while (sp < sl && (c = StringUTF16.getChar(val, sp)) < '\u0080') { + while (sp < sl) { // ascii fast loop; + char c = StringUTF16.getChar(val, sp); + if (c >= '\u0080') { + break; + } dst[dp++] = (byte)c; sp++; } while (sp < sl) { - c = StringUTF16.getChar(val, sp++); + char c = StringUTF16.getChar(val, sp++); if (c < 0x80) { dst[dp++] = (byte)c; } else if (c < 0x800) { diff --git a/src/java.base/share/classes/java/lang/StringBuffer.java b/src/java.base/share/classes/java/lang/StringBuffer.java index e2ca48fdaf6e6ddf7664c6af146e746a06131cd8..1ba12bd29bc2b798dcabebf537d28a8cbe8ca612 100644 --- a/src/java.base/share/classes/java/lang/StringBuffer.java +++ b/src/java.base/share/classes/java/lang/StringBuffer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1994, 2021, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,12 @@ package java.lang; import java.io.IOException; -import java.util.Arrays; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.ObjectStreamField; +import java.io.Serial; +import java.io.Serializable; +import java.io.StreamCorruptedException; import jdk.internal.vm.annotation.IntrinsicCandidate; /** @@ -106,7 +111,7 @@ import jdk.internal.vm.annotation.IntrinsicCandidate; */ public final class StringBuffer extends AbstractStringBuilder - implements java.io.Serializable, Comparable, CharSequence + implements Serializable, Comparable, CharSequence { /** @@ -116,7 +121,7 @@ import jdk.internal.vm.annotation.IntrinsicCandidate; private transient String toStringCache; /** use serialVersionUID from JDK 1.0.2 for interoperability */ - @java.io.Serial + @Serial static final long serialVersionUID = 3388685877147921107L; /** @@ -725,25 +730,25 @@ import jdk.internal.vm.annotation.IntrinsicCandidate; * A flag indicating whether the backing array is shared. * The value is ignored upon deserialization. */ - @java.io.Serial - private static final java.io.ObjectStreamField[] serialPersistentFields = + @Serial + private static final ObjectStreamField[] serialPersistentFields = { - new java.io.ObjectStreamField("value", char[].class), - new java.io.ObjectStreamField("count", Integer.TYPE), - new java.io.ObjectStreamField("shared", Boolean.TYPE), + new ObjectStreamField("value", char[].class), + new ObjectStreamField("count", Integer.TYPE), + new ObjectStreamField("shared", Boolean.TYPE), }; /** - * The {@code writeObject} method is called to write the state of the {@code StringBuffer} to - * a stream. + * The {@code writeObject} method is called to write the state of the + * {@code StringBuffer} to a stream. * * @param s the {@code ObjectOutputStream} to which data is written * @throws IOException if an I/O error occurs */ - @java.io.Serial - private synchronized void writeObject(java.io.ObjectOutputStream s) - throws java.io.IOException { - java.io.ObjectOutputStream.PutField fields = s.putFields(); + @Serial + private synchronized void writeObject(ObjectOutputStream s) + throws IOException { + ObjectOutputStream.PutField fields = s.putFields(); char[] val = new char[capacity()]; if (isLatin1()) { StringLatin1.getChars(value, 0, count, val, 0); @@ -757,20 +762,26 @@ import jdk.internal.vm.annotation.IntrinsicCandidate; } /** - * The {@code readObject} method is called to restore the state of the {@code StringBuffer} from - * a stream. + * The {@code readObject} method is called to restore the state of the + * {@code StringBuffer} from a stream. * * @param s the {@code ObjectInputStream} from which data is read * @throws IOException if an I/O error occurs * @throws ClassNotFoundException if a serialized class cannot be loaded */ - @java.io.Serial - private void readObject(java.io.ObjectInputStream s) - throws java.io.IOException, ClassNotFoundException { - java.io.ObjectInputStream.GetField fields = s.readFields(); + @Serial + private void readObject(ObjectInputStream s) + throws IOException, ClassNotFoundException { + ObjectInputStream.GetField fields = s.readFields(); + char[] val = (char[])fields.get("value", null); + int c = fields.get("count", 0); + if (c < 0 || c > val.length) { + throw new StreamCorruptedException("count value invalid"); + } initBytes(val, 0, val.length); - count = fields.get("count", 0); + count = c; + // ignore shared field } synchronized void getBytes(byte[] dst, int dstBegin, byte coder) { diff --git a/src/java.base/share/classes/java/lang/StringBuilder.java b/src/java.base/share/classes/java/lang/StringBuilder.java index b22ed99dbfc6b271db37e957826faf2dfa69fe16..8e759c213a9a80ae8631107feb6958c5fcf66bcb 100644 --- a/src/java.base/share/classes/java/lang/StringBuilder.java +++ b/src/java.base/share/classes/java/lang/StringBuilder.java @@ -28,6 +28,10 @@ package java.lang; import jdk.internal.vm.annotation.IntrinsicCandidate; import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.Serial; +import java.io.StreamCorruptedException; /** * A mutable sequence of characters. This class provides an API compatible @@ -90,7 +94,7 @@ public final class StringBuilder { /** use serialVersionUID for interoperability */ - @java.io.Serial + @Serial static final long serialVersionUID = 4383685877147921099L; /** @@ -464,9 +468,8 @@ public final class StringBuilder * @param s the {@code ObjectOutputStream} to which data is written * @throws IOException if an I/O error occurs */ - @java.io.Serial - private void writeObject(java.io.ObjectOutputStream s) - throws java.io.IOException { + @Serial + private void writeObject(ObjectOutputStream s) throws IOException { s.defaultWriteObject(); s.writeInt(count); char[] val = new char[capacity()]; @@ -486,13 +489,16 @@ public final class StringBuilder * @throws IOException if an I/O error occurs * @throws ClassNotFoundException if a serialized class cannot be loaded */ - @java.io.Serial - private void readObject(java.io.ObjectInputStream s) - throws IOException, ClassNotFoundException { + @Serial + private void readObject(ObjectInputStream s) + throws IOException, ClassNotFoundException { s.defaultReadObject(); - count = s.readInt(); + int c = s.readInt(); char[] val = (char[]) s.readObject(); + if (c < 0 || c > val.length) { + throw new StreamCorruptedException("count value invalid"); + } initBytes(val, 0, val.length); + count = c; } - } diff --git a/src/java.base/share/classes/java/lang/StringUTF16.java b/src/java.base/share/classes/java/lang/StringUTF16.java index 29287aaa22cf1b8bf36af37a8ac7d214edf0fb89..b59b21fd1806205f5992fbe19009b72b1c0e237c 100644 --- a/src/java.base/share/classes/java/lang/StringUTF16.java +++ b/src/java.base/share/classes/java/lang/StringUTF16.java @@ -1549,13 +1549,9 @@ final class StringUTF16 { } // We know there are at most two digits left at this point. - q = i / 10; - r = (q * 10) - i; - putChar(buf, --charPos, '0' + r); - - // Whatever left is the remaining digit. - if (q < 0) { - putChar(buf, --charPos, '0' - q); + putChar(buf, --charPos, Integer.DigitOnes[-i]); + if (i < -9) { + putChar(buf, --charPos, Integer.DigitTens[-i]); } if (negative) { @@ -1604,13 +1600,9 @@ final class StringUTF16 { } // We know there are at most two digits left at this point. - q2 = i2 / 10; - r = (q2 * 10) - i2; - putChar(buf, --charPos, '0' + r); - - // Whatever left is the remaining digit. - if (q2 < 0) { - putChar(buf, --charPos, '0' - q2); + putChar(buf, --charPos, Integer.DigitOnes[-i2]); + if (i2 < -9) { + putChar(buf, --charPos, Integer.DigitTens[-i2]); } if (negative) { diff --git a/src/java.base/share/classes/java/lang/SuppressWarnings.java b/src/java.base/share/classes/java/lang/SuppressWarnings.java index 09ab6c4724b0b21d050eeb10ffcc6a0e25648aec..fd115fb8bef35ace0b2f875a614efa51bc9689ae 100644 --- a/src/java.base/share/classes/java/lang/SuppressWarnings.java +++ b/src/java.base/share/classes/java/lang/SuppressWarnings.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2022, 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 @@ -29,21 +29,52 @@ import java.lang.annotation.*; import static java.lang.annotation.ElementType.*; /** - * Indicates that the named compiler warnings should be suppressed in the - * annotated element (and in all program elements contained in the annotated - * element). Note that the set of warnings suppressed in a given element is - * a superset of the warnings suppressed in all containing elements. For - * example, if you annotate a class to suppress one warning and annotate a - * method to suppress another, both warnings will be suppressed in the method. - * However, note that if a warning is suppressed in a {@code - * module-info} file, the suppression applies to elements within the - * file and not to types contained within the module. + * Indicates the warnings to be suppressed at compile time in the + * annotated element, and in all elements contained in the annotated + * element. * - *

    As a matter of style, programmers should always use this annotation - * on the most deeply nested element where it is effective. If you want to + *

    The {@code SuppressWarnings} annotation interface is applicable + * in all declaration contexts, so an {@code @SuppressWarnings} + * annotation can be used on any element. As a matter of style, + * programmers should always use this annotation on the most deeply + * nested element where it is effective. For example, if you want to * suppress a warning in a particular method, you should annotate that * method rather than its class. * + *

    The set of warnings suppressed in a given element is a union of + * the warnings suppressed in all containing elements. For example, + * if you annotate a class to suppress one warning and annotate a + * method in the class to suppress another, both warnings will be + * suppressed in the method. However, note that if a warning is + * suppressed in a {@code module-info} file, the suppression applies + * to elements within the file and not to types contained + * within the module. Likewise, if a warning is suppressed in a + * {@code package-info} file, the suppression applies to elements + * within the file and not to types contained within the + * package. + * + *

    Java compilers must recognize all the kinds of warnings defined + * in the Java Language Specification (JLS section {@jls + * 9.6.4.5}) which include: + * + *

      + *
    • Unchecked warnings, specified by the string {@code "unchecked"}. + *
    • Deprecation warnings, specified by the string {@code "deprecation"}. + *
    • Removal warnings, specified by the string {@code "removal"}. + *
    • Preview warnings, specified by the string {@code "preview"}. + *
    + * + * Whether or not a Java compiler recognizes other strings is a + * quality of implementation concern. Compiler vendors should + * document the additional warning names they support. Vendors are + * encouraged to cooperate to ensure that the same names work across + * multiple compilers. + * + * @implNote + * In addition to the mandated suppression strings, the {@code javac} + * reference implementation recognizes compilation-related warning + * names documented in its {@code --help-lint} output. + * * @author Josh Bloch * @since 1.5 * @jls 4.8 Raw Types @@ -52,7 +83,7 @@ import static java.lang.annotation.ElementType.*; * @jls 5.5 Casting Contexts * @jls 9.6.4.5 @SuppressWarnings */ -@Target({TYPE, FIELD, METHOD, PARAMETER, CONSTRUCTOR, LOCAL_VARIABLE, MODULE}) +// Implicitly target all declaration contexts by omitting a @Target annotation @Retention(RetentionPolicy.SOURCE) public @interface SuppressWarnings { /** @@ -63,12 +94,6 @@ public @interface SuppressWarnings { * ignore any warning names they do not recognize. They are, however, * free to emit a warning if an annotation contains an unrecognized * warning name. - * - *

    The string {@code "unchecked"} is used to suppress - * unchecked warnings. Compiler vendors should document the - * additional warning names they support in conjunction with this - * annotation type. They are encouraged to cooperate to ensure - * that the same names work across multiple compilers. * @return the set of warnings to be suppressed */ String[] value(); diff --git a/src/java.base/share/classes/java/lang/System.java b/src/java.base/share/classes/java/lang/System.java index 47b436847cb4ee742d782237d394efc975487a19..96b32ecabb63e986abe4dc0b28229dab67fb9e64 100644 --- a/src/java.base/share/classes/java/lang/System.java +++ b/src/java.base/share/classes/java/lang/System.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1994, 2022, 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 @@ -1207,7 +1207,7 @@ public final class System { * Severity values and Mapping to {@code java.util.logging.Level}. *

    * {@linkplain System.Logger.Level System logger levels} are mapped to - * {@linkplain java.util.logging.Level java.util.logging levels} + * {@linkplain java.logging/java.util.logging.Level java.util.logging levels} * of corresponding severity. *
    The mapping is as follows: *

    @@ -1219,19 +1219,19 @@ public final class System { * * * {@link Logger.Level#ALL ALL} - * {@link java.util.logging.Level#ALL ALL} + * {@link java.logging/java.util.logging.Level#ALL ALL} * {@link Logger.Level#TRACE TRACE} - * {@link java.util.logging.Level#FINER FINER} + * {@link java.logging/java.util.logging.Level#FINER FINER} * {@link Logger.Level#DEBUG DEBUG} - * {@link java.util.logging.Level#FINE FINE} + * {@link java.logging/java.util.logging.Level#FINE FINE} * {@link Logger.Level#INFO INFO} - * {@link java.util.logging.Level#INFO INFO} + * {@link java.logging/java.util.logging.Level#INFO INFO} * {@link Logger.Level#WARNING WARNING} - * {@link java.util.logging.Level#WARNING WARNING} + * {@link java.logging/java.util.logging.Level#WARNING WARNING} * {@link Logger.Level#ERROR ERROR} - * {@link java.util.logging.Level#SEVERE SEVERE} + * {@link java.logging/java.util.logging.Level#SEVERE SEVERE} * {@link Logger.Level#OFF OFF} - * {@link java.util.logging.Level#OFF OFF} + * {@link java.logging/java.util.logging.Level#OFF OFF} * * * @@ -1240,6 +1240,7 @@ public final class System { * @see java.lang.System.LoggerFinder * @see java.lang.System.Logger */ + @SuppressWarnings("doclint:reference") // cross-module links public enum Level { // for convenience, we're reusing java.util.logging.Level int values @@ -1542,7 +1543,7 @@ public final class System { * {@code java.util.logging} as the backend framework when the * {@code java.logging} module is present. * It returns a {@linkplain System.Logger logger} instance - * that will route log messages to a {@link java.util.logging.Logger + * that will route log messages to a {@link java.logging/java.util.logging.Logger * java.util.logging.Logger}. Otherwise, if {@code java.logging} is not * present, the default implementation will return a simple logger * instance that will route log messages of {@code INFO} level and above to @@ -1556,7 +1557,7 @@ public final class System { * logging backend, and usually requires using APIs specific to that backend. *

    For the default {@code LoggerFinder} implementation * using {@code java.util.logging} as its backend, refer to - * {@link java.util.logging java.util.logging} for logging configuration. + * {@link java.logging/java.util.logging java.util.logging} for logging configuration. * For the default {@code LoggerFinder} implementation returning simple loggers * when the {@code java.logging} module is absent, the configuration * is implementation dependent. @@ -1591,7 +1592,7 @@ public final class System { * System.Logger.Level} to a level supported by the logging backend it uses. *
    The default LoggerFinder using {@code java.util.logging} as the backend * maps {@code System.Logger} levels to - * {@linkplain java.util.logging.Level java.util.logging} levels + * {@linkplain java.logging/java.util.logging.Level java.util.logging} levels * of corresponding severity - as described in {@link Logger.Level * Logger.Level}. * @@ -1600,6 +1601,7 @@ public final class System { * * @since 9 */ + @SuppressWarnings("doclint:reference") // cross-module links public abstract static class LoggerFinder { /** * The {@code RuntimePermission("loggerFinder")} is diff --git a/src/java.base/share/classes/java/lang/Thread.java b/src/java.base/share/classes/java/lang/Thread.java index 797a7f9f82ec26aa1e1ae87e852d223304ca5e30..77e0bbc6129a396c9f212e9d2b17b27b34ef2fa0 100644 --- a/src/java.base/share/classes/java/lang/Thread.java +++ b/src/java.base/share/classes/java/lang/Thread.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1994, 2022, 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 @@ -1976,8 +1976,8 @@ public class Thread implements Runnable { * @return the uncaught exception handler for this thread */ public UncaughtExceptionHandler getUncaughtExceptionHandler() { - return uncaughtExceptionHandler != null ? - uncaughtExceptionHandler : group; + UncaughtExceptionHandler handler = this.uncaughtExceptionHandler; + return handler != null ? handler : group; } /** diff --git a/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java b/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java index c687916dde4926ce50b2c70939fd7e0c7a6e056e..ca5bf8a765634b74bfa40cbff616b25b7b250183 100644 --- a/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java +++ b/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java @@ -683,6 +683,7 @@ class InvokerBytecodeGenerator { } private static MemberName resolveFrom(String name, MethodType type, Class holder) { + assert(!UNSAFE.shouldBeInitialized(holder)) : holder + "not initialized"; MemberName member = new MemberName(holder, name, type, REF_invokeStatic); MemberName resolvedMember = MemberName.getFactory().resolveOrNull(REF_invokeStatic, member, holder, LM_TRUSTED); traceLambdaForm(name, type, holder, resolvedMember); diff --git a/src/java.base/share/classes/java/lang/invoke/MemoryAccessVarHandleBase.java b/src/java.base/share/classes/java/lang/invoke/MemoryAccessVarHandleBase.java index 59098e9fa74dcd720ed825f7397b5de788beefd7..7703c997fc3393788f444a02c04e330f223dbd5e 100644 --- a/src/java.base/share/classes/java/lang/invoke/MemoryAccessVarHandleBase.java +++ b/src/java.base/share/classes/java/lang/invoke/MemoryAccessVarHandleBase.java @@ -50,7 +50,7 @@ abstract class MemoryAccessVarHandleBase extends VarHandle { this.alignmentMask = alignmentMask; } - static IllegalStateException newIllegalStateExceptionForMisalignedAccess(long address) { - return new IllegalStateException("Misaligned access at address: " + address); + static IllegalArgumentException newIllegalArgumentExceptionForMisalignedAccess(long address) { + return new IllegalArgumentException("Misaligned access at address: " + address); } } diff --git a/src/java.base/share/classes/java/lang/invoke/MethodHandleProxies.java b/src/java.base/share/classes/java/lang/invoke/MethodHandleProxies.java index 4dd2b1fce7ecb5c9a6e2e513db8ad9dd85ded2a4..69d975a7289012e282494d8805571026990ac656 100644 --- a/src/java.base/share/classes/java/lang/invoke/MethodHandleProxies.java +++ b/src/java.base/share/classes/java/lang/invoke/MethodHandleProxies.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2022, 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,9 +28,11 @@ package java.lang.invoke; import java.lang.reflect.*; import java.security.AccessController; import java.security.PrivilegedAction; + +import jdk.internal.access.JavaLangReflectAccess; +import jdk.internal.access.SharedSecrets; import sun.invoke.WrapperInstance; import java.util.ArrayList; -import java.util.concurrent.ConcurrentHashMap; import jdk.internal.reflect.CallerSensitive; import jdk.internal.reflect.Reflection; @@ -88,7 +90,7 @@ public class MethodHandleProxies { * Therefore, each instance must implement a unique single-method interface. * Implementations may not bundle together * multiple single-method interfaces onto single implementation classes - * in the style of {@link java.awt.AWTEventMulticaster}. + * in the style of {@link java.desktop/java.awt.AWTEventMulticaster}. *

    * The method handle may throw an undeclared exception, * which means any checked exception (or other checked throwable) @@ -152,7 +154,8 @@ public class MethodHandleProxies { // entry points, must be covered by hand-written or automatically // generated adapter classes. // - @SuppressWarnings("removal") + @SuppressWarnings({"removal", + "doclint:reference"}) // cross-module links @CallerSensitive public static T asInterfaceInstance(final Class intfc, final MethodHandle target) { if (!intfc.isInterface() || !Modifier.isPublic(intfc.getModifiers())) @@ -184,8 +187,6 @@ public class MethodHandleProxies { checkTarget = checkTarget.asType(checkTarget.type().changeReturnType(Object.class)); vaTargets[i] = checkTarget.asSpreader(Object[].class, smMT.parameterCount()); } - final ConcurrentHashMap defaultMethodMap = - hasDefaultMethods(intfc) ? new ConcurrentHashMap<>() : null; final InvocationHandler ih = new InvocationHandler() { private Object getArg(String name) { if ((Object)name == "getWrapperInstanceTarget") return target; @@ -202,7 +203,8 @@ public class MethodHandleProxies { if (isObjectMethod(method)) return callObjectMethod(proxy, method, args); if (isDefaultMethod(method)) { - return callDefaultMethod(defaultMethodMap, proxy, intfc, method, args); + // no additional access check is performed + return JLRA.invokeDefault(proxy, method, args, null); } throw newInternalError("bad proxy method: "+method); } @@ -292,7 +294,7 @@ public class MethodHandleProxies { private static Object callObjectMethod(Object self, Method m, Object[] args) { assert(isObjectMethod(m)) : m; return switch (m.getName()) { - case "toString" -> self.getClass().getName() + "@" + Integer.toHexString(self.hashCode()); + case "toString" -> java.util.Objects.toIdentityString(self); case "hashCode" -> System.identityHashCode(self); case "equals" -> (self == args[0]); default -> null; @@ -320,37 +322,5 @@ public class MethodHandleProxies { return !Modifier.isAbstract(m.getModifiers()); } - private static boolean hasDefaultMethods(Class intfc) { - for (Method m : intfc.getMethods()) { - if (!isObjectMethod(m) && - !Modifier.isAbstract(m.getModifiers())) { - return true; - } - } - return false; - } - - private static Object callDefaultMethod(ConcurrentHashMap defaultMethodMap, - Object self, Class intfc, Method m, Object[] args) throws Throwable { - assert(isDefaultMethod(m) && !isObjectMethod(m)) : m; - - // Lazily compute the associated method handle from the method - MethodHandle dmh = defaultMethodMap.computeIfAbsent(m, mk -> { - try { - // Look up the default method for special invocation thereby - // avoiding recursive invocation back to the proxy - MethodHandle mh = MethodHandles.Lookup.IMPL_LOOKUP.findSpecial( - intfc, mk.getName(), - MethodType.methodType(mk.getReturnType(), mk.getParameterTypes()), - self.getClass()); - return mh.asSpreader(Object[].class, mk.getParameterCount()); - } catch (NoSuchMethodException | IllegalAccessException e) { - // The method is known to exist and should be accessible, this - // method would not be called unless the invokeinterface to the - // default (public) method passed access control checks - throw new InternalError(e); - } - }); - return dmh.invoke(self, args); - } + private static final JavaLangReflectAccess JLRA = SharedSecrets.getJavaLangReflectAccess(); } diff --git a/src/java.base/share/classes/java/lang/invoke/MethodHandles.java b/src/java.base/share/classes/java/lang/invoke/MethodHandles.java index 743ebb6675996de06691fbb2cbded1afef2d46fc..b7d5bde0aebab2f4486065562ae5b7b956b101db 100644 --- a/src/java.base/share/classes/java/lang/invoke/MethodHandles.java +++ b/src/java.base/share/classes/java/lang/invoke/MethodHandles.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2022, 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 @@ -2002,7 +2002,7 @@ public class MethodHandles { * there is no internal form available to record in any class's constant pool. * A hidden class or interface is not discoverable by {@link Class#forName(String, boolean, ClassLoader)}, * {@link ClassLoader#loadClass(String, boolean)}, or {@link #findClass(String)}, and - * is not {@linkplain java.lang.instrument.Instrumentation#isModifiableClass(Class) + * is not {@linkplain java.instrument/java.lang.instrument.Instrumentation#isModifiableClass(Class) * modifiable} by Java agents or tool agents using the * JVM Tool Interface. * @@ -2105,6 +2105,7 @@ public class MethodHandles { * @jvms 5.5 Initialization * @jls 12.7 Unloading of Classes and Interfaces */ + @SuppressWarnings("doclint:reference") // cross-module links public Lookup defineHiddenClass(byte[] bytes, boolean initialize, ClassOption... options) throws IllegalAccessException { diff --git a/src/java.base/share/classes/java/lang/invoke/X-VarHandleMemoryAccess.java.template b/src/java.base/share/classes/java/lang/invoke/X-VarHandleMemoryAccess.java.template index 0bdfd212e0783a1f22517fad179c350c1e836aee..bdb4904d9942d988fa40668159a71b192ab4acd7 100644 --- a/src/java.base/share/classes/java/lang/invoke/X-VarHandleMemoryAccess.java.template +++ b/src/java.base/share/classes/java/lang/invoke/X-VarHandleMemoryAccess.java.template @@ -106,7 +106,7 @@ final class MemoryAccessVarHandle$Type$Helper extends MemoryAccessVarHandleBase static long offset(boolean skipAlignmentMaskCheck, MemorySegmentProxy bb, long offset, long alignmentMask) { long address = offsetNoVMAlignCheck(skipAlignmentMaskCheck, bb, offset, alignmentMask); if ((address & VM_ALIGN) != 0) { - throw MemoryAccessVarHandleBase.newIllegalStateExceptionForMisalignedAccess(address); + throw MemoryAccessVarHandleBase.newIllegalArgumentExceptionForMisalignedAccess(address); } return address; } @@ -115,14 +115,15 @@ final class MemoryAccessVarHandle$Type$Helper extends MemoryAccessVarHandleBase static long offsetNoVMAlignCheck(boolean skipAlignmentMaskCheck, MemorySegmentProxy bb, long offset, long alignmentMask) { long base = bb.unsafeGetOffset(); long address = base + offset; + long maxAlignMask = bb.maxAlignMask(); if (skipAlignmentMaskCheck) { //note: the offset portion has already been aligned-checked, by construction - if ((base & alignmentMask) != 0) { - throw MemoryAccessVarHandleBase.newIllegalStateExceptionForMisalignedAccess(address); + if (((base | maxAlignMask) & alignmentMask) != 0) { + throw MemoryAccessVarHandleBase.newIllegalArgumentExceptionForMisalignedAccess(address); } } else { - if ((address & alignmentMask) != 0) { - throw MemoryAccessVarHandleBase.newIllegalStateExceptionForMisalignedAccess(address); + if (((address | maxAlignMask) & alignmentMask) != 0) { + throw MemoryAccessVarHandleBase.newIllegalArgumentExceptionForMisalignedAccess(address); } } return address; diff --git a/src/java.base/share/classes/java/lang/reflect/AccessibleObject.java b/src/java.base/share/classes/java/lang/reflect/AccessibleObject.java index 19dbce14b7571ed919efe62f3b43a5465cbdcb67..2b620967a8aecc8df06248e87115953e93e1d6f6 100644 --- a/src/java.base/share/classes/java/lang/reflect/AccessibleObject.java +++ b/src/java.base/share/classes/java/lang/reflect/AccessibleObject.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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 @@ -168,6 +168,15 @@ public class AccessibleObject implements AnnotatedElement { * open module.

    • * * + *

    This method may be used by JNI code + * with no caller class on the stack to enable access to a {@link Member member} + * of {@link Member#getDeclaringClass() declaring class} {@code D} if and only if: + *

      + *
    • The member is {@code public} and {@code D} is {@code public} in + * a package that the module containing {@code D} {@link + * Module#isExported(String,Module) exports} unconditionally.
      • + *
    + * *

    This method cannot be used to enable access to private members, * members with default (package) access, protected instance members, or * protected constructors when the declaring class is in a different module @@ -246,6 +255,11 @@ public class AccessibleObject implements AnnotatedElement { * } * } * + *

    If this method is invoked by JNI code + * with no caller class on the stack, the {@code accessible} flag can + * only be set if the member and the declaring class are public, and + * the class is in a package that is exported unconditionally.

    + * *

    If there is a security manager, its {@code checkPermission} method * is first called with a {@code ReflectPermission("suppressAccessChecks")} * permission.

    @@ -304,6 +318,16 @@ public class AccessibleObject implements AnnotatedElement { throw new IllegalCallerException(); // should not happen } + if (caller == null) { + // No caller frame when a native thread attaches to the VM + // only allow access to a public accessible member + boolean canAccess = Reflection.verifyPublicMemberAccess(declaringClass, declaringClass.getModifiers()); + if (!canAccess && throwExceptionIfDenied) { + throwInaccessibleObjectException(caller, declaringClass); + } + return canAccess; + } + Module callerModule = caller.getModule(); Module declaringModule = declaringClass.getModule(); @@ -312,12 +336,7 @@ public class AccessibleObject implements AnnotatedElement { if (!declaringModule.isNamed()) return true; String pn = declaringClass.getPackageName(); - int modifiers; - if (this instanceof Executable) { - modifiers = ((Executable) this).getModifiers(); - } else { - modifiers = ((Field) this).getModifiers(); - } + int modifiers = ((Member)this).getModifiers(); // class is public and package is exported to caller boolean isClassPublic = Modifier.isPublic(declaringClass.getModifiers()); @@ -341,25 +360,37 @@ public class AccessibleObject implements AnnotatedElement { } if (throwExceptionIfDenied) { - // not accessible - String msg = "Unable to make "; - if (this instanceof Field) - msg += "field "; - msg += this + " accessible: " + declaringModule + " does not \""; - if (isClassPublic && Modifier.isPublic(modifiers)) - msg += "exports"; - else - msg += "opens"; - msg += " " + pn + "\" to " + callerModule; - InaccessibleObjectException e = new InaccessibleObjectException(msg); - if (printStackTraceWhenAccessFails()) { - e.printStackTrace(System.err); - } - throw e; + throwInaccessibleObjectException(caller, declaringClass); } return false; } + private void throwInaccessibleObjectException(Class caller, Class declaringClass) { + boolean isClassPublic = Modifier.isPublic(declaringClass.getModifiers()); + String pn = declaringClass.getPackageName(); + int modifiers = ((Member)this).getModifiers(); + + // not accessible + String msg = "Unable to make "; + if (this instanceof Field) + msg += "field "; + msg += this + " accessible"; + msg += caller == null ? " by JNI attached native thread with no caller frame: " : ": "; + msg += declaringClass.getModule() + " does not \""; + if (isClassPublic && Modifier.isPublic(modifiers)) + msg += "exports"; + else + msg += "opens"; + msg += " " + pn + "\"" ; + if (caller != null) + msg += " to " + caller.getModule(); + InaccessibleObjectException e = new InaccessibleObjectException(msg); + if (printStackTraceWhenAccessFails()) { + e.printStackTrace(System.err); + } + throw e; + } + private boolean isSubclassOf(Class queryClass, Class ofClass) { while (queryClass != null) { if (queryClass == ofClass) { @@ -409,7 +440,11 @@ public class AccessibleObject implements AnnotatedElement { * is set to {@code true}, i.e. the checks for Java language access control * are suppressed, or if the caller can access the member as * specified in The Java Language Specification, - * with the variation noted in the class description.

    + * with the variation noted in the class description. + * If this method is invoked by JNI code + * with no caller class on the stack, this method returns {@code true} + * if the member and the declaring class are public, and the class is in + * a package that is exported unconditionally.

    * * @param obj an instance object of the declaring class of this reflected * object if it is an instance method or field diff --git a/src/java.base/share/classes/java/lang/reflect/Constructor.java b/src/java.base/share/classes/java/lang/reflect/Constructor.java index 73ad66d5d5dc62a621ab2f6b40fc86e34b7e63bd..17277c7eb35590bf0da774581d2bda34dd499974 100644 --- a/src/java.base/share/classes/java/lang/reflect/Constructor.java +++ b/src/java.base/share/classes/java/lang/reflect/Constructor.java @@ -371,7 +371,7 @@ public final class Constructor extends Executable { sb.append(getDeclaringClass().getTypeName()); sb.append('('); StringJoiner sj = new StringJoiner(","); - for (Class parameterType : getParameterTypes()) { + for (Class parameterType : getSharedParameterTypes()) { sj.add(parameterType.getTypeName()); } sb.append(sj); diff --git a/src/java.base/share/classes/java/lang/reflect/InvocationHandler.java b/src/java.base/share/classes/java/lang/reflect/InvocationHandler.java index 4ca59906367966d51fae53e7f52a59ba3f394594..d5d00f34c868f42ef0520ee363f99a49f809c711 100644 --- a/src/java.base/share/classes/java/lang/reflect/InvocationHandler.java +++ b/src/java.base/share/classes/java/lang/reflect/InvocationHandler.java @@ -28,7 +28,6 @@ package java.lang.reflect; import jdk.internal.reflect.CallerSensitive; import jdk.internal.reflect.Reflection; -import java.lang.invoke.MethodHandle; import java.util.Objects; /** @@ -262,33 +261,6 @@ public interface InvocationHandler { throws Throwable { Objects.requireNonNull(proxy); Objects.requireNonNull(method); - - // verify that the object is actually a proxy instance - if (!Proxy.isProxyClass(proxy.getClass())) { - throw new IllegalArgumentException("'proxy' is not a proxy instance"); - } - if (!method.isDefault()) { - throw new IllegalArgumentException("\"" + method + "\" is not a default method"); - } - @SuppressWarnings("unchecked") - Class proxyClass = (Class)proxy.getClass(); - - Class intf = method.getDeclaringClass(); - // access check on the default method - method.checkAccess(Reflection.getCallerClass(), intf, proxyClass, method.getModifiers()); - - MethodHandle mh = Proxy.defaultMethodHandle(proxyClass, method); - // invoke the super method - try { - // the args array can be null if the number of formal parameters required by - // the method is zero (consistent with Method::invoke) - Object[] params = args != null ? args : Proxy.EMPTY_ARGS; - return mh.invokeExact(proxy, params); - } catch (ClassCastException | NullPointerException e) { - throw new IllegalArgumentException(e.getMessage(), e); - } catch (Proxy.InvocationException e) { - // unwrap and throw the exception thrown by the default method - throw e.getCause(); - } + return Proxy.invokeDefault(proxy, method, args, Reflection.getCallerClass()); } } diff --git a/src/java.base/share/classes/java/lang/reflect/Method.java b/src/java.base/share/classes/java/lang/reflect/Method.java index 5d8fe026b406eae1662b134f940cd01097c42346..2aff745d55367f5db32ee48211d7660c841c0210 100644 --- a/src/java.base/share/classes/java/lang/reflect/Method.java +++ b/src/java.base/share/classes/java/lang/reflect/Method.java @@ -431,7 +431,7 @@ public final class Method extends Executable { String toShortSignature() { StringJoiner sj = new StringJoiner(",", getName() + "(", ")"); - for (Class parameterType : getParameterTypes()) { + for (Class parameterType : getSharedParameterTypes()) { sj.add(parameterType.getTypeName()); } return sj.toString(); diff --git a/src/java.base/share/classes/java/lang/reflect/Proxy.java b/src/java.base/share/classes/java/lang/reflect/Proxy.java index c9e3bb259ae44bbd68edbdae7a29308fa6c07925..6dd5b3ef1db42a65e34371feb49599bf65f16277 100644 --- a/src/java.base/share/classes/java/lang/reflect/Proxy.java +++ b/src/java.base/share/classes/java/lang/reflect/Proxy.java @@ -1314,6 +1314,46 @@ public class Proxy implements java.io.Serializable { }); } + /* + * Invoke the default method of the given proxy with an explicit caller class. + * + * @throws IllegalAccessException if the proxy interface is inaccessible to the caller + * if caller is non-null + */ + static Object invokeDefault(Object proxy, Method method, Object[] args, Class caller) + throws Throwable { + // verify that the object is actually a proxy instance + if (!Proxy.isProxyClass(proxy.getClass())) { + throw new IllegalArgumentException("'proxy' is not a proxy instance"); + } + if (!method.isDefault()) { + throw new IllegalArgumentException("\"" + method + "\" is not a default method"); + } + @SuppressWarnings("unchecked") + Class proxyClass = (Class)proxy.getClass(); + + // skip access check if caller is null + if (caller != null) { + Class intf = method.getDeclaringClass(); + // access check on the default method + method.checkAccess(caller, intf, proxyClass, method.getModifiers()); + } + + MethodHandle mh = Proxy.defaultMethodHandle(proxyClass, method); + // invoke the super method + try { + // the args array can be null if the number of formal parameters required by + // the method is zero (consistent with Method::invoke) + Object[] params = args != null ? args : Proxy.EMPTY_ARGS; + return mh.invokeExact(proxy, params); + } catch (ClassCastException | NullPointerException e) { + throw new IllegalArgumentException(e.getMessage(), e); + } catch (Proxy.InvocationException e) { + // unwrap and throw the exception thrown by the default method + throw e.getCause(); + } + } + /** * Internal exception type to wrap the exception thrown by the default method * so that it can distinguish CCE and NPE thrown due to the arguments diff --git a/src/java.base/share/classes/java/lang/reflect/ReflectAccess.java b/src/java.base/share/classes/java/lang/reflect/ReflectAccess.java index 6ac890156b0f5668520da4c46283d67fa07c0269..fa5a5d453ec02c1398bfb821d1be5bfac5322647 100644 --- a/src/java.base/share/classes/java/lang/reflect/ReflectAccess.java +++ b/src/java.base/share/classes/java/lang/reflect/ReflectAccess.java @@ -127,4 +127,9 @@ class ReflectAccess implements jdk.internal.access.JavaLangReflectAccess { { return ctor.newInstanceWithCaller(args, true, caller); } + + public Object invokeDefault(Object proxy, Method method, Object[] args, Class caller) + throws Throwable { + return Proxy.invokeDefault(proxy, method, args, caller); + } } diff --git a/src/java.base/share/classes/java/math/BigDecimal.java b/src/java.base/share/classes/java/math/BigDecimal.java index b13906ebae9ce8c3466c16a6ac399490244f96fb..c491346f9f58d9bab187904d67bb32874a77a70b 100644 --- a/src/java.base/share/classes/java/math/BigDecimal.java +++ b/src/java.base/share/classes/java/math/BigDecimal.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2022, 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 @@ -1791,7 +1791,7 @@ public class BigDecimal extends Number implements Comparable { * @throws ArithmeticException if the result is inexact but the * rounding mode is {@code UNNECESSARY} or * {@code mc.precision == 0} and the quotient has a - * non-terminating decimal expansion,including dividing by zero + * non-terminating decimal expansion, including dividing by zero * @since 1.5 */ public BigDecimal divide(BigDecimal divisor, MathContext mc) { diff --git a/src/java.base/share/classes/java/net/doc-files/net-properties.html b/src/java.base/share/classes/java/net/doc-files/net-properties.html index 0c2d3e232dad4ef40d03d713ec36b1679dbc5cbd..2bd355804328ef1cd643a71f793eae9dadaee7d3 100644 --- a/src/java.base/share/classes/java/net/doc-files/net-properties.html +++ b/src/java.base/share/classes/java/net/doc-files/net-properties.html @@ -214,6 +214,22 @@ of proxies.

    property is defined, then its value will be used as the domain name.

    +

  • {@systemProperty jdk.https.negotiate.cbt} (default: <never>)
    + This controls the generation and sending of TLS channel binding tokens (CBT) when Kerberos + or the Negotiate authentication scheme using Kerberos are employed over HTTPS with + {@code HttpsURLConnection}. There are three possible settings:

    +
      +

    1. "never". This is also the default value if the property is not set. In this case, + CBTs are never sent.

      +

    2. "always". CBTs are sent for all Kerberos authentication attempts over HTTPS.

      +

    3. "domain:<comma separated domain list>" Each domain in the list specifies destination + host or hosts for which a CBT is sent. Domains can be single hosts like foo, or foo.com, + or literal IP addresses as specified in RFC 2732, or wildcards like *.foo.com which matches + all hosts under foo.com and its sub-domains. CBTs are not sent to any destinations + that don't match one of the list entries

      +
    +

    The channel binding tokens generated are of the type "tls-server-end-point" as defined in + RFC 5929.

    All these properties are checked only once at startup.

    diff --git a/src/java.base/share/classes/java/net/package-info.java b/src/java.base/share/classes/java/net/package-info.java index b221c6bf2f73de4f12967a0d464afdc6ea715d2c..6fc9913dfedd3b520cdf07ab611ef1af4822c8c7 100644 --- a/src/java.base/share/classes/java/net/package-info.java +++ b/src/java.base/share/classes/java/net/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2022, 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 @@ -122,7 +122,7 @@ *
  • {@link java.net.HttpURLConnection} is a subclass of URLConnection * and provides some additional functionalities specific to the * HTTP protocol. This API has been superseded by the newer - * {@linkplain java.net.http HTTP Client API}.
    • + * {@linkplain java.net.http/java.net.http HTTP Client API}. * *

    The recommended usage is to use {@link java.net.URI} to identify * resources, then convert it into a {@link java.net.URL} when it is time to @@ -157,4 +157,5 @@ * * @since 1.0 */ +@SuppressWarnings("doclint:reference") // cross-module links package java.net; diff --git a/src/java.base/share/classes/java/nio/Buffer.java b/src/java.base/share/classes/java/nio/Buffer.java index 92c9f80dca8c439fc6e54e411b0b70265333d968..a452b1a28dd435e454104f05c36dc5e4a1dee223 100644 --- a/src/java.base/share/classes/java/nio/Buffer.java +++ b/src/java.base/share/classes/java/nio/Buffer.java @@ -767,7 +767,11 @@ public abstract class Buffer { final void checkScope() { ScopedMemoryAccess.Scope scope = scope(); if (scope != null) { - scope.checkValidState(); + try { + scope.checkValidState(); + } catch (ScopedMemoryAccess.Scope.ScopedAccessError e) { + throw new IllegalStateException("This segment is already closed"); + } } } diff --git a/src/java.base/share/classes/java/nio/channels/Channels.java b/src/java.base/share/classes/java/nio/channels/Channels.java index 3e68d49b2b7023f2890f25435067d6dc5a1f563a..1d2ccaa778889a66a14436c8654e1cd668be23fe 100644 --- a/src/java.base/share/classes/java/nio/channels/Channels.java +++ b/src/java.base/share/classes/java/nio/channels/Channels.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -40,8 +40,6 @@ import java.nio.charset.UnsupportedCharsetException; import java.nio.channels.spi.AbstractInterruptibleChannel; import java.util.Objects; import java.util.concurrent.ExecutionException; -import sun.nio.ch.ChannelInputStream; -import sun.nio.ch.ChannelOutputStream; import sun.nio.cs.StreamDecoder; import sun.nio.cs.StreamEncoder; @@ -87,7 +85,7 @@ public final class Channels { */ public static InputStream newInputStream(ReadableByteChannel ch) { Objects.requireNonNull(ch, "ch"); - return new ChannelInputStream(ch); + return sun.nio.ch.Streams.of(ch); } /** @@ -106,7 +104,7 @@ public final class Channels { */ public static OutputStream newOutputStream(WritableByteChannel ch) { Objects.requireNonNull(ch, "ch"); - return new ChannelOutputStream(ch); + return sun.nio.ch.Streams.of(ch); } /** diff --git a/src/java.base/share/classes/java/nio/channels/FileChannel.java b/src/java.base/share/classes/java/nio/channels/FileChannel.java index 2ea213b3509e859c1f6086d211b89c8fac49da93..9d9c35fbc1f760c8b829b869ddc7b897c5212671 100644 --- a/src/java.base/share/classes/java/nio/channels/FileChannel.java +++ b/src/java.base/share/classes/java/nio/channels/FileChannel.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2022, 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,13 +25,16 @@ package java.nio.channels; -import java.io.*; +import java.io.IOException; import java.nio.ByteBuffer; import java.nio.MappedByteBuffer; import java.nio.channels.spi.AbstractInterruptibleChannel; -import java.nio.file.*; +import java.nio.file.FileAlreadyExistsException; +import java.nio.file.OpenOption; +import java.nio.file.Path; +import java.nio.file.StandardOpenOption; import java.nio.file.attribute.FileAttribute; -import java.nio.file.spi.*; +import java.nio.file.spi.FileSystemProvider; import java.util.Set; import java.util.HashSet; import java.util.Collections; @@ -403,6 +406,9 @@ public abstract class FileChannel * with the number of bytes actually written. Otherwise this method * behaves exactly as specified by the {@link WritableByteChannel} * interface.

    + * + * @throws NonWritableChannelException + * If this channel was not opened for writing */ public abstract int write(ByteBuffer src) throws IOException; @@ -417,6 +423,9 @@ public abstract class FileChannel * with the number of bytes actually written. Otherwise this method * behaves exactly as specified in the {@link GatheringByteChannel} * interface.

    + * + * @throws NonWritableChannelException + * If this channel was not opened for writing */ public abstract long write(ByteBuffer[] srcs, int offset, int length) throws IOException; @@ -431,6 +440,9 @@ public abstract class FileChannel * with the number of bytes actually written. Otherwise this method * behaves exactly as specified in the {@link GatheringByteChannel} * interface.

    + * + * @throws NonWritableChannelException + * If this channel was not opened for writing */ public final long write(ByteBuffer[] srcs) throws IOException { return write(srcs, 0, srcs.length); @@ -554,8 +566,11 @@ public abstract class FileChannel * actually done is system-dependent and is therefore unspecified. * *

    This method is only guaranteed to force changes that were made to - * this channel's file via the methods defined in this class. It may or - * may not force changes that were made by modifying the content of a + * this channel's file via the methods defined in this class, or the methods + * defined by {@link java.io.FileOutputStream} or + * {@link java.io.RandomAccessFile} when the channel was obtained with the + * {@code getChannel} method. It may or may not force changes that were made + * by modifying the content of a * {@link MappedByteBuffer mapped byte buffer} obtained by * invoking the {@link #map map} method. Invoking the {@link * MappedByteBuffer#force force} method of the mapped byte buffer will @@ -1030,7 +1045,7 @@ public abstract class FileChannel * region * * @throws NonReadableChannelException - * If {@code shared} is {@code true} this channel was not + * If {@code shared} is {@code true} but this channel was not * opened for reading * * @throws NonWritableChannelException @@ -1148,6 +1163,14 @@ public abstract class FileChannel * blocked in this method and is attempting to lock an overlapping * region of the same file * + * @throws NonReadableChannelException + * If {@code shared} is {@code true} but this channel was not + * opened for reading + * + * @throws NonWritableChannelException + * If {@code shared} is {@code false} but this channel was not + * opened for writing + * * @throws IOException * If some other I/O error occurs * @@ -1180,6 +1203,9 @@ public abstract class FileChannel * blocked in this method and is attempting to lock an overlapping * region * + * @throws NonWritableChannelException + * If this channel was not opened for writing + * * @throws IOException * If some other I/O error occurs * diff --git a/src/java.base/share/classes/java/nio/file/Files.java b/src/java.base/share/classes/java/nio/file/Files.java index 9c1f92614faef7fe68a4df2df2daf4237aa7c439..0d9bba9cbcae707d327d8d685e179a1536c86771 100644 --- a/src/java.base/share/classes/java/nio/file/Files.java +++ b/src/java.base/share/classes/java/nio/file/Files.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2022, 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 @@ -824,7 +824,7 @@ public final class Files { * java.io.File#createTempFile(String,String,File)} method. * *

    As with the {@code File.createTempFile} methods, this method is only - * part of a temporary-file facility. Where used as a work files, + * part of a temporary-file facility. Where used as a work file, * the resulting file may be opened using the {@link * StandardOpenOption#DELETE_ON_CLOSE DELETE_ON_CLOSE} option so that the * file is deleted when the appropriate {@code close} method is invoked. diff --git a/src/java.base/share/classes/java/security/AccessControlContext.java b/src/java.base/share/classes/java/security/AccessControlContext.java index a7f3641bedadcc5181e6f99dd887596c65bbaddf..1cb35d9bdfc407c4532eb2d5a99bbbaac07a9f6b 100644 --- a/src/java.base/share/classes/java/security/AccessControlContext.java +++ b/src/java.base/share/classes/java/security/AccessControlContext.java @@ -916,7 +916,6 @@ public final class AccessControlContext { private boolean containsAllLimits(AccessControlContext that) { boolean match = false; - Permission thisPerm; if (this.permissions == null && that.permissions == null) return true; diff --git a/src/java.base/share/classes/java/security/Provider.java b/src/java.base/share/classes/java/security/Provider.java index c6c3d63c61fe26b95542172af29c8d747d7b0179..c1c4bea90cdbae297be607c15f10ce39d1cc9705 100644 --- a/src/java.base/share/classes/java/security/Provider.java +++ b/src/java.base/share/classes/java/security/Provider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2022, 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 @@ -1149,7 +1149,7 @@ public abstract class Provider extends Properties { switch (opType) { case ADD: // clean up old alias if present - Service prevAliasService = legacyMap.get(aliasAlg); + Service prevAliasService = legacyMap.get(aliasKey); if (prevAliasService != null) { prevAliasService.removeAlias(aliasAlg); } diff --git a/src/java.base/share/classes/java/security/Security.java b/src/java.base/share/classes/java/security/Security.java index 2ee706c2448ed6b72070b980b336b39a5cbc3b65..352dc5e7fac242fae09b8c1f1c531d32dcba8655 100644 --- a/src/java.base/share/classes/java/security/Security.java +++ b/src/java.base/share/classes/java/security/Security.java @@ -91,8 +91,7 @@ public final class Security { if (propFile.exists()) { InputStream is = null; try { - FileInputStream fis = new FileInputStream(propFile); - is = new BufferedInputStream(fis); + is = new FileInputStream(propFile); props.load(is); loadedProps = true; @@ -140,7 +139,7 @@ public final class Security { // now load the user-specified file so its values // will win if they conflict with the earlier values if (extraPropFile != null) { - BufferedInputStream bis = null; + InputStream is = null; try { URL propURL; @@ -152,8 +151,8 @@ public final class Security { } else { propURL = new URL(extraPropFile); } - bis = new BufferedInputStream(propURL.openStream()); - props.load(bis); + is = propURL.openStream(); + props.load(is); loadedProps = true; if (sdebug != null) { @@ -172,9 +171,9 @@ public final class Security { e.printStackTrace(); } } finally { - if (bis != null) { + if (is != null) { try { - bis.close(); + is.close(); } catch (IOException ioe) { if (sdebug != null) { sdebug.println("unable to close input stream"); diff --git a/src/java.base/share/classes/java/security/cert/PKIXCertPathBuilderResult.java b/src/java.base/share/classes/java/security/cert/PKIXCertPathBuilderResult.java index 01cedffe9c86bec98e103554e89518a4802b3a51..4812e380bb33784b5d5d69ea722d6505094b0d9e 100644 --- a/src/java.base/share/classes/java/security/cert/PKIXCertPathBuilderResult.java +++ b/src/java.base/share/classes/java/security/cert/PKIXCertPathBuilderResult.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2021, 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 @@ -110,8 +110,8 @@ public class PKIXCertPathBuilderResult extends PKIXCertPathValidatorResult StringBuilder sb = new StringBuilder(); sb.append("PKIXCertPathBuilderResult: [\n"); sb.append(" Certification Path: " + certPath + "\n"); - sb.append(" Trust Anchor: " + getTrustAnchor().toString() + "\n"); - sb.append(" Policy Tree: " + String.valueOf(getPolicyTree()) + "\n"); + sb.append(" Trust Anchor: " + getTrustAnchor() + "\n"); + sb.append(" Policy Tree: " + getPolicyTree() + "\n"); sb.append(" Subject Public Key: " + getPublicKey() + "\n"); sb.append("]"); return sb.toString(); diff --git a/src/java.base/share/classes/java/security/cert/PKIXCertPathValidatorResult.java b/src/java.base/share/classes/java/security/cert/PKIXCertPathValidatorResult.java index 3ba1e335a5495be02b353008ad8d0aa08a4c0f16..5552078ff5cb5f73f49129367312d8fcbf163c24 100644 --- a/src/java.base/share/classes/java/security/cert/PKIXCertPathValidatorResult.java +++ b/src/java.base/share/classes/java/security/cert/PKIXCertPathValidatorResult.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2021, 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 @@ -150,8 +150,8 @@ public class PKIXCertPathValidatorResult implements CertPathValidatorResult { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("PKIXCertPathValidatorResult: [\n"); - sb.append(" Trust Anchor: " + trustAnchor.toString() + "\n"); - sb.append(" Policy Tree: " + String.valueOf(policyTree) + "\n"); + sb.append(" Trust Anchor: " + trustAnchor + "\n"); + sb.append(" Policy Tree: " + policyTree + "\n"); sb.append(" Subject Public Key: " + subjectPublicKey + "\n"); sb.append("]"); return sb.toString(); diff --git a/src/java.base/share/classes/java/security/cert/PKIXParameters.java b/src/java.base/share/classes/java/security/cert/PKIXParameters.java index d29269e9c42bb31f41941b56f8aa0494d4e9e00f..88e77f0b6cfa936b7b25f13f06d3a8be67b44374 100644 --- a/src/java.base/share/classes/java/security/cert/PKIXParameters.java +++ b/src/java.base/share/classes/java/security/cert/PKIXParameters.java @@ -696,8 +696,7 @@ public class PKIXParameters implements CertPathParameters { /* start with trusted anchor info */ if (unmodTrustAnchors != null) { - sb.append(" Trust Anchors: " + unmodTrustAnchors.toString() - + "\n"); + sb.append(" Trust Anchors: " + unmodTrustAnchors + "\n"); } /* now, append initial state information */ @@ -706,13 +705,13 @@ public class PKIXParameters implements CertPathParameters { sb.append(" Initial Policy OIDs: any\n"); } else { sb.append(" Initial Policy OIDs: [" - + unmodInitialPolicies.toString() + "]\n"); + + unmodInitialPolicies + "]\n"); } } /* now, append constraints on all certificates in the path */ - sb.append(" Validity Date: " + String.valueOf(date) + "\n"); - sb.append(" Signature Provider: " + String.valueOf(sigProvider) + "\n"); + sb.append(" Validity Date: " + date + "\n"); + sb.append(" Signature Provider: " + sigProvider + "\n"); sb.append(" Default Revocation Enabled: " + revocationEnabled + "\n"); sb.append(" Explicit Policy Required: " + explicitPolicyRequired + "\n"); sb.append(" Policy Mapping Inhibited: " + policyMappingInhibited + "\n"); @@ -720,14 +719,14 @@ public class PKIXParameters implements CertPathParameters { sb.append(" Policy Qualifiers Rejected: " + policyQualifiersRejected + "\n"); /* now, append target cert requirements */ - sb.append(" Target Cert Constraints: " + String.valueOf(certSelector) + "\n"); + sb.append(" Target Cert Constraints: " + certSelector + "\n"); /* finally, append miscellaneous parameters */ if (certPathCheckers != null) sb.append(" Certification Path Checkers: [" - + certPathCheckers.toString() + "]\n"); + + certPathCheckers + "]\n"); if (certStores != null) - sb.append(" CertStores: [" + certStores.toString() + "]\n"); + sb.append(" CertStores: [" + certStores + "]\n"); sb.append("]"); return sb.toString(); } diff --git a/src/java.base/share/classes/java/security/cert/TrustAnchor.java b/src/java.base/share/classes/java/security/cert/TrustAnchor.java index f026bea41790b726be764ceb703003e3e37500cf..ab60b5cbd9ae6828e4805ff6e4a61a7f3d300927 100644 --- a/src/java.base/share/classes/java/security/cert/TrustAnchor.java +++ b/src/java.base/share/classes/java/security/cert/TrustAnchor.java @@ -323,14 +323,13 @@ public class TrustAnchor { StringBuilder sb = new StringBuilder(); sb.append("[\n"); if (pubKey != null) { - sb.append(" Trusted CA Public Key: " + pubKey.toString() + "\n"); - sb.append(" Trusted CA Issuer Name: " - + String.valueOf(caName) + "\n"); + sb.append(" Trusted CA Public Key: " + pubKey + "\n"); + sb.append(" Trusted CA Issuer Name: " + caName + "\n"); } else { - sb.append(" Trusted CA cert: " + trustedCert.toString() + "\n"); + sb.append(" Trusted CA cert: " + trustedCert + "\n"); } if (nc != null) - sb.append(" Name Constraints: " + nc.toString() + "\n"); + sb.append(" Name Constraints: " + nc + "\n"); return sb.toString(); } diff --git a/src/java.base/share/classes/java/security/cert/X509CertSelector.java b/src/java.base/share/classes/java/security/cert/X509CertSelector.java index 86c516191a956607ec8048ca12d82d0f4736d1b0..5a25ba5927f1a9f1815b7c0cd9375e56810cf34c 100644 --- a/src/java.base/share/classes/java/security/cert/X509CertSelector.java +++ b/src/java.base/share/classes/java/security/cert/X509CertSelector.java @@ -1763,10 +1763,10 @@ public class X509CertSelector implements CertSelector { StringBuilder sb = new StringBuilder(); sb.append("X509CertSelector: [\n"); if (x509Cert != null) { - sb.append(" Certificate: " + x509Cert.toString() + "\n"); + sb.append(" Certificate: " + x509Cert + "\n"); } if (serialNumber != null) { - sb.append(" Serial Number: " + serialNumber.toString() + "\n"); + sb.append(" Serial Number: " + serialNumber + "\n"); } if (issuer != null) { sb.append(" Issuer: " + getIssuerAsString() + "\n"); @@ -1775,7 +1775,7 @@ public class X509CertSelector implements CertSelector { sb.append(" Subject: " + getSubjectAsString() + "\n"); } sb.append(" matchAllSubjectAltNames flag: " - + String.valueOf(matchAllSubjectAltNames) + "\n"); + + matchAllSubjectAltNames + "\n"); if (subjectAlternativeNames != null) { sb.append(" SubjectAlternativeNames:\n"); for (List list : subjectAlternativeNames) { @@ -1795,29 +1795,29 @@ public class X509CertSelector implements CertSelector { } if (certificateValid != null) { sb.append(" Certificate Valid: " + - certificateValid.toString() + "\n"); + certificateValid + "\n"); } if (privateKeyValid != null) { sb.append(" Private Key Valid: " + - privateKeyValid.toString() + "\n"); + privateKeyValid + "\n"); } if (subjectPublicKeyAlgID != null) { sb.append(" Subject Public Key AlgID: " + - subjectPublicKeyAlgID.toString() + "\n"); + subjectPublicKeyAlgID + "\n"); } if (subjectPublicKey != null) { sb.append(" Subject Public Key: " + - subjectPublicKey.toString() + "\n"); + subjectPublicKey + "\n"); } if (keyUsage != null) { sb.append(" Key Usage: " + keyUsageToString(keyUsage) + "\n"); } if (keyPurposeSet != null) { sb.append(" Extended Key Usage: " + - keyPurposeSet.toString() + "\n"); + keyPurposeSet + "\n"); } if (policy != null) { - sb.append(" Policy: " + policy.toString() + "\n"); + sb.append(" Policy: " + policy + "\n"); } if (pathToGeneralNames != null) { sb.append(" Path to names:\n"); @@ -2145,7 +2145,7 @@ public class X509CertSelector implements CertSelector { debug.println("X509CertSelector.match: private key usage not " + "within validity date; ext.NOT_BEFORE: " + time + "; X509CertSelector: " - + this.toString()); + + this); e2.printStackTrace(); } return false; @@ -2153,7 +2153,7 @@ public class X509CertSelector implements CertSelector { if (debug != null) { debug.println("X509CertSelector.match: IOException in " + "private key usage check; X509CertSelector: " - + this.toString()); + + this); e4.printStackTrace(); } return false; diff --git a/src/java.base/share/classes/java/text/AttributedCharacterIterator.java b/src/java.base/share/classes/java/text/AttributedCharacterIterator.java index 31b5b7d8d3c64a82dee99978d8c1ba739b87836a..6a2f33630e0181e1c8ef5be8d7a7573d50917021 100644 --- a/src/java.base/share/classes/java/text/AttributedCharacterIterator.java +++ b/src/java.base/share/classes/java/text/AttributedCharacterIterator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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,15 @@ import java.util.Set; * *

    * Attribute keys are instances of {@link AttributedCharacterIterator.Attribute} and its - * subclasses, such as {@link java.awt.font.TextAttribute}. + * subclasses, such as {@link java.desktop/java.awt.font.TextAttribute}. * * @see AttributedCharacterIterator.Attribute - * @see java.awt.font.TextAttribute + * @see java.desktop/java.awt.font.TextAttribute * @see AttributedString * @see Annotation * @since 1.2 */ - +@SuppressWarnings("doclint:reference") // cross-module links public interface AttributedCharacterIterator extends CharacterIterator { /** diff --git a/src/java.base/share/classes/java/text/Bidi.java b/src/java.base/share/classes/java/text/Bidi.java index 00a878e1c6425c129ce52a9b6208681d5092e9e8..2ec7bea6988cf9d2fe8f1ce0c3b5154041959b13 100644 --- a/src/java.base/share/classes/java/text/Bidi.java +++ b/src/java.base/share/classes/java/text/Bidi.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2022, 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 @@ -121,10 +121,11 @@ public final class Bidi { * * @param paragraph a paragraph of text with optional character and paragraph attribute information * - * @see java.awt.font.TextAttribute#BIDI_EMBEDDING - * @see java.awt.font.TextAttribute#NUMERIC_SHAPING - * @see java.awt.font.TextAttribute#RUN_DIRECTION + * @see java.desktop/java.awt.font.TextAttribute#BIDI_EMBEDDING + * @see java.desktop/java.awt.font.TextAttribute#NUMERIC_SHAPING + * @see java.desktop/java.awt.font.TextAttribute#RUN_DIRECTION */ + @SuppressWarnings("doclint:reference") // cross-module links public Bidi(AttributedCharacterIterator paragraph) { if (paragraph == null) { throw new IllegalArgumentException("paragraph is null"); diff --git a/src/java.base/share/classes/java/text/MessageFormat.java b/src/java.base/share/classes/java/text/MessageFormat.java index e304d072411401b427f7c169179dbed2113e8372..98f9d1a144d91389cc3d0a9931528704e00b4610 100644 --- a/src/java.base/share/classes/java/text/MessageFormat.java +++ b/src/java.base/share/classes/java/text/MessageFormat.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2022, 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 @@ -778,7 +778,7 @@ public class MessageFormat extends Format { * {@code null} or has fewer than argumentIndex+1 elements. * * - * + * * * *
    Examples of subformat,argument,and formatted textExamples of subformat, argument, and formatted text
    Subformat diff --git a/src/java.base/share/classes/java/time/chrono/HijrahChronology.java b/src/java.base/share/classes/java/time/chrono/HijrahChronology.java index 87f307e15d3c878d46dc9a6009868fb293eec30a..1ce99906708aa197d0ec4e95c6cd4b8446e490e0 100644 --- a/src/java.base/share/classes/java/time/chrono/HijrahChronology.java +++ b/src/java.base/share/classes/java/time/chrono/HijrahChronology.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2022, 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 @@ -533,18 +533,14 @@ public final class HijrahChronology extends AbstractChronology implements Serial @Override public ValueRange range(ChronoField field) { checkCalendarInit(); - if (field instanceof ChronoField) { - ChronoField f = field; - return switch (f) { - case DAY_OF_MONTH -> ValueRange.of(1, 1, getMinimumMonthLength(), getMaximumMonthLength()); - case DAY_OF_YEAR -> ValueRange.of(1, getMaximumDayOfYear()); - case ALIGNED_WEEK_OF_MONTH -> ValueRange.of(1, 5); - case YEAR, YEAR_OF_ERA -> ValueRange.of(getMinimumYear(), getMaximumYear()); - case ERA -> ValueRange.of(1, 1); - default -> field.range(); - }; - } - return field.range(); + return switch (field) { + case DAY_OF_MONTH -> ValueRange.of(1, 1, getMinimumMonthLength(), getMaximumMonthLength()); + case DAY_OF_YEAR -> ValueRange.of(1, getMaximumDayOfYear()); + case ALIGNED_WEEK_OF_MONTH -> ValueRange.of(1, 5); + case YEAR, YEAR_OF_ERA -> ValueRange.of(getMinimumYear(), getMaximumYear()); + case ERA -> ValueRange.of(1, 1); + default -> field.range(); + }; } //----------------------------------------------------------------------- diff --git a/src/java.base/share/classes/java/util/Hashtable.java b/src/java.base/share/classes/java/util/Hashtable.java index c103df557901fa506b4f829b25da578f59002a05..5d722879bc03f1633f8aa5444ff620978cad017f 100644 --- a/src/java.base/share/classes/java/util/Hashtable.java +++ b/src/java.base/share/classes/java/util/Hashtable.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1994, 2021, 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 @@ -1254,7 +1254,7 @@ public class Hashtable * Reconstitute the Hashtable from a stream (i.e., deserialize it). */ @java.io.Serial - private void readObject(java.io.ObjectInputStream s) + private void readObject(ObjectInputStream s) throws IOException, ClassNotFoundException { readHashtable(s); } @@ -1263,14 +1263,16 @@ public class Hashtable * Perform deserialization of the Hashtable from an ObjectInputStream. * The Properties class overrides this method. */ - void readHashtable(java.io.ObjectInputStream s) + void readHashtable(ObjectInputStream s) throws IOException, ClassNotFoundException { - // Read in the threshold and loadFactor - s.defaultReadObject(); - // Validate loadFactor (ignore threshold - it will be re-computed) - if (loadFactor <= 0 || Float.isNaN(loadFactor)) - throw new StreamCorruptedException("Illegal Load: " + loadFactor); + ObjectInputStream.GetField fields = s.readFields(); + + // Read and validate loadFactor (ignore threshold - it will be re-computed) + float lf = fields.get("loadFactor", 0.75f); + if (lf <= 0 || Float.isNaN(lf)) + throw new StreamCorruptedException("Illegal load factor: " + lf); + lf = Math.min(Math.max(0.25f, lf), 4.0f); // Read the original length of the array and number of elements int origlength = s.readInt(); @@ -1282,13 +1284,13 @@ public class Hashtable // Clamp original length to be more than elements / loadFactor // (this is the invariant enforced with auto-growth) - origlength = Math.max(origlength, (int)(elements / loadFactor) + 1); + origlength = Math.max(origlength, (int)(elements / lf) + 1); // Compute new length with a bit of room 5% + 3 to grow but // no larger than the clamped original length. Make the length // odd if it's large enough, this helps distribute the entries. // Guard against the length ending up zero, that's not valid. - int length = (int)((elements + elements / 20) / loadFactor) + 3; + int length = (int)(elements * 1.05f / lf) + 3; if (length > elements && (length & 1) == 0) length--; length = Math.min(length, origlength); @@ -1300,8 +1302,9 @@ public class Hashtable // Check Map.Entry[].class since it's the nearest public type to // what we're actually creating. SharedSecrets.getJavaObjectInputStreamAccess().checkArray(s, Map.Entry[].class, length); + Hashtable.UnsafeHolder.putLoadFactor(this, lf); table = new Entry[length]; - threshold = (int)Math.min(length * loadFactor, MAX_ARRAY_SIZE + 1); + threshold = (int)Math.min(length * lf, MAX_ARRAY_SIZE + 1); count = 0; // Read the number of elements and then all the key/value objects @@ -1315,6 +1318,18 @@ public class Hashtable } } + // Support for resetting final field during deserializing + private static final class UnsafeHolder { + private UnsafeHolder() { throw new InternalError(); } + private static final jdk.internal.misc.Unsafe unsafe + = jdk.internal.misc.Unsafe.getUnsafe(); + private static final long LF_OFFSET + = unsafe.objectFieldOffset(Hashtable.class, "loadFactor"); + static void putLoadFactor(Hashtable table, float lf) { + unsafe.putFloat(table, LF_OFFSET, lf); + } + } + /** * The put method used by readObject. This is provided because put * is overridable and should not be called in readObject since the diff --git a/src/java.base/share/classes/java/util/IdentityHashMap.java b/src/java.base/share/classes/java/util/IdentityHashMap.java index 34d6722ac098f12b5b5a56dc7b594a5a5a66da8f..4795c30b3d5ee1595504dd0700d8656695a69474 100644 --- a/src/java.base/share/classes/java/util/IdentityHashMap.java +++ b/src/java.base/share/classes/java/util/IdentityHashMap.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2021, 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,8 @@ package java.util; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; import java.lang.reflect.Array; import java.util.function.BiConsumer; import java.util.function.BiFunction; @@ -1267,12 +1269,12 @@ public class IdentityHashMap * particular order. */ @java.io.Serial - private void writeObject(java.io.ObjectOutputStream s) + private void writeObject(ObjectOutputStream s) throws java.io.IOException { - // Write out and any hidden stuff + // Write out size (number of mappings) and any hidden stuff s.defaultWriteObject(); - // Write out size (number of Mappings) + // Write out size again (maintained for backward compatibility) s.writeInt(size); // Write out keys and values (alternating) @@ -1291,18 +1293,20 @@ public class IdentityHashMap * deserializes it). */ @java.io.Serial - private void readObject(java.io.ObjectInputStream s) + private void readObject(ObjectInputStream s) throws java.io.IOException, ClassNotFoundException { - // Read in any hidden stuff - s.defaultReadObject(); + // Size (number of mappings) is written to the stream twice + // Read first size value and ignore it + s.readFields(); - // Read in size (number of Mappings) + // Read second size value, validate and assign to size field int size = s.readInt(); if (size < 0) throw new java.io.StreamCorruptedException ("Illegal mappings count: " + size); int cap = capacity(size); - SharedSecrets.getJavaObjectInputStreamAccess().checkArray(s, Object[].class, cap); + SharedSecrets.getJavaObjectInputStreamAccess().checkArray(s, Object[].class, cap*2); + this.size = size; init(cap); // Read the keys and values, and put the mappings in the table diff --git a/src/java.base/share/classes/java/util/Locale.java b/src/java.base/share/classes/java/util/Locale.java index 90a242984f1763f25ab0a22698c3d7c4b212d74b..2da179a5dd7b74b6144b3d2f027e9f2d14d65cda 100644 --- a/src/java.base/share/classes/java/util/Locale.java +++ b/src/java.base/share/classes/java/util/Locale.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2022, 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 @@ -2003,7 +2003,7 @@ public final class Locale implements Cloneable, Serializable { /** * Returns a name for the locale that is appropriate for display * to the user. This will be the values returned by - * getDisplayLanguage(), getDisplayScript(),getDisplayCountry() + * getDisplayLanguage(), getDisplayScript(), getDisplayCountry(), * getDisplayVariant(), and optional * Unicode extensions assembled into a single string. The non-empty * values are used in order, with the second and subsequent names in diff --git a/src/java.base/share/classes/java/util/Objects.java b/src/java.base/share/classes/java/util/Objects.java index c32a67441da9d069c00f0d57fc6f2cc34427dade..0b727d6310b6b26af562476956d497150c595312 100644 --- a/src/java.base/share/classes/java/util/Objects.java +++ b/src/java.base/share/classes/java/util/Objects.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2022, 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 @@ -164,6 +164,30 @@ public final class Objects { return (o != null) ? o.toString() : nullDefault; } + /** + * {@return a string equivalent to the string returned by {@code + * Object.toString} if that method and {@code hashCode} are not + * overridden} + * + * @implNote + * This method constructs a string for an object without calling + * any overridable methods of the object. + * + * @implSpec + * The method returns a string equivalent to:
    + * {@code o.getClass().getName() + "@" + Integer.toHexString(System.identityHashCode(o))} + * + * @param o an object + * @throws NullPointerException if the argument is null + * @see Object#toString + * @see System#identityHashCode(Object) + * @since 19 + */ + public static String toIdentityString(Object o) { + requireNonNull(o); + return o.getClass().getName() + "@" + Integer.toHexString(System.identityHashCode(o)); + } + /** * Returns 0 if the arguments are identical and {@code * c.compare(a, b)} otherwise. diff --git a/src/java.base/share/classes/java/util/Observable.java b/src/java.base/share/classes/java/util/Observable.java index d71bf5d5d4c3bb40b7cbed8b11a210a7a8751bc7..01956702c2d82f43eafe01d836e84437c8bc5675 100644 --- a/src/java.base/share/classes/java/util/Observable.java +++ b/src/java.base/share/classes/java/util/Observable.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1994, 2022, 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 @@ -66,13 +66,14 @@ package java.util; * {@code Observable} is unspecified, and state changes are not in * one-for-one correspondence with notifications. * For a richer event model, consider using the - * {@link java.beans} package. For reliable and ordered + * {@link java.desktop/java.beans} package. For reliable and ordered * messaging among threads, consider using one of the concurrent data * structures in the {@link java.util.concurrent} package. * For reactive streams style programming, see the * {@link java.util.concurrent.Flow} API. */ @Deprecated(since="9") +@SuppressWarnings("doclint:reference") // cross-module links public class Observable { private boolean changed = false; private Vector obs; diff --git a/src/java.base/share/classes/java/util/ResourceBundle.java b/src/java.base/share/classes/java/util/ResourceBundle.java index 8f57d782d474b28276aca502aeb9e8fdc90a0627..052de0555c7bbdb01a6d1f0ac64d74755fc05d53 100644 --- a/src/java.base/share/classes/java/util/ResourceBundle.java +++ b/src/java.base/share/classes/java/util/ResourceBundle.java @@ -3729,7 +3729,7 @@ public abstract class ResourceBundle { } - private static final boolean TRACE_ON = Boolean.valueOf( + private static final boolean TRACE_ON = Boolean.parseBoolean( GetPropertyAction.privilegedGetProperty("resource.bundle.debug", "false")); private static void trace(String format, Object... params) { diff --git a/src/java.base/share/classes/java/util/ServiceLoader.java b/src/java.base/share/classes/java/util/ServiceLoader.java index 64b01c3157e3928b22621615997446d7ca43fbbe..531ffa3f09c785a5b6a8bef9fa1f8f3c14a2f99b 100644 --- a/src/java.base/share/classes/java/util/ServiceLoader.java +++ b/src/java.base/share/classes/java/util/ServiceLoader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2022, 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 @@ -1585,7 +1585,7 @@ public final class ServiceLoader * are located in the order that its module descriptor {@linkplain * java.lang.module.ModuleDescriptor.Provides#providers() lists the * providers}. Providers added dynamically by instrumentation agents (see - * {@link java.lang.instrument.Instrumentation#redefineModule redefineModule}) + * {@link java.instrument/java.lang.instrument.Instrumentation#redefineModule redefineModule}) * are always located after providers declared by the module.

    * *

  • Step 2: Locate providers in unnamed modules.

    @@ -1647,6 +1647,7 @@ public final class ServiceLoader * @revised 9 */ @CallerSensitive + @SuppressWarnings("doclint:reference") // cross-module links public static ServiceLoader load(Class service, ClassLoader loader) { diff --git a/src/java.base/share/classes/java/util/jar/Attributes.java b/src/java.base/share/classes/java/util/jar/Attributes.java index a33d1086285d792a105d6c19a6779e82c8f65a14..3b59f74275fd6ec901ede9681afc9a84c4490ed4 100644 --- a/src/java.base/share/classes/java/util/jar/Attributes.java +++ b/src/java.base/share/classes/java/util/jar/Attributes.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2021, 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 @@ package java.util.jar; +import java.io.ByteArrayOutputStream; import java.io.DataOutputStream; import java.io.IOException; import java.util.Collection; @@ -366,7 +367,7 @@ public class Attributes implements Map, Cloneable { int read(Manifest.FastInputStream is, byte[] lbuf, String filename, int lineNumber) throws IOException { String name = null, value; - byte[] lastline = null; + ByteArrayOutputStream fullLine = new ByteArrayOutputStream(); int len; while ((len = is.readLine(lbuf)) != -1) { @@ -392,15 +393,12 @@ public class Attributes implements Map, Cloneable { + Manifest.getErrorPosition(filename, lineNumber) + ")"); } lineContinued = true; - byte[] buf = new byte[lastline.length + len - 1]; - System.arraycopy(lastline, 0, buf, 0, lastline.length); - System.arraycopy(lbuf, 1, buf, lastline.length, len - 1); + fullLine.write(lbuf, 1, len - 1); if (is.peek() == ' ') { - lastline = buf; continue; } - value = new String(buf, 0, buf.length, UTF_8.INSTANCE); - lastline = null; + value = fullLine.toString(UTF_8.INSTANCE); + fullLine.reset(); } else { while (lbuf[i++] != ':') { if (i >= len) { @@ -414,8 +412,8 @@ public class Attributes implements Map, Cloneable { } name = new String(lbuf, 0, i - 2, UTF_8.INSTANCE); if (is.peek() == ' ') { - lastline = new byte[len - i]; - System.arraycopy(lbuf, i, lastline, 0, len - i); + fullLine.reset(); + fullLine.write(lbuf, i, len - i); continue; } value = new String(lbuf, i, len - i, UTF_8.INSTANCE); diff --git a/src/java.base/share/classes/java/util/jar/JarVerifier.java b/src/java.base/share/classes/java/util/jar/JarVerifier.java index 280d64e9d37a95a0b337b72c1a86d231f78bf368..e6a217b424cc7eff46209bc1fb5ea7f6a04a5131 100644 --- a/src/java.base/share/classes/java/util/jar/JarVerifier.java +++ b/src/java.base/share/classes/java/util/jar/JarVerifier.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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 @@ -96,6 +96,10 @@ class JarVerifier { /** collect -DIGEST-MANIFEST values for deny list */ private List manifestDigests; + /* A cache mapping code signers to the algorithms used to digest jar + entries, and whether or not the algorithms are permitted. */ + private Map> signersToAlgs; + public JarVerifier(String name, byte[] rawBytes) { manifestName = name; manifestRawBytes = rawBytes; @@ -105,6 +109,7 @@ class JarVerifier { pendingBlocks = new ArrayList<>(); baos = new ByteArrayOutputStream(); manifestDigests = new ArrayList<>(); + signersToAlgs = new HashMap<>(); } /** @@ -244,7 +249,8 @@ class JarVerifier { if (!parsingBlockOrSF) { JarEntry je = mev.getEntry(); if ((je != null) && (je.signers == null)) { - je.signers = mev.verify(verifiedSigners, sigFileSigners); + je.signers = mev.verify(verifiedSigners, sigFileSigners, + signersToAlgs); je.certs = mapSignersToCertArray(je.signers); } } else { diff --git a/src/java.base/share/classes/java/util/regex/Grapheme.java b/src/java.base/share/classes/java/util/regex/Grapheme.java index efc92158dfecb932cbe13f09191654622c669369..9922cab121a91475f7ec63c584f6672c2f150a71 100644 --- a/src/java.base/share/classes/java/util/regex/Grapheme.java +++ b/src/java.base/share/classes/java/util/regex/Grapheme.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2022, 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,8 +35,8 @@ final class Grapheme { *

    * See Unicode Standard Annex #29 Unicode Text Segmentation for the specification * for the extended grapheme cluster boundary rules. The following implementation - * is based on version 12.0 of the annex. - * (http://www.unicode.org/reports/tr29/tr29-35.html) + * is based on the annex for Unicode version 14.0. + * (http://www.unicode.org/reports/tr29/tr29-38.html) * * @param src the {@code CharSequence} to be scanned * @param off offset to start looking for the next boundary in the src @@ -97,7 +97,7 @@ final class Grapheme { private static final int FIRST_TYPE = 0; private static final int LAST_TYPE = 14; - private static boolean[][] rules; + private static final boolean[][] rules; static { rules = new boolean[LAST_TYPE + 1][LAST_TYPE + 1]; // GB 999 Any + Any -> default @@ -201,8 +201,9 @@ final class Grapheme { if (cp == 0x200D) return ZWJ; if (cp >= 0x0600 && cp <= 0x0605 || - cp == 0x06DD || cp == 0x070F || cp == 0x08E2 || - cp == 0x110BD || cp == 0x110CD) + cp == 0x06DD || cp == 0x070F || + cp == 0x0890 || cp == 0x0891 || + cp == 0x08E2 || cp == 0x110BD || cp == 0x110CD) return PREPEND; return CONTROL; case Character.NON_SPACING_MARK: diff --git a/src/java.base/share/classes/java/util/regex/Pattern.java b/src/java.base/share/classes/java/util/regex/Pattern.java index d52a2b92af939d49d6da1970a924641fe992aaec..b1e3977d0b2b3125950b88ea94a9e5a201b7374a 100644 --- a/src/java.base/share/classes/java/util/regex/Pattern.java +++ b/src/java.base/share/classes/java/util/regex/Pattern.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2022, 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 @@ -1795,6 +1795,8 @@ loop: for(int x=0, offset=0; x= 0 && index < seq.length()); + if (lengthInCodePoints == 1 && index >= 0 && index < seq.length() && + !Character.isHighSurrogate(seq.charAt(index))) { return 1; } int length = seq.length(); diff --git a/src/java.base/share/classes/java/util/zip/ZipFile.java b/src/java.base/share/classes/java/util/zip/ZipFile.java index 47edf1ffae1403faba3b7ca1a1fda6c6457893e9..1e5e92e4370cbe20159e0c7d1f13bb8ace37578b 100644 --- a/src/java.base/share/classes/java/util/zip/ZipFile.java +++ b/src/java.base/share/classes/java/util/zip/ZipFile.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2022, 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 @@ -208,7 +208,7 @@ public class ZipFile implements ZipConstants, Closeable { * * @throws SecurityException * if a security manager exists and its {@code checkRead} - * method doesn't allow read access to the file,or its + * method doesn't allow read access to the file, or its * {@code checkDelete} method doesn't allow deleting the * file when the {@code OPEN_DELETE} flag is set * @@ -1497,6 +1497,9 @@ public class ZipFile implements ZipConstants, Closeable { zerror("invalid END header (bad central directory offset)"); } // read in the CEN and END + if (end.cenlen + ENDHDR >= Integer.MAX_VALUE) { + zerror("invalid END header (central directory size too large)"); + } cen = this.cen = new byte[(int)(end.cenlen + ENDHDR)]; if (readFullyAt(cen, 0, cen.length, cenpos) != end.cenlen + ENDHDR) { zerror("read CEN tables failed"); diff --git a/src/java.base/share/classes/javax/crypto/Cipher.java b/src/java.base/share/classes/javax/crypto/Cipher.java index 2daa932498b8b2c8665ad6522a75a7ae5edb6a3d..a6751e886bdbcf26d538534b35ae036b12e662db 100644 --- a/src/java.base/share/classes/javax/crypto/Cipher.java +++ b/src/java.base/share/classes/javax/crypto/Cipher.java @@ -2833,7 +2833,7 @@ public class Cipher { break; default: // should never happen - sb.append("error:").append(Integer.toString(opmode)); + sb.append("error:").append(opmode); } sb.append(", algorithm from: ").append(getProviderName()); return sb.toString(); diff --git a/src/java.base/share/classes/javax/crypto/CryptoPolicyParser.java b/src/java.base/share/classes/javax/crypto/CryptoPolicyParser.java index 5ccaa8143152b3b995f453f5203edd7a2f6ecd64..5d53bc112c00256e0474fd3f9a6bae4b1d427830 100644 --- a/src/java.base/share/classes/javax/crypto/CryptoPolicyParser.java +++ b/src/java.base/share/classes/javax/crypto/CryptoPolicyParser.java @@ -395,7 +395,7 @@ final class CryptoPolicyParser { switch (lookahead) { case StreamTokenizer.TT_NUMBER: throw new ParsingException(st.lineno(), expect, - "number "+String.valueOf(st.nval)); + "number " + st.nval); case StreamTokenizer.TT_EOF: throw new ParsingException("expected "+expect+", read end of file"); case StreamTokenizer.TT_WORD: diff --git a/src/java.base/share/classes/javax/crypto/EncryptedPrivateKeyInfo.java b/src/java.base/share/classes/javax/crypto/EncryptedPrivateKeyInfo.java index 59b4a07f3497d5af64eaa6d270f20f288e649671..09c69748d5a8da90b8bce9e73eadb464de53af5f 100644 --- a/src/java.base/share/classes/javax/crypto/EncryptedPrivateKeyInfo.java +++ b/src/java.base/share/classes/javax/crypto/EncryptedPrivateKeyInfo.java @@ -77,15 +77,18 @@ public class EncryptedPrivateKeyInfo { * @exception NullPointerException if the encoded is null. * @exception IOException if error occurs when parsing the ASN.1 encoding. */ - public EncryptedPrivateKeyInfo(byte[] encoded) - throws IOException { + public EncryptedPrivateKeyInfo(byte[] encoded) throws IOException { if (encoded == null) { throw new NullPointerException("the encoded parameter " + - "must be non-null"); + "must be non-null"); } - this.encoded = encoded.clone(); - DerValue val = new DerValue(this.encoded); + DerValue val = new DerValue(encoded); + if (val.tag != DerValue.tag_Sequence) { + throw new IOException("DER header error: no SEQ tag"); + } + + this.encoded = encoded.clone(); DerValue[] seq = new DerValue[2]; seq[0] = val.data.getDerValue(); diff --git a/src/java.base/share/classes/javax/crypto/SealedObject.java b/src/java.base/share/classes/javax/crypto/SealedObject.java index 354bc0e8d738288a37eddcde1259d289a25a7734..a1242213e44811a041dfd60135075b72e101e9d8 100644 --- a/src/java.base/share/classes/javax/crypto/SealedObject.java +++ b/src/java.base/share/classes/javax/crypto/SealedObject.java @@ -292,12 +292,9 @@ public class SealedObject implements Serializable { throws IOException, ClassNotFoundException, IllegalBlockSizeException, BadPaddingException { - ObjectInput a = getExtObjectInputStream(c); - try { + try (ObjectInput a = getExtObjectInputStream(c)) { Object obj = a.readObject(); return obj; - } finally { - a.close(); } } @@ -412,12 +409,9 @@ public class SealedObject implements Serializable { throw new RuntimeException(iape.getMessage()); } - ObjectInput a = getExtObjectInputStream(c); - try { + try (ObjectInput a = getExtObjectInputStream(c)) { Object obj = a.readObject(); return obj; - } finally { - a.close(); } } diff --git a/src/java.base/share/classes/javax/net/ssl/SSLEngine.java b/src/java.base/share/classes/javax/net/ssl/SSLEngine.java index b3007b2a9a13a4bee8d84c55623f9c81303be021..f60ab53f34e2dd2c15951141f4fbce31746d60cb 100644 --- a/src/java.base/share/classes/javax/net/ssl/SSLEngine.java +++ b/src/java.base/share/classes/javax/net/ssl/SSLEngine.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2022, 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 @@ -920,9 +920,9 @@ public abstract class SSLEngine { * The returned array includes cipher suites from the list of standard * cipher suite names in the - * JSSE Cipher Suite Names section of the Java Cryptography - * Architecture Standard Algorithm Name Documentation, and may also - * include other cipher suites that the provider supports. + * JSSE Cipher Suite Names section of the Java Security Standard + * Algorithm Names Specification, and may also include other cipher + * suites that the provider supports. * * @return an array of cipher suite names * @see #getEnabledCipherSuites() @@ -946,9 +946,9 @@ public abstract class SSLEngine { * The returned array includes cipher suites from the list of standard * cipher suite names in the - * JSSE Cipher Suite Names section of the Java Cryptography - * Architecture Standard Algorithm Name Documentation, and may also - * include other cipher suites that the provider supports. + * JSSE Cipher Suite Names section of the Java Security Standard + * Algorithm Names Specification, and may also include other cipher + * suites that the provider supports. * * @return an array of cipher suite names * @see #getSupportedCipherSuites() @@ -968,10 +968,10 @@ public abstract class SSLEngine { * Note that the standard list of cipher suite names may be found in the * - * JSSE Cipher Suite Names section of the Java Cryptography - * Architecture Standard Algorithm Name Documentation. Providers - * may support cipher suite names not found in this list or might not - * use the recommended name for a certain cipher suite. + * JSSE Cipher Suite Names section of the Java Security Standard + * Algorithm Names Specification. Providers may support cipher suite + * names not found in this list or might not use the recommended name + * for a certain cipher suite. *

    * See {@link #getEnabledCipherSuites()} for more information * on why a specific cipher suite may never be used on a engine. diff --git a/src/java.base/share/classes/javax/net/ssl/SSLParameters.java b/src/java.base/share/classes/javax/net/ssl/SSLParameters.java index b156a8a5dac8d53b7ab9fbf722dd1e1fe4a4f177..83b83c8427040bad4cacf83115c35f62b07cbdc7 100644 --- a/src/java.base/share/classes/javax/net/ssl/SSLParameters.java +++ b/src/java.base/share/classes/javax/net/ssl/SSLParameters.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2022, 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 @@ -111,9 +111,9 @@ public class SSLParameters { * {@code setCipherSuites(cipherSuites);}. Note that the * standard list of cipher suite names may be found in the - * JSSE Cipher Suite Names section of the Java Cryptography - * Architecture Standard Algorithm Name Documentation. Providers - * may support cipher suite names not found in this list. + * JSSE Cipher Suite Names section of the Java Security Standard + * Algorithm Names Specification. Providers may support cipher suite + * names not found in this list. * * @param cipherSuites the array of ciphersuites (or null) */ @@ -131,9 +131,9 @@ public class SSLParameters { * Note that the standard list of cipher suite names may be found in the * - * JSSE Cipher Suite Names section of the Java Cryptography - * Architecture Standard Algorithm Name Documentation. Providers - * may support cipher suite names not found in this list. + * JSSE Cipher Suite Names section of the Java Security Standard + * Algorithm Names Specification. Providers may support cipher suite + * names not found in this list. * * @param cipherSuites the array of ciphersuites (or null) * @param protocols the array of protocols (or null) @@ -154,9 +154,9 @@ public class SSLParameters { * The returned array includes cipher suites from the list of standard * cipher suite names in the - * JSSE Cipher Suite Names section of the Java Cryptography - * Architecture Standard Algorithm Name Documentation, and may also - * include other cipher suites that the provider supports. + * JSSE Cipher Suite Names section of the Java Security Standard + * Algorithm Names Specification, and may also include other cipher suites + * that the provider supports. * * @return a copy of the array of ciphersuites or null if none * have been set. @@ -171,10 +171,10 @@ public class SSLParameters { * @param cipherSuites the array of ciphersuites (or null). Note that the * standard list of cipher suite names may be found in the - * JSSE Cipher Suite Names section of the Java Cryptography - * Architecture Standard Algorithm Name Documentation. Providers - * may support cipher suite names not found in this list or might not - * use the recommended name for a certain cipher suite. + * JSSE Cipher Suite Names section of the Java Security Standard + * Algorithm Names Specification. Providers may support cipher suite + * names not found in this list or might not use the recommended name + * for a certain cipher suite. */ public void setCipherSuites(String[] cipherSuites) { this.cipherSuites = clone(cipherSuites); @@ -617,7 +617,7 @@ public class SSLParameters { * * @return a non-null, possibly zero-length array of application protocol * {@code String}s. The array is ordered based on protocol - * preference, with {@code protocols[0]} being the most preferred. + * preference, with the first entry being the most preferred. * @see #setApplicationProtocols * @since 9 */ diff --git a/src/java.base/share/classes/javax/net/ssl/SSLServerSocket.java b/src/java.base/share/classes/javax/net/ssl/SSLServerSocket.java index 00a8bed19f091a40f230cce941e6a1e6e33c547d..20d7e7af676a1b37c47a4047827480333a401232 100644 --- a/src/java.base/share/classes/javax/net/ssl/SSLServerSocket.java +++ b/src/java.base/share/classes/javax/net/ssl/SSLServerSocket.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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 @@ -197,9 +197,9 @@ public abstract class SSLServerSocket extends ServerSocket { * The returned array includes cipher suites from the list of standard * cipher suite names in the - * JSSE Cipher Suite Names section of the Java Cryptography - * Architecture Standard Algorithm Name Documentation, and may also - * include other cipher suites that the provider supports. + * JSSE Cipher Suite Names section of the Java Security Standard + * Algorithm Names Specification, and may also include other cipher + * suites that the provider supports. * * @return an array of cipher suites enabled * @see #getSupportedCipherSuites() @@ -223,10 +223,10 @@ public abstract class SSLServerSocket extends ServerSocket { * Note that the standard list of cipher suite names may be found in the * - * JSSE Cipher Suite Names section of the Java Cryptography - * Architecture Standard Algorithm Name Documentation. Providers - * may support cipher suite names not found in this list or might not - * use the recommended name for a certain cipher suite. + * JSSE Cipher Suite Names section of the Java Security Standard + * Algorithm Names Specification. Providers may support cipher suite + * names not found in this list or might not use the recommended name + * for a certain cipher suite. *

    * SSLSockets returned from accept() * inherit this setting. @@ -253,9 +253,9 @@ public abstract class SSLServerSocket extends ServerSocket { * The returned array includes cipher suites from the list of standard * cipher suite names in the - * JSSE Cipher Suite Names section of the Java Cryptography - * Architecture Standard Algorithm Name Documentation, and may also - * include other cipher suites that the provider supports. + * JSSE Cipher Suite Names section of the Java Security Standard + * Algorithm Names Specification, and may also include other cipher + * suites that the provider supports. * * @return an array of cipher suite names * @see #getEnabledCipherSuites() diff --git a/src/java.base/share/classes/javax/net/ssl/SSLServerSocketFactory.java b/src/java.base/share/classes/javax/net/ssl/SSLServerSocketFactory.java index e66bd11239d9192a7aae6b38f7c57c1cc40b0fee..68c09c02a6f6c9939a145a415374f4a0a4461dcf 100644 --- a/src/java.base/share/classes/javax/net/ssl/SSLServerSocketFactory.java +++ b/src/java.base/share/classes/javax/net/ssl/SSLServerSocketFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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 @@ -87,9 +87,9 @@ public abstract class SSLServerSocketFactory extends ServerSocketFactory { * The returned array includes cipher suites from the list of standard * cipher suite names in the - * JSSE Cipher Suite Names section of the Java Cryptography - * Architecture Standard Algorithm Name Documentation, and may also - * include other cipher suites that the provider supports. + * JSSE Cipher Suite Names section of the Java Security Standard + * Algorithm Names Specification, and may also include other cipher + * suites that the provider supports. * * @see #getSupportedCipherSuites() * @return array of the cipher suites enabled by default @@ -108,9 +108,9 @@ public abstract class SSLServerSocketFactory extends ServerSocketFactory { * The returned array includes cipher suites from the list of standard * cipher suite names in the - * JSSE Cipher Suite Names section of the Java Cryptography - * Architecture Standard Algorithm Name Documentation, and may also - * include other cipher suites that the provider supports. + * JSSE Cipher Suite Names section of the Java Security Standard + * Algorithm Names Specification, and may also include other cipher + * suites that the provider supports. * * @return an array of cipher suite names * @see #getDefaultCipherSuites() diff --git a/src/java.base/share/classes/javax/net/ssl/SSLSocket.java b/src/java.base/share/classes/javax/net/ssl/SSLSocket.java index 84e5be716feab684ff7852f0f5a2fa3596cefaef..b2c912c3b65bdf2bff1c074ef51d1fdbeaefc969 100644 --- a/src/java.base/share/classes/javax/net/ssl/SSLSocket.java +++ b/src/java.base/share/classes/javax/net/ssl/SSLSocket.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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 @@ -327,9 +327,9 @@ public abstract class SSLSocket extends Socket * The returned array includes cipher suites from the list of standard * cipher suite names in the - * JSSE Cipher Suite Names section of the Java Cryptography - * Architecture Standard Algorithm Name Documentation, and may also - * include other cipher suites that the provider supports. + * JSSE Cipher Suite Names section of the Java Security Standard + * Algorithm Names Specification, and may also include other cipher + * suites that the provider supports. * * @return an array of cipher suite names * @see #getEnabledCipherSuites() @@ -353,9 +353,9 @@ public abstract class SSLSocket extends Socket * The returned array includes cipher suites from the list of standard * cipher suite names in the - * JSSE Cipher Suite Names section of the Java Cryptography - * Architecture Standard Algorithm Name Documentation, and may also - * include other cipher suites that the provider supports. + * JSSE Cipher Suite Names section of the Java Security Standard + * Algorithm Names Specification, and may also include other cipher + * suites that the provider supports. * * @return an array of cipher suite names * @see #getSupportedCipherSuites() @@ -375,10 +375,10 @@ public abstract class SSLSocket extends Socket * Note that the standard list of cipher suite names may be found in the * - * JSSE Cipher Suite Names section of the Java Cryptography - * Architecture Standard Algorithm Name Documentation. Providers - * may support cipher suite names not found in this list or might not - * use the recommended name for a certain cipher suite. + * JSSE Cipher Suite Names section of the Java Security Standard + * Algorithm Names Specification. Providers may support cipher suite + * names not found in this list or might not use the recommended name + * for a certain cipher suite. *

    * See {@link #getEnabledCipherSuites()} for more information * on why a specific ciphersuite may never be used on a connection. diff --git a/src/java.base/share/classes/javax/net/ssl/SSLSocketFactory.java b/src/java.base/share/classes/javax/net/ssl/SSLSocketFactory.java index 6db6d740750d15eebaa1e8beba7a719f58eefda0..dd10f422f3ece59a19e351ad8ad787868b2b49ab 100644 --- a/src/java.base/share/classes/javax/net/ssl/SSLSocketFactory.java +++ b/src/java.base/share/classes/javax/net/ssl/SSLSocketFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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 @@ -113,9 +113,9 @@ public abstract class SSLSocketFactory extends SocketFactory { * The returned array includes cipher suites from the list of standard * cipher suite names in the - * JSSE Cipher Suite Names section of the Java Cryptography - * Architecture Standard Algorithm Name Documentation, and may also - * include other cipher suites that the provider supports. + * JSSE Cipher Suite Names section of the Java Security Standard + * Algorithm Names Specification, and may also include other cipher suites + * that the provider supports. * * @see #getSupportedCipherSuites() * @return array of the cipher suites enabled by default @@ -132,9 +132,9 @@ public abstract class SSLSocketFactory extends SocketFactory { * The returned array includes cipher suites from the list of standard * cipher suite names in the - * JSSE Cipher Suite Names section of the Java Cryptography - * Architecture Standard Algorithm Name Documentation, and may also - * include other cipher suites that the provider supports. + * JSSE Cipher Suite Names section of the Java Security Standard + * Algorithm Names Specification, and may also include other cipher suites + * that the provider supports. * * @see #getDefaultCipherSuites() * @return an array of cipher suite names diff --git a/src/java.base/share/classes/jdk/internal/access/JavaLangReflectAccess.java b/src/java.base/share/classes/jdk/internal/access/JavaLangReflectAccess.java index 4082fae336fe7807017823838698934ebe720789..9e3ce846f02498b58fbc294a64cd4bf612743fd5 100644 --- a/src/java.base/share/classes/jdk/internal/access/JavaLangReflectAccess.java +++ b/src/java.base/share/classes/jdk/internal/access/JavaLangReflectAccess.java @@ -102,4 +102,11 @@ public interface JavaLangReflectAccess { /** Returns a new instance created by the given constructor with access check */ public T newInstance(Constructor ctor, Object[] args, Class caller) throws IllegalAccessException, InstantiationException, InvocationTargetException; + + /** Invokes the given default method if the method's declaring interface is + * accessible to the given caller. Otherwise, IllegalAccessException will + * be thrown. If the caller is null, no access check is performed. + */ + public Object invokeDefault(Object proxy, Method method, Object[] args, Class caller) + throws Throwable; } diff --git a/src/java.base/share/classes/jdk/internal/access/foreign/MemorySegmentProxy.java b/src/java.base/share/classes/jdk/internal/access/foreign/MemorySegmentProxy.java index a00b6516a55bc13de48658de94fd7cfd34aae17d..068fcfa1a6b50bea45bcfff29c7d70c0c5eb269a 100644 --- a/src/java.base/share/classes/jdk/internal/access/foreign/MemorySegmentProxy.java +++ b/src/java.base/share/classes/jdk/internal/access/foreign/MemorySegmentProxy.java @@ -44,6 +44,7 @@ public abstract class MemorySegmentProxy { public abstract Object unsafeGetBase(); public abstract boolean isSmall(); public abstract ScopedMemoryAccess.Scope scope(); + public abstract long maxAlignMask(); /* Helper functions for offset computations. These are required so that we can avoid issuing long opcodes * (e.g. LMUL, LADD) when we're operating on 'small' segments (segments whose length can be expressed with an int). diff --git a/src/java.base/share/classes/jdk/internal/icu/impl/Punycode.java b/src/java.base/share/classes/jdk/internal/icu/impl/Punycode.java index 52f6e546f3ae379e3744322904e60b01f1a6695c..6fe1ebcc54677d32cf2e6a9f8758c41925f10ec7 100644 --- a/src/java.base/share/classes/jdk/internal/icu/impl/Punycode.java +++ b/src/java.base/share/classes/jdk/internal/icu/impl/Punycode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2022, 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,9 +76,6 @@ public final class Punycode { // TODO: eliminate the 256 limitation private static final int MAX_CP_COUNT = 256; - private static final int UINT_MAGIC = 0x80000000; - private static final long ULONG_MAGIC = 0x8000000000000000L; - private static int adaptBias(int delta, int length, boolean firstTime){ if(firstTime){ delta /=DAMP; @@ -96,34 +93,25 @@ public final class Punycode { } /** - * basicToDigit[] contains the numeric value of a basic code - * point (for use in representing integers) in the range 0 to - * BASE-1, or -1 if b is does not represent a value. + * @return the numeric value of a basic code point (for use in representing integers) + * in the range 0 to BASE-1, or a negative value if cp is invalid. */ - static final int[] basicToDigit= new int[]{ - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, -1, -1, -1, -1, -1, -1, - - -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, - 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1, - - -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, - 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1, - - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 + private static final int decodeDigit(int cp) { + if(cp<='Z') { + if(cp<='9') { + if(cp<'0') { + return -1; + } else { + return cp-'0'+26; // 0..9 -> 26..35 + } + } else { + return cp-'A'; // A-Z -> 0..25 + } + } else if(cp<='z') { + return cp-'a'; // a..z -> 0..25 + } else { + return -1; + } }; private static char asciiCaseMap(char b, boolean uppercase) { @@ -158,6 +146,12 @@ public final class Punycode { return (char)((ZERO-26)+digit); } } + + // ICU-13727: Limit input length for n^2 algorithm + // where well-formed strings are at most 59 characters long. + private static final int ENCODE_MAX_CODE_UNITS = 1000; + private static final int DECODE_MAX_CHARS = 2000; + /** * Converts Unicode to Punycode. * The input string must not contain single, unpaired surrogates. @@ -174,6 +168,10 @@ public final class Punycode { int n, delta, handledCPCount, basicLength, destLength, bias, j, m, q, k, t, srcCPCount; char c, c2; int srcLength = src.length(); + if (srcLength > ENCODE_MAX_CODE_UNITS) { + throw new RuntimeException( + "input too long: " + srcLength + " UTF-16 code units"); + } int destCapacity = MAX_CP_COUNT; char[] dest = new char[destCapacity]; StringBuffer result = new StringBuffer(); @@ -251,7 +249,7 @@ public final class Punycode { * Increase delta enough to advance the decoder's * state to , but guard against overflow: */ - if(m-n>(0x7fffffff-MAX_CP_COUNT-delta)/(handledCPCount+1)) { + if(m-n>(0x7fffffff-handledCPCount-delta)/(handledCPCount+1)) { throw new RuntimeException("Internal program error"); } delta+=(m-n)*(handledCPCount+1); @@ -332,6 +330,9 @@ public final class Punycode { public static StringBuffer decode(StringBuffer src, boolean[] caseFlags) throws ParseException{ int srcLength = src.length(); + if (srcLength > DECODE_MAX_CHARS) { + throw new RuntimeException("input too long: " + srcLength + " characters"); + } StringBuffer result = new StringBuffer(); int n, destLength, i, bias, basicLength, j, in, oldi, w, k, digit, t, destCPCount, firstSupplementaryIndex, cpLength; @@ -395,7 +396,7 @@ public final class Punycode { throw new ParseException("Illegal char found", -1); } - digit=basicToDigit[(byte)src.charAt(in++)]; + digit=decodeDigit(src.charAt(in++)); if(digit<0) { throw new ParseException("Invalid char found", -1); } diff --git a/src/java.base/share/classes/jdk/internal/icu/impl/UnicodeSetStringSpan.java b/src/java.base/share/classes/jdk/internal/icu/impl/UnicodeSetStringSpan.java index ee5e80dd8830f783536f4ba3a16f5ec7aa9f1041..331ab234f5954e3be18be1d7e7ad4704d26fe6ba 100644 --- a/src/java.base/share/classes/jdk/internal/icu/impl/UnicodeSetStringSpan.java +++ b/src/java.base/share/classes/jdk/internal/icu/impl/UnicodeSetStringSpan.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2022, 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 @@ -134,9 +134,15 @@ public class UnicodeSetStringSpan { int i, spanLength; someRelevant = false; - for (i = 0; i < stringsLength; ++i) { + for (i = 0; i < stringsLength;) { String string = strings.get(i); int length16 = string.length(); + if (length16 == 0) { + // Remove the empty string. + strings.remove(i); + --stringsLength; + continue; + } spanLength = spanSet.span(string, SpanCondition.CONTAINED); if (spanLength < length16) { // Relevant string. someRelevant = true; @@ -144,6 +150,7 @@ public class UnicodeSetStringSpan { if (/* (0 != (which & UTF16)) && */ length16 > maxLength16) { maxLength16 = length16; } + ++i; } if (!someRelevant && (which & WITH_COUNT) == 0) { return; diff --git a/src/java.base/share/classes/jdk/internal/icu/impl/data/icudt67b/uprops.icu b/src/java.base/share/classes/jdk/internal/icu/impl/data/icudt67b/uprops.icu deleted file mode 100644 index ee08ff5b011d49d5866413c5856f37f58b0ab8cc..0000000000000000000000000000000000000000 Binary files a/src/java.base/share/classes/jdk/internal/icu/impl/data/icudt67b/uprops.icu and /dev/null differ diff --git a/src/java.base/share/classes/jdk/internal/icu/impl/data/icudt67b/nfc.nrm b/src/java.base/share/classes/jdk/internal/icu/impl/data/icudt70b/nfc.nrm similarity index 86% rename from src/java.base/share/classes/jdk/internal/icu/impl/data/icudt67b/nfc.nrm rename to src/java.base/share/classes/jdk/internal/icu/impl/data/icudt70b/nfc.nrm index 45c260858f9aea1031520e13b6087be76b6c9301..b42accf8ad174cb046bf609e13179e1b3c2ec70e 100644 Binary files a/src/java.base/share/classes/jdk/internal/icu/impl/data/icudt67b/nfc.nrm and b/src/java.base/share/classes/jdk/internal/icu/impl/data/icudt70b/nfc.nrm differ diff --git a/src/java.base/share/classes/jdk/internal/icu/impl/data/icudt67b/nfkc.nrm b/src/java.base/share/classes/jdk/internal/icu/impl/data/icudt70b/nfkc.nrm similarity index 67% rename from src/java.base/share/classes/jdk/internal/icu/impl/data/icudt67b/nfkc.nrm rename to src/java.base/share/classes/jdk/internal/icu/impl/data/icudt70b/nfkc.nrm index 2c0587b6d455a6221287faf70600adcea6a7ef7b..450b6ed323b8ecd52cffd1f91c59bc284fdeb161 100644 Binary files a/src/java.base/share/classes/jdk/internal/icu/impl/data/icudt67b/nfkc.nrm and b/src/java.base/share/classes/jdk/internal/icu/impl/data/icudt70b/nfkc.nrm differ diff --git a/src/java.base/share/classes/jdk/internal/icu/impl/data/icudt67b/ubidi.icu b/src/java.base/share/classes/jdk/internal/icu/impl/data/icudt70b/ubidi.icu similarity index 63% rename from src/java.base/share/classes/jdk/internal/icu/impl/data/icudt67b/ubidi.icu rename to src/java.base/share/classes/jdk/internal/icu/impl/data/icudt70b/ubidi.icu index bec7b093064530bb5049258a4280cf55a113ec8a..b125866b8e2d907c50bcd715e3174bbf1796c03a 100644 Binary files a/src/java.base/share/classes/jdk/internal/icu/impl/data/icudt67b/ubidi.icu and b/src/java.base/share/classes/jdk/internal/icu/impl/data/icudt70b/ubidi.icu differ diff --git a/src/java.base/share/classes/jdk/internal/icu/impl/data/icudt70b/uprops.icu b/src/java.base/share/classes/jdk/internal/icu/impl/data/icudt70b/uprops.icu new file mode 100644 index 0000000000000000000000000000000000000000..335caa93cc2803e26e5b34342bb0c9e45074b155 Binary files /dev/null and b/src/java.base/share/classes/jdk/internal/icu/impl/data/icudt70b/uprops.icu differ diff --git a/src/java.base/share/classes/jdk/internal/icu/lang/UCharacter.java b/src/java.base/share/classes/jdk/internal/icu/lang/UCharacter.java index 716aa9827900ed8c4384dbbdecc9aa039147e4fd..b703611cf275bd41d0def5ba4e0747daf354d4a1 100644 --- a/src/java.base/share/classes/jdk/internal/icu/lang/UCharacter.java +++ b/src/java.base/share/classes/jdk/internal/icu/lang/UCharacter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2022, 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 @@ -84,7 +84,7 @@ import jdk.internal.icu.util.VersionInfo; *

    * Further detail on differences can be determined using the program * + * "https://github.com/unicode-org/icu/blob/main/icu4j/main/tests/core/src/com/ibm/icu/dev/test/lang/UCharacterCompare.java"> * com.ibm.icu.dev.test.lang.UCharacterCompare *

    *

    @@ -101,9 +101,9 @@ import jdk.internal.icu.util.VersionInfo; * For more information see * "About the Unicode Character Database" * (http://www.unicode.org/ucd/) - * and the ICU + * and the ICU * User Guide chapter on Properties - * (http://www.icu-project.org/userguide/properties.html). + * (https://unicode-org.github.io/icu/userguide/strings/properties). *

    *

    * There are also functions that provide easy migration from C/POSIX functions diff --git a/src/java.base/share/classes/jdk/internal/icu/lang/UCharacterDirection.java b/src/java.base/share/classes/jdk/internal/icu/lang/UCharacterDirection.java index db9beb0c3acd1b4337d2cf81367f624438243f07..22b878155bb4ba61e2b89d5e25bd569ebc43e8df 100644 --- a/src/java.base/share/classes/jdk/internal/icu/lang/UCharacterDirection.java +++ b/src/java.base/share/classes/jdk/internal/icu/lang/UCharacterDirection.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2022, 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 @@ -53,7 +53,7 @@ public final class UCharacterDirection implements UCharacterEnums.ECharacterDire // private constructor ========================================= ///CLOVER:OFF /** - * Private constructor to prevent initialisation + * Private constructor to prevent initialization */ private UCharacterDirection() { diff --git a/src/java.base/share/classes/jdk/internal/icu/lang/UCharacterEnums.java b/src/java.base/share/classes/jdk/internal/icu/lang/UCharacterEnums.java index 9b4809ae411e930f49f4845a439c62481cc7183e..38f8684ea04c1d8fb187236e8c70e2877e7472eb 100644 --- a/src/java.base/share/classes/jdk/internal/icu/lang/UCharacterEnums.java +++ b/src/java.base/share/classes/jdk/internal/icu/lang/UCharacterEnums.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -62,7 +62,7 @@ package jdk.internal.icu.lang; @Deprecated class UCharacterEnums { - /** This is just a namespace, it is not instantiatable. */ + /** This is just a namespace, it is not instantiable. */ private UCharacterEnums() {}; /** diff --git a/src/java.base/share/classes/jdk/internal/icu/text/BidiBase.java b/src/java.base/share/classes/jdk/internal/icu/text/BidiBase.java index 1714c15143a6b22b160efa792ceeb3ee75e1eb97..1161e9c84649775efc69e3a43751db3565ee9bf1 100644 --- a/src/java.base/share/classes/jdk/internal/icu/text/BidiBase.java +++ b/src/java.base/share/classes/jdk/internal/icu/text/BidiBase.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2022, 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,7 @@ import jdk.internal.icu.impl.UBiDiProps; * * This is an implementation of the Unicode Bidirectional Algorithm. The * algorithm is defined in the - * Unicode Standard Annex #9: + * Unicode Standard Annex #9: * Unicode Bidirectional Algorithm. *

    * @@ -985,7 +985,7 @@ public class BidiBase { /** * Enumerated property Bidi_Paired_Bracket_Type (new in Unicode 6.3). * Used in - * Unicode Standard Annex #9: + * Unicode Standard Annex #9: * Unicode Bidirectional Algorithm. * Returns UCharacter.BidiPairedBracketType values. * @stable ICU 52 @@ -3365,7 +3365,7 @@ public class BidiBase { /** * Perform the Unicode Bidi algorithm. It is defined in the - * Unicode Standard Annex #9: + * Unicode Standard Annex #9: * Unicode Bidirectional Algorithm, version 13, * also described in The Unicode Standard, Version 4.0 .

    * @@ -3450,7 +3450,7 @@ public class BidiBase { /** * Perform the Unicode Bidi algorithm. It is defined in the - * Unicode Standard Annex #9: + * Unicode Standard Annex #9: * Unicode Bidirectional Algorithm, version 13, * also described in The Unicode Standard, Version 4.0 .

    * @@ -3786,7 +3786,7 @@ public class BidiBase { /** * Perform the Unicode Bidi algorithm on a given paragraph, as defined in the - * Unicode Standard Annex #9: + * Unicode Standard Annex #9: * Unicode Bidirectional Algorithm, version 13, * also described in The Unicode Standard, Version 4.0 .

    * diff --git a/src/java.base/share/classes/jdk/internal/icu/text/BidiLine.java b/src/java.base/share/classes/jdk/internal/icu/text/BidiLine.java index 6a358abebd7785c4ecde5affe8a1c0ff6ba2f98e..d8fa4f61fa46afe0bbb53c3c303c46f5d1fbc48b 100644 --- a/src/java.base/share/classes/jdk/internal/icu/text/BidiLine.java +++ b/src/java.base/share/classes/jdk/internal/icu/text/BidiLine.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2022, 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 @@ -47,7 +47,7 @@ final class BidiLine { * text in a single paragraph or in a line of a single paragraph * which has already been processed according to * the Unicode 3.0 Bidi algorithm as defined in - * Unicode Standard Annex #9: + * Unicode Standard Annex #9: * Unicode Bidirectional Algorithm, version 13, * also described in The Unicode Standard, Version 4.0.1 . * diff --git a/src/java.base/share/classes/jdk/internal/icu/text/Normalizer2.java b/src/java.base/share/classes/jdk/internal/icu/text/Normalizer2.java index f7fc6d294a3566785d1cf3cf3f87ee5c0c161171..db0d1fc20bf9902e3251003c8b75d6d17fc73d7d 100644 --- a/src/java.base/share/classes/jdk/internal/icu/text/Normalizer2.java +++ b/src/java.base/share/classes/jdk/internal/icu/text/Normalizer2.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2022, 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 @@ -43,7 +43,7 @@ import jdk.internal.icu.impl.Norm2AllModes; * The primary functions are to produce a normalized string and to detect whether * a string is already normalized. * The most commonly used normalization forms are those defined in - * Unicode Standard Annex #15: + * Unicode Standard Annex #15: * Unicode Normalization Forms. * However, this API supports additional normalization forms for specialized purposes. * For example, NFKC_Casefold is provided via getInstance("nfkc_cf", COMPOSE) diff --git a/src/java.base/share/classes/jdk/internal/icu/text/NormalizerBase.java b/src/java.base/share/classes/jdk/internal/icu/text/NormalizerBase.java index ffe065413a532c47c21bfb2b2d958860bccfab93..f2566d9d419b77c597be0a170cd411d21eb939b0 100644 --- a/src/java.base/share/classes/jdk/internal/icu/text/NormalizerBase.java +++ b/src/java.base/share/classes/jdk/internal/icu/text/NormalizerBase.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2022, 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,7 +44,7 @@ import java.text.Normalizer; * normalize transforms Unicode text into an equivalent composed or * decomposed form, allowing for easier sorting and searching of text. * normalize supports the standard normalization forms described in - * + * * Unicode Standard Annex #15 — Unicode Normalization Forms. * * Characters with accents or other adornments can be encoded in diff --git a/src/java.base/share/classes/jdk/internal/icu/text/StringPrep.java b/src/java.base/share/classes/jdk/internal/icu/text/StringPrep.java index 82fe7d3a5a9fab86924b09722a98a1091b0fd189..f05d0403665682063770531583e5c2b08b2fe4d0 100644 --- a/src/java.base/share/classes/jdk/internal/icu/text/StringPrep.java +++ b/src/java.base/share/classes/jdk/internal/icu/text/StringPrep.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2022, 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,9 +67,9 @@ import jdk.internal.icu.util.VersionInfo; *

  • Unassigned Table: Contains code points that are unassigned * in the Unicode Version supported by StringPrep. Currently * RFC 3454 supports Unicode 3.2.
    • - *
  • Prohibited Table: Contains code points that are prohibted from + *
  • Prohibited Table: Contains code points that are prohibited from * the output of the StringPrep processing function.
    • - *
  • Mapping Table: Contains code ponts that are deleted from the output or case mapped.
    • + *
  • Mapping Table: Contains code points that are deleted from the output or case mapped.
    • * * * The procedure for preparing Unicode strings: @@ -226,8 +226,8 @@ public final class StringPrep { sprepUniVer = getVersionInfo(reader.getUnicodeVersion()); normCorrVer = getVersionInfo(indexes[NORM_CORRECTNS_LAST_UNI_VERSION]); VersionInfo normUniVer = UCharacter.getUnicodeVersion(); - if(normUniVer.compareTo(sprepUniVer) < 0 && /* the Unicode version of SPREP file must be less than the Unicode Vesion of the normalization data */ - normUniVer.compareTo(normCorrVer) < 0 && /* the Unicode version of the NormalizationCorrections.txt file should be less than the Unicode Vesion of the normalization data */ + if(normUniVer.compareTo(sprepUniVer) < 0 && /* the Unicode version of SPREP file must be less than the Unicode Version of the normalization data */ + normUniVer.compareTo(normCorrVer) < 0 && /* the Unicode version of the NormalizationCorrections.txt file should be less than the Unicode Version of the normalization data */ ((indexes[OPTIONS] & NORMALIZATION_ON) > 0) /* normalization turned on*/ ){ throw new IOException("Normalization Correction version not supported"); @@ -325,7 +325,7 @@ public final class StringPrep { ch -= val.value; } }else if(val.type == DELETE){ - // just consume the codepoint and contine + // just consume the codepoint and continue continue; } //copy the source into destination diff --git a/src/java.base/share/classes/jdk/internal/icu/text/UCharacterIterator.java b/src/java.base/share/classes/jdk/internal/icu/text/UCharacterIterator.java index e85a08c4605e86f0731f752aaa75e06639943aca..93978372c3a03822342b1717a82f8b93ab2b450a 100644 --- a/src/java.base/share/classes/jdk/internal/icu/text/UCharacterIterator.java +++ b/src/java.base/share/classes/jdk/internal/icu/text/UCharacterIterator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2022, 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 @@ -147,9 +147,9 @@ public abstract class UCharacterIterator */ public int nextCodePoint(){ int ch1 = next(); - if(UTF16.isLeadSurrogate((char)ch1)){ + if(UTF16.isLeadSurrogate(ch1)){ int ch2 = next(); - if(UTF16.isTrailSurrogate((char)ch2)){ + if(UTF16.isTrailSurrogate(ch2)){ return UCharacterProperty.getRawSupplementary((char)ch1, (char)ch2); }else if (ch2 != DONE) { @@ -175,7 +175,7 @@ public abstract class UCharacterIterator /** * Retreat to the start of the previous code point in the text, * and return it (pre-decrement semantics). If the index is not - * preceeded by a valid surrogate pair, the behavior is the same + * preceded by a valid surrogate pair, the behavior is the same * as previous(). Otherwise the iterator is * decremented to the start of the surrogate pair, and the code * point represented by the pair is returned. @@ -185,9 +185,9 @@ public abstract class UCharacterIterator */ public int previousCodePoint(){ int ch1 = previous(); - if(UTF16.isTrailSurrogate((char)ch1)){ + if(UTF16.isTrailSurrogate(ch1)){ int ch2 = previous(); - if(UTF16.isLeadSurrogate((char)ch2)){ + if(UTF16.isLeadSurrogate(ch2)){ return UCharacterProperty.getRawSupplementary((char)ch2, (char)ch1); }else if (ch2 != DONE) { diff --git a/src/java.base/share/classes/jdk/internal/icu/text/UTF16.java b/src/java.base/share/classes/jdk/internal/icu/text/UTF16.java index b35d842b0d5c2350556347979ab10d07fd2ed67d..4205487a966fe75ce73bb315d0506f6355885c10 100644 --- a/src/java.base/share/classes/jdk/internal/icu/text/UTF16.java +++ b/src/java.base/share/classes/jdk/internal/icu/text/UTF16.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2022, 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 @@ -382,36 +382,39 @@ public final class UTF16 } /** - * Determines whether the code value is a surrogate. - * @param char16 the input character. - * @return true if the input character is a surrogate. - * @stable ICU 2.1 + * Determines whether the code point is a surrogate. + * + * @param codePoint The input character. + * (In ICU 2.1-69 the type of this parameter was char.) + * @return true If the input code point is a surrogate. + * @stable ICU 70 */ - public static boolean isSurrogate(char char16) - { - return (char16 & SURROGATE_BITMASK) == SURROGATE_BITS; + public static boolean isSurrogate(int codePoint) { + return (codePoint & SURROGATE_BITMASK) == SURROGATE_BITS; } /** - * Determines whether the character is a trail surrogate. - * @param char16 the input character. - * @return true if the input character is a trail surrogate. - * @stable ICU 2.1 + * Determines whether the code point is a trail surrogate. + * + * @param codePoint The input character. + * (In ICU 2.1-69 the type of this parameter was char.) + * @return true If the input code point is a trail surrogate. + * @stable ICU 70 */ - public static boolean isTrailSurrogate(char char16) - { - return (char16 & TRAIL_SURROGATE_BITMASK) == TRAIL_SURROGATE_BITS; + public static boolean isTrailSurrogate(int codePoint) { + return (codePoint & TRAIL_SURROGATE_BITMASK) == TRAIL_SURROGATE_BITS; } /** - * Determines whether the character is a lead surrogate. - * @param char16 the input character. - * @return true if the input character is a lead surrogate - * @stable ICU 2.1 + * Determines whether the code point is a lead surrogate. + * + * @param codePoint The input character. + * (In ICU 2.1-69 the type of this parameter was char.) + * @return true If the input code point is a lead surrogate + * @stable ICU 70 */ - public static boolean isLeadSurrogate(char char16) - { - return (char16 & LEAD_SURROGATE_BITMASK) == LEAD_SURROGATE_BITS; + public static boolean isLeadSurrogate(int codePoint) { + return (codePoint & LEAD_SURROGATE_BITMASK) == LEAD_SURROGATE_BITS; } /** diff --git a/src/java.base/share/classes/jdk/internal/icu/text/UnicodeSet.java b/src/java.base/share/classes/jdk/internal/icu/text/UnicodeSet.java index 63188dca460231fb7f6137aac56843335abfbf12..6f5919e016bdc5c3668236bfbe936ea71590f3c8 100644 --- a/src/java.base/share/classes/jdk/internal/icu/text/UnicodeSet.java +++ b/src/java.base/share/classes/jdk/internal/icu/text/UnicodeSet.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2022, 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 @@ -135,8 +135,8 @@ import jdk.internal.icu.util.VersionInfo; * "[:Lu:]" and the Perl-like syntax "\p{Lu}" are recognized. For a * complete list of supported property patterns, see the User's Guide * for UnicodeSet at - * - * http://www.icu-project.org/userguide/unicodeSet.html. + * + * https://unicode-org.github.io/icu/userguide/strings/unicodeset. * Actual determination of property data is defined by the underlying * Unicode database as implemented by UCharacter. * @@ -147,6 +147,13 @@ import jdk.internal.icu.util.VersionInfo; * their delimiters; "[:^foo]" and "\P{foo}". In any other location, * '^' has no special meaning. * + *

    Since ICU 70, "[^...]", "[:^foo]", "\P{foo}", and "[:binaryProperty=No:]" + * perform a "code point complement" (all code points minus the original set), + * removing all multicharacter strings, + * equivalent to .{@link #complement()}.{@link #removeAllStrings()} . + * The {@link #complement()} API function continues to perform a + * symmetric difference with all code points and thus retains all multicharacter strings. + * *

    Ranges are indicated by placing two a '-' between two * characters, as in "a-z". This specifies the range of all * characters from the left to the right, in Unicode order. If the @@ -189,8 +196,6 @@ import jdk.internal.icu.util.VersionInfo; * Unicode property *

    • * - *

    Warning: you cannot add an empty string ("") to a UnicodeSet.

    - * *

    Formal syntax

    * *
    @@ -230,9 +235,8 @@ import jdk.internal.icu.util.VersionInfo; * * * hex :=  - * any character for which - * Character.digit(c, 16) - * returns a non-negative result + * '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9' |
    + *     'A' | 'B' | 'C' | 'D' | 'E' | 'F' | 'a' | 'b' | 'c' | 'd' | 'e' | 'f'     * * * property :=  @@ -487,7 +491,7 @@ public class UnicodeSet { else if (i > 0 && c == list[i-1]) { // c is after end of prior range list[i-1]++; - // no need to chcek for collapse here + // no need to check for collapse here } else { @@ -528,7 +532,6 @@ public class UnicodeSet { * present. If this set already contains the multicharacter, * the call leaves this set unchanged. * Thus {@code "ch" => {"ch"}} - *
    Warning: you cannot add an empty string ("") to a UnicodeSet. * @param s the source string * @return this object, for chaining * @stable ICU 2.0 @@ -546,22 +549,19 @@ public class UnicodeSet { /** * Utility for getting code point from single code point CharSequence. - * See the public UTF16.getSingleCodePoint() + * See the public UTF16.getSingleCodePoint() (which returns -1 for null rather than throwing NPE). + * * @return a code point IF the string consists of a single one. * otherwise returns -1. * @param s to test */ private static int getSingleCP(CharSequence s) { - if (s.length() < 1) { - throw new IllegalArgumentException("Can't use zero-length strings in UnicodeSet"); - } - if (s.length() > 2) return -1; if (s.length() == 1) return s.charAt(0); - - // at this point, len = 2 - int cp = UTF16.charAt(s, 0); - if (cp > 0xFFFF) { // is surrogate pair - return cp; + if (s.length() == 2) { + int cp = Character.codePointAt(s, 0); + if (cp > 0xFFFF) { // is surrogate pair + return cp; + } } return -1; } @@ -569,13 +569,11 @@ public class UnicodeSet { /** * Complements the specified range in this set. Any character in * the range will be removed if it is in this set, or will be - * added if it is not in this set. If {@code end > start} + * added if it is not in this set. If start > end * then an empty range is complemented, leaving the set unchanged. * - * @param start first character, inclusive, of range to be removed - * from this set. - * @param end last character, inclusive, of range to be removed - * from this set. + * @param start first character, inclusive, of range + * @param end last character, inclusive, of range * @stable ICU 2.0 */ public UnicodeSet complement(int start, int end) { diff --git a/src/java.base/share/classes/jdk/internal/icu/util/CodePointTrie.java b/src/java.base/share/classes/jdk/internal/icu/util/CodePointTrie.java index 1738696f75ab2a210fc2c54d311f20660753aece..7aaa0be68c8b9c54d45d5b995237c7d0f1c3c816 100644 --- a/src/java.base/share/classes/jdk/internal/icu/util/CodePointTrie.java +++ b/src/java.base/share/classes/jdk/internal/icu/util/CodePointTrie.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2022, 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 @@ -43,7 +43,7 @@ import static jdk.internal.icu.impl.NormalizerImpl.UTF16Plus; /** * Immutable Unicode code point trie. * Fast, reasonably compact, map from Unicode code points (U+0000..U+10FFFF) to integer values. - * For details see http://site.icu-project.org/design/struct/utrie + * For details see https://icu.unicode.org/design/struct/utrie * *

    This class is not intended for public subclassing. * diff --git a/src/java.base/share/classes/jdk/internal/icu/util/VersionInfo.java b/src/java.base/share/classes/jdk/internal/icu/util/VersionInfo.java index d79ee84731b3027a9e2c36ba3741ccf6b5124480..799d570e2aa8296bcd9cf84e7b8cda3dc7b0a524 100644 --- a/src/java.base/share/classes/jdk/internal/icu/util/VersionInfo.java +++ b/src/java.base/share/classes/jdk/internal/icu/util/VersionInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2022, 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 @@ -54,7 +54,7 @@ public final class VersionInfo * @deprecated This API is ICU internal only. */ @Deprecated - public static final String ICU_DATA_VERSION_PATH = "67b"; + public static final String ICU_DATA_VERSION_PATH = "70b"; // public methods ------------------------------------------------------ @@ -148,7 +148,15 @@ public final class VersionInfo */ public int compareTo(VersionInfo other) { - return m_version_ - other.m_version_; + // m_version_ is an int, a signed 32-bit integer. + // When the major version is >=128, then the version int is negative. + // Compare it in two steps to simulate an unsigned-int comparison. + // (Alternatively we could turn each int into a long and reset the upper 32 bits.) + // Compare the upper bits first, using logical shift right (unsigned). + int diff = (m_version_ >>> 1) - (other.m_version_ >>> 1); + if (diff != 0) { return diff; } + // Compare the remaining bits. + return (m_version_ & 1) - (other.m_version_ & 1); } // private data members ---------------------------------------------- diff --git a/src/java.base/share/classes/jdk/internal/module/ModulePath.java b/src/java.base/share/classes/jdk/internal/module/ModulePath.java index 47c21ed3b3d26f465c784592af0836564bb31ed2..876050ef8396851544d4ca7a202ef79d6388f606 100644 --- a/src/java.base/share/classes/jdk/internal/module/ModulePath.java +++ b/src/java.base/share/classes/jdk/internal/module/ModulePath.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2021, 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 @@ -527,7 +527,6 @@ public class ModulePath implements ModuleFinder { Set packages = classFiles.stream() .map(this::toPackageName) .flatMap(Optional::stream) - .distinct() .collect(Collectors.toSet()); // all packages are exported and open diff --git a/src/java.base/share/classes/jdk/internal/reflect/Reflection.java b/src/java.base/share/classes/jdk/internal/reflect/Reflection.java index 76a4bf8fa4a643beeb647d193ae2610bc7d4f0fc..23b686041e67f647d5e2dfe2fe268d63d24cc0da 100644 --- a/src/java.base/share/classes/jdk/internal/reflect/Reflection.java +++ b/src/java.base/share/classes/jdk/internal/reflect/Reflection.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2022, 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 @@ -379,11 +379,8 @@ public class Reflection { String msg = currentClass + currentSuffix + " cannot access "; if (m2.isExported(memberPackageName, m1)) { - // module access okay so include the modifiers in the message - msg += "a member of " + memberClass + memberSuffix + - " with modifiers \"" + Modifier.toString(modifiers) + "\""; - + msg += "a member of " + memberClass + memberSuffix + msgSuffix(modifiers); } else { // module access failed msg += memberClass + memberSuffix+ " because " @@ -410,11 +407,8 @@ public class Reflection { String msg = "JNI attached native thread (null caller frame) cannot access "; if (m2.isExported(memberPackageName)) { - // module access okay so include the modifiers in the message - msg += "a member of " + memberClass + memberSuffix + - " with modifiers \"" + Modifier.toString(modifiers) + "\""; - + msg += "a member of " + memberClass + memberSuffix + msgSuffix(modifiers); } else { // module access failed msg += memberClass + memberSuffix+ " because " @@ -424,6 +418,16 @@ public class Reflection { return new IllegalAccessException(msg); } + private static String msgSuffix(int modifiers) { + boolean packageAccess = + ((Modifier.PRIVATE | + Modifier.PROTECTED | + Modifier.PUBLIC) & modifiers) == 0; + return packageAccess ? + " with package access" : + " with modifiers \"" + Modifier.toString(modifiers) + "\""; + } + /** * Returns true if {@code currentClass} and {@code memberClass} * are nestmates - that is, if they have the same nesthost as diff --git a/src/java.base/share/classes/jdk/internal/util/random/RandomSupport.java b/src/java.base/share/classes/jdk/internal/util/random/RandomSupport.java index d47043b89aa199a5dca72c44e28ca3876e09d7b8..14fe0d3906df27386deb816f58a11341fbe29771 100644 --- a/src/java.base/share/classes/jdk/internal/util/random/RandomSupport.java +++ b/src/java.base/share/classes/jdk/internal/util/random/RandomSupport.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2020, 2022, 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 @@ -645,7 +645,7 @@ public class RandomSupport { if (origin < bound) { r = r * (bound - origin) + origin; if (r >= bound) // may need to correct a rounding problem - r = Double.longBitsToDouble(Double.doubleToLongBits(bound) - 1); + r = Math.nextAfter(bound, origin); } return r; } @@ -677,7 +677,7 @@ public class RandomSupport { double r = rng.nextDouble(); r = r * bound; if (r >= bound) // may need to correct a rounding problem - r = Double.longBitsToDouble(Double.doubleToLongBits(bound) - 1); + r = Math.nextDown(r); return r; } diff --git a/src/java.base/share/classes/sun/net/NetProperties.java b/src/java.base/share/classes/sun/net/NetProperties.java index 5ff150b105a8a6ea8eaa4487cd62689539437815..d3f0bd4905bdf7113be0bb62fab821ebb2783434 100644 --- a/src/java.base/share/classes/sun/net/NetProperties.java +++ b/src/java.base/share/classes/sun/net/NetProperties.java @@ -68,10 +68,9 @@ public class NetProperties { File f = new File(fname, "conf"); f = new File(f, "net.properties"); fname = f.getCanonicalPath(); - InputStream in = new FileInputStream(fname); - BufferedInputStream bin = new BufferedInputStream(in); - props.load(bin); - bin.close(); + try (FileInputStream in = new FileInputStream(fname)) { + props.load(in); + } } catch (Exception e) { // Do nothing. We couldn't find or access the file // so we won't have default properties... diff --git a/src/java.base/share/classes/sun/net/www/MimeEntry.java b/src/java.base/share/classes/sun/net/www/MimeEntry.java index 48b847cf558d18fb570655254a8a21809ad4064a..3422b58e1bc39cc6bb1eb7db7bca053f6fcaf5fc 100644 --- a/src/java.base/share/classes/sun/net/www/MimeEntry.java +++ b/src/java.base/share/classes/sun/net/www/MimeEntry.java @@ -24,7 +24,6 @@ */ package sun.net.www; -import java.net.URL; import java.io.*; import java.util.StringJoiner; import java.util.StringTokenizer; @@ -63,34 +62,6 @@ public class MimeEntry implements Cloneable { this(type, UNKNOWN, null, null, null); } - // - // The next two constructors are used only by the deprecated - // PlatformMimeTable classes or, in last case, is called by the public - // constructor. They are kept here anticipating putting support for - // mailcap formatted config files back in (so BOTH the properties format - // and the mailcap formats are supported). - // - MimeEntry(String type, String imageFileName, String extensionString) { - typeName = type.toLowerCase(); - action = UNKNOWN; - command = null; - this.imageFileName = imageFileName; - setExtensions(extensionString); - starred = isStarred(typeName); - } - - // For use with MimeTable::parseMailCap - MimeEntry(String typeName, int action, String command, - String tempFileNameTemplate) { - this.typeName = typeName.toLowerCase(); - this.action = action; - this.command = command; - this.imageFileName = null; - this.fileExtensions = null; - - this.tempFileNameTemplate = tempFileNameTemplate; - } - // This is the one called by the public constructor. MimeEntry(String typeName, int action, String command, String imageFileName, String fileExtensions[]) { diff --git a/src/java.base/share/classes/sun/net/www/MimeTable.java b/src/java.base/share/classes/sun/net/www/MimeTable.java index fd8c5565dfafcdddd8192e0f20ab69c055246711..accbe8b1c199945fd5969a13cb782f24330b9e8e 100644 --- a/src/java.base/share/classes/sun/net/www/MimeTable.java +++ b/src/java.base/share/classes/sun/net/www/MimeTable.java @@ -37,11 +37,11 @@ import java.util.StringTokenizer; public class MimeTable implements FileNameMap { /** Keyed by content type, returns MimeEntries */ private Hashtable entries - = new Hashtable(); + = new Hashtable<>(); /** Keyed by file extension (with the .), returns MimeEntries */ private Hashtable extensionMap - = new Hashtable(); + = new Hashtable<>(); // Will be reset if in the platform-specific data file @SuppressWarnings("removal") @@ -55,7 +55,6 @@ public class MimeTable implements FileNameMap { }); private static final String filePreamble = "sun.net.www MIME content-types table"; - private static final String fileMagic = "#" + filePreamble; MimeTable() { load(); @@ -67,7 +66,7 @@ public class MimeTable implements FileNameMap { @SuppressWarnings("removal") static MimeTable getDefaultInstance() { return java.security.AccessController.doPrivileged( - new java.security.PrivilegedAction() { + new java.security.PrivilegedAction<>() { public MimeTable run() { MimeTable instance = new MimeTable(); URLConnection.setFileNameMap(instance); @@ -244,8 +243,8 @@ public class MimeTable implements FileNameMap { throw new InternalError("default mime table not found"); } - try (BufferedInputStream bin = new BufferedInputStream(in)) { - entries.load(bin); + try (in) { + entries.load(in); } catch (IOException e) { System.err.println("Warning: " + e.getMessage()); } @@ -349,17 +348,6 @@ public class MimeTable implements FileNameMap { // else illegal name exception } - String[] getExtensions(String list) { - StringTokenizer tokenizer = new StringTokenizer(list, ","); - int n = tokenizer.countTokens(); - String[] extensions = new String[n]; - for (int i = 0; i < n; i++) { - extensions[i] = tokenizer.nextToken(); - } - - return extensions; - } - int getActionCode(String action) { for (int i = 0; i < MimeEntry.actionKeywords.length; i++) { if (action.equalsIgnoreCase(MimeEntry.actionKeywords[i])) { @@ -382,9 +370,7 @@ public class MimeTable implements FileNameMap { } protected boolean saveAsProperties(File file) { - FileOutputStream os = null; - try { - os = new FileOutputStream(file); + try (FileOutputStream os = new FileOutputStream(file)) { Properties properties = getAsProperties(); properties.put("temp.file.template", tempFileTemplate); String tag; @@ -407,11 +393,6 @@ public class MimeTable implements FileNameMap { e.printStackTrace(); return false; } - finally { - if (os != null) { - try { os.close(); } catch (IOException e) {} - } - } return true; } diff --git a/src/java.base/share/classes/sun/net/www/http/HttpClient.java b/src/java.base/share/classes/sun/net/www/http/HttpClient.java index 4b3c40b4fc01f7ed30f680409a2e1e725a48b716..8993f0c2a0af42317bf3b35054e4c8edd69c2edc 100644 --- a/src/java.base/share/classes/sun/net/www/http/HttpClient.java +++ b/src/java.base/share/classes/sun/net/www/http/HttpClient.java @@ -144,12 +144,27 @@ public class HttpClient extends NetworkClient { // Traffic capture tool, if configured. See HttpCapture class for info private HttpCapture capture = null; + /* "jdk.https.negotiate.cbt" property can be set to "always" (always sent), "never" (never sent) or + * "domain:a,c.d,*.e.f" (sent to host a, or c.d or to the domain e.f and any of its subdomains). This is + * a comma separated list of arbitrary length with no white-space allowed. + * If enabled (for a particular destination) then Negotiate/SPNEGO authentication requests will include + * a channel binding token for the destination server. The default behavior and setting for the + * property is "never" + */ + private static final String spnegoCBT; + private static final PlatformLogger logger = HttpURLConnection.getHttpLogger(); + private static void logFinest(String msg) { if (logger.isLoggable(PlatformLogger.Level.FINEST)) { logger.finest(msg); } } + private static void logError(String msg) { + if (logger.isLoggable(PlatformLogger.Level.SEVERE)) { + logger.severe(msg); + } + } protected volatile String authenticatorKey; @@ -165,6 +180,18 @@ public class HttpClient extends NetworkClient { return keepAliveTimeout; } + static String normalizeCBT(String s) { + if (s == null || s.equals("never")) { + return "never"; + } + if (s.equals("always") || s.startsWith("domain:")) { + return s; + } else { + logError("Unexpected value for \"jdk.https.negotiate.cbt\" system property"); + return "never"; + } + } + static { Properties props = GetPropertyAction.privilegedGetProperties(); String keepAlive = props.getProperty("http.keepAlive"); @@ -172,6 +199,9 @@ public class HttpClient extends NetworkClient { String cacheNTLM = props.getProperty("jdk.ntlm.cache"); String cacheSPNEGO = props.getProperty("jdk.spnego.cache"); + String s = props.getProperty("jdk.https.negotiate.cbt"); + spnegoCBT = normalizeCBT(s); + if (keepAlive != null) { keepAliveProp = Boolean.parseBoolean(keepAlive); } else { @@ -206,6 +236,10 @@ public class HttpClient extends NetworkClient { } + public String getSpnegoCBT() { + return spnegoCBT; + } + protected HttpClient() { } diff --git a/src/java.base/share/classes/sun/net/www/protocol/http/HttpCallerInfo.java b/src/java.base/share/classes/sun/net/www/protocol/http/HttpCallerInfo.java index 038f7adfe905880754fe68a93b4f543f1df3cf2a..5afed084c7f35603b048b2a6530afee2228b0f9c 100644 --- a/src/java.base/share/classes/sun/net/www/protocol/http/HttpCallerInfo.java +++ b/src/java.base/share/classes/sun/net/www/protocol/http/HttpCallerInfo.java @@ -29,6 +29,7 @@ import java.net.Authenticator; import java.net.Authenticator.RequestorType; import java.net.InetAddress; import java.net.URL; +import java.security.cert.X509Certificate; /** * Used in HTTP/Negotiate, to feed HTTP request info into JGSS as a HttpCaller, @@ -51,6 +52,9 @@ public final class HttpCallerInfo { public final InetAddress addr; public final RequestorType authType; public final Authenticator authenticator; + // Used to obtain server cert for SPNEGO CBT. + // May be null in which case CBT is not set + public final X509Certificate serverCert; /** * Create a schemed object based on an un-schemed one. @@ -65,13 +69,19 @@ public final class HttpCallerInfo { this.authType = old.authType; this.scheme = scheme; this.authenticator = old.authenticator; + this.serverCert = old.serverCert; } /** * Constructor an un-schemed object for site access. */ public HttpCallerInfo(URL url, Authenticator a) { + this(url, null, a); + } + + public HttpCallerInfo(URL url, X509Certificate serverCert, Authenticator a) { this.url= url; + this.serverCert= serverCert; prompt = ""; host = url.getHost(); @@ -100,9 +110,14 @@ public final class HttpCallerInfo { * Constructor an un-schemed object for proxy access. */ public HttpCallerInfo(URL url, String host, int port, Authenticator a) { + this(url, host, port, null, a); + } + + public HttpCallerInfo(URL url, String host, int port, X509Certificate serverCert, Authenticator a) { this.url= url; this.host = host; this.port = port; + this.serverCert = serverCert; prompt = ""; addr = null; protocol = url.getProtocol(); diff --git a/src/java.base/share/classes/sun/net/www/protocol/http/HttpURLConnection.java b/src/java.base/share/classes/sun/net/www/protocol/http/HttpURLConnection.java index cba385f04fa2a2621ad853b7817576f794d6f191..0ce0d29ee675e18ec1cccfd6249cf5506ea0f91e 100644 --- a/src/java.base/share/classes/sun/net/www/protocol/http/HttpURLConnection.java +++ b/src/java.base/share/classes/sun/net/www/protocol/http/HttpURLConnection.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2022, 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 @@ -288,8 +288,7 @@ public class HttpURLConnection extends java.net.HttpURLConnection { } static final String httpVersion = "HTTP/1.1"; - static final String acceptString = - "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"; + static final String acceptString = "*/*"; // the following http request headers should NOT have their values // returned for security reasons. @@ -1740,7 +1739,7 @@ public class HttpURLConnection extends java.net.HttpURLConnection { AuthenticationHeader authhdr = new AuthenticationHeader ( "Proxy-Authenticate", responses, - new HttpCallerInfo(url, + getHttpCallerInfo(url, http.getProxyHostUsed(), http.getProxyPortUsed(), authenticator), @@ -1815,7 +1814,7 @@ public class HttpURLConnection extends java.net.HttpURLConnection { srvHdr = new AuthenticationHeader ( "WWW-Authenticate", responses, - new HttpCallerInfo(url, authenticator), + getHttpCallerInfo(url, authenticator), dontUseNegotiate ); @@ -2211,7 +2210,7 @@ public class HttpURLConnection extends java.net.HttpURLConnection { AuthenticationHeader authhdr = new AuthenticationHeader( "Proxy-Authenticate", responses, - new HttpCallerInfo(url, + getHttpCallerInfo(url, http.getProxyHostUsed(), http.getProxyPortUsed(), authenticator), @@ -2280,6 +2279,21 @@ public class HttpURLConnection extends java.net.HttpURLConnection { responses.reset(); } + /** + * Overridden in https to also include the server certificate + */ + protected HttpCallerInfo getHttpCallerInfo(URL url, String proxy, int port, + Authenticator authenticator) { + return new HttpCallerInfo(url, proxy, port, authenticator); + } + + /** + * Overridden in https to also include the server certificate + */ + protected HttpCallerInfo getHttpCallerInfo(URL url, Authenticator authenticator) { + return new HttpCallerInfo(url, authenticator); + } + static String connectRequestURI(URL url) { String host = url.getHost(); int port = url.getPort(); diff --git a/src/java.base/share/classes/sun/net/www/protocol/https/AbstractDelegateHttpsURLConnection.java b/src/java.base/share/classes/sun/net/www/protocol/https/AbstractDelegateHttpsURLConnection.java index 3828eb3cd29a38cad87f9c6b7428fa7287e0f3f5..7ed4381dda6e6c231fb2542a7694beacbf8ab120 100644 --- a/src/java.base/share/classes/sun/net/www/protocol/https/AbstractDelegateHttpsURLConnection.java +++ b/src/java.base/share/classes/sun/net/www/protocol/https/AbstractDelegateHttpsURLConnection.java @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2001, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -25,10 +25,13 @@ package sun.net.www.protocol.https; +import java.net.Authenticator; import java.net.URL; import java.net.Proxy; import java.net.SecureCacheResponse; import java.security.Principal; +import java.security.cert.Certificate; +import java.security.cert.X509Certificate; import java.io.IOException; import java.util.List; import java.util.Optional; @@ -36,6 +39,7 @@ import javax.net.ssl.SSLSession; import javax.net.ssl.SSLPeerUnverifiedException; import sun.net.www.http.*; import sun.net.www.protocol.http.HttpURLConnection; +import sun.net.www.protocol.http.HttpCallerInfo; /** * HTTPS URL connection support. @@ -309,4 +313,71 @@ public abstract class AbstractDelegateHttpsURLConnection extends return ((HttpsClient)http).getSSLSession(); } + + /* + * If no SSL Session available or if the system config does not allow it + * don't use the extended caller info (the server cert). + * Otherwise return true to include the server cert + */ + private boolean useExtendedCallerInfo(URL url) { + HttpsClient https = (HttpsClient)http; + if (https.getSSLSession() == null) { + return false; + } + String prop = http.getSpnegoCBT(); + if (prop.equals("never")) { + return false; + } + String target = url.getHost(); + if (prop.startsWith("domain:")) { + String[] domains = prop.substring(7).split(","); + for (String domain : domains) { + if (target.equals(domain)) { + return true; + } + if (domain.startsWith("*.") && target.endsWith(domain.substring(1))) { + return true; + } + } + return false; + } + return true; + } + + @Override + protected HttpCallerInfo getHttpCallerInfo(URL url, String proxy, int port, + Authenticator authenticator) + { + if (!useExtendedCallerInfo(url)) { + return super.getHttpCallerInfo(url, proxy, port, authenticator); + } + HttpsClient https = (HttpsClient)http; + try { + Certificate[] certs = https.getServerCertificates(); + if (certs[0] instanceof X509Certificate x509Cert) { + return new HttpCallerInfo(url, proxy, port, x509Cert, authenticator); + } + } catch (SSLPeerUnverifiedException e) { + // ignore + } + return super.getHttpCallerInfo(url, proxy, port, authenticator); + } + + @Override + protected HttpCallerInfo getHttpCallerInfo(URL url, Authenticator authenticator) + { + if (!useExtendedCallerInfo(url)) { + return super.getHttpCallerInfo(url, authenticator); + } + HttpsClient https = (HttpsClient)http; + try { + Certificate[] certs = https.getServerCertificates(); + if (certs[0] instanceof X509Certificate x509Cert) { + return new HttpCallerInfo(url, x509Cert, authenticator); + } + } catch (SSLPeerUnverifiedException e) { + // ignore + } + return super.getHttpCallerInfo(url, authenticator); + } } diff --git a/src/java.base/share/classes/sun/net/www/protocol/jar/JarURLConnection.java b/src/java.base/share/classes/sun/net/www/protocol/jar/JarURLConnection.java index 4ccf7819914400104a3b0cf9c94c7a6bab73f2eb..234827fb76f2ef2fd45ead6d3520852a2baf31cf 100644 --- a/src/java.base/share/classes/sun/net/www/protocol/jar/JarURLConnection.java +++ b/src/java.base/share/classes/sun/net/www/protocol/jar/JarURLConnection.java @@ -25,21 +25,17 @@ package sun.net.www.protocol.jar; -import java.io.InputStream; -import java.io.IOException; -import java.io.FileNotFoundException; import java.io.BufferedInputStream; -import java.net.URL; -import java.net.URLConnection; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; import java.net.MalformedURLException; -import java.net.UnknownServiceException; -import java.util.Enumeration; -import java.util.Map; +import java.net.URL; +import java.security.Permission; import java.util.List; +import java.util.Map; import java.util.jar.JarEntry; import java.util.jar.JarFile; -import java.util.jar.Manifest; -import java.security.Permission; /** * @author Benjamin Renaud @@ -47,26 +43,10 @@ import java.security.Permission; */ public class JarURLConnection extends java.net.JarURLConnection { - private static final boolean debug = false; - /* the Jar file factory. It handles both retrieval and caching. */ private static final JarFileFactory factory = JarFileFactory.getInstance(); - /* the url for the Jar file */ - private URL jarFileURL; - - /* the permission to get this JAR file. This is the actual, ultimate, - * permission, returned by the jar file factory. - */ - private Permission permission; - - /* the url connection for the JAR file */ - private URLConnection jarFileURLConnection; - - /* the entry name, if any */ - private String entryName; - /* the JarEntry */ private JarEntry jarEntry; @@ -80,12 +60,10 @@ public class JarURLConnection extends java.net.JarURLConnection { throws MalformedURLException, IOException { super(url); - jarFileURL = getJarFileURL(); - jarFileURLConnection = jarFileURL.openConnection(); + jarFileURLConnection = getJarFileURL().openConnection(); // whether, or not, the embedded URL should use the cache will depend // on this instance's cache value jarFileURLConnection.setUseCaches(useCaches); - entryName = getEntryName(); } public JarFile getJarFile() throws IOException { @@ -120,7 +98,7 @@ public class JarURLConnection extends java.net.JarURLConnection { public void connect() throws IOException { if (!connected) { boolean useCaches = getUseCaches(); - String entryName = this.entryName; + String entryName = getEntryName(); /* the factory call will do the security checks */ URL url = getJarFileURL(); @@ -176,6 +154,7 @@ public class JarURLConnection extends java.net.JarURLConnection { InputStream result = null; + String entryName = getEntryName(); if (entryName == null) { throw new IOException("no entry name specified"); } else { @@ -216,7 +195,7 @@ public class JarURLConnection extends java.net.JarURLConnection { Object result = null; connect(); - if (entryName == null) { + if (getEntryName() == null) { result = jarFile; } else { result = super.getContent(); @@ -226,6 +205,7 @@ public class JarURLConnection extends java.net.JarURLConnection { public String getContentType() { if (contentType == null) { + String entryName = getEntryName(); if (entryName == null) { contentType = "x-java/jar"; } else { diff --git a/src/java.base/share/classes/sun/net/www/protocol/mailto/Handler.java b/src/java.base/share/classes/sun/net/www/protocol/mailto/Handler.java index e9052397483abdeb6c17274ffb88100947b387ea..cb8e490995e5f467d6f75ac87f4a590e3c9e8b25 100644 --- a/src/java.base/share/classes/sun/net/www/protocol/mailto/Handler.java +++ b/src/java.base/share/classes/sun/net/www/protocol/mailto/Handler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2021, 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 @@ -32,10 +32,6 @@ package sun.net.www.protocol.mailto; import java.net.URL; import java.net.URLConnection; import java.net.URLStreamHandler; -import java.io.*; -import sun.net.www.*; -//import sun.net.www.protocol.news.ArticlePoster; -import sun.net.smtp.SmtpClient; /** open an nntp input stream given a URL */ public class Handler extends URLStreamHandler { @@ -99,7 +95,7 @@ public class Handler extends URLStreamHandler { // } */ - public synchronized URLConnection openConnection(URL u) { + public URLConnection openConnection(URL u) { return new MailToURLConnection(u); } @@ -126,33 +122,16 @@ public class Handler extends URLStreamHandler { /* * Let's just make sure we DO have an Email address in the URL. */ - boolean nogood = false; - if (file == null || file.isEmpty()) - nogood = true; - else { - boolean allwhites = true; - for (int i = 0; i < file.length(); i++) - if (!Character.isWhitespace(file.charAt(i))) - allwhites = false; - if (allwhites) - nogood = true; - } - if (nogood) + if (file.isBlank()) throw new RuntimeException("No email address"); - setURLHandler(u, protocol, host, port, file, null); + setURLHandler(u, protocol, host, port, file); } /** * This method is used to suppress the deprecated warning - * - * @param u the URL to receive the result of parsing the spec - * @param spec the URL string to parse - * @param start the character position to start parsing at. This is - * just past the ':'. - * @param limit the character position to stop parsing at. */ @SuppressWarnings("deprecation") - private void setURLHandler(URL u, String protocol, String host, int port, String file, String ref) { - setURL(u,protocol,host,port,file,null); + private void setURLHandler(URL u, String protocol, String host, int port, String file) { + setURL(u, protocol, host, port, file, null); } } diff --git a/src/java.base/share/classes/sun/nio/ch/ChannelInputStream.java b/src/java.base/share/classes/sun/nio/ch/ChannelInputStream.java index 4ddd30485af4a992dc5d9f2b91df638110b088f9..6397eda0c936722dcf34b3f442239c1fb2263e2c 100644 --- a/src/java.base/share/classes/sun/nio/ch/ChannelInputStream.java +++ b/src/java.base/share/classes/sun/nio/ch/ChannelInputStream.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2022, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -40,58 +40,52 @@ import java.util.Objects; import jdk.internal.util.ArraysSupport; /** - * This class is defined here rather than in java.nio.channels.Channels - * so that code can be shared with SocketAdaptor. + * An InputStream that reads bytes from a channel. * * @author Mike McCloskey * @author Mark Reinhold - * @since 1.4 */ - -public class ChannelInputStream - extends InputStream -{ +class ChannelInputStream extends InputStream { private static final int DEFAULT_BUFFER_SIZE = 8192; - public static int read(ReadableByteChannel ch, ByteBuffer bb, - boolean block) - throws IOException - { + private final ReadableByteChannel ch; + private ByteBuffer bb; + private byte[] bs; // Invoker's previous array + private byte[] b1; + + /** + * Initialize a ChannelInputStream that reads from the given channel. + */ + ChannelInputStream(ReadableByteChannel ch) { + this.ch = ch; + } + + /** + * Reads a sequence of bytes from the channel into the given buffer. + */ + private int read(ByteBuffer bb) throws IOException { if (ch instanceof SelectableChannel sc) { synchronized (sc.blockingLock()) { - boolean bm = sc.isBlocking(); - if (!bm) + if (!sc.isBlocking()) throw new IllegalBlockingModeException(); - if (bm != block) - sc.configureBlocking(block); - int n = ch.read(bb); - if (bm != block) - sc.configureBlocking(bm); - return n; + return ch.read(bb); } } else { return ch.read(bb); } } - protected final ReadableByteChannel ch; - private ByteBuffer bb = null; - private byte[] bs = null; // Invoker's previous array - private byte[] b1 = null; - - public ChannelInputStream(ReadableByteChannel ch) { - this.ch = ch; - } - + @Override public synchronized int read() throws IOException { if (b1 == null) b1 = new byte[1]; - int n = this.read(b1); + int n = read(b1); if (n == 1) return b1[0] & 0xff; return -1; } + @Override public synchronized int read(byte[] bs, int off, int len) throws IOException { @@ -109,12 +103,6 @@ public class ChannelInputStream return read(bb); } - protected int read(ByteBuffer bb) - throws IOException - { - return ChannelInputStream.read(ch, bb, true); - } - @Override public byte[] readAllBytes() throws IOException { if (!(ch instanceof SeekableByteChannel sbc)) @@ -201,6 +189,7 @@ public class ChannelInputStream return (capacity == nread) ? buf : Arrays.copyOf(buf, nread); } + @Override public int available() throws IOException { // special case where the channel is to a file if (ch instanceof SeekableByteChannel sbc) { @@ -210,6 +199,7 @@ public class ChannelInputStream return 0; } + @Override public synchronized long skip(long n) throws IOException { // special case where the channel is to a file if (ch instanceof SeekableByteChannel sbc) { @@ -230,46 +220,62 @@ public class ChannelInputStream return super.skip(n); } - public void close() throws IOException { - ch.close(); - } - @Override public long transferTo(OutputStream out) throws IOException { Objects.requireNonNull(out, "out"); - if (out instanceof ChannelOutputStream cos - && ch instanceof FileChannel fc) { - WritableByteChannel wbc = cos.channel(); - - if (wbc instanceof FileChannel dst) { - return transfer(fc, dst); - } - - if (wbc instanceof SelectableChannel sc) { + if (ch instanceof FileChannel fc) { + // FileChannel -> SocketChannel + if (out instanceof SocketOutputStream sos) { + SocketChannelImpl sc = sos.channel(); synchronized (sc.blockingLock()) { if (!sc.isBlocking()) throw new IllegalBlockingModeException(); - return transfer(fc, wbc); + return transfer(fc, sc); } } - return transfer(fc, wbc); + // FileChannel -> WritableByteChannel + if (out instanceof ChannelOutputStream cos) { + WritableByteChannel wbc = cos.channel(); + + if (wbc instanceof SelectableChannel sc) { + synchronized (sc.blockingLock()) { + if (!sc.isBlocking()) + throw new IllegalBlockingModeException(); + return transfer(fc, wbc); + } + } + + return transfer(fc, wbc); + } } return super.transferTo(out); } - private static long transfer(FileChannel src, WritableByteChannel dst) throws IOException { - long initialPos = src.position(); + /** + * Transfers all bytes from a channel's file to a target writeable byte channel. + * If the writeable byte channel is a selectable channel then it must be in + * blocking mode. + */ + private static long transfer(FileChannel fc, WritableByteChannel target) + throws IOException + { + long initialPos = fc.position(); long pos = initialPos; try { - while (pos < src.size()) { - pos += src.transferTo(pos, Long.MAX_VALUE, dst); + while (pos < fc.size()) { + pos += fc.transferTo(pos, Long.MAX_VALUE, target); } } finally { - src.position(pos); + fc.position(pos); } return pos - initialPos; } + + @Override + public void close() throws IOException { + ch.close(); + } } diff --git a/src/java.base/share/classes/sun/nio/ch/ChannelOutputStream.java b/src/java.base/share/classes/sun/nio/ch/ChannelOutputStream.java index a1e838efab460c191949770c35662fe347db4fbb..dff8af9ebafc14c4e1629d12a15e93b655b3e454 100644 --- a/src/java.base/share/classes/sun/nio/ch/ChannelOutputStream.java +++ b/src/java.base/share/classes/sun/nio/ch/ChannelOutputStream.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2021, 2022, 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,68 +25,30 @@ package sun.nio.ch; -import java.io.*; -import java.nio.*; -import java.nio.channels.*; -import java.nio.channels.spi.*; +import java.io.IOException; +import java.io.OutputStream; +import java.nio.ByteBuffer; +import java.nio.channels.IllegalBlockingModeException; +import java.nio.channels.SelectableChannel; +import java.nio.channels.WritableByteChannel; import java.util.Objects; /** - * This class is defined here rather than in java.nio.channels.Channels - * so that it will be accessible from java.nio.channels.Channels and - * sun.nio.ch.ChannelInputStream. - * + * An OutputStream that writes bytes to a channel. * * @author Mark Reinhold * @author Mike McCloskey - * @author JSR-51 Expert Group - * @since 18 */ -public class ChannelOutputStream extends OutputStream { - +class ChannelOutputStream extends OutputStream { private final WritableByteChannel ch; private ByteBuffer bb; private byte[] bs; // Invoker's previous array private byte[] b1; /** - * Write all remaining bytes in buffer to the given channel. - * If the channel is selectable then it must be configured blocking. - */ - private static void writeFullyImpl(WritableByteChannel ch, ByteBuffer bb) - throws IOException - { - while (bb.remaining() > 0) { - int n = ch.write(bb); - if (n <= 0) - throw new RuntimeException("no bytes written"); - } - } - - /** - * Write all remaining bytes in buffer to the given channel. - * - * @throws IllegalBlockingModeException - * If the channel is selectable and configured non-blocking. - */ - private static void writeFully(WritableByteChannel ch, ByteBuffer bb) - throws IOException - { - if (ch instanceof SelectableChannel sc) { - synchronized (sc.blockingLock()) { - if (!sc.isBlocking()) - throw new IllegalBlockingModeException(); - writeFullyImpl(ch, bb); - } - } else { - writeFullyImpl(ch, bb); - } - } - - /** - * @param ch The channel wrapped by this stream. + * Initialize a ChannelOutputStream that writes to the given channel. */ - public ChannelOutputStream(WritableByteChannel ch) { + ChannelOutputStream(WritableByteChannel ch) { this.ch = ch; } @@ -97,17 +59,30 @@ public class ChannelOutputStream extends OutputStream { return ch; } + /** + * Write all remaining bytes in buffer to the channel. + * If the channel is selectable then it must be configured blocking. + */ + private void writeFully(ByteBuffer bb) throws IOException { + while (bb.remaining() > 0) { + int n = ch.write(bb); + if (n <= 0) + throw new RuntimeException("no bytes written"); + } + } + @Override public synchronized void write(int b) throws IOException { if (b1 == null) b1 = new byte[1]; b1[0] = (byte) b; - this.write(b1); + write(b1); } @Override public synchronized void write(byte[] bs, int off, int len) - throws IOException { + throws IOException + { Objects.checkFromIndexSize(off, len, bs.length); if (len == 0) { return; @@ -119,12 +94,20 @@ public class ChannelOutputStream extends OutputStream { bb.position(off); this.bb = bb; this.bs = bs; - writeFully(ch, bb); + + if (ch instanceof SelectableChannel sc) { + synchronized (sc.blockingLock()) { + if (!sc.isBlocking()) + throw new IllegalBlockingModeException(); + writeFully(bb); + } + } else { + writeFully(bb); + } } @Override public void close() throws IOException { ch.close(); } - } diff --git a/src/java.base/share/classes/sun/nio/ch/SocketAdaptor.java b/src/java.base/share/classes/sun/nio/ch/SocketAdaptor.java index bcab4b67a75754414a3c9c89ecbd6966cda40d79..745d8d7f1f8a0674cbd5f8eca4fefa37d5838461 100644 --- a/src/java.base/share/classes/sun/nio/ch/SocketAdaptor.java +++ b/src/java.base/share/classes/sun/nio/ch/SocketAdaptor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2022, 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 @@ -177,32 +177,7 @@ class SocketAdaptor throw new SocketException("Socket is not connected"); if (!sc.isInputOpen()) throw new SocketException("Socket input is shutdown"); - return new InputStream() { - @Override - public int read() throws IOException { - byte[] a = new byte[1]; - int n = read(a, 0, 1); - return (n > 0) ? (a[0] & 0xff) : -1; - } - @Override - public int read(byte[] b, int off, int len) throws IOException { - int timeout = SocketAdaptor.this.timeout; - if (timeout > 0) { - long nanos = MILLISECONDS.toNanos(timeout); - return sc.blockingRead(b, off, len, nanos); - } else { - return sc.blockingRead(b, off, len, 0); - } - } - @Override - public int available() throws IOException { - return sc.available(); - } - @Override - public void close() throws IOException { - sc.close(); - } - }; + return new SocketInputStream(sc, () -> timeout); } @Override @@ -213,21 +188,7 @@ class SocketAdaptor throw new SocketException("Socket is not connected"); if (!sc.isOutputOpen()) throw new SocketException("Socket output is shutdown"); - return new OutputStream() { - @Override - public void write(int b) throws IOException { - byte[] a = new byte[]{(byte) b}; - write(a, 0, 1); - } - @Override - public void write(byte[] b, int off, int len) throws IOException { - sc.blockingWriteFully(b, off, len); - } - @Override - public void close() throws IOException { - sc.close(); - } - }; + return new SocketOutputStream(sc); } private void setBooleanOption(SocketOption name, boolean value) diff --git a/src/java.base/share/classes/sun/nio/ch/SocketInputStream.java b/src/java.base/share/classes/sun/nio/ch/SocketInputStream.java new file mode 100644 index 0000000000000000000000000000000000000000..6c69eaf5214c74822eab09419d9acf409b0484b9 --- /dev/null +++ b/src/java.base/share/classes/sun/nio/ch/SocketInputStream.java @@ -0,0 +1,83 @@ +/* + * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package sun.nio.ch; + +import java.io.IOException; +import java.io.InputStream; +import java.util.function.IntSupplier; +import static java.util.concurrent.TimeUnit.MILLISECONDS; + +/** + * An InputStream that reads bytes from a socket channel. + */ +class SocketInputStream extends InputStream { + private final SocketChannelImpl sc; + private final IntSupplier timeoutSupplier; + + /** + * Initialize a SocketInputStream that reads from the given socket channel. + * @param sc the socket channel + * @param timeoutSupplier supplies the read timeout, in milliseconds + */ + SocketInputStream(SocketChannelImpl sc, IntSupplier timeoutSupplier) { + this.sc = sc; + this.timeoutSupplier = timeoutSupplier; + } + + /** + * Initialize a SocketInputStream that reads from the given socket channel. + */ + SocketInputStream(SocketChannelImpl sc) { + this(sc, () -> 0); + } + + @Override + public int read() throws IOException { + byte[] a = new byte[1]; + int n = read(a, 0, 1); + return (n > 0) ? (a[0] & 0xff) : -1; + } + + @Override + public int read(byte[] b, int off, int len) throws IOException { + int timeout = timeoutSupplier.getAsInt(); + if (timeout > 0) { + long nanos = MILLISECONDS.toNanos(timeout); + return sc.blockingRead(b, off, len, nanos); + } else { + return sc.blockingRead(b, off, len, 0); + } + } + + @Override + public int available() throws IOException { + return sc.available(); + } + + @Override + public void close() throws IOException { + sc.close(); + } +} diff --git a/src/java.base/share/classes/sun/nio/ch/SocketOutputStream.java b/src/java.base/share/classes/sun/nio/ch/SocketOutputStream.java new file mode 100644 index 0000000000000000000000000000000000000000..78d0dce46fa1e4fc726c544701b5049ae38217b3 --- /dev/null +++ b/src/java.base/share/classes/sun/nio/ch/SocketOutputStream.java @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package sun.nio.ch; + +import java.io.IOException; +import java.io.OutputStream; + +/** + * An OutputStream that writes bytes to a socket channel. + */ +class SocketOutputStream extends OutputStream { + private final SocketChannelImpl sc; + + /** + * Initialize a SocketOutputStream that writes to the given socket channel. + */ + SocketOutputStream(SocketChannelImpl sc) { + this.sc = sc; + } + + /** + * Returns the socket channel. + */ + SocketChannelImpl channel() { + return sc; + } + + @Override + public void write(int b) throws IOException { + byte[] a = new byte[]{(byte) b}; + write(a, 0, 1); + } + + @Override + public void write(byte[] b, int off, int len) throws IOException { + sc.blockingWriteFully(b, off, len); + } + + @Override + public void close() throws IOException { + sc.close(); + } +} diff --git a/src/java.base/share/classes/sun/nio/ch/Streams.java b/src/java.base/share/classes/sun/nio/ch/Streams.java new file mode 100644 index 0000000000000000000000000000000000000000..4326c9e2e0b911711fb2190798c7fd4cd6f77326 --- /dev/null +++ b/src/java.base/share/classes/sun/nio/ch/Streams.java @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package sun.nio.ch; + +import java.io.InputStream; +import java.io.OutputStream; +import java.nio.channels.ReadableByteChannel; +import java.nio.channels.WritableByteChannel; + +/** + * Factory methods for input/output streams based on channels. + */ +public class Streams { + private Streams() { } + + /** + * Return an input stream that reads bytes from the given channel. + */ + public static InputStream of(ReadableByteChannel ch) { + if (ch instanceof SocketChannelImpl sc) { + return new SocketInputStream(sc); + } else { + return new ChannelInputStream(ch); + } + } + + /** + * Return an output stream that writes bytes to the given channel. + */ + public static OutputStream of(WritableByteChannel ch) { + if (ch instanceof SocketChannelImpl sc) { + return new SocketOutputStream(sc); + } else { + return new ChannelOutputStream(ch); + } + } +} diff --git a/src/java.base/share/classes/sun/reflect/annotation/TypeAnnotationParser.java b/src/java.base/share/classes/sun/reflect/annotation/TypeAnnotationParser.java index 5c7356fca81a11113e2bbcbd64d3280ed43bdbae..fc51faad6fce86c3b1cbf8c46a1ba4eb0b27bc11 100644 --- a/src/java.base/share/classes/sun/reflect/annotation/TypeAnnotationParser.java +++ b/src/java.base/share/classes/sun/reflect/annotation/TypeAnnotationParser.java @@ -132,7 +132,8 @@ public final class TypeAnnotationParser { Class declaringClass = ctor.getDeclaringClass(); if (!declaringClass.isEnum() && (declaringClass.isMemberClass() && - (declaringClass.getModifiers() & Modifier.STATIC) == 0) ) { + (declaringClass.getModifiers() & Modifier.STATIC) == 0) && + filter == TypeAnnotation.TypeAnnotationTarget.METHOD_FORMAL_PARAMETER) { offset = true; } } diff --git a/src/java.base/share/classes/sun/security/pkcs/ContentInfo.java b/src/java.base/share/classes/sun/security/pkcs/ContentInfo.java index 125da2c9e2c58901af3f0a0998e6e9c44c7ff711..fbc6a46fc00ac9e71a6428819d023ea2f11a1131 100644 --- a/src/java.base/share/classes/sun/security/pkcs/ContentInfo.java +++ b/src/java.base/share/classes/sun/security/pkcs/ContentInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2021, 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 @@ -127,7 +127,9 @@ public class ContentInfo { if (oldStyle) { // JDK1.1.x-style encoding - content = typeAndContent[1]; + if (typeAndContent.length > 1) { // content is OPTIONAL + content = typeAndContent[1]; + } } else { // This is the correct, standards-compliant encoding. // Parse the content (OPTIONAL field). diff --git a/src/java.base/share/classes/sun/security/pkcs/SignerInfo.java b/src/java.base/share/classes/sun/security/pkcs/SignerInfo.java index 868babb2b44231f72a4522ca32b89d5379e025b4..af466e6615683fa2dc6d5d99b906d6a878bc20ef 100644 --- a/src/java.base/share/classes/sun/security/pkcs/SignerInfo.java +++ b/src/java.base/share/classes/sun/security/pkcs/SignerInfo.java @@ -383,8 +383,15 @@ public class SignerInfo implements DerEncoder { if (digestAlgName.equals("SHAKE256") || digestAlgName.equals("SHAKE256-LEN")) { if (digestAlgName.equals("SHAKE256-LEN")) { - int v = new DerValue(digestAlgorithmId - .getEncodedParams()).getInteger(); + // RFC8419: for EdDSA in CMS, the id-shake256-len + // algorithm id must contain parameter value 512 + // encoded as a positive integer value + byte[] params = digestAlgorithmId.getEncodedParams(); + if (params == null) { + throw new SignatureException( + "id-shake256-len oid missing length"); + } + int v = new DerValue(params).getInteger(); if (v != 512) { throw new SignatureException( "Unsupported id-shake256-" + v); @@ -527,6 +534,7 @@ public class SignerInfo implements DerEncoder { if (spec == null) { throw new NoSuchAlgorithmException("Missing PSSParameterSpec for RSASSA-PSS algorithm"); } + if (!AlgorithmId.get(spec.getDigestAlgorithm()).equals(digAlgId)) { throw new NoSuchAlgorithmException("Incompatible digest algorithm"); } diff --git a/src/java.base/share/classes/sun/security/pkcs10/PKCS10.java b/src/java.base/share/classes/sun/security/pkcs10/PKCS10.java index 2a28f809888fedde59886c2cacd284235f70af23..05bb19fe1c10032330c0700667c725d1ee1b75af 100644 --- a/src/java.base/share/classes/sun/security/pkcs10/PKCS10.java +++ b/src/java.base/share/classes/sun/security/pkcs10/PKCS10.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2021, 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 @@ -141,7 +141,6 @@ public class PKCS10 { // Inner sequence: version, name, key, attributes // BigInteger serial; - DerValue val; serial = seq[0].data.getBigInteger(); if (!serial.equals(BigInteger.ZERO)) diff --git a/src/java.base/share/classes/sun/security/provider/DSAParameters.java b/src/java.base/share/classes/sun/security/provider/DSAParameters.java index 9a71ae1df860b787f7ed16c4008e1711f020efa2..9b8486894623a857544959283b064fa86764e180 100644 --- a/src/java.base/share/classes/sun/security/provider/DSAParameters.java +++ b/src/java.base/share/classes/sun/security/provider/DSAParameters.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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 @@ -101,7 +101,7 @@ public class DSAParameters extends AlgorithmParametersSpi { try { Class dsaParamSpec = Class.forName ("java.security.spec.DSAParameterSpec"); - if (dsaParamSpec.isAssignableFrom(paramSpec)) { + if (paramSpec.isAssignableFrom(dsaParamSpec)) { return paramSpec.cast( new DSAParameterSpec(this.p, this.q, this.g)); } else { diff --git a/src/java.base/share/classes/sun/security/provider/PolicyParser.java b/src/java.base/share/classes/sun/security/provider/PolicyParser.java index cc6a304cb77e6148d2d5c11d61f1a376d0dc10d9..347bc8f9b564323053a61125e899e918659dfe53 100644 --- a/src/java.base/share/classes/sun/security/provider/PolicyParser.java +++ b/src/java.base/share/classes/sun/security/provider/PolicyParser.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2021, 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 @@ -733,8 +733,7 @@ public class PolicyParser { switch (lookahead) { case StreamTokenizer.TT_NUMBER: throw new ParsingException(st.lineno(), expect, - LocalizedMessage.getNonlocalized("number.") + - String.valueOf(st.nval)); + LocalizedMessage.getNonlocalized("number.") + st.nval); case StreamTokenizer.TT_EOF: LocalizedMessage localizedMsg = new LocalizedMessage ("expected.expect.read.end.of.file."); @@ -826,8 +825,7 @@ public class PolicyParser { switch (lookahead) { case StreamTokenizer.TT_NUMBER: throw new ParsingException(st.lineno(), ";", - LocalizedMessage.getNonlocalized("number.") + - String.valueOf(st.nval)); + LocalizedMessage.getNonlocalized("number.") + st.nval); case StreamTokenizer.TT_EOF: throw new ParsingException(LocalizedMessage.getNonlocalized ("expected.read.end.of.file.")); diff --git a/src/java.base/share/classes/sun/security/provider/certpath/Builder.java b/src/java.base/share/classes/sun/security/provider/certpath/Builder.java index 186d1269de315888ab83563c7b20f2987e39a983..b5cf0c5e44287e00fb94405344c61d782f24c05e 100644 --- a/src/java.base/share/classes/sun/security/provider/certpath/Builder.java +++ b/src/java.base/share/classes/sun/security/provider/certpath/Builder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,6 @@ package sun.security.provider.certpath; import java.io.IOException; -import java.security.AccessController; import java.security.GeneralSecurityException; import java.security.cert.*; import java.util.*; @@ -337,7 +336,7 @@ public abstract class Builder { if (debug != null) { debug.println("Builder.targetDistance() merged constraints: " - + String.valueOf(constraints)); + + constraints); } /* reduce permitted by excluded */ GeneralSubtrees permitted = diff --git a/src/java.base/share/classes/sun/security/provider/certpath/ConstraintsChecker.java b/src/java.base/share/classes/sun/security/provider/certpath/ConstraintsChecker.java index 28fb322ddc4d8385089a65730427cf84cc928ddd..00d67de5a079d5e18f7cfe2b7165678bdf2101fb 100644 --- a/src/java.base/share/classes/sun/security/provider/certpath/ConstraintsChecker.java +++ b/src/java.base/share/classes/sun/security/provider/certpath/ConstraintsChecker.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2021, 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 @@ -185,14 +185,14 @@ class ConstraintsChecker extends PKIXCertPathChecker { if (debug != null) { debug.println("prevNC = " + prevNC + - ", newNC = " + String.valueOf(newConstraints)); + ", newNC = " + newConstraints); } // if there are no previous name constraints, we just return the // new name constraints. if (prevNC == null) { if (debug != null) { - debug.println("mergedNC = " + String.valueOf(newConstraints)); + debug.println("mergedNC = " + newConstraints); } if (newConstraints == null) { return newConstraints; diff --git a/src/java.base/share/classes/sun/security/provider/certpath/ForwardBuilder.java b/src/java.base/share/classes/sun/security/provider/certpath/ForwardBuilder.java index 6122fdaa97077ae8f1266f882cd81ebd99dc495e..19dd5dd8d751fe8fc6fd123ae65c99f6517d2a27 100644 --- a/src/java.base/share/classes/sun/security/provider/certpath/ForwardBuilder.java +++ b/src/java.base/share/classes/sun/security/provider/certpath/ForwardBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2021, 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 @@ -34,7 +34,6 @@ import java.security.cert.CertPathValidatorException; import java.security.cert.PKIXReason; import java.security.cert.CertStore; import java.security.cert.CertStoreException; -import java.security.cert.PKIXBuilderParameters; import java.security.cert.PKIXCertPathChecker; import java.security.cert.TrustAnchor; import java.security.cert.X509Certificate; @@ -598,8 +597,8 @@ class ForwardBuilder extends Builder { X500Name tAo1 = tSubjectName.commonAncestor(cIssuer1Name); X500Name tAo2 = tSubjectName.commonAncestor(cIssuer2Name); if (debug != null) { - debug.println(METHOD_NME +" tAo1: " + String.valueOf(tAo1)); - debug.println(METHOD_NME +" tAo2: " + String.valueOf(tAo2)); + debug.println(METHOD_NME +" tAo1: " + tAo1); + debug.println(METHOD_NME +" tAo2: " + tAo2); } if (tAo1 != null || tAo2 != null) { if (tAo1 != null && tAo2 != null) { diff --git a/src/java.base/share/classes/sun/security/provider/certpath/ForwardState.java b/src/java.base/share/classes/sun/security/provider/certpath/ForwardState.java index 2dc9e208e924f212b4b9d6a26fbac752e599967d..5cbd0d7f404d83cca7d61faca68357cc1a56b64a 100644 --- a/src/java.base/share/classes/sun/security/provider/certpath/ForwardState.java +++ b/src/java.base/share/classes/sun/security/provider/certpath/ForwardState.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -117,9 +117,8 @@ class ForwardState implements State { sb.append("State ["); sb.append("\n issuerDN of last cert: ").append(issuerDN); sb.append("\n traversedCACerts: ").append(traversedCACerts); - sb.append("\n init: ").append(String.valueOf(init)); - sb.append("\n keyParamsNeeded: ").append - (String.valueOf(keyParamsNeededFlag)); + sb.append("\n init: ").append(init); + sb.append("\n keyParamsNeeded: ").append(keyParamsNeededFlag); sb.append("\n subjectNamesTraversed: \n").append (subjectNamesTraversed); sb.append("]\n"); diff --git a/src/java.base/share/classes/sun/security/rsa/PSSParameters.java b/src/java.base/share/classes/sun/security/rsa/PSSParameters.java index fef496ed50c88360e3ef9e319c95577178ccee66..5a1584b0a9ea1244820d800597329c995cf5663c 100644 --- a/src/java.base/share/classes/sun/security/rsa/PSSParameters.java +++ b/src/java.base/share/classes/sun/security/rsa/PSSParameters.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2022, 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 @@ -102,8 +102,13 @@ public final class PSSParameters extends AlgorithmParametersSpi { if (!val.getOID().equals(AlgorithmId.MGF1_oid)) { throw new IOException("Only MGF1 mgf is supported"); } + + byte[] encodedParams = val.getEncodedParams(); + if (encodedParams == null) { + throw new IOException("Missing MGF1 parameters"); + } AlgorithmId params = AlgorithmId.parse( - new DerValue(val.getEncodedParams())); + new DerValue(encodedParams)); String mgfDigestName = params.getName(); switch (mgfDigestName) { case "SHA-1": @@ -180,7 +185,7 @@ public final class PSSParameters extends AlgorithmParametersSpi { protected T engineGetParameterSpec(Class paramSpec) throws InvalidParameterSpecException { - if (PSSParameterSpec.class.isAssignableFrom(paramSpec)) { + if (paramSpec.isAssignableFrom(PSSParameterSpec.class)) { return paramSpec.cast(spec); } else { throw new InvalidParameterSpecException diff --git a/src/java.base/share/classes/sun/security/rsa/RSAPSSSignature.java b/src/java.base/share/classes/sun/security/rsa/RSAPSSSignature.java index d523e0b8be125f11669734e9ed852d0069d3be9a..15c143127fb24bb8c150596ea7e714b467170c3f 100644 --- a/src/java.base/share/classes/sun/security/rsa/RSAPSSSignature.java +++ b/src/java.base/share/classes/sun/security/rsa/RSAPSSSignature.java @@ -255,7 +255,6 @@ public class RSAPSSSignature extends SignatureSpi { * internal signature parameters. */ private void isValid(RSAKey rsaKey) throws InvalidKeyException { - AlgorithmParameterSpec keyParams = rsaKey.getParams(); // validate key parameters if (!isCompatible(rsaKey.getParams(), this.sigParams)) { throw new InvalidKeyException diff --git a/src/java.base/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java b/src/java.base/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java index fbc9fda05faf23ca9594ec51310309ba00bb6a32..8ca5135fe85be196d9b85cb18af3946911b6e1ac 100644 --- a/src/java.base/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java +++ b/src/java.base/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java @@ -141,7 +141,7 @@ public final class RSAPrivateCrtKeyImpl BigInteger n, BigInteger e, BigInteger d, BigInteger p, BigInteger q, BigInteger pe, BigInteger qe, BigInteger coeff) throws InvalidKeyException { - RSAPrivateKey key; + if ((e.signum() == 0) || (p.signum() == 0) || (q.signum() == 0) || (pe.signum() == 0) || (qe.signum() == 0) || (coeff.signum() == 0)) { diff --git a/src/java.base/share/classes/sun/security/ssl/DHServerKeyExchange.java b/src/java.base/share/classes/sun/security/ssl/DHServerKeyExchange.java index af64383457a8b8d8b15e48d81cefeca5498ccdc9..38e97073eb1fb8abd0bc1dcfc308e926ab20b652 100644 --- a/src/java.base/share/classes/sun/security/ssl/DHServerKeyExchange.java +++ b/src/java.base/share/classes/sun/security/ssl/DHServerKeyExchange.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2021, 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 @@ -444,7 +444,6 @@ final class DHServerKeyExchange { */ private void updateSignature(Signature sig, byte[] clntNonce, byte[] svrNonce) throws SignatureException { - int tmp; sig.update(clntNonce); sig.update(svrNonce); diff --git a/src/java.base/share/classes/sun/security/ssl/SSLEngineInputRecord.java b/src/java.base/share/classes/sun/security/ssl/SSLEngineInputRecord.java index 31abe94e9a1122a9ae71a53e6da9aa7960e28d85..938768aaf76bb26fd53b9342e9c5f5497b87bcb4 100644 --- a/src/java.base/share/classes/sun/security/ssl/SSLEngineInputRecord.java +++ b/src/java.base/share/classes/sun/security/ssl/SSLEngineInputRecord.java @@ -358,7 +358,6 @@ final class SSLEngineInputRecord extends InputRecord implements SSLRecord { // The packet should be a complete record. // int srcPos = packet.position(); - int srcLim = packet.limit(); byte firstByte = packet.get(srcPos); byte thirdByte = packet.get(srcPos + 2); diff --git a/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java b/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java index 94ff8801fab184d207cc50890a28171281ae1c0f..3cf357254aa7a5a30b4f009eaeb2f664d9ae02bc 100644 --- a/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java +++ b/src/java.base/share/classes/sun/security/ssl/SupportedGroupsExtension.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2022, 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 @@ -112,7 +112,7 @@ final class SupportedGroupsExtension { @Override public String toString() { MessageFormat messageFormat = new MessageFormat( - "\"versions\": '['{0}']'", Locale.ENGLISH); + "\"named groups\": '['{0}']'", Locale.ENGLISH); if (namedGroupsIds == null || namedGroupsIds.length == 0) { Object[] messageFields = { diff --git a/src/java.base/share/classes/sun/security/timestamp/HttpTimestamper.java b/src/java.base/share/classes/sun/security/timestamp/HttpTimestamper.java index cba296c6b97e64e8bfc8b2e9cbcdd818615c0909..03070fab053b7c0b3f574992dfbb5b8fbb52f9b0 100644 --- a/src/java.base/share/classes/sun/security/timestamp/HttpTimestamper.java +++ b/src/java.base/share/classes/sun/security/timestamp/HttpTimestamper.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2021, 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 @@ -30,7 +30,6 @@ import java.io.DataOutputStream; import java.io.EOFException; import java.io.IOException; import java.net.URI; -import java.net.URL; import java.net.HttpURLConnection; import java.util.*; @@ -112,9 +111,7 @@ public class HttpTimestamper implements Timestamper { connection.connect(); // No HTTP authentication is performed // Send the request - DataOutputStream output = null; - try { - output = new DataOutputStream(connection.getOutputStream()); + try (var output = new DataOutputStream(connection.getOutputStream())) { byte[] request = tsQuery.encode(); output.write(request, 0, request.length); output.flush(); @@ -122,17 +119,11 @@ public class HttpTimestamper implements Timestamper { debug.println("sent timestamp query (length=" + request.length + ")"); } - } finally { - if (output != null) { - output.close(); - } } // Receive the reply - BufferedInputStream input = null; byte[] replyBuffer = null; - try { - input = new BufferedInputStream(connection.getInputStream()); + try (var input = new BufferedInputStream(connection.getInputStream())) { if (debug != null) { String header = connection.getHeaderField(0); debug.println(header); @@ -157,10 +148,6 @@ public class HttpTimestamper implements Timestamper { debug.println("received timestamp response (length=" + replyBuffer.length + ")"); } - } finally { - if (input != null) { - input.close(); - } } return new TSResponse(replyBuffer); } diff --git a/src/java.base/share/classes/sun/security/tools/KeyStoreUtil.java b/src/java.base/share/classes/sun/security/tools/KeyStoreUtil.java index 6c7cc402bf71da645597a3e1e3165f4a6b1eb34f..6095bb914721b435fcdc9cde46299c0fc7e5fd65 100644 --- a/src/java.base/share/classes/sun/security/tools/KeyStoreUtil.java +++ b/src/java.base/share/classes/sun/security/tools/KeyStoreUtil.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2021, 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 @@ -225,7 +225,9 @@ public class KeyStoreUtil { List result = new ArrayList<>(); Properties p = new Properties(); - p.load(new FileInputStream(file)); + try (FileInputStream is = new FileInputStream(file)) { + p.load(is); + } String s = p.getProperty(tool + ".all"); if (s != null) { diff --git a/src/java.base/share/classes/sun/security/tools/keytool/Main.java b/src/java.base/share/classes/sun/security/tools/keytool/Main.java index 74f0bd5c25507ee13fb1a0bb5d63221ddb6adeaa..de13f75aea918cbbc97a04a5371af04a8c3de710 100644 --- a/src/java.base/share/classes/sun/security/tools/keytool/Main.java +++ b/src/java.base/share/classes/sun/security/tools/keytool/Main.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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 @@ -31,10 +31,14 @@ import java.nio.file.Path; import java.security.*; import java.security.cert.Certificate; import java.security.cert.CertificateFactory; +import java.security.cert.CertPathValidatorException; +import java.security.cert.CertPathValidatorException.BasicReason; import java.security.cert.CertStoreException; import java.security.cert.CRL; import java.security.cert.X509Certificate; import java.security.cert.CertificateException; +import java.security.cert.CertificateParsingException; +import java.security.cert.TrustAnchor; import java.security.cert.URICertStoreParameters; @@ -43,6 +47,8 @@ import java.security.interfaces.EdECKey; import java.security.spec.ECParameterSpec; import java.text.Collator; import java.text.MessageFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.*; import java.util.function.BiFunction; import java.util.jar.JarEntry; @@ -60,6 +66,7 @@ import javax.security.auth.x500.X500Principal; import java.util.Base64; import sun.security.pkcs12.PKCS12KeyStore; +import sun.security.provider.certpath.CertPathConstraintsParameters; import sun.security.util.ECKeySizeParameterSpec; import sun.security.util.KeyUtil; import sun.security.util.NamedCurve; @@ -83,6 +90,7 @@ import sun.security.tools.KeyStoreUtil; import sun.security.tools.PathList; import sun.security.util.DerValue; import sun.security.util.Pem; +import sun.security.validator.Validator; import sun.security.x509.*; import static java.security.KeyStore.*; @@ -178,6 +186,8 @@ public final class Main { // Warnings on weak algorithms etc private List weakWarnings = new ArrayList<>(); + private Set trustedCerts = new HashSet<>(); + private static final DisabledAlgorithmConstraints DISABLED_CHECK = new DisabledAlgorithmConstraints( DisabledAlgorithmConstraints.PROPERTY_CERTPATH_DISABLED_ALGS); @@ -1118,6 +1128,7 @@ public final class Main { } } + KeyStore cakstore = buildTrustedCerts(); // -trustcacerts can be specified on -importcert, -printcert or -printcrl. // Reset it so that warnings on CA cert will remain for other command. if (command != IMPORTCERT && command != PRINTCERT @@ -1126,7 +1137,13 @@ public final class Main { } if (trustcacerts) { - caks = KeyStoreUtil.getCacertsKeyStore(); + if (cakstore != null) { + caks = cakstore; + } else { + // try to load cacerts again, and let exception propagate + // if it cannot be loaded + caks = KeyStoreUtil.getCacertsKeyStore(); + } } // Perform the specified command @@ -1485,7 +1502,9 @@ public final class Main { byte[] rawReq = Pem.decode(new String(sb)); PKCS10 req = new PKCS10(rawReq); - checkWeak(rb.getString("the.certificate.request"), req); + CertPathConstraintsParameters cpcp = new CertPathConstraintsParameters( + req.getSubjectPublicKeyInfo(), null, null, null); + checkWeakConstraint(rb.getString("the.certificate.request"), req, cpcp); info.set(X509CertInfo.KEY, new CertificateX509Key(req.getSubjectPublicKeyInfo())); info.set(X509CertInfo.SUBJECT, @@ -1542,8 +1561,11 @@ public final class Main { } } - checkWeak(rb.getString("the.issuer"), keyStore.getCertificateChain(alias)); - checkWeak(rb.getString("the.generated.certificate"), cert); + checkWeakConstraint(rb.getString("the.issuer"), + keyStore.getCertificateChain(alias)); + cpcp = buildCertPathConstraint(cert, null); + checkWeakConstraint(rb.getString("the.generated.certificate"), + cert, cpcp); } private void doGenCRL(PrintStream out) @@ -1592,7 +1614,10 @@ public final class Main { } else { out.write(crl.getEncodedInternal()); } - checkWeak(rb.getString("the.generated.crl"), crl, privateKey); + CertPathConstraintsParameters cpcp = new CertPathConstraintsParameters( + privateKey, null, null, null); + checkWeakConstraint(rb.getString("the.generated.crl"), crl, privateKey, + cpcp); } /** @@ -1638,7 +1663,10 @@ public final class Main { request.encodeAndSign(subject, privKey, sigAlgName); request.print(out); - checkWeak(rb.getString("the.generated.certificate.request"), request); + CertPathConstraintsParameters cpcp = new CertPathConstraintsParameters( + request.getSubjectPublicKeyInfo(), null, null, null); + checkWeakConstraint(rb.getString("the.generated.certificate.request"), + request, cpcp); } /** @@ -1683,7 +1711,9 @@ public final class Main { throw new Exception(form.format(source)); } dumpCert(cert, out); - checkWeak(rb.getString("the.certificate"), cert); + CertPathConstraintsParameters cpcp = + buildCertPathConstraint(cert, null); + checkWeakConstraint(rb.getString("the.certificate"), cert, cpcp); } /** @@ -2021,7 +2051,8 @@ public final class Main { } else { finalChain = new Certificate[] { newCert }; } - checkWeak(rb.getString("the.generated.certificate"), finalChain); + checkWeakConstraint(rb.getString("the.generated.certificate"), + finalChain); keyStore.setKeyEntry(alias, privKey, keyPass, finalChain); } @@ -2114,6 +2145,7 @@ public final class Main { private void doPrintEntry(String label, String alias, PrintStream out) throws Exception { + CertPathConstraintsParameters cpcp; if (keyStore.containsAlias(alias) == false) { MessageFormat form = new MessageFormat (rb.getString("Alias.alias.does.not.exist")); @@ -2170,6 +2202,10 @@ public final class Main { if (verbose || rfc || debug) { out.println(rb.getString ("Certificate.chain.length.") + chain.length); + + X509Certificate[] xcerts = convertCerts(chain); + List certs = Arrays.asList(xcerts); + TrustAnchor anchor = findTrustAnchor(certs); for (int i = 0; i < chain.length; i ++) { MessageFormat form = new MessageFormat (rb.getString("Certificate.i.1.")); @@ -2182,14 +2218,26 @@ public final class Main { } else { dumpCert(chain[i], out); } - checkWeak(label, chain[i]); + + if (i == 0 && + ((X509Certificate)chain[0]). + getBasicConstraints() == -1) { + // this is an EE + cpcp = buildCertPathConstraint((X509Certificate) chain[i], anchor); + } else { + cpcp = new CertPathConstraintsParameters( + (X509Certificate)chain[i], null, anchor, + null); + } + + checkWeakConstraint(label, chain[i], cpcp); } } else { // Print the digest of the user cert only out.println (rb.getString("Certificate.fingerprint.SHA.256.") + getCertFingerPrint("SHA-256", chain[0])); - checkWeak(label, chain); + checkWeakConstraint(label, chain); } } else { out.println(rb.getString @@ -2215,7 +2263,8 @@ public final class Main { out.println(rb.getString("Certificate.fingerprint.SHA.256.") + getCertFingerPrint("SHA-256", cert)); } - checkWeak(label, cert); + cpcp = buildCertPathConstraint((X509Certificate)cert, null); + checkWeakConstraint(label, cert, cpcp); } else { out.println(rb.getString("Unknown.Entry.Type")); } @@ -2442,7 +2491,9 @@ public final class Main { try { Certificate c = srckeystore.getCertificate(alias); if (c != null) { - checkWeak("<" + newAlias + ">", c); + CertPathConstraintsParameters cpcp = + buildCertPathConstraint((X509Certificate)c, null); + checkWeakConstraint("<" + newAlias + ">", c, cpcp); } keyStore.setEntry(newAlias, entry, pp); // Place the check so that only successful imports are blocked. @@ -2639,11 +2690,14 @@ public final class Main { issuer = verifyCRL(caks, crl); if (issuer != null) { signer = caks.getCertificate(issuer); + CertPathConstraintsParameters cpcp = + buildCertPathConstraint((X509Certificate)signer, + null); out.printf(rb.getString( "verified.by.s.in.s.weak"), issuer, "cacerts", - withWeak(signer.getPublicKey())); + withWeakConstraint(signer.getPublicKey(), cpcp)); out.println(); } } @@ -2651,11 +2705,14 @@ public final class Main { issuer = verifyCRL(keyStore, crl); if (issuer != null) { signer = keyStore.getCertificate(issuer); + CertPathConstraintsParameters cpcp = + buildCertPathConstraint((X509Certificate)signer, + null); out.printf(rb.getString( "verified.by.s.in.s.weak"), issuer, "keystore", - withWeak(signer.getPublicKey())); + withWeakConstraint(signer.getPublicKey(), cpcp)); out.println(); } } @@ -2672,7 +2729,15 @@ public final class Main { out.println(rb.getString ("STARNN")); } - checkWeak(rb.getString("the.crl"), crl, signer == null ? null : signer.getPublicKey()); + + if (signer != null) { + CertPathConstraintsParameters cpcp = + buildCertPathConstraint((X509Certificate)signer, null); + checkWeakConstraint(rb.getString("the.crl"), crl, + signer.getPublicKey(), cpcp); + } else { + checkWeak(rb.getString("the.crl"), crl, null); + } } } @@ -2718,10 +2783,12 @@ public final class Main { PKCS10 req = new PKCS10(Pem.decode(new String(sb))); PublicKey pkey = req.getSubjectPublicKeyInfo(); + CertPathConstraintsParameters cpcp = + new CertPathConstraintsParameters(pkey, null, null, null); out.printf(rb.getString("PKCS.10.with.weak"), req.getSubjectName(), pkey.getFormat(), - withWeak(pkey), + withWeakConstraint(pkey, cpcp), withWeak(req.getSigAlg())); for (PKCS10Attribute attr: req.getAttributes().getAttributes()) { ObjectIdentifier oid = attr.getAttributeId(); @@ -2745,7 +2812,12 @@ public final class Main { if (debug) { out.println(req); // Just to see more, say, public key length... } - checkWeak(rb.getString("the.certificate.request"), req); + + CertPathConstraintsParameters cpcp1 = + new CertPathConstraintsParameters( + req.getSubjectPublicKeyInfo(), null, null, null); + checkWeakConstraint(rb.getString("the.certificate.request"), req, + cpcp1); } /** @@ -2765,6 +2837,9 @@ public final class Main { throw new Exception(rb.getString("Empty.input")); } Certificate[] certs = c.toArray(new Certificate[c.size()]); + X509Certificate[] xcerts = convertCerts(certs); + List chain = Arrays.asList(xcerts); + TrustAnchor anchor = findTrustAnchor(chain); for (int i=0; i certs = signer.getSignerCertPath().getCertificates(); + @SuppressWarnings("unchecked") + List chain = + (List)certs; + TrustAnchor anchor = findTrustAnchor(chain); + CertPathConstraintsParameters cpcp; int cc = 0; for (Certificate cert: certs) { out.printf(rb.getString("Certificate.d."), ++cc); @@ -2913,16 +3003,27 @@ public final class Main { printX509Cert(x, out); } out.println(); - checkWeak(oneInManys(rb.getString( + if (cc == 0 && x.getBasicConstraints() == -1) { + // this is an EE + cpcp = buildCertPathConstraint(x, anchor); + } else { + cpcp = new CertPathConstraintsParameters( + x, null, anchor, null); + } + checkWeakConstraint(oneInManys(rb.getString( "the.certificate"), cc, certs.size(), pos, - ss.size()), x); + ss.size()), x, cpcp); } Timestamp ts = signer.getTimestamp(); if (ts != null) { out.println(rb.getString("Timestamp.")); out.println(); certs = ts.getSignerCertPath().getCertificates(); + @SuppressWarnings("unchecked") + List tschain = + (List)certs; + anchor = findTrustAnchor(tschain); cc = 0; for (Certificate cert: certs) { out.printf(rb.getString("Certificate.d."), ++cc); @@ -2935,10 +3036,18 @@ public final class Main { printX509Cert(x, out); } out.println(); - checkWeak(oneInManys(rb.getString( + if (cc == 0 && + x.getBasicConstraints() == -1) { + // this is an EE + cpcp = buildCertPathConstraint(x, anchor); + } else { + cpcp = new CertPathConstraintsParameters( + x, null, anchor, null); + } + checkWeakConstraint(oneInManys(rb.getString( "the.tsa.certificate"), cc, certs.size(), pos, - ss.size()), x); + ss.size()), x, cpcp); } } } @@ -2968,6 +3077,9 @@ public final class Main { } int i = 0; + @SuppressWarnings("unchecked") + List xcerts = (List)chain; + TrustAnchor anchor = findTrustAnchor(xcerts); for (Certificate cert : chain) { try { if (rfc) { @@ -2978,7 +3090,17 @@ public final class Main { printX509Cert((X509Certificate)cert, out); out.println(); } - checkWeak(oneInMany(rb.getString("the.certificate"), i++, chain.size()), cert); + X509Certificate x = (X509Certificate)cert; + CertPathConstraintsParameters cpcp; + if (i == 0 && x.getBasicConstraints() == -1) { + // this is an EE + cpcp = buildCertPathConstraint(x, anchor); + } else { + cpcp = new CertPathConstraintsParameters( + x, null, anchor, null); + } + checkWeakConstraint(oneInMany(rb.getString( + "the.certificate"), i++, chain.size()), x, cpcp); } catch (Exception e) { if (debug) { e.printStackTrace(); @@ -3202,8 +3324,11 @@ public final class Main { throw new Exception(rb.getString("Input.not.an.X.509.certificate")); } + CertPathConstraintsParameters cpcp = + buildCertPathConstraint(cert, null); + if (noprompt) { - checkWeak(rb.getString("the.input"), cert); + checkWeakConstraint(rb.getString("the.input"), cert, cpcp); keyStore.setCertificateEntry(alias, cert); return true; } @@ -3223,7 +3348,7 @@ public final class Main { ("Certificate.already.exists.in.keystore.under.alias.trustalias.")); Object[] source = {trustalias}; System.err.println(form.format(source)); - checkWeak(rb.getString("the.input"), cert); + checkWeakConstraint(rb.getString("the.input"), cert, cpcp); printWeakWarnings(true); reply = getYesNoReply (rb.getString("Do.you.still.want.to.add.it.no.")); @@ -3234,7 +3359,7 @@ public final class Main { ("Certificate.already.exists.in.system.wide.CA.keystore.under.alias.trustalias.")); Object[] source = {trustalias}; System.err.println(form.format(source)); - checkWeak(rb.getString("the.input"), cert); + checkWeakConstraint(rb.getString("the.input"), cert, cpcp); printWeakWarnings(true); reply = getYesNoReply (rb.getString("Do.you.still.want.to.add.it.to.your.own.keystore.no.")); @@ -3243,7 +3368,7 @@ public final class Main { // Print the cert and ask user if they really want to add // it to their keystore printX509Cert(cert, System.out); - checkWeak(rb.getString("the.input"), cert); + checkWeakConstraint(rb.getString("the.input"), cert, cpcp); printWeakWarnings(true); reply = getYesNoReply (rb.getString("Trust.this.certificate.no.")); @@ -3270,7 +3395,7 @@ public final class Main { // Print the cert and ask user if they really want to add it to // their keystore printX509Cert(cert, System.out); - checkWeak(rb.getString("the.input"), cert); + checkWeakConstraint(rb.getString("the.input"), cert, cpcp); printWeakWarnings(true); reply = getYesNoReply (rb.getString("Trust.this.certificate.no.")); @@ -3410,6 +3535,21 @@ public final class Main { return keyPass; } + private String withWeakConstraint(String alg, + CertPathConstraintsParameters cpcp) { + try { + DISABLED_CHECK.permits(alg, cpcp, false); + } catch (CertPathValidatorException e) { + return String.format(rb.getString("with.disabled"), alg); + } + try { + LEGACY_CHECK.permits(alg, cpcp, false); + return alg; + } catch (CertPathValidatorException e) { + return String.format(rb.getString("with.weak"), alg); + } + } + private String withWeak(String alg) { if (DISABLED_CHECK.permits(SIG_PRIMITIVE_SET, alg, null)) { if (LEGACY_CHECK.permits(SIG_PRIMITIVE_SET, alg, null)) { @@ -3436,21 +3576,24 @@ public final class Main { return result; } - private String withWeak(Key key) { + private String withWeakConstraint(Key key, + CertPathConstraintsParameters cpcp) { int kLen = KeyUtil.getKeySize(key); String displayAlg = fullDisplayAlgName(key); - if (DISABLED_CHECK.permits(SIG_PRIMITIVE_SET, key)) { - if (LEGACY_CHECK.permits(SIG_PRIMITIVE_SET, key)) { - if (kLen >= 0) { - return String.format(rb.getString("key.bit"), kLen, displayAlg); - } else { - return String.format(rb.getString("unknown.size.1"), displayAlg); - } + try { + DISABLED_CHECK.permits(key.getAlgorithm(), cpcp, true); + } catch (CertPathValidatorException e) { + return String.format(rb.getString("key.bit.disabled"), kLen, displayAlg); + } + try { + LEGACY_CHECK.permits(key.getAlgorithm(), cpcp, true); + if (kLen >= 0) { + return String.format(rb.getString("key.bit"), kLen, displayAlg); } else { - return String.format(rb.getString("key.bit.weak"), kLen, displayAlg); + return String.format(rb.getString("unknown.size.1"), displayAlg); } - } else { - return String.format(rb.getString("key.bit.disabled"), kLen, displayAlg); + } catch (CertPathValidatorException e) { + return String.format(rb.getString("key.bit.weak"), kLen, displayAlg); } } @@ -3465,9 +3608,11 @@ public final class Main { (rb.getString(".PATTERN.printX509Cert.with.weak")); PublicKey pkey = cert.getPublicKey(); String sigName = cert.getSigAlgName(); + CertPathConstraintsParameters cpcp = + buildCertPathConstraint(cert, null); // No need to warn about sigalg of a trust anchor if (!isTrustedCert(cert)) { - sigName = withWeak(sigName); + sigName = withWeakConstraint(sigName, cpcp); } Object[] source = {cert.getSubjectX500Principal().toString(), cert.getIssuerX500Principal().toString(), @@ -3477,7 +3622,7 @@ public final class Main { getCertFingerPrint("SHA-1", cert), getCertFingerPrint("SHA-256", cert), sigName, - withWeak(pkey), + withWeakConstraint(pkey, cpcp), cert.getVersion() }; out.println(form.format(source)); @@ -3801,7 +3946,7 @@ public final class Main { throws Exception { - checkWeak(rb.getString("reply"), replyCerts); + checkWeakConstraint(rb.getString("reply"), replyCerts); // order the certs in the reply (bottom-up). // we know that all certs in the reply are of type X.509, because @@ -3883,11 +4028,14 @@ public final class Main { replyCerts.length); tmpCerts[tmpCerts.length-1] = root.snd; replyCerts = tmpCerts; - checkWeak(String.format(fromKeyStore + CertPathConstraintsParameters cpcp = + buildCertPathConstraint((X509Certificate)root.snd, + null); + checkWeakConstraint(String.format(fromKeyStore ? rb.getString("alias.in.keystore") : rb.getString("alias.in.cacerts"), root.fst), - root.snd); + root.snd, cpcp); } } return replyCerts; @@ -3952,7 +4100,9 @@ public final class Main { (X509Certificate) certToVerify), chain, certs)) { for (Pair p : chain) { - checkWeak(p.fst, p.snd); + CertPathConstraintsParameters cpcp = + buildCertPathConstraint(p.snd, null); + checkWeakConstraint(p.fst, p.snd, cpcp); } Certificate[] newChain = new Certificate[chain.size()]; @@ -4161,18 +4311,18 @@ public final class Main { } if (date != null) { if (date.matches("\\d\\d\\d\\d\\/\\d\\d\\/\\d\\d")) { - c.set(Integer.valueOf(date.substring(0, 4)), - Integer.valueOf(date.substring(5, 7))-1, - Integer.valueOf(date.substring(8, 10))); + c.set(Integer.parseInt(date.substring(0, 4)), + Integer.parseInt(date.substring(5, 7))-1, + Integer.parseInt(date.substring(8, 10))); } else { throw ioe; } } if (time != null) { if (time.matches("\\d\\d:\\d\\d:\\d\\d")) { - c.set(Calendar.HOUR_OF_DAY, Integer.valueOf(time.substring(0, 2))); - c.set(Calendar.MINUTE, Integer.valueOf(time.substring(3, 5))); - c.set(Calendar.SECOND, Integer.valueOf(time.substring(6, 8))); + c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(time.substring(0, 2))); + c.set(Calendar.MINUTE, Integer.parseInt(time.substring(3, 5))); + c.set(Calendar.SECOND, Integer.parseInt(time.substring(6, 8))); c.set(Calendar.MILLISECOND, 0); } else { throw ioe; @@ -4748,6 +4898,78 @@ public final class Main { } } + private void checkWeakConstraint(String label, String sigAlg, Key key, + CertPathConstraintsParameters cpcp) throws Exception { + if (sigAlg != null) { + try { + DISABLED_CHECK.permits(sigAlg, cpcp, false); + try { + LEGACY_CHECK.permits(sigAlg, cpcp, false); + } catch (CertPathValidatorException e) { + weakWarnings.add(String.format( + rb.getString("whose.sigalg.weak"), label, sigAlg)); + } + } catch (CertPathValidatorException e) { + String eMessage = e.getMessage(); + if (eMessage.contains("denyAfter constraint check failed") && + e.getReason() == BasicReason.ALGORITHM_CONSTRAINED) { + String startSeparator = "Constraint date: "; + int startSepPos = eMessage.indexOf(startSeparator); + String endSeparator = "; params date"; + int endSepPos = eMessage.indexOf(endSeparator); + String denyAfterDate = null; + try { + denyAfterDate = eMessage.substring(startSepPos + startSeparator.length(), + endSepPos); + } catch (IndexOutOfBoundsException e1) { + throw new Exception(rb.getString( + "Unable.to.parse.denyAfter.string.in.exception.message")); + } + + SimpleDateFormat formatter = new SimpleDateFormat("EEE MMM dd HH:mm:ss Z yyyy"); + Date dateObj = null; + try { + dateObj = formatter.parse(denyAfterDate); + } catch (ParseException e2) { + throw new Exception(rb.getString( + "Unable.to.parse.denyAfter.string.in.exception.message")); + } + formatter = new SimpleDateFormat("yyyy-MM-dd"); + denyAfterDate = formatter.format(dateObj); + + weakWarnings.add(String.format( + rb.getString("whose.sigalg.usagesignedjar"), label, sigAlg, + denyAfterDate)); + } else { + weakWarnings.add(String.format( + rb.getString("whose.sigalg.disabled"), label, sigAlg)); + } + if (debug) { + e.printStackTrace(); + } + } + } + + if (key != null) { + try { + DISABLED_CHECK.permits(key.getAlgorithm(), cpcp, true); + try { + LEGACY_CHECK.permits(key.getAlgorithm(), cpcp, true); + } catch (CertPathValidatorException e) { + weakWarnings.add(String.format( + rb.getString("whose.key.weak"), label, + String.format(rb.getString("key.bit"), + KeyUtil.getKeySize(key), fullDisplayAlgName(key)))); + } + } catch (CertPathValidatorException e) { + weakWarnings.add(String.format( + rb.getString("whose.key.disabled"), label, + String.format(rb.getString("key.bit"), + KeyUtil.getKeySize(key), fullDisplayAlgName(key)))); + } + } + } + private void checkWeak(String label, String sigAlg, Key key) { if (sigAlg != null) { if (!DISABLED_CHECK.permits(SIG_PRIMITIVE_SET, sigAlg, null)) { @@ -4774,8 +4996,11 @@ public final class Main { } } - private void checkWeak(String label, Certificate[] certs) - throws KeyStoreException { + private void checkWeakConstraint(String label, Certificate[] certs) + throws KeyStoreException, Exception { + X509Certificate[] xcerts = convertCerts(certs); + List chain = Arrays.asList(xcerts); + TrustAnchor anchor = findTrustAnchor(chain); for (int i = 0; i < certs.length; i++) { Certificate cert = certs[i]; if (cert instanceof X509Certificate) { @@ -4784,23 +5009,43 @@ public final class Main { if (certs.length > 1) { fullLabel = oneInMany(label, i, certs.length); } - checkWeak(fullLabel, xc); + + CertPathConstraintsParameters cpcp = null; + if (i == 0 && xc.getBasicConstraints() == -1) { + // this is an EE + cpcp = buildCertPathConstraint(xc, anchor); + } else { + cpcp = new CertPathConstraintsParameters( + xc, null, anchor, null); + } + checkWeakConstraint(fullLabel, xc, cpcp); } } } - private void checkWeak(String label, Certificate cert) - throws KeyStoreException { + private void checkWeakConstraint(String label, Certificate cert, + CertPathConstraintsParameters cpcp) + throws KeyStoreException, Exception { if (cert instanceof X509Certificate) { X509Certificate xc = (X509Certificate)cert; // No need to check the sigalg of a trust anchor String sigAlg = isTrustedCert(cert) ? null : xc.getSigAlgName(); - checkWeak(label, sigAlg, xc.getPublicKey()); + checkWeakConstraint(label, sigAlg, xc.getPublicKey(), cpcp); } } - private void checkWeak(String label, PKCS10 p10) { - checkWeak(label, p10.getSigAlg(), p10.getSubjectPublicKeyInfo()); + private void checkWeakConstraint(String label, PKCS10 p10, + CertPathConstraintsParameters cpcp) throws Exception { + checkWeakConstraint(label, p10.getSigAlg(), + p10.getSubjectPublicKeyInfo(), cpcp); + } + + private void checkWeakConstraint(String label, CRL crl, Key key, + CertPathConstraintsParameters cpcp) throws Exception { + if (crl instanceof X509CRLImpl) { + X509CRLImpl impl = (X509CRLImpl)crl; + checkWeakConstraint(label, impl.getSigAlgName(), key, cpcp); + } } private void checkWeak(String label, CRL crl, Key key) { @@ -4810,6 +5055,76 @@ public final class Main { } } + private KeyStore buildTrustedCerts() { + KeyStore caks = null; + try { + caks = KeyStoreUtil.getCacertsKeyStore(); + if (caks != null) { + Enumeration aliases = caks.aliases(); + while (aliases.hasMoreElements()) { + String a = aliases.nextElement(); + try { + trustedCerts.add((X509Certificate)caks.getCertificate(a)); + } catch (Exception e2) { + // ignore, if the keystore has not been loaded/initialized properly + } + } + } + } catch (Exception e) { + // Ignore, if cacerts cannot be loaded + } + return caks; + } + + private TrustAnchor findTrustAnchor(List chain) { + if (chain.isEmpty()) { + return null; + } + + X509Certificate last = chain.get(chain.size() - 1); + Optional trusted = + trustedCerts.stream() + .filter(c -> c.getSubjectX500Principal().equals(last.getIssuerX500Principal())) + .findFirst(); + return trusted.isPresent() ? new TrustAnchor(trusted.get(), null) : null; + } + + private X509Certificate[] convertCerts(Certificate[] certs) { + X509Certificate[] xcerts = new X509Certificate[certs.length]; + + for (int i = 0; i < certs.length; i++) { + if (certs[i] instanceof X509Certificate) { + xcerts[i] = (X509Certificate) certs[i]; + } + } + return xcerts; + } + + private CertPathConstraintsParameters buildCertPathConstraint( + X509Certificate xcert, TrustAnchor anchor) throws Exception{ + List eku = xcert.getExtendedKeyUsage(); + if (eku == null) { + return new CertPathConstraintsParameters(xcert, null, + anchor, null); + } + + if (eku.contains(KnownOIDs.codeSigning.value())) { + return new CertPathConstraintsParameters(xcert, + Validator.VAR_CODE_SIGNING, anchor, null); + } else if (eku.contains(KnownOIDs.clientAuth.value())) { + return new CertPathConstraintsParameters(xcert, + Validator.VAR_TLS_CLIENT, anchor, null); + } else if (eku.contains(KnownOIDs.serverAuth.value())) { + return new CertPathConstraintsParameters(xcert, + Validator.VAR_TLS_SERVER, anchor, null); + } else if (eku.contains(KnownOIDs.KP_TimeStamping.value())) { + return new CertPathConstraintsParameters(xcert, + Validator.VAR_TSA_SERVER, anchor, null); + } + return new CertPathConstraintsParameters(xcert, Validator.VAR_GENERIC, + anchor, null); + } + private void printWeakWarnings(boolean newLine) { if (!weakWarnings.isEmpty() && !nowarn) { System.err.println("\nWarning:"); diff --git a/src/java.base/share/classes/sun/security/tools/keytool/Resources.java b/src/java.base/share/classes/sun/security/tools/keytool/Resources.java index df0147e529ded693a1a82999fa077aed65198d3f..f26b2a13bd8324ffc2eea394237b983a3cb6fa0e 100644 --- a/src/java.base/share/classes/sun/security/tools/keytool/Resources.java +++ b/src/java.base/share/classes/sun/security/tools/keytool/Resources.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2022, 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 @@ -483,6 +483,8 @@ public class Resources extends java.util.ListResourceBundle { "Subject: %1$s\nFormat: %2$s\nPublic Key: %3$s\nSignature algorithm: %4$s\n"}, {"verified.by.s.in.s.weak", "Verified by %1$s in %2$s with a %3$s"}, {"whose.sigalg.disabled", "%1$s uses the %2$s signature algorithm which is considered a security risk and is disabled."}, + {"whose.sigalg.usagesignedjar", "%1$s uses the %2$s signature algorithm which is considered a security risk and cannot be used to sign JARs after %3$s."}, + {"Unable.to.parse.denyAfter.string.in.exception.message", "Unable to parse denyAfter date string in exception message"}, {"whose.sigalg.weak", "%1$s uses the %2$s signature algorithm which is considered a security risk. This algorithm will be disabled in a future update."}, {"whose.key.disabled", "%1$s uses a %2$s which is considered a security risk and is disabled."}, {"whose.key.weak", "%1$s uses a %2$s which is considered a security risk. This key size will be disabled in a future update."}, diff --git a/src/java.base/share/classes/sun/security/util/ChannelBindingException.java b/src/java.base/share/classes/sun/security/util/ChannelBindingException.java new file mode 100644 index 0000000000000000000000000000000000000000..847cd0741a0d2a14171c82ec78fcf1590a0f1d00 --- /dev/null +++ b/src/java.base/share/classes/sun/security/util/ChannelBindingException.java @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package sun.security.util; + +import java.security.GeneralSecurityException; + +/** + * Thrown by TlsChannelBinding if an error occurs + */ +public class ChannelBindingException extends GeneralSecurityException { + + @java.io.Serial + private static final long serialVersionUID = -5021387249782788460L; + + /** + * Constructs a ChannelBindingException with no detail message. A detail + * message is a String that describes this particular exception. + */ + public ChannelBindingException() { + super(); + } + + /** + * Constructs a ChannelBindingException with a detail message and + * specified cause. + */ + public ChannelBindingException(String msg, Exception e) { + super(msg, e); + } + + /** + * Constructs a ChannelBindingException with a detail message + */ + public ChannelBindingException(String msg) { + super(msg); + } +} diff --git a/src/java.base/share/classes/sun/security/util/GCMParameters.java b/src/java.base/share/classes/sun/security/util/GCMParameters.java index 02390777a039dd919a0d6ff7457247d8cdd589eb..d54965f975dfe7c46f82d21f125b81be5395eae6 100644 --- a/src/java.base/share/classes/sun/security/util/GCMParameters.java +++ b/src/java.base/share/classes/sun/security/util/GCMParameters.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2022, 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 @@ -111,7 +111,7 @@ public final class GCMParameters extends AlgorithmParametersSpi { T engineGetParameterSpec(Class paramSpec) throws InvalidParameterSpecException { - if (GCMParameterSpec.class.isAssignableFrom(paramSpec)) { + if (paramSpec.isAssignableFrom(GCMParameterSpec.class)) { return paramSpec.cast(new GCMParameterSpec(tLen * 8, iv)); } else { throw new InvalidParameterSpecException diff --git a/src/java.base/share/classes/sun/security/util/ManifestEntryVerifier.java b/src/java.base/share/classes/sun/security/util/ManifestEntryVerifier.java index 14a56e33f38d643098e89f8a74dc55207034526c..187922cc8f294722f77c032530ecdbb25a0446e1 100644 --- a/src/java.base/share/classes/sun/security/util/ManifestEntryVerifier.java +++ b/src/java.base/share/classes/sun/security/util/ManifestEntryVerifier.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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 @@ -192,7 +192,8 @@ public class ManifestEntryVerifier { * */ public CodeSigner[] verify(Hashtable verifiedSigners, - Hashtable sigFileSigners) + Hashtable sigFileSigners, + Map> signersToAlgs) throws JarException { if (skip) { @@ -207,38 +208,60 @@ public class ManifestEntryVerifier { return signers; } - JarConstraintsParameters params = - getParams(verifiedSigners, sigFileSigners); + CodeSigner[] entrySigners = sigFileSigners.get(name); + Map algsPermittedStatus = + algsPermittedStatusForSigners(signersToAlgs, entrySigners); + // Flag that indicates if only disabled algorithms are used and jar + // entry should be treated as unsigned. + boolean disabledAlgs = true; + JarConstraintsParameters params = null; for (int i=0; i < digests.size(); i++) { MessageDigest digest = digests.get(i); - if (params != null) { - try { - params.setExtendedExceptionMsg(JarFile.MANIFEST_NAME, - name + " entry"); - DisabledAlgorithmConstraints.jarConstraints() - .permits(digest.getAlgorithm(), params, false); - } catch (GeneralSecurityException e) { - if (debug != null) { - debug.println("Digest algorithm is restricted: " + e); + String digestAlg = digest.getAlgorithm(); + + // Check if this algorithm is permitted, skip if false. + if (algsPermittedStatus != null) { + Boolean permitted = algsPermittedStatus.get(digestAlg); + if (permitted == null) { + if (params == null) { + params = new JarConstraintsParameters(entrySigners); } - return null; + if (!checkConstraints(digestAlg, params)) { + algsPermittedStatus.put(digestAlg, Boolean.FALSE); + continue; + } else { + algsPermittedStatus.put(digestAlg, Boolean.TRUE); + } + } else if (!permitted) { + continue; } } + + // A non-disabled algorithm was used. + disabledAlgs = false; + byte [] manHash = manifestHashes.get(i); byte [] theHash = digest.digest(); if (debug != null) { debug.println("Manifest Entry: " + - name + " digest=" + digest.getAlgorithm()); + name + " digest=" + digestAlg); debug.println(" manifest " + HexFormat.of().formatHex(manHash)); debug.println(" computed " + HexFormat.of().formatHex(theHash)); debug.println(); } - if (!MessageDigest.isEqual(theHash, manHash)) - throw new SecurityException(digest.getAlgorithm()+ + if (!MessageDigest.isEqual(theHash, manHash)) { + throw new SecurityException(digestAlg + " digest error for "+name); + } + } + + // If there were only disabled algorithms used, return null and jar + // entry will be treated as unsigned. + if (disabledAlgs) { + return null; } // take it out of sigFileSigners and put it in verifiedSigners... @@ -249,40 +272,36 @@ public class ManifestEntryVerifier { return signers; } - /** - * Get constraints parameters for JAR. The constraints should be - * checked against all code signers. Returns the parameters, - * or null if the signers for this entry have already been checked - * or there are no signers for this entry. - */ - private JarConstraintsParameters getParams( - Map verifiedSigners, - Map sigFileSigners) { - - // verifiedSigners is usually preloaded with the Manifest's signers. - // If verifiedSigners contains the Manifest, then it will have all of - // the signers of the JAR. But if it doesn't then we need to fallback - // and check verifiedSigners to see if the signers of this entry have - // been checked already. - if (verifiedSigners.containsKey(manifestFileName)) { - if (verifiedSigners.size() > 1) { - // this means we already checked it previously - return null; - } else { - return new JarConstraintsParameters( - verifiedSigners.get(manifestFileName)); + // Gets the algorithms permitted status for the signers of this entry. + private static Map algsPermittedStatusForSigners( + Map> signersToAlgs, + CodeSigner[] signers) { + if (signers != null) { + Map algs = signersToAlgs.get(signers); + // create new HashMap if absent + if (algs == null) { + algs = new HashMap<>(); + signersToAlgs.put(signers, algs); } - } else { + return algs; + } + return null; + } + + // Checks the algorithm constraints against the signers of this entry. + private boolean checkConstraints(String algorithm, + JarConstraintsParameters params) { + try { + params.setExtendedExceptionMsg(JarFile.MANIFEST_NAME, + name + " entry"); + DisabledAlgorithmConstraints.jarConstraints() + .permits(algorithm, params, false); + return true; + } catch (GeneralSecurityException e) { if (debug != null) { - debug.println(manifestFileName + " not present in verifiedSigners"); - } - CodeSigner[] signers = sigFileSigners.get(name); - if (signers == null || verifiedSigners.containsValue(signers)) { - return null; - } else { - return new JarConstraintsParameters(signers); + debug.println("Digest algorithm is restricted: " + e); } + return false; } } } - diff --git a/src/java.base/share/classes/sun/security/util/PolicyUtil.java b/src/java.base/share/classes/sun/security/util/PolicyUtil.java index 3bea048f539004969afe5512b8918abeed42ef4c..b0ce1c496027e26c598640aa13b5a17c8c9e0025 100644 --- a/src/java.base/share/classes/sun/security/util/PolicyUtil.java +++ b/src/java.base/share/classes/sun/security/util/PolicyUtil.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2021, 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 @@ -124,14 +124,8 @@ public class PolicyUtil { debug.println("reading password"+passURL); } - InputStream in = null; - try { - in = passURL.openStream(); + try (InputStream in = passURL.openStream()) { keyStorePassword = Password.readPassword(in); - } finally { - if (in != null) { - in.close(); - } } } @@ -159,13 +153,9 @@ public class PolicyUtil { debug.println("reading keystore"+keyStoreUrl); } - InputStream inStream = null; - try { - inStream = - new BufferedInputStream(getInputStream(keyStoreUrl)); + try (InputStream inStream = + new BufferedInputStream(getInputStream(keyStoreUrl))) { ks.load(inStream, keyStorePassword); - } finally { - inStream.close(); } return ks; } diff --git a/src/java.naming/share/classes/com/sun/jndi/ldap/sasl/TlsChannelBinding.java b/src/java.base/share/classes/sun/security/util/TlsChannelBinding.java similarity index 82% rename from src/java.naming/share/classes/com/sun/jndi/ldap/sasl/TlsChannelBinding.java rename to src/java.base/share/classes/sun/security/util/TlsChannelBinding.java index 922fa18028ce345464d02be8e1f2d239a6925655..8f7ac50bb5e761087bf609b2010aa5d5b5c1b3cd 100644 --- a/src/java.naming/share/classes/com/sun/jndi/ldap/sasl/TlsChannelBinding.java +++ b/src/java.base/share/classes/sun/security/util/TlsChannelBinding.java @@ -22,10 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package com.sun.jndi.ldap.sasl; -import javax.naming.NamingException; -import javax.security.sasl.SaslException; +package sun.security.util; + import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.security.cert.CertificateEncodingException; @@ -47,14 +46,6 @@ import java.util.Hashtable; public class TlsChannelBinding { - // TLS channel binding type property - public static final String CHANNEL_BINDING_TYPE = - "com.sun.jndi.ldap.tls.cbtype"; - - // internal TLS channel binding property - public static final String CHANNEL_BINDING = - "jdk.internal.sasl.tlschannelbinding"; - public enum TlsChannelBindingType { /** @@ -80,19 +71,18 @@ public class TlsChannelBinding { } /** - * Parse value of "com.sun.jndi.ldap.tls.cbtype" property + * Parse given value to see if it is a recognized and supported channel binding type + * * @param cbType - * @return TLS Channel Binding type or null if - * "com.sun.jndi.ldap.tls.cbtype" property has not been set. - * @throws NamingException + * @return TLS Channel Binding type or null if given string is null + * @throws ChannelBindingException */ - public static TlsChannelBindingType parseType(String cbType) throws NamingException { + public static TlsChannelBindingType parseType(String cbType) throws ChannelBindingException { if (cbType != null) { if (cbType.equals(TlsChannelBindingType.TLS_SERVER_END_POINT.getName())) { return TlsChannelBindingType.TLS_SERVER_END_POINT; } else { - throw new NamingException("Illegal value for " + - CHANNEL_BINDING_TYPE + " property."); + throw new ChannelBindingException("Illegal value for channel binding type: " + cbType); } } return null; @@ -104,9 +94,9 @@ public class TlsChannelBinding { /** * Construct tls-server-end-point Channel Binding data * @param serverCertificate - * @throws SaslException + * @throws ChannelBindingException */ - public static TlsChannelBinding create(X509Certificate serverCertificate) throws SaslException { + public static TlsChannelBinding create(X509Certificate serverCertificate) throws ChannelBindingException { try { final byte[] prefix = TlsChannelBindingType.TLS_SERVER_END_POINT.getName().concat(":").getBytes(); @@ -127,7 +117,7 @@ public class TlsChannelBinding { System.arraycopy(hash, 0, cbData, prefix.length, hash.length); return new TlsChannelBinding(TlsChannelBindingType.TLS_SERVER_END_POINT, cbData); } catch (NoSuchAlgorithmException | CertificateEncodingException e) { - throw new SaslException("Cannot create TLS channel binding data", e); + throw new ChannelBindingException("Cannot create TLS channel binding data", e); } } diff --git a/src/java.base/share/classes/sun/security/x509/CRLNumberExtension.java b/src/java.base/share/classes/sun/security/x509/CRLNumberExtension.java index 9434e613441ac1aede6b75eea4d6fc54fb9bf2ba..244e9d5df9be125162130bef9355f819d3e3d4f2 100644 --- a/src/java.base/share/classes/sun/security/x509/CRLNumberExtension.java +++ b/src/java.base/share/classes/sun/security/x509/CRLNumberExtension.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2021, 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 @@ -199,7 +199,6 @@ implements CertAttrSet { * @exception IOException on encoding errors. */ public void encode(OutputStream out) throws IOException { - DerOutputStream tmp = new DerOutputStream(); encode(out, PKIXExtensions.CRLNumber_Id, true); } diff --git a/src/java.base/share/classes/sun/security/x509/CertificateIssuerExtension.java b/src/java.base/share/classes/sun/security/x509/CertificateIssuerExtension.java index 0dd8f39642a3bb87c7234992df95a9e5cd6fb693..40eba681244e979b22bc79cf0698e3ba1d2a3af9 100644 --- a/src/java.base/share/classes/sun/security/x509/CertificateIssuerExtension.java +++ b/src/java.base/share/classes/sun/security/x509/CertificateIssuerExtension.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2021, 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 @@ -170,7 +170,7 @@ public class CertificateIssuerExtension extends Extension */ public String toString() { return super.toString() + "Certificate Issuer [\n" + - String.valueOf(names) + "]\n"; + names + "]\n"; } /** diff --git a/src/java.base/share/classes/sun/security/x509/DeltaCRLIndicatorExtension.java b/src/java.base/share/classes/sun/security/x509/DeltaCRLIndicatorExtension.java index 10b5a9dc09e9528a4cfc1e3cd961dc11b1f8a886..5933758874a79123ddbf9a51f116b92f96c3e16c 100644 --- a/src/java.base/share/classes/sun/security/x509/DeltaCRLIndicatorExtension.java +++ b/src/java.base/share/classes/sun/security/x509/DeltaCRLIndicatorExtension.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2021, 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,9 +28,6 @@ package sun.security.x509; import java.io.IOException; import java.io.OutputStream; import java.math.BigInteger; -import java.util.Enumeration; - -import sun.security.util.*; /** * Represents the Delta CRL Indicator Extension. @@ -80,7 +77,7 @@ public class DeltaCRLIndicatorExtension extends CRLNumberExtension { } /** - * Creates a delta CRL indictor extension with the BigInteger value . + * Creates a delta CRL indicator extension with the BigInteger value . * The criticality is set to true. * * @param crlNum the value to be set for the extension. @@ -110,7 +107,6 @@ public class DeltaCRLIndicatorExtension extends CRLNumberExtension { * @exception IOException on encoding errors. */ public void encode(OutputStream out) throws IOException { - DerOutputStream tmp = new DerOutputStream(); super.encode(out, PKIXExtensions.DeltaCRLIndicator_Id, true); } } diff --git a/src/java.base/share/classes/sun/security/x509/GeneralSubtrees.java b/src/java.base/share/classes/sun/security/x509/GeneralSubtrees.java index 8adafe203444d94fc37ffc17554178718a0f8c9b..c47fc0c8245c8eec481eb0e8b8c3dffb5d029428 100644 --- a/src/java.base/share/classes/sun/security/x509/GeneralSubtrees.java +++ b/src/java.base/share/classes/sun/security/x509/GeneralSubtrees.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2021, 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 @@ -130,7 +130,7 @@ public class GeneralSubtrees implements Cloneable { /** * Encode the GeneralSubtrees. * - * @param out the DerOutputStrean to encode this object to. + * @param out the DerOutputStream to encode this object to. */ public void encode(DerOutputStream out) throws IOException { DerOutputStream seq = new DerOutputStream(); @@ -346,7 +346,6 @@ public class GeneralSubtrees implements Cloneable { // same type in this. for (int i = 0; i < size(); i++) { GeneralNameInterface thisEntry = getGeneralNameInterface(i); - boolean removeThisEntry = false; // Step 3a: If the widest name of this type in other narrows // thisEntry, remove thisEntry and add widest other to newThis. diff --git a/src/java.base/share/classes/sun/security/x509/InvalidityDateExtension.java b/src/java.base/share/classes/sun/security/x509/InvalidityDateExtension.java index 7fac65f3ee592c28fe608e27a01c212433bb86f9..b731cba41027477e05da0991e1a142bbae5334cb 100644 --- a/src/java.base/share/classes/sun/security/x509/InvalidityDateExtension.java +++ b/src/java.base/share/classes/sun/security/x509/InvalidityDateExtension.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2021, 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 @@ -168,7 +168,7 @@ public class InvalidityDateExtension extends Extension * Returns a printable representation of the Invalidity Date. */ public String toString() { - return super.toString() + " Invalidity Date: " + String.valueOf(date); + return super.toString() + " Invalidity Date: " + date; } /** diff --git a/src/java.base/share/classes/sun/security/x509/X509CertInfo.java b/src/java.base/share/classes/sun/security/x509/X509CertInfo.java index 5fbc9a08f54fed80b3dea514cdec633d29aaf398..09a9ed2932078f50f445b60546ab36c44a03f248 100644 --- a/src/java.base/share/classes/sun/security/x509/X509CertInfo.java +++ b/src/java.base/share/classes/sun/security/x509/X509CertInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2021, 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 @@ -729,7 +729,6 @@ public class X509CertInfo implements CertAttrSet { "has no extensions"); } SubjectAlternativeNameExtension subjectAltNameExt = null; - SubjectAlternativeNameExtension extValue = null; GeneralNames names = null; try { subjectAltNameExt = (SubjectAlternativeNameExtension) diff --git a/src/java.base/share/classes/sun/security/x509/X509Key.java b/src/java.base/share/classes/sun/security/x509/X509Key.java index faf7cfb927febb12ea9960f27af764c4369d7085..19979cb8e7e1509cbe3a6d8a5e691d669b5a41d7 100644 --- a/src/java.base/share/classes/sun/security/x509/X509Key.java +++ b/src/java.base/share/classes/sun/security/x509/X509Key.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2021, 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,7 +27,6 @@ package sun.security.x509; import java.io.*; import java.util.Arrays; -import java.util.Properties; import java.security.Key; import java.security.PublicKey; import java.security.KeyFactory; @@ -150,10 +149,10 @@ public class X509Key implements PublicKey { * this kind of key, a subclass is returned. Otherwise, a generic * X509Key object is returned. * - *

    This mechanism gurantees that keys (and algorithms) may be + *

    This mechanism guarantees that keys (and algorithms) may be * freely manipulated and transferred, without risk of losing * information. Also, when a key (or algorithm) needs some special - * handling, that specific need can be accomodated. + * handling, that specific need can be accommodated. * * @param in the DER-encoded SubjectPublicKeyInfo value * @exception IOException on data format errors @@ -233,8 +232,6 @@ public class X509Key implements PublicKey { */ String classname = ""; try { - Properties props; - String keytype; Provider sunProvider; sunProvider = Security.getProvider("SUN"); diff --git a/src/java.base/share/classes/sun/text/RuleBasedBreakIterator.java b/src/java.base/share/classes/sun/text/RuleBasedBreakIterator.java index b3abf812f29dad922ba187e88b5d3baf9750a390..4d46cbd1c9c1b50912e0f8a4158a4c5562fc1e6a 100644 --- a/src/java.base/share/classes/sun/text/RuleBasedBreakIterator.java +++ b/src/java.base/share/classes/sun/text/RuleBasedBreakIterator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2022, 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 @@ -70,7 +70,7 @@ import sun.text.SupplementaryCharacterData; * expression defines a set of characters (the "ignore characters") that * will be transparent to the BreakIterator.  A sequence of characters will break the * same way it would if any ignore characters it contains are taken out.  Break - * positions never occur befoer ignore characters.

    + * positions never occur before ignore characters.

    * *

    A regular expression uses a subset of the normal Unix regular-expression syntax, and * defines a sequence of characters to be kept together. With one significant exception, the @@ -151,7 +151,7 @@ import sun.text.SupplementaryCharacterData; * If ! appears at the beginning of a regular expression, it tells the regexp * parser that this expression specifies the backwards-iteration behavior of the iterator, * and not its normal iteration behavior.  This is generally only used in situations - * where the automatically-generated backwards-iteration brhavior doesn't produce + * where the automatically-generated backwards-iteration behavior doesn't produce * satisfactory results and must be supplemented with extra client-specified rules. * * diff --git a/src/java.base/share/classes/sun/text/spi/JavaTimeDateTimePatternProvider.java b/src/java.base/share/classes/sun/text/spi/JavaTimeDateTimePatternProvider.java index c8fd888e2b2699f253a97735c6263c6f4e831f89..a3835c6ac82e1a93214a4785eb438a241768fbed 100644 --- a/src/java.base/share/classes/sun/text/spi/JavaTimeDateTimePatternProvider.java +++ b/src/java.base/share/classes/sun/text/spi/JavaTimeDateTimePatternProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2022, 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,12 +46,12 @@ public abstract class JavaTimeDateTimePatternProvider extends LocaleServiceProvi * Concrete implementation of this method will retrieve * a java.time specific dateTime Pattern from selected Locale Provider. * - * @param timeStyle an {@code int} value representing FormatStyle constant, -1 + * @param timeStyle an {@code int} value, representing FormatStyle constant, -1 * for date-only pattern - * @param dateStyle an {@code int} value,representing FormatStyle constant, -1 + * @param dateStyle an {@code int} value, representing FormatStyle constant, -1 * for time-only pattern * @param locale {@code locale}, non-null - * @param calType a {@code String},non-null representing CalendarType such as "japanese", + * @param calType a {@code String}, non-null representing CalendarType such as "japanese", * "iso8601" * @return formatting pattern {@code String} * @see java.time.format.DateTimeFormatterBuilder#convertStyle(java.time.format.FormatStyle) diff --git a/src/java.base/share/classes/sun/util/locale/provider/LocaleResources.java b/src/java.base/share/classes/sun/util/locale/provider/LocaleResources.java index b6351cf1aca9a2702324dd9ddbbde34ba881d57d..fe84b66b167c75666126102714eb197c82677c86 100644 --- a/src/java.base/share/classes/sun/util/locale/provider/LocaleResources.java +++ b/src/java.base/share/classes/sun/util/locale/provider/LocaleResources.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2021, 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 @@ -605,7 +605,7 @@ public class LocaleResources { } } - private static final boolean TRACE_ON = Boolean.valueOf( + private static final boolean TRACE_ON = Boolean.parseBoolean( GetPropertyAction.privilegedGetProperty("locale.resources.debug", "false")); public static void trace(String format, Object... params) { diff --git a/src/java.base/share/legal/icu.md b/src/java.base/share/legal/icu.md index ab850bf143edf5f4febfbc82c7b65f47b0e2bd8e..35a54e61112aaac3257c9ea0b255baa3fd58effb 100644 --- a/src/java.base/share/legal/icu.md +++ b/src/java.base/share/legal/icu.md @@ -1,4 +1,4 @@ -## International Components for Unicode (ICU4J) v67.1 +## International Components for Unicode (ICU4J) v70.1 ### ICU4J License ``` @@ -80,61 +80,439 @@ of the copyright holder. All trademarks and registered trademarks mentioned herein are the property of their respective owners. +2. Chinese/Japanese Word Break Dictionary Data (cjdict.txt) -—————————————————————————————————————————————————————————————————————— - - -From: https://www.unicode.org/copyright.html: - - Unicode® Copyright and Terms of Use - - For the general privacy policy governing access to this site, see the Unicode Privacy Policy. - - Unicode Copyright - Copyright © 1991-2020 Unicode, Inc. All rights reserved. - Definitions - - Unicode Data Files ("DATA FILES") include all data files under the directories: - https://www.unicode.org/Public/ - https://www.unicode.org/reports/ - https://www.unicode.org/ivd/data/ - - Unicode Data Files do not include PDF online code charts under the directory: - https://www.unicode.org/Public/ - - Unicode Software ("SOFTWARE") includes any source code published in the Unicode Standard - or any source code or compiled code under the directories: - https://www.unicode.org/Public/PROGRAMS/ - https://www.unicode.org/Public/cldr/ - http://site.icu-project.org/download/ - - Terms of Use - Certain documents and files on this website contain a legend indicating that "Modification is permitted." Any person is hereby authorized, without fee, to modify such documents and files to create derivative works conforming to the Unicode® Standard, subject to Terms and Conditions herein. - Any person is hereby authorized, without fee, to view, use, reproduce, and distribute all documents and files, subject to the Terms and Conditions herein. - Further specifications of rights and restrictions pertaining to the use of the Unicode DATA FILES and SOFTWARE can be found in the Unicode Data Files and Software License. - Each version of the Unicode Standard has further specifications of rights and restrictions of use. For the book editions (Unicode 5.0 and earlier), these are found on the back of the title page. - The Unicode PDF online code charts carry specific restrictions. Those restrictions are incorporated as the first page of each PDF code chart. - All other files, including online documentation of the core specification for Unicode 6.0 and later, are covered under these general Terms of Use. - No license is granted to "mirror" the Unicode website where a fee is charged for access to the "mirror" site. - Modification is not permitted with respect to this document. All copies of this document must be verbatim. - Restricted Rights Legend - Any technical data or software which is licensed to the United States of America, its agencies and/or instrumentalities under this Agreement is commercial technical data or commercial computer software developed exclusively at private expense as defined in FAR 2.101, or DFARS 252.227-7014 (June 1995), as applicable. For technical data, use, duplication, or disclosure by the Government is subject to restrictions as set forth in DFARS 202.227-7015 Technical Data, Commercial and Items (Nov 1995) and this Agreement. For Software, in accordance with FAR 12-212 or DFARS 227-7202, as applicable, use, duplication or disclosure by the Government is subject to the restrictions set forth in this Agreement. - Warranties and Disclaimers - This publication and/or website may include technical or typographical errors or other inaccuracies. Changes are periodically added to the information herein; these changes will be incorporated in new editions of the publication and/or website. Unicode, Inc. may make improvements and/or changes in the product(s) and/or program(s) described in this publication and/or website at any time. - If this file has been purchased on magnetic or optical media from Unicode, Inc. the sole and exclusive remedy for any claim will be exchange of the defective media within ninety (90) days of original purchase. - EXCEPT AS PROVIDED IN SECTION E.2, THIS PUBLICATION AND/OR SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND EITHER EXPRESS, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT. UNICODE, INC. AND ITS LICENSORS ASSUME NO RESPONSIBILITY FOR ERRORS OR OMISSIONS IN THIS PUBLICATION AND/OR SOFTWARE OR OTHER DOCUMENTS WHICH ARE REFERENCED BY OR LINKED TO THIS PUBLICATION OR THE UNICODE WEBSITE. - Waiver of Damages - In no event shall Unicode, Inc. or its licensors be liable for any special, incidental, indirect or consequential damages of any kind, or any damages whatsoever, whether or not Unicode, Inc. was advised of the possibility of the damage, including, without limitation, those resulting from the following: loss of use, data or profits, in connection with the use, modification or distribution of this information or its derivatives. - Trademarks & Logos - The Unicode Word Mark and the Unicode Logo are trademarks of Unicode, Inc. “The Unicode Consortium” and “Unicode, Inc.” are trade names of Unicode, Inc. Use of the information and materials found on this website indicates your acknowledgement of Unicode, Inc.’s exclusive worldwide rights in the Unicode Word Mark, the Unicode Logo, and the Unicode trade names. - The Unicode Consortium Name and Trademark Usage Policy (“Trademark Policy”) are incorporated herein by reference and you agree to abide by the provisions of the Trademark Policy, which may be changed from time to time in the sole discretion of Unicode, Inc. - All third party trademarks referenced herein are the property of their respective owners. - Miscellaneous - Jurisdiction and Venue. This website is operated from a location in the State of California, United States of America. Unicode, Inc. makes no representation that the materials are appropriate for use in other locations. If you access this website from other locations, you are responsible for compliance with local laws. This Agreement, all use of this website and any claims and damages resulting from use of this website are governed solely by the laws of the State of California without regard to any principles which would apply the laws of a different jurisdiction. The user agrees that any disputes regarding this website shall be resolved solely in the courts located in Santa Clara County, California. The user agrees said courts have personal jurisdiction and agree to waive any right to transfer the dispute to any other forum. - Modification by Unicode, Inc. Unicode, Inc. shall have the right to modify this Agreement at any time by posting it to this website. The user may not assign any part of this Agreement without Unicode, Inc.’s prior written consent. - Taxes. The user agrees to pay any taxes arising from access to this website or use of the information herein, except for those based on Unicode’s net income. - Severability. If any provision of this Agreement is declared invalid or unenforceable, the remaining provisions of this Agreement shall remain in effect. - Entire Agreement. This Agreement constitutes the entire agreement between the parties. + # The Google Chrome software developed by Google is licensed under + # the BSD license. Other software included in this distribution is + # provided under other licenses, as set forth below. + # + # The BSD License + # http://opensource.org/licenses/bsd-license.php + # Copyright (C) 2006-2008, Google Inc. + # + # All rights reserved. + # + # Redistribution and use in source and binary forms, with or without + # modification, are permitted provided that the following conditions are met: + # + # Redistributions of source code must retain the above copyright notice, + # this list of conditions and the following disclaimer. + # Redistributions in binary form must reproduce the above + # copyright notice, this list of conditions and the following + # disclaimer in the documentation and/or other materials provided with + # the distribution. + # Neither the name of Google Inc. nor the names of its + # contributors may be used to endorse or promote products derived from + # this software without specific prior written permission. + # + # + # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND + # CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, + # INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + # DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + # LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + # CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + # SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + # BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + # LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + # + # + # The word list in cjdict.txt are generated by combining three word lists + # listed below with further processing for compound word breaking. The + # frequency is generated with an iterative training against Google web + # corpora. + # + # * Libtabe (Chinese) + # - https://sourceforge.net/project/?group_id=1519 + # - Its license terms and conditions are shown below. + # + # * IPADIC (Japanese) + # - http://chasen.aist-nara.ac.jp/chasen/distribution.html + # - Its license terms and conditions are shown below. + # + # ---------COPYING.libtabe ---- BEGIN-------------------- + # + # /* + # * Copyright (c) 1999 TaBE Project. + # * Copyright (c) 1999 Pai-Hsiang Hsiao. + # * All rights reserved. + # * + # * Redistribution and use in source and binary forms, with or without + # * modification, are permitted provided that the following conditions + # * are met: + # * + # * . Redistributions of source code must retain the above copyright + # * notice, this list of conditions and the following disclaimer. + # * . Redistributions in binary form must reproduce the above copyright + # * notice, this list of conditions and the following disclaimer in + # * the documentation and/or other materials provided with the + # * distribution. + # * . Neither the name of the TaBE Project nor the names of its + # * contributors may be used to endorse or promote products derived + # * from this software without specific prior written permission. + # * + # * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + # * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + # * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + # * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + # * REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + # * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + # * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + # * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + # * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + # * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + # * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + # * OF THE POSSIBILITY OF SUCH DAMAGE. + # */ + # + # /* + # * Copyright (c) 1999 Computer Systems and Communication Lab, + # * Institute of Information Science, Academia + # * Sinica. All rights reserved. + # * + # * Redistribution and use in source and binary forms, with or without + # * modification, are permitted provided that the following conditions + # * are met: + # * + # * . Redistributions of source code must retain the above copyright + # * notice, this list of conditions and the following disclaimer. + # * . Redistributions in binary form must reproduce the above copyright + # * notice, this list of conditions and the following disclaimer in + # * the documentation and/or other materials provided with the + # * distribution. + # * . Neither the name of the Computer Systems and Communication Lab + # * nor the names of its contributors may be used to endorse or + # * promote products derived from this software without specific + # * prior written permission. + # * + # * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + # * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + # * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + # * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + # * REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + # * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + # * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + # * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + # * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + # * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + # * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + # * OF THE POSSIBILITY OF SUCH DAMAGE. + # */ + # + # Copyright 1996 Chih-Hao Tsai @ Beckman Institute, + # University of Illinois + # c-tsai4@uiuc.edu http://casper.beckman.uiuc.edu/~c-tsai4 + # + # ---------------COPYING.libtabe-----END-------------------------------- + # + # + # ---------------COPYING.ipadic-----BEGIN------------------------------- + # + # Copyright 2000, 2001, 2002, 2003 Nara Institute of Science + # and Technology. All Rights Reserved. + # + # Use, reproduction, and distribution of this software is permitted. + # Any copy of this software, whether in its original form or modified, + # must include both the above copyright notice and the following + # paragraphs. + # + # Nara Institute of Science and Technology (NAIST), + # the copyright holders, disclaims all warranties with regard to this + # software, including all implied warranties of merchantability and + # fitness, in no event shall NAIST be liable for + # any special, indirect or consequential damages or any damages + # whatsoever resulting from loss of use, data or profits, whether in an + # action of contract, negligence or other tortuous action, arising out + # of or in connection with the use or performance of this software. + # + # A large portion of the dictionary entries + # originate from ICOT Free Software. The following conditions for ICOT + # Free Software applies to the current dictionary as well. + # + # Each User may also freely distribute the Program, whether in its + # original form or modified, to any third party or parties, PROVIDED + # that the provisions of Section 3 ("NO WARRANTY") will ALWAYS appear + # on, or be attached to, the Program, which is distributed substantially + # in the same form as set out herein and that such intended + # distribution, if actually made, will neither violate or otherwise + # contravene any of the laws and regulations of the countries having + # jurisdiction over the User or the intended distribution itself. + # + # NO WARRANTY + # + # The program was produced on an experimental basis in the course of the + # research and development conducted during the project and is provided + # to users as so produced on an experimental basis. Accordingly, the + # program is provided without any warranty whatsoever, whether express, + # implied, statutory or otherwise. The term "warranty" used herein + # includes, but is not limited to, any warranty of the quality, + # performance, merchantability and fitness for a particular purpose of + # the program and the nonexistence of any infringement or violation of + # any right of any third party. + # + # Each user of the program will agree and understand, and be deemed to + # have agreed and understood, that there is no warranty whatsoever for + # the program and, accordingly, the entire risk arising from or + # otherwise connected with the program is assumed by the user. + # + # Therefore, neither ICOT, the copyright holder, or any other + # organization that participated in or was otherwise related to the + # development of the program and their respective officials, directors, + # officers and other employees shall be held liable for any and all + # damages, including, without limitation, general, special, incidental + # and consequential damages, arising out of or otherwise in connection + # with the use or inability to use the program or any product, material + # or result produced or otherwise obtained by using the program, + # regardless of whether they have been advised of, or otherwise had + # knowledge of, the possibility of such damages at any time during the + # project or thereafter. Each user will be deemed to have agreed to the + # foregoing by his or her commencement of use of the program. The term + # "use" as used herein includes, but is not limited to, the use, + # modification, copying and distribution of the program and the + # production of secondary products from the program. + # + # In the case where the program, whether in its original form or + # modified, was distributed or delivered to or received by a user from + # any person, organization or entity other than ICOT, unless it makes or + # grants independently of ICOT any specific warranty to the user in + # writing, such person, organization or entity, will also be exempted + # from and not be held liable to the user for any such damages as noted + # above as far as the program is concerned. + # + # ---------------COPYING.ipadic-----END---------------------------------- + +3. Lao Word Break Dictionary Data (laodict.txt) + + # Copyright (C) 2016 and later: Unicode, Inc. and others. + # License & terms of use: http://www.unicode.org/copyright.html + # Copyright (c) 2015 International Business Machines Corporation + # and others. All Rights Reserved. + # + # Project: https://github.com/rober42539/lao-dictionary + # Dictionary: https://github.com/rober42539/lao-dictionary/laodict.txt + # License: https://github.com/rober42539/lao-dictionary/LICENSE.txt + # (copied below) + # + # This file is derived from the above dictionary version of Nov 22, 2020 + # ---------------------------------------------------------------------- + # Copyright (C) 2013 Brian Eugene Wilson, Robert Martin Campbell. + # All rights reserved. + # + # Redistribution and use in source and binary forms, with or without + # modification, are permitted provided that the following conditions are met: + # + # Redistributions of source code must retain the above copyright notice, this + # list of conditions and the following disclaimer. Redistributions in binary + # form must reproduce the above copyright notice, this list of conditions and + # the following disclaimer in the documentation and/or ther materials + # provided with the distribution. + # + # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + # FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + # COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + # INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + # (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + # SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + # STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + # OF THE POSSIBILITY OF SUCH DAMAGE. + # -------------------------------------------------------------------------- + +4. Burmese Word Break Dictionary Data (burmesedict.txt) + + # Copyright (c) 2014 International Business Machines Corporation + # and others. All Rights Reserved. + # + # This list is part of a project hosted at: + # github.com/kanyawtech/myanmar-karen-word-lists + # + # -------------------------------------------------------------------------- + # Copyright (c) 2013, LeRoy Benjamin Sharon + # All rights reserved. + # + # Redistribution and use in source and binary forms, with or without + # modification, are permitted provided that the following conditions + # are met: Redistributions of source code must retain the above + # copyright notice, this list of conditions and the following + # disclaimer. Redistributions in binary form must reproduce the + # above copyright notice, this list of conditions and the following + # disclaimer in the documentation and/or other materials provided + # with the distribution. + # + # Neither the name Myanmar Karen Word Lists, nor the names of its + # contributors may be used to endorse or promote products derived + # from this software without specific prior written permission. + # + # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND + # CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, + # INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + # DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS + # BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + # EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + # TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + # ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + # TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF + # THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + # SUCH DAMAGE. + # -------------------------------------------------------------------------- + +5. Time Zone Database + + ICU uses the public domain data and code derived from Time Zone +Database for its time zone support. The ownership of the TZ database +is explained in BCP 175: Procedure for Maintaining the Time Zone +Database section 7. + + # 7. Database Ownership + # + # The TZ database itself is not an IETF Contribution or an IETF + # document. Rather it is a pre-existing and regularly updated work + # that is in the public domain, and is intended to remain in the + # public domain. Therefore, BCPs 78 [RFC5378] and 79 [RFC3979] do + # not apply to the TZ Database or contributions that individuals make + # to it. Should any claims be made and substantiated against the TZ + # Database, the organization that is providing the IANA + # Considerations defined in this RFC, under the memorandum of + # understanding with the IETF, currently ICANN, may act in accordance + # with all competent court orders. No ownership claims will be made + # by ICANN or the IETF Trust on the database or the code. Any person + # making a contribution to the database or code waives all rights to + # future claims in that contribution or in the TZ Database. + +6. Google double-conversion + +Copyright 2006-2011, the V8 project authors. All rights reserved. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + * Neither the name of Google Inc. nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +==================================================== + +Unicode® Copyright and Terms of Use +For the general privacy policy governing access to this site, see the Unicode Privacy Policy. + +Unicode Copyright +Copyright © 1991-2021 Unicode, Inc. All rights reserved. +Definitions +Unicode Data Files ("DATA FILES") include all data files under the directories: +https://www.unicode.org/Public/ +https://www.unicode.org/reports/ +https://www.unicode.org/ivd/data/ + +Unicode Data Files do not include PDF online code charts under the directory: +https://www.unicode.org/Public/ + +Unicode Software ("SOFTWARE") includes any source code published in the Unicode Standard +or any source code or compiled code under the directories: +https://www.unicode.org/Public/PROGRAMS/ +https://www.unicode.org/Public/cldr/ +http://site.icu-project.org/download/ +Terms of Use +Certain documents and files on this website contain a legend indicating that "Modification is permitted." Any person is hereby authorized, without fee, to modify such documents and files to create derivative works conforming to the Unicode® Standard, subject to Terms and Conditions herein. +Any person is hereby authorized, without fee, to view, use, reproduce, and distribute all documents and files, subject to the Terms and Conditions herein. +Further specifications of rights and restrictions pertaining to the use of the Unicode DATA FILES and SOFTWARE can be found in the Unicode Data Files and Software License. +Each version of the Unicode Standard has further specifications of rights and restrictions of use. For the book editions (Unicode 5.0 and earlier), these are found on the back of the title page. +The Unicode PDF online code charts carry specific restrictions. Those restrictions are incorporated as the first page of each PDF code chart. +All other files, including online documentation of the core specification for Unicode 6.0 and later, are covered under these general Terms of Use. +No license is granted to "mirror" the Unicode website where a fee is charged for access to the "mirror" site. +Modification is not permitted with respect to this document. All copies of this document must be verbatim. +Restricted Rights Legend +Any technical data or software which is licensed to the United States of America, its agencies and/or instrumentalities under this Agreement is commercial technical data or commercial computer software developed exclusively at private expense as defined in FAR 2.101, or DFARS 252.227-7014 (June 1995), as applicable. For technical data, use, duplication, or disclosure by the Government is subject to restrictions as set forth in DFARS 202.227-7015 Technical Data, Commercial and Items (Nov 1995) and this Agreement. For Software, in accordance with FAR 12-212 or DFARS 227-7202, as applicable, use, duplication or disclosure by the Government is subject to the restrictions set forth in this Agreement. +Warranties and Disclaimers +This publication and/or website may include technical or typographical errors or other inaccuracies. Changes are periodically added to the information herein; these changes will be incorporated in new editions of the publication and/or website. Unicode, Inc. may make improvements and/or changes in the product(s) and/or program(s) described in this publication and/or website at any time. +If this file has been purchased on magnetic or optical media from Unicode, Inc. the sole and exclusive remedy for any claim will be exchange of the defective media within ninety (90) days of original purchase. +EXCEPT AS PROVIDED IN SECTION E.2, THIS PUBLICATION AND/OR SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND EITHER EXPRESS, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT. UNICODE, INC. AND ITS LICENSORS ASSUME NO RESPONSIBILITY FOR ERRORS OR OMISSIONS IN THIS PUBLICATION AND/OR SOFTWARE OR OTHER DOCUMENTS WHICH ARE REFERENCED BY OR LINKED TO THIS PUBLICATION OR THE UNICODE WEBSITE. +Waiver of Damages +In no event shall Unicode, Inc. or its licensors be liable for any special, incidental, indirect or consequential damages of any kind, or any damages whatsoever, whether or not Unicode, Inc. was advised of the possibility of the damage, including, without limitation, those resulting from the following: loss of use, data or profits, in connection with the use, modification or distribution of this information or its derivatives. +Trademarks & Logos +The Unicode Word Mark and the Unicode Logo are trademarks of Unicode, Inc. “The Unicode Consortium” and “Unicode, Inc.” are trade names of Unicode, Inc. Use of the information and materials found on this website indicates your acknowledgement of Unicode, Inc.’s exclusive worldwide rights in the Unicode Word Mark, the Unicode Logo, and the Unicode trade names. +The Unicode Consortium Name and Trademark Usage Policy (“Trademark Policy”) are incorporated herein by reference and you agree to abide by the provisions of the Trademark Policy, which may be changed from time to time in the sole discretion of Unicode, Inc. +All third party trademarks referenced herein are the property of their respective owners. +Miscellaneous +Jurisdiction and Venue. This website is operated from a location in the State of California, United States of America. Unicode, Inc. makes no representation that the materials are appropriate for use in other locations. If you access this website from other locations, you are responsible for compliance with local laws. This Agreement, all use of this website and any claims and damages resulting from use of this website are governed solely by the laws of the State of California without regard to any principles which would apply the laws of a different jurisdiction. The user agrees that any disputes regarding this website shall be resolved solely in the courts located in Santa Clara County, California. The user agrees said courts have personal jurisdiction and agree to waive any right to transfer the dispute to any other forum. +Modification by Unicode, Inc. Unicode, Inc. shall have the right to modify this Agreement at any time by posting it to this website. The user may not assign any part of this Agreement without Unicode, Inc.’s prior written consent. +Taxes. The user agrees to pay any taxes arising from access to this website or use of the information herein, except for those based on Unicode’s net income. +Severability. If any provision of this Agreement is declared invalid or unenforceable, the remaining provisions of this Agreement shall remain in effect. +Entire Agreement. This Agreement constitutes the entire agreement between the parties. + +======================================================= + +UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE + +See Terms of Use +for definitions of Unicode Inc.’s Data Files and Software. + +NOTICE TO USER: Carefully read the following legal agreement. +BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S +DATA FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"), +YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE +TERMS AND CONDITIONS OF THIS AGREEMENT. +IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE +THE DATA FILES OR SOFTWARE. + +COPYRIGHT AND PERMISSION NOTICE + +Copyright © 1991-2021 Unicode, Inc. All rights reserved. +Distributed under the Terms of Use in https://www.unicode.org/copyright.html. + +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Unicode data files and any associated documentation +(the "Data Files") or Unicode software and any associated documentation +(the "Software") to deal in the Data Files or Software +without restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, and/or sell copies of +the Data Files or Software, and to permit persons to whom the Data Files +or Software are furnished to do so, provided that either +(a) this copyright and permission notice appear with all copies +of the Data Files or Software, or +(b) this copyright and permission notice appear in associated +Documentation. + +THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF +ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE +WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT OF THIRD PARTY RIGHTS. +IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS +NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL +DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THE DATA FILES OR SOFTWARE. + +Except as contained in this notice, the name of a copyright holder +shall not be used in advertising or otherwise to promote the sale, +use or other dealings in these Data Files or Software without prior +written authorization of the copyright holder. ``` diff --git a/src/java.base/share/legal/unicode.md b/src/java.base/share/legal/unicode.md index cff0c82a873dd86974430c7b506303b313dfed04..fbb82346769fa04caf4186bfa53e01df02238d4a 100644 --- a/src/java.base/share/legal/unicode.md +++ b/src/java.base/share/legal/unicode.md @@ -1,5 +1,5 @@ -## The Unicode Standard, Unicode Character Database, Version 13.0.0 - +## The Unicode Standard, Unicode Character Database, Version 14.0.0 + ### Unicode Character Database ``` @@ -18,7 +18,7 @@ THE DATA FILES OR SOFTWARE. COPYRIGHT AND PERMISSION NOTICE -Copyright © 1991-2020 Unicode, Inc. All rights reserved. +Copyright © 1991-2021 Unicode, Inc. All rights reserved. Distributed under the Terms of Use in https://www.unicode.org/copyright.html. Permission is hereby granted, free of charge, to any person obtaining @@ -50,5 +50,54 @@ shall not be used in advertising or otherwise to promote the sale, use or other dealings in these Data Files or Software without prior written authorization of the copyright holder. +=== http://www.unicode.org/copyright.html content === +Unicode (R) Copyright and Terms of Use +For the general privacy policy governing access to this site, see the Unicode Privacy Policy. + +Unicode Copyright +Copyright (C) 1991-2021 Unicode, Inc. All rights reserved. +Definitions +Unicode Data Files ("DATA FILES") include all data files under the directories: +https://www.unicode.org/Public/ +https://www.unicode.org/reports/ +https://www.unicode.org/ivd/data/ + +Unicode Data Files do not include PDF online code charts under the directory: +https://www.unicode.org/Public/ + +Unicode Software ("SOFTWARE") includes any source code published in the Unicode Standard +or any source code or compiled code under the directories: +https://www.unicode.org/Public/PROGRAMS/ +https://www.unicode.org/Public/cldr/ +http://site.icu-project.org/download/ +Terms of Use +Certain documents and files on this website contain a legend indicating that "Modification is permitted." Any person is hereby authorized, without fee, to modify such documents and files to create derivative works conforming to the Unicode® Standard, subject to Terms and Conditions herein. +Any person is hereby authorized, without fee, to view, use, reproduce, and distribute all documents and files, subject to the Terms and Conditions herein. +Further specifications of rights and restrictions pertaining to the use of the Unicode DATA FILES and SOFTWARE can be found in the Unicode Data Files and Software License. +Each version of the Unicode Standard has further specifications of rights and restrictions of use. For the book editions (Unicode 5.0 and earlier), these are found on the back of the title page. +The Unicode PDF online code charts carry specific restrictions. Those restrictions are incorporated as the first page of each PDF code chart. +All other files, including online documentation of the core specification for Unicode 6.0 and later, are covered under these general Terms of Use. +No license is granted to "mirror" the Unicode website where a fee is charged for access to the "mirror" site. +Modification is not permitted with respect to this document. All copies of this document must be verbatim. +Restricted Rights Legend +Any technical data or software which is licensed to the United States of America, its agencies and/or instrumentalities under this Agreement is commercial technical data or commercial computer software developed exclusively at private expense as defined in FAR 2.101, or DFARS 252.227-7014 (June 1995), as applicable. For technical data, use, duplication, or disclosure by the Government is subject to restrictions as set forth in DFARS 202.227-7015 Technical Data, Commercial and Items (Nov 1995) and this Agreement. For Software, in accordance with FAR 12-212 or DFARS 227-7202, as applicable, use, duplication or disclosure by the Government is subject to the restrictions set forth in this Agreement. +Warranties and Disclaimers +This publication and/or website may include technical or typographical errors or other inaccuracies. Changes are periodically added to the information herein; these changes will be incorporated in new editions of the publication and/or website. Unicode, Inc. may make improvements and/or changes in the product(s) and/or program(s) described in this publication and/or website at any time. +If this file has been purchased on magnetic or optical media from Unicode, Inc. the sole and exclusive remedy for any claim will be exchange of the defective media within ninety (90) days of original purchase. +EXCEPT AS PROVIDED IN SECTION E.2, THIS PUBLICATION AND/OR SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND EITHER EXPRESS, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT. UNICODE, INC. AND ITS LICENSORS ASSUME NO RESPONSIBILITY FOR ERRORS OR OMISSIONS IN THIS PUBLICATION AND/OR SOFTWARE OR OTHER DOCUMENTS WHICH ARE REFERENCED BY OR LINKED TO THIS PUBLICATION OR THE UNICODE WEBSITE. +Waiver of Damages +In no event shall Unicode, Inc. or its licensors be liable for any special, incidental, indirect or consequential damages of any kind, or any damages whatsoever, whether or not Unicode, Inc. was advised of the possibility of the damage, including, without limitation, those resulting from the following: loss of use, data or profits, in connection with the use, modification or distribution of this information or its derivatives. +Trademarks & Logos +The Unicode Word Mark and the Unicode Logo are trademarks of Unicode, Inc. “The Unicode Consortium” and “Unicode, Inc.” are trade names of Unicode, Inc. Use of the information and materials found on this website indicates your acknowledgement of Unicode, Inc.’s exclusive worldwide rights in the Unicode Word Mark, the Unicode Logo, and the Unicode trade names. +The Unicode Consortium Name and Trademark Usage Policy (“Trademark Policy”) are incorporated herein by reference and you agree to abide by the provisions of the Trademark Policy, which may be changed from time to time in the sole discretion of Unicode, Inc. +All third party trademarks referenced herein are the property of their respective owners. +Miscellaneous +Jurisdiction and Venue. This website is operated from a location in the State of California, United States of America. Unicode, Inc. makes no representation that the materials are appropriate for use in other locations. If you access this website from other locations, you are responsible for compliance with local laws. This Agreement, all use of this website and any claims and damages resulting from use of this website are governed solely by the laws of the State of California without regard to any principles which would apply the laws of a different jurisdiction. The user agrees that any disputes regarding this website shall be resolved solely in the courts located in Santa Clara County, California. The user agrees said courts have personal jurisdiction and agree to waive any right to transfer the dispute to any other forum. +Modification by Unicode, Inc. Unicode, Inc. shall have the right to modify this Agreement at any time by posting it to this website. The user may not assign any part of this Agreement without Unicode, Inc.’s prior written consent. +Taxes. The user agrees to pay any taxes arising from access to this website or use of the information herein, except for those based on Unicode’s net income. +Severability. If any provision of this Agreement is declared invalid or unenforceable, the remaining provisions of this Agreement shall remain in effect. +Entire Agreement. This Agreement constitutes the entire agreement between the parties. + + ``` diff --git a/src/java.base/share/man/java.1 b/src/java.base/share/man/java.1 index 442e4a9dfb456b762c6394c45bb52c01decb33af..6a1532a8981ba93481fdd1542d55e9511537efa0 100644 --- a/src/java.base/share/man/java.1 +++ b/src/java.base/share/man/java.1 @@ -1,4 +1,4 @@ -.\" Copyright (c) 1994, 2021, Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1994, 2022, 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 @@ -512,6 +512,15 @@ of the release. .RS .RE .TP +.B \f[CB]\-\-finalization=\f[R]\f[I]value\f[R] +Controls whether the JVM performs finalization of objects. +Valid values are "enabled" and "disabled". +Finalization is enabled by default, so the value "enabled" does nothing. +The value "disabled" disables finalization, so that no finalizers are +invoked. +.RS +.RE +.TP .B \f[CB]\-\-module\-path\f[R] \f[I]modulepath\f[R]... or \f[CB]\-p\f[R] \f[I]modulepath\f[R] A semicolon (\f[CB];\f[R]) separated list of directories in which each directory is a directory of modules. @@ -1081,8 +1090,10 @@ Require using shared class data, otherwise fail. .RS .PP \f[B]Note:\f[R] The \f[CB]\-Xshare:on\f[R] option is used for testing -purposes only and may cause intermittent failures due to the use of -address space layout randomization by the operation system. +purposes only. +It may cause the VM to unexpectedly exit during start\-up when the CDS +archive cannot be used (for example, when certain VM parameters are +changed, or when a different JDK is used). This option should not be used in production environments. .RE .TP @@ -1431,14 +1442,6 @@ By default, this parameter is enabled. .RS .RE .TP -.B \f[CB]samplethreads=\f[R]{\f[CB]true\f[R]|\f[CB]false\f[R]} -Specifies whether thread sampling is enabled. -Thread sampling occurs only if the sampling event is enabled along with -this parameter. -By default, this parameter is enabled. -.RS -.RE -.TP .B \f[CB]stackdepth=\f[R]\f[I]depth\f[R] Stack depth for stack traces. By default, the depth is set to 64 method calls. @@ -5255,293 +5258,83 @@ who\[aq]s running the application, because administrators by default don\[aq]t have the privilege to lock pages in memory. .SH APPLICATION CLASS DATA SHARING .PP -Application Class Data Sharing (AppCDS) extends class data sharing (CDS) -to enable application classes to be placed in a shared archive. +Application Class Data Sharing (AppCDS) stores classes used by your +applications in an archive file. +Since these classes are stored in a format that can be loaded very +quickly (compared to classes stored in a JAR file), AppCDS can improve +the start\-up time of your applications. +In addition, AppCDS can reduce the runtime memory footprint by sharing +parts of these classes across multiple processes. .PP -In addition to the core library classes, AppCDS supports \f[B]Class Data -Sharing\f[R] -[https://docs.oracle.com/en/java/javase/12/vm/class\-data\-sharing.html#GUID\-7EAA3411\-8CF0\-4D19\-BD05\-DF5E1780AA91] -from the following locations: -.IP \[bu] 2 -Platform classes from the runtime image -.IP \[bu] 2 -Application classes from the runtime image -.IP \[bu] 2 -Application classes from the class path -.IP \[bu] 2 -Application classes from the module path +Classes in the CDS archive are stored in an optimized format that\[aq]s +about 2 to 5 times larger than classes stored in JAR files or the JDK +runtime image. +Therefore, it\[aq]s a good idea to archive only those classes that are +actually used by your application. +These usually are just a small portion of all available classes. +For example, your application may use only a few APIs provided by a +large library. +.SS Using CDS Archives .PP -Archiving application classes provides better start up time at runtime. -When running multiple JVM processes, AppCDS also reduces the runtime -footprint with memory sharing for read\-only metadata. +By default, in most JDK distributions, unless \f[CB]\-Xshare:off\f[R] is +specified, the JVM starts up with a default CDS archive, which is +usually located in \f[CB]JAVA_HOME/lib/server/classes.jsa\f[R] (or +\f[CB]JAVA_HOME\\bin\\server\\classes.jsa\f[R] on Windows). +This archive contains about 1300 core library classes that are used by +most applications. .PP -CDS/AppCDS supports archiving classes from JAR files only. +To use CDS for the exact set of classes used by your application, you +can use the \f[CB]\-XX:SharedArchiveFile\f[R] option, which has the +general form: +.RS .PP -Prior to JDK 11, a non\-empty directory was reported as a fatal error in -the following conditions: -.IP \[bu] 2 -For base CDS, a non\-empty directory cannot exist in the -\f[CB]\-Xbootclasspath/a\f[R] path +\f[CB]\-XX:SharedArchiveFile=:\f[R] +.RE .IP \[bu] 2 -With \f[CB]\-XX:+UseAppCDS\f[R], a non\-empty directory could not exist in -the \f[CB]\-Xbootclasspath/a\f[R] path, class path, and module path. -.PP -In JDK 11 and later, \f[CB]\-XX:+UseAppCDS\f[R] is obsolete and the -behavior for a non\-empty directory is based on the class types in the -classlist. -A non\-empty directory is reported as a fatal error in the following -conditions: +The \f[CB]\f[R] overrides the default CDS archive. .IP \[bu] 2 -If application classes or platform classes are not loaded, dump time -only reports an error if a non\-empty directory exists in -\f[CB]\-Xbootclasspath/a\f[R] path +The \f[CB]\f[R] provides additional classes that can be +loaded on top of those in the \f[CB]\f[R]. .IP \[bu] 2 -If application classes or platform classes are loaded, dump time reports -an error for a non\-empty directory that exists in -\f[CB]\-Xbootclasspath/a\f[R] path, class path, or module path -.PP -In JDK 11 and later, using -\f[CB]\-XX:DumpLoadedClassList=\f[R]\f[I]class_list_file\f[R] results a -generated classlist with all classes (both system library classes and -application classes) included. -You no longer have to specify \f[CB]\-XX:+UseAppCDS\f[R] with -\f[CB]\-XX:DumpLoadedClassList\f[R] to produce a complete class list. +On Windows, the above path delimiter \f[CB]:\f[R] should be replaced with +\f[CB];\f[R] .PP -In JDK 11 and later, because \f[CB]UseAppCDS\f[R] is obsolete, -\f[CB]SharedArchiveFile\f[R] becomes a product flag by default. -Specifying \f[CB]+UnlockDiagnosticVMOptions\f[R] for -\f[CB]SharedArchiveFile\f[R] is no longer needed in any configuration. +(The names "static" and "dyanmic" are used for historical reasons. +The only significance is that the "static" archive is loaded first and +the "dynamic" archive is loaded second). .PP -Class Data Sharing (CDS)/AppCDS does not support archiving array classes -in a class list. -When an array in the class list is encountered, CDS dump time gives the -explicit error message: +The JVM can use up to two archives. +To use only a single \f[CB]\f[R], you can omit the +\f[CB]\f[R] portion: .RS .PP -\f[CB]Preload\ Warning:\ Cannot\ find\f[R] \f[I]array_name\f[R] +\f[CB]\-XX:SharedArchiveFile=\f[R] .RE .PP -Although an array in the class list is not allowed, some array classes -can still be created at CDS/AppCDS dump time. -Those arrays are created during the execution of the Java code used by -the Java class loaders (\f[CB]PlatformClassLoader\f[R] and the system -class loader) to load classes at dump time. -The created arrays are archived with the rest of the loaded classes. -.SS Extending Class Data Sharing to Support the Module Path -.PP -In JDK 11, Class Data Sharing (CDS) has been improved to support -archiving classes from the module path. -.IP \[bu] 2 -To create a CDS archive using the \f[CB]\-\-module\-path\f[R] VM option, -use the following command line syntax: -.RS 2 +For convenience, the \f[CB]\f[R] records the location of +the \f[CB]\f[R]. +Therefore, you can omit the \f[CB]\f[R] by saying only: .RS .PP -\f[CB]java\ \-Xshare:dump\ \-XX:SharedClassListFile=\f[R]\f[I]class_list_file\f[R] -\f[CB]\-XX:SharedArchiveFile=\f[R]\f[I]shared_archive_file\f[R] -\f[CB]\-\-module\-path=\f[R]\f[I]path_to_modular_jar\f[R] \f[CB]\-m\f[R] -\f[I]module_name\f[R] -.RE +\f[CB]\-XX:SharedArchiveFile=\f[R] .RE -.IP \[bu] 2 -To run with a CDS archive using the \f[CB]\-\-module\-path\f[R] VM option, -use the following the command line syntax: -.RS 2 -.RS -.PP -\f[CB]java\ \-XX:SharedArchiveFile=\f[R]\f[I]shared_archive_file\f[R] -\f[CB]\-\-module\-path=\f[R]\f[I]path_to_modular_jar\f[R] \f[CB]\-m\f[R] -\f[I]module_name\f[R] -.RE -.RE -.PP -The following table describes how the VM options related to module paths -can be used along with the \f[CB]\-Xshare\f[R] option. -.PP -.TS -tab(@); -l l l. -T{ -Option -T}@T{ -\-Xshare:dump -T}@T{ -\-Xshare:{on,auto} -T} -_ -T{ -\f[CB]\-\-module\-path\f[R][1] \f[I]mp\f[R] -T}@T{ -Allowed -T}@T{ -Allowed[2] -T} -T{ -\f[CB]\-\-module\f[R] -T}@T{ -Allowed -T}@T{ -Allowed -T} -T{ -\f[CB]\-\-add\-module\f[R] -T}@T{ -Allowed -T}@T{ -Allowed -T} -T{ -\f[CB]\-\-upgrade\-module\-path\f[R][3] -T}@T{ -Disallowed (exits if specified) -T}@T{ -Allowed (disables CDS) -T} -T{ -\f[CB]\-\-patch\-module\f[R][4] -T}@T{ -Disallowed (exits if specified) -T}@T{ -Allowed (disables CDS) -T} -T{ -\f[CB]\-\-limit\-modules\f[R][5] -T}@T{ -Disallowed (exits if specified) -T}@T{ -Allowed (disables CDS) -T} -.TE -.PP -[1] Although there are two ways of specifying a module in a -\f[CB]\-\-module\-path\f[R], that is, modular JAR or exploded module, only -modular JARs are supported. -.PP -[2] Different \f[I]mp\f[R] can be specified during dump time versus run -time. -If an archived class K was loaded from \f[CB]mp1.jar\f[R] at dump time, -but changes in \f[I]mp\f[R] cause it to be available from a different -\f[CB]mp2.jar\f[R] at run time, then the archived version of K will be -disregarded at run time; K will be loaded dynamically. -.PP -[3] Currently, only two system modules are upgradeable -(\f[CB]java.compiler\f[R] and \f[CB]jdk.internal.vm.compiler\f[R]). -However, these modules are seldom upgraded in production software. -.PP -[4] As documented in JEP 261, using \f[CB]\-\-patch\-module\f[R] is -strongly discouraged for production use. -.PP -[5] \f[CB]\-\-limit\-modules\f[R] is intended for testing purposes. -It is seldom used in production software. +.SS Creating CDS Archives .PP -If \f[CB]\-\-upgrade\-module\-path\f[R], \f[CB]\-\-patch\-module\f[R], or -\f[CB]\-\-limit\-modules\f[R] is specified at dump time, an error will be -printed and the JVM will exit. -For example, if the \f[CB]\-\-limit\-modules\f[R] option is specified at -dump time, the user will see the following error: -.IP -.nf -\f[CB] -Error\ occurred\ during\ initialization\ of\ VM -Cannot\ use\ the\ following\ option\ when\ dumping\ the\ shared\ archive:\ \-\-limit\-modules -\f[R] -.fi -.PP -If \f[CB]\-\-upgrade\-module\-path\f[R], \f[CB]\-\-patch\-module\f[R], or -\f[CB]\-\-limit\-modules\f[R] is specified at run time, a warning message -will be printed indicating that CDS is disabled. -For example, if the \f[CB]\-\-limit\-modules\f[R] options is specified at -run time, the user will see the following warning: -.IP -.nf -\f[CB] -Java\ HotSpot(TM)\ 64\-Bit\ Server\ VM\ warning:\ CDS\ is\ disabled\ when\ the\ \-\-limit\-modules\ option\ is\ specified. -\f[R] -.fi -.PP -Several other noteworthy things include: -.IP \[bu] 2 -Any valid combinations of \f[CB]\-cp\f[R] and \f[CB]\-\-module\-path\f[R] -are supported. -.IP \[bu] 2 -A non\-empty directory in the module path causes a fatal error. -The user will see the following error messages: -.RS 2 -.IP -.nf -\f[CB] -Error:\ non\-empty\ directory\ \ Hint:\ enable\ \-Xlog:class+path=info\ to\ diagnose\ the\ failure\ Error\ occurred\ during\ initialization\ of\ VM\ Cannot\ have\ non\-empty\ directory\ in\ paths -\f[R] -.fi -.RE +CDS archives can be created with several methods: .IP \[bu] 2 -Unlike the class path, there\[aq]s no restriction that the module path -at dump time must be equal to or be a prefix of the module path at run -time. +\f[CB]\-Xshare:dump\f[R] .IP \[bu] 2 -The archive is invalidated if an existing JAR in the module path is -updated after archive generation. +\f[CB]\-XX:ArchiveClassesAtExit\f[R] .IP \[bu] 2 -Removing a JAR from the module path does not invalidate the shared -archive. -Archived classes from the removed JAR are not used at runtime. -.SS Dynamic CDS archive +\f[CB]jcmd\ VM.cds\f[R] .PP -Dynamic CDS archive extends AppCDS to allow archiving of classes when a -Java application exits. -It improves the usability of AppCDS by eliminating the trial run step -for creating a class list for each application. -The archived classes include all loaded application classes and library -classes that are not present in the default CDS archive which is -included in the JDK. +One common operation in all these methods is a "trial run", where you +run the application once to determine the classes that should be stored +in the archive. +.SS Creating a Static CDS Archive File with \-Xshare:dump .PP -A base archive is required when creating a dynamic archive. -If the base archive is not specified, the default CDS archive is used as -the base archive. -.PP -To create a dynamic CDS archive with the default CDS archive as the base -archive, just add the -\f[CB]\-XX:ArchiveClassesAtExit=\f[R] option to the -command line for running the Java application. -.PP -If the default CDS archive does not exist, the VM will exit with the -following error: -.IP -.nf -\f[CB] -ArchiveClassesAtExit\ not\ supported\ when\ base\ CDS\ archive\ is\ not\ loaded -\f[R] -.fi -.PP -To run the Java application using a dynamic CDS archive, just add the -\f[CB]\-XX:SharedArchiveFile=\f[R] option to the command -line for running the Java application. -.PP -The base archive is not required to be specified in the command line. -The base archive information, including its name and full path, will be -retrieved from the dynamic archive header. -Note that the user could also use the \f[CB]\-XX:SharedArchiveFile\f[R] -option for specifying a regular AppCDS archive. -Therefore, the specified archive in the \f[CB]\-XX:SharedArchiveFile\f[R] -option could be either a regular or dynamic archive. -During VM start up the specified archive header will be read. -If \f[CB]\-XX:SharedArchiveFile\f[R] refers to a regular archive, then the -behavior will be unchanged. -If \f[CB]\-XX:SharedArchiveFile\f[R] refers to a dynamic archive, the VM -will retrieve the base archive location from the dynamic archive. -If the dynamic archive was created with the default CDS archive, then -the current default CDS archive will be used, and will be found relative -to the current run time environment. -.PP -Please refer to \f[B]JDK\-8221706\f[R] -[https://bugs.openjdk.java.net/browse/JDK\-8221706] for details on error -checking during dynamic CDS archive dump time and run time. -.SS Creating a Shared Archive File and Using It to Run an Application -.SS AppCDS archive -.PP -The following steps create a shared archive file that contains all the -classes used by the \f[CB]test.Hello\f[R] application. -The last step runs the application with the shared archive file. +The following steps create a static CDS archive file that contains all +the classes used by the \f[CB]test.Hello\f[R] application. .IP "1." 3 Create a list of all classes used by the \f[CB]test.Hello\f[R] application. @@ -5553,23 +5346,20 @@ contains a list of all classes used by this application: \f[CB]java\ \-Xshare:off\ \-XX:DumpLoadedClassList=hello.classlist\ \-cp\ hello.jar\ test.Hello\f[R] .RE .PP -Note that the classpath specified by the \f[CB]\-cp\f[R] parameter must -contain only JAR files. +The classpath specified by the \f[CB]\-cp\f[R] parameter must contain only +JAR files. .RE .IP "2." 3 -Create a shared archive, named \f[CB]hello.jsa\f[R], that contains all the +Create a static archive, named \f[CB]hello.jsa\f[R], that contains all the classes in \f[CB]hello.classlist\f[R]: .RS 4 .RS .PP \f[CB]java\ \-Xshare:dump\ \-XX:SharedArchiveFile=hello.jsa\ \-XX:SharedClassListFile=hello.classlist\ \-cp\ hello.jar\f[R] .RE -.PP -Note that the classpath used at archive creation time must be the same -as (or a prefix of) the classpath used at run time. .RE .IP "3." 3 -Run the application \f[CB]test.Hello\f[R] with the shared archive +Run the application \f[CB]test.Hello\f[R] with the archive \f[CB]hello.jsa\f[R]: .RS 4 .RS @@ -5583,23 +5373,27 @@ using the class contained in the \f[CB]hello.jsa\f[R] shared archive: .RS 4 .RS .PP -\f[CB]java\ \-XX:SharedArchiveFile=hello.jsa\ \-cp\ hello.jar\ \-verbose:class\ test.Hello\f[R] +\f[CB]java\ \-XX:SharedArchiveFile=hello.jsa\ \-cp\ hello.jar\ \-Xlog:class+load\ test.Hello\f[R] .RE .PP The output of this command should contain the following text: -.IP -.nf -\f[CB] -Loaded\ test.Hello\ from\ shared\ objects\ file\ by\ sun/misc/Launcher$AppClassLoader -\f[R] -.fi +.RS +.PP +\f[CB][info][class,load]\ test.Hello\ source:\ shared\ objects\ file\f[R] .RE -.SS Dynamic CDS archive +.RE +.SS Creating a Dynamic CDS Archive File with \-XX:SharedArchiveFile +.PP +Advantages of dynamic CDS archives are: +.IP \[bu] 2 +They usually use less disk space, since they don\[aq]t need to store the +classes that are already in the static archive. +.IP \[bu] 2 +They are created with one fewer step than the comparable static archive. .PP The following steps create a dynamic CDS archive file that contains the -classes used by the \f[CB]test.Hello\f[R] application and are not included -in the default CDS archive. -The second step runs the application with the dynamic CDS archive. +classes that are used by the \f[CB]test.Hello\f[R] application, excluding +those that are already in the default CDS archive. .IP "1." 3 Create a dynamic CDS archive, named \f[CB]hello.jsa\f[R], that contains all the classes in \f[CB]hello.jar\f[R] loaded by the application @@ -5609,9 +5403,6 @@ all the classes in \f[CB]hello.jar\f[R] loaded by the application .PP \f[CB]java\ \-XX:ArchiveClassesAtExit=hello.jsa\ \-cp\ hello.jar\ Hello\f[R] .RE -.PP -Note that the classpath used at archive creation time must be the same -as (or a prefix of) the classpath used at run time. .RE .IP "2." 3 Run the application \f[CB]test.Hello\f[R] with the shared archive @@ -5627,218 +5418,87 @@ Run the application \f[CB]test.Hello\f[R] with the shared archive the \f[CB]test.Hello\f[R] application is using the class contained in the \f[CB]hello.jsa\f[R] shared archive. .PP -To automate the above steps 1 and 2, one can write a script such as the -following: -.IP -.nf -\f[CB] -\ \ \ \ ARCHIVE=hello.jsa -\ \ \ \ if\ test\ \-f\ $ARCHIVE;\ then -\ \ \ \ \ \ \ \ FLAG="\-XX:SharedArchiveFile=$ARCHIVE" -\ \ \ \ else -\ \ \ \ \ \ \ \ FLAG="\-XX:ArchiveClassesAtExit=$ARCHIVE" -\ \ \ \ fi -\ \ \ \ $JAVA_HOME/bin/java\ \-cp\ hello.jar\ $FLAG\ test.Hello -\f[R] -.fi -.PP -Like an AppCDS archive, the archive needs to be re\-generated if the -Java version has changed. -The above script could be adjusted to account for the Java version as -follows: -.IP -.nf -\f[CB] -\ \ \ \ ARCHIVE=hello.jsa -\ \ \ \ VERSION=foo.version -\ \ \ \ if\ test\ \-f\ $ARCHIVE\ \-a\ \-f\ $VERSION\ &&\ cmp\ \-s\ $VERSION\ $JAVA_HOME/release;\ then -\ \ \ \ \ \ \ \ FLAG="\-XX:SharedArchiveFile=$ARCHIVE" -\ \ \ \ else -\ \ \ \ \ \ \ \ FLAG="\-XX:ArchiveClassesAtExit=$ARCHIVE" -\ \ \ \ \ \ \ \ cp\ \-f\ $JAVA_HOME/release\ $VERSION -\ \ \ \ fi -\ \ \ \ $JAVA_HOME/bin/java\ \-cp\ hello.jar\ $FLAG\ test.Hello -\f[R] -.fi -.PP -Currently, we don\[aq]t support concurrent dumping operations to the -same CDS archive. -Care should be taken to avoid multiple writers to the same CDS archive. -.PP -The user could also create a dynamic CDS archive with a specific base -archive, e.g. -named as \f[CB]base.jsa\f[R] as follows: +It\[aq]s also possible to create a dynamic CDS archive with a +non\-default static CDS archive. +E.g., .RS .PP \f[CB]java\ \-XX:SharedArchiveFile=base.jsa\ \-XX:ArchiveClassesAtExit=hello.jsa\ \-cp\ hello.jar\ Hello\f[R] .RE .PP -To run the application using the dynamic CDS archive \f[CB]hello.jsa\f[R] -and a specific base CDS archive \f[CB]base.jsa\f[R]: +To run the application using this dynamic CDS archive: .RS .PP \f[CB]java\ \-XX:SharedArchiveFile=base.jsa:hello.jsa\ \-cp\ hello.jar\ Hello\f[R] .RE .PP -Note that on Windows, the above path delimiter \f[CB]:\f[R] should be -replaced with \f[CB];\f[R]. -.PP -The above command for specifying a base archive is useful if the base -archive used for creating the dynamic archive has been moved. -Normally, just specifying the dynamic archive should be sufficient since -the base archive info can be retrieved from the dynamic archive header. -.SS Sharing a Shared Archive Across Multiple Application Processes -.PP -You can share the same archive file across multiple applications -processes. -This reduces memory usage because the archive is memory\-mapped into the -address space of the processes. -The operating system automatically shares the read\-only pages across -these processes. -.PP -The following steps demonstrate how to create a common archive that can -be shared by different applications. -Classes from \f[CB]common.jar\f[R], \f[CB]hello.jar\f[R] and \f[CB]hi.jar\f[R] -are archived in the \f[CB]common.jsa\f[R] because they are all in the -classpath during the archiving step (step 3). -.PP -To include classes from \f[CB]hello.jar\f[R] and \f[CB]hi.jar\f[R], the -\f[CB]\&.jar\f[R] files must be added to the classpath specified by the -\f[CB]\-cp\f[R] parameter. -.IP "1." 3 -Create a list of all classes used by the \f[CB]Hello\f[R] application and -another list for the \f[CB]Hi\f[R] application: -.RS 4 -.RS -.PP -\f[CB]java\ \-XX:DumpLoadedClassList=hello.classlist\ \-cp\ common.jar:hello.jar\ Hello\f[R] -.RE -.RS -.PP -\f[CB]java\ \-XX:DumpLoadedClassList=hi.classlist\ \-cp\ common.jar:hi.jar\ Hi\f[R] -.RE -.RE -.IP "2." 3 -Create a single list of classes used by all the applications that will -share the shared archive file. -.RS 4 +(On Windows, the above path delimiter \f[CB]:\f[R] should be replaced with +\f[CB];\f[R]) .PP -\f[B]Linux and macOS\f[R] The following commands combine the files -\f[CB]hello.classlist\f[R] and \f[CB]hi.classlist\f[R] into one file, -\f[CB]common.classlist\f[R]: +As mention above, the name of the static archive can be skipped: .RS .PP -\f[CB]cat\ hello.classlist\ hi.classlist\ >\ common.classlist\f[R] +\f[CB]java\ \-XX:SharedArchiveFile=hello.jsa\ \-cp\ hello.jar\ Hello\f[R] .RE +.SS Creating CDS Archive Files with jcmd .PP -\f[B]Windows\f[R] The following commands combine the files -\f[CB]hello.classlist\f[R] and \f[CB]hi.classlist\f[R] into one file, -\f[CB]common.classlist\f[R]: -.RS +The previous two sections require you to modify the application\[aq]s +start\-up script in order to create a CDS archive. +Sometimes this could be difficult, for example, if the application\[aq]s +class path is set up by complex routines. .PP -\f[CB]type\ hello.classlist\ hi.classlist\ >\ common.classlist\f[R] -.RE -.RE -.IP "3." 3 -Create a shared archive named \f[CB]common.jsa\f[R] that contains all the -classes in \f[CB]common.classlist\f[R]: -.RS 4 +The \f[CB]jcmd\ VM.cds\f[R] command provides a less intrusive way for +creating a CDS archive by connecting to a running JVM process. +You can create either a static: .RS .PP -\f[CB]java\ \-Xshare:dump\ \-XX:SharedArchiveFile=common.jsa\ \-XX:SharedClassListFile=common.classlist\ \-cp\ common.jar:hello.jar:hi.jar\f[R] +\f[CB]jcmd\ \ VM.cds\ static_dump\ my_static_archive.jsa\f[R] .RE .PP -The classpath parameter used is the common class path prefix shared by -the \f[CB]Hello\f[R] and \f[CB]Hi\f[R] applications. -.RE -.IP "4." 3 -Run the \f[CB]Hello\f[R] and \f[CB]Hi\f[R] applications with the same shared -archive: -.RS 4 +or a dynamic archive: .RS .PP -\f[CB]java\ \-XX:SharedArchiveFile=common.jsa\ \-cp\ common.jar:hello.jar:hi.jar\ Hello\f[R] +\f[CB]jcmd\ \ VM.cds\ dynamic_dump\ my_dynamic_archive.jsa\f[R] .RE -.RS .PP -\f[CB]java\ \-XX:SharedArchiveFile=common.jsa\ \-cp\ common.jar:hello.jar:hi.jar\ Hi\f[R] -.RE -.RE -.SS Specifying Additional Shared Data Added to an Archive File -.PP -The \f[CB]SharedArchiveConfigFile\f[R] option is used to specify -additional shared data to add to the archive file. +To use the resulting archive file in a subsequent run of the application +without modifying the application\[aq]s start\-up script, you can use +the following technique: .RS .PP -\f[CB]\-XX:SharedArchiveConfigFile=\f[R]\f[I]shared_config_file\f[R] +\f[CB]env\ JAVA_TOOL_OPTIONS=\-XX:SharedArchiveFile=my_static_archive.jsa\ bash\ app_start.sh\f[R] .RE .PP -JDK 9 and later supports adding both symbols and string objects to an -archive for memory sharing when you have multiple JVM processes running -on the same host. -An example of this is having multiple JVM processes that use the same -set of Java EE classes. -When these common classes are loaded and used, new symbols and strings -may be created and added to the JVM\[aq]s internal "symbol" and "string" -tables. -At runtime, the symbols or string objects mapped from the archive file -can be shared across multiple JVM processes, resulting in a reduction of -overall memory usage. -In addition, archiving strings also provides added performance benefits -in both startup time and runtime execution. -.PP -In JDK 10 and later, CONSTANT_String entries in archived classes are -resolved to interned String objects at dump time, and all interned -String objects are archived. -However, even though all CONSTANT_String literals in all archived -classes are resolved, it might still beneficial to add additional -strings that are not string literals in class files, but are likely to -be used by your application at run time. -.PP -Symbol data should be generated by the \f[CB]jcmd\f[R] tool attaching to a -running JVM process. -See \f[B]jcmd\f[R]. -.PP -The following is an example of the symbol dumping command in -\f[CB]jcmd\f[R]: -.RS -.PP -\f[CB]jcmd\f[R] \f[I]pid\f[R] \f[CB]VM.symboltable\ \-verbose\f[R] -.RE +Note: to use \f[CB]jcmd\ \ VM.cds\ dynamic_dump\f[R], the JVM process +identified by \f[CB]\f[R] must be started with +\f[CB]\-XX:+RecordDynamicDumpInfo\f[R], which can also be passed to the +application start\-up script with the same technique: .RS .PP -\f[B]Note:\f[R] The first line (process ID) and the second line -(\f[CB]\@VERSION\ ...\f[R]) of this \f[CB]jcmd\f[R] output should be -excluded from the configuration file. +\f[CB]env\ JAVA_TOOL_OPTIONS=\-XX:+RecordDynamicDumpInfo\ bash\ app_start.sh\f[R] .RE -.SS Example of a Configuration File -.PP -The following is an example of a configuration file: -.IP -.nf -\f[CB] -VERSION:\ 1.0 -\@SECTION:\ Symbol -10\ \-1:\ linkMethod -\f[R] -.fi -.PP -In the configuration file example, the \f[CB]\@SECTION:\ Symbol\f[R] entry -uses the following format: -.RS -.PP -\f[I]length\f[R] \f[I]refcount\f[R]\f[CB]:\f[R] \f[I]symbol\f[R] -.RE -.PP -The \f[I]refcount\f[R] for a shared symbol is always \f[CB]\-1\f[R]. -.PP -\f[CB]\@SECTION\f[R] specifies the type of the section that follows it. -All data within the section must be the same type that\[aq]s specified -by \f[CB]\@SECTION\f[R]. -Different types of data can\[aq]t be mixed. -Multiple separated data sections for the same type specified by -different \f[CB]\@SECTION\f[R] are allowed within one -\f[CB]shared_config_file\f[R] . +.SS Restrictions on Class Path and Module Path +.IP \[bu] 2 +Neither the class path (\f[CB]\-classpath\f[R] and +\f[CB]\-Xbootclasspath/a\f[R]) nor the module path +(\f[CB]\-\-module\-path\f[R]) can contain non\-empty directories. +.IP \[bu] 2 +Only modular JAR files are supported in \f[CB]\-\-module\-path\f[R]. +Exploded modules are not supported. +.IP \[bu] 2 +The class path used at archive creation time must be the same as (or a +prefix of) the class path used at run time. +(There\[aq]s no such requirement for the module path.) +.IP \[bu] 2 +The CDS archive cannot be loaded if any JAR files in the class path or +module path are modified after the archive is generated. +.IP \[bu] 2 +If any of the VM options \f[CB]\-\-upgrade\-module\-path\f[R], +\f[CB]\-\-patch\-module\f[R] or \f[CB]\-\-limit\-modules\f[R] are specified, +CDS is disabled. +This means that the JVM will execute without loading any CDS archives. +In addition, if you try to create a CDS archive with any of these 3 +options specified, the JVM will report an error. .SH PERFORMANCE TUNING EXAMPLES .PP You can use the Java advanced runtime options to optimize the diff --git a/src/java.base/share/man/keytool.1 b/src/java.base/share/man/keytool.1 index 09f8057a06605d4ca12b584bf9e612953f99d2d4..7d0cdf6a161cca9b5b6afae22e91bcca312589db 100644 --- a/src/java.base/share/man/keytool.1 +++ b/src/java.base/share/man/keytool.1 @@ -1,4 +1,4 @@ -.\" Copyright (c) 1998, 2020, Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1998, 2022, 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 @@ -70,6 +70,8 @@ keystore \f[CB]\-storepasswd\f[R]: Changes the store password of a keystore .IP \[bu] 2 \f[CB]\-showinfo\f[R]: Displays security\-related information +.IP \[bu] 2 +\f[CB]\-version\f[R]: Prints the program version .PP See \f[B]Commands and Options\f[R] for a description of these commands with their options. @@ -219,6 +221,10 @@ they perform. \f[B]Commands for Displaying Security\-related Information\f[R]: .IP \[bu] 2 \f[CB]\-showinfo\f[R] +.PP +\f[B]Commands for Displaying Program Version\f[R]: +.IP \[bu] 2 +\f[CB]\-version\f[R] .SH COMMANDS FOR CREATING OR ADDING DATA TO THE KEYSTORE .TP .B \f[CB]\-gencert\f[R] @@ -1314,6 +1320,10 @@ information. The \f[CB]\-tls\f[R] option displays TLS configurations, such as the list of enabled protocols and cipher suites. .RE +.SH COMMANDS FOR DISPLAYING PROGRAM VERSION +.PP +You can use \f[CB]\-version\f[R] to print the program version of +\f[CB]keytool\f[R]. .SH COMMANDS FOR DISPLAYING HELP INFORMATION .PP You can use \f[CB]\-\-help\f[R] to display a list of \f[CB]keytool\f[R] diff --git a/src/java.base/unix/classes/java/lang/ProcessImpl.java b/src/java.base/unix/classes/java/lang/ProcessImpl.java index 2bf36f8f136794af4030e12c64026ab217696959..0a3f4e34783fefa183b32841878ea1150c9599aa 100644 --- a/src/java.base/unix/classes/java/lang/ProcessImpl.java +++ b/src/java.base/unix/classes/java/lang/ProcessImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2022, 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 @@ -45,7 +45,6 @@ import java.security.AccessController; import java.security.PrivilegedAction; import java.security.PrivilegedActionException; import java.security.PrivilegedExceptionAction; -import java.util.Properties; import jdk.internal.access.JavaIOFileDescriptorAccess; import jdk.internal.access.SharedSecrets; import jdk.internal.util.StaticProperty; @@ -641,109 +640,6 @@ final class ProcessImpl extends Process { } } - // A FileInputStream that supports the deferment of the actual close - // operation until the last pending I/O operation on the stream has - // finished. This is required on Solaris because we must close the stdin - // and stdout streams in the destroy method in order to reclaim the - // underlying file descriptors. Doing so, however, causes any thread - // currently blocked in a read on one of those streams to receive an - // IOException("Bad file number"), which is incompatible with historical - // behavior. By deferring the close we allow any pending reads to see -1 - // (EOF) as they did before. - // - private static class DeferredCloseInputStream extends PipeInputStream { - DeferredCloseInputStream(FileDescriptor fd) { - super(fd); - } - - private Object lock = new Object(); // For the following fields - private boolean closePending = false; - private int useCount = 0; - private InputStream streamToClose; - - private void raise() { - synchronized (lock) { - useCount++; - } - } - - private void lower() throws IOException { - synchronized (lock) { - useCount--; - if (useCount == 0 && closePending) { - streamToClose.close(); - } - } - } - - // stc is the actual stream to be closed; it might be this object, or - // it might be an upstream object for which this object is downstream. - // - private void closeDeferred(InputStream stc) throws IOException { - synchronized (lock) { - if (useCount == 0) { - stc.close(); - } else { - closePending = true; - streamToClose = stc; - } - } - } - - public void close() throws IOException { - synchronized (lock) { - useCount = 0; - closePending = false; - } - super.close(); - } - - public int read() throws IOException { - raise(); - try { - return super.read(); - } finally { - lower(); - } - } - - public int read(byte[] b) throws IOException { - raise(); - try { - return super.read(b); - } finally { - lower(); - } - } - - public int read(byte[] b, int off, int len) throws IOException { - raise(); - try { - return super.read(b, off, len); - } finally { - lower(); - } - } - - public long skip(long n) throws IOException { - raise(); - try { - return super.skip(n); - } finally { - lower(); - } - } - - public int available() throws IOException { - raise(); - try { - return super.available(); - } finally { - lower(); - } - } - } - /** * A buffered input stream for a subprocess pipe file descriptor * that allows the underlying file descriptor to be reclaimed when @@ -757,7 +653,7 @@ final class ProcessImpl extends Process { * will block if another thread is at the same time blocked in a file * operation (e.g. 'read()') on the same file descriptor. We therefore * combine 'ProcessPipeInputStream' approach used on Linux and Bsd - * with the DeferredCloseInputStream approach used on Solaris. This means + * with the deferring 'close' of InputStream. This means * that every potentially blocking operation on the file descriptor * increments a counter before it is executed and decrements it once it * finishes. The 'close()' operation will only be executed if there are diff --git a/src/java.base/unix/classes/sun/net/sdp/SdpProvider.java b/src/java.base/unix/classes/sun/net/sdp/SdpProvider.java index c082bb6f02c842071830f6a6ca25d7b1d973d057..f9530cf779768675d08f4edca6ca93b2419e4a28 100644 --- a/src/java.base/unix/classes/sun/net/sdp/SdpProvider.java +++ b/src/java.base/unix/classes/sun/net/sdp/SdpProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2021, 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,7 +35,6 @@ import java.io.FileDescriptor; import java.io.IOException; import java.io.PrintStream; -import sun.net.sdp.SdpSupport; import sun.security.action.GetPropertyAction; /** @@ -192,8 +191,7 @@ public class SdpProvider extends NetHooks.Provider { private static List loadRulesFromFile(String file) throws IOException { - Scanner scanner = new Scanner(new File(file)); - try { + try (Scanner scanner = new Scanner(new File(file))) { List result = new ArrayList<>(); while (scanner.hasNextLine()) { String line = scanner.nextLine().trim(); @@ -279,8 +277,6 @@ public class SdpProvider extends NetHooks.Provider { } } return result; - } finally { - scanner.close(); } } diff --git a/src/java.base/unix/classes/sun/net/www/protocol/file/Handler.java b/src/java.base/unix/classes/sun/net/www/protocol/file/Handler.java index 5892517e938e2332fbe5778c5ab75962ffa562b1..207e95d27f8fd01e1e5b40d723036d4ed71295b5 100644 --- a/src/java.base/unix/classes/sun/net/www/protocol/file/Handler.java +++ b/src/java.base/unix/classes/sun/net/www/protocol/file/Handler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1994, 2021, 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,13 +25,10 @@ package sun.net.www.protocol.file; -import java.net.InetAddress; import java.net.URLConnection; import java.net.URL; import java.net.Proxy; -import java.net.MalformedURLException; import java.net.URLStreamHandler; -import java.io.InputStream; import java.io.IOException; import sun.net.www.ParseUtil; import java.io.File; @@ -42,14 +39,6 @@ import java.io.File; */ public class Handler extends URLStreamHandler { - private String getHost(URL url) { - String host = url.getHost(); - if (host == null) - host = ""; - return host; - } - - protected void parseURL(URL u, String spec, int start, int limit) { /* * Ugly backwards compatibility. Flip any file separator @@ -61,18 +50,18 @@ public class Handler extends URLStreamHandler { * rather than forcing this to be fixed in the caller of the URL * class where it belongs. Since backslash is an "unwise" * character that would normally be encoded if literally intended - * as a non-seperator character the damage of veering away from the + * as a non-separator character the damage of veering away from the * specification is presumably limited. */ super.parseURL(u, spec.replace(File.separatorChar, '/'), start, limit); } - public synchronized URLConnection openConnection(URL u) + public URLConnection openConnection(URL u) throws IOException { return openConnection(u, null); } - public synchronized URLConnection openConnection(URL u, Proxy p) + public URLConnection openConnection(URL u, Proxy p) throws IOException { String host = u.getHost(); if (host == null || host.isEmpty() || host.equals("~") || diff --git a/src/java.base/windows/classes/sun/net/www/protocol/file/Handler.java b/src/java.base/windows/classes/sun/net/www/protocol/file/Handler.java index 5475eca7c2eb44480d199fee2e2f370a2d7b111e..18ccda6e7c1d96a02839d3edb61b4d97222ff6b0 100644 --- a/src/java.base/windows/classes/sun/net/www/protocol/file/Handler.java +++ b/src/java.base/windows/classes/sun/net/www/protocol/file/Handler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2021, 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,13 +25,10 @@ package sun.net.www.protocol.file; -import java.net.InetAddress; import java.net.URLConnection; import java.net.URL; import java.net.Proxy; -import java.net.MalformedURLException; import java.net.URLStreamHandler; -import java.io.InputStream; import java.io.IOException; import sun.net.www.ParseUtil; import java.io.File; @@ -42,14 +39,6 @@ import java.io.File; */ public class Handler extends URLStreamHandler { - private String getHost(URL url) { - String host = url.getHost(); - if (host == null) - host = ""; - return host; - } - - protected void parseURL(URL u, String spec, int start, int limit) { /* * Ugly backwards compatibility. Flip any file separator @@ -61,18 +50,18 @@ public class Handler extends URLStreamHandler { * rather than forcing this to be fixed in the caller of the URL * class where it belongs. Since backslash is an "unwise" * character that would normally be encoded if literally intended - * as a non-seperator character the damage of veering away from the + * as a non-separator character the damage of veering away from the * specification is presumably limited. */ super.parseURL(u, spec.replace(File.separatorChar, '/'), start, limit); } - public synchronized URLConnection openConnection(URL url) + public URLConnection openConnection(URL url) throws IOException { return openConnection(url, null); } - public synchronized URLConnection openConnection(URL url, Proxy p) + public URLConnection openConnection(URL url, Proxy p) throws IOException { String path; diff --git a/src/java.base/windows/classes/sun/nio/ch/PipeImpl.java b/src/java.base/windows/classes/sun/nio/ch/PipeImpl.java index 8b786f04d124d4c343330d2a3d3b2d619b9a4bf9..b78ac0e3a204162bba868c1b2c28bdfa88d1feba 100644 --- a/src/java.base/windows/classes/sun/nio/ch/PipeImpl.java +++ b/src/java.base/windows/classes/sun/nio/ch/PipeImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2022, 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 @@ -32,8 +32,6 @@ import java.io.IOException; import java.net.InetAddress; import java.net.InetSocketAddress; import java.net.SocketAddress; -import java.net.UnixDomainSocketAddress; -import java.net.StandardProtocolFamily; import java.net.StandardSocketOptions; import java.nio.*; import java.nio.channels.*; @@ -164,10 +162,6 @@ class PipeImpl try { if (ssc != null) ssc.close(); - if (sa instanceof UnixDomainSocketAddress) { - Path path = ((UnixDomainSocketAddress) sa).getPath(); - Files.deleteIfExists(path); - } } catch (IOException e2) {} } } @@ -184,8 +178,7 @@ class PipeImpl /** * Creates Pipe implementation that supports optionally buffering. * - * @implNote The pipe uses Unix domain sockets where possible. It uses a - * loopback connection on older editions of Windows. When buffering is + * @implNote Uses a loopback connection. When buffering is * disabled then it sets TCP_NODELAY on the sink channel. */ @SuppressWarnings("removal") @@ -212,23 +205,8 @@ class PipeImpl return sink; } - private static volatile boolean noUnixDomainSockets; - private static ServerSocketChannel createListener() throws IOException { - ServerSocketChannel listener = null; - if (!noUnixDomainSockets) { - try { - listener = ServerSocketChannel.open(StandardProtocolFamily.UNIX); - return listener.bind(null); - } catch (UnsupportedOperationException | IOException e) { - // IOException is most likely to be caused by the temporary directory - // name being too long. Possibly should log this. - noUnixDomainSockets = true; - if (listener != null) - listener.close(); - } - } - listener = ServerSocketChannel.open(); + ServerSocketChannel listener = ServerSocketChannel.open(); InetAddress lb = InetAddress.getLoopbackAddress(); listener.bind(new InetSocketAddress(lb, 0)); return listener; diff --git a/src/java.base/windows/native/libjava/HostLocaleProviderAdapter_md.c b/src/java.base/windows/native/libjava/HostLocaleProviderAdapter_md.c index 879422f096f3aabbbee1b2e88c0ce4372186d092..b7c2bcc28db60538546cb4508e8af6f715f474bc 100644 --- a/src/java.base/windows/native/libjava/HostLocaleProviderAdapter_md.c +++ b/src/java.base/windows/native/libjava/HostLocaleProviderAdapter_md.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2022, 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 @@ -835,7 +835,7 @@ void replaceCalendarArrayElems(JNIEnv *env, jstring jlangtag, jint calid, jobjec WCHAR name[BUFLEN]; const jchar *langtag = (*env)->GetStringChars(env, jlangtag, JNI_FALSE); jstring tmp_string; - CALTYPE isGenitive; + CALTYPE isGenitive = 0; CHECK_NULL(langtag); diff --git a/src/java.base/windows/native/libnet/DefaultProxySelector.c b/src/java.base/windows/native/libnet/DefaultProxySelector.c index 74efd4ab91e3ae4000a3219e76aa43cf734ccd3f..6b91874eda1d3881159e4ac0f6cf8da3b785892f 100644 --- a/src/java.base/windows/native/libnet/DefaultProxySelector.c +++ b/src/java.base/windows/native/libnet/DefaultProxySelector.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2022, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -104,7 +104,6 @@ static int createProxyList(LPWSTR win_proxy, const WCHAR *pproto, list_item **he int nr_elems = 0; wchar_t *context = NULL; wchar_t *current_proxy = NULL; - BOOL error = FALSE; /* * The proxy server list contains one or more of the following strings @@ -116,7 +115,6 @@ static int createProxyList(LPWSTR win_proxy, const WCHAR *pproto, list_item **he LPWSTR pport; LPWSTR phost; int portVal = 0; - wchar_t *next_proxy = NULL; list_item *proxy = NULL; wchar_t* pos = NULL; @@ -230,16 +228,12 @@ Java_sun_net_spi_DefaultProxySelector_getSystemProxies(JNIEnv *env, auto_proxy_options.dwFlags = WINHTTP_AUTOPROXY_AUTO_DETECT; auto_proxy_options.fAutoLogonIfChallenged = TRUE; use_auto_proxy = TRUE; - } else if (ie_proxy_config.lpszAutoConfigUrl != NULL) { + } + if (ie_proxy_config.lpszAutoConfigUrl != NULL) { /* Windows uses PAC file */ auto_proxy_options.lpszAutoConfigUrl = ie_proxy_config.lpszAutoConfigUrl; - auto_proxy_options.dwFlags = WINHTTP_AUTOPROXY_CONFIG_URL; + auto_proxy_options.dwFlags |= WINHTTP_AUTOPROXY_CONFIG_URL; use_auto_proxy = TRUE; - } else if (ie_proxy_config.lpszProxy != NULL) { - /* Windows uses manually entered proxy. */ - use_auto_proxy = FALSE; - win_bypass_proxy = ie_proxy_config.lpszProxyBypass; - win_proxy = ie_proxy_config.lpszProxy; } if (use_auto_proxy) { @@ -254,6 +248,12 @@ Java_sun_net_spi_DefaultProxySelector_getSystemProxies(JNIEnv *env, } } + if (!use_auto_proxy && ie_proxy_config.lpszProxy != NULL) { + /* Windows uses manually entered proxy. */ + win_bypass_proxy = ie_proxy_config.lpszProxyBypass; + win_proxy = ie_proxy_config.lpszProxy; + } + /* Check the bypass entry. */ if (NULL != win_bypass_proxy) { /* @@ -290,7 +290,6 @@ Java_sun_net_spi_DefaultProxySelector_getSystemProxies(JNIEnv *env, } if (win_proxy != NULL) { - wchar_t *context = NULL; int defport = 0; int nr_elems = 0; @@ -313,27 +312,28 @@ Java_sun_net_spi_DefaultProxySelector_getSystemProxies(JNIEnv *env, nr_elems = createProxyList(win_proxy, lpProto, &head); if (nr_elems != 0 && head != NULL) { int index = 0; + list_item *current = head; proxy_array = (*env)->NewObjectArray(env, nr_elems, proxy_class, NULL); if (proxy_array == NULL || (*env)->ExceptionCheck(env)) { goto noproxy; } - while (head != NULL && index < nr_elems) { + while (current != NULL && index < nr_elems) { jstring jhost; jobject isa; jobject proxy; - if (head->host != NULL && proxy_array != NULL) { + if (current->host != NULL && proxy_array != NULL) { /* Let's create the appropriate Proxy object then. */ - if (head->port == 0) { - head->port = defport; + if (current->port == 0) { + current->port = defport; } - jhost = (*env)->NewString(env, head->host, (jsize)wcslen(head->host)); + jhost = (*env)->NewString(env, current->host, (jsize)wcslen(current->host)); if (jhost == NULL || (*env)->ExceptionCheck(env)) { proxy_array = NULL; } isa = (*env)->CallStaticObjectMethod(env, isaddr_class, isaddr_createUnresolvedID, jhost, - head->port); + current->port); if (isa == NULL || (*env)->ExceptionCheck(env)) { proxy_array = NULL; } @@ -347,7 +347,7 @@ Java_sun_net_spi_DefaultProxySelector_getSystemProxies(JNIEnv *env, } index++; } - head = head->next; + current = current->next; } } } diff --git a/src/java.base/windows/native/libnio/ch/WindowsAsynchronousServerSocketChannelImpl.c b/src/java.base/windows/native/libnio/ch/WindowsAsynchronousServerSocketChannelImpl.c index a08f3a3564fab61c22f066396aea29321a676665..340bbb9c8decc27eda10e634481b2be1bcfa007f 100644 --- a/src/java.base/windows/native/libnio/ch/WindowsAsynchronousServerSocketChannelImpl.c +++ b/src/java.base/windows/native/libnio/ch/WindowsAsynchronousServerSocketChannelImpl.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2022, 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 @@ -69,6 +69,10 @@ Java_sun_nio_ch_WindowsAsynchronousServerSocketChannelImpl_initIDs(JNIEnv* env, DWORD dwBytes; s = socket(AF_INET, SOCK_STREAM, 0); + if (s == INVALID_SOCKET && WSAGetLastError() == WSAEAFNOSUPPORT) { + /* IPv4 unavailable... try IPv6 instead */ + s = socket(AF_INET6, SOCK_STREAM, 0); + } if (s == INVALID_SOCKET) { JNU_ThrowIOExceptionWithLastError(env, "socket failed"); return; diff --git a/src/java.base/windows/native/libnio/ch/WindowsAsynchronousSocketChannelImpl.c b/src/java.base/windows/native/libnio/ch/WindowsAsynchronousSocketChannelImpl.c index 40b8d8ba8dc13e111bf0e6a16a3aeb2f39b49f34..6b1fa64e708610de367c34bf7c349b032c9cc23d 100644 --- a/src/java.base/windows/native/libnio/ch/WindowsAsynchronousSocketChannelImpl.c +++ b/src/java.base/windows/native/libnio/ch/WindowsAsynchronousSocketChannelImpl.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2022, 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 @@ -66,6 +66,10 @@ Java_sun_nio_ch_WindowsAsynchronousSocketChannelImpl_initIDs(JNIEnv* env, jclass DWORD dwBytes; s = socket(AF_INET, SOCK_STREAM, 0); + if (s == INVALID_SOCKET && WSAGetLastError() == WSAEAFNOSUPPORT) { + /* IPv4 unavailable... try IPv6 instead */ + s = socket(AF_INET6, SOCK_STREAM, 0); + } if (s == INVALID_SOCKET) { JNU_ThrowIOExceptionWithLastError(env, "socket failed"); return; diff --git a/src/java.datatransfer/share/classes/java/awt/datatransfer/Clipboard.java b/src/java.datatransfer/share/classes/java/awt/datatransfer/Clipboard.java index ad3a56a701fd824b64ae6490274cc295e53e3050..bc3ed00a0300ad14f0b45ec30c1f7c7b792a66e9 100644 --- a/src/java.datatransfer/share/classes/java/awt/datatransfer/Clipboard.java +++ b/src/java.datatransfer/share/classes/java/awt/datatransfer/Clipboard.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2022, 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 @@ -43,10 +43,11 @@ import sun.datatransfer.DataFlavorUtil; * * @author Amy Fowler * @author Alexander Gerasimov - * @see java.awt.Toolkit#getSystemClipboard - * @see java.awt.Toolkit#getSystemSelection + * @see java.desktop/java.awt.Toolkit#getSystemClipboard + * @see java.desktop/java.awt.Toolkit#getSystemSelection * @since 1.1 */ +@SuppressWarnings("doclint:reference") // cross-module links public class Clipboard { String name; @@ -81,7 +82,7 @@ public class Clipboard { * Creates a clipboard object. * * @param name for the clipboard - * @see java.awt.Toolkit#getSystemClipboard + * @see java.desktop/java.awt.Toolkit#getSystemClipboard */ public Clipboard(String name) { this.name = name; @@ -91,7 +92,7 @@ public class Clipboard { * Returns the name of this clipboard object. * * @return the name of this clipboard object - * @see java.awt.Toolkit#getSystemClipboard + * @see java.desktop/java.awt.Toolkit#getSystemClipboard */ public String getName() { return name; @@ -118,7 +119,7 @@ public class Clipboard { * content * @param owner the object which owns the clipboard content * @throws IllegalStateException if the clipboard is currently unavailable - * @see java.awt.Toolkit#getSystemClipboard + * @see java.desktop/java.awt.Toolkit#getSystemClipboard */ public synchronized void setContents(Transferable contents, ClipboardOwner owner) { final ClipboardOwner oldOwner = this.owner; @@ -145,7 +146,7 @@ public class Clipboard { * @param requestor the object requesting the clip data (not used) * @return the current transferable object on the clipboard * @throws IllegalStateException if the clipboard is currently unavailable - * @see java.awt.Toolkit#getSystemClipboard + * @see java.desktop/java.awt.Toolkit#getSystemClipboard */ public synchronized Transferable getContents(Object requestor) { return contents; diff --git a/src/java.desktop/macosx/classes/com/apple/laf/AquaScrollBarUI.java b/src/java.desktop/macosx/classes/com/apple/laf/AquaScrollBarUI.java index 9d87013c48e2c29056033ee13aedc0630f9ccc11..ea239d83a23a6a91192f81dba3814e689e3a2881 100644 --- a/src/java.desktop/macosx/classes/com/apple/laf/AquaScrollBarUI.java +++ b/src/java.desktop/macosx/classes/com/apple/laf/AquaScrollBarUI.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2021, 2022, 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 @@ -144,7 +144,8 @@ public class AquaScrollBarUI extends ScrollBarUI { public void paint(final Graphics g, final JComponent c) { syncState(c); - painter.paint(g, c, 0, 0, fScrollBar.getWidth(), fScrollBar.getHeight()); + Rectangle trackBounds = getTrackBounds(); + painter.paint(g, c, trackBounds.x, trackBounds.y, trackBounds.width, trackBounds.height); } protected State getState(final JComponent c, final ScrollBarPart pressedPart) { @@ -188,11 +189,17 @@ public class AquaScrollBarUI extends ScrollBarUI { } protected Rectangle getTrackBounds() { - return new Rectangle(0, 0, fScrollBar.getWidth(), fScrollBar.getHeight()); + Insets insets = fScrollBar.getInsets(); + return new Rectangle(insets.left, insets.top, + fScrollBar.getWidth() - (insets.left + insets.right), + fScrollBar.getHeight() - (insets.top + insets.bottom)); } protected Rectangle getDragBounds() { - return new Rectangle(0, 0, fScrollBar.getWidth(), fScrollBar.getHeight()); + Insets insets = fScrollBar.getInsets(); + return new Rectangle(insets.left, insets.top, + fScrollBar.getWidth() - (insets.left + insets.right), + fScrollBar.getHeight() - (insets.top + insets.bottom)); } protected void startTimer(final boolean initial) { @@ -228,7 +235,10 @@ public class AquaScrollBarUI extends ScrollBarUI { protected Hit getPartHit(final int x, final int y) { syncState(fScrollBar); - return JRSUIUtils.HitDetection.getHitForPoint(painter.getControl(), 0, 0, fScrollBar.getWidth(), fScrollBar.getHeight(), x, y); + Insets insets = fScrollBar.getInsets(); + return JRSUIUtils.HitDetection.getHitForPoint(painter.getControl(), insets.left, insets.top, + fScrollBar.getWidth() - (insets.left + insets.right), + fScrollBar.getHeight() - (insets.top + insets.bottom), x, y); } protected class PropertyChangeHandler implements PropertyChangeListener { @@ -344,7 +354,9 @@ public class AquaScrollBarUI extends ScrollBarUI { // scroller goes 0-100 with a visible area of 20 we are getting a ratio of the // remaining 80. syncState(fScrollBar); - final double offsetChange = JRSUIUtils.ScrollBar.getNativeOffsetChange(painter.getControl(), 0, 0, fScrollBar.getWidth(), fScrollBar.getHeight(), offsetWeCareAbout, visibleAmt, extent); + final Rectangle limitRect = getDragBounds(); // GetThemeTrackDragRect + final double offsetChange = JRSUIUtils.ScrollBar.getNativeOffsetChange(painter.getControl(), + limitRect.x, limitRect.y, limitRect.width, limitRect.height, offsetWeCareAbout, visibleAmt, extent); // the scrollable area is the extent - visible amount; final int scrollableArea = extent - visibleAmt; @@ -597,7 +609,7 @@ public class AquaScrollBarUI extends ScrollBarUI { // determine the bounding rectangle for our thumb region syncState(fScrollBar); double[] rect = new double[4]; - JRSUIUtils.ScrollBar.getPartBounds(rect, painter.getControl(), 0, 0, fScrollBar.getWidth(), fScrollBar.getHeight(), ScrollBarPart.THUMB); + JRSUIUtils.ScrollBar.getPartBounds(rect, painter.getControl(), limitRect.x, limitRect.y, limitRect.width, limitRect.height, ScrollBarPart.THUMB); final Rectangle r = new Rectangle((int)rect[0], (int)rect[1], (int)rect[2], (int)rect[3]); // figure out the scroll-to-here start location based on our orientation, the diff --git a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CDataTransferer.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CDataTransferer.java index 0ea70549d430b33bf41f263e8a805c3ccb6eab60..e6a16ed670fc2808e85f3da8f5b1dea85564e04d 100644 --- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CDataTransferer.java +++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CDataTransferer.java @@ -33,8 +33,6 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.net.URL; import java.nio.charset.Charset; -import java.text.Normalizer; -import java.text.Normalizer.Form; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -165,9 +163,6 @@ public class CDataTransferer extends DataTransferer { // regular string that allows to translate data to target represantation // class by base method format = CF_STRING; - } else if (format == CF_STRING) { - String src = new String(bytes, UTF_8); - bytes = Normalizer.normalize(src, Form.NFC).getBytes(UTF_8); } return super.translateBytes(bytes, flavor, format, transferable); diff --git a/src/java.desktop/macosx/classes/sun/lwawt/macosx/LWCToolkit.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/LWCToolkit.java index 4a8f5bafe85206dfb243981fef3e1831e4a44700..2362b68c41cfc3f97aaef0d15e7e4e1ef2c0e193 100644 --- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/LWCToolkit.java +++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/LWCToolkit.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2022, 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 @@ -453,7 +453,7 @@ public final class LWCToolkit extends LWToolkit { desktopProperties.put("awt.multiClickInterval", getMultiClickTime()); // These DnD properties must be set, otherwise Swing ends up spewing NPEs - // all over the place. The values came straight off of MToolkit. + // all over the place. The values came straight off of XToolkit. desktopProperties.put("DnD.Autoscroll.initialDelay", Integer.valueOf(50)); desktopProperties.put("DnD.Autoscroll.interval", Integer.valueOf(50)); desktopProperties.put("DnD.Autoscroll.cursorHysteresis", Integer.valueOf(5)); diff --git a/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTView.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTView.m index 8e44052333c2c8786405d3f888abb91ef82d4094..15be2ae90f2243fe29c019c6d8f6a3b32c95c5c6 100644 --- a/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTView.m +++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTView.m @@ -546,12 +546,13 @@ static BOOL shouldUsePressAndHold() { -(BOOL) isCodePointInUnicodeBlockNeedingIMEvent: (unichar) codePoint { if ((codePoint == 0x0024) || (codePoint == 0x00A3) || (codePoint == 0x00A5) || + ((codePoint >= 0x900) && (codePoint <= 0x97F)) || ((codePoint >= 0x20A3) && (codePoint <= 0x20BF)) || ((codePoint >= 0x3000) && (codePoint <= 0x303F)) || ((codePoint >= 0xFF00) && (codePoint <= 0xFFEF))) { // Code point is in 'CJK Symbols and Punctuation' or // 'Halfwidth and Fullwidth Forms' Unicode block or - // currency symbols unicode + // currency symbols unicode or Devanagari script return YES; } return NO; @@ -957,11 +958,17 @@ static jclass jc_CInputMethod = NULL; #ifdef IM_DEBUG NSLog(@"insertText kbdlayout %@ ",(NSString *)kbdLayout); + + NSLog(@"utf8Length %lu utf16Length %lu", (unsigned long)utf8Length, (unsigned long)utf16Length); + NSLog(@"codePoint %x", codePoint); #endif // IM_DEBUG if ((utf16Length > 2) || ((utf8Length > 1) && [self isCodePointInUnicodeBlockNeedingIMEvent:codePoint]) || ((codePoint == 0x5c) && ([(NSString *)kbdLayout containsString:@"Kotoeri"]))) { +#ifdef IM_DEBUG + NSLog(@"string complex "); +#endif aStringIsComplex = YES; } diff --git a/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/CommonComponentAccessibility.h b/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/CommonComponentAccessibility.h index 33ab5c5fd2e5cb9623ba41eb7023ab96a427efcd..be0169a064df06e2bb279d311774a598200ccc52 100644 --- a/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/CommonComponentAccessibility.h +++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/CommonComponentAccessibility.h @@ -83,6 +83,7 @@ - (NSView* _Nonnull)view; - (NSWindow* _Nonnull)window; - (id _Nonnull)parent; +- (CommonComponentAccessibility* _Nullable)typeSafeParent; - (NSString* _Nonnull)javaRole; - (BOOL)isMenu; diff --git a/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/CommonComponentAccessibility.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/CommonComponentAccessibility.m index 69fc9908fd5388d006c50b38c624948e8797ef8b..d53d0350abf31c391e25a54e7088bef9fe4d5602 100644 --- a/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/CommonComponentAccessibility.m +++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/CommonComponentAccessibility.m @@ -95,7 +95,11 @@ static jobject sAccessibilityClass = NULL; return NO; } - return isChildSelected(env, ((CommonComponentAccessibility *)[self parent])->fAccessible, fIndex, fComponent); + CommonComponentAccessibility* parent = [self typeSafeParent]; + if (parent != nil) { + return isChildSelected(env, parent->fAccessible, fIndex, fComponent); + } + return NO; } - (BOOL)isSelectable:(JNIEnv *)env @@ -708,6 +712,15 @@ static jobject sAccessibilityClass = NULL; return fParent; } +- (CommonComponentAccessibility *)typeSafeParent +{ + id parent = [self parent]; + if ([parent isKindOfClass:[CommonComponentAccessibility class]]) { + return (CommonComponentAccessibility*)parent; + } + return nil; +} + - (NSString *)javaRole { if(fJavaRole == nil) { @@ -824,11 +837,13 @@ static jobject sAccessibilityClass = NULL; if (fNSRole == nil) { NSString *javaRole = [self javaRole]; fNSRole = [sRoles objectForKey:javaRole]; + CommonComponentAccessibility* parent = [self typeSafeParent]; // The sRoles NSMutableDictionary maps popupmenu to Mac's popup button. // JComboBox behavior currently relies on this. However this is not the // proper mapping for a JPopupMenu so fix that. if ( [javaRole isEqualToString:@"popupmenu"] && - ![[[self parent] javaRole] isEqualToString:@"combobox"] ) { + parent != nil && + ![[parent javaRole] isEqualToString:@"combobox"] ) { fNSRole = NSAccessibilityMenuRole; } if (fNSRole == nil) { @@ -1025,8 +1040,9 @@ static jobject sAccessibilityClass = NULL; // This may change when later fixing issues which currently // exist for combo boxes, but for now the following is only // for JPopupMenus, not for combobox menus. - id parent = [self parent]; + id parent = [self typeSafeParent]; if ( [[self javaRole] isEqualToString:@"popupmenu"] && + parent != nil && ![[parent javaRole] isEqualToString:@"combobox"] ) { NSArray *children = [CommonComponentAccessibility childrenOfParent:self diff --git a/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/TabButtonAccessibility.m b/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/TabButtonAccessibility.m index 4caf97c21cb67ad5c69f6d8b531206bbfc92761b..538240028b8d3ab76e1360d2b1632977df6f4913 100644 --- a/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/TabButtonAccessibility.m +++ b/src/java.desktop/macosx/native/libawt_lwawt/awt/a11y/TabButtonAccessibility.m @@ -59,11 +59,14 @@ - (jobject)tabGroup { if (fTabGroupAxContext == NULL) { - JNIEnv* env = [ThreadUtilities getJNIEnv]; - jobject tabGroupAxContext = [(CommonComponentAccessibility *)[self parent] axContextWithEnv:env]; - fTabGroupAxContext = (*env)->NewWeakGlobalRef(env, tabGroupAxContext); - CHECK_EXCEPTION(); - (*env)->DeleteLocalRef(env, tabGroupAxContext); + CommonComponentAccessibility* parent = [self typeSafeParent]; + if (parent != nil) { + JNIEnv *env = [ThreadUtilities getJNIEnv]; + jobject tabGroupAxContext = [parent axContextWithEnv:env]; + fTabGroupAxContext = (*env)->NewWeakGlobalRef(env, tabGroupAxContext); + CHECK_EXCEPTION(); + (*env)->DeleteLocalRef(env, tabGroupAxContext); + } } return fTabGroupAxContext; } diff --git a/src/java.desktop/share/classes/com/sun/beans/TypeResolver.java b/src/java.desktop/share/classes/com/sun/beans/TypeResolver.java index 25f079473100cafe6e41dd85de85e6d8ca0be293..c8f2d1891dc0672ec840c9201009cb4181c3c2d5 100644 --- a/src/java.desktop/share/classes/com/sun/beans/TypeResolver.java +++ b/src/java.desktop/share/classes/com/sun/beans/TypeResolver.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -104,7 +104,7 @@ public final class TypeResolver { * of those parameters. For example, Map<K,V> is a generic class, and * a corresponding ParameterizedType might look like * Map<K=String,V=Integer>. Given such a ParameterizedType, this method - * will replace K with String, or List<K> with List<String;, or + * will replace K with String, or List<K> with List<String>, or * List<? super K> with List<? super String>.

    * *

    The {@code actual} argument to this method can also be a Class. diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPImageReader.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPImageReader.java index df283e8102cd9ab099fbbe759718ac2669df6d0a..2e1c2db03ca84d64cdaa2c2abb00dabffeb1edb9 100644 --- a/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPImageReader.java +++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/bmp/BMPImageReader.java @@ -52,6 +52,7 @@ import java.security.AccessController; import java.security.PrivilegedAction; import java.util.ArrayList; import java.util.Iterator; +import java.util.List; import javax.imageio.IIOException; import javax.imageio.ImageIO; import javax.imageio.ImageReadParam; @@ -223,6 +224,33 @@ public class BMPImageReader extends ImageReader implements BMPConstants { } } + private void readColorPalette(int sizeOfPalette) throws IOException { + final int UNIT_SIZE = 1024000; + if (sizeOfPalette < UNIT_SIZE) { + palette = new byte[sizeOfPalette]; + iis.readFully(palette, 0, sizeOfPalette); + } else { + int bytesToRead = sizeOfPalette; + int bytesRead = 0; + List bufs = new ArrayList<>(); + while (bytesToRead != 0) { + int sz = Math.min(bytesToRead, UNIT_SIZE); + byte[] unit = new byte[sz]; + iis.readFully(unit, 0, sz); + bufs.add(unit); + bytesRead += sz; + bytesToRead -= sz; + } + byte[] paletteData = new byte[bytesRead]; + int copiedBytes = 0; + for (byte[] ba : bufs) { + System.arraycopy(ba, 0, paletteData, copiedBytes, ba.length); + copiedBytes += ba.length; + } + palette = paletteData; + } + } + /** * Process the image header. * @@ -305,8 +333,7 @@ public class BMPImageReader extends ImageReader implements BMPConstants { // Read in the palette int numberOfEntries = (int)((bitmapOffset - 14 - size) / 3); int sizeOfPalette = numberOfEntries*3; - palette = new byte[sizeOfPalette]; - iis.readFully(palette, 0, sizeOfPalette); + readColorPalette(sizeOfPalette); metadata.palette = palette; metadata.paletteSize = numberOfEntries; } else { @@ -343,8 +370,7 @@ public class BMPImageReader extends ImageReader implements BMPConstants { } int numberOfEntries = (int)((bitmapOffset-14-size) / 4); int sizeOfPalette = numberOfEntries * 4; - palette = new byte[sizeOfPalette]; - iis.readFully(palette, 0, sizeOfPalette); + readColorPalette(sizeOfPalette); metadata.palette = palette; metadata.paletteSize = numberOfEntries; @@ -404,8 +430,7 @@ public class BMPImageReader extends ImageReader implements BMPConstants { if (colorsUsed != 0) { // there is a palette sizeOfPalette = (int)colorsUsed*4; - palette = new byte[sizeOfPalette]; - iis.readFully(palette, 0, sizeOfPalette); + readColorPalette(sizeOfPalette); metadata.palette = palette; metadata.paletteSize = (int)colorsUsed; @@ -430,8 +455,7 @@ public class BMPImageReader extends ImageReader implements BMPConstants { // Read in the palette int numberOfEntries = (int)((bitmapOffset-14-size) / 4); int sizeOfPalette = numberOfEntries*4; - palette = new byte[sizeOfPalette]; - iis.readFully(palette, 0, sizeOfPalette); + readColorPalette(sizeOfPalette); metadata.palette = palette; metadata.paletteSize = numberOfEntries; @@ -529,8 +553,7 @@ public class BMPImageReader extends ImageReader implements BMPConstants { // Read in the palette int numberOfEntries = (int)((bitmapOffset-14-size) / 4); int sizeOfPalette = numberOfEntries*4; - palette = new byte[sizeOfPalette]; - iis.readFully(palette, 0, sizeOfPalette); + readColorPalette(sizeOfPalette); metadata.palette = palette; metadata.paletteSize = numberOfEntries; @@ -592,7 +615,7 @@ public class BMPImageReader extends ImageReader implements BMPConstants { } if (metadata.compression == BI_RGB) { - long imageDataSize = (width * height * (bitsPerPixel / 8)); + long imageDataSize = ((long)width * height * (bitsPerPixel / 8)); if (imageDataSize > (bitmapFileSize - bitmapOffset)) { throw new IIOException(I18N.getString("BMPImageReader9")); } diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/common/ReaderUtil.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/common/ReaderUtil.java index 0f8d1d66a28d206c2092ab3541e060d05622c7b5..906aa3a8a38fa7377456112b05b86474e2b53db1 100644 --- a/src/java.desktop/share/classes/com/sun/imageio/plugins/common/ReaderUtil.java +++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/common/ReaderUtil.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2021, 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,6 +28,8 @@ package com.sun.imageio.plugins.common; import java.awt.Point; import java.awt.Rectangle; import java.io.IOException; +import java.util.List; +import java.util.ArrayList; import javax.imageio.stream.ImageInputStream; /** @@ -213,4 +215,47 @@ public class ReaderUtil { } return result; } + + /** + * An utility method to allocate and initialize a byte array + * step by step with pre-defined limit, instead of allocating + * a large array up-front based on the length derived from + * an image header. + * + * @param iis a {@code ImageInputStream} to decode data and store + * it in byte array. + * @param length the size of data to decode + * + * @return array of size length when decode succeeeds + * + * @throws IOException if decoding of stream fails + */ + public static byte[] staggeredReadByteStream(ImageInputStream iis, + int length) throws IOException { + final int UNIT_SIZE = 1024000; + byte[] decodedData; + if (length < UNIT_SIZE) { + decodedData = new byte[length]; + iis.readFully(decodedData, 0, length); + } else { + int bytesToRead = length; + int bytesRead = 0; + List bufs = new ArrayList<>(); + while (bytesToRead != 0) { + int sz = Math.min(bytesToRead, UNIT_SIZE); + byte[] unit = new byte[sz]; + iis.readFully(unit, 0, sz); + bufs.add(unit); + bytesRead += sz; + bytesToRead -= sz; + } + decodedData = new byte[bytesRead]; + int copiedBytes = 0; + for (byte[] ba : bufs) { + System.arraycopy(ba, 0, decodedData, copiedBytes, ba.length); + copiedBytes += ba.length; + } + } + return decodedData; + } } diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageReader.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageReader.java index 2bedc9440ee9435349836be4a2a76d284c5694c7..9632e37d1d41d06a5079857c3701c04d423266d9 100644 --- a/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageReader.java +++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/gif/GIFImageReader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2021, 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 @@ -1007,6 +1007,11 @@ public class GIFImageReader extends ImageReader { } } + if (tableIndex >= prefix.length) { + throw new IIOException("Code buffer limit reached," + + " no End of Image tag present, possibly data is corrupted. "); + } + int ti = tableIndex; int oc = oldCode; diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java index ab15bdfc6b810e9b40779164d2dcdfb351d623ef..a7edf73cb80b6cbb4e518ea9150dac18ac62dedc 100644 --- a/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java +++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java @@ -1156,6 +1156,13 @@ public class JPEGImageReader extends ImageReader { throw new IIOException("Unsupported Image Type"); } + if ((long)width * height > Integer.MAX_VALUE - 2) { + // We are not able to properly decode image that has number + // of pixels greater than Integer.MAX_VALUE - 2 + throw new IIOException("Can not read image of the size " + + width + " by " + height); + } + image = getDestination(param, imageTypes, width, height); imRas = image.getRaster(); diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGImageReader.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGImageReader.java index bd06a4da600de9d40f95b698bdcc393f93c4d7c6..edebce1d62e00837b3646347971cee02eb85176b 100644 --- a/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGImageReader.java +++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGImageReader.java @@ -1415,6 +1415,13 @@ public class PNGImageReader extends ImageReader { int width = metadata.IHDR_width; int height = metadata.IHDR_height; + if ((long)width * height > Integer.MAX_VALUE - 2) { + // We are not able to properly decode image that has number + // of pixels greater than Integer.MAX_VALUE - 2 + throw new IIOException("Can not read image of the size " + + width + " by " + height); + } + // Init default values sourceXSubsampling = 1; sourceYSubsampling = 1; diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFDecompressor.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFDecompressor.java index a1b0439097758409a855b970b552dd897f79a679..4516ce0ad82e391319cb46d7332112d2892b5c26 100644 --- a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFDecompressor.java +++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFDecompressor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2021, 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 @@ -1438,7 +1438,11 @@ public abstract class TIFFDecompressor { * * @param byteCount the number of bytes of compressed data. */ - public void setByteCount(int byteCount) { + public void setByteCount(int byteCount) throws IOException{ + if (byteCount < 0) { + throw new IIOException("Strip byte count can't be" + + " negative: " + byteCount); + } this.byteCount = byteCount; } diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFFaxDecompressor.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFFaxDecompressor.java index 22ebda2187af01eccbccad45acb7f973b374f27c..4d64072075a6ea362e99c2cf7e99835ad6b2f8bd 100644 --- a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFFaxDecompressor.java +++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFFaxDecompressor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2021, 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 @@ -29,6 +29,7 @@ import java.io.EOFException; import javax.imageio.IIOException; import javax.imageio.plugins.tiff.BaselineTIFFTagSet; import javax.imageio.plugins.tiff.TIFFField; +import com.sun.imageio.plugins.common.ReaderUtil; class TIFFFaxDecompressor extends TIFFDecompressor { @@ -637,14 +638,14 @@ class TIFFFaxDecompressor extends TIFFDecompressor { this.bitsPerScanline = scanlineStride*8; this.lineBitNum = 8*dstOffset; - this.data = new byte[byteCount]; this.bitPointer = 0; this.bytePointer = 0; this.prevChangingElems = new int[w + 1]; this.currChangingElems = new int[w + 1]; stream.seek(offset); - stream.readFully(data); + this.data = ReaderUtil. + staggeredReadByteStream(stream, byteCount); if (compression == BaselineTIFFTagSet.COMPRESSION_CCITT_RLE) { decodeRLE(); diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFLZWDecompressor.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFLZWDecompressor.java index 9010674bdb18abe8cee1b5133f0442802ab89d21..fc682589ce2700cbb29547ca9bd6323474a20002 100644 --- a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFLZWDecompressor.java +++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFLZWDecompressor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2021, 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 @@ package com.sun.imageio.plugins.tiff; import java.io.IOException; import javax.imageio.IIOException; import javax.imageio.plugins.tiff.BaselineTIFFTagSet; +import com.sun.imageio.plugins.common.ReaderUtil; class TIFFLZWDecompressor extends TIFFDecompressor { @@ -95,9 +96,8 @@ class TIFFLZWDecompressor extends TIFFDecompressor { } stream.seek(offset); - - byte[] sdata = new byte[byteCount]; - stream.readFully(sdata); + byte[] sdata = ReaderUtil. + staggeredReadByteStream(stream, byteCount); if (flipBits) { for (int i = 0; i < byteCount; i++) { diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFNullDecompressor.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFNullDecompressor.java index 6ffc1f0acb7da9d4b3b5dc9a9f2fdfe458ac9c1f..9b5a746eec1da0eddd064a8ff785ad5150982d5a 100644 --- a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFNullDecompressor.java +++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFNullDecompressor.java @@ -136,12 +136,7 @@ public class TIFFNullDecompressor extends TIFFDecompressor { int lastRow = activeSrcHeight - 1; for (int y = 0; y < activeSrcHeight; y++) { - int bytesRead = stream.read(b, dstOffset, activeBytesPerRow); - if (bytesRead < 0) { - throw new EOFException(); - } else if (bytesRead != activeBytesPerRow) { - break; - } + stream.readFully(b, dstOffset, activeBytesPerRow); dstOffset += scanlineStride; // Skip unneeded bytes (row suffix + row prefix). @@ -154,17 +149,10 @@ public class TIFFNullDecompressor extends TIFFDecompressor { stream.seek(offset); int bytesPerRow = (srcWidth*bitsPerPixel + 7)/8; if(bytesPerRow == scanlineStride) { - if (stream.read(b, dstOffset, bytesPerRow*srcHeight) < 0) { - throw new EOFException(); - } + stream.readFully(b, dstOffset, bytesPerRow*srcHeight); } else { for (int y = 0; y < srcHeight; y++) { - int bytesRead = stream.read(b, dstOffset, bytesPerRow); - if (bytesRead < 0) { - throw new EOFException(); - } else if (bytesRead != bytesPerRow) { - break; - } + stream.readFully(b, dstOffset, bytesPerRow); dstOffset += scanlineStride; } } diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFPackBitsDecompressor.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFPackBitsDecompressor.java index 42a44a43eee4e396005496ab4f8cf1e3fed5362a..0a5dfe8308e206620c5bb87fb2a2c2fe9b2c1add 100644 --- a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFPackBitsDecompressor.java +++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFPackBitsDecompressor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2021, 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 @@ package com.sun.imageio.plugins.tiff; import java.io.IOException; +import com.sun.imageio.plugins.common.ReaderUtil; public class TIFFPackBitsDecompressor extends TIFFDecompressor { @@ -77,8 +78,8 @@ public class TIFFPackBitsDecompressor extends TIFFDecompressor { int scanlineStride) throws IOException { stream.seek(offset); - byte[] srcData = new byte[byteCount]; - stream.readFully(srcData); + byte[] srcData = ReaderUtil. + staggeredReadByteStream(stream, byteCount); int bytesPerRow = (srcWidth*bitsPerPixel + 7)/8; byte[] buf; diff --git a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFYCbCrDecompressor.java b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFYCbCrDecompressor.java index 11151d8e6c8e71700e3465d95d52fcc477854d87..0f10904cab413b5fa6126387d69d36a0eea41331 100644 --- a/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFYCbCrDecompressor.java +++ b/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFYCbCrDecompressor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2021, 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 @@ -180,7 +180,7 @@ public class TIFFYCbCrDecompressor extends TIFFDecompressor { super.setOffset(offset); } - public void setByteCount(int byteCount) { + public void setByteCount(int byteCount) throws IOException { if(decompressor != null) { decompressor.setByteCount(byteCount); } diff --git a/src/java.desktop/share/classes/com/sun/media/sound/DataPusher.java b/src/java.desktop/share/classes/com/sun/media/sound/DataPusher.java index 8944df836aef4f68821ff47e90f61d6a00ab8585..d40c2cd8c317f5faa67ae58b4e6bd4232a2436ed 100644 --- a/src/java.desktop/share/classes/com/sun/media/sound/DataPusher.java +++ b/src/java.desktop/share/classes/com/sun/media/sound/DataPusher.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2022, 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,7 @@ public final class DataPusher implements Runnable { source.start(); if (pushThread == null) { pushThread = JSSecurityManager.createThread(this, - null, // name + "DataPusher", // name false, // daemon -1, // priority true); // doStart diff --git a/src/java.desktop/share/classes/com/sun/media/sound/JSSecurityManager.java b/src/java.desktop/share/classes/com/sun/media/sound/JSSecurityManager.java index f593ed8b89749206a6d9f4b058c41c7cc8a1f45f..51482b24aeaae88ecab6d19bb8a35463841f2831 100644 --- a/src/java.desktop/share/classes/com/sun/media/sound/JSSecurityManager.java +++ b/src/java.desktop/share/classes/com/sun/media/sound/JSSecurityManager.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2022, 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 @@ -112,7 +112,6 @@ final class JSSecurityManager { final boolean isDaemon, final int priority, final boolean doStart) { - String name = (threadName != null) ? threadName : "JSSM Thread"; Thread thread = new Thread(null, runnable, threadName, 0, false); thread.setDaemon(isDaemon); diff --git a/src/java.desktop/share/classes/com/sun/media/sound/StandardMidiFileReader.java b/src/java.desktop/share/classes/com/sun/media/sound/StandardMidiFileReader.java index 2dc904945714701cb833e48bbf34ff00c1b3601d..7303cb771756e8c11a27792433ee208751da1fb3 100644 --- a/src/java.desktop/share/classes/com/sun/media/sound/StandardMidiFileReader.java +++ b/src/java.desktop/share/classes/com/sun/media/sound/StandardMidiFileReader.java @@ -379,6 +379,10 @@ final class SMFParser { // meta int metaType = readUnsigned(); int metaLength = (int) readVarInt(); + if (metaLength < 0) { + throw new InvalidMidiDataException("length out of bounds: " + + metaLength); + } final byte[] metaData; try { metaData = new byte[metaLength]; diff --git a/src/java.desktop/share/classes/com/sun/media/sound/WaveFloatFileReader.java b/src/java.desktop/share/classes/com/sun/media/sound/WaveFloatFileReader.java index 2c3be1507fc1c0d11fbd36ded942bf72304f19f2..f8365f7178080e6c1bac2e4361c8bdd50a36df80 100644 --- a/src/java.desktop/share/classes/com/sun/media/sound/WaveFloatFileReader.java +++ b/src/java.desktop/share/classes/com/sun/media/sound/WaveFloatFileReader.java @@ -73,6 +73,10 @@ public final class WaveFloatFileReader extends SunFileReader { samplerate = chunk.readUnsignedInt(); /* framerate = */chunk.readUnsignedInt(); framesize = chunk.readUnsignedShort(); + if (framesize == 0) { + throw new UnsupportedAudioFileException( + "Can not process audio format with 0 frame size"); + } bits = chunk.readUnsignedShort(); } if (chunk.getFormat().equals("data")) { diff --git a/src/java.desktop/share/classes/java/awt/List.java b/src/java.desktop/share/classes/java/awt/List.java index 3877fcd3b3dba01866bfb16f88c6ba810c6aa3d5..f29374ab6bc062101dd13632dd42eeccaa246a82 100644 --- a/src/java.desktop/share/classes/java/awt/List.java +++ b/src/java.desktop/share/classes/java/awt/List.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2022, 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 @@ -1750,7 +1750,7 @@ public class List extends Component implements ItemSelectable, Accessible { /** * Get the Font of this object. * - * @return the Font,if supported, for the object; otherwise, null + * @return the Font, if supported, for the object; otherwise, null * @see #setFont */ public Font getFont() { diff --git a/src/java.desktop/share/classes/java/awt/MenuComponent.java b/src/java.desktop/share/classes/java/awt/MenuComponent.java index 0e7ab46cedf0391c0dfd0c1d77f4c673116db5d3..2550eea7f520f3f4eab189678a4e594d248cf47b 100644 --- a/src/java.desktop/share/classes/java/awt/MenuComponent.java +++ b/src/java.desktop/share/classes/java/awt/MenuComponent.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2022, 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 @@ -742,7 +742,7 @@ public abstract class MenuComponent implements java.io.Serializable { /** * Gets the {@code Font} of this object. * - * @return the {@code Font},if supported, for the object; + * @return the {@code Font}, if supported, for the object; * otherwise, {@code null} */ public Font getFont() { diff --git a/src/java.desktop/share/classes/java/awt/font/GlyphJustificationInfo.java b/src/java.desktop/share/classes/java/awt/font/GlyphJustificationInfo.java index c4a8a7452b6222f3776dc730fd002b734089013b..f9cc5d547f3afc3effcde46d44789020961444ac 100644 --- a/src/java.desktop/share/classes/java/awt/font/GlyphJustificationInfo.java +++ b/src/java.desktop/share/classes/java/awt/font/GlyphJustificationInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 1999, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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 @@ -193,7 +193,7 @@ public final class GlyphJustificationInfo { public final int shrinkPriority; /** - * If {@code true},this glyph absorbs all remaining shrinkage at + * If {@code true}, this glyph absorbs all remaining shrinkage at * this and lower priority levels as it shrinks. */ public final boolean shrinkAbsorb; diff --git a/src/java.desktop/share/classes/java/awt/geom/Arc2D.java b/src/java.desktop/share/classes/java/awt/geom/Arc2D.java index 849cc4703797fdaaf6bc75639f038e7245c65777..16a891b2cc4728ec11b4f23f06eac3a6d2cf9a60 100644 --- a/src/java.desktop/share/classes/java/awt/geom/Arc2D.java +++ b/src/java.desktop/share/classes/java/awt/geom/Arc2D.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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 @@ -777,7 +777,7 @@ public abstract class Arc2D extends RectangularShape { * elliptical boundary of the arc. * * @return A {@code Point2D} object representing the - * x,y coordinates of the ending point of the arc. + * x,y coordinates of the ending point of the arc. * @since 1.2 */ public Point2D getEndPoint() { diff --git a/src/java.desktop/share/classes/javax/imageio/stream/ImageInputStream.java b/src/java.desktop/share/classes/javax/imageio/stream/ImageInputStream.java index 6c05a7183c9e7b1790c1693762f3aa23d3b62847..d8999d4a884de701c13da49bef0568403cb7c557 100644 --- a/src/java.desktop/share/classes/javax/imageio/stream/ImageInputStream.java +++ b/src/java.desktop/share/classes/javax/imageio/stream/ImageInputStream.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2022, 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 @@ -393,7 +393,7 @@ public interface ImageInputStream extends DataInput, Closeable { * zero-extension. If the character {@code '\n'} is * encountered, it is discarded and reading ceases. If the * character {@code '\r'} is encountered, it is discarded - * and, if the following byte converts to the character + * and, if the following byte converts to the character * {@code '\n'}, then that is discarded also; reading then * ceases. If end of file is encountered before either of the * characters {@code '\n'} and {@code '\r'} is diff --git a/src/java.desktop/share/classes/javax/print/attribute/standard/JobStateReason.java b/src/java.desktop/share/classes/javax/print/attribute/standard/JobStateReason.java index f5ab4103098963140a4b0ff1dce1dc451949c840..2f8526cb7b15a48038fa1943e0ae1f32380e2737 100644 --- a/src/java.desktop/share/classes/javax/print/attribute/standard/JobStateReason.java +++ b/src/java.desktop/share/classes/javax/print/attribute/standard/JobStateReason.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2022, 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 @@ -89,7 +89,7 @@ public class JobStateReason extends EnumSyntax implements Attribute { /** * The printer could not access one or more documents passed by reference * (i.e., the print data representation object is a {@code URL}). This - * reason is intended to cover any file access problem,including file does + * reason is intended to cover any file access problem, including file does * not exist and access denied because of an access control problem. Whether * the printer aborts the job and moves the job to the {@code ABORTED} job * state or prints all documents that are accessible and moves the job to diff --git a/src/java.desktop/share/classes/javax/sound/midi/Sequencer.java b/src/java.desktop/share/classes/javax/sound/midi/Sequencer.java index 4ee2cbcfd5a6942cbdf4a44339e632cc2f65b1ef..f51cb37342761928586e07cd6caeabe04e6e5ed7 100644 --- a/src/java.desktop/share/classes/javax/sound/midi/Sequencer.java +++ b/src/java.desktop/share/classes/javax/sound/midi/Sequencer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2022, 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 @@ -472,7 +472,7 @@ public interface Sequencer extends MidiDevice { /** * Registers a meta-event listener to receive notification whenever a * meta-event is encountered in the sequence and processed by the sequencer. - * This method can fail if, for instance,this class of sequencer does not + * This method can fail if, for instance, this class of sequencer does not * support meta-event notification. * * @param listener listener to add diff --git a/src/java.desktop/share/classes/javax/swing/JFileChooser.java b/src/java.desktop/share/classes/javax/swing/JFileChooser.java index 544f4ee953bb356a9390fa3a779de7d5e4ca42ef..8d286e05f3bab1f030e805182ae1aa6ba968051a 100644 --- a/src/java.desktop/share/classes/javax/swing/JFileChooser.java +++ b/src/java.desktop/share/classes/javax/swing/JFileChooser.java @@ -1412,7 +1412,8 @@ public class JFileChooser extends JComponent implements Accessible { /** * Returns true if hidden files are not shown in the file chooser; - * otherwise, returns false. + * otherwise, returns false. The default value of this property may be + * derived from the underlying Operating System. * * @return the status of the file hiding property * @see #setFileHidingEnabled diff --git a/src/java.desktop/share/classes/javax/swing/package-info.java b/src/java.desktop/share/classes/javax/swing/package-info.java index 29509af1f4c15dee235be48f78085cb6872c3079..a75e62ebf4a720ad314f60eec97a22e82f0dae9b 100644 --- a/src/java.desktop/share/classes/javax/swing/package-info.java +++ b/src/java.desktop/share/classes/javax/swing/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2022, 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 @@ -132,15 +132,12 @@ * For overviews, tutorials, examples, guides, and other documentation, * please see: *

    * * @serial exclude diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicFileChooserUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicFileChooserUI.java index 33f42da00f8270734d2f2d52bc82f4a8e476a79f..439101c0ef28af39685a98ea00f449a9913592e3 100644 --- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicFileChooserUI.java +++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicFileChooserUI.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2022, 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,21 +25,58 @@ package javax.swing.plaf.basic; -import javax.swing.*; -import javax.swing.filechooser.*; -import javax.swing.filechooser.FileFilter; -import javax.swing.event.*; -import javax.swing.plaf.*; -import java.awt.*; -import java.awt.event.*; -import java.awt.datatransfer.*; -import java.beans.*; -import java.io.*; -import java.util.*; +import java.awt.BorderLayout; +import java.awt.Toolkit; +import java.awt.datatransfer.DataFlavor; +import java.awt.datatransfer.Transferable; +import java.awt.event.ActionEvent; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; +import java.beans.PropertyChangeListener; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Hashtable; import java.util.List; -import java.util.regex.*; +import java.util.Locale; +import java.util.regex.Pattern; +import java.util.regex.PatternSyntaxException; + +import javax.swing.AbstractAction; +import javax.swing.Action; +import javax.swing.ActionMap; +import javax.swing.Icon; +import javax.swing.InputMap; +import javax.swing.JButton; +import javax.swing.JComponent; +import javax.swing.JFileChooser; +import javax.swing.JList; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JTable; +import javax.swing.LookAndFeel; +import javax.swing.SwingUtilities; +import javax.swing.TransferHandler; +import javax.swing.UIDefaults; +import javax.swing.UIManager; +import javax.swing.event.ListSelectionEvent; +import javax.swing.event.ListSelectionListener; +import javax.swing.filechooser.FileFilter; +import javax.swing.filechooser.FileSystemView; +import javax.swing.filechooser.FileView; +import javax.swing.plaf.ActionMapUIResource; +import javax.swing.plaf.ComponentUI; +import javax.swing.plaf.FileChooserUI; +import javax.swing.plaf.UIResource; + import sun.awt.shell.ShellFolder; -import sun.swing.*; +import sun.swing.DefaultLookup; +import sun.swing.FilePane; +import sun.swing.SwingUtilities2; +import sun.swing.UIAction; /** * Basic L&F implementation of a FileChooser. @@ -723,11 +760,12 @@ public class BasicFileChooserUI extends FileChooserUI { // new functionality add it to the Handler, but make sure this // class calls into the Handler. Handler handler; + /** - * Constucts a {@code DoubleClickListener}. - * @param list the lsit + * Constructs a {@code DoubleClickListener}. + * @param list the list */ - public DoubleClickListener(JList list) { + public DoubleClickListener(JList list) { handler = new Handler(list); } diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicScrollBarUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicScrollBarUI.java index afb2d58b88519950d977639147fed2e80ad57587..8c7f348097e09fa510993276190579ccef3717c2 100644 --- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicScrollBarUI.java +++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicScrollBarUI.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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,18 +25,47 @@ package javax.swing.plaf.basic; +import java.awt.Color; +import java.awt.Component; +import java.awt.Container; +import java.awt.Dimension; +import java.awt.Graphics; +import java.awt.Insets; +import java.awt.LayoutManager; +import java.awt.Point; +import java.awt.Rectangle; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.FocusEvent; +import java.awt.event.FocusListener; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.awt.event.MouseMotionListener; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; + +import javax.swing.BoundedRangeModel; +import javax.swing.InputMap; +import javax.swing.JButton; +import javax.swing.JComponent; +import javax.swing.JList; +import javax.swing.JScrollBar; +import javax.swing.JScrollPane; +import javax.swing.JViewport; +import javax.swing.LookAndFeel; +import javax.swing.SwingConstants; +import javax.swing.SwingUtilities; +import javax.swing.Timer; +import javax.swing.UIManager; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; +import javax.swing.plaf.ComponentUI; +import javax.swing.plaf.ScrollBarUI; +import javax.swing.plaf.UIResource; + import sun.swing.DefaultLookup; import sun.swing.UIAction; -import java.awt.*; -import java.awt.event.*; - -import java.beans.*; - -import javax.swing.*; -import javax.swing.event.*; -import javax.swing.plaf.*; - import static sun.swing.SwingUtilities2.drawHLine; import static sun.swing.SwingUtilities2.drawRect; import static sun.swing.SwingUtilities2.drawVLine; @@ -754,7 +783,7 @@ public class BasicScrollBarUI } /** - * Laysouts a vertical scroll bar. + * Lays out a vertical scroll bar. * @param sb the scroll bar */ protected void layoutVScrollbar(JScrollBar sb) @@ -856,7 +885,7 @@ public class BasicScrollBarUI } /** - * Laysouts a vertical scroll bar. + * Lays out a horizontal scroll bar. * @param sb the scroll bar */ protected void layoutHScrollbar(JScrollBar sb) diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java index c9e5fd51f7fe194eeeb2165141d1174e9eb5830e..360e98eee7af162de68e894798021356165e92ff 100644 --- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java +++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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,21 +25,60 @@ package javax.swing.plaf.basic; -import sun.swing.SwingUtilities2; - -import javax.swing.*; -import javax.swing.event.*; -import javax.swing.plaf.*; -import javax.swing.text.View; - -import java.awt.*; -import java.awt.event.*; -import java.beans.PropertyChangeListener; +import java.awt.Color; +import java.awt.Component; +import java.awt.Container; +import java.awt.Dimension; +import java.awt.Font; +import java.awt.FontMetrics; +import java.awt.Graphics; +import java.awt.Graphics2D; +import java.awt.Insets; +import java.awt.LayoutManager; +import java.awt.Point; +import java.awt.Polygon; +import java.awt.Rectangle; +import java.awt.Shape; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.ContainerEvent; +import java.awt.event.ContainerListener; +import java.awt.event.FocusAdapter; +import java.awt.event.FocusEvent; +import java.awt.event.FocusListener; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; +import java.awt.event.MouseMotionListener; import java.beans.PropertyChangeEvent; -import java.util.Vector; +import java.beans.PropertyChangeListener; import java.util.Hashtable; +import java.util.Vector; + +import javax.swing.Action; +import javax.swing.ActionMap; +import javax.swing.Icon; +import javax.swing.InputMap; +import javax.swing.JButton; +import javax.swing.JComponent; +import javax.swing.JPanel; +import javax.swing.JTabbedPane; +import javax.swing.JViewport; +import javax.swing.KeyStroke; +import javax.swing.LookAndFeel; +import javax.swing.SwingConstants; +import javax.swing.SwingUtilities; +import javax.swing.UIManager; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; +import javax.swing.plaf.ComponentInputMapUIResource; +import javax.swing.plaf.ComponentUI; +import javax.swing.plaf.TabbedPaneUI; +import javax.swing.plaf.UIResource; +import javax.swing.text.View; import sun.swing.DefaultLookup; +import sun.swing.SwingUtilities2; import sun.swing.UIAction; /** @@ -216,7 +255,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants { public BasicTabbedPaneUI() {} /** - * Create a UI. + * Creates a UI. * @param c a component * @return a UI */ @@ -386,7 +425,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants { } /** - * Install the defaults. + * Installs the defaults. */ protected void installDefaults() { LookAndFeel.installColorsAndFont(tabPane, "TabbedPane.background", @@ -423,7 +462,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants { } /** - * Uninstall the defaults. + * Uninstalls the defaults. */ protected void uninstallDefaults() { highlight = null; @@ -438,7 +477,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants { } /** - * Install the listeners. + * Installs the listeners. */ protected void installListeners() { if ((propertyChangeListener = createPropertyChangeListener()) != null) { @@ -461,7 +500,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants { } /** - * Uninstall the listeners. + * Uninstalls the listeners. */ protected void uninstallListeners() { if (mouseListener != null) { @@ -916,7 +955,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants { * Paints a tab. * @param g the graphics * @param tabPlacement the tab placement - * @param rects rectangles + * @param rects the tab rectangles * @param tabIndex the tab index * @param iconRect the icon rectangle * @param textRect the text rectangle @@ -1090,9 +1129,9 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants { } /** - * Laysout a label. + * Lays out a label. * @param tabPlacement the tab placement - * @param metrics the font metric + * @param metrics the font metrics * @param tabIndex the tab index * @param title the title * @param icon the icon @@ -1262,7 +1301,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants { * Paints the focus indicator. * @param g the graphics * @param tabPlacement the tab placement - * @param rects rectangles + * @param rects the tab rectangles * @param tabIndex the tab index * @param iconRect the icon rectangle * @param textRect the text rectangle @@ -1307,9 +1346,9 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants { } /** - * this function draws the border around each tab - * note that this function does now draw the background of the tab. - * that is done elsewhere + * Paints the border around a tab. + * Note that this function does not paint the background of the tab, + * that is done elsewhere. * * @param g the graphics context in which to paint * @param tabPlacement the placement (left, right, bottom, top) of the tab @@ -1839,7 +1878,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants { } /** - * Assure the rectangles are created. + * Assures the tab rectangles are created. * @param tabCount the tab count */ protected void assureRectsCreated(int tabCount) { @@ -2144,7 +2183,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants { // Tab Navigation methods /** - * Navigate the selected tab. + * Navigates the selected tab. * @param direction the direction */ protected void navigateSelectedTab(int direction) { @@ -2226,7 +2265,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants { } /** - * Select the next tab in the run. + * Selects the next tab in the run. * @param current the current tab */ protected void selectNextTabInRun(int current) { @@ -2240,7 +2279,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants { } /** - * Select the previous tab in the run. + * Selects the previous tab in the run. * @param current the current tab */ protected void selectPreviousTabInRun(int current) { @@ -2254,7 +2293,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants { } /** - * Select the next tab. + * Selects the next tab. * @param current the current tab */ protected void selectNextTab(int current) { @@ -2267,7 +2306,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants { } /** - * Select the previous tab. + * Selects the previous tab. * @param current the current tab */ protected void selectPreviousTab(int current) { @@ -2772,7 +2811,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants { * Returns the preferred tab area width. * @param tabPlacement the tab placement * @param height the height - * @return the preferred tab area widty + * @return the preferred tab area width */ protected int preferredTabAreaWidth(int tabPlacement, int height) { FontMetrics metrics = getFontMetrics(); diff --git a/src/java.desktop/share/classes/javax/swing/table/TableCellEditor.java b/src/java.desktop/share/classes/javax/swing/table/TableCellEditor.java index a0bcb391ba3eb9569815106563fb580f0e33e8bb..21b7034a55c4071eedb6a8a3246177743c51e36e 100644 --- a/src/java.desktop/share/classes/javax/swing/table/TableCellEditor.java +++ b/src/java.desktop/share/classes/javax/swing/table/TableCellEditor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 1999, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2021, 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,13 +27,11 @@ package javax.swing.table; import java.awt.Component; import javax.swing.CellEditor; -import javax.swing.*; +import javax.swing.JTable; /** - * This interface defines the method any object that would like to be - * an editor of values for components such as JListBox, - * JComboBox, JTree, or JTable - * needs to implement. + * This interface must be implemented to provide an editor of cell values + * for a {@code JTable}. * * @author Alan Chung */ diff --git a/src/java.desktop/share/classes/javax/swing/text/html/AccessibleHTML.java b/src/java.desktop/share/classes/javax/swing/text/html/AccessibleHTML.java index ba8465d45704185ab7a86a6afa6973cd6a8eed42..12cd5a74a721795e3814091d2bdd31621d3491e9 100644 --- a/src/java.desktop/share/classes/javax/swing/text/html/AccessibleHTML.java +++ b/src/java.desktop/share/classes/javax/swing/text/html/AccessibleHTML.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2022, 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 @@ -464,7 +464,7 @@ class AccessibleHTML implements Accessible { /** * Gets the Font of this object. * - * @return the Font,if supported, for the object; otherwise, null + * @return the Font, if supported, for the object; otherwise, null * @see #setFont */ public Font getFont() { diff --git a/src/java.desktop/share/classes/sun/awt/SunToolkit.java b/src/java.desktop/share/classes/sun/awt/SunToolkit.java index dfc3d24c579640cda58ee584bf1af628d713c480..380a5e4db017e29a66f329891bc075786e04dfa4 100644 --- a/src/java.desktop/share/classes/sun/awt/SunToolkit.java +++ b/src/java.desktop/share/classes/sun/awt/SunToolkit.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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 @@ -204,7 +204,7 @@ public abstract class SunToolkit extends Toolkit * access to Xlib, OpenGL, etc. However, these methods are implemented * in SunToolkit so that they can be called from shared code (e.g. * from the OGL pipeline) or from the X11 pipeline regardless of whether - * XToolkit or MToolkit is currently in use. There are native macros + * XToolkit is currently in use. There are native macros * (such as AWT_LOCK) defined in awt.h, so if the implementation of these * methods is changed, make sure it is compatible with the native macros. * diff --git a/src/java.desktop/share/classes/sun/awt/shell/ShellFolder.java b/src/java.desktop/share/classes/sun/awt/shell/ShellFolder.java index 0c375a900a0aae852f1e1edbc5a5e60319b357ff..3aa91dcb6006f31bb0e7ed32719098c4b69407a8 100644 --- a/src/java.desktop/share/classes/sun/awt/shell/ShellFolder.java +++ b/src/java.desktop/share/classes/sun/awt/shell/ShellFolder.java @@ -41,6 +41,7 @@ import java.util.List; import java.util.concurrent.Callable; import javax.swing.SwingConstants; +import sun.awt.OSInfo; /** * @author Michael Martak @@ -295,7 +296,7 @@ public abstract class ShellFolder extends File { */ public static File getNormalizedFile(File f) throws IOException { File canonical = f.getCanonicalFile(); - if (f.equals(canonical)) { + if (f.equals(canonical) || OSInfo.getOSType() == OSInfo.OSType.WINDOWS) { // path of f doesn't contain symbolic links return canonical; } diff --git a/src/java.desktop/share/classes/sun/font/TrueTypeFont.java b/src/java.desktop/share/classes/sun/font/TrueTypeFont.java index b3afe089132a8ac878f9773f84ac525b131ef3f7..856297643cf63eeee242c212b788db661b8ab0f0 100644 --- a/src/java.desktop/share/classes/sun/font/TrueTypeFont.java +++ b/src/java.desktop/share/classes/sun/font/TrueTypeFont.java @@ -503,7 +503,9 @@ public class TrueTypeFont extends FileFont { /* checksum */ ibuffer.get(); table.offset = ibuffer.get() & 0x7FFFFFFF; table.length = ibuffer.get() & 0x7FFFFFFF; - if (table.offset + table.length > fileSize) { + if ((table.offset + table.length < table.length) || + (table.offset + table.length > fileSize)) + { throw new FontFormatException("bad table, tag="+table.tag); } } @@ -798,8 +800,11 @@ public class TrueTypeFont extends FileFont { break; } } + if (entry == null || entry.length == 0 || - entry.offset+entry.length > fileSize) { + (entry.offset + entry.length < entry.length) || + (entry.offset + entry.length > fileSize)) + { return null; } @@ -888,6 +893,9 @@ public class TrueTypeFont extends FileFont { return false; } ByteBuffer eblcTable = getTableBuffer(EBLCTag); + if (eblcTable == null) { + return false; + } int numSizes = eblcTable.getInt(4); /* The bitmapSizeTable's start at offset of 8. * Each bitmapSizeTable entry is 48 bytes. diff --git a/src/java.desktop/share/classes/sun/print/PSPrinterJob.java b/src/java.desktop/share/classes/sun/print/PSPrinterJob.java index e0252aad226664ad44f2f2b97214ff21eb091f17..61450e49553f7c788d39ebe30da208ac6cbeba84 100644 --- a/src/java.desktop/share/classes/sun/print/PSPrinterJob.java +++ b/src/java.desktop/share/classes/sun/print/PSPrinterJob.java @@ -394,10 +394,8 @@ public class PSPrinterJob extends RasterPrinterJob { // Load property file Properties props = new Properties(); - try (FileInputStream is = new FileInputStream(f.getPath()); - BufferedInputStream bis = new BufferedInputStream(is)) - { - props.load(bis); + try (FileInputStream in = new FileInputStream(f.getPath())) { + props.load(in); } return props; } catch (Exception e){ diff --git a/src/java.desktop/share/classes/sun/print/PSStreamPrintService.java b/src/java.desktop/share/classes/sun/print/PSStreamPrintService.java index 62a28e0505261c016118840db40be102a7838136..e1594e051f5c31996c75ba21ec1acc3dc0eb7938 100644 --- a/src/java.desktop/share/classes/sun/print/PSStreamPrintService.java +++ b/src/java.desktop/share/classes/sun/print/PSStreamPrintService.java @@ -427,7 +427,17 @@ public class PSStreamPrintService extends StreamPrintService if (attr == OrientationRequested.REVERSE_PORTRAIT || (flavor != null) && !(flavor.equals(DocFlavor.SERVICE_FORMATTED.PAGEABLE) || - flavor.equals(DocFlavor.SERVICE_FORMATTED.PRINTABLE))) { + flavor.equals(DocFlavor.SERVICE_FORMATTED.PRINTABLE) || + flavor.equals(DocFlavor.INPUT_STREAM.GIF) || + flavor.equals(DocFlavor.INPUT_STREAM.JPEG) || + flavor.equals(DocFlavor.INPUT_STREAM.PNG) || + flavor.equals(DocFlavor.BYTE_ARRAY.GIF) || + flavor.equals(DocFlavor.BYTE_ARRAY.JPEG) || + flavor.equals(DocFlavor.BYTE_ARRAY.PNG) || + flavor.equals(DocFlavor.URL.GIF) || + flavor.equals(DocFlavor.URL.JPEG) || + flavor.equals(DocFlavor.URL.PNG))) + { return false; } } else if (attr.getCategory() == PageRanges.class) { @@ -440,7 +450,7 @@ public class PSStreamPrintService extends StreamPrintService if (flavor != null && !(flavor.equals(DocFlavor.SERVICE_FORMATTED.PAGEABLE) || flavor.equals(DocFlavor.SERVICE_FORMATTED.PRINTABLE))) { - return false; + return attr == SheetCollate.UNCOLLATED; } } else if (attr.getCategory() == Sides.class) { if (flavor != null && diff --git a/src/java.desktop/unix/classes/sun/awt/X11GraphicsEnvironment.java b/src/java.desktop/unix/classes/sun/awt/X11GraphicsEnvironment.java index e8cff0a28e93dd3c332c866fbe243ebdb54eb62b..5c9d2a1b69570215721360e343ca2c8b2b96b32e 100644 --- a/src/java.desktop/unix/classes/sun/awt/X11GraphicsEnvironment.java +++ b/src/java.desktop/unix/classes/sun/awt/X11GraphicsEnvironment.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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,7 +67,7 @@ public final class X11GraphicsEnvironment extends SunGraphicsEnvironment { System.loadLibrary("awt"); /* - * Note: The MToolkit object depends on the static initializer + * Note: The XToolkit object depends on the static initializer * of X11GraphicsEnvironment to initialize the connection to * the X11 server. */ diff --git a/src/java.desktop/unix/classes/sun/font/FcFontConfiguration.java b/src/java.desktop/unix/classes/sun/font/FcFontConfiguration.java index d839731bb2f0238d82b0005b1237417755bc644d..24eafee31a5c33bdc33020b6d3d263c6d5bd1374 100644 --- a/src/java.desktop/unix/classes/sun/font/FcFontConfiguration.java +++ b/src/java.desktop/unix/classes/sun/font/FcFontConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2022, 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 @@ -295,6 +295,12 @@ public class FcFontConfiguration extends FontConfiguration { return null; } + private String extractOsInfo(String s) { + if (s.startsWith("\"")) s = s.substring(1); + if (s.endsWith("\"")) s = s.substring(0, s.length()-1); + return s; + } + /** * Sets the OS name and version from environment information. */ @@ -331,6 +337,16 @@ public class FcFontConfiguration extends FontConfiguration { } else if ((f = new File("/etc/fedora-release")).canRead()) { osName = "Fedora"; osVersion = getVersionString(f); + } else if ((f = new File("/etc/os-release")).canRead()) { + Properties props = new Properties(); + try (FileInputStream fis = new FileInputStream(f)) { + props.load(fis); + } + osName = props.getProperty("NAME"); + osVersion = props.getProperty("VERSION_ID"); + osName = extractOsInfo(osName); + if (osName.equals("SLES")) osName = "SuSE"; + osVersion = extractOsInfo(osVersion); } } catch (Exception e) { if (FontUtilities.debugFonts()) { diff --git a/src/java.desktop/unix/classes/sun/font/MFontConfiguration.java b/src/java.desktop/unix/classes/sun/font/MFontConfiguration.java index e0e58cf167b237956c0281bc69d90a566a58ffd1..73c6142805931de65e961a649465b423cee26f77 100644 --- a/src/java.desktop/unix/classes/sun/font/MFontConfiguration.java +++ b/src/java.desktop/unix/classes/sun/font/MFontConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2022, 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 @@ -114,6 +114,16 @@ public class MFontConfiguration extends FontConfiguration { } osName = props.getProperty("DISTRIB_ID"); osVersion = props.getProperty("DISTRIB_RELEASE"); + } else if ((f = new File("/etc/os-release")).canRead()) { + Properties props = new Properties(); + try (FileInputStream fis = new FileInputStream(f)) { + props.load(fis); + } + osName = props.getProperty("NAME"); + osVersion = props.getProperty("VERSION_ID"); + osName = extractOsInfo(osName); + if (osName.equals("SLES")) osName = "SuSE"; + osVersion = extractOsInfo(osVersion); } } catch (Exception e) { } @@ -134,6 +144,12 @@ public class MFontConfiguration extends FontConfiguration { return null; } + private String extractOsInfo(String s) { + if (s.startsWith("\"")) s = s.substring(1); + if (s.endsWith("\"")) s = s.substring(0, s.length()-1); + return s; + } + private static final String fontsDirPrefix = "$JRE_LIB_FONTS"; protected String mapFileName(String fileName) { diff --git a/src/java.desktop/unix/classes/sun/java2d/opengl/GLXGraphicsConfig.java b/src/java.desktop/unix/classes/sun/java2d/opengl/GLXGraphicsConfig.java index 536962bd82030e87cb085fcdcb63687cc571ac20..588dfbf882aef65ba91d5a2568caf592e1e92732 100644 --- a/src/java.desktop/unix/classes/sun/java2d/opengl/GLXGraphicsConfig.java +++ b/src/java.desktop/unix/classes/sun/java2d/opengl/GLXGraphicsConfig.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2022, 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 @@ -216,7 +216,7 @@ public final class GLXGraphicsConfig } /** - * The following methods are invoked from MToolkit or XToolkit.java and + * The following methods are invoked from XToolkit.java and * X11ComponentPeer.java rather than having the X11-dependent * implementations hardcoded in those classes. This way the appropriate * actions are taken based on the peer's GraphicsConfig, whether it is diff --git a/src/java.desktop/unix/native/common/awt/awt.h b/src/java.desktop/unix/native/common/awt/awt.h index 18a6dee275b27c891254e8ee5aabd6f83b67a356..5c71431f03374c0fbd9016ee8584b0b87443934e 100644 --- a/src/java.desktop/unix/native/common/awt/awt.h +++ b/src/java.desktop/unix/native/common/awt/awt.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2022, 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 @@ typedef char Boolean; #endif /* !HEADLESS && !MACOSX */ -/* The JVM instance: defined in awt_MToolkit.c */ +/* The JVM instance: defined in awt_LoadLibrary.c */ extern JavaVM *jvm; extern jclass tkClass; diff --git a/src/java.desktop/windows/native/libawt/windows/awt_Component.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Component.cpp index 8db02f9aee485ce89f2cfc3d03e02e7b867d7c6a..2dadde0548063d3d2de29e22c54ee8cd119092fc 100644 --- a/src/java.desktop/windows/native/libawt/windows/awt_Component.cpp +++ b/src/java.desktop/windows/native/libawt/windows/awt_Component.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2022, 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 @@ -3917,11 +3917,11 @@ void AwtComponent::SetCandidateWindow(int iCandType, int x, int y) HIMC hIMC = ImmGetContext(hwnd); if (hIMC) { CANDIDATEFORM cf; - cf.dwStyle = CFS_POINT; + cf.dwStyle = CFS_CANDIDATEPOS; ImmGetCandidateWindow(hIMC, 0, &cf); if (x != cf.ptCurrentPos.x || y != cf.ptCurrentPos.y) { cf.dwIndex = iCandType; - cf.dwStyle = CFS_POINT; + cf.dwStyle = CFS_CANDIDATEPOS; cf.ptCurrentPos = {x, y}; cf.rcArea = {0, 0, 0, 0}; ImmSetCandidateWindow(hIMC, &cf); diff --git a/src/java.desktop/windows/native/libawt/windows/awt_DnDDS.cpp b/src/java.desktop/windows/native/libawt/windows/awt_DnDDS.cpp index 0f9fb662bbf5c85b779a8032225c0194dc568ed5..8146d62c4a7dd4d31dd5bd7c6ab827d176f1db87 100644 --- a/src/java.desktop/windows/native/libawt/windows/awt_DnDDS.cpp +++ b/src/java.desktop/windows/native/libawt/windows/awt_DnDDS.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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 @@ -267,13 +267,13 @@ void AwtDragSource::_DoDragDrop(void* param) { dragSource->Signal(); AwtToolkit &toolkit = AwtToolkit::GetInstance(); - toolkit.isInDoDragDropLoop = TRUE; + toolkit.isDnDSourceActive = TRUE; res = ::DoDragDrop(dragSource, dragSource, convertActionsToDROPEFFECT(dragSource->m_actions), &effects ); - toolkit.isInDoDragDropLoop = FALSE; + toolkit.isDnDSourceActive = FALSE; if (effects == DROPEFFECT_NONE && dragSource->m_dwPerformedDropEffect != DROPEFFECT_NONE) { effects = dragSource->m_dwPerformedDropEffect; diff --git a/src/java.desktop/windows/native/libawt/windows/awt_DnDDT.cpp b/src/java.desktop/windows/native/libawt/windows/awt_DnDDT.cpp index 126e7194f865eaa70db07d109cb69891c59ca574..ed41af9d6bfc8e6f880e29cc0c0e781113da5802 100644 --- a/src/java.desktop/windows/native/libawt/windows/awt_DnDDT.cpp +++ b/src/java.desktop/windows/native/libawt/windows/awt_DnDDT.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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 @@ -141,7 +141,7 @@ static void ScaleDown(POINT &cp, HWND m_window) { HRESULT __stdcall AwtDropTarget::DragEnter(IDataObject __RPC_FAR *pDataObj, DWORD grfKeyState, POINTL pt, DWORD __RPC_FAR *pdwEffect) { TRY; - AwtToolkit::GetInstance().isInDoDragDropLoop = TRUE; + AwtToolkit::GetInstance().isDnDTargetActive = TRUE; if (NULL != m_pIDropTargetHelper) { m_pIDropTargetHelper->DragEnter( m_window, @@ -161,7 +161,7 @@ HRESULT __stdcall AwtDropTarget::DragEnter(IDataObject __RPC_FAR *pDataObj, DWOR (IsLocalDnD() && !IsLocalDataObject(pDataObj))) { *pdwEffect = retEffect; - AwtToolkit::GetInstance().isInDoDragDropLoop = FALSE; + AwtToolkit::GetInstance().isDnDTargetActive = FALSE; return ret; } @@ -173,7 +173,7 @@ HRESULT __stdcall AwtDropTarget::DragEnter(IDataObject __RPC_FAR *pDataObj, DWOR } if (JNU_IsNull(env, m_dtcp) || !JNU_IsNull(env, safe_ExceptionOccurred(env))) { - AwtToolkit::GetInstance().isInDoDragDropLoop = FALSE; + AwtToolkit::GetInstance().isDnDTargetActive = FALSE; return ret; } @@ -200,12 +200,12 @@ HRESULT __stdcall AwtDropTarget::DragEnter(IDataObject __RPC_FAR *pDataObj, DWOR env->ExceptionDescribe(); env->ExceptionClear(); actions = java_awt_dnd_DnDConstants_ACTION_NONE; - AwtToolkit::GetInstance().isInDoDragDropLoop = FALSE; + AwtToolkit::GetInstance().isDnDTargetActive = FALSE; } } catch (std::bad_alloc&) { retEffect = ::convertActionsToDROPEFFECT(actions); *pdwEffect = retEffect; - AwtToolkit::GetInstance().isInDoDragDropLoop = FALSE; + AwtToolkit::GetInstance().isDnDTargetActive = FALSE; throw; } @@ -421,7 +421,7 @@ void AwtDropTarget::DropDone(jboolean success, jint action) { m_dropSuccess = success; m_dropActions = action; AwtToolkit::GetInstance().QuitMessageLoop(AwtToolkit::EXIT_ENCLOSING_LOOP); - AwtToolkit::GetInstance().isInDoDragDropLoop = FALSE; + AwtToolkit::GetInstance().isDnDTargetActive = FALSE; } /** @@ -1136,7 +1136,7 @@ void AwtDropTarget::UnloadCache() { void AwtDropTarget::DragCleanup(void) { UnloadCache(); - AwtToolkit::GetInstance().isInDoDragDropLoop = FALSE; + AwtToolkit::GetInstance().isDnDTargetActive = FALSE; } BOOL AwtDropTarget::IsLocalDataObject(IDataObject __RPC_FAR *pDataObject) { diff --git a/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp index 355d32072730feee2b0f6d3aba28c8d9c5d6343e..17e69d70b15bd3375b530bd712e10582d8951185 100644 --- a/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp +++ b/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2022, 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 @@ -344,7 +344,8 @@ AwtToolkit::AwtToolkit() { m_waitEvent = ::CreateEvent(NULL, FALSE, FALSE, NULL); m_inputMethodWaitEvent = ::CreateEvent(NULL, FALSE, FALSE, NULL); - isInDoDragDropLoop = FALSE; + isDnDSourceActive = FALSE; + isDnDTargetActive = FALSE; eventNumber = 0; } @@ -3012,7 +3013,7 @@ Java_sun_awt_windows_WToolkit_syncNativeQueue(JNIEnv *env, jobject self, jlong t tk.PostMessage(WM_SYNC_WAIT, 0, 0); for(long t = 2; t < timeout && WAIT_TIMEOUT == ::WaitForSingleObject(tk.m_waitEvent, 2); t+=2) { - if (tk.isInDoDragDropLoop) { + if (tk.isDnDSourceActive || tk.isDnDTargetActive) { break; } } @@ -3216,7 +3217,7 @@ LRESULT AwtToolkit::InvokeInputMethodFunction(UINT msg, WPARAM wParam, LPARAM lP * the IME completion. */ CriticalSection::Lock lock(m_inputMethodLock); - if (isInDoDragDropLoop) { + if (isDnDSourceActive || isDnDTargetActive) { SendMessage(msg, wParam, lParam); ::ResetEvent(m_inputMethodWaitEvent); return m_inputMethodData; diff --git a/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.h b/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.h index a148001842d568a58aaba6eac1793362d851e8ee..ff9baf6464a630c05fccebbd45d83a10e92bf1b6 100644 --- a/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.h +++ b/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2022, 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 @@ -441,7 +441,8 @@ public: HANDLE m_waitEvent; volatile DWORD eventNumber; - volatile BOOL isInDoDragDropLoop; + volatile BOOL isDnDSourceActive; + volatile BOOL isDnDTargetActive; private: HWND CreateToolkitWnd(LPCTSTR name); diff --git a/src/java.logging/share/classes/java/util/logging/LogManager.java b/src/java.logging/share/classes/java/util/logging/LogManager.java index a6d11b64517952a9aeb868941a6c5e0ce6f51bf7..2d277602a4aceccf96d25ea774183205c291b2a1 100644 --- a/src/java.logging/share/classes/java/util/logging/LogManager.java +++ b/src/java.logging/share/classes/java/util/logging/LogManager.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2022, 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 @@ -1381,8 +1381,7 @@ public class LogManager { String fname = getConfigurationFileName(); try (final InputStream in = new FileInputStream(fname)) { - final BufferedInputStream bin = new BufferedInputStream(in); - readConfiguration(bin); + readConfiguration(in); } } @@ -1877,8 +1876,7 @@ public class LogManager { String fname = getConfigurationFileName(); try (final InputStream in = new FileInputStream(fname)) { - final BufferedInputStream bin = new BufferedInputStream(in); - updateConfiguration(bin, mapper); + updateConfiguration(in, mapper); } } @@ -2558,13 +2556,14 @@ public class LogManager { /** * String representation of the - * {@link javax.management.ObjectName} for the management interface + * {@link java.management/javax.management.ObjectName} for the management interface * for the logging facility. * - * @see java.lang.management.PlatformLoggingMXBean + * @see java.management/java.lang.management.PlatformLoggingMXBean * * @since 1.5 */ + @SuppressWarnings("doclint:reference") public static final String LOGGING_MXBEAN_NAME = "java.util.logging:type=Logging"; @@ -2575,14 +2574,15 @@ public class LogManager { * * @deprecated {@code java.util.logging.LoggingMXBean} is deprecated and * replaced with {@code java.lang.management.PlatformLoggingMXBean}. Use - * {@link java.lang.management.ManagementFactory#getPlatformMXBean(Class) + * {@link java.management/java.lang.management.ManagementFactory#getPlatformMXBean(Class) * ManagementFactory.getPlatformMXBean}(PlatformLoggingMXBean.class) * instead. * - * @see java.lang.management.PlatformLoggingMXBean + * @see java.management/java.lang.management.PlatformLoggingMXBean * @since 1.5 */ @Deprecated(since="9") + @SuppressWarnings("doclint:reference") public static synchronized LoggingMXBean getLoggingMXBean() { return Logging.getInstance(); } diff --git a/src/java.logging/share/classes/java/util/logging/LogRecord.java b/src/java.logging/share/classes/java/util/logging/LogRecord.java index 5549789664af3fd7c391a9dab2b91a9b79570155..6d680d7f6065ca8336d7da67c60758adbb286132 100644 --- a/src/java.logging/share/classes/java/util/logging/LogRecord.java +++ b/src/java.logging/share/classes/java/util/logging/LogRecord.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2022, 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 @@ -179,7 +179,7 @@ public class LogRecord implements java.io.Serializable { /** * Synthesizes a pseudo unique integer value from a long {@code id} value. - * For backward compatibility with previous releases,the returned integer is + * For backward compatibility with previous releases, the returned integer is * such that for any positive long less than or equals to {@code Integer.MAX_VALUE}, * the returned integer is equal to the original value. * Otherwise - it is synthesized with a best effort hashing algorithm, diff --git a/src/java.logging/share/classes/java/util/logging/LoggingMXBean.java b/src/java.logging/share/classes/java/util/logging/LoggingMXBean.java index 812eb36622d2814a985a624b9b11f31753759c4d..01eea1d0e1e123467f468264110ca7ee20ad7fbe 100644 --- a/src/java.logging/share/classes/java/util/logging/LoggingMXBean.java +++ b/src/java.logging/share/classes/java/util/logging/LoggingMXBean.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2022, 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 @@ -29,18 +29,18 @@ package java.util.logging; /** * The management interface for the logging facility. * - * {@link java.lang.management.PlatformLoggingMXBean + * {@link java.management/java.lang.management.PlatformLoggingMXBean * java.lang.management.PlatformLoggingMXBean} is the management interface * for logging facility registered in the {@link - * java.lang.management.ManagementFactory#getPlatformMBeanServer() + * java.management/java.lang.management.ManagementFactory#getPlatformMBeanServer() * platform MBeanServer}. * It is recommended to use the {@code PlatformLoggingMXBean} obtained via - * the {@link java.lang.management.ManagementFactory#getPlatformMXBean(Class) + * the {@link java.management/java.lang.management.ManagementFactory#getPlatformMXBean(Class) * ManagementFactory.getPlatformMXBean(PlatformLoggingMXBean.class)} method. * * @deprecated {@code LoggingMXBean} is no longer a {@link - * java.lang.management.PlatformManagedObject platform MXBean} and is replaced - * with {@link java.lang.management.PlatformLoggingMXBean}. + * java.management/java.lang.management.PlatformManagedObject platform MXBean} and is replaced + * with {@link java.management/java.lang.management.PlatformLoggingMXBean}. * It will not register in the platform {@code MBeanServer}. * Use {@code ManagementFactory.getPlatformMXBean(PlatformLoggingMXBean.class)} * instead. @@ -49,9 +49,10 @@ package java.util.logging; * @author Mandy Chung * @since 1.5 * - * @see java.lang.management.PlatformLoggingMXBean + * @see java.management/java.lang.management.PlatformLoggingMXBean */ @Deprecated(since="9") +@SuppressWarnings("doclint:reference") public interface LoggingMXBean { /** diff --git a/src/java.management/share/classes/java/lang/management/ManagementFactory.java b/src/java.management/share/classes/java/lang/management/ManagementFactory.java index cba413ccf63942c537588196c3c2bf3720df66de..13db85d0f094cc3b10e07d40500a662f15981cb2 100644 --- a/src/java.management/share/classes/java/lang/management/ManagementFactory.java +++ b/src/java.management/share/classes/java/lang/management/ManagementFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2022, 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 @@ -176,7 +176,7 @@ import sun.management.spi.PlatformMBeanProvider.PlatformComponent; * * * {@link PlatformLoggingMXBean} - * {@link java.util.logging.LogManager#LOGGING_MXBEAN_NAME + * {@link java.logging/java.util.logging.LogManager#LOGGING_MXBEAN_NAME * java.util.logging:type=Logging} * * @@ -246,7 +246,8 @@ import sun.management.spi.PlatformMBeanProvider.PlatformComponent; * @author Mandy Chung * @since 1.5 */ -@SuppressWarnings("removal") +@SuppressWarnings({"removal", + "doclint:reference"}) // cross-module links public class ManagementFactory { // A class with only static fields and methods. private ManagementFactory() {}; diff --git a/src/java.management/share/classes/java/lang/management/PlatformLoggingMXBean.java b/src/java.management/share/classes/java/lang/management/PlatformLoggingMXBean.java index 80595dd75d6de9b57b81295fc053dd85c487e3ec..3a50dc20958785b066dd94a778abba8c320b2659 100644 --- a/src/java.management/share/classes/java/lang/management/PlatformLoggingMXBean.java +++ b/src/java.management/share/classes/java/lang/management/PlatformLoggingMXBean.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2022, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ package java.lang.management; /** - * The management interface for the {@linkplain java.util.logging logging} facility. + * The management interface for the {@linkplain java.logging/java.util.logging logging} facility. * *

    There is a single global instance of the {@code PlatformLoggingMXBean}. * The {@link java.lang.management.ManagementFactory#getPlatformMXBean(Class) @@ -41,17 +41,18 @@ package java.lang.management; * The {@link javax.management.ObjectName ObjectName} for uniquely * identifying the {@code PlatformLoggingMXBean} within an MBeanServer is: * 

    - *      {@link java.util.logging.LogManager#LOGGING_MXBEAN_NAME java.util.logging:type=Logging}
+ *      {@link java.logging/java.util.logging.LogManager#LOGGING_MXBEAN_NAME java.util.logging:type=Logging}
  *
    * * @since 1.7 */ +@SuppressWarnings("doclint:reference") // cross-module links public interface PlatformLoggingMXBean extends PlatformManagedObject { /** * Returns the list of the currently registered - * {@linkplain java.util.logging.Logger logger} names. This method - * calls {@link java.util.logging.LogManager#getLoggerNames} and + * {@linkplain java.logging/java.util.logging.Logger logger} names. This method + * calls {@link java.logging/java.util.logging.LogManager#getLoggerNames} and * returns a list of the logger names. * * @return A list of {@code String} each of which is a @@ -60,15 +61,15 @@ public interface PlatformLoggingMXBean extends PlatformManagedObject { java.util.List getLoggerNames(); /** - * Gets the name of the log {@linkplain java.util.logging.Logger#getLevel + * Gets the name of the log {@linkplain java.logging/java.util.logging.Logger#getLevel * level} associated with the specified logger. * If the specified logger does not exist, {@code null} * is returned. * This method first finds the logger of the given name and * then returns the name of the log level by calling: *
    - * {@link java.util.logging.Logger#getLevel - * Logger.getLevel()}.{@link java.util.logging.Level#getName getName()}; + * {@link java.logging/java.util.logging.Logger#getLevel + * Logger.getLevel()}.{@link java.logging/java.util.logging.Level#getName getName()}; *
    * *

    @@ -83,16 +84,16 @@ public interface PlatformLoggingMXBean extends PlatformManagedObject { * is {@code null}. If the specified logger does not * exist, {@code null} is returned. * - * @see java.util.logging.Logger#getLevel + * @see java.logging/java.util.logging.Logger#getLevel */ String getLoggerLevel(String loggerName); /** * Sets the specified logger to the specified new - * {@linkplain java.util.logging.Logger#setLevel level}. + * {@linkplain java.logging/java.util.logging.Logger#setLevel level}. * If the {@code levelName} is not {@code null}, the level * of the specified logger is set to the parsed - * {@link java.util.logging.Level Level} + * {@link java.logging/java.util.logging.Level Level} * matching the {@code levelName}. * If the {@code levelName} is {@code null}, the level * of the specified logger is set to {@code null} and @@ -111,13 +112,13 @@ public interface PlatformLoggingMXBean extends PlatformManagedObject { * @throws SecurityException if a security manager exists and if * the caller does not have LoggingPermission("control"). * - * @see java.util.logging.Logger#setLevel + * @see java.logging/java.util.logging.Logger#setLevel */ void setLoggerLevel(String loggerName, String levelName); /** * Returns the name of the - * {@linkplain java.util.logging.Logger#getParent parent} + * {@linkplain java.logging/java.util.logging.Logger#getParent parent} * for the specified logger. * If the specified logger does not exist, {@code null} is returned. * If the specified logger is the root {@code Logger} in the namespace, diff --git a/src/java.management/share/classes/javax/management/MXBean.java b/src/java.management/share/classes/javax/management/MXBean.java index f583ba62eaa23fe7a891672d7c9c0d7d47321f79..e1d740d39be734ea4cec09540a33cba71792ba3e 100644 --- a/src/java.management/share/classes/javax/management/MXBean.java +++ b/src/java.management/share/classes/javax/management/MXBean.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2022, 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 @@ -929,7 +929,7 @@ public interface ModuleMXBean {

  • Otherwise, if J has at least one public constructor with either {@link javax.management.ConstructorParameters @javax.management.ConstructorParameters} or - {@code @java.beans.ConstructoProperties} annotation, then one of those + {@code @java.beans.ConstructorProperties} annotation, then one of those constructors (not necessarily always the same one) will be called to reconstruct an instance of J. If a constructor is annotated with both diff --git a/src/java.management/share/classes/javax/management/remote/JMXAddressable.java b/src/java.management/share/classes/javax/management/remote/JMXAddressable.java index cc770b75194fc02d93a497ed7ef2b8b51682d6eb..b100004d51ed160c19ea5d4ff289b73b6d54fb6c 100644 --- a/src/java.management/share/classes/javax/management/remote/JMXAddressable.java +++ b/src/java.management/share/classes/javax/management/remote/JMXAddressable.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2022, 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 @@ -32,7 +32,7 @@ package javax.management.remote; * Depending on the connector implementation, a {@link JMXConnector} * object may implement this interface too. {@code JMXConnector} * objects for the RMI Connector are instances of - * {@link javax.management.remote.rmi.RMIConnector RMIConnector} which + * {@link java.management.rmi/javax.management.remote.rmi.RMIConnector RMIConnector} which * implements this interface.

    * *

    An object implementing this interface might not have an address @@ -41,6 +41,7 @@ package javax.management.remote; * * @since 1.6 */ +@SuppressWarnings("doclint:reference") // cross-module links public interface JMXAddressable { /** *

    The address of this object.

    diff --git a/src/java.management/share/classes/javax/management/remote/JMXServerErrorException.java b/src/java.management/share/classes/javax/management/remote/JMXServerErrorException.java index a8bf827fd3e778ea58a783e81760d9bb143dffe0..185912c6b660aeaadd08fbf00c14b6c0586c197a 100644 --- a/src/java.management/share/classes/javax/management/remote/JMXServerErrorException.java +++ b/src/java.management/share/classes/javax/management/remote/JMXServerErrorException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2022, 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 @@ -38,9 +38,10 @@ import javax.management.MBeanServer; * JMXServerErrorException instance contains the original * Error that occurred as its cause. * - * @see java.rmi.ServerError + * @see java.rmi/java.rmi.ServerError * @since 1.5 */ +@SuppressWarnings("doclint:reference") // cross-module links public class JMXServerErrorException extends IOException { private static final long serialVersionUID = 3996732239558744666L; diff --git a/src/java.management/share/classes/sun/management/LockInfoCompositeData.java b/src/java.management/share/classes/sun/management/LockInfoCompositeData.java index 087ce3d780e17b162812015802044cd4e5a93cc2..bafdff2dbfb1f71d9dcd08d3c169ad8f7ce664d0 100644 --- a/src/java.management/share/classes/sun/management/LockInfoCompositeData.java +++ b/src/java.management/share/classes/sun/management/LockInfoCompositeData.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2022, 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 @@ -68,7 +68,7 @@ public class LockInfoCompositeData extends LazyCompositeData { return new CompositeDataSupport(LOCK_INFO_COMPOSITE_TYPE, items); } catch (OpenDataException e) { // Should never reach here - throw Util.newException(e); + throw new RuntimeException(e); } } @@ -79,7 +79,7 @@ public class LockInfoCompositeData extends LazyCompositeData { MappedMXBeanType.toOpenType(LockInfo.class); } catch (OpenDataException e) { // Should never reach here - throw Util.newException(e); + throw new RuntimeException(e); } } diff --git a/src/java.management/share/classes/sun/management/ManagementFactoryHelper.java b/src/java.management/share/classes/sun/management/ManagementFactoryHelper.java index 7e5c1d8764020de4a28ecf7c4194e5f1bd7ab5ef..3746cd311b2801b27560506fff1f044c216518dd 100644 --- a/src/java.management/share/classes/sun/management/ManagementFactoryHelper.java +++ b/src/java.management/share/classes/sun/management/ManagementFactoryHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2022, 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 @@ -482,7 +482,7 @@ public class ManagementFactoryHelper { } }); } catch (PrivilegedActionException e) { - throw Util.newException(e.getException()); + throw new RuntimeException(e.getException()); } } @@ -540,7 +540,7 @@ public class ManagementFactoryHelper { } }); } catch (PrivilegedActionException e) { - throw Util.newException(e.getException()); + throw new RuntimeException(e.getException()); } } diff --git a/src/java.management/share/classes/sun/management/Util.java b/src/java.management/share/classes/sun/management/Util.java index 9ce1a5d31ee8be89e40a4b1204406b3c88a964bf..94bab86140cf7f214f4b2abae08336c6059d86ee 100644 --- a/src/java.management/share/classes/sun/management/Util.java +++ b/src/java.management/share/classes/sun/management/Util.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2022, 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 @@ -34,10 +34,6 @@ import javax.management.MalformedObjectNameException; public class Util { private Util() {} // there are no instances of this class - static RuntimeException newException(Exception e) { - throw new RuntimeException(e); - } - private static final String[] EMPTY_STRING_ARRAY = new String[0]; static String[] toStringArray(List list) { return list.toArray(EMPTY_STRING_ARRAY); diff --git a/src/java.naming/share/classes/com/sun/jndi/ldap/sasl/LdapSasl.java b/src/java.naming/share/classes/com/sun/jndi/ldap/sasl/LdapSasl.java index bc557bfaa3564af50093c6dcdcdefbe221e09eeb..23be470604143677c22300e52df20e3d910024ea 100644 --- a/src/java.naming/share/classes/com/sun/jndi/ldap/sasl/LdapSasl.java +++ b/src/java.naming/share/classes/com/sun/jndi/ldap/sasl/LdapSasl.java @@ -42,7 +42,9 @@ import javax.security.sasl.*; import com.sun.jndi.ldap.Connection; import com.sun.jndi.ldap.LdapClient; import com.sun.jndi.ldap.LdapResult; -import com.sun.jndi.ldap.sasl.TlsChannelBinding.TlsChannelBindingType; +import sun.security.util.ChannelBindingException; +import sun.security.util.TlsChannelBinding; +import sun.security.util.TlsChannelBinding.TlsChannelBindingType; /** * Handles SASL support. @@ -62,6 +64,14 @@ public final class LdapSasl { private static final int LDAP_SUCCESS = 0; private static final int LDAP_SASL_BIND_IN_PROGRESS = 14; // LDAPv3 + // TLS channel binding type property + private static final String CHANNEL_BINDING_TYPE = + "com.sun.jndi.ldap.tls.cbtype"; + + // internal TLS channel binding property + private static final String CHANNEL_BINDING = + "jdk.internal.sasl.tlschannelbinding"; + private LdapSasl() { } @@ -113,8 +123,8 @@ public final class LdapSasl { String[] mechs = getSaslMechanismNames(authMech); // Internal TLS Channel Binding property cannot be set explicitly - if (env.get(TlsChannelBinding.CHANNEL_BINDING) != null) { - throw new NamingException(TlsChannelBinding.CHANNEL_BINDING + + if (env.get(CHANNEL_BINDING) != null) { + throw new NamingException(CHANNEL_BINDING + " property cannot be set explicitly"); } @@ -123,17 +133,24 @@ public final class LdapSasl { try { // Prepare TLS Channel Binding data if (conn.isTlsConnection()) { - TlsChannelBindingType cbType = - TlsChannelBinding.parseType( - (String)env.get(TlsChannelBinding.CHANNEL_BINDING_TYPE)); + TlsChannelBindingType cbType; + try { + cbType = TlsChannelBinding.parseType((String)env.get(CHANNEL_BINDING_TYPE)); + } catch (ChannelBindingException e) { + throw wrapInNamingException(e); + } if (cbType == TlsChannelBindingType.TLS_SERVER_END_POINT) { // set tls-server-end-point channel binding X509Certificate cert = conn.getTlsServerCertificate(); if (cert != null) { - TlsChannelBinding tlsCB = - TlsChannelBinding.create(cert); + TlsChannelBinding tlsCB; + try { + tlsCB = TlsChannelBinding.create(cert); + } catch (ChannelBindingException e) { + throw wrapInNamingException(e); + } envProps = (Hashtable) env.clone(); - envProps.put(TlsChannelBinding.CHANNEL_BINDING, tlsCB.getData()); + envProps.put(CHANNEL_BINDING, tlsCB.getData()); } else { throw new SaslException("No suitable certificate to generate " + "TLS Channel Binding data"); @@ -227,5 +244,11 @@ public final class LdapSasl { return mechNames; } + private static NamingException wrapInNamingException(Exception e) { + NamingException ne = new NamingException(); + ne.setRootCause(e); + return ne; + } + private static final byte[] NO_BYTES = new byte[0]; } diff --git a/src/java.naming/share/classes/module-info.java b/src/java.naming/share/classes/module-info.java index f7d0ace806d12d21493002845d4412228743333f..43be8eb62991df6b57da5d35ed7117d230c6bf51 100644 --- a/src/java.naming/share/classes/module-info.java +++ b/src/java.naming/share/classes/module-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -104,9 +104,11 @@ *
  • DNS Naming Provider
    • *
  • RMI Naming Provider
    • * - * @provides javax.naming.ldap.spi.LdapDnsProvider + * @provides java.security.Provider * + * @uses javax.naming.ldap.StartTlsResponse * @uses javax.naming.ldap.spi.LdapDnsProvider + * @uses javax.naming.spi.InitialContextFactory * * @moduleGraph * @since 9 diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/AuthenticationFilter.java b/src/java.net.http/share/classes/jdk/internal/net/http/AuthenticationFilter.java index 2561afd645d07ceff8c4ce329efd2fb60915f7ca..6e6182a1fb2a2eefc5c30ca754ec65c6da6cbb7d 100644 --- a/src/java.net.http/share/classes/jdk/internal/net/http/AuthenticationFilter.java +++ b/src/java.net.http/share/classes/jdk/internal/net/http/AuthenticationFilter.java @@ -305,7 +305,7 @@ class AuthenticationFilter implements HeaderFilter { AuthInfo au = proxy ? exchange.proxyauth : exchange.serverauth; if (au == null) { // if no authenticator, let the user deal with 407/401 - if (!exchange.client().authenticator().isPresent()) return null; + if (exchange.client().authenticator().isEmpty()) return null; PasswordAuthentication pw = getCredentials(authval, proxy, req); if (pw == null) { @@ -331,7 +331,7 @@ class AuthenticationFilter implements HeaderFilter { } // if no authenticator, let the user deal with 407/401 - if (!exchange.client().authenticator().isPresent()) return null; + if (exchange.client().authenticator().isEmpty()) return null; // try again PasswordAuthentication pw = getCredentials(authval, proxy, req); diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/HttpRequestImpl.java b/src/java.net.http/share/classes/jdk/internal/net/http/HttpRequestImpl.java index a04ded70480a03b3a739e8b59d9c54bc0e61d307..3e5da6d4c147452217fdbd46c98dab23fb5578c8 100644 --- a/src/java.net.http/share/classes/jdk/internal/net/http/HttpRequestImpl.java +++ b/src/java.net.http/share/classes/jdk/internal/net/http/HttpRequestImpl.java @@ -124,7 +124,7 @@ public class HttpRequestImpl extends HttpRequest implements WebSocketRequest { checkTimeout(timeout); this.systemHeadersBuilder = new HttpHeadersBuilder(); } - if (!userHeaders.firstValue("User-Agent").isPresent()) { + if (userHeaders.firstValue("User-Agent").isEmpty()) { this.systemHeadersBuilder.setHeader("User-Agent", USER_AGENT); } this.uri = requestURI; @@ -182,7 +182,7 @@ public class HttpRequestImpl extends HttpRequest implements WebSocketRequest { this.userHeaders = other.userHeaders; this.isWebSocket = other.isWebSocket; this.systemHeadersBuilder = new HttpHeadersBuilder(); - if (!userHeaders.firstValue("User-Agent").isPresent()) { + if (userHeaders.firstValue("User-Agent").isEmpty()) { this.systemHeadersBuilder.setHeader("User-Agent", USER_AGENT); } this.uri = uri; diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/common/Utils.java b/src/java.net.http/share/classes/jdk/internal/net/http/common/Utils.java index c22c36a1eb3bcc07346e36eebfadf206ff4bb613..09457b795b4b647fd58a234a596eb06ebdce0083 100644 --- a/src/java.net.http/share/classes/jdk/internal/net/http/common/Utils.java +++ b/src/java.net.http/share/classes/jdk/internal/net/http/common/Utils.java @@ -175,7 +175,7 @@ public final class Utils { // used by caller. public static final BiPredicate CONTEXT_RESTRICTED(HttpClient client) { - return (k, v) -> !client.authenticator().isPresent() || + return (k, v) -> client.authenticator().isEmpty() || (!k.equalsIgnoreCase("Authorization") && !k.equalsIgnoreCase("Proxy-Authorization")); } diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/websocket/BuilderImpl.java b/src/java.net.http/share/classes/jdk/internal/net/http/websocket/BuilderImpl.java index 7a8a540d2b3f55c0ad4c432dfec26561b4804b3a..452e83206f4bdff86572c7c8bbb4839932682706 100644 --- a/src/java.net.http/share/classes/jdk/internal/net/http/websocket/BuilderImpl.java +++ b/src/java.net.http/share/classes/jdk/internal/net/http/websocket/BuilderImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2021, 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 @@ -72,7 +72,7 @@ public final class BuilderImpl implements Builder { this.proxySelector = proxySelector; // If a proxy selector was supplied by the user, it should be present // on the client and should be the same that what we got as an argument - assert !client.proxy().isPresent() + assert client.proxy().isEmpty() || client.proxy().equals(proxySelector); this.headers = headers; this.subprotocols = subprotocols; diff --git a/src/java.net.http/share/classes/jdk/internal/net/http/websocket/OpeningHandshake.java b/src/java.net.http/share/classes/jdk/internal/net/http/websocket/OpeningHandshake.java index b4d456b76469849287b2af8bea8e9a224273b051..dd60bd621b798f9d5c5c90c748b58a6e6fd10ea8 100644 --- a/src/java.net.http/share/classes/jdk/internal/net/http/websocket/OpeningHandshake.java +++ b/src/java.net.http/share/classes/jdk/internal/net/http/websocket/OpeningHandshake.java @@ -28,7 +28,6 @@ package jdk.internal.net.http.websocket; import java.net.http.HttpClient; import java.net.http.HttpClient.Version; import java.net.http.HttpHeaders; -import java.net.http.HttpRequest; import java.net.http.HttpResponse; import java.net.http.HttpResponse.BodyHandlers; import java.net.http.WebSocketHandshakeException; @@ -62,7 +61,6 @@ import java.util.Optional; import java.util.Set; import java.util.TreeSet; import java.util.concurrent.CompletableFuture; -import java.util.stream.Collectors; import java.util.stream.Stream; import static java.lang.String.format; @@ -281,7 +279,7 @@ public class OpeningHandshake { throws CheckFailedException { Optional opt = responseHeaders.firstValue(HEADER_PROTOCOL); - if (!opt.isPresent()) { + if (opt.isEmpty()) { // If there is no such header in the response, then the server // doesn't want to use any subprotocol return ""; @@ -363,7 +361,7 @@ public class OpeningHandshake { * or {@code null} if none is required or applicable. */ private static Proxy proxyFor(Optional selector, URI uri) { - if (!selector.isPresent()) { + if (selector.isEmpty()) { return null; } URI requestURI = createRequestURI(uri); // Based on the HTTP scheme diff --git a/src/java.security.jgss/share/classes/sun/net/www/protocol/http/spnego/NegotiatorImpl.java b/src/java.security.jgss/share/classes/sun/net/www/protocol/http/spnego/NegotiatorImpl.java index c17b54dd3358da9718d96f7e2fd1ee0dc1d05c00..82f2391816bc2a8973537a72f485cf6d28bc0818 100644 --- a/src/java.security.jgss/share/classes/sun/net/www/protocol/http/spnego/NegotiatorImpl.java +++ b/src/java.security.jgss/share/classes/sun/net/www/protocol/http/spnego/NegotiatorImpl.java @@ -40,6 +40,9 @@ import sun.security.jgss.GSSManagerImpl; import sun.security.jgss.GSSContextImpl; import sun.security.jgss.GSSUtil; import sun.security.jgss.HttpCaller; +import sun.security.jgss.krb5.internal.TlsChannelBindingImpl; +import sun.security.util.ChannelBindingException; +import sun.security.util.TlsChannelBinding; /** * This class encapsulates all JAAS and JGSS API calls in a separate class @@ -65,7 +68,7 @@ public class NegotiatorImpl extends Negotiator { *
  • Creating GSSContext *
  • A first call to initSecContext */ - private void init(HttpCallerInfo hci) throws GSSException { + private void init(HttpCallerInfo hci) throws GSSException, ChannelBindingException { final Oid oid; if (hci.scheme.equalsIgnoreCase("Kerberos")) { @@ -100,6 +103,14 @@ public class NegotiatorImpl extends Negotiator { if (context instanceof GSSContextImpl) { ((GSSContextImpl)context).requestDelegPolicy(true); } + if (hci.serverCert != null) { + if (DEBUG) { + System.out.println("Negotiate: Setting CBT"); + } + // set the channel binding token + TlsChannelBinding b = TlsChannelBinding.create(hci.serverCert); + context.setChannelBinding(new TlsChannelBindingImpl(b.getData())); + } oneToken = context.initSecContext(new byte[0], 0, 0); } @@ -110,7 +121,7 @@ public class NegotiatorImpl extends Negotiator { public NegotiatorImpl(HttpCallerInfo hci) throws IOException { try { init(hci); - } catch (GSSException e) { + } catch (GSSException | ChannelBindingException e) { if (DEBUG) { System.out.println("Negotiate support not initiated, will " + "fallback to other scheme if allowed. Reason:"); diff --git a/src/java.security.jgss/share/classes/sun/security/jgss/spnego/SpNegoContext.java b/src/java.security.jgss/share/classes/sun/security/jgss/spnego/SpNegoContext.java index 311dfadbdd7db0ef6a74a11e682bae7662aa1729..61a5d34186dd54d1e48441b46b2e762af1c2f311 100644 --- a/src/java.security.jgss/share/classes/sun/security/jgss/spnego/SpNegoContext.java +++ b/src/java.security.jgss/share/classes/sun/security/jgss/spnego/SpNegoContext.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2021, 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 @@ -866,6 +866,7 @@ public class SpNegoContext implements GSSContextSpi { mechContext.requestMutualAuth(mutualAuthState); mechContext.requestReplayDet(replayDetState); mechContext.requestSequenceDet(sequenceDetState); + mechContext.setChannelBinding(channelBinding); if (mechContext instanceof GSSContextImpl) { ((GSSContextImpl)mechContext).requestDelegPolicy( delegPolicyState); @@ -899,6 +900,7 @@ public class SpNegoContext implements GSSContextSpi { myCred.getInternalCred()); } mechContext = factory.manager.createContext(cred); + mechContext.setChannelBinding(channelBinding); } // pass token to mechanism acceptSecContext diff --git a/src/java.security.jgss/share/classes/sun/security/krb5/internal/ktab/KeyTab.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/ktab/KeyTab.java index a2d2c683b97ad67ff9293ef8c396a0269f459445..e7d3ebdfda6cae737df6d90e9ae94f0dc0da4277 100644 --- a/src/java.security.jgss/share/classes/sun/security/krb5/internal/ktab/KeyTab.java +++ b/src/java.security.jgss/share/classes/sun/security/krb5/internal/ktab/KeyTab.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2022, 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 @@ -376,12 +376,33 @@ public class KeyTab implements KeyTabConstants { addEntry(service, service.getSalt(), psswd, kvno, append); } - // Called by KDC test + /** + * Adds a new entry in the key table. + * @param service the service which will have a new entry in the key table. + * @param salt specified non default salt, cannot be null + * @param psswd the password which generates the key. + * @param kvno the kvno to use, -1 means automatic increasing + * @param append false if entries with old kvno would be removed. + * Note: if kvno is not -1, entries with the same kvno are always removed + */ public void addEntry(PrincipalName service, String salt, char[] psswd, int kvno, boolean append) throws KrbException { EncryptionKey[] encKeys = EncryptionKey.acquireSecretKeys( - psswd, salt); + psswd, salt); + addEntry(service, encKeys, kvno, append); + } + + /** + * Adds a new entry in the key table. + * @param service the service which will have a new entry in the key table. + * @param encKeys the keys to be added + * @param kvno the kvno to use, -1 means automatic increasing + * @param append false if entries with old kvno would be removed. + * Note: if kvno is not -1, entries with the same kvno are always removed + */ + public void addEntry(PrincipalName service, EncryptionKey[] encKeys, + int kvno, boolean append) throws KrbException { // There should be only one maximum KVNO value for all etypes, so that // all added keys can have the same KVNO. diff --git a/src/java.security.jgss/windows/classes/sun/security/krb5/internal/tools/Ktab.java b/src/java.security.jgss/windows/classes/sun/security/krb5/internal/tools/Ktab.java index d09e4665b08b95439cc76cad0c9ca57e78b35484..108cd4c24bb45fff2e4df3595af63dd11c90d60d 100644 --- a/src/java.security.jgss/windows/classes/sun/security/krb5/internal/tools/Ktab.java +++ b/src/java.security.jgss/windows/classes/sun/security/krb5/internal/tools/Ktab.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2022, 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,7 +35,6 @@ import sun.security.krb5.internal.ktab.*; import java.io.IOException; import java.io.BufferedReader; import java.io.InputStreamReader; -import java.io.File; import java.text.DateFormat; import java.util.Arrays; import java.util.Date; @@ -61,10 +60,12 @@ public class Ktab { int etype = -1; char[] password = null; - boolean forced = false; // true if delete without prompt. Default false + boolean fopt = false; // true if delete without prompt or + // add by contacting KDC. Default false boolean append = false; // true if new keys are appended. Default false int vDel = -1; // kvno to delete, -1 all, -2 old. Default -1 int vAdd = -1; // kvno to add. Default -1, means auto incremented + String salt = null; // salt to use. Default null, means default salt /** * The main program that can be invoked at command line. @@ -186,6 +187,12 @@ public class Ktab { error(args[i] + " is not valid after -" + action); } break; + case "-s": // salt for -a + if (++i >= args.length || args[i].startsWith("-")) { + error("A salt string must be specified after -s"); + } + salt = args[i]; + break; case "-n": // kvno for -a if (++i >= args.length || args[i].startsWith("-")) { error("A KVNO must be specified after -n"); @@ -213,8 +220,8 @@ public class Ktab { case "-t": // list timestamps showTime = true; break; - case "-f": // force delete, no prompt - forced = true; + case "-f": // force delete or get salt from KDC + fopt = true; break; case "-append": // -a, new keys append to file append = true; @@ -258,6 +265,10 @@ public class Ktab { * a new key table. */ void addEntry() { + if (salt != null && fopt) { + System.err.println("-s and -f cannot coexist when adding a keytab entry."); + System.exit(-1); + } PrincipalName pname = null; try { pname = new PrincipalName(principal); @@ -283,7 +294,15 @@ public class Ktab { } try { // admin.addEntry(pname, password); - table.addEntry(pname, password, vAdd, append); + if (fopt) { + KrbAsReqBuilder builder = new KrbAsReqBuilder(pname, password); + builder.action(); + table.addEntry(pname, builder.getKeys(true), vAdd, append); + } else if (salt != null) { + table.addEntry(pname, salt, password, vAdd, append); + } else { + table.addEntry(pname, password, vAdd, append); + } Arrays.fill(password, '0'); // clear password // admin.save(); table.save(); @@ -367,7 +386,7 @@ public class Ktab { PrincipalName pname = null; try { pname = new PrincipalName(principal); - if (!forced) { + if (!fopt) { String answer; BufferedReader cis = new BufferedReader(new InputStreamReader(System.in)); @@ -424,6 +443,7 @@ public class Ktab { printHelp(); System.exit(-1); } + /** * Prints out the help information. */ @@ -434,11 +454,13 @@ public class Ktab { System.out.println(); System.out.println("-l [-e] [-t]\n" + " list the keytab name and entries. -e with etype, -t with timestamp."); - System.out.println("-a [] [-n ] [-append]\n" + System.out.println("-a [] [-n ] [-f | -s ] [-append]\n" + " add new key entries to the keytab for the given principal name with\n" + " optional . If a is specified, new keys' Key Version\n" + " Numbers equal to the value, otherwise, automatically incrementing\n" - + " the Key Version Numbers. If -append is specified, new keys are\n" + + " the Key Version Numbers. If is specified, it will be used\n" + + " instead of the default salt. If -f is specified, the KDC will be\n" + + " contacted to fetch the salt. If -append is specified, new keys are\n" + " appended to the keytab, otherwise, old keys for the\n" + " same principal are removed."); System.out.println("-d [-f] [-e ] [ | all | old]\n" diff --git a/src/java.security.jgss/windows/native/libsspi_bridge/sspi.cpp b/src/java.security.jgss/windows/native/libsspi_bridge/sspi.cpp index 2f359a84e7be6a10f5aa00914a58dc465915e403..aa673367607484c082fbebf19d7ebd91eb6dec7e 100644 --- a/src/java.security.jgss/windows/native/libsspi_bridge/sspi.cpp +++ b/src/java.security.jgss/windows/native/libsspi_bridge/sspi.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2019, 2022, 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 @@ -1043,6 +1043,10 @@ gss_accept_sec_context(OM_uint32 *minor_status, { PP(">>>> Calling UNIMPLEMENTED gss_accept_sec_context..."); PP("gss_accept_sec_context is not supported in this initiator-only library"); + if (output_token) { + output_token->length = 0; + output_token->value = NULL; + } return GSS_S_FAILURE; } diff --git a/src/java.security.sasl/share/classes/com/sun/security/sasl/digest/DigestMD5Base.java b/src/java.security.sasl/share/classes/com/sun/security/sasl/digest/DigestMD5Base.java index 5e26277136ba8c276163eb10479f864470ed6a10..956a079ae996c8cb5c3e0e9815a8ffe9fefb21f9 100644 --- a/src/java.security.sasl/share/classes/com/sun/security/sasl/digest/DigestMD5Base.java +++ b/src/java.security.sasl/share/classes/com/sun/security/sasl/digest/DigestMD5Base.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2022, 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 @@ -158,7 +158,7 @@ abstract class DigestMD5Base extends AbstractSaslImpl { protected String authzid; // authzid or canonicalized authzid /** - * Constucts an instance of DigestMD5Base. Calls super constructor + * Constructs an instance of DigestMD5Base. Calls super constructor * to parse properties for mechanism. * * @param props A map of property/value pairs diff --git a/src/java.security.sasl/share/classes/javax/security/sasl/SaslServer.java b/src/java.security.sasl/share/classes/javax/security/sasl/SaslServer.java index 697b790deed97fe9cc1f6a8af0de2970a6586218..1e2d08aa8a1481e8c4f4a1a1f6b74fbcf3a03b18 100644 --- a/src/java.security.sasl/share/classes/javax/security/sasl/SaslServer.java +++ b/src/java.security.sasl/share/classes/javax/security/sasl/SaslServer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2022, 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 @@ -105,7 +105,7 @@ public abstract interface SaslServer { * by sending a challenge to the client, or if the authentication has * succeeded but challenge data needs to be processed by the client. * {@code isComplete()} should be called - * after each call to {@code evaluateResponse()},to determine if any further + * after each call to {@code evaluateResponse()}, to determine if any further * response is needed from the client. * * @param response The non-null (but possibly empty) response sent diff --git a/src/java.sql/share/classes/java/sql/BatchUpdateException.java b/src/java.sql/share/classes/java/sql/BatchUpdateException.java index c94f0788e1179a650b3025349e1c5a161d0a9d19..3e480102952da835dc6ec0caaf20a97dbffae252 100644 --- a/src/java.sql/share/classes/java/sql/BatchUpdateException.java +++ b/src/java.sql/share/classes/java/sql/BatchUpdateException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2022, 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 @@ -55,7 +55,7 @@ import java.util.Arrays; *

    * A JDBC driver implementation should use * the constructor {@code BatchUpdateException(String reason, String SQLState, - * int vendorCode, long []updateCounts,Throwable cause) } instead of + * int vendorCode, long []updateCounts, Throwable cause) } instead of * constructors that take {@code int[]} for the update counts to avoid the * possibility of overflow. *

    @@ -78,7 +78,7 @@ public class BatchUpdateException extends SQLException { * Note: There is no validation of {@code updateCounts} for * overflow and because of this it is recommended that you use the constructor * {@code BatchUpdateException(String reason, String SQLState, - * int vendorCode, long []updateCounts,Throwable cause) }. + * int vendorCode, long []updateCounts, Throwable cause) }. *

    * @param reason a description of the error * @param SQLState an XOPEN or SQL:2003 code identifying the exception @@ -115,7 +115,7 @@ public class BatchUpdateException extends SQLException { * Note: There is no validation of {@code updateCounts} for * overflow and because of this it is recommended that you use the constructor * {@code BatchUpdateException(String reason, String SQLState, - * int vendorCode, long []updateCounts,Throwable cause) }. + * int vendorCode, long []updateCounts, Throwable cause) }. *

    * @param reason a description of the exception * @param SQLState an XOPEN or SQL:2003 code identifying the exception @@ -148,7 +148,7 @@ public class BatchUpdateException extends SQLException { * Note: There is no validation of {@code updateCounts} for * overflow and because of this it is recommended that you use the constructor * {@code BatchUpdateException(String reason, String SQLState, - * int vendorCode, long []updateCounts,Throwable cause) }. + * int vendorCode, long []updateCounts, Throwable cause) }. *

    * @param reason a description of the exception * @param updateCounts an array of {@code int}, with each element @@ -178,7 +178,7 @@ public class BatchUpdateException extends SQLException { * Note: There is no validation of {@code updateCounts} for * overflow and because of this it is recommended that you use the constructor * {@code BatchUpdateException(String reason, String SQLState, - * int vendorCode, long []updateCounts,Throwable cause) }. + * int vendorCode, long []updateCounts, Throwable cause) }. *

    * @param updateCounts an array of {@code int}, with each element * indicating the update count, {@code Statement.SUCCESS_NO_INFO} or @@ -244,7 +244,7 @@ public class BatchUpdateException extends SQLException { * Note: There is no validation of {@code updateCounts} for * overflow and because of this it is recommended that you use the constructor * {@code BatchUpdateException(String reason, String SQLState, - * int vendorCode, long []updateCounts,Throwable cause) }. + * int vendorCode, long []updateCounts, Throwable cause) }. *

    * @param updateCounts an array of {@code int}, with each element * indicating the update count, {@code Statement.SUCCESS_NO_INFO} or @@ -274,7 +274,7 @@ public class BatchUpdateException extends SQLException { * Note: There is no validation of {@code updateCounts} for * overflow and because of this it is recommended that you use the constructor * {@code BatchUpdateException(String reason, String SQLState, - * int vendorCode, long []updateCounts,Throwable cause) }. + * int vendorCode, long []updateCounts, Throwable cause) }. *

    * @param reason a description of the exception * @param updateCounts an array of {@code int}, with each element @@ -315,7 +315,7 @@ public class BatchUpdateException extends SQLException { * Note: There is no validation of {@code updateCounts} for * overflow and because of this it is recommended that you use the constructor * {@code BatchUpdateException(String reason, String SQLState, - * int vendorCode, long []updateCounts,Throwable cause) }. + * int vendorCode, long []updateCounts, Throwable cause) }. *

    * @param cause the underlying reason for this {@code SQLException} * (which is saved for later retrieval by the {@code getCause()} method); @@ -351,7 +351,7 @@ public class BatchUpdateException extends SQLException { * Note: There is no validation of {@code updateCounts} for * overflow and because of this it is recommended that you use the constructor * {@code BatchUpdateException(String reason, String SQLState, - * int vendorCode, long []updateCounts,Throwable cause) }. + * int vendorCode, long []updateCounts, Throwable cause) }. *

    * @param cause the underlying reason for this {@code SQLException} (which is saved for later retrieval by the {@code getCause()} method); * may be null indicating diff --git a/src/java.sql/share/classes/java/sql/Connection.java b/src/java.sql/share/classes/java/sql/Connection.java index 0221696ee8fa9727854a1c3135e1ef9d3477bea5..0a5429d302f1594a8d559dbb9de1cf94e587e305 100644 --- a/src/java.sql/share/classes/java/sql/Connection.java +++ b/src/java.sql/share/classes/java/sql/Connection.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2022, 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 @@ -634,7 +634,7 @@ public interface Connection extends Wrapper, AutoCloseable { * custom mapping of SQL structured types and distinct types. *

    * You must set the values for the {@code TypeMap} prior to - * callng {@code setMap} as a JDBC driver may create an internal copy + * calling {@code setMap} as a JDBC driver may create an internal copy * of the {@code TypeMap}: * * 

    @@ -1594,7 +1594,7 @@ throws SQLException;
     /**
      * Sets and validates the sharding keys for this connection. A {@code null}
      * value may be specified for the sharding Key. The validity
-     * of a {@code null} sharding key is vendor-specific. Consult your vendor's
+     * of a {@code null} sharding key is vendor-specific. Consult your vendor's
      * documentation for additional information.
      * @implSpec
      * The default implementation will throw a
@@ -1616,7 +1616,7 @@ throws SQLException;
      * and set on this connection; false if the sharding keys are not valid or
      * the timeout period expires before the operation completes.
      * @throws SQLException if an error occurs while performing this validation;
-     * a {@code superSharedingKey} is specified
+     * a {@code superShardingKey} is specified
      * without a {@code shardingKey};
      * this method is called on a closed {@code connection}; or
      * the {@code timeout} value is negative.
@@ -1634,7 +1634,7 @@ throws SQLException;
     /**
      * Sets and validates the sharding key for this connection. A {@code null}
      * value may be specified for the sharding Key. The validity
-     * of a {@code null} sharding key is vendor-specific. Consult your vendor's
+     * of a {@code null} sharding key is vendor-specific. Consult your vendor's
      * documentation for additional information.
      * @implSpec
      * The default implementation will throw a
@@ -1680,7 +1680,7 @@ throws SQLException;
      * The super sharding key may be {@code null}
      * @throws SQLException if an error  occurs setting the sharding keys;
      * this method is called on a closed {@code connection}; or
-     * a {@code superSharedingKey} is specified without a {@code shardingKey}
+     * a {@code superShardingKey} is specified without a {@code shardingKey}
      * @throws SQLFeatureNotSupportedException if the driver does not support sharding
      * @since 9
      * @see ShardingKey
diff --git a/src/java.sql/share/classes/java/sql/DatabaseMetaData.java b/src/java.sql/share/classes/java/sql/DatabaseMetaData.java
index 532c37ee4bb3a1cf422391a83f9666f7fe59b1c5..6f63c2989b80aa27ed05586c0e5c2fcdb6342b55 100644
--- a/src/java.sql/share/classes/java/sql/DatabaseMetaData.java
+++ b/src/java.sql/share/classes/java/sql/DatabaseMetaData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2022, 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
@@ -1513,7 +1513,7 @@ public interface DatabaseMetaData extends Wrapper {
      * @param tableNamePattern a table name pattern; must match the
      *        table name as it is stored in the database
      * @param types a list of table types, which must be from the list of table types
-     *         returned from {@link #getTableTypes},to include; {@code null} returns
+     *         returned from {@link #getTableTypes}, to include; {@code null} returns
      * all types
      * @return {@code ResultSet} - each row is a table description
      * @throws SQLException if a database access error occurs
@@ -3044,7 +3044,7 @@ public interface DatabaseMetaData extends Wrapper {
      *  
  • SCOPE_TABLE String {@code =>} table name that is the scope of a
      *      reference attribute ({@code null} if the DATA_TYPE isn't REF)
      * 
  • SOURCE_DATA_TYPE short {@code =>} source type of a distinct type or user-generated
-     *      Ref type,SQL type from java.sql.Types ({@code null} if DATA_TYPE
+     *      Ref type, SQL type from java.sql.Types ({@code null} if DATA_TYPE
      *      isn't DISTINCT or user-generated REF)
      *  
      * @param catalog a catalog name; must match the catalog name as it
diff --git a/src/java.sql/share/classes/java/sql/Statement.java b/src/java.sql/share/classes/java/sql/Statement.java
index 10c8d9e12c6a92b8f690083d82fff3bfc4054dd4..bb5a5cfd64d963379652b1f03dff3f5d143639c9 100644
--- a/src/java.sql/share/classes/java/sql/Statement.java
+++ b/src/java.sql/share/classes/java/sql/Statement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2022, 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
@@ -779,7 +779,7 @@ public interface Statement extends Wrapper, AutoCloseable {
      *
      * @throws SQLException if a database access error occurs,
      * this method is called on a closed {@code Statement}, the SQL
-     * statement returns a {@code ResultSet} object,the second argument
+     * statement returns a {@code ResultSet} object, the second argument
      * supplied to this method is not an
      * {@code int} array whose elements are valid column indexes, the method is called on a
      * {@code PreparedStatement} or {@code CallableStatement}
@@ -960,7 +960,7 @@ public interface Statement extends Wrapper, AutoCloseable {
      *         object; {@code false} if it is an update count or there
      *         are no more results
      * @throws SQLException if a database access error occurs,
-     * this method is called on a closed {@code Statement},the
+     * this method is called on a closed {@code Statement}, the
      *          elements of the {@code String} array passed to this
      *          method are not valid column names, the method is called on a
      * {@code PreparedStatement} or {@code CallableStatement}
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/LoadDocument.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/LoadDocument.java
index bc7194411f0899ead04824c72fd06f0340d16b30..39084c87f0b90ff2debbdda5c50a98f5f4f88ef2 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/LoadDocument.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/LoadDocument.java
@@ -39,7 +39,7 @@ import jdk.xml.internal.SecuritySupport;
 
 /**
  * @author Morten Jorgensen
- * @LastModified: May 2021
+ * @LastModified: Sept 2021
  */
 public final class LoadDocument {
 
@@ -190,6 +190,9 @@ public final class LoadDocument {
         if (cache != null) {
             newdom = cache.retrieveDocument(base, originalUri, translet);
             if (newdom == null) {
+                if (translet.getAccessError() != null) {
+                    throw new Exception(translet.getAccessError());
+                }
                 final Exception e = new FileNotFoundException(originalUri);
                 throw new TransletException(e);
             }
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java
index 58b8f433e8ea4f2dd49ae1798224c61d57eb2639..1612fd6192383e965a6fc983096a9196d5833dc2 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java
@@ -54,7 +54,7 @@ import org.w3c.dom.Document;
  * @author Morten Jorgensen
  * @author G. Todd Miller
  * @author John Howard, JohnH@schemasoft.com
- * @LastModified: May 2021
+ * @LastModified: Sept 2021
  */
 public abstract class AbstractTranslet implements Translet {
 
@@ -116,6 +116,9 @@ public abstract class AbstractTranslet implements Translet {
      */
     private String _accessExternalStylesheet = JdkConstants.EXTERNAL_ACCESS_DEFAULT;
 
+    // The error message when access to exteranl resources is rejected
+    private String _accessErr = null;
+
     /************************************************************************
      * Debugging
      ************************************************************************/
@@ -786,6 +789,20 @@ public abstract class AbstractTranslet implements Translet {
         _accessExternalStylesheet = protocols;
     }
 
+    /**
+     * Returns the access error.
+     */
+    public String getAccessError() {
+        return _accessErr;
+    }
+
+    /**
+     * Sets the access error.
+     */
+    public void setAccessError(String accessErr) {
+        this._accessErr = accessErr;
+    }
+
     /************************************************************************
      * DOMImplementation caching for basis library
      ************************************************************************/
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java
index 9e266eec28f7a9e97bd2ccf20a31ffb11ed45421..b58eabc54d5adec75ee1d69b22e8c91bd7919d8a 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java
@@ -101,7 +101,7 @@ import org.xml.sax.ext.LexicalHandler;
  * @author Morten Jorgensen
  * @author G. Todd Miller
  * @author Santiago Pericas-Geertsen
- * @LastModified: June 2021
+ * @LastModified: Sept 2021
  */
 public final class TransformerImpl extends Transformer
     implements DOMCache
@@ -1351,8 +1351,33 @@ public final class TransformerImpl extends Transformer
             }
 
             if (resolvedSource == null)  {
-                StreamSource streamSource = new StreamSource(
-                     SystemIDResolver.getAbsoluteURI(href, baseURI));
+                /**
+                 * Uses the translet to carry over error msg.
+                 * Performs the access check without any interface changes
+                 * (e.g. Translet and DOMCache).
+                 */
+                @SuppressWarnings("unchecked") //AbstractTranslet is the sole impl.
+                AbstractTranslet t = (AbstractTranslet)translet;
+                String systemId = SystemIDResolver.getAbsoluteURI(href, baseURI);
+                String errMsg = null;
+                try {
+                    String accessError = SecuritySupport.checkAccess(systemId,
+                            t.getAllowedProtocols(),
+                            JdkConstants.ACCESS_EXTERNAL_ALL);
+                    if (accessError != null) {
+                        ErrorMsg msg = new ErrorMsg(ErrorMsg.ACCESSING_XSLT_TARGET_ERR,
+                                SecuritySupport.sanitizePath(href), accessError);
+                        errMsg = msg.toString();
+                    }
+                } catch (IOException ioe) {
+                    errMsg = ioe.getMessage();
+                }
+                if (errMsg != null) {
+                    t.setAccessError(errMsg);
+                    return null;
+                }
+
+                StreamSource streamSource = new StreamSource(systemId);
                 return getDOM(streamSource) ;
             }
 
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XML11DocumentScannerImpl.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XML11DocumentScannerImpl.java
index 1ec084e93a6a01d0423f873e6e17e3cb0ebf2e76..67f6478f1354f7d59f3cccc71c64183a2ec3dbb2 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XML11DocumentScannerImpl.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XML11DocumentScannerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -54,7 +54,7 @@ import com.sun.org.apache.xerces.internal.xni.XNIException;
  * @author Andy Clark, IBM
  * @author Arnaud  Le Hors, IBM
  * @author Eric Ye, IBM
- *
+ * @LastModified: Aug 2021
  */
 public class XML11DocumentScannerImpl
     extends XMLDocumentScannerImpl {
@@ -278,16 +278,6 @@ public class XML11DocumentScannerImpl
                                            + fStringBuffer.toString() + "\"");
                     }
                 }
-                // note that none of these characters should ever get through
-                // XML11EntityScanner.  Not sure why
-                // this check was originally necessary.  - NG
-                else if (c == '\n' || c == '\r' || c == 0x85 || c == 0x2028) {
-                    fEntityScanner.scanChar(null);
-                    fStringBuffer.append(' ');
-                    if (entityDepth == fEntityDepth) {
-                        fStringBuffer2.append('\n');
-                    }
-                }
                 else if (c != -1 && XMLChar.isHighSurrogate(c)) {
                     fStringBuffer3.clear();
                     if (scanSurrogates(fStringBuffer3)) {
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java
index 4be8d68e15331f5fe3932a9c972bab3de623e558..332aeb542060794d20f985fa6e64c06ec4d0b130 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java
@@ -21,6 +21,7 @@
 
 package com.sun.org.apache.xerces.internal.impl;
 
+import static com.sun.org.apache.xerces.internal.impl.Constants.XML_VERSION_1_1;
 import com.sun.org.apache.xerces.internal.impl.XMLScanner.NameType;
 import com.sun.org.apache.xerces.internal.impl.msg.XMLMessageFormatter;
 import com.sun.org.apache.xerces.internal.util.XML11Char;
@@ -40,7 +41,7 @@ import java.io.IOException;
  * @author Michael Glavassevich, IBM
  * @author Neil Graham, IBM
  *
- * @LastModified: Apr 2021
+ * @LastModified: Aug 2021
  */
 
 public class XML11EntityScanner
@@ -116,7 +117,7 @@ public class XML11EntityScanner
                 load(1, false, false);
                 offset = 0;
             }
-            if (c == '\r' && external) {
+            if (c == '\r' && external && fCurrentEntity.position < fCurrentEntity.count) {
                 int cc = fCurrentEntity.ch[fCurrentEntity.position++];
                 if (cc != '\n' && cc != 0x85) {
                     fCurrentEntity.position--;
@@ -761,71 +762,12 @@ public class XML11EntityScanner
         }
 
         // normalize newlines
-        int offset = fCurrentEntity.position;
-        int c = fCurrentEntity.ch[offset];
-        int newlines = 0;
-        boolean counted = false;
-        boolean external = fCurrentEntity.isExternal();
-        if (c == '\n' || ((c == '\r' || c == 0x85 || c == 0x2028) && external)) {
-            do {
-                c = fCurrentEntity.ch[fCurrentEntity.position++];
-                if ((c == '\r' ) && external) {
-                    newlines++;
-                    fCurrentEntity.lineNumber++;
-                    fCurrentEntity.columnNumber = 1;
-                    if (fCurrentEntity.position == fCurrentEntity.count) {
-                        checkEntityLimit(null, fCurrentEntity, offset, newlines);
-                        offset = 0;
-                        fCurrentEntity.baseCharOffset += (fCurrentEntity.position - fCurrentEntity.startPosition);
-                        fCurrentEntity.position = newlines;
-                        fCurrentEntity.startPosition = newlines;
-                        if (load(newlines, false, true)) {
-                            counted = true;
-                            break;
-                        }
-                    }
-                    int cc = fCurrentEntity.ch[fCurrentEntity.position];
-                    if (cc == '\n' || cc == 0x85) {
-                        fCurrentEntity.position++;
-                        offset++;
-                    }
-                    /*** NEWLINE NORMALIZATION ***/
-                    else {
-                        newlines++;
-                    }
-                }
-                else if (c == '\n' || ((c == 0x85 || c == 0x2028) && external)) {
-                    newlines++;
-                    fCurrentEntity.lineNumber++;
-                    fCurrentEntity.columnNumber = 1;
-                    if (fCurrentEntity.position == fCurrentEntity.count) {
-                        checkEntityLimit(null, fCurrentEntity, offset, newlines);
-                        offset = 0;
-                        fCurrentEntity.baseCharOffset += (fCurrentEntity.position - fCurrentEntity.startPosition);
-                        fCurrentEntity.position = newlines;
-                        fCurrentEntity.startPosition = newlines;
-                        if (load(newlines, false, true)) {
-                            counted = true;
-                            break;
-                        }
-                    }
-                }
-                else {
-                    fCurrentEntity.position--;
-                    break;
-                }
-            } while (fCurrentEntity.position < fCurrentEntity.count - 1);
-            for (int i = offset; i < fCurrentEntity.position; i++) {
-                fCurrentEntity.ch[i] = '\n';
-            }
-            int length = fCurrentEntity.position - offset;
-            if (fCurrentEntity.position == fCurrentEntity.count - 1) {
-                checkEntityLimit(null, fCurrentEntity, offset, length);
-                content.setValues(fCurrentEntity.ch, offset, length);
-                return -1;
-            }
+        if (normalizeNewlines(XML_VERSION_1_1, content, false, false, null)) {
+            return -1;
         }
 
+        int c;
+        boolean external = fCurrentEntity.isExternal();
         // inner loop, scanning for content
         if (external) {
             while (fCurrentEntity.position < fCurrentEntity.count) {
@@ -913,65 +855,12 @@ public class XML11EntityScanner
         }
 
         // normalize newlines
-        int offset = fCurrentEntity.position;
-        int c = fCurrentEntity.ch[offset];
-        int newlines = 0;
-        boolean external = fCurrentEntity.isExternal();
-        if (c == '\n' || ((c == '\r' || c == 0x85 || c == 0x2028) && external)) {
-            do {
-                c = fCurrentEntity.ch[fCurrentEntity.position++];
-                if ((c == '\r' ) && external) {
-                    newlines++;
-                    fCurrentEntity.lineNumber++;
-                    fCurrentEntity.columnNumber = 1;
-                    if (fCurrentEntity.position == fCurrentEntity.count) {
-                        offset = 0;
-                        fCurrentEntity.baseCharOffset += (fCurrentEntity.position - fCurrentEntity.startPosition);
-                        fCurrentEntity.position = newlines;
-                        fCurrentEntity.startPosition = newlines;
-                        if (load(newlines, false, true)) {
-                            break;
-                        }
-                    }
-                    int cc = fCurrentEntity.ch[fCurrentEntity.position];
-                    if (cc == '\n' || cc == 0x85) {
-                        fCurrentEntity.position++;
-                        offset++;
-                    }
-                    /*** NEWLINE NORMALIZATION ***/
-                    else {
-                        newlines++;
-                    }
-                }
-                else if (c == '\n' || ((c == 0x85 || c == 0x2028) && external)) {
-                    newlines++;
-                    fCurrentEntity.lineNumber++;
-                    fCurrentEntity.columnNumber = 1;
-                    if (fCurrentEntity.position == fCurrentEntity.count) {
-                        offset = 0;
-                        fCurrentEntity.baseCharOffset += (fCurrentEntity.position - fCurrentEntity.startPosition);
-                        fCurrentEntity.position = newlines;
-                        fCurrentEntity.startPosition = newlines;
-                        if (load(newlines, false, true)) {
-                            break;
-                        }
-                    }
-                }
-                else {
-                    fCurrentEntity.position--;
-                    break;
-                }
-            } while (fCurrentEntity.position < fCurrentEntity.count - 1);
-            for (int i = offset; i < fCurrentEntity.position; i++) {
-                fCurrentEntity.ch[i] = '\n';
-            }
-            int length = fCurrentEntity.position - offset;
-            if (fCurrentEntity.position == fCurrentEntity.count - 1) {
-                content.setValues(fCurrentEntity.ch, offset, length);
-                return -1;
-            }
+        if (normalizeNewlines(XML_VERSION_1_1, content, false, true, null)) {
+            return -1;
         }
 
+        int c;
+        boolean external = fCurrentEntity.isExternal();
         // scan literal value
         if (external) {
             while (fCurrentEntity.position < fCurrentEntity.count) {
@@ -1093,66 +982,11 @@ public class XML11EntityScanner
             }
 
             // normalize newlines
-            int offset = fCurrentEntity.position;
-            int c = fCurrentEntity.ch[offset];
-            int newlines = 0;
-            if (c == '\n' || ((c == '\r' || c == 0x85 || c == 0x2028) && external)) {
-                do {
-                    c = fCurrentEntity.ch[fCurrentEntity.position++];
-                    if ((c == '\r' ) && external) {
-                        newlines++;
-                        fCurrentEntity.lineNumber++;
-                        fCurrentEntity.columnNumber = 1;
-                        if (fCurrentEntity.position == fCurrentEntity.count) {
-                            offset = 0;
-                            fCurrentEntity.baseCharOffset += (fCurrentEntity.position - fCurrentEntity.startPosition);
-                            fCurrentEntity.position = newlines;
-                            fCurrentEntity.startPosition = newlines;
-                            if (load(newlines, false, true)) {
-                                break;
-                            }
-                        }
-                        int cc = fCurrentEntity.ch[fCurrentEntity.position];
-                        if (cc == '\n' || cc == 0x85) {
-                            fCurrentEntity.position++;
-                            offset++;
-                        }
-                        /*** NEWLINE NORMALIZATION ***/
-                        else {
-                            newlines++;
-                        }
-                    }
-                    else if (c == '\n' || ((c == 0x85 || c == 0x2028) && external)) {
-                        newlines++;
-                        fCurrentEntity.lineNumber++;
-                        fCurrentEntity.columnNumber = 1;
-                        if (fCurrentEntity.position == fCurrentEntity.count) {
-                            offset = 0;
-                            fCurrentEntity.baseCharOffset += (fCurrentEntity.position - fCurrentEntity.startPosition);
-                            fCurrentEntity.position = newlines;
-                            fCurrentEntity.startPosition = newlines;
-                            fCurrentEntity.count = newlines;
-                            if (load(newlines, false, true)) {
-                                break;
-                            }
-                        }
-                    }
-                    else {
-                        fCurrentEntity.position--;
-                        break;
-                    }
-                } while (fCurrentEntity.position < fCurrentEntity.count - 1);
-                for (int i = offset; i < fCurrentEntity.position; i++) {
-                    fCurrentEntity.ch[i] = '\n';
-                }
-                int length = fCurrentEntity.position - offset;
-                if (fCurrentEntity.position == fCurrentEntity.count - 1) {
-                    checkEntityLimit(NameType.COMMENT, fCurrentEntity, offset, length);
-                    buffer.append(fCurrentEntity.ch, offset, length);
-                    return true;
-                }
+            if (normalizeNewlines(XML_VERSION_1_1, buffer, true, false, NameType.COMMENT)) {
+                return true;
             }
 
+            int c;
             // iterate over buffer looking for delimiter
             OUTER: while (fCurrentEntity.position < fCurrentEntity.count) {
                 c = fCurrentEntity.ch[fCurrentEntity.position++];
@@ -1256,22 +1090,6 @@ public class XML11EntityScanner
             checkEntityLimit(nt, fCurrentEntity, offset, fCurrentEntity.position - offset);
             return true;
         }
-        else if (c == '\n' && (cc == '\r' ) && fCurrentEntity.isExternal()) {
-            // handle newlines
-            if (fCurrentEntity.position == fCurrentEntity.count) {
-                invokeListeners(1);
-                fCurrentEntity.ch[0] = (char)cc;
-                load(1, false, false);
-            }
-            int ccc = fCurrentEntity.ch[++fCurrentEntity.position];
-            if (ccc == '\n' || ccc == 0x85) {
-                fCurrentEntity.position++;
-            }
-            fCurrentEntity.lineNumber++;
-            fCurrentEntity.columnNumber = 1;
-            checkEntityLimit(nt, fCurrentEntity, offset, fCurrentEntity.position - offset);
-            return true;
-        }
 
         // character was not skipped
         return false;
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java
index 7dbdf6075135d804bbac4e8fcc1eaefa7f4e7483..8a01f74e790325fadfb883b94a8ac36ac929dd0e 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java
@@ -91,7 +91,7 @@ import org.xml.sax.InputSource;
  * @author K.Venugopal SUN Microsystems
  * @author Neeraj Bajaj SUN Microsystems
  * @author Sunitha Reddy SUN Microsystems
- * @LastModified: May 2021
+ * @LastModified: Aug 2021
  */
 public class XMLEntityManager implements XMLComponent, XMLEntityResolver {
 
@@ -1235,7 +1235,7 @@ public class XMLEntityManager implements XMLComponent, XMLEntityResolver {
             externalEntity = (Entity.ExternalEntity)entity;
             extLitSysId = (externalEntity.entityLocation != null ? externalEntity.entityLocation.getLiteralSystemId() : null);
             extBaseSysId = (externalEntity.entityLocation != null ? externalEntity.entityLocation.getBaseSystemId() : null);
-            expandedSystemId = expandSystemId(extLitSysId, extBaseSysId);
+            expandedSystemId = expandSystemId(extLitSysId, extBaseSysId, fStrictURI);
             boolean unparsed = entity.isUnparsed();
             boolean parameter = entityName.startsWith("%");
             boolean general = !parameter;
@@ -1312,15 +1312,13 @@ public class XMLEntityManager implements XMLComponent, XMLEntityResolver {
              */
             xmlInputSource = staxInputSource.getXMLInputSource() ;
             if (!fISCreatedByResolver) {
-                //let the not-LoadExternalDTD or not-SupportDTD process to handle the situation
-                if (fLoadExternalDTD) {
-                    String accessError = SecuritySupport.checkAccess(expandedSystemId, fAccessExternalDTD, JdkConstants.ACCESS_EXTERNAL_ALL);
-                    if (accessError != null) {
-                        fErrorReporter.reportError(this.getEntityScanner(),XMLMessageFormatter.XML_DOMAIN,
-                                "AccessExternalEntity",
-                                new Object[] { SecuritySupport.sanitizePath(expandedSystemId), accessError },
-                                XMLErrorReporter.SEVERITY_FATAL_ERROR);
-                    }
+                String accessError = SecuritySupport.checkAccess(expandedSystemId,
+                        fAccessExternalDTD, JdkConstants.ACCESS_EXTERNAL_ALL);
+                if (accessError != null) {
+                    fErrorReporter.reportError(this.getEntityScanner(),XMLMessageFormatter.XML_DOMAIN,
+                            "AccessExternalEntity",
+                            new Object[] { SecuritySupport.sanitizePath(expandedSystemId), accessError },
+                            XMLErrorReporter.SEVERITY_FATAL_ERROR);
                 }
             }
         }
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java
index c48ed8f70be229e2f2e53d7207fdedf8a327a47f..33ffe9831b86ea016bbc973e0f778b0bd2ea1de5 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java
@@ -21,6 +21,8 @@
 
 package com.sun.org.apache.xerces.internal.impl;
 
+import static com.sun.org.apache.xerces.internal.impl.Constants.XML_VERSION_1_0;
+import static com.sun.org.apache.xerces.internal.impl.Constants.XML_VERSION_1_1;
 import com.sun.org.apache.xerces.internal.impl.XMLScanner.NameType;
 import com.sun.org.apache.xerces.internal.impl.io.ASCIIReader;
 import com.sun.org.apache.xerces.internal.impl.io.UCSReader;
@@ -55,7 +57,7 @@ import java.util.Locale;
  * @author Arnaud  Le Hors, IBM
  * @author K.Venugopal Sun Microsystems
  *
- * @LastModified: Apr 2021
+ * @LastModified: Sep 2021
  */
 public class XMLEntityScanner implements XMLLocator  {
 
@@ -149,6 +151,15 @@ public class XMLEntityScanner implements XMLLocator  {
     // indicates that the operation is for detecting XML version
     boolean detectingVersion = false;
 
+    // offset of the current cursor position
+    int offset = 0;
+
+    // number of newlines in the current process
+    int newlines = 0;
+
+    // indicating whether the content has been counted towards limit
+    boolean counted = false;
+
     //
     // Constructors
     //
@@ -553,7 +564,7 @@ public class XMLEntityScanner implements XMLLocator  {
         }
 
         // scan character
-        int offset = fCurrentEntity.position;
+        offset = fCurrentEntity.position;
         int c = fCurrentEntity.ch[fCurrentEntity.position++];
         if (c == '\n' || (c == '\r' && isExternal)) {
             fCurrentEntity.lineNumber++;
@@ -561,10 +572,10 @@ public class XMLEntityScanner implements XMLLocator  {
             if (fCurrentEntity.position == fCurrentEntity.count) {
                 invokeListeners(1);
                 fCurrentEntity.ch[0] = (char)c;
-                load(1, false, false);
+                load(1, true, false);
                 offset = 0;
             }
-            if (c == '\r' && isExternal) {
+            if (c == '\r' && isExternal && fCurrentEntity.position < fCurrentEntity.count) {
                 if (fCurrentEntity.ch[fCurrentEntity.position++] != '\n') {
                     fCurrentEntity.position--;
                 }
@@ -614,7 +625,7 @@ public class XMLEntityScanner implements XMLLocator  {
         }
 
         // scan nmtoken
-        int offset = fCurrentEntity.position;
+        offset = fCurrentEntity.position;
         boolean vc = false;
         char c;
         while (true){
@@ -695,7 +706,7 @@ public class XMLEntityScanner implements XMLLocator  {
         }
 
         // scan name
-        int offset = fCurrentEntity.position;
+        offset = fCurrentEntity.position;
         int length;
         if (XMLChar.isNameStart(fCurrentEntity.ch[offset])) {
             if (++fCurrentEntity.position == fCurrentEntity.count) {
@@ -788,7 +799,7 @@ public class XMLEntityScanner implements XMLLocator  {
         }
 
         // scan qualified name
-        int offset = fCurrentEntity.position;
+        offset = fCurrentEntity.position;
 
         //making a check if if the specified character is a valid name start character
         //as defined by production [5] in the XML 1.0 specification.
@@ -1043,81 +1054,11 @@ public class XMLEntityScanner implements XMLLocator  {
         }
 
         // normalize newlines
-        int offset = fCurrentEntity.position;
-        int c = fCurrentEntity.ch[offset];
-        int newlines = 0;
-        boolean counted = false;
-        if (c == '\n' || (c == '\r' && isExternal)) {
-            if (DEBUG_BUFFER) {
-                System.out.print("[newline, "+offset+", "+fCurrentEntity.position+": ");
-                print();
-                System.out.println();
-            }
-            do {
-                c = fCurrentEntity.ch[fCurrentEntity.position++];
-                if (c == '\r' && isExternal) {
-                    newlines++;
-                    fCurrentEntity.lineNumber++;
-                    fCurrentEntity.columnNumber = 1;
-                    if (fCurrentEntity.position == fCurrentEntity.count) {
-                        checkEntityLimit(null, fCurrentEntity, offset, newlines);
-                        offset = 0;
-                        fCurrentEntity.position = newlines;
-                        if (load(newlines, false, true)) {
-                            counted = true;
-                            break;
-                        }
-                    }
-                    if (fCurrentEntity.ch[fCurrentEntity.position] == '\n') {
-                        fCurrentEntity.position++;
-                        offset++;
-                    }
-                    /*** NEWLINE NORMALIZATION ***/
-                    else {
-                        newlines++;
-                    }
-                } else if (c == '\n') {
-                    newlines++;
-                    fCurrentEntity.lineNumber++;
-                    fCurrentEntity.columnNumber = 1;
-                    if (fCurrentEntity.position == fCurrentEntity.count) {
-                        checkEntityLimit(null, fCurrentEntity, offset, newlines);
-                        offset = 0;
-                        fCurrentEntity.position = newlines;
-                        if (load(newlines, false, true)) {
-                            counted = true;
-                            break;
-                        }
-                    }
-                } else {
-                    fCurrentEntity.position--;
-                    break;
-                }
-            } while (fCurrentEntity.position < fCurrentEntity.count - 1);
-            for (int i = offset; i < fCurrentEntity.position; i++) {
-                fCurrentEntity.ch[i] = '\n';
-            }
-            int length = fCurrentEntity.position - offset;
-            if (fCurrentEntity.position == fCurrentEntity.count - 1) {
-                checkEntityLimit(null, fCurrentEntity, offset, length);
-                //CHANGED: dont replace the value.. append to the buffer. This gives control to the callee
-                //on buffering the data..
-                content.setValues(fCurrentEntity.ch, offset, length);
-                //content.append(fCurrentEntity.ch, offset, length);
-                if (DEBUG_BUFFER) {
-                    System.out.print("]newline, "+offset+", "+fCurrentEntity.position+": ");
-                    print();
-                    System.out.println();
-                }
-                return -1;
-            }
-            if (DEBUG_BUFFER) {
-                System.out.print("]newline, "+offset+", "+fCurrentEntity.position+": ");
-                print();
-                System.out.println();
-            }
+        if (normalizeNewlines(XML_VERSION_1_0, content, false, false, null)) {
+            return -1;
         }
 
+        int c;
         while (fCurrentEntity.position < fCurrentEntity.count) {
             c = fCurrentEntity.ch[fCurrentEntity.position++];
             if (!XMLChar.isContent(c)) {
@@ -1202,85 +1143,14 @@ public class XMLEntityScanner implements XMLLocator  {
         }
 
         // normalize newlines
-        int offset = fCurrentEntity.position;
-        int c = fCurrentEntity.ch[offset];
-        int newlines = 0;
         if(whiteSpaceInfoNeeded)
             whiteSpaceLen=0;
-        if (c == '\n' || (c == '\r' && isExternal)) {
-            if (DEBUG_BUFFER) {
-                System.out.print("[newline, "+offset+", "+fCurrentEntity.position+": ");
-                print();
-                System.out.println();
-            }
-            do {
-                c = fCurrentEntity.ch[fCurrentEntity.position++];
-                if (c == '\r' && isExternal) {
-                    newlines++;
-                    fCurrentEntity.lineNumber++;
-                    fCurrentEntity.columnNumber = 1;
-                    if (fCurrentEntity.position == fCurrentEntity.count) {
-                        offset = 0;
-                        fCurrentEntity.position = newlines;
-                        if (load(newlines, false, true)) {
-                            break;
-                        }
-                    }
-                    if (fCurrentEntity.ch[fCurrentEntity.position] == '\n') {
-                        fCurrentEntity.position++;
-                        offset++;
-                    }
-                    /*** NEWLINE NORMALIZATION ***/
-                    else {
-                        newlines++;
-                    }
-                    /***/
-                } else if (c == '\n') {
-                    newlines++;
-                    fCurrentEntity.lineNumber++;
-                    fCurrentEntity.columnNumber = 1;
-                    if (fCurrentEntity.position == fCurrentEntity.count) {
-                        offset = 0;
-                        fCurrentEntity.position = newlines;
-                        if (load(newlines, false, true)) {
-                            break;
-                        }
-                    }
-                    /*** NEWLINE NORMALIZATION ***
-                     * if (fCurrentEntity.ch[fCurrentEntity.position] == '\r'
-                     * && external) {
-                     * fCurrentEntity.position++;
-                     * offset++;
-                     * }
-                     * /***/
-                } else {
-                    fCurrentEntity.position--;
-                    break;
-                }
-            } while (fCurrentEntity.position < fCurrentEntity.count - 1);
-            int i=0;
-            for ( i = offset; i < fCurrentEntity.position; i++) {
-                fCurrentEntity.ch[i] = '\n';
-                storeWhiteSpace(i);
-            }
 
-            int length = fCurrentEntity.position - offset;
-            if (fCurrentEntity.position == fCurrentEntity.count - 1) {
-                content.setValues(fCurrentEntity.ch, offset, length);
-                if (DEBUG_BUFFER) {
-                    System.out.print("]newline, "+offset+", "+fCurrentEntity.position+": ");
-                    print();
-                    System.out.println();
-                }
-                return -1;
-            }
-            if (DEBUG_BUFFER) {
-                System.out.print("]newline, "+offset+", "+fCurrentEntity.position+": ");
-                print();
-                System.out.println();
-            }
+        if (normalizeNewlines(XML_VERSION_1_0, content, false, true, null)) {
+            return -1;
         }
 
+        int c;
         // scan literal value
         for (; fCurrentEntity.position= whiteSpaceLookup.length) {
             int [] tmp = new int[whiteSpaceLookup.length + 100];
             System.arraycopy(whiteSpaceLookup, 0, tmp, 0, whiteSpaceLookup.length);
@@ -1415,75 +1285,11 @@ public class XMLEntityScanner implements XMLLocator  {
                 return false;
             }
 
-            // normalize newlines
-            int offset = fCurrentEntity.position;
-            int c = fCurrentEntity.ch[offset];
-            int newlines = 0;
-            if (c == '\n' || (c == '\r' && isExternal)) {
-                if (DEBUG_BUFFER) {
-                    System.out.print("[newline, "+offset+", "+fCurrentEntity.position+": ");
-                    print();
-                    System.out.println();
-                }
-                do {
-                    c = fCurrentEntity.ch[fCurrentEntity.position++];
-                    if (c == '\r' && isExternal) {
-                        newlines++;
-                        fCurrentEntity.lineNumber++;
-                        fCurrentEntity.columnNumber = 1;
-                        if (fCurrentEntity.position == fCurrentEntity.count) {
-                            offset = 0;
-                            fCurrentEntity.position = newlines;
-                            if (load(newlines, false, true)) {
-                                break;
-                            }
-                        }
-                        if (fCurrentEntity.ch[fCurrentEntity.position] == '\n') {
-                            fCurrentEntity.position++;
-                            offset++;
-                        }
-                        /*** NEWLINE NORMALIZATION ***/
-                        else {
-                            newlines++;
-                        }
-                    } else if (c == '\n') {
-                        newlines++;
-                        fCurrentEntity.lineNumber++;
-                        fCurrentEntity.columnNumber = 1;
-                        if (fCurrentEntity.position == fCurrentEntity.count) {
-                            offset = 0;
-                            fCurrentEntity.position = newlines;
-                            fCurrentEntity.count = newlines;
-                            if (load(newlines, false, true)) {
-                                break;
-                            }
-                        }
-                    } else {
-                        fCurrentEntity.position--;
-                        break;
-                    }
-                } while (fCurrentEntity.position < fCurrentEntity.count - 1);
-                for (int i = offset; i < fCurrentEntity.position; i++) {
-                    fCurrentEntity.ch[i] = '\n';
-                }
-                int length = fCurrentEntity.position - offset;
-                if (fCurrentEntity.position == fCurrentEntity.count - 1) {
-                    checkEntityLimit(NameType.COMMENT, fCurrentEntity, offset, length);
-                    buffer.append(fCurrentEntity.ch, offset, length);
-                    if (DEBUG_BUFFER) {
-                        System.out.print("]newline, "+offset+", "+fCurrentEntity.position+": ");
-                        print();
-                        System.out.println();
-                    }
-                    return true;
-                }
-                if (DEBUG_BUFFER) {
-                    System.out.print("]newline, "+offset+", "+fCurrentEntity.position+": ");
-                    print();
-                    System.out.println();
-                }
+            if (normalizeNewlines(XML_VERSION_1_0, buffer, true, false, NameType.COMMENT)) {
+                return true;
             }
 
+            int c;
             // iterate over buffer looking for delimiter
             OUTER: while (fCurrentEntity.position < fCurrentEntity.count) {
                 c = fCurrentEntity.ch[fCurrentEntity.position++];
@@ -1570,7 +1376,7 @@ public class XMLEntityScanner implements XMLLocator  {
         }
 
         // skip character
-        int offset = fCurrentEntity.position;
+        offset = fCurrentEntity.position;
         int cc = fCurrentEntity.ch[fCurrentEntity.position];
         if (cc == c) {
             fCurrentEntity.position++;
@@ -1587,26 +1393,6 @@ public class XMLEntityScanner implements XMLLocator  {
             }
             checkEntityLimit(nt, fCurrentEntity, offset, fCurrentEntity.position - offset);
             return true;
-        } else if (c == '\n' && cc == '\r' && isExternal) {
-            // handle newlines
-            if (fCurrentEntity.position == fCurrentEntity.count) {
-                invokeListeners(1);
-                fCurrentEntity.ch[0] = (char)cc;
-                load(1, false, false);
-            }
-            fCurrentEntity.position++;
-            if (fCurrentEntity.ch[fCurrentEntity.position] == '\n') {
-                fCurrentEntity.position++;
-            }
-            fCurrentEntity.lineNumber++;
-            fCurrentEntity.columnNumber = 1;
-            if (DEBUG_BUFFER) {
-                System.out.print(")skipChar, '"+(char)c+"': ");
-                print();
-                System.out.println(" -> true");
-            }
-            checkEntityLimit(nt, fCurrentEntity, offset, fCurrentEntity.position - offset);
-            return true;
         }
 
         // character was not skipped
@@ -1659,7 +1445,7 @@ public class XMLEntityScanner implements XMLLocator  {
 
         // skip spaces
         int c = fCurrentEntity.ch[fCurrentEntity.position];
-        int offset = fCurrentEntity.position - 1;
+        offset = fCurrentEntity.position - 1;
         if (XMLChar.isSpace(c)) {
             do {
                 boolean entityChanged = false;
@@ -2332,5 +2118,86 @@ public class XMLEntityScanner implements XMLLocator  {
 
     } // skipDeclSpaces():boolean
 
+    /**
+     * Normalizes newlines. As specified in XML specification, this method
+     * converts newlines, '\n', '\r' and '\r\n' to '\n' as 2.11 End-of-Line Handling.
+     * Further, it may put them in a cache for later process as needed, for example
+     * as specified in 3.3.3 Attribute-Value Normalization.
+     *
+     * @ImplNote this method does not limit to processing external parsed entities
+     * as 2.11 required. It handles all cases where newlines need to be processed.
+     *
+     * @param buffer the current content buffer
+     * @param append a flag indicating whether to append to the buffer
+     * @param storeWS a flag indicating whether the whitespaces need to be stored
+     * for later processing
+     * @param nt the type of the entity
+     * @return true if the cursor is at the end of the current entity, false otherwise.
+     * @throws IOException
+     */
+    protected boolean normalizeNewlines(short version, XMLString buffer, boolean append,
+            boolean storeWS, NameType nt)
+            throws IOException {
+        // normalize newlines
+        offset = fCurrentEntity.position;
+        int c = fCurrentEntity.ch[offset];
+        newlines = 0;
+        // how this information is used is determined by the caller of this method
+        counted = false;
+        if ((c == '\n' || c == '\r') ||
+                (version == XML_VERSION_1_1 && (c == 0x85 || c == 0x2028) && isExternal)) {
+            do {
+                c = fCurrentEntity.ch[fCurrentEntity.position++];
+                if ((c == '\n' || c == '\r') ||
+                    (version == XML_VERSION_1_1 && (c == 0x85 || c == 0x2028))) {
+                    newlines++;
+                    fCurrentEntity.lineNumber++;
+                    fCurrentEntity.columnNumber = 1;
+                    if (fCurrentEntity.position == fCurrentEntity.count) {
+                        checkEntityLimit(nt, fCurrentEntity, offset, newlines);
+                        offset = 0;
+                        fCurrentEntity.position = newlines;
+                        if (load(newlines, false, true)) {
+                            counted = true;
+                            break;
+                        }
+                    }
+                    if (c == '\r') {
+                        int cc = fCurrentEntity.ch[fCurrentEntity.position];
+                        if (cc == '\n' || (version == XML_VERSION_1_1 && cc == 0x85)) {
+                            fCurrentEntity.position++;
+                            offset++;
+                        }
+                        /*** NEWLINE NORMALIZATION ***/
+                        else {
+                            newlines++;
+                        }
+                    }
+                } else {
+                    fCurrentEntity.position--;
+                    break;
+                }
+            } while (fCurrentEntity.position < fCurrentEntity.count - 1);
+
+            for (int i = offset; i < fCurrentEntity.position; i++) {
+                fCurrentEntity.ch[i] = '\n';
+                if (storeWS) {
+                    storeWhiteSpace(i);
+                }
+            }
 
+            int length = fCurrentEntity.position - offset;
+            if (fCurrentEntity.position == fCurrentEntity.count - 1) {
+                checkEntityLimit(nt, fCurrentEntity, offset, length);
+                if (append) {
+                    buffer.append(fCurrentEntity.ch, offset, length);
+                } else {
+                    buffer.setValues(fCurrentEntity.ch, offset, length);
+                }
+
+                return true;
+            }
+        }
+        return false;
+    }
 } // class XMLEntityScanner
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLScanner.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLScanner.java
index 6a6362199c52ea826c2540db7580d0b568e9296b..2102b8558faddf8d1b1de705062332ddcaa17531 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLScanner.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLScanner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -67,7 +67,7 @@ import com.sun.xml.internal.stream.Entity;
  * @author Eric Ye, IBM
  * @author K.Venugopal SUN Microsystems
  * @author Sunitha Reddy, SUN Microsystems
- * @LastModified: Feb 2020
+ * @LastModified: Aug 2021
  */
 public abstract class XMLScanner
         implements XMLComponent {
@@ -956,12 +956,6 @@ public abstract class XMLScanner
                         System.out.println("** valueF: \""
                                 + stringBuffer.toString() + "\"");
                     }
-                } else if (c == '\n' || c == '\r') {
-                    fEntityScanner.scanChar(null);
-                    stringBuffer.append(' ');
-                    if (entityDepth == fEntityDepth && fNeedNonNormalizedValue) {
-                        fStringBuffer2.append('\n');
-                    }
                 } else if (c != -1 && XMLChar.isHighSurrogate(c)) {
                     fStringBuffer3.clear();
                     if (scanSurrogates(fStringBuffer3)) {
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLStringBuffer.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLStringBuffer.java
index 9e9157384239d9dfca1f2d995cf9e317942dcfa2..118aeb7ad967a520ea9721f607ff8c9a82fb75ec 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLStringBuffer.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/util/XMLStringBuffer.java
@@ -1,6 +1,5 @@
 /*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -41,19 +40,11 @@ import com.sun.org.apache.xerces.internal.xni.XMLString;
  *
  * @author Andy Clark, IBM
  * @author Eric Ye, IBM
- *
+ * @LastModified: Aug 2021
  */
 public class XMLStringBuffer
 extends XMLString {
 
-    //
-    // Constants
-    //
-
-
-    /** Default buffer size (32). */
-    public static final int DEFAULT_SIZE = 32;
-
     //
     // Data
     //
@@ -112,79 +103,4 @@ extends XMLString {
         length = 0;
     }
 
-    /**
-     * append
-     *
-     * @param c
-     */
-    public void append(char c) {
-        if(this.length + 1 > this.ch.length){
-            int newLength = this.ch.length * 2 ;
-            if(newLength < this.ch.length + DEFAULT_SIZE){
-                newLength = this.ch.length + DEFAULT_SIZE;
-            }
-            char [] tmp = new char[newLength];
-            System.arraycopy(this.ch, 0, tmp, 0, this.length);
-            this.ch = tmp;
-        }
-        this.ch[this.length] = c ;
-        this.length++;
-    } // append(char)
-
-    /**
-     * append
-     *
-     * @param s
-     */
-    public void append(String s) {
-        int length = s.length();
-        if (this.length + length > this.ch.length) {
-            int newLength = this.ch.length * 2 ;
-            if(newLength < this.ch.length + length + DEFAULT_SIZE){
-                newLength = this.ch.length + length+ DEFAULT_SIZE;
-            }
-
-            char[] newch = new char[newLength];
-            System.arraycopy(this.ch, 0, newch, 0, this.length);
-            this.ch = newch;
-        }
-        s.getChars(0, length, this.ch, this.length);
-        this.length += length;
-    } // append(String)
-
-    /**
-     * append
-     *
-     * @param ch
-     * @param offset
-     * @param length
-     */
-    public void append(char[] ch, int offset, int length) {
-        if (this.length + length > this.ch.length) {
-            int newLength = this.ch.length * 2 ;
-            if(newLength < this.ch.length + length + DEFAULT_SIZE){
-                newLength = this.ch.length + length + DEFAULT_SIZE;
-            }
-            char[] newch = new char[newLength];
-            System.arraycopy(this.ch, 0, newch, 0, this.length);
-            this.ch = newch;
-        }
-        //making the code more robust as it would handle null or 0 length data,
-        //add the data only when it contains some thing
-        if(ch != null && length > 0){
-            System.arraycopy(ch, offset, this.ch, this.length, length);
-            this.length += length;
-        }
-    } // append(char[],int,int)
-
-    /**
-     * append
-     *
-     * @param s
-     */
-    public void append(XMLString s) {
-        append(s.ch, s.offset, s.length);
-    } // append(XMLString)
-
-
 } // class XMLStringBuffer
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLString.java b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLString.java
index f63e1d20aa680f17fc161f8b238a767cf872d698..9d26c252651a8a04c07c8502c19d4d3eaa6c35da 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLString.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xni/XMLString.java
@@ -1,6 +1,5 @@
 /*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -42,9 +41,11 @@ package com.sun.org.apache.xerces.internal.xni;
  *
  * @author Eric Ye, IBM
  * @author Andy Clark, IBM
- *
+ * @LastModified: Aug 2021
  */
 public class XMLString {
+    /** Default buffer size (32). */
+    public static final int DEFAULT_SIZE = 32;
 
     //
     // Data
@@ -189,4 +190,78 @@ public class XMLString {
         return length > 0 ? new String(ch, offset, length) : "";
     } // toString():String
 
+    /**
+     * Appends a char to the buffer.
+     *
+     * @param c the char
+     */
+    public void append(char c) {
+        if(this.length + 1 > this.ch.length){
+            int newLength = this.ch.length * 2 ;
+            if(newLength < this.ch.length + DEFAULT_SIZE){
+                newLength = this.ch.length + DEFAULT_SIZE;
+            }
+            char [] tmp = new char[newLength];
+            System.arraycopy(this.ch, 0, tmp, 0, this.length);
+            this.ch = tmp;
+        }
+        this.ch[this.length] = c ;
+        this.length++;
+    } // append(char)
+
+    /**
+     * Appends a string to the buffer.
+     *
+     * @param s the string
+     */
+    public void append(String s) {
+        int length = s.length();
+        if (this.length + length > this.ch.length) {
+            int newLength = this.ch.length * 2 ;
+            if(newLength < this.ch.length + length + DEFAULT_SIZE){
+                newLength = this.ch.length + length+ DEFAULT_SIZE;
+            }
+
+            char[] newch = new char[newLength];
+            System.arraycopy(this.ch, 0, newch, 0, this.length);
+            this.ch = newch;
+        }
+        s.getChars(0, length, this.ch, this.length);
+        this.length += length;
+    } // append(String)
+
+    /**
+     * Appends a number of characters to the buffer.
+     *
+     * @param ch the char array
+     * @param offset the offset
+     * @param length the length
+     */
+    public void append(char[] ch, int offset, int length) {
+        if (this.length + length > this.ch.length) {
+            int newLength = this.ch.length * 2 ;
+            if(newLength < this.ch.length + length + DEFAULT_SIZE){
+                newLength = this.ch.length + length + DEFAULT_SIZE;
+            }
+            char[] newch = new char[newLength];
+            System.arraycopy(this.ch, 0, newch, 0, this.length);
+            this.ch = newch;
+        }
+        //making the code more robust as it would handle null or 0 length data,
+        //add the data only when it contains some thing
+        if(ch != null && length > 0){
+            System.arraycopy(ch, offset, this.ch, this.length, length);
+            this.length += length;
+        }
+    } // append(char[],int,int)
+
+    /**
+     * Appends another buffer to this buffer
+     *
+     * @param s another buffer
+     */
+    public void append(XMLString s) {
+        append(s.ch, s.offset, s.length);
+    } // append(XMLString)
+
 } // class XMLString
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SystemIDResolver.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SystemIDResolver.java
index f2c198c9f09572f331b780f2216473e3a59b6148..fa4e0c901260fc9e75e82c57b6cd6d94f442516c 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SystemIDResolver.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SystemIDResolver.java
@@ -1,6 +1,5 @@
 /*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -42,6 +41,8 @@ import com.sun.org.apache.xml.internal.serializer.utils.URI.MalformedURIExceptio
  * used in com.sun.org.apache.xml.internal.serializer.
  *
  * @xsl.usage internal
+ *
+ * @LastModified: Jan 2022
  */
 public final class SystemIDResolver
 {
@@ -282,7 +283,7 @@ public final class SystemIDResolver
   public static String getAbsoluteURI(String urlString, String base)
           throws TransformerException
   {
-    if (base == null)
+    if (base == null || base.length() == 0)
       return getAbsoluteURI(urlString);
 
     String absoluteBase = getAbsoluteURI(base);
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/SystemIDResolver.java b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/SystemIDResolver.java
index de383ca3e9dabd79ea4666eccc1ca678f7399dda..caf2a4b1ba7b0a0a21e066ace451995503c69da4 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/SystemIDResolver.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/SystemIDResolver.java
@@ -1,6 +1,5 @@
 /*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -35,6 +34,8 @@ import com.sun.org.apache.xml.internal.utils.URI.MalformedURIException;
  * fact that it's declared to throw TransformerException.  Please
  * see code comments for details on how resolution is performed.
    
  * @xsl.usage internal
+ *
+ * @LastModified: Sept 2021
  */
 public class SystemIDResolver
 {
@@ -275,7 +276,7 @@ public class SystemIDResolver
   public static String getAbsoluteURI(String urlString, String base)
           throws TransformerException
   {
-    if (base == null)
+    if (base == null || base.length() == 0)
       return getAbsoluteURI(urlString);
 
     String absoluteBase = getAbsoluteURI(base);
diff --git a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncSystemProperty.java b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncSystemProperty.java
index bad9cf1a311e6ff0bfc5fd3d5fcc53209e65c431..819faa61b9ca0799ae623b5be87f6761fc053dc3 100644
--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncSystemProperty.java
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/functions/FuncSystemProperty.java
@@ -164,11 +164,8 @@ public class FuncSystemProperty extends FunctionOneArg
     try
     {
       // Use SecuritySupport class to provide privileged access to property file
-      InputStream is = SecuritySupport.getResourceAsStream(XSLT_PROPERTIES);
-
-      // get a buffered version
-      try (BufferedInputStream bis = new BufferedInputStream(is)) {
-          target.load(bis);  // and load up the property bag from this
+      try (InputStream is = SecuritySupport.getResourceAsStream(XSLT_PROPERTIES)) {
+          target.load(is);  // and load up the property bag from this
       }
     }
     catch (Exception ex)
diff --git a/src/java.xml/share/classes/javax/xml/stream/XMLStreamReader.java b/src/java.xml/share/classes/javax/xml/stream/XMLStreamReader.java
index c2a230fe2853b4f556d3f29246a28d1b1dee3bec..a40b4c9142bd16c3e1ed07998b3751eb0ec1b75b 100644
--- a/src/java.xml/share/classes/javax/xml/stream/XMLStreamReader.java
+++ b/src/java.xml/share/classes/javax/xml/stream/XMLStreamReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2022, 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
@@ -85,7 +85,7 @@ import javax.xml.namespace.QName;
  *        getProperty(), hasNext(), require(), close(),
  *            getNamespaceURI(), isStartElement(),
  *            isEndElement(), isCharacters(), isWhiteSpace(),
- *            getNamespaceContext(), getEventType(),getLocation(),
+ *            getNamespaceContext(), getEventType(), getLocation(),
  *            hasText(), hasName()
  *       
  *     
diff --git a/src/java.xml/share/classes/org/xml/sax/ext/DeclHandler.java b/src/java.xml/share/classes/org/xml/sax/ext/DeclHandler.java
index 7d5944656f2f5c46f6db9424891838737da42c39..f0ce5b63ae27be3825db3570f98b43ee919ffa81 100644
--- a/src/java.xml/share/classes/org/xml/sax/ext/DeclHandler.java
+++ b/src/java.xml/share/classes/org/xml/sax/ext/DeclHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2022, 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,7 +67,7 @@ public interface DeclHandler
      * string "ANY", or a parenthesised group, optionally followed
      * by an occurrence indicator.  The model will be normalized so
      * that all parameter entities are fully resolved and all whitespace
-     * is removed,and will include the enclosing parentheses.  Other
+     * is removed, and will include the enclosing parentheses.  Other
      * normalization (such as removing redundant parentheses or
      * simplifying occurrence indicators) is at the discretion of the
      * parser.
    
diff --git a/src/jdk.accessibility/windows/classes/com/sun/java/accessibility/internal/AccessBridge.java b/src/jdk.accessibility/windows/classes/com/sun/java/accessibility/internal/AccessBridge.java
index 853be1977546357ad702ceb5c8029fdb3e85d18f..e178e646d7d7088f57a47c23d7cf1aec28c325a0 100644
--- a/src/jdk.accessibility/windows/classes/com/sun/java/accessibility/internal/AccessBridge.java
+++ b/src/jdk.accessibility/windows/classes/com/sun/java/accessibility/internal/AccessBridge.java
@@ -27,6 +27,7 @@ package com.sun.java.accessibility.internal;
 
 import java.awt.*;
 import java.awt.event.*;
+import java.awt.geom.AffineTransform;
 import java.util.*;
 import java.lang.*;
 import java.lang.reflect.*;
@@ -478,6 +479,9 @@ public final class AccessBridge {
         if (parent == null) {
             return null;
         }
+        Point userSpaceXY = AccessibilityGraphicsEnvironment.toUserSpace(x, y);
+        x = userSpaceXY.x;
+        y = userSpaceXY.y;
         if (windowHandleToContextMap != null &&
             windowHandleToContextMap.containsValue(getRootAccessibleContext(parent))) {
             // Path for applications that register their top-level
@@ -1593,6 +1597,8 @@ public final class AccessBridge {
                             if (p != null) {
                                 r.x = p.x;
                                 r.y = p.y;
+
+                                r = AccessibilityGraphicsEnvironment.toDeviceSpaceAbs(r);
                                 return r;
                             }
                         } catch (Exception e) {
@@ -2257,6 +2263,7 @@ public final class AccessBridge {
                             if (s != null && s.equals("\n")) {
                                 rect.width = 0;
                             }
+                            rect = AccessibilityGraphicsEnvironment.toDeviceSpaceAbs(rect);
                             return rect;
                         }
                     }
@@ -7338,4 +7345,182 @@ public final class AccessBridge {
             }
         }
     }
+
+    /**
+     * A helper class to handle coordinate conversion between screen and user spaces.
+     * See {@link sun.java2d.SunGraphicsEnvironment}
+     */
+    private static abstract class AccessibilityGraphicsEnvironment extends GraphicsEnvironment {
+        /**
+         * Returns the graphics configuration which bounds contain the given point in the user's space.
+         *
+         * See {@link sun.java2d.SunGraphicsEnvironment#getGraphicsConfigurationAtPoint(GraphicsConfiguration, double, double)}
+         *
+         * @param  x the x coordinate of the given point in the user's space
+         * @param  y the y coordinate of the given point in the user's space
+         * @return the graphics configuration
+         */
+        public static GraphicsConfiguration getGraphicsConfigurationAtPoint(double x, double y) {
+            GraphicsConfiguration gc = GraphicsEnvironment.getLocalGraphicsEnvironment()
+                    .getDefaultScreenDevice().getDefaultConfiguration();
+            return getGraphicsConfigurationAtPoint(gc, x, y);
+        }
+
+        /**
+         * Returns the graphics configuration which bounds contain the given point in the user's space.
+         *
+         * See {@link sun.java2d.SunGraphicsEnvironment#getGraphicsConfigurationAtPoint(GraphicsConfiguration, double, double)}
+         *
+         * @param  current the default configuration which is checked in the first
+         *         place
+         * @param  x the x coordinate of the given point in the user's space
+         * @param  y the y coordinate of the given point in the user's space
+         * @return the graphics configuration
+         */
+        public static GraphicsConfiguration getGraphicsConfigurationAtPoint(
+                GraphicsConfiguration current, double x, double y) {
+            if (containsUserSpacePoint(current, x, y)) {
+                return current;
+            }
+            GraphicsEnvironment env = getLocalGraphicsEnvironment();
+            for (GraphicsDevice device : env.getScreenDevices()) {
+                GraphicsConfiguration config = device.getDefaultConfiguration();
+                if (containsUserSpacePoint(config, x, y)) {
+                    return config;
+                }
+            }
+            return current;
+        }
+
+        /**
+         * Returns the graphics configuration which bounds contain the given point in the device space.
+         *
+         * @param  x the x coordinate of the given point in the device space
+         * @param  y the y coordinate of the given point in the device space
+         * @return the graphics configuration
+         */
+        public static GraphicsConfiguration getGraphicsConfigurationAtDevicePoint(double x, double y) {
+            GraphicsConfiguration gc = GraphicsEnvironment.getLocalGraphicsEnvironment()
+                    .getDefaultScreenDevice().getDefaultConfiguration();
+            return getGraphicsConfigurationAtDevicePoint(gc, x, y);
+        }
+
+        /**
+         * Returns the graphics configuration which bounds contain the given point in the device space.
+         *
+         * @param  current the default configuration which is checked in the first
+         *         place
+         * @param  x the x coordinate of the given point in the device space
+         * @param  y the y coordinate of the given point in the device space
+         * @return the graphics configuration
+         */
+        public static GraphicsConfiguration getGraphicsConfigurationAtDevicePoint(
+                GraphicsConfiguration current, double x, double y) {
+            if (containsDeviceSpacePoint(current, x, y)) {
+                return current;
+            }
+            GraphicsEnvironment env = getLocalGraphicsEnvironment();
+            for (GraphicsDevice device : env.getScreenDevices()) {
+                GraphicsConfiguration config = device.getDefaultConfiguration();
+                if (containsDeviceSpacePoint(config, x, y)) {
+                    return config;
+                }
+            }
+            return current;
+        }
+
+        private static boolean containsDeviceSpacePoint(GraphicsConfiguration config, double x, double y) {
+            Rectangle bounds = config.getBounds();
+            bounds = toDeviceSpaceAbs(config, bounds.x, bounds.y, bounds.width, bounds.height);
+            return bounds.contains(x, y);
+        }
+
+        private static boolean containsUserSpacePoint(GraphicsConfiguration config, double x, double y) {
+            Rectangle bounds = config.getBounds();
+            return bounds.contains(x, y);
+        }
+
+        /**
+         * Converts absolute coordinates from the device
+         * space to the user's space space using appropriate device transformation.
+         *
+         * @param  x absolute x coordinate in the device's space
+         * @param  y absolute y coordinate in the device's space
+         * @return the corresponding coordinates in user's space
+         */
+        public static Point toUserSpace(int x, int y) {
+            GraphicsConfiguration gc = getGraphicsConfigurationAtDevicePoint(x, y);
+            return toUserSpace(gc, x, y);
+        }
+
+        /**
+         * Converts absolute coordinates from the device
+         * space to the user's space using passed graphics configuration.
+         *
+         * @param  gc the graphics configuration to be used for transformation
+         * @param  x absolute x coordinate in the device's space
+         * @param  y absolute y coordinate in the device's space
+         * @return the corresponding coordinates in user's space
+         */
+        public static Point toUserSpace(GraphicsConfiguration gc, int x, int y) {
+            AffineTransform tx = gc.getDefaultTransform();
+            Rectangle screen = gc.getBounds();
+            int userX = screen.x + clipRound((x - screen.x) / tx.getScaleX());
+            int userY = screen.y + clipRound((y - screen.y) / tx.getScaleY());
+            return new Point(userX, userY);
+        }
+
+        /**
+         * Converts the rectangle from the user's space to the device space using
+         * appropriate device transformation.
+         *
+         * See {@link sun.java2d.SunGraphicsEnvironment#toDeviceSpaceAbs(Rectangle)}
+         *
+         * @param  rect the rectangle in the user's space
+         * @return the rectangle which uses device space (pixels)
+         */
+        public static Rectangle toDeviceSpaceAbs(Rectangle rect) {
+            GraphicsConfiguration gc = getGraphicsConfigurationAtPoint(rect.x, rect.y);
+            return toDeviceSpaceAbs(gc, rect.x, rect.y, rect.width, rect.height);
+        }
+
+        /**
+         * Converts absolute coordinates (x, y) and the size (w, h) from the user's
+         * space to the device space using passed graphics configuration.
+         *
+         * See {@link sun.java2d.SunGraphicsEnvironment#toDeviceSpaceAbs(GraphicsConfiguration, int, int, int, int)}
+         *
+         * @param  gc the graphics configuration to be used for transformation
+         * @param  x absolute coordinate in the user's space
+         * @param  y absolute coordinate in the user's space
+         * @param  w the width in the user's space
+         * @param  h the height in the user's space
+         * @return the rectangle which uses device space (pixels)
+         */
+        public static Rectangle toDeviceSpaceAbs(GraphicsConfiguration gc,
+                                                 int x, int y, int w, int h) {
+            AffineTransform tx = gc.getDefaultTransform();
+            Rectangle screen = gc.getBounds();
+            return new Rectangle(
+                    screen.x + clipRound((x - screen.x) * tx.getScaleX()),
+                    screen.y + clipRound((y - screen.y) * tx.getScaleY()),
+                    clipRound(w * tx.getScaleX()),
+                    clipRound(h * tx.getScaleY())
+            );
+        }
+
+        /**
+         * See {@link sun.java2d.pipe.Region#clipRound}
+         */
+        private static int clipRound(final double coordinate) {
+            final double newv = coordinate - 0.5;
+            if (newv < Integer.MIN_VALUE) {
+                return Integer.MIN_VALUE;
+            }
+            if (newv > Integer.MAX_VALUE) {
+                return Integer.MAX_VALUE;
+            }
+            return (int) Math.ceil(newv);
+        }
+    }
 }
diff --git a/src/jdk.attach/windows/native/libattach/VirtualMachineImpl.c b/src/jdk.attach/windows/native/libattach/VirtualMachineImpl.c
index a21ce9fa73b7327a00b04811127f525c79fe7337..f08a7c004b31420f0ea380462699570fee0ad162 100644
--- a/src/jdk.attach/windows/native/libattach/VirtualMachineImpl.c
+++ b/src/jdk.attach/windows/native/libattach/VirtualMachineImpl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021, 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
@@ -399,6 +399,7 @@ JNIEXPORT void JNICALL Java_sun_tools_attach_VirtualMachineImpl_enqueue
     /*
      * Setup data to copy to target process
      */
+    memset(&data, 0, sizeof(data));
     data._GetModuleHandle = _GetModuleHandle;
     data._GetProcAddress = _GetProcAddress;
 
diff --git a/src/jdk.compiler/share/classes/com/sun/source/util/DocTrees.java b/src/jdk.compiler/share/classes/com/sun/source/util/DocTrees.java
index a1344aff555f7606866ed65e5573a0a878842007..5a9aee518a1475bbc11ec7aa82f6492de5805080 100644
--- a/src/jdk.compiler/share/classes/com/sun/source/util/DocTrees.java
+++ b/src/jdk.compiler/share/classes/com/sun/source/util/DocTrees.java
@@ -87,6 +87,11 @@ public abstract class DocTrees extends Trees {
     /**
      * Returns the doc comment tree, if any, for the Tree node identified by a given TreePath.
      * Returns {@code null} if no doc comment was found.
+     *
+     * @implNote The default implementation of this method returns the same
+     * {@code DocCommentTree} instance for repeated invocations
+     * with the same argument.
+     *
      * @param path the path for the tree node
      * @return the doc comment tree
      */
@@ -95,6 +100,11 @@ public abstract class DocTrees extends Trees {
     /**
      * Returns the doc comment tree of the given element.
      * Returns {@code null} if no doc comment was found.
+     *
+     * @implNote The default implementation of this method returns the same
+     * {@code DocCommentTree} instance for repeated invocations
+     * with the same argument.
+     *
      * @param e an element whose documentation is required
      * @return the doc comment tree
      *
@@ -109,6 +119,9 @@ public abstract class DocTrees extends Trees {
      * Returns {@code null} if no doc comment was found.
      * Future releases may support additional file types.
      *
+     * @implNote The default implementation of this method returns a
+     * new {@code DocCommentTree} instance for each invocation.
+     *
      * @param fileObject the content container
      * @return the doc comment tree
      * @since 9
@@ -123,6 +136,9 @@ public abstract class DocTrees extends Trees {
      * Returns {@code null} if no doc comment was found.
      * Future releases may support additional file types.
      *
+     * @implNote The default implementation of this method returns a
+     * new {@code DocCommentTree} instance for each invocation.
+     *
      * @param e an element whose path is used as a reference
      * @param relativePath the relative path from the Element
      * @return the doc comment tree
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTrees.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTrees.java
index 75926c1b0d0cd2119b10d1e59a250d1bb584e142..5fac3447139a4c1f57806472f6e2fed47daf0a97 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTrees.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTrees.java
@@ -507,10 +507,16 @@ public class JavacTrees extends DocTrees {
             }
 
             ClassSymbol sym = (ClassSymbol) types.skipTypeVars(tsym.type, false).tsym;
-
             Symbol msym = (memberName == sym.name)
-                    ? findConstructor(sym, paramTypes)
-                    : findMethod(sym, memberName, paramTypes);
+                    ? findConstructor(sym, paramTypes, true)
+                    : findMethod(sym, memberName, paramTypes, true);
+
+            if (msym == null) {
+                msym = (memberName == sym.name)
+                        ? findConstructor(sym, paramTypes, false)
+                        : findMethod(sym, memberName, paramTypes, false);
+            }
+
             if (paramTypes != null) {
                 // explicit (possibly empty) arg list given, so cannot be a field
                 return msym;
@@ -608,10 +614,10 @@ public class JavacTrees extends DocTrees {
         return null;
     }
 
-    MethodSymbol findConstructor(ClassSymbol tsym, List paramTypes) {
+    MethodSymbol findConstructor(ClassSymbol tsym, List paramTypes, boolean strict) {
         for (Symbol sym : tsym.members().getSymbolsByName(names.init)) {
             if (sym.kind == MTH) {
-                if (hasParameterTypes((MethodSymbol) sym, paramTypes)) {
+                if (hasParameterTypes((MethodSymbol) sym, paramTypes, strict)) {
                     return (MethodSymbol) sym;
                 }
             }
@@ -619,12 +625,13 @@ public class JavacTrees extends DocTrees {
         return null;
     }
 
-    private MethodSymbol findMethod(ClassSymbol tsym, Name methodName, List paramTypes) {
-        return searchMethod(tsym, methodName, paramTypes, new HashSet<>());
+    private MethodSymbol findMethod(ClassSymbol tsym, Name methodName, List paramTypes, boolean strict) {
+        return searchMethod(tsym, methodName, paramTypes, strict, new HashSet<>());
     }
 
     private MethodSymbol searchMethod(ClassSymbol tsym, Name methodName,
-                                       List paramTypes, Set searched) {
+                                       List paramTypes, boolean strict,
+                                       Set searched) {
         //### Note that this search is not necessarily what the compiler would do!
 
         // do not match constructors
@@ -662,7 +669,7 @@ public class JavacTrees extends DocTrees {
             for (Symbol sym : tsym.members().getSymbolsByName(methodName)) {
                 if (sym != null &&
                     sym.kind == MTH) {
-                    if (hasParameterTypes((MethodSymbol) sym, paramTypes)) {
+                    if (hasParameterTypes((MethodSymbol) sym, paramTypes, strict)) {
                         return (MethodSymbol) sym;
                     }
                 }
@@ -675,7 +682,7 @@ public class JavacTrees extends DocTrees {
         // search superclass
         Type superclass = tsym.getSuperclass();
         if (superclass.tsym != null) {
-            MethodSymbol msym = searchMethod((ClassSymbol) superclass.tsym, methodName, paramTypes, searched);
+            MethodSymbol msym = searchMethod((ClassSymbol) superclass.tsym, methodName, paramTypes, strict, searched);
             if (msym != null) {
                 return msym;
             }
@@ -686,7 +693,7 @@ public class JavacTrees extends DocTrees {
         for (List l = intfs; l.nonEmpty(); l = l.tail) {
             Type intf = l.head;
             if (intf.isErroneous()) continue;
-            MethodSymbol msym = searchMethod((ClassSymbol) intf.tsym, methodName, paramTypes, searched);
+            MethodSymbol msym = searchMethod((ClassSymbol) intf.tsym, methodName, paramTypes, strict, searched);
             if (msym != null) {
                 return msym;
             }
@@ -695,7 +702,7 @@ public class JavacTrees extends DocTrees {
         // search enclosing class
         ClassSymbol encl = tsym.owner.enclClass();
         if (encl != null) {
-            MethodSymbol msym = searchMethod(encl, methodName, paramTypes, searched);
+            MethodSymbol msym = searchMethod(encl, methodName, paramTypes, strict, searched);
             if (msym != null) {
                 return msym;
             }
@@ -704,7 +711,7 @@ public class JavacTrees extends DocTrees {
         return null;
     }
 
-    private boolean hasParameterTypes(MethodSymbol method, List paramTypes) {
+    private boolean hasParameterTypes(MethodSymbol method, List paramTypes, boolean strict) {
         if (paramTypes == null)
             return true;
 
@@ -712,7 +719,7 @@ public class JavacTrees extends DocTrees {
             return false;
 
         List methodParamTypes = method.asType().getParameterTypes();
-        if (!Type.isErroneous(paramTypes) && types.isSubtypes(paramTypes, methodParamTypes)) {
+        if (!strict && !Type.isErroneous(paramTypes) && types.isSubtypes(paramTypes, methodParamTypes)) {
             return true;
         }
 
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/ClassFinder.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/ClassFinder.java
index fa67ff3a7cabe09943766f250dfcbf73f5c6efaf..ab7582e7cedf34c878906a295b93fe8bcaea9535 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/ClassFinder.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/ClassFinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2022, 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
@@ -292,10 +292,16 @@ public class ClassFinder {
                 ClassSymbol c = (ClassSymbol) sym;
                 dependencies.push(c, CompletionCause.CLASS_READER);
                 annotate.blockAnnotations();
-                c.members_field = new Scope.ErrorScope(c); // make sure it's always defined
+                Scope.ErrorScope members = new Scope.ErrorScope(c);
+                c.members_field = members; // make sure it's always defined
                 completeOwners(c.owner);
                 completeEnclosing(c);
-                fillIn(c);
+                //if an enclosing class is completed from the source,
+                //this class might have been completed already as well,
+                //avoid attempts to re-complete it:
+                if (c.members_field == members) {
+                    fillIn(c);
+                }
             } finally {
                 annotate.unblockAnnotationsNoFlush();
                 dependencies.pop();
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/ArgumentAttr.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/ArgumentAttr.java
index fe0f14323051728c98c386b6ba25e24c6099d0c6..99d0cae240eeccaff1c8f531532602b795818e0d 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/ArgumentAttr.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/ArgumentAttr.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022, 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
@@ -143,7 +143,7 @@ public class ArgumentAttr extends JCTree.Visitor {
 
     /**
      * Checks a type in the speculative tree against a given result; the type can be either a plain
-     * type or an argument type,in which case a more complex check is required.
+     * type or an argument type, in which case a more complex check is required.
      */
     Type checkSpeculative(JCTree expr, ResultInfo resultInfo) {
         return checkSpeculative(expr, expr.type, resultInfo);
@@ -151,7 +151,7 @@ public class ArgumentAttr extends JCTree.Visitor {
 
     /**
      * Checks a type in the speculative tree against a given result; the type can be either a plain
-     * type or an argument type,in which case a more complex check is required.
+     * type or an argument type, in which case a more complex check is required.
      */
     Type checkSpeculative(DiagnosticPosition pos, Type t, ResultInfo resultInfo) {
         if (t.hasTag(DEFERRED)) {
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
index 7bd813cddb73abb43d14c71051acfdaca111cb56..230539f6e0e8adb7ffc6d93de105a753233c9ae1 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
@@ -50,9 +50,11 @@ import com.sun.tools.javac.comp.Check.CheckContext;
 import com.sun.tools.javac.comp.DeferredAttr.AttrMode;
 import com.sun.tools.javac.comp.MatchBindingsComputer.MatchBindings;
 import com.sun.tools.javac.jvm.*;
+
 import static com.sun.tools.javac.resources.CompilerProperties.Fragments.Diamond;
 import static com.sun.tools.javac.resources.CompilerProperties.Fragments.DiamondInvalidArg;
 import static com.sun.tools.javac.resources.CompilerProperties.Fragments.DiamondInvalidArgs;
+
 import com.sun.tools.javac.resources.CompilerProperties.Errors;
 import com.sun.tools.javac.resources.CompilerProperties.Fragments;
 import com.sun.tools.javac.resources.CompilerProperties.Warnings;
@@ -2909,11 +2911,18 @@ public class Attr extends JCTree.Visitor {
             //       ...
             //     }
             InferenceContext inferenceContext = resultInfo.checkContext.inferenceContext();
+            Type enclType = clazztype.getEnclosingType();
+            if (enclType != null &&
+                    enclType.hasTag(CLASS) &&
+                    !chk.checkDenotable((ClassType)enclType)) {
+                log.error(tree.encl, Errors.EnclosingClassTypeNonDenotable(enclType));
+            }
             final boolean isDiamond = TreeInfo.isDiamond(tree);
             if (isDiamond
                     && ((tree.constructorType != null && inferenceContext.free(tree.constructorType))
                     || (tree.clazz.type != null && inferenceContext.free(tree.clazz.type)))) {
                 final ResultInfo resultInfoForClassDefinition = this.resultInfo;
+                Env dupLocalEnv = localEnv.dup(localEnv.tree, localEnv.info.dup(localEnv.info.scope.dupUnshared()));
                 inferenceContext.addFreeTypeListener(List.of(tree.constructorType, tree.clazz.type),
                         instantiatedContext -> {
                             tree.constructorType = instantiatedContext.asInstType(tree.constructorType);
@@ -2922,7 +2931,7 @@ public class Attr extends JCTree.Visitor {
                             try {
                                 this.resultInfo = resultInfoForClassDefinition;
                                 visitAnonymousClassDefinition(tree, clazz, clazz.type, cdef,
-                                                            localEnv, argtypes, typeargtypes, pkind);
+                                        dupLocalEnv, argtypes, typeargtypes, pkind);
                             } finally {
                                 this.resultInfo = prevResult;
                             }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransPatterns.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransPatterns.java
index 56fdc73e02e6da351dc1019a00b2f4c2cce06328..48a575658b3a0ca8fa497b0ee7154446f42ef6c1 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransPatterns.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransPatterns.java
@@ -665,11 +665,14 @@ public class TransPatterns extends TreeTranslator {
     @Override
     public void visitClassDef(JCClassDecl tree) {
         ClassSymbol prevCurrentClass = currentClass;
+        MethodSymbol prevMethodSym = currentMethodSym;
         try {
             currentClass = tree.sym;
+            currentMethodSym = null;
             super.visitClassDef(tree);
         } finally {
             currentClass = prevCurrentClass;
+            currentMethodSym = prevMethodSym;
         }
     }
 
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java
index 3a763cbe0343617aaef9b30968db4161680c8b0c..c5df4f9ff3c0c95ae3d4d4ccc29c650e0f1d9152 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java
@@ -109,7 +109,6 @@ public class TypeEnter implements Completer {
     private final Annotate annotate;
     private final TypeAnnotations typeAnnotations;
     private final Types types;
-    private final JCDiagnostic.Factory diags;
     private final DeferredLintHandler deferredLintHandler;
     private final Lint lint;
     private final TypeEnvs typeEnvs;
@@ -137,7 +136,6 @@ public class TypeEnter implements Completer {
         annotate = Annotate.instance(context);
         typeAnnotations = TypeAnnotations.instance(context);
         types = Types.instance(context);
-        diags = JCDiagnostic.Factory.instance(context);
         deferredLintHandler = DeferredLintHandler.instance(context);
         lint = Lint.instance(context);
         typeEnvs = TypeEnvs.instance(context);
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Items.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Items.java
index 170cac2a111c89532f31bb83d53b1e1e1ec1b91d..c15287ad45e0e5e86ce3f317a516d16073452edf 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Items.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Items.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2022, 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
@@ -669,7 +669,7 @@ public class Items {
             } else {
                 switch (targetcode) {
                 case INTcode:
-                    if (Code.truncate(typecode) == INTcode)
+                    if (Code.truncate(typecode) == INTcode && typecode != CHARcode)
                         return this;
                     else
                         return new ImmediateItem(
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/StringConcat.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/StringConcat.java
index 0dddb3e5868e4f776a9b17e165c3ba5483476420..edb41fc2faf53a6de59af2675322f3cce6c3acc0 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/StringConcat.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/StringConcat.java
@@ -142,25 +142,6 @@ public abstract class StringConcat {
         return res.append(tree);
     }
 
-    /**
-     * If the type is not accessible from current context, try to figure out the
-     * sharpest accessible supertype.
-     *
-     * @param originalType type to sharpen
-     * @return sharped type
-     */
-    Type sharpestAccessible(Type originalType) {
-        if (originalType.hasTag(ARRAY)) {
-            return types.makeArrayType(sharpestAccessible(types.elemtype(originalType)));
-        }
-
-        Type type = originalType;
-        while (!rs.isAccessible(gen.getAttrEnv(), type.asElement())) {
-            type = types.supertype(type);
-        }
-        return type;
-    }
-
     /**
      * "Legacy" bytecode flavor: emit the StringBuilder.append chains for string
      * concatenation.
@@ -305,6 +286,14 @@ public abstract class StringConcat {
 
             return splits.toList();
         }
+
+        /**
+         * Returns true if the argument should be converted to a string eagerly, to preserve
+         * possible side-effects.
+         */
+        protected boolean shouldConvertToStringEagerly(Type argType) {
+            return !types.unboxedTypeOrType(argType).isPrimitive() && argType.tsym != syms.stringType.tsym;
+        }
     }
 
     /**
@@ -333,14 +322,18 @@ public abstract class StringConcat {
                 for (JCTree arg : t) {
                     Object constVal = arg.type.constValue();
                     if ("".equals(constVal)) continue;
-                    if (arg.type == syms.botType) {
-                        dynamicArgs.add(types.boxedClass(syms.voidType).type);
-                    } else {
-                        dynamicArgs.add(sharpestAccessible(arg.type));
+                    Type argType = arg.type;
+                    if (argType == syms.botType) {
+                        argType = types.boxedClass(syms.voidType).type;
                     }
                     if (!first || generateFirstArg) {
                         gen.genExpr(arg, arg.type).load();
                     }
+                    if (shouldConvertToStringEagerly(argType)) {
+                        gen.callMethod(pos, syms.stringType, names.valueOf, List.of(syms.objectType), true);
+                        argType = syms.stringType;
+                    }
+                    dynamicArgs.add(argType);
                     first = false;
                 }
                 doCall(type, pos, dynamicArgs.toList());
@@ -439,10 +432,15 @@ public abstract class StringConcat {
                     } else {
                         // Ordinary arguments come through the dynamic arguments.
                         recipe.append(TAG_ARG);
-                        dynamicArgs.add(sharpestAccessible(arg.type));
+                        Type argType = arg.type;
                         if (!first || generateFirstArg) {
                             gen.genExpr(arg, arg.type).load();
                         }
+                        if (shouldConvertToStringEagerly(argType)) {
+                            gen.callMethod(pos, syms.stringType, names.valueOf, List.of(syms.objectType), true);
+                            argType = syms.stringType;
+                        }
+                        dynamicArgs.add(argType);
                         first = false;
                     }
                 }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
index 4b508c4bdf093dab35f0c38e866bf9f76b0569c3..b14673532bf142918b63fa4a628be46719918cbf 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
@@ -2035,7 +2035,7 @@ public class JavacParser implements Parser {
                     args.append(parseExpression());
                 }
             }
-            accept(RPAREN);
+            accept(RPAREN, tk -> Errors.Expected2(RPAREN, COMMA));
         } else {
             syntaxError(token.pos, Errors.Expected(LPAREN));
         }
@@ -2123,7 +2123,7 @@ public class JavacParser implements Parser {
                     nextToken();
                     break;
                 default:
-                    args.append(syntaxError(token.pos, Errors.Expected(GT)));
+                    args.append(syntaxError(token.pos, Errors.Expected2(GT, COMMA)));
                     break;
                 }
                 return args.toList();
@@ -3379,7 +3379,7 @@ public class JavacParser implements Parser {
                     buf.append(annotationValue());
                 }
             }
-            accept(RBRACE);
+            accept(RBRACE, tk -> Errors.AnnotationMissingElementValue);
             return toP(F.at(pos).NewArray(null, List.nil(), buf.toList()));
         default:
             selectExprMode();
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
index 3fd713fabfcb1176800727029f0ccc96670623d5..fddd3e935e1d24ca0fe321be4827dc47eb1040cd 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
@@ -118,6 +118,9 @@ compiler.err.already.defined.static.single.import=\
 compiler.err.already.defined.this.unit=\
     {0} is already defined in this compilation unit
 
+compiler.err.annotation.missing.element.value=\
+    annotation is missing element value
+
 # 0: type, 1: list of name
 compiler.err.annotation.missing.default.value=\
     annotation @{0} is missing a default value for the element ''{1}''
@@ -3912,3 +3915,8 @@ compiler.warn.declared.using.preview=\
 
 compiler.warn.attempt.to.synchronize.on.instance.of.value.based.class=\
     attempt to synchronize on an instance of a value-based class
+
+# 0: type
+compiler.err.enclosing.class.type.non.denotable=\
+    enclosing class type: {0}\n\
+    is non-denotable, try casting to a denotable type
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Package.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Package.java
index 8a9f1cbb30163406df360d2436edc1f322f78b05..f10d1b4fa69b05ee5d18a2f207ee2da972e650ba 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Package.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Package.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2022, 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,7 +44,7 @@ import com.sun.tools.sjavac.pubapi.PubApi;
 
 /**
  * The Package class maintains meta information about a package.
- * For example its sources, dependents,its pubapi and its artifacts.
+ * For example its sources, dependents, its pubapi and its artifacts.
  *
  * It might look odd that we track dependents/pubapi/artifacts on
  * a package level, but it makes sense since recompiling a full package
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Transformer.java b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Transformer.java
index c9e2c62865cbb6e8711b2aee7488f88767e7a8d3..4f2ea5d0c7ea9fe983274cbe8cf3cb000b671869 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Transformer.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/sjavac/Transformer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2022, 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
@@ -38,7 +38,7 @@ import com.sun.tools.sjavac.pubapi.PubApi;
  * The transform interface is used to transform content inside a package, from one form to another.
  * Usually the output form is an unpredictable number of output files. (eg class files)
  * but can also be an unpredictable number of generated source files (eg idl2java)
- * or a single predictable output file (eg when copying,cleaning or compiling a properties file).
+ * or a single predictable output file (eg when copying, cleaning or compiling a properties file).
  *
  *  
    This is NOT part of any supported API.
  *  If you write code that depends on this, you do so at your own risk.
diff --git a/src/jdk.crypto.ec/share/classes/sun/security/ec/ECDHKeyAgreement.java b/src/jdk.crypto.ec/share/classes/sun/security/ec/ECDHKeyAgreement.java
index 8f69da0ac7ad64f7d892ed16e5b9977154189743..79eb9a1f7744f822446ef0260f2500cc0cb6023f 100644
--- a/src/jdk.crypto.ec/share/classes/sun/security/ec/ECDHKeyAgreement.java
+++ b/src/jdk.crypto.ec/share/classes/sun/security/ec/ECDHKeyAgreement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2022, 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
@@ -197,7 +197,7 @@ public final class ECDHKeyAgreement extends KeyAgreementSpi {
         EllipticCurve curve = spec.getCurve();
         BigInteger rhs = x.modPow(BigInteger.valueOf(3), p).add(curve.getA()
             .multiply(x)).add(curve.getB()).mod(p);
-        BigInteger lhs = y.modPow(BigInteger.valueOf(2), p).mod(p);
+        BigInteger lhs = y.modPow(BigInteger.TWO, p);
         if (!rhs.equals(lhs)) {
             throw new InvalidKeyException("Point is not on curve");
         }
diff --git a/src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java b/src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java
index 8c9e4f9dbe625e2795a443fb704811417ce4c3e3..200ed63634f601e40a8baa7334170f52eeb7e6f7 100644
--- a/src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java
+++ b/src/jdk.crypto.ec/share/classes/sun/security/ec/SunEC.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2022, 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
@@ -208,9 +208,8 @@ public final class SunEC extends Provider {
         /*
          *  Key Factory engine
          */
-        putService(new ProviderService(this, "KeyFactory",
-            "EC", "sun.security.ec.ECKeyFactory",
-            List.of("EllipticCurve"), ATTRS));
+        putService(new ProviderServiceA(this, "KeyFactory",
+            "EC", "sun.security.ec.ECKeyFactory", ATTRS));
 
         /*
          * Algorithm Parameter engine
@@ -319,9 +318,8 @@ public final class SunEC extends Provider {
         /*
          *  Key Pair Generator engine
          */
-        putService(new ProviderService(this, "KeyPairGenerator",
-            "EC", "sun.security.ec.ECKeyPairGenerator",
-            List.of("EllipticCurve"), ATTRS));
+        putService(new ProviderServiceA(this, "KeyPairGenerator",
+            "EC", "sun.security.ec.ECKeyPairGenerator", ATTRS));
 
         /*
          * Key Agreement engine
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/CommandProcessor.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/CommandProcessor.java
index 085bc3d87999772009614a0e147fea1027d23b03..7693a1493a0da9ec4980e260e8cdc7a50692ac5c 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/CommandProcessor.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/CommandProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2022, 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
@@ -1671,19 +1671,54 @@ public class CommandProcessor {
                 }
             }
         },
+        new Command("threadcontext", "threadcontext [-v] { -a | id }", false) {
+            public void doit(Tokens t) {
+                boolean verbose = false;
+                if (t.countTokens() == 2) {
+                    if (t.nextToken().equals("-v")) {
+                        verbose = true;
+                    } else {
+                        usage();
+                        return;
+                    }
+                }
+                if (t.countTokens() != 1) {
+                    usage();
+                    return;
+                }
+                String id = t.nextToken();
+                Threads threads = VM.getVM().getThreads();
+                boolean all = id.equals("-a");
+                for (int i = 0; i < threads.getNumberOfThreads(); i++) {
+                    JavaThread thread = threads.getJavaThreadAt(i);
+                    ByteArrayOutputStream bos = new ByteArrayOutputStream();
+                    thread.printThreadIDOn(new PrintStream(bos));
+                    if (all || bos.toString().equals(id)) {
+                        out.format("Thread \"%s\" id=%s Address=%s\n",
+                                   thread.getThreadName(), bos.toString(), thread.getAddress());
+                        thread.printThreadContextOn(out, verbose);
+                        out.println(" ");
+                        if (!all) return;
+                    }
+                }
+                if (!all) {
+                    out.println("Couldn't find thread " + id);
+                }
+            }
+        },
         new Command("thread", "thread { -a | id }", false) {
             public void doit(Tokens t) {
                 if (t.countTokens() != 1) {
                     usage();
                 } else {
-                    String name = t.nextToken();
+                    String id = t.nextToken();
                     Threads threads = VM.getVM().getThreads();
-                    boolean all = name.equals("-a");
+                    boolean all = id.equals("-a");
                     for (int i = 0; i < threads.getNumberOfThreads(); i++) {
                         JavaThread thread = threads.getJavaThreadAt(i);
                         ByteArrayOutputStream bos = new ByteArrayOutputStream();
                         thread.printThreadIDOn(new PrintStream(bos));
-                        if (all || bos.toString().equals(name)) {
+                        if (all || bos.toString().equals(id)) {
                             out.println("Thread " + bos.toString() + " Address " + thread.getAddress());
                             thread.printInfoOn(out);
                             out.println(" ");
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HSDB.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HSDB.java
index c530cb67b3593b6e26aa613a9d3bfda4a09282c0..4baa00fc000cee9da44e532a4923610aade1c389 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HSDB.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HSDB.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2022, 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
@@ -337,6 +337,15 @@ public class HSDB implements ObjectHistogramPanel.Listener, SAListener {
     item.setMnemonic(KeyEvent.VK_M);
     toolsMenu.add(item);
 
+    item = createMenuItem("Annotated Memory Viewer",
+                          new ActionListener() {
+                             public void actionPerformed(ActionEvent e) {
+                                showAnnotatedMemoryViewer();
+                             }
+                          });
+    item.setMnemonic(KeyEvent.VK_W);
+    toolsMenu.add(item);
+
     item = createMenuItem("Monitor Cache Dump",
                           new ActionListener() {
                               public void actionPerformed(ActionEvent e) {
@@ -1611,7 +1620,11 @@ public class HSDB implements ObjectHistogramPanel.Listener, SAListener {
   }
 
   public void showMemoryViewer() {
-    showPanel("Memory Viewer", new MemoryViewer(agent.getDebugger(), agent.getTypeDataBase().getAddressSize() == 8));
+    showPanel("Memory Viewer", new MemoryViewer(agent.getDebugger(), false, agent.getTypeDataBase().getAddressSize() == 8));
+  }
+
+  public void showAnnotatedMemoryViewer() {
+    showPanel("Annotated Memory Viewer", new MemoryViewer(agent.getDebugger(), true, agent.getTypeDataBase().getAddressSize() == 8));
   }
 
   public void showCommandLineFlags() {
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HotSpotAgent.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HotSpotAgent.java
index aa021510567ef5a160a11d07b7e7b2239a4218d7..04db854c84d03f2e064e3ee8305a437e19856478 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HotSpotAgent.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/HotSpotAgent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2021, Azul Systems, Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -390,17 +390,6 @@ public class HotSpotAgent {
             // Remote mode (client attaching to server)
             //
 
-            // Create and install a security manager
-
-            // FIXME: currently commented out because we were having
-            // security problems since we're "in the sun.* hierarchy" here.
-            // Perhaps a permissive policy file would work around this. In
-            // the long run, will probably have to move into com.sun.*.
-
-            //    if (System.getSecurityManager() == null) {
-            //      System.setSecurityManager(new RMISecurityManager());
-            //    }
-
             connectRemoteDebugger();
         }
     }
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JavaThread.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JavaThread.java
index e11e336d436a9ebad4c0e0daf37551a4ca1ffa4c..00adf9c285b6e31eb328ea13ba2bb26f92646180 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JavaThread.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JavaThread.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2022, 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
@@ -481,6 +481,25 @@ public class JavaThread extends Thread {
     return access.getLastSP(addr);
   }
 
+  // Print the contents of all registers in the thread's context
+  public void printThreadContextOn(PrintStream out, boolean verbose){
+    ThreadContext tc = getThreadProxy().getContext();
+    for (int r = 0; r < tc.getNumRegisters(); r++) {
+      Address regAddr = tc.getRegisterAsAddress(r);
+      System.out.format("%s: %s", tc.getRegisterName(r), regAddr);
+      if (regAddr == null) {
+        System.out.println();
+      } else {
+        PointerLocation l = PointerFinder.find(regAddr);
+        if (l.isUnknown()) {
+          System.out.println();
+        } else {
+          System.out.print(": ");
+          l.printOn(System.out, false, verbose);
+        }
+      }
+    }
+  }
 
   public void printThreadInfoOn(PrintStream out){
     Oop threadOop = this.getThreadObj();
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/MemoryPanel.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/MemoryPanel.java
index 20408f4add455d9866aee246d622fcde9920f599..76522a6676c19f63bf3107d38c94eced6fb085ad 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/MemoryPanel.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/MemoryPanel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2022, 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,7 +27,9 @@ package sun.jvm.hotspot.ui;
 import java.awt.*;
 import java.awt.datatransfer.*;
 import java.awt.event.*;
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.PrintStream;
 import java.math.*;
 import java.util.*;
 import javax.swing.*;
@@ -35,9 +37,12 @@ import javax.swing.event.*;
 import javax.swing.table.*;
 import sun.jvm.hotspot.debugger.*;
 import sun.jvm.hotspot.ui.*;
+import sun.jvm.hotspot.utilities.PointerFinder;
+import sun.jvm.hotspot.utilities.PointerLocation;
 
 public class MemoryPanel extends JPanel {
   private boolean is64Bit;
+  private boolean isAnnotated;
   private Debugger debugger;
   private int addressSize;
   private String unmappedAddrString;
@@ -78,10 +83,11 @@ public class MemoryPanel extends JPanel {
     }
   }
 
-  public MemoryPanel(final Debugger debugger, boolean is64Bit) {
+  public MemoryPanel(final Debugger debugger, boolean isAnnotated, boolean is64Bit) {
     super();
     this.debugger = debugger;
     this.is64Bit = is64Bit;
+    this.isAnnotated = isAnnotated;
     if (is64Bit) {
       addressSize = 8;
       unmappedAddrString = "??????????????????";
@@ -98,23 +104,58 @@ public class MemoryPanel extends JPanel {
           return numVisibleRows;
         }
         public int getColumnCount() {
-          return 2;
+          return isAnnotated ? 1 : 2;
         }
         public Object getValueAt(int row, int column) {
-          switch (column) {
-          case 0:  return bigIntToHexString(startVal.add(new BigInteger(Integer.toString((row * addressSize)))));
-          case 1: {
-            try {
-              Address addr = bigIntToAddress(startVal.add(new BigInteger(Integer.toString((row * addressSize)))));
+          // When not annotated, we just display the address followed by its contents in two
+          // separate columns. When annotated the format is just one column which contains:
+          //   
    :  
+          // For example:
+          //   0x00007f7eb010c330: 0x00007f7eb6c9dfb0 vtable for os::PlatformMonitor + 0x10
+          if (!isAnnotated) {
+            switch (column) {
+            case 0:  return bigIntToHexString(startVal.add(new BigInteger(Integer.toString((row * addressSize)))));
+            case 1: {
+              try {
+                Address addr = bigIntToAddress(startVal.add(new BigInteger(Integer.toString((row * addressSize)))));
+                if (addr != null) {
+                  return addressToString(addr.getAddressAt(0));
+                }
+                return unmappedAddrString;
+              } catch (UnmappedAddressException e) {
+                return unmappedAddrString;
+              }
+            }
+            default: throw new RuntimeException("Column " + column + " out of bounds");
+            }
+          } else {
+            switch (column) {
+            case 0: {
+              BigInteger bigaddr = startVal.add(new BigInteger(Integer.toString((row * addressSize))));
+              Address addr = bigIntToAddress(bigaddr);
+
+              String col1 = bigIntToHexString(bigaddr);
+              String col2 = unmappedAddrString;
+              String col3 = "";
+
               if (addr != null) {
-                return addressToString(addr.getAddressAt(0));
+                try {
+                  col2 = addressToString(addr.getAddressAt(0));
+                  PointerLocation loc = PointerFinder.find(addr.getAddressAt(0));
+                  if (!loc.isUnknown()) {
+                    ByteArrayOutputStream bos = new ByteArrayOutputStream();
+                    PrintStream tty = new PrintStream(bos);
+                    loc.printOn(tty, false, false);
+                    col3 = bos.toString();
+                  }
+                } catch (UnmappedAddressException e) {
+                }
               }
-              return unmappedAddrString;
-            } catch (UnmappedAddressException e) {
-              return unmappedAddrString;
+
+              return col1 + ": " + col2 + " " + col3;
+            }
+            default: throw new RuntimeException("Column " + column + " out of bounds");
             }
-          }
-          default: throw new RuntimeException("Column " + column + " out of bounds");
           }
         }
         public boolean isCellEditable(int row, int col) {
@@ -198,6 +239,15 @@ public class MemoryPanel extends JPanel {
         private void handleImport(JComponent c, String str) {
           // do whatever you want with the string here
           try {
+            // If someone drag-n-dropped a selection from the Annotated Memory Viewer,
+            // window, it will look like this:
+            //   0x00007f7eb010c330: 0x00007f7eb6c9dfb0 vtable for os::PlatformMonitor + 0x10
+            // We need to grab the second address.
+            int secondAddrStartIndex = str.indexOf("0x", 2);
+            if (secondAddrStartIndex != -1) {
+              str = str.substring(secondAddrStartIndex);
+              str = str.split("\\s")[0];
+            }
             makeVisible(debugger.parseAddress(str));
             clearSelection();
             table.clearSelection();
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/MemoryViewer.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/MemoryViewer.java
index f6193a37f1606b9f8928cf50f57f8bd859cb78c8..e475292c29c5b3a22e6fb1e591edba5ea992391c 100644
--- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/MemoryViewer.java
+++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/MemoryViewer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, 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
@@ -33,9 +33,9 @@ import sun.jvm.hotspot.debugger.*;
     address. */
 
 public class MemoryViewer extends JPanel {
-  public MemoryViewer(final Debugger debugger, boolean is64Bit) {
+  public MemoryViewer(final Debugger debugger, boolean isAnnotated, boolean is64Bit) {
     super();
-    final MemoryPanel memory = new MemoryPanel(debugger, is64Bit);
+    final MemoryPanel memory = new MemoryPanel(debugger, isAnnotated, is64Bit);
     memory.setBorder(GraphicsUtilities.newBorder(5));
     JPanel addressPanel = new JPanel();
     addressPanel.setLayout(new BoxLayout(addressPanel, BoxLayout.X_AXIS));
diff --git a/src/jdk.httpserver/share/classes/com/sun/net/httpserver/SimpleFileServer.java b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/SimpleFileServer.java
index a08f48567c9420f47e8a80c528661e22ce15fbbc..2952a40b142700a3d03b2a6aa02d0c99ec225f91 100644
--- a/src/jdk.httpserver/share/classes/com/sun/net/httpserver/SimpleFileServer.java
+++ b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/SimpleFileServer.java
@@ -1,10 +1,12 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022, 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.
+ * 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
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/FixedLengthInputStream.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/FixedLengthInputStream.java
index c875a1ab9b497b58730e741e21adf22f33315ec3..ac6fb7be00542f6c9086e4c95613a86fe1cfae82 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/FixedLengthInputStream.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/FixedLengthInputStream.java
@@ -41,6 +41,9 @@ class FixedLengthInputStream extends LeftOverInputStream {
 
     FixedLengthInputStream (ExchangeImpl t, InputStream src, long len) {
         super (t, src);
+        if (len < 0) {
+            throw new IllegalArgumentException("Content-Length: " + len);
+        }
         this.remaining = len;
     }
 
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/FixedLengthOutputStream.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/FixedLengthOutputStream.java
index 8b431645ceb1c1c3740da5986b78bdada049bcd2..4935214c2e15246294d90351bb9834f94ad2fd70 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/FixedLengthOutputStream.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/FixedLengthOutputStream.java
@@ -47,6 +47,9 @@ class FixedLengthOutputStream extends FilterOutputStream
 
     FixedLengthOutputStream (ExchangeImpl t, OutputStream src, long len) {
         super (src);
+        if (len < 0) {
+            throw new IllegalArgumentException("Content-Length: " + len);
+        }
         this.t = t;
         this.remaining = len;
     }
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/Request.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/Request.java
index 265b5c82718a6ca93a9202a6a366566e441cf05a..92b2f709c3476031622f77bb521a726a2e72913f 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/Request.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/Request.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2021, 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
@@ -208,7 +208,9 @@ class Request {
                         "sun.net.httpserver.maxReqHeaders) exceeded, " +
                         ServerConfig.getMaxReqHeaders() + ".");
             }
-
+            if (k == null) {  // Headers disallows null keys, use empty string
+                k = "";       // instead to represent invalid key
+            }
             hdrs.add (k,v);
             len = 0;
         }
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/ServerImpl.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/ServerImpl.java
index ec6b99ab8bea06ee6f5b253167f8abdfd622989d..c2ed3e0e9c6cb9a5ff98ec0b74b7bd25c41d65ef 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/ServerImpl.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/ServerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2022, 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
@@ -521,6 +521,18 @@ class ServerImpl implements TimeSource {
         public void run () {
             /* context will be null for new connections */
             logger.log(Level.TRACE, "exchange started");
+
+            if (dispatcherThread == Thread.currentThread()) {
+                try {
+                    // call selector to process cancelled keys
+                    selector.selectNow();
+                } catch (IOException ioe) {
+                    logger.log(Level.DEBUG, "processing of cancelled keys failed: closing");
+                    closeConnection(connection);
+                    return;
+                }
+            }
+
             context = connection.getHttpContext();
             boolean newconnection;
             SSLEngine engine = null;
@@ -618,6 +630,11 @@ class ServerImpl implements TimeSource {
                     headerValue = headers.getFirst("Content-Length");
                     if (headerValue != null) {
                         clen = Long.parseLong(headerValue);
+                        if (clen < 0) {
+                            reject(Code.HTTP_BAD_REQUEST, requestLine,
+                                    "Illegal Content-Length value");
+                            return;
+                        }
                     }
                     if (clen == 0) {
                         requestCompleted(connection);
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/FileServerHandler.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/FileServerHandler.java
index b1b28446b4d3931ef2c07216ec1ae63d22662e05..e0e9736cad47ef226b666c75410f7f03d2f7125d 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/FileServerHandler.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/FileServerHandler.java
@@ -1,10 +1,12 @@
 /*
- * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2022, 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.
+ * 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
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/JWebServer.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/JWebServer.java
index 59f77abbae8b2f4552ce242c5f7a09292ef2733c..015d1b95244b4deaead56263450f77208c84809c 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/JWebServer.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/JWebServer.java
@@ -1,10 +1,12 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022, 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.
+ * 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
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/Main.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/Main.java
index 83441cdbc7f1d7c324a1e6407d6b38378c88ee26..30535c9296d8d6299ebc840a4b99a73c0d7c4a12 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/Main.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/Main.java
@@ -1,10 +1,12 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022, 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.
+ * 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
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/OutputFilter.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/OutputFilter.java
index bdbcf2361eea6668528b191ec42919e9a85e20a7..0a4d901303e561a15ffecce60bed5290a4a68692 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/OutputFilter.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/OutputFilter.java
@@ -1,10 +1,12 @@
 /*
- * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2022, 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.
+ * 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
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/ResourceBundleHelper.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/ResourceBundleHelper.java
index 99349fe34748f0d6b4a8c35eb4c4350b375b6566..690722bddb9403047c85e91ee32fa4f425e18b1a 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/ResourceBundleHelper.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/ResourceBundleHelper.java
@@ -1,10 +1,12 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022, 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.
+ * 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
diff --git a/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/SimpleFileServerImpl.java b/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/SimpleFileServerImpl.java
index 852aae5a83832e3bcb12cf780bb1952c875ff5da..7e97d203b6c4ef7254f58e036587fa8b48a6640a 100644
--- a/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/SimpleFileServerImpl.java
+++ b/src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/SimpleFileServerImpl.java
@@ -1,10 +1,12 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022, 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.
+ * 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
diff --git a/src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/Addressable.java b/src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/Addressable.java
index 39f61e76122446b4b333b332e9176eba7dbcd035..17d417bee519e73a369e35aa60ce5aa923054fdd 100644
--- a/src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/Addressable.java
+++ b/src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/Addressable.java
@@ -40,8 +40,7 @@ package jdk.incubator.foreign;
 public sealed interface Addressable permits MemorySegment, MemoryAddress, NativeSymbol, VaList {
 
     /**
-     * Returns the memory address associated with this addressable.
-     * @return The memory address associated with this addressable.
+     * {@return the {@linkplain MemoryAddress memory address} associated with this addressable}
      */
     MemoryAddress address();
 }
diff --git a/src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/FunctionDescriptor.java b/src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/FunctionDescriptor.java
index 9c557ec9e9e90c49d045e4922d907b64ed851c0d..6bedfc4c16aaa1aef7ad209400cedaac047536b6 100644
--- a/src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/FunctionDescriptor.java
+++ b/src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/FunctionDescriptor.java
@@ -54,16 +54,14 @@ public sealed class FunctionDescriptor implements Constable permits FunctionDesc
     }
 
     /**
-     * Returns the return layout associated with this function.
-     * @return the return layout.
+     * {@return the return layout (if any) associated with this function descriptor}
      */
     public Optional returnLayout() {
         return Optional.ofNullable(resLayout);
     }
 
     /**
-     * Returns the argument layouts associated with this function.
-     * @return the argument layouts.
+     * {@return the argument layouts associated with this function descriptor}.
      */
     public List argumentLayouts() {
         return argLayouts;
@@ -166,8 +164,7 @@ public sealed class FunctionDescriptor implements Constable permits FunctionDesc
     }
 
     /**
-     * Returns a string representation of this function descriptor.
-     * @return a string representation of this function descriptor.
+     * {@return the string representation of this function descriptor}
      */
     @Override
     public String toString() {
@@ -201,8 +198,7 @@ public sealed class FunctionDescriptor implements Constable permits FunctionDesc
     }
 
     /**
-     * Returns the hash code value for this function descriptor.
-     * @return the hash code value for this function descriptor.
+     * {@return the hash code value for this function descriptor}
      */
     @Override
     public int hashCode() {
diff --git a/src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/GroupLayout.java b/src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/GroupLayout.java
index d08bb716ae893520e5ba7071c4ce0e9ed931f540..6fc9baad7fff7a9841673ed4949efe7d220ee99c 100644
--- a/src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/GroupLayout.java
+++ b/src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/GroupLayout.java
@@ -133,18 +133,14 @@ public final class GroupLayout extends AbstractLayout implements MemoryLayout {
     }
 
     /**
-     * Is this group layout a struct?
-     *
-     * @return true, if this group layout is a struct.
+     * {@return {@code true}, if this group layout is a struct}
      */
     public boolean isStruct() {
         return kind == Kind.STRUCT;
     }
 
     /**
-     * Is this group layout a union?
-     *
-     * @return true, if this group layout is a union.
+     * {@return {@code true}, if this group layout is a union}
      */
     public boolean isUnion() {
         return kind == Kind.UNION;
diff --git a/src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/MemoryAddress.java b/src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/MemoryAddress.java
index 7e94d63014cff23abf221847d9dcb9ea65a45096..007464d1691aacbf197f41e7eab9fb64c201da8b 100644
--- a/src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/MemoryAddress.java
+++ b/src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/MemoryAddress.java
@@ -78,8 +78,7 @@ import java.nio.ByteOrder;
 public sealed interface MemoryAddress extends Addressable permits MemoryAddressImpl {
 
     /**
-     * Returns the raw long value associated with this memory address.
-     * @return The raw long value associated with this memory address.
+     * {@return the raw long value associated with this memory address}
      */
     long toRawLongValue();
 
@@ -141,8 +140,7 @@ public sealed interface MemoryAddress extends Addressable permits MemoryAddressI
     boolean equals(Object that);
 
     /**
-     * Returns the hash code value for this address.
-     * @return the hash code value for this address.
+     * {@return the hash code value for this address}
      */
     @Override
     int hashCode();
@@ -174,6 +172,8 @@ public sealed interface MemoryAddress extends Addressable permits MemoryAddressI
      * @param layout the layout of the memory region to be read.
      * @param offset offset in bytes (relative to this address). The final address of this read operation can be expressed as {@code toRowLongValue() + offset}.
      * @return a byte value read from this address.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout.
      * @throws IllegalCallerException if access to this method occurs from a module {@code M} and the command line option
      * {@code --enable-native-access} is either absent, or does not mention the module name {@code M}, or
      * {@code ALL-UNNAMED} in case {@code M} is an unnamed module.
@@ -192,6 +192,8 @@ public sealed interface MemoryAddress extends Addressable permits MemoryAddressI
      * @param layout the layout of the memory region to be written.
      * @param offset offset in bytes (relative to this address). The final address of this write operation can be expressed as {@code toRowLongValue() + offset}.
      * @param value the byte value to be written.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout.
      * @throws IllegalCallerException if access to this method occurs from a module {@code M} and the command line option
      * {@code --enable-native-access} is either absent, or does not mention the module name {@code M}, or
      * {@code ALL-UNNAMED} in case {@code M} is an unnamed module.
@@ -210,6 +212,8 @@ public sealed interface MemoryAddress extends Addressable permits MemoryAddressI
      * @param layout the layout of the memory region to be read.
      * @param offset offset in bytes (relative to this address). The final address of this read operation can be expressed as {@code toRowLongValue() + offset}.
      * @return a boolean value read from this address.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout.
      * @throws IllegalCallerException if access to this method occurs from a module {@code M} and the command line option
      * {@code --enable-native-access} is either absent, or does not mention the module name {@code M}, or
      * {@code ALL-UNNAMED} in case {@code M} is an unnamed module.
@@ -228,6 +232,8 @@ public sealed interface MemoryAddress extends Addressable permits MemoryAddressI
      * @param layout the layout of the memory region to be written.
      * @param offset offset in bytes (relative to this address). The final address of this write operation can be expressed as {@code toRowLongValue() + offset}.
      * @param value the boolean value to be written.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout.
      * @throws IllegalCallerException if access to this method occurs from a module {@code M} and the command line option
      * {@code --enable-native-access} is either absent, or does not mention the module name {@code M}, or
      * {@code ALL-UNNAMED} in case {@code M} is an unnamed module.
@@ -246,6 +252,8 @@ public sealed interface MemoryAddress extends Addressable permits MemoryAddressI
      * @param layout the layout of the memory region to be read.
      * @param offset offset in bytes (relative to this address). The final address of this read operation can be expressed as {@code toRowLongValue() + offset}.
      * @return a char value read from this address.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout.
      * @throws IllegalCallerException if access to this method occurs from a module {@code M} and the command line option
      * {@code --enable-native-access} is either absent, or does not mention the module name {@code M}, or
      * {@code ALL-UNNAMED} in case {@code M} is an unnamed module.
@@ -264,6 +272,8 @@ public sealed interface MemoryAddress extends Addressable permits MemoryAddressI
      * @param layout the layout of the memory region to be written.
      * @param offset offset in bytes (relative to this address). The final address of this write operation can be expressed as {@code toRowLongValue() + offset}.
      * @param value the char value to be written.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout.
      * @throws IllegalCallerException if access to this method occurs from a module {@code M} and the command line option
      * {@code --enable-native-access} is either absent, or does not mention the module name {@code M}, or
      * {@code ALL-UNNAMED} in case {@code M} is an unnamed module.
@@ -282,6 +292,8 @@ public sealed interface MemoryAddress extends Addressable permits MemoryAddressI
      * @param layout the layout of the memory region to be read.
      * @param offset offset in bytes (relative to this address). The final address of this read operation can be expressed as {@code toRowLongValue() + offset}.
      * @return a short value read from this address.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout.
      * @throws IllegalCallerException if access to this method occurs from a module {@code M} and the command line option
      * {@code --enable-native-access} is either absent, or does not mention the module name {@code M}, or
      * {@code ALL-UNNAMED} in case {@code M} is an unnamed module.
@@ -300,6 +312,8 @@ public sealed interface MemoryAddress extends Addressable permits MemoryAddressI
      * @param layout the layout of the memory region to be written.
      * @param offset offset in bytes (relative to this address). The final address of this write operation can be expressed as {@code toRowLongValue() + offset}.
      * @param value the short value to be written.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout.
      * @throws IllegalCallerException if access to this method occurs from a module {@code M} and the command line option
      * {@code --enable-native-access} is either absent, or does not mention the module name {@code M}, or
      * {@code ALL-UNNAMED} in case {@code M} is an unnamed module.
@@ -318,6 +332,8 @@ public sealed interface MemoryAddress extends Addressable permits MemoryAddressI
      * @param layout the layout of the memory region to be read.
      * @param offset offset in bytes (relative to this address). The final address of this read operation can be expressed as {@code toRowLongValue() + offset}.
      * @return an int value read from this address.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout.
      * @throws IllegalCallerException if access to this method occurs from a module {@code M} and the command line option
      * {@code --enable-native-access} is either absent, or does not mention the module name {@code M}, or
      * {@code ALL-UNNAMED} in case {@code M} is an unnamed module.
@@ -336,6 +352,8 @@ public sealed interface MemoryAddress extends Addressable permits MemoryAddressI
      * @param layout the layout of the memory region to be written.
      * @param offset offset in bytes (relative to this address). The final address of this write operation can be expressed as {@code toRowLongValue() + offset}.
      * @param value the int value to be written.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout.
      * @throws IllegalCallerException if access to this method occurs from a module {@code M} and the command line option
      * {@code --enable-native-access} is either absent, or does not mention the module name {@code M}, or
      * {@code ALL-UNNAMED} in case {@code M} is an unnamed module.
@@ -354,6 +372,8 @@ public sealed interface MemoryAddress extends Addressable permits MemoryAddressI
      * @param layout the layout of the memory region to be read.
      * @param offset offset in bytes (relative to this address). The final address of this read operation can be expressed as {@code toRowLongValue() + offset}.
      * @return a float value read from this address.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout.
      * @throws IllegalCallerException if access to this method occurs from a module {@code M} and the command line option
      * {@code --enable-native-access} is either absent, or does not mention the module name {@code M}, or
      * {@code ALL-UNNAMED} in case {@code M} is an unnamed module.
@@ -372,6 +392,8 @@ public sealed interface MemoryAddress extends Addressable permits MemoryAddressI
      * @param layout the layout of the memory region to be written.
      * @param offset offset in bytes (relative to this address). The final address of this write operation can be expressed as {@code toRowLongValue() + offset}.
      * @param value the float value to be written.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout.
      * @throws IllegalCallerException if access to this method occurs from a module {@code M} and the command line option
      * {@code --enable-native-access} is either absent, or does not mention the module name {@code M}, or
      * {@code ALL-UNNAMED} in case {@code M} is an unnamed module.
@@ -390,6 +412,8 @@ public sealed interface MemoryAddress extends Addressable permits MemoryAddressI
      * @param layout the layout of the memory region to be read.
      * @param offset offset in bytes (relative to this address). The final address of this read operation can be expressed as {@code toRowLongValue() + offset}.
      * @return a long value read from this address.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout.
      * @throws IllegalCallerException if access to this method occurs from a module {@code M} and the command line option
      * {@code --enable-native-access} is either absent, or does not mention the module name {@code M}, or
      * {@code ALL-UNNAMED} in case {@code M} is an unnamed module.
@@ -408,6 +432,8 @@ public sealed interface MemoryAddress extends Addressable permits MemoryAddressI
      * @param layout the layout of the memory region to be written.
      * @param offset offset in bytes (relative to this address). The final address of this write operation can be expressed as {@code toRowLongValue() + offset}.
      * @param value the long value to be written.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout.
      * @throws IllegalCallerException if access to this method occurs from a module {@code M} and the command line option
      * {@code --enable-native-access} is either absent, or does not mention the module name {@code M}, or
      * {@code ALL-UNNAMED} in case {@code M} is an unnamed module.
@@ -426,6 +452,8 @@ public sealed interface MemoryAddress extends Addressable permits MemoryAddressI
      * @param layout the layout of the memory region to be read.
      * @param offset offset in bytes (relative to this address). The final address of this read operation can be expressed as {@code toRowLongValue() + offset}.
      * @return a double value read from this address.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout.
      * @throws IllegalCallerException if access to this method occurs from a module {@code M} and the command line option
      * {@code --enable-native-access} is either absent, or does not mention the module name {@code M}, or
      * {@code ALL-UNNAMED} in case {@code M} is an unnamed module.
@@ -444,6 +472,8 @@ public sealed interface MemoryAddress extends Addressable permits MemoryAddressI
      * @param layout the layout of the memory region to be written.
      * @param offset offset in bytes (relative to this address). The final address of this write operation can be expressed as {@code toRowLongValue() + offset}.
      * @param value the double value to be written.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout.
      * @throws IllegalCallerException if access to this method occurs from a module {@code M} and the command line option
      * {@code --enable-native-access} is either absent, or does not mention the module name {@code M}, or
      * {@code ALL-UNNAMED} in case {@code M} is an unnamed module.
@@ -462,6 +492,8 @@ public sealed interface MemoryAddress extends Addressable permits MemoryAddressI
      * @param layout the layout of the memory region to be read.
      * @param offset offset in bytes (relative to this address). The final address of this read operation can be expressed as {@code toRowLongValue() + offset}.
      * @return an address value read from this address.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout.
      * @throws IllegalCallerException if access to this method occurs from a module {@code M} and the command line option
      * {@code --enable-native-access} is either absent, or does not mention the module name {@code M}, or
      * {@code ALL-UNNAMED} in case {@code M} is an unnamed module.
@@ -480,6 +512,8 @@ public sealed interface MemoryAddress extends Addressable permits MemoryAddressI
      * @param layout the layout of the memory region to be written.
      * @param offset offset in bytes (relative to this address). The final address of this write operation can be expressed as {@code toRowLongValue() + offset}.
      * @param value the address value to be written.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout.
      * @throws IllegalCallerException if access to this method occurs from a module {@code M} and the command line option
      * {@code --enable-native-access} is either absent, or does not mention the module name {@code M}, or
      * {@code ALL-UNNAMED} in case {@code M} is an unnamed module.
@@ -498,6 +532,9 @@ public sealed interface MemoryAddress extends Addressable permits MemoryAddressI
      * @param layout the layout of the memory region to be read.
      * @param index index in bytes (relative to this address). The final address of this read operation can be expressed as {@code toRowLongValue() + (index * layout.byteSize())}.
      * @return a char value read from this address.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout,
+     * or if the layout alignment is greater than its size.
      * @throws IllegalCallerException if access to this method occurs from a module {@code M} and the command line option
      * {@code --enable-native-access} is either absent, or does not mention the module name {@code M}, or
      * {@code ALL-UNNAMED} in case {@code M} is an unnamed module.
@@ -516,6 +553,9 @@ public sealed interface MemoryAddress extends Addressable permits MemoryAddressI
      * @param layout the layout of the memory region to be written.
      * @param index index in bytes (relative to this address). The final address of this write operation can be expressed as {@code toRowLongValue() + (index * layout.byteSize())}.
      * @param value the char value to be written.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout,
+     * or if the layout alignment is greater than its size.
      * @throws IllegalCallerException if access to this method occurs from a module {@code M} and the command line option
      * {@code --enable-native-access} is either absent, or does not mention the module name {@code M}, or
      * {@code ALL-UNNAMED} in case {@code M} is an unnamed module.
@@ -534,6 +574,9 @@ public sealed interface MemoryAddress extends Addressable permits MemoryAddressI
      * @param layout the layout of the memory region to be read.
      * @param index index in bytes (relative to this address). The final address of this read operation can be expressed as {@code toRowLongValue() + (index * layout.byteSize())}.
      * @return a short value read from this address.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout,
+     * or if the layout alignment is greater than its size.
      * @throws IllegalCallerException if access to this method occurs from a module {@code M} and the command line option
      * {@code --enable-native-access} is either absent, or does not mention the module name {@code M}, or
      * {@code ALL-UNNAMED} in case {@code M} is an unnamed module.
@@ -552,6 +595,9 @@ public sealed interface MemoryAddress extends Addressable permits MemoryAddressI
      * @param layout the layout of the memory region to be written.
      * @param index index in bytes (relative to this address). The final address of this write operation can be expressed as {@code toRowLongValue() + (index * layout.byteSize())}.
      * @param value the short value to be written.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout,
+     * or if the layout alignment is greater than its size.
      * @throws IllegalCallerException if access to this method occurs from a module {@code M} and the command line option
      * {@code --enable-native-access} is either absent, or does not mention the module name {@code M}, or
      * {@code ALL-UNNAMED} in case {@code M} is an unnamed module.
@@ -570,6 +616,9 @@ public sealed interface MemoryAddress extends Addressable permits MemoryAddressI
      * @param layout the layout of the memory region to be read.
      * @param index index in bytes (relative to this address). The final address of this read operation can be expressed as {@code toRowLongValue() + (index * layout.byteSize())}.
      * @return an int value read from this address.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout,
+     * or if the layout alignment is greater than its size.
      * @throws IllegalCallerException if access to this method occurs from a module {@code M} and the command line option
      * {@code --enable-native-access} is either absent, or does not mention the module name {@code M}, or
      * {@code ALL-UNNAMED} in case {@code M} is an unnamed module.
@@ -588,6 +637,9 @@ public sealed interface MemoryAddress extends Addressable permits MemoryAddressI
      * @param layout the layout of the memory region to be written.
      * @param index index in bytes (relative to this address). The final address of this write operation can be expressed as {@code toRowLongValue() + (index * layout.byteSize())}.
      * @param value the int value to be written.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout,
+     * or if the layout alignment is greater than its size.
      * @throws IllegalCallerException if access to this method occurs from a module {@code M} and the command line option
      * {@code --enable-native-access} is either absent, or does not mention the module name {@code M}, or
      * {@code ALL-UNNAMED} in case {@code M} is an unnamed module.
@@ -606,6 +658,9 @@ public sealed interface MemoryAddress extends Addressable permits MemoryAddressI
      * @param layout the layout of the memory region to be read.
      * @param index index in bytes (relative to this address). The final address of this read operation can be expressed as {@code toRowLongValue() + (index * layout.byteSize())}.
      * @return a float value read from this address.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout,
+     * or if the layout alignment is greater than its size.
      * @throws IllegalCallerException if access to this method occurs from a module {@code M} and the command line option
      * {@code --enable-native-access} is either absent, or does not mention the module name {@code M}, or
      * {@code ALL-UNNAMED} in case {@code M} is an unnamed module.
@@ -624,6 +679,9 @@ public sealed interface MemoryAddress extends Addressable permits MemoryAddressI
      * @param layout the layout of the memory region to be written.
      * @param index index in bytes (relative to this address). The final address of this write operation can be expressed as {@code toRowLongValue() + (index * layout.byteSize())}.
      * @param value the float value to be written.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout,
+     * or if the layout alignment is greater than its size.
      * @throws IllegalCallerException if access to this method occurs from a module {@code M} and the command line option
      * {@code --enable-native-access} is either absent, or does not mention the module name {@code M}, or
      * {@code ALL-UNNAMED} in case {@code M} is an unnamed module.
@@ -642,6 +700,9 @@ public sealed interface MemoryAddress extends Addressable permits MemoryAddressI
      * @param layout the layout of the memory region to be read.
      * @param index index in bytes (relative to this address). The final address of this read operation can be expressed as {@code toRowLongValue() + (index * layout.byteSize())}.
      * @return a long value read from this address.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout,
+     * or if the layout alignment is greater than its size.
      * @throws IllegalCallerException if access to this method occurs from a module {@code M} and the command line option
      * {@code --enable-native-access} is either absent, or does not mention the module name {@code M}, or
      * {@code ALL-UNNAMED} in case {@code M} is an unnamed module.
@@ -660,6 +721,9 @@ public sealed interface MemoryAddress extends Addressable permits MemoryAddressI
      * @param layout the layout of the memory region to be written.
      * @param index index in bytes (relative to this address). The final address of this write operation can be expressed as {@code toRowLongValue() + (index * layout.byteSize())}.
      * @param value the long value to be written.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout,
+     * or if the layout alignment is greater than its size.
      * @throws IllegalCallerException if access to this method occurs from a module {@code M} and the command line option
      * {@code --enable-native-access} is either absent, or does not mention the module name {@code M}, or
      * {@code ALL-UNNAMED} in case {@code M} is an unnamed module.
@@ -678,6 +742,9 @@ public sealed interface MemoryAddress extends Addressable permits MemoryAddressI
      * @param layout the layout of the memory region to be read.
      * @param index index in bytes (relative to this address). The final address of this read operation can be expressed as {@code toRowLongValue() + (index * layout.byteSize())}.
      * @return a double value read from this address.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout,
+     * or if the layout alignment is greater than its size.
      * @throws IllegalCallerException if access to this method occurs from a module {@code M} and the command line option
      * {@code --enable-native-access} is either absent, or does not mention the module name {@code M}, or
      * {@code ALL-UNNAMED} in case {@code M} is an unnamed module.
@@ -696,6 +763,9 @@ public sealed interface MemoryAddress extends Addressable permits MemoryAddressI
      * @param layout the layout of the memory region to be written.
      * @param index index in bytes (relative to this address). The final address of this write operation can be expressed as {@code toRowLongValue() + (index * layout.byteSize())}.
      * @param value the double value to be written.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout,
+     * or if the layout alignment is greater than its size.
      * @throws IllegalCallerException if access to this method occurs from a module {@code M} and the command line option
      * {@code --enable-native-access} is either absent, or does not mention the module name {@code M}, or
      * {@code ALL-UNNAMED} in case {@code M} is an unnamed module.
@@ -714,6 +784,9 @@ public sealed interface MemoryAddress extends Addressable permits MemoryAddressI
      * @param layout the layout of the memory region to be read.
      * @param index index in bytes (relative to this address). The final address of this read operation can be expressed as {@code toRowLongValue() + (index * layout.byteSize())}.
      * @return an address value read from this address.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout,
+     * or if the layout alignment is greater than its size.
      * @throws IllegalCallerException if access to this method occurs from a module {@code M} and the command line option
      * {@code --enable-native-access} is either absent, or does not mention the module name {@code M}, or
      * {@code ALL-UNNAMED} in case {@code M} is an unnamed module.
@@ -732,6 +805,9 @@ public sealed interface MemoryAddress extends Addressable permits MemoryAddressI
      * @param layout the layout of the memory region to be written.
      * @param index index in bytes (relative to this address). The final address of this write operation can be expressed as {@code toRowLongValue() + (index * layout.byteSize())}.
      * @param value the address value to be written.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout,
+     * or if the layout alignment is greater than its size.
      * @throws IllegalCallerException if access to this method occurs from a module {@code M} and the command line option
      * {@code --enable-native-access} is either absent, or does not mention the module name {@code M}, or
      * {@code ALL-UNNAMED} in case {@code M} is an unnamed module.
diff --git a/src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/MemoryLayout.java b/src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/MemoryLayout.java
index fe0fb4e93f9ce140f4ac141ab96f5a604a32d2d1..991897c367d12fd9d2d3e3aa6ccc739678151e7a 100644
--- a/src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/MemoryLayout.java
+++ b/src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/MemoryLayout.java
@@ -195,18 +195,15 @@ import java.util.stream.Stream;
 public sealed interface MemoryLayout extends Constable permits AbstractLayout, SequenceLayout, GroupLayout, PaddingLayout, ValueLayout {
 
     /**
-     * Returns an {@link Optional} containing the nominal descriptor for this
+     * {@return an {@link Optional} containing the nominal descriptor for this
      * layout, if one can be constructed, or an empty {@link Optional}
-     * if one cannot be constructed.
-     *
-     * @return An {@link Optional} containing the resulting nominal descriptor,
-     * or an empty {@link Optional} if one cannot be constructed.
+     * if one cannot be constructed}
      */
     @Override
     Optional> describeConstable();
 
     /**
-     * Does this layout have a specified size? A layout does not have a specified size if it is (or contains) a sequence layout whose
+     * Returns {@code true} if this layout has a specified size. A layout does not have a specified size if it is (or contains) a sequence layout whose
      * size is unspecified (see {@link SequenceLayout#elementCount()}).
      *
      * Value layouts (see {@link ValueLayout}) and padding layouts (see {@link MemoryLayout#paddingLayout(long)})
@@ -217,26 +214,20 @@ public sealed interface MemoryLayout extends Constable permits AbstractLayout, S
     boolean hasSize();
 
     /**
-     * Computes the layout size, in bits.
-     *
-     * @return the layout size, in bits.
+     * {@return the layout size, in bits}
      * @throws UnsupportedOperationException if the layout is, or contains, a sequence layout with unspecified size (see {@link SequenceLayout}).
      */
     long bitSize();
 
     /**
-     * Computes the layout size, in bytes.
-     *
-     * @return the layout size, in bytes.
+     * {@return the layout size, in bytes}
      * @throws UnsupportedOperationException if the layout is, or contains, a sequence layout with unspecified size (see {@link SequenceLayout}),
      * or if {@code bitSize()} is not a multiple of 8.
      */
     long byteSize();
 
     /**
-     * Return the name (if any) associated with this layout.
-     *
-     * @return the layout name (if any).
+     * {@return the name (if any) associated with this layout}
      * @see MemoryLayout#withName(String)
      */
     Optional name();
@@ -534,8 +525,7 @@ public sealed interface MemoryLayout extends Constable permits AbstractLayout, S
     }
 
     /**
-     * Is this a {@linkplain #paddingLayout(long) padding layout} ?
-     * @return true, if this layout is a padding layout.
+     * {@return true, if this layout is a padding layout}
      */
     boolean isPadding();
 
@@ -651,16 +641,12 @@ public sealed interface MemoryLayout extends Constable permits AbstractLayout, S
     boolean equals(Object that);
 
     /**
-     * Returns the hash code value for this layout.
-     *
-     * @return the hash code value for this layout.
+     * {@return the hash code value for this layout}
      */
     int hashCode();
 
     /**
-     * Returns a string representation of this layout.
-     *
-     * @return a string representation of this layout.
+     * {@return the string representation of this layout}
      */
     @Override
     String toString();
diff --git a/src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/MemorySegment.java b/src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/MemorySegment.java
index de974fa2e8031d1551aa4e3d24c46a89159793ce..a450853073478dbc93d2ba1604c4396d0d51e348 100644
--- a/src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/MemorySegment.java
+++ b/src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/MemorySegment.java
@@ -139,6 +139,56 @@ import java.util.stream.Stream;
  * {@linkplain MemoryHandles#varHandle(ValueLayout) value layout}, and then adapt it using the var handle combinator
  * functions defined in the {@link MemoryHandles} class.
  *
+ * 
    Alignment
    
+ *
+ * When dereferencing a memory segment using a layout, the runtime must check that the segment address being dereferenced
+ * matches the layout's {@linkplain MemoryLayout#byteAlignment() alignment constraints}. If the segment being
+ * dereferenced is a native segment, then it has a concrete {@linkplain #address() base address}, which can
+ * be used to perform the alignment check. The pseudo-function below demonstrates this:
+ *
+ * 
    {@code
+boolean isAligned(MemorySegment segment, long offset, MemoryLayout layout) {
+   return ((segment.address().toRawLongValue() + offset) % layout.byteAlignment()) == 0
+}
+ * }
    
+ *
+ * If, however, the segment being dereferenced is a heap segment, the above function will not work: a heap
+ * segment's base address is virtualized and, as such, cannot be used to construct an alignment check. Instead,
+ * heap segments are assumed to produce addresses which are never more aligned than the element size of the Java array from which
+ * they have originated from, as shown in the following table:
+ *
+ * 
    
+ * 
+ * 
+ * 
+ *     
+ *     
+ * 
+ * 
+ * 
+ * 
+ *     
+ * 
+ *     
+ * 
+ *     
+ * 
+ *     
+ * 
+ *     
+ * 
+ *     
+ * 
+ *     
+ * 
+ *     
+ * 
+ * 
    Array type of an array backing a segment and its address alignment
    Array typeAlignment
    {@code boolean[]}{@code 1}
    {@code byte[]}{@code 1}
    {@code char[]}{@code 2}
    {@code short[]}{@code 2}
    {@code int[]}{@code 4}
    {@code float[]}{@code 4}
    {@code long[]}{@code 8}
    {@code double[]}{@code 8}
    
+ *
+ * Note that the above definition is conservative: it might be possible, for instance, that a heap segment
+ * constructed from a {@code byte[]} might have a subset of addresses {@code S} which happen to be 8-byte aligned. But determining
+ * which segment addresses belong to {@code S} requires reasoning about details which are ultimately implementation-dependent.
+ *
  * 
    Lifecycle and confinement
    
  *
  * Memory segments are associated with a resource scope (see {@link ResourceScope}), which can be accessed using
@@ -200,11 +250,10 @@ import java.util.stream.Stream;
 public sealed interface MemorySegment extends Addressable permits AbstractMemorySegmentImpl {
 
     /**
-     * The base memory address associated with this native memory segment.
+     * {@return the base memory address associated with this native memory segment}
      * @throws UnsupportedOperationException if this segment is not a {@linkplain #isNative() native} segment.
      * @throws IllegalStateException if the scope associated with this segment has been closed, or if access occurs from
      * a thread other than the thread owning that scope.
-     * @return The base memory address.
      */
     @Override
     MemoryAddress address();
@@ -216,7 +265,7 @@ public sealed interface MemorySegment extends Addressable permits AbstractMemory
      * 
    
      * The returned spliterator splits this segment according to the specified element layout; that is,
      * if the supplied layout has size N, then calling {@link Spliterator#trySplit()} will result in a spliterator serving
-     * approximately {@code S/N/2} elements (depending on whether N is even or not), where {@code S} is the size of
+     * approximately {@code S/N} elements (depending on whether N is even or not), where {@code S} is the size of
      * this segment. As such, splitting is possible as long as {@code S/N >= 2}. The spliterator returns segments that
      * are associated with the same scope as this segment.
      * 
    
@@ -226,7 +275,9 @@ public sealed interface MemorySegment extends Addressable permits AbstractMemory
      * @param elementLayout the layout to be used for splitting.
      * @return the element spliterator for this segment
      * @throws IllegalArgumentException if the {@code elementLayout} size is zero, or the segment size modulo the
-     * {@code elementLayout} size is greater than zero.
+     * {@code elementLayout} size is greater than zero, if this segment is
+     * incompatible with the alignment constraints in the provided layout,
+     * or if the {@code elementLayout} alignment is greater than its size.
      */
     Spliterator spliterator(MemoryLayout elementLayout);
 
@@ -240,19 +291,19 @@ public sealed interface MemorySegment extends Addressable permits AbstractMemory
      * @param elementLayout the layout to be used for splitting.
      * @return a sequential {@code Stream} over disjoint slices in this segment.
      * @throws IllegalArgumentException if the {@code elementLayout} size is zero, or the segment size modulo the
-     * {@code elementLayout} size is greater than zero.
+     * {@code elementLayout} size is greater than zero, if this segment is
+     * incompatible with the alignment constraints in the provided layout,
+     * or if the {@code elementLayout} alignment is greater than its size.
      */
     Stream elements(MemoryLayout elementLayout);
 
     /**
-     * Returns the resource scope associated with this memory segment.
-     * @return the resource scope associated with this memory segment.
+     * {@return the resource scope associated with this memory segment}
      */
     ResourceScope scope();
 
     /**
-     * The size (in bytes) of this memory segment.
-     * @return The size (in bytes) of this memory segment.
+     * {@return the size (in bytes) of this memory segment}
      */
     long byteSize();
 
@@ -289,8 +340,7 @@ public sealed interface MemorySegment extends Addressable permits AbstractMemory
     }
 
     /**
-     * Is this segment read-only?
-     * @return {@code true}, if this segment is read-only.
+     * {@return {@code true}, if this segment is read-only}
      * @see #asReadOnly()
      */
     boolean isReadOnly();
@@ -304,7 +354,7 @@ public sealed interface MemorySegment extends Addressable permits AbstractMemory
     MemorySegment asReadOnly();
 
     /**
-     * Is this a native segment? Returns true if this segment is a native memory segment,
+     * Returns {@code true} if this segment is a native segment. A native memory segment is
      * created using the {@link #allocateNative(long, ResourceScope)} (and related) factory, or a buffer segment
      * derived from a direct {@link java.nio.ByteBuffer} using the {@link #ofByteBuffer(ByteBuffer)} factory,
      * or if this is a {@linkplain #isMapped() mapped} segment.
@@ -313,7 +363,7 @@ public sealed interface MemorySegment extends Addressable permits AbstractMemory
     boolean isNative();
 
     /**
-     * Is this a mapped segment? Returns true if this segment is a mapped memory segment,
+     * Returns {@code true} if this segment is a mapped segment. A mapped memory segment is
      * created using the {@link #mapFile(Path, long, long, FileChannel.MapMode, ResourceScope)} factory, or a buffer segment
      * derived from a {@link java.nio.MappedByteBuffer} using the {@link #ofByteBuffer(ByteBuffer)} factory.
      * @return {@code true} if this segment is a mapped segment.
@@ -430,7 +480,7 @@ public sealed interface MemorySegment extends Addressable permits AbstractMemory
     long mismatch(MemorySegment other);
 
     /**
-     * Tells whether the contents of this mapped segment is resident in physical
+     * Determines whether the contents of this mapped segment is resident in physical
      * memory.
      *
      * 
     A return value of {@code true} implies that it is highly likely
@@ -982,9 +1032,9 @@ public sealed interface MemorySegment extends Addressable permits AbstractMemory
      * @param dstElementLayout the element layout associated with the destination segment.
      * @param dstOffset the starting offset, in bytes, of the destination segment.
      * @param elementCount the number of elements to be copied.
-     * @throws IllegalArgumentException if the element layouts have different sizes, if the source offset is incompatible
-     * with the alignment constraints in the source element layout, or if the destination offset is incompatible with the
-     * alignment constraints in the destination element layout.
+     * @throws IllegalArgumentException if the element layouts have different sizes, if the source (resp. destination) segment/offset are
+     * incompatible with the alignment constraints in the source
+     * (resp. destination) element layout, or if the source (resp. destination) element layout alignment is greater than its size.
      * @throws IllegalStateException if either the scope associated with the source segment or the scope associated
      * with the destination segment have been already closed, or if access occurs from a thread other than the thread
      * owning either scopes.
@@ -1003,13 +1053,15 @@ public sealed interface MemorySegment extends Addressable permits AbstractMemory
         AbstractMemorySegmentImpl srcImpl = (AbstractMemorySegmentImpl)srcSegment;
         AbstractMemorySegmentImpl dstImpl = (AbstractMemorySegmentImpl)dstSegment;
         if (srcElementLayout.byteSize() != dstElementLayout.byteSize()) {
-            throw new IllegalArgumentException("Source and destination layouts must have same sizes");
+            throw new IllegalArgumentException("Source and destination layouts must have same size");
         }
-        if (srcOffset % srcElementLayout.byteAlignment() != 0) {
+        Utils.checkElementAlignment(srcElementLayout, "Source layout alignment greater than its size");
+        Utils.checkElementAlignment(dstElementLayout, "Destination layout alignment greater than its size");
+        if (!srcImpl.isAlignedForElement(srcOffset, srcElementLayout)) {
             throw new IllegalArgumentException("Source segment incompatible with alignment constraints");
         }
-        if (dstOffset % dstElementLayout.byteAlignment() != 0) {
-            throw new IllegalArgumentException("Target segment incompatible with alignment constraints");
+        if (!dstImpl.isAlignedForElement(dstOffset, dstElementLayout)) {
+            throw new IllegalArgumentException("Destination segment incompatible with alignment constraints");
         }
         long size = elementCount * srcElementLayout.byteSize();
         srcImpl.checkAccess(srcOffset, size, true);
@@ -1034,6 +1086,8 @@ public sealed interface MemorySegment extends Addressable permits AbstractMemory
      * @return a byte value read from this address.
      * @throws IllegalStateException if the scope associated with this segment has been closed, or if access occurs from
      * a thread other than the thread owning that scope.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout.
      * @throws IndexOutOfBoundsException when the dereference operation falls outside the spatial bounds of the
      * memory segment.
      */
@@ -1051,6 +1105,8 @@ public sealed interface MemorySegment extends Addressable permits AbstractMemory
      * @param value the byte value to be written.
      * @throws IllegalStateException if the scope associated with this segment has been closed, or if access occurs from
      * a thread other than the thread owning that scope.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout.
      * @throws IndexOutOfBoundsException when the dereference operation falls outside the spatial bounds of the
      * memory segment.
      * @throws UnsupportedOperationException if this segment is {@linkplain #isReadOnly() read-only}.
@@ -1069,6 +1125,8 @@ public sealed interface MemorySegment extends Addressable permits AbstractMemory
      * @return a boolean value read from this address.
      * @throws IllegalStateException if the scope associated with this segment has been closed, or if access occurs from
      * a thread other than the thread owning that scope.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout.
      * @throws IndexOutOfBoundsException when the dereference operation falls outside the spatial bounds of the
      * memory segment.
      */
@@ -1086,6 +1144,8 @@ public sealed interface MemorySegment extends Addressable permits AbstractMemory
      * @param value the boolean value to be written.
      * @throws IllegalStateException if the scope associated with this segment has been closed, or if access occurs from
      * a thread other than the thread owning that scope.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout.
      * @throws IndexOutOfBoundsException when the dereference operation falls outside the spatial bounds of the
      * memory segment.
      * @throws UnsupportedOperationException if this segment is {@linkplain #isReadOnly() read-only}.
@@ -1104,6 +1164,8 @@ public sealed interface MemorySegment extends Addressable permits AbstractMemory
      * @return a char value read from this address.
      * @throws IllegalStateException if the scope associated with this segment has been closed, or if access occurs from
      * a thread other than the thread owning that scope.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout.
      * @throws IndexOutOfBoundsException when the dereference operation falls outside the spatial bounds of the
      * memory segment.
      */
@@ -1121,6 +1183,8 @@ public sealed interface MemorySegment extends Addressable permits AbstractMemory
      * @param value the char value to be written.
      * @throws IllegalStateException if the scope associated with this segment has been closed, or if access occurs from
      * a thread other than the thread owning that scope.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout.
      * @throws IndexOutOfBoundsException when the dereference operation falls outside the spatial bounds of the
      * memory segment.
      * @throws UnsupportedOperationException if this segment is {@linkplain #isReadOnly() read-only}.
@@ -1139,6 +1203,8 @@ public sealed interface MemorySegment extends Addressable permits AbstractMemory
      * @return a short value read from this address.
      * @throws IllegalStateException if the scope associated with this segment has been closed, or if access occurs from
      * a thread other than the thread owning that scope.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout.
      * @throws IndexOutOfBoundsException when the dereference operation falls outside the spatial bounds of the
      * memory segment.
      */
@@ -1156,6 +1222,8 @@ public sealed interface MemorySegment extends Addressable permits AbstractMemory
      * @param value the short value to be written.
      * @throws IllegalStateException if the scope associated with this segment has been closed, or if access occurs from
      * a thread other than the thread owning that scope.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout.
      * @throws IndexOutOfBoundsException when the dereference operation falls outside the spatial bounds of the
      * memory segment.
      * @throws UnsupportedOperationException if this segment is {@linkplain #isReadOnly() read-only}.
@@ -1174,6 +1242,8 @@ public sealed interface MemorySegment extends Addressable permits AbstractMemory
      * @return an int value read from this address.
      * @throws IllegalStateException if the scope associated with this segment has been closed, or if access occurs from
      * a thread other than the thread owning that scope.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout.
      * @throws IndexOutOfBoundsException when the dereference operation falls outside the spatial bounds of the
      * memory segment.
      */
@@ -1191,6 +1261,8 @@ public sealed interface MemorySegment extends Addressable permits AbstractMemory
      * @param value the int value to be written.
      * @throws IllegalStateException if the scope associated with this segment has been closed, or if access occurs from
      * a thread other than the thread owning that scope.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout.
      * @throws IndexOutOfBoundsException when the dereference operation falls outside the spatial bounds of the
      * memory segment.
      * @throws UnsupportedOperationException if this segment is {@linkplain #isReadOnly() read-only}.
@@ -1209,6 +1281,8 @@ public sealed interface MemorySegment extends Addressable permits AbstractMemory
      * @return a float value read from this address.
      * @throws IllegalStateException if the scope associated with this segment has been closed, or if access occurs from
      * a thread other than the thread owning that scope.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout.
      * @throws IndexOutOfBoundsException when the dereference operation falls outside the spatial bounds of the
      * memory segment.
      */
@@ -1226,6 +1300,8 @@ public sealed interface MemorySegment extends Addressable permits AbstractMemory
      * @param value the float value to be written.
      * @throws IllegalStateException if the scope associated with this segment has been closed, or if access occurs from
      * a thread other than the thread owning that scope.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout.
      * @throws IndexOutOfBoundsException when the dereference operation falls outside the spatial bounds of the
      * memory segment.
      * @throws UnsupportedOperationException if this segment is {@linkplain #isReadOnly() read-only}.
@@ -1244,6 +1320,8 @@ public sealed interface MemorySegment extends Addressable permits AbstractMemory
      * @return a long value read from this address.
      * @throws IllegalStateException if the scope associated with this segment has been closed, or if access occurs from
      * a thread other than the thread owning that scope.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout.
      * @throws IndexOutOfBoundsException when the dereference operation falls outside the spatial bounds of the
      * memory segment.
      */
@@ -1261,6 +1339,8 @@ public sealed interface MemorySegment extends Addressable permits AbstractMemory
      * @param value the long value to be written.
      * @throws IllegalStateException if the scope associated with this segment has been closed, or if access occurs from
      * a thread other than the thread owning that scope.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout.
      * @throws IndexOutOfBoundsException when the dereference operation falls outside the spatial bounds of the
      * memory segment.
      * @throws UnsupportedOperationException if this segment is {@linkplain #isReadOnly() read-only}.
@@ -1279,6 +1359,8 @@ public sealed interface MemorySegment extends Addressable permits AbstractMemory
      * @return a double value read from this address.
      * @throws IllegalStateException if the scope associated with this segment has been closed, or if access occurs from
      * a thread other than the thread owning that scope.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout.
      * @throws IndexOutOfBoundsException when the dereference operation falls outside the spatial bounds of the
      * memory segment.
      */
@@ -1296,6 +1378,8 @@ public sealed interface MemorySegment extends Addressable permits AbstractMemory
      * @param value the double value to be written.
      * @throws IllegalStateException if the scope associated with this segment has been closed, or if access occurs from
      * a thread other than the thread owning that scope.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout.
      * @throws IndexOutOfBoundsException when the dereference operation falls outside the spatial bounds of the
      * memory segment.
      * @throws UnsupportedOperationException if this segment is {@linkplain #isReadOnly() read-only}.
@@ -1314,6 +1398,8 @@ public sealed interface MemorySegment extends Addressable permits AbstractMemory
      * @return an address value read from this address.
      * @throws IllegalStateException if the scope associated with this segment has been closed, or if access occurs from
      * a thread other than the thread owning that scope.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout.
      * @throws IndexOutOfBoundsException when the dereference operation falls outside the spatial bounds of the
      * memory segment.
      */
@@ -1331,6 +1417,8 @@ public sealed interface MemorySegment extends Addressable permits AbstractMemory
      * @param value the address value to be written.
      * @throws IllegalStateException if the scope associated with this segment has been closed, or if access occurs from
      * a thread other than the thread owning that scope.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout.
      * @throws IndexOutOfBoundsException when the dereference operation falls outside the spatial bounds of the
      * memory segment.
      * @throws UnsupportedOperationException if this segment is {@linkplain #isReadOnly() read-only}.
@@ -1349,11 +1437,15 @@ public sealed interface MemorySegment extends Addressable permits AbstractMemory
      * @return a char value read from this address.
      * @throws IllegalStateException if the scope associated with this segment has been closed, or if access occurs from
      * a thread other than the thread owning that scope.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout,
+     * or if the layout alignment is greater than its size.
      * @throws IndexOutOfBoundsException when the dereference operation falls outside the spatial bounds of the
      * memory segment.
      */
     @ForceInline
     default char getAtIndex(ValueLayout.OfChar layout, long index) {
+        Utils.checkElementAlignment(layout, "Layout alignment greater than its size");
         return (char)layout.accessHandle().get(this, Utils.scaleOffset(this, index, layout.byteSize()));
     }
 
@@ -1366,12 +1458,16 @@ public sealed interface MemorySegment extends Addressable permits AbstractMemory
      * @param value the char value to be written.
      * @throws IllegalStateException if the scope associated with this segment has been closed, or if access occurs from
      * a thread other than the thread owning that scope.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout,
+     * or if the layout alignment is greater than its size.
      * @throws IndexOutOfBoundsException when the dereference operation falls outside the spatial bounds of the
      * memory segment.
      * @throws UnsupportedOperationException if this segment is {@linkplain #isReadOnly() read-only}.
      */
     @ForceInline
     default void setAtIndex(ValueLayout.OfChar layout, long index, char value) {
+        Utils.checkElementAlignment(layout, "Layout alignment greater than its size");
         layout.accessHandle().set(this, Utils.scaleOffset(this, index, layout.byteSize()), value);
     }
 
@@ -1384,11 +1480,15 @@ public sealed interface MemorySegment extends Addressable permits AbstractMemory
      * @return a short value read from this address.
      * @throws IllegalStateException if the scope associated with this segment has been closed, or if access occurs from
      * a thread other than the thread owning that scope.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout,
+     * or if the layout alignment is greater than its size.
      * @throws IndexOutOfBoundsException when the dereference operation falls outside the spatial bounds of the
      * memory segment.
      */
     @ForceInline
     default short getAtIndex(ValueLayout.OfShort layout, long index) {
+        Utils.checkElementAlignment(layout, "Layout alignment greater than its size");
         return (short)layout.accessHandle().get(this, Utils.scaleOffset(this, index, layout.byteSize()));
     }
 
@@ -1401,12 +1501,16 @@ public sealed interface MemorySegment extends Addressable permits AbstractMemory
      * @param value the short value to be written.
      * @throws IllegalStateException if the scope associated with this segment has been closed, or if access occurs from
      * a thread other than the thread owning that scope.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout,
+     * or if the layout alignment is greater than its size.
      * @throws IndexOutOfBoundsException when the dereference operation falls outside the spatial bounds of the
      * memory segment.
      * @throws UnsupportedOperationException if this segment is {@linkplain #isReadOnly() read-only}.
      */
     @ForceInline
     default void setAtIndex(ValueLayout.OfShort layout, long index, short value) {
+        Utils.checkElementAlignment(layout, "Layout alignment greater than its size");
         layout.accessHandle().set(this, Utils.scaleOffset(this, index, layout.byteSize()), value);
     }
 
@@ -1419,11 +1523,15 @@ public sealed interface MemorySegment extends Addressable permits AbstractMemory
      * @return an int value read from this address.
      * @throws IllegalStateException if the scope associated with this segment has been closed, or if access occurs from
      * a thread other than the thread owning that scope.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout,
+     * or if the layout alignment is greater than its size.
      * @throws IndexOutOfBoundsException when the dereference operation falls outside the spatial bounds of the
      * memory segment.
      */
     @ForceInline
     default int getAtIndex(ValueLayout.OfInt layout, long index) {
+        Utils.checkElementAlignment(layout, "Layout alignment greater than its size");
         return (int)layout.accessHandle().get(this, Utils.scaleOffset(this, index, layout.byteSize()));
     }
 
@@ -1436,12 +1544,16 @@ public sealed interface MemorySegment extends Addressable permits AbstractMemory
      * @param value the int value to be written.
      * @throws IllegalStateException if the scope associated with this segment has been closed, or if access occurs from
      * a thread other than the thread owning that scope.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout,
+     * or if the layout alignment is greater than its size.
      * @throws IndexOutOfBoundsException when the dereference operation falls outside the spatial bounds of the
      * memory segment.
      * @throws UnsupportedOperationException if this segment is {@linkplain #isReadOnly() read-only}.
      */
     @ForceInline
     default void setAtIndex(ValueLayout.OfInt layout, long index, int value) {
+        Utils.checkElementAlignment(layout, "Layout alignment greater than its size");
         layout.accessHandle().set(this, Utils.scaleOffset(this, index, layout.byteSize()), value);
     }
 
@@ -1454,11 +1566,15 @@ public sealed interface MemorySegment extends Addressable permits AbstractMemory
      * @return a float value read from this address.
      * @throws IllegalStateException if the scope associated with this segment has been closed, or if access occurs from
      * a thread other than the thread owning that scope.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout,
+     * or if the layout alignment is greater than its size.
      * @throws IndexOutOfBoundsException when the dereference operation falls outside the spatial bounds of the
      * memory segment.
      */
     @ForceInline
     default float getAtIndex(ValueLayout.OfFloat layout, long index) {
+        Utils.checkElementAlignment(layout, "Layout alignment greater than its size");
         return (float)layout.accessHandle().get(this, Utils.scaleOffset(this, index, layout.byteSize()));
     }
 
@@ -1471,12 +1587,16 @@ public sealed interface MemorySegment extends Addressable permits AbstractMemory
      * @param value the float value to be written.
      * @throws IllegalStateException if the scope associated with this segment has been closed, or if access occurs from
      * a thread other than the thread owning that scope.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout,
+     * or if the layout alignment is greater than its size.
      * @throws IndexOutOfBoundsException when the dereference operation falls outside the spatial bounds of the
      * memory segment.
      * @throws UnsupportedOperationException if this segment is {@linkplain #isReadOnly() read-only}.
      */
     @ForceInline
     default void setAtIndex(ValueLayout.OfFloat layout, long index, float value) {
+        Utils.checkElementAlignment(layout, "Layout alignment greater than its size");
         layout.accessHandle().set(this, Utils.scaleOffset(this, index, layout.byteSize()), value);
     }
 
@@ -1489,11 +1609,15 @@ public sealed interface MemorySegment extends Addressable permits AbstractMemory
      * @return a long value read from this address.
      * @throws IllegalStateException if the scope associated with this segment has been closed, or if access occurs from
      * a thread other than the thread owning that scope.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout,
+     * or if the layout alignment is greater than its size.
      * @throws IndexOutOfBoundsException when the dereference operation falls outside the spatial bounds of the
      * memory segment.
      */
     @ForceInline
     default long getAtIndex(ValueLayout.OfLong layout, long index) {
+        Utils.checkElementAlignment(layout, "Layout alignment greater than its size");
         return (long)layout.accessHandle().get(this, Utils.scaleOffset(this, index, layout.byteSize()));
     }
 
@@ -1506,12 +1630,16 @@ public sealed interface MemorySegment extends Addressable permits AbstractMemory
      * @param value the long value to be written.
      * @throws IllegalStateException if the scope associated with this segment has been closed, or if access occurs from
      * a thread other than the thread owning that scope.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout,
+     * or if the layout alignment is greater than its size.
      * @throws IndexOutOfBoundsException when the dereference operation falls outside the spatial bounds of the
      * memory segment.
      * @throws UnsupportedOperationException if this segment is {@linkplain #isReadOnly() read-only}.
      */
     @ForceInline
     default void setAtIndex(ValueLayout.OfLong layout, long index, long value) {
+        Utils.checkElementAlignment(layout, "Layout alignment greater than its size");
         layout.accessHandle().set(this, Utils.scaleOffset(this, index, layout.byteSize()), value);
     }
 
@@ -1524,11 +1652,15 @@ public sealed interface MemorySegment extends Addressable permits AbstractMemory
      * @return a double value read from this address.
      * @throws IllegalStateException if the scope associated with this segment has been closed, or if access occurs from
      * a thread other than the thread owning that scope.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout,
+     * or if the layout alignment is greater than its size.
      * @throws IndexOutOfBoundsException when the dereference operation falls outside the spatial bounds of the
      * memory segment.
      */
     @ForceInline
     default double getAtIndex(ValueLayout.OfDouble layout, long index) {
+        Utils.checkElementAlignment(layout, "Layout alignment greater than its size");
         return (double)layout.accessHandle().get(this, Utils.scaleOffset(this, index, layout.byteSize()));
     }
 
@@ -1541,12 +1673,16 @@ public sealed interface MemorySegment extends Addressable permits AbstractMemory
      * @param value the double value to be written.
      * @throws IllegalStateException if the scope associated with this segment has been closed, or if access occurs from
      * a thread other than the thread owning that scope.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout,
+     * or if the layout alignment is greater than its size.
      * @throws IndexOutOfBoundsException when the dereference operation falls outside the spatial bounds of the
      * memory segment.
      * @throws UnsupportedOperationException if this segment is {@linkplain #isReadOnly() read-only}.
      */
     @ForceInline
     default void setAtIndex(ValueLayout.OfDouble layout, long index, double value) {
+        Utils.checkElementAlignment(layout, "Layout alignment greater than its size");
         layout.accessHandle().set(this, Utils.scaleOffset(this, index, layout.byteSize()), value);
     }
 
@@ -1559,11 +1695,15 @@ public sealed interface MemorySegment extends Addressable permits AbstractMemory
      * @return an address value read from this address.
      * @throws IllegalStateException if the scope associated with this segment has been closed, or if access occurs from
      * a thread other than the thread owning that scope.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout,
+     * or if the layout alignment is greater than its size.
      * @throws IndexOutOfBoundsException when the dereference operation falls outside the spatial bounds of the
      * memory segment.
      */
     @ForceInline
     default MemoryAddress getAtIndex(ValueLayout.OfAddress layout, long index) {
+        Utils.checkElementAlignment(layout, "Layout alignment greater than its size");
         return (MemoryAddress)layout.accessHandle().get(this, Utils.scaleOffset(this, index, layout.byteSize()));
     }
 
@@ -1576,12 +1716,16 @@ public sealed interface MemorySegment extends Addressable permits AbstractMemory
      * @param value the address value to be written.
      * @throws IllegalStateException if the scope associated with this segment has been closed, or if access occurs from
      * a thread other than the thread owning that scope.
+     * @throws IllegalArgumentException if the dereference operation is
+     * incompatible with the alignment constraints in the provided layout,
+     * or if the layout alignment is greater than its size.
      * @throws IndexOutOfBoundsException when the dereference operation falls outside the spatial bounds of the
      * memory segment.
      * @throws UnsupportedOperationException if this segment is {@linkplain #isReadOnly() read-only}.
      */
     @ForceInline
     default void setAtIndex(ValueLayout.OfAddress layout, long index, Addressable value) {
+        Utils.checkElementAlignment(layout, "Layout alignment greater than its size");
         layout.accessHandle().set(this, Utils.scaleOffset(this, index, layout.byteSize()), value.address());
     }
 
@@ -1598,7 +1742,9 @@ public sealed interface MemorySegment extends Addressable permits AbstractMemory
      * @param dstIndex the starting index of the destination array.
      * @param elementCount the number of array elements to be copied.
      * @throws  IllegalArgumentException if {@code dstArray} is not an array, or if it is an array but whose type is not supported,
-     * or if the destination array component type does not match the carrier of the source element layout.
+     * if the destination array component type does not match the carrier of the source element layout, if the source
+     * segment/offset are incompatible with the alignment constraints in the source element layout,
+     * or if the destination element layout alignment is greater than its size.
      */
     @ForceInline
     static void copy(
@@ -1614,6 +1760,10 @@ public sealed interface MemorySegment extends Addressable permits AbstractMemory
         int dstBase = (int)baseAndScale;
         int dstWidth = (int)(baseAndScale >> 32);
         AbstractMemorySegmentImpl srcImpl = (AbstractMemorySegmentImpl)srcSegment;
+        Utils.checkElementAlignment(srcLayout, "Source layout alignment greater than its size");
+        if (!srcImpl.isAlignedForElement(srcOffset, srcLayout)) {
+            throw new IllegalArgumentException("Source segment incompatible with alignment constraints");
+        }
         srcImpl.checkAccess(srcOffset, elementCount * dstWidth, true);
         Objects.checkFromIndexSize(dstIndex, elementCount, Array.getLength(dstArray));
         if (dstWidth == 1 || srcLayout.order() == ByteOrder.nativeOrder()) {
@@ -1639,7 +1789,9 @@ public sealed interface MemorySegment extends Addressable permits AbstractMemory
      * @param dstOffset the starting offset, in bytes, of the destination segment.
      * @param elementCount the number of array elements to be copied.
      * @throws  IllegalArgumentException if {@code srcArray} is not an array, or if it is an array but whose type is not supported,
-     * or if the source array component type does not match the carrier of the destination element layout.
+     * if the source array component type does not match the carrier of the destination element layout, if the destination
+     * segment/offset are incompatible with the alignment constraints in the destination element layout,
+     * or if the destination element layout alignment is greater than its size.
      */
     @ForceInline
     static void copy(
@@ -1656,6 +1808,10 @@ public sealed interface MemorySegment extends Addressable permits AbstractMemory
         int srcWidth = (int)(baseAndScale >> 32);
         Objects.checkFromIndexSize(srcIndex, elementCount, Array.getLength(srcArray));
         AbstractMemorySegmentImpl destImpl = (AbstractMemorySegmentImpl)dstSegment;
+        Utils.checkElementAlignment(dstLayout, "Destination layout alignment greater than its size");
+        if (!destImpl.isAlignedForElement(dstOffset, dstLayout)) {
+            throw new IllegalArgumentException("Destination segment incompatible with alignment constraints");
+        }
         destImpl.checkAccess(dstOffset, elementCount * srcWidth, false);
         if (srcWidth == 1 || dstLayout.order() == ByteOrder.nativeOrder()) {
             ScopedMemoryAccess.getScopedMemoryAccess().copyMemory(null, destImpl.scope(),
diff --git a/src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/NativeSymbol.java b/src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/NativeSymbol.java
index bf137e965d74c3e699c50b4bd6a8800474cf866f..3dc583f98fc0273e742b9f5d812101df561072a2 100644
--- a/src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/NativeSymbol.java
+++ b/src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/NativeSymbol.java
@@ -43,22 +43,19 @@ import java.util.Objects;
 sealed public interface NativeSymbol extends Addressable permits NativeSymbolImpl {
 
     /**
-     * Returns the name of this symbol.
-     * @return the name of this symbol.
+     * {@return the name of this symbol}
      */
     String name();
 
     /**
-     * Returns the resource scope associated with this symbol.
-     * @return the resource scope associated with this symbol.
+     * {@return the resource scope associated with this symbol}
      */
     ResourceScope scope();
 
     /**
-     * Returns the memory address associated with this symbol.
+     * {@return the memory address associated with this symbol}
      * @throws IllegalStateException if the scope associated with this symbol has been closed, or if access occurs from
      * a thread other than the thread owning that scope.
-     * @return The memory address associated with this symbol.
      */
     @Override
     MemoryAddress address();
diff --git a/src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/ResourceScope.java b/src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/ResourceScope.java
index 24665c7dfe9fcbb588dfa5a291a3ffce9a9e29db..6c5d6b2b66fc24f598115b40e0bae5f8617cdf84 100644
--- a/src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/ResourceScope.java
+++ b/src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/ResourceScope.java
@@ -147,8 +147,7 @@ import java.util.Spliterator;
  */
 public sealed interface ResourceScope extends AutoCloseable permits ResourceScopeImpl {
     /**
-     * Is this resource scope alive?
-     * @return true, if this resource scope is alive.
+     * {@return {@code true}, if this resource scope is alive}
      * @see ResourceScope#close()
      */
     boolean isAlive();
diff --git a/src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/SequenceLayout.java b/src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/SequenceLayout.java
index 13ac71927288931165273ba74dd008f5d1721af8..8143d2929cea6fc073cf9a2d7e2464c7a239bebd 100644
--- a/src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/SequenceLayout.java
+++ b/src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/SequenceLayout.java
@@ -82,18 +82,14 @@ public final class SequenceLayout extends AbstractLayout implements MemoryLayout
     }
 
     /**
-     * Returns the element layout associated with this sequence layout.
-     *
-     * @return The element layout associated with this sequence layout.
+     * {@return the element layout associated with this sequence layout}
      */
     public MemoryLayout elementLayout() {
         return elementLayout;
     }
 
     /**
-     * Returns the element count of this sequence layout (if any).
-     *
-     * @return the element count of this sequence layout (if any).
+     * {@return the element count of this sequence layout (if any)}
      */
     public OptionalLong elementCount() {
         return elemCount;
diff --git a/src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/VaList.java b/src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/VaList.java
index 1bc449fa907c374c8d4b973dfc9bf017a6310da7..73ede4e4e9a4242585017a71a9fa1fce80726f6d 100644
--- a/src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/VaList.java
+++ b/src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/VaList.java
@@ -132,8 +132,7 @@ sealed public interface VaList extends Addressable permits WinVaList, SysVVaList
     void skip(MemoryLayout... layouts);
 
     /**
-     * Returns the resource scope associated with this variable argument list.
-     * @return the resource scope associated with this variable argument list.
+     * {@return the resource scope associated with this variable argument list}
      */
     ResourceScope scope();
 
@@ -153,10 +152,9 @@ sealed public interface VaList extends Addressable permits WinVaList, SysVVaList
     VaList copy();
 
     /**
-     * Returns the memory address associated with this variable argument list.
+     * {@return the {@linkplain MemoryAddress memory address} associated with this variable argument list}
      * @throws IllegalStateException if the scope associated with this variable argument list has been closed, or if access occurs from
      * a thread other than the thread owning that scope.
-     * @return The memory address associated with this variable argument list.
      */
     @Override
     MemoryAddress address();
diff --git a/src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/ValueLayout.java b/src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/ValueLayout.java
index 3ce22d8743f3a35d462741a13549cf64a79216dd..c2df9e1b25f972f3202b5320874c59e47fc261af 100644
--- a/src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/ValueLayout.java
+++ b/src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/ValueLayout.java
@@ -41,9 +41,9 @@ import java.util.OptionalLong;
 
 /**
  * A value layout. A value layout is used to model the memory layout associated with values of basic data types, such as integral types
- * (either signed or unsigned) and floating-point types. Each value layout has a size, an alignment, a {@linkplain ByteOrder byte order})
- * and a carrier, that is, the Java type that should be used when {@linkplain MemorySegment#get(OfInt, long) accessing}
- * a memory region using the value layout.
+ * (either signed or unsigned) and floating-point types. Each value layout has a size, an alignment (in bits),
+ * a {@linkplain ByteOrder byte order}, and a carrier, that is, the Java type that should be used when
+ * {@linkplain MemorySegment#get(OfInt, long) accessing} a memory region using the value layout.
  * 
    
  * This class defines useful value layout constants for Java primitive types and addresses.
  * The layout constants in this class make implicit alignment and byte-ordering assumption: all layout
@@ -82,9 +82,7 @@ public sealed class ValueLayout extends AbstractLayout implements MemoryLayout {
     }
 
     /**
-     * Returns the value's byte order.
-     *
-     * @return the value's  byte order.
+     * {@return the value's byte order}
      */
     public ByteOrder order() {
         return order;
@@ -125,8 +123,7 @@ public sealed class ValueLayout extends AbstractLayout implements MemoryLayout {
     }
 
     /**
-     * Returns the carrier associated with this value layout.
-     * @return the carrier associated with this value layout.
+     * {@return the carrier associated with this value layout}
      */
     public Class carrier() {
         return carrier;
@@ -513,8 +510,8 @@ public sealed class ValueLayout extends AbstractLayout implements MemoryLayout {
     }
 
     /**
-     * A value layout constant whose size is the same as that of a machine address (e.g. {@code size_t}),
-     * bit-alignment set to 8, and byte order set to {@link ByteOrder#nativeOrder()}.
+     * A value layout constant whose size is the same as that of a machine address ({@code size_t}),
+     * bit alignment set to 8, and byte order set to {@link ByteOrder#nativeOrder()}.
      * Equivalent to the following code:
      * {@snippet lang=java :
      * MemoryLayout.valueLayout(MemoryAddress.class, ByteOrder.nativeOrder()).withBitAlignment(8);
@@ -524,7 +521,7 @@ public sealed class ValueLayout extends AbstractLayout implements MemoryLayout {
 
     /**
      * A value layout constant whose size is the same as that of a Java {@code byte},
-     * bit-alignment set to 8, and byte order set to {@link ByteOrder#nativeOrder()}.
+     * bit alignment set to 8, and byte order set to {@link ByteOrder#nativeOrder()}.
      * Equivalent to the following code:
      * {@snippet lang=java :
      * MemoryLayout.valueLayout(byte.class, ByteOrder.nativeOrder()).withBitAlignment(8);
@@ -534,7 +531,7 @@ public sealed class ValueLayout extends AbstractLayout implements MemoryLayout {
 
     /**
      * A value layout constant whose size is the same as that of a Java {@code boolean},
-     * bit-alignment set to 8, and byte order set to {@link ByteOrder#nativeOrder()}.
+     * bit alignment set to 8, and byte order set to {@link ByteOrder#nativeOrder()}.
      * Equivalent to the following code:
      * {@snippet lang=java :
      * MemoryLayout.valueLayout(boolean.class, ByteOrder.nativeOrder()).withBitAlignment(8);
@@ -544,7 +541,7 @@ public sealed class ValueLayout extends AbstractLayout implements MemoryLayout {
 
     /**
      * A value layout constant whose size is the same as that of a Java {@code char},
-     * bit-alignment set to 8, and byte order set to {@link ByteOrder#nativeOrder()}.
+     * bit alignment set to 8, and byte order set to {@link ByteOrder#nativeOrder()}.
      * Equivalent to the following code:
      * {@snippet lang=java :
      * MemoryLayout.valueLayout(char.class, ByteOrder.nativeOrder()).withBitAlignment(8);
@@ -554,7 +551,7 @@ public sealed class ValueLayout extends AbstractLayout implements MemoryLayout {
 
     /**
      * A value layout constant whose size is the same as that of a Java {@code short},
-     * bit-alignment set to 8, and byte order set to {@link ByteOrder#nativeOrder()}.
+     * bit alignment set to 8, and byte order set to {@link ByteOrder#nativeOrder()}.
      * Equivalent to the following code:
      * {@snippet lang=java :
      * MemoryLayout.valueLayout(short.class, ByteOrder.nativeOrder()).withBitAlignment(8);
@@ -564,7 +561,7 @@ public sealed class ValueLayout extends AbstractLayout implements MemoryLayout {
 
     /**
      * A value layout constant whose size is the same as that of a Java {@code int},
-     * bit-alignment set to 8, and byte order set to {@link ByteOrder#nativeOrder()}.
+     * bit alignment set to 8, and byte order set to {@link ByteOrder#nativeOrder()}.
      * Equivalent to the following code:
      * {@snippet lang=java :
      * MemoryLayout.valueLayout(int.class, ByteOrder.nativeOrder()).withBitAlignment(8);
@@ -574,7 +571,7 @@ public sealed class ValueLayout extends AbstractLayout implements MemoryLayout {
 
     /**
      * A value layout constant whose size is the same as that of a Java {@code long},
-     * bit-alignment set to 8, and byte order set to {@link ByteOrder#nativeOrder()}.
+     * bit alignment set to 8, and byte order set to {@link ByteOrder#nativeOrder()}.
      * Equivalent to the following code:
      * {@snippet lang=java :
      * MemoryLayout.valueLayout(long.class, ByteOrder.nativeOrder()).withBitAlignment(8);
@@ -585,7 +582,7 @@ public sealed class ValueLayout extends AbstractLayout implements MemoryLayout {
 
     /**
      * A value layout constant whose size is the same as that of a Java {@code float},
-     * bit-alignment set to 8, and byte order set to {@link ByteOrder#nativeOrder()}.
+     * bit alignment set to 8, and byte order set to {@link ByteOrder#nativeOrder()}.
      * Equivalent to the following code:
      * {@snippet lang=java :
      * MemoryLayout.valueLayout(float.class, ByteOrder.nativeOrder()).withBitAlignment(8);
@@ -595,7 +592,7 @@ public sealed class ValueLayout extends AbstractLayout implements MemoryLayout {
 
     /**
      * A value layout constant whose size is the same as that of a Java {@code double},
-     * bit-alignment set to 8, and byte order set to {@link ByteOrder#nativeOrder()}.
+     * bit alignment set to 8, and byte order set to {@link ByteOrder#nativeOrder()}.
      * Equivalent to the following code:
      * {@snippet lang=java :
      * MemoryLayout.valueLayout(double.class, ByteOrder.nativeOrder()).withBitAlignment(8);
diff --git a/src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/package-info.java b/src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/package-info.java
index 3621495d064732809b4c3e97be652ed8c6b2666f..a74c6d3a55d7d2a80dd49caa5459245de2a8ea48 100644
--- a/src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/package-info.java
+++ b/src/jdk.incubator.foreign/share/classes/jdk/incubator/foreign/package-info.java
@@ -30,7 +30,7 @@
  * 
    Foreign memory access
    
  *
  * 
    
- * The main abstractions introduced to support foreign memory access is {@link jdk.incubator.foreign.MemorySegment}, which
+ * The main abstraction introduced to support foreign memory access is {@link jdk.incubator.foreign.MemorySegment}, which
  * models a contiguous memory region, which can reside either inside or outside the Java heap.
  * A memory segment represents the main access coordinate of a memory access var handle, which can be obtained
  * using the combinator methods defined in the {@link jdk.incubator.foreign.MemoryHandles} class; a set of
diff --git a/src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/AbstractMemorySegmentImpl.java b/src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/AbstractMemorySegmentImpl.java
index eacbeb26a519282d878018cd55db213c47df531b..6ced72bc1af7b8204783a894dd293fe5e45956b3 100644
--- a/src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/AbstractMemorySegmentImpl.java
+++ b/src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/AbstractMemorySegmentImpl.java
@@ -124,8 +124,12 @@ public abstract non-sealed class AbstractMemorySegmentImpl extends MemorySegment
         if (elementLayout.byteSize() == 0) {
             throw new IllegalArgumentException("Element layout size cannot be zero");
         }
-        if (byteSize() % elementLayout.byteSize() != 0) {
-            throw new IllegalArgumentException("Segment size is no a multiple of layout size");
+        Utils.checkElementAlignment(elementLayout, "Element layout alignment greater than its size");
+        if (!isAlignedForElement(0, elementLayout)) {
+            throw new IllegalArgumentException("Incompatible alignment constraints");
+        }
+        if (!Utils.isAligned(byteSize(), elementLayout.byteSize())) {
+            throw new IllegalArgumentException("Segment size is not a multiple of layout size");
         }
         return new SegmentSplitter(elementLayout.byteSize(), byteSize() / elementLayout.byteSize(),
                 this);
@@ -360,11 +364,7 @@ public abstract non-sealed class AbstractMemorySegmentImpl extends MemorySegment
     }
 
     void checkValidState() {
-        try {
-            scope.checkValidState();
-        } catch (ScopedMemoryAccess.Scope.ScopedAccessError ex) {
-            throw new IllegalStateException("This segment is already closed");
-        }
+        scope.checkValidStateSlow();
     }
 
     @Override
@@ -383,8 +383,13 @@ public abstract non-sealed class AbstractMemorySegmentImpl extends MemorySegment
         return (this.mask & mask) != 0;
     }
 
+    @ForceInline
+    public final boolean isAlignedForElement(long offset, MemoryLayout layout) {
+        return (((unsafeGetOffset() + offset) | maxAlignMask()) & (layout.byteAlignment() - 1)) == 0;
+    }
+
     private int checkArraySize(String typeName, int elemSize) {
-        if (length % elemSize != 0) {
+        if (!Utils.isAligned(length, elemSize)) {
             throw new IllegalStateException(String.format("Segment size is not a multiple of %d. Size: %d", elemSize, length));
         }
         long arraySize = length / elemSize;
diff --git a/src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/ConfinedScope.java b/src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/ConfinedScope.java
index ac8850258c15cf4842cac7b9493eef284987040d..a0a7d01cea6872aeb20454101c0b119ce161571f 100644
--- a/src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/ConfinedScope.java
+++ b/src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/ConfinedScope.java
@@ -39,10 +39,7 @@ import java.lang.ref.Cleaner;
  */
 final class ConfinedScope extends ResourceScopeImpl {
 
-    private boolean closed; // = false
-    private int lockCount = 0;
     private int asyncReleaseCount = 0;
-    private final Thread owner;
 
     static final VarHandle ASYNC_RELEASE_COUNT;
 
@@ -55,40 +52,29 @@ final class ConfinedScope extends ResourceScopeImpl {
     }
 
     public ConfinedScope(Thread owner, Cleaner cleaner) {
-        super(new ConfinedResourceList(), cleaner);
-        this.owner = owner;
-    }
-
-    @ForceInline
-    public final void checkValidState() {
-        if (owner != Thread.currentThread()) {
-            throw new IllegalStateException("Attempted access outside owning thread");
-        }
-        if (closed) {
-            throw new IllegalStateException("Already closed");
-        }
+        super(owner, new ConfinedResourceList(), cleaner);
     }
 
     @Override
     public boolean isAlive() {
-        return !closed;
+        return state != CLOSED;
     }
 
     @Override
     @ForceInline
     public void acquire0() {
-        checkValidState();
-        if (lockCount == MAX_FORKS) {
+        checkValidStateSlow();
+        if (state == MAX_FORKS) {
             throw new IllegalStateException("Scope keep alive limit exceeded");
         }
-        lockCount++;
+        state++;
     }
 
     @Override
     @ForceInline
     public void release0() {
         if (Thread.currentThread() == owner) {
-            lockCount--;
+            state--;
         } else {
             // It is possible to end up here in two cases: this scope was kept alive by some other confined scope
             // which is implicitly released (in which case the release call comes from the cleaner thread). Or,
@@ -99,19 +85,14 @@ final class ConfinedScope extends ResourceScopeImpl {
     }
 
     void justClose() {
-        this.checkValidState();
-        if (lockCount == 0 || lockCount - ((int)ASYNC_RELEASE_COUNT.getVolatile(this)) == 0) {
-            closed = true;
+        checkValidStateSlow();
+        if (state == 0 || state - ((int)ASYNC_RELEASE_COUNT.getVolatile(this)) == 0) {
+            state = CLOSED;
         } else {
-            throw new IllegalStateException("Scope is kept alive by " + lockCount + " scopes");
+            throw new IllegalStateException("Scope is kept alive by " + state + " scopes");
         }
     }
 
-    @Override
-    public Thread ownerThread() {
-        return owner;
-    }
-
     /**
      * A confined resource list; no races are possible here.
      */
diff --git a/src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/HeapMemorySegmentImpl.java b/src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/HeapMemorySegmentImpl.java
index 755d6cb14dc247a31e89299741c6fb805dea7b37..4d2249261a3a892d0d32c3d632014ca70ebf150b 100644
--- a/src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/HeapMemorySegmentImpl.java
+++ b/src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/HeapMemorySegmentImpl.java
@@ -36,29 +36,38 @@ import java.nio.ByteBuffer;
 import java.util.Objects;
 
 /**
- * Implementation for heap memory segments. An heap memory segment is composed by an offset and
+ * Implementation for heap memory segments. A heap memory segment is composed by an offset and
  * a base object (typically an array). To enhance performances, the access to the base object needs to feature
  * sharp type information, as well as sharp null-check information. For this reason, many concrete subclasses
  * of {@link HeapMemorySegmentImpl} are defined (e.g. {@link OfFloat}, so that each subclass can override the
- * {@link HeapMemorySegmentImpl#base()} method so that it returns an array of the correct (sharp) type.
+ * {@link HeapMemorySegmentImpl#base()} method so that it returns an array of the correct (sharp) type. Note that
+ * the field type storing the 'base' coordinate is just Object; similarly, all the constructor in the subclasses
+ * accept an Object 'base' parameter instead of a sharper type (e.g. {@code byte[]}). This is deliberate, as
+ * using sharper types would require use of type-conversions, which in turn would inhibit some C2 optimizations,
+ * such as the elimination of store barriers in methods like {@link HeapMemorySegmentImpl#dup(long, long, int, ResourceScopeImpl)}.
  */
-public abstract class HeapMemorySegmentImpl extends AbstractMemorySegmentImpl {
+public abstract class HeapMemorySegmentImpl extends AbstractMemorySegmentImpl {
 
     private static final Unsafe UNSAFE = Unsafe.getUnsafe();
     private static final int BYTE_ARR_BASE = UNSAFE.arrayBaseOffset(byte[].class);
 
+    private static final long MAX_ALIGN_1 = 1;
+    private static final long MAX_ALIGN_2 = 2;
+    private static final long MAX_ALIGN_4 = 4;
+    private static final long MAX_ALIGN_8 = 8;
+
     final long offset;
-    final H base;
+    final Object base;
 
     @ForceInline
-    HeapMemorySegmentImpl(long offset, H base, long length, int mask) {
+    HeapMemorySegmentImpl(long offset, Object base, long length, int mask) {
         super(length, mask, ResourceScopeImpl.GLOBAL);
         this.offset = offset;
         this.base = base;
     }
 
     @Override
-    abstract H base();
+    abstract Object base();
 
     @Override
     long min() {
@@ -66,7 +75,7 @@ public abstract class HeapMemorySegmentImpl extends AbstractMemorySegmentImpl
     }
 
     @Override
-    abstract HeapMemorySegmentImpl dup(long offset, long size, int mask, ResourceScopeImpl scope);
+    abstract HeapMemorySegmentImpl dup(long offset, long size, int mask, ResourceScopeImpl scope);
 
     @Override
     ByteBuffer makeByteBuffer() {
@@ -79,9 +88,9 @@ public abstract class HeapMemorySegmentImpl extends AbstractMemorySegmentImpl
 
     // factories
 
-    public static class OfByte extends HeapMemorySegmentImpl {
+    public static class OfByte extends HeapMemorySegmentImpl {
 
-        OfByte(long offset, byte[] base, long length, int mask) {
+        OfByte(long offset, Object base, long length, int mask) {
             super(offset, base, length, mask);
         }
 
@@ -92,7 +101,7 @@ public abstract class HeapMemorySegmentImpl extends AbstractMemorySegmentImpl
 
         @Override
         byte[] base() {
-            return Objects.requireNonNull(base);
+            return (byte[])Objects.requireNonNull(base);
         }
 
         public static MemorySegment fromArray(byte[] arr) {
@@ -100,11 +109,16 @@ public abstract class HeapMemorySegmentImpl extends AbstractMemorySegmentImpl
             long byteSize = (long)arr.length * Unsafe.ARRAY_BYTE_INDEX_SCALE;
             return new OfByte(Unsafe.ARRAY_BYTE_BASE_OFFSET, arr, byteSize, defaultAccessModes(byteSize));
         }
+
+        @Override
+        public long maxAlignMask() {
+            return MAX_ALIGN_1;
+        }
     }
 
-    public static class OfChar extends HeapMemorySegmentImpl {
+    public static class OfChar extends HeapMemorySegmentImpl {
 
-        OfChar(long offset, char[] base, long length, int mask) {
+        OfChar(long offset, Object base, long length, int mask) {
             super(offset, base, length, mask);
         }
 
@@ -115,7 +129,7 @@ public abstract class HeapMemorySegmentImpl extends AbstractMemorySegmentImpl
 
         @Override
         char[] base() {
-            return Objects.requireNonNull(base);
+            return (char[])Objects.requireNonNull(base);
         }
 
         public static MemorySegment fromArray(char[] arr) {
@@ -123,11 +137,16 @@ public abstract class HeapMemorySegmentImpl extends AbstractMemorySegmentImpl
             long byteSize = (long)arr.length * Unsafe.ARRAY_CHAR_INDEX_SCALE;
             return new OfChar(Unsafe.ARRAY_CHAR_BASE_OFFSET, arr, byteSize, defaultAccessModes(byteSize));
         }
+
+        @Override
+        public long maxAlignMask() {
+            return MAX_ALIGN_2;
+        }
     }
 
-    public static class OfShort extends HeapMemorySegmentImpl {
+    public static class OfShort extends HeapMemorySegmentImpl {
 
-        OfShort(long offset, short[] base, long length, int mask) {
+        OfShort(long offset, Object base, long length, int mask) {
             super(offset, base, length, mask);
         }
 
@@ -138,7 +157,7 @@ public abstract class HeapMemorySegmentImpl extends AbstractMemorySegmentImpl
 
         @Override
         short[] base() {
-            return Objects.requireNonNull(base);
+            return (short[])Objects.requireNonNull(base);
         }
 
         public static MemorySegment fromArray(short[] arr) {
@@ -146,11 +165,16 @@ public abstract class HeapMemorySegmentImpl extends AbstractMemorySegmentImpl
             long byteSize = (long)arr.length * Unsafe.ARRAY_SHORT_INDEX_SCALE;
             return new OfShort(Unsafe.ARRAY_SHORT_BASE_OFFSET, arr, byteSize, defaultAccessModes(byteSize));
         }
+
+        @Override
+        public long maxAlignMask() {
+            return MAX_ALIGN_2;
+        }
     }
 
-    public static class OfInt extends HeapMemorySegmentImpl {
+    public static class OfInt extends HeapMemorySegmentImpl {
 
-        OfInt(long offset, int[] base, long length, int mask) {
+        OfInt(long offset, Object base, long length, int mask) {
             super(offset, base, length, mask);
         }
 
@@ -161,7 +185,7 @@ public abstract class HeapMemorySegmentImpl extends AbstractMemorySegmentImpl
 
         @Override
         int[] base() {
-            return Objects.requireNonNull(base);
+            return (int[])Objects.requireNonNull(base);
         }
 
         public static MemorySegment fromArray(int[] arr) {
@@ -169,11 +193,16 @@ public abstract class HeapMemorySegmentImpl extends AbstractMemorySegmentImpl
             long byteSize = (long)arr.length * Unsafe.ARRAY_INT_INDEX_SCALE;
             return new OfInt(Unsafe.ARRAY_INT_BASE_OFFSET, arr, byteSize, defaultAccessModes(byteSize));
         }
+
+        @Override
+        public long maxAlignMask() {
+            return MAX_ALIGN_4;
+        }
     }
 
-    public static class OfLong extends HeapMemorySegmentImpl {
+    public static class OfLong extends HeapMemorySegmentImpl {
 
-        OfLong(long offset, long[] base, long length, int mask) {
+        OfLong(long offset, Object base, long length, int mask) {
             super(offset, base, length, mask);
         }
 
@@ -184,7 +213,7 @@ public abstract class HeapMemorySegmentImpl extends AbstractMemorySegmentImpl
 
         @Override
         long[] base() {
-            return Objects.requireNonNull(base);
+            return (long[])Objects.requireNonNull(base);
         }
 
         public static MemorySegment fromArray(long[] arr) {
@@ -192,11 +221,16 @@ public abstract class HeapMemorySegmentImpl extends AbstractMemorySegmentImpl
             long byteSize = (long)arr.length * Unsafe.ARRAY_LONG_INDEX_SCALE;
             return new OfLong(Unsafe.ARRAY_LONG_BASE_OFFSET, arr, byteSize, defaultAccessModes(byteSize));
         }
+
+        @Override
+        public long maxAlignMask() {
+            return MAX_ALIGN_8;
+        }
     }
 
-    public static class OfFloat extends HeapMemorySegmentImpl {
+    public static class OfFloat extends HeapMemorySegmentImpl {
 
-        OfFloat(long offset, float[] base, long length, int mask) {
+        OfFloat(long offset, Object base, long length, int mask) {
             super(offset, base, length, mask);
         }
 
@@ -207,7 +241,7 @@ public abstract class HeapMemorySegmentImpl extends AbstractMemorySegmentImpl
 
         @Override
         float[] base() {
-            return Objects.requireNonNull(base);
+            return (float[])Objects.requireNonNull(base);
         }
 
         public static MemorySegment fromArray(float[] arr) {
@@ -215,11 +249,16 @@ public abstract class HeapMemorySegmentImpl extends AbstractMemorySegmentImpl
             long byteSize = (long)arr.length * Unsafe.ARRAY_FLOAT_INDEX_SCALE;
             return new OfFloat(Unsafe.ARRAY_FLOAT_BASE_OFFSET, arr, byteSize, defaultAccessModes(byteSize));
         }
+
+        @Override
+        public long maxAlignMask() {
+            return MAX_ALIGN_4;
+        }
     }
 
-    public static class OfDouble extends HeapMemorySegmentImpl {
+    public static class OfDouble extends HeapMemorySegmentImpl {
 
-        OfDouble(long offset, double[] base, long length, int mask) {
+        OfDouble(long offset, Object base, long length, int mask) {
             super(offset, base, length, mask);
         }
 
@@ -230,7 +269,7 @@ public abstract class HeapMemorySegmentImpl extends AbstractMemorySegmentImpl
 
         @Override
         double[] base() {
-            return Objects.requireNonNull(base);
+            return (double[])Objects.requireNonNull(base);
         }
 
         public static MemorySegment fromArray(double[] arr) {
@@ -238,6 +277,11 @@ public abstract class HeapMemorySegmentImpl extends AbstractMemorySegmentImpl
             long byteSize = (long)arr.length * Unsafe.ARRAY_DOUBLE_INDEX_SCALE;
             return new OfDouble(Unsafe.ARRAY_DOUBLE_BASE_OFFSET, arr, byteSize, defaultAccessModes(byteSize));
         }
+
+        @Override
+        public long maxAlignMask() {
+            return MAX_ALIGN_8;
+        }
     }
 
 }
diff --git a/src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/LayoutPath.java b/src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/LayoutPath.java
index 1d8bb265c839f13bd51505ed5b56fc943284ce63..dbe52a697998049dbb2bc68b553c0c9224803a75 100644
--- a/src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/LayoutPath.java
+++ b/src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/LayoutPath.java
@@ -282,11 +282,11 @@ public class LayoutPath {
     private static void checkAlignment(LayoutPath path) {
         MemoryLayout layout = path.layout;
         long alignment = layout.bitAlignment();
-        if (path.offset % alignment != 0) {
+        if (!Utils.isAligned(path.offset, alignment)) {
             throw new UnsupportedOperationException("Invalid alignment requirements for layout " + layout);
         }
         for (long stride : path.strides) {
-            if (stride % alignment != 0) {
+            if (!Utils.isAligned(stride, alignment)) {
                 throw new UnsupportedOperationException("Alignment requirements for layout " + layout + " do not match stride " + stride);
             }
         }
diff --git a/src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/MemoryAddressImpl.java b/src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/MemoryAddressImpl.java
index 59d7105082cfc8876b2f0daa2db592adef99ca13..7bb5590757190b540d7bfecc12020ac2bf55cead 100644
--- a/src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/MemoryAddressImpl.java
+++ b/src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/MemoryAddressImpl.java
@@ -267,6 +267,7 @@ public final class MemoryAddressImpl implements MemoryAddress, Scoped {
     @CallerSensitive
     public char getAtIndex(ValueLayout.OfChar layout, long index) {
         Reflection.ensureNativeAccess(Reflection.getCallerClass());
+        Utils.checkElementAlignment(layout, "Layout alignment greater than its size");
         return NativeMemorySegmentImpl.EVERYTHING.get(layout, toRawLongValue() + (index * layout.byteSize()));
     }
 
@@ -275,6 +276,7 @@ public final class MemoryAddressImpl implements MemoryAddress, Scoped {
     @CallerSensitive
     public void setAtIndex(ValueLayout.OfChar layout, long index, char value) {
         Reflection.ensureNativeAccess(Reflection.getCallerClass());
+        Utils.checkElementAlignment(layout, "Layout alignment greater than its size");
         NativeMemorySegmentImpl.EVERYTHING.set(layout, toRawLongValue() + (index * layout.byteSize()), value);
     }
 
@@ -283,6 +285,7 @@ public final class MemoryAddressImpl implements MemoryAddress, Scoped {
     @CallerSensitive
     public short getAtIndex(ValueLayout.OfShort layout, long index) {
         Reflection.ensureNativeAccess(Reflection.getCallerClass());
+        Utils.checkElementAlignment(layout, "Layout alignment greater than its size");
         return NativeMemorySegmentImpl.EVERYTHING.get(layout, toRawLongValue() + (index * layout.byteSize()));
     }
 
@@ -291,6 +294,7 @@ public final class MemoryAddressImpl implements MemoryAddress, Scoped {
     @CallerSensitive
     public void setAtIndex(ValueLayout.OfShort layout, long index, short value) {
         Reflection.ensureNativeAccess(Reflection.getCallerClass());
+        Utils.checkElementAlignment(layout, "Layout alignment greater than its size");
         NativeMemorySegmentImpl.EVERYTHING.set(layout, toRawLongValue() + (index * layout.byteSize()), value);
     }
 
@@ -299,6 +303,7 @@ public final class MemoryAddressImpl implements MemoryAddress, Scoped {
     @CallerSensitive
     public int getAtIndex(ValueLayout.OfInt layout, long index) {
         Reflection.ensureNativeAccess(Reflection.getCallerClass());
+        Utils.checkElementAlignment(layout, "Layout alignment greater than its size");
         return NativeMemorySegmentImpl.EVERYTHING.get(layout, toRawLongValue() + (index * layout.byteSize()));
     }
 
@@ -307,6 +312,7 @@ public final class MemoryAddressImpl implements MemoryAddress, Scoped {
     @CallerSensitive
     public void setAtIndex(ValueLayout.OfInt layout, long index, int value) {
         Reflection.ensureNativeAccess(Reflection.getCallerClass());
+        Utils.checkElementAlignment(layout, "Layout alignment greater than its size");
         NativeMemorySegmentImpl.EVERYTHING.set(layout, toRawLongValue() + (index * layout.byteSize()), value);
     }
 
@@ -315,6 +321,7 @@ public final class MemoryAddressImpl implements MemoryAddress, Scoped {
     @CallerSensitive
     public float getAtIndex(ValueLayout.OfFloat layout, long index) {
         Reflection.ensureNativeAccess(Reflection.getCallerClass());
+        Utils.checkElementAlignment(layout, "Layout alignment greater than its size");
         return NativeMemorySegmentImpl.EVERYTHING.get(layout, toRawLongValue() + (index * layout.byteSize()));
     }
 
@@ -323,6 +330,7 @@ public final class MemoryAddressImpl implements MemoryAddress, Scoped {
     @CallerSensitive
     public void setAtIndex(ValueLayout.OfFloat layout, long index, float value) {
         Reflection.ensureNativeAccess(Reflection.getCallerClass());
+        Utils.checkElementAlignment(layout, "Layout alignment greater than its size");
         NativeMemorySegmentImpl.EVERYTHING.set(layout, toRawLongValue() + (index * layout.byteSize()), value);
     }
 
@@ -331,6 +339,7 @@ public final class MemoryAddressImpl implements MemoryAddress, Scoped {
     @CallerSensitive
     public long getAtIndex(ValueLayout.OfLong layout, long index) {
         Reflection.ensureNativeAccess(Reflection.getCallerClass());
+        Utils.checkElementAlignment(layout, "Layout alignment greater than its size");
         return NativeMemorySegmentImpl.EVERYTHING.get(layout, toRawLongValue() + (index * layout.byteSize()));
     }
 
@@ -339,6 +348,7 @@ public final class MemoryAddressImpl implements MemoryAddress, Scoped {
     @CallerSensitive
     public void setAtIndex(ValueLayout.OfLong layout, long index, long value) {
         Reflection.ensureNativeAccess(Reflection.getCallerClass());
+        Utils.checkElementAlignment(layout, "Layout alignment greater than its size");
         NativeMemorySegmentImpl.EVERYTHING.set(layout, toRawLongValue() + (index * layout.byteSize()), value);
     }
 
@@ -347,6 +357,7 @@ public final class MemoryAddressImpl implements MemoryAddress, Scoped {
     @CallerSensitive
     public double getAtIndex(ValueLayout.OfDouble layout, long index) {
         Reflection.ensureNativeAccess(Reflection.getCallerClass());
+        Utils.checkElementAlignment(layout, "Layout alignment greater than its size");
         return NativeMemorySegmentImpl.EVERYTHING.get(layout, toRawLongValue() + (index * layout.byteSize()));
     }
 
@@ -355,6 +366,7 @@ public final class MemoryAddressImpl implements MemoryAddress, Scoped {
     @CallerSensitive
     public void setAtIndex(ValueLayout.OfDouble layout, long index, double value) {
         Reflection.ensureNativeAccess(Reflection.getCallerClass());
+        Utils.checkElementAlignment(layout, "Layout alignment greater than its size");
         NativeMemorySegmentImpl.EVERYTHING.set(layout, toRawLongValue() + (index * layout.byteSize()), value);
     }
 
@@ -363,6 +375,7 @@ public final class MemoryAddressImpl implements MemoryAddress, Scoped {
     @CallerSensitive
     public MemoryAddress getAtIndex(ValueLayout.OfAddress layout, long index) {
         Reflection.ensureNativeAccess(Reflection.getCallerClass());
+        Utils.checkElementAlignment(layout, "Layout alignment greater than its size");
         return NativeMemorySegmentImpl.EVERYTHING.get(layout, toRawLongValue() + (index * layout.byteSize()));
     }
 
@@ -371,6 +384,7 @@ public final class MemoryAddressImpl implements MemoryAddress, Scoped {
     @CallerSensitive
     public void setAtIndex(ValueLayout.OfAddress layout, long index, Addressable value) {
         Reflection.ensureNativeAccess(Reflection.getCallerClass());
+        Utils.checkElementAlignment(layout, "Layout alignment greater than its size");
         NativeMemorySegmentImpl.EVERYTHING.set(layout, toRawLongValue() + (index * layout.byteSize()), value.address());
     }
 }
diff --git a/src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/NativeMemorySegmentImpl.java b/src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/NativeMemorySegmentImpl.java
index 11f795a2f8434b936980bfb4f4c9dc0f980f4b71..bd06223b6ceb007447a824cf346ed142da65e10a 100644
--- a/src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/NativeMemorySegmentImpl.java
+++ b/src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/NativeMemorySegmentImpl.java
@@ -92,6 +92,11 @@ public class NativeMemorySegmentImpl extends AbstractMemorySegmentImpl {
         return null;
     }
 
+    @Override
+    public long maxAlignMask() {
+        return 0;
+    }
+
     // factories
 
     public static MemorySegment makeNativeSegment(long bytesSize, long alignmentBytes, ResourceScopeImpl scope) {
diff --git a/src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/NativeSymbolImpl.java b/src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/NativeSymbolImpl.java
index ede6a7ad5f8b3c6700d69bf55dd69b656d4d54d2..cb62a2c240f3e3ed3e455e2147f72c1dbd6cc72e 100644
--- a/src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/NativeSymbolImpl.java
+++ b/src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/NativeSymbolImpl.java
@@ -28,11 +28,12 @@ package jdk.internal.foreign;
 import jdk.incubator.foreign.MemoryAddress;
 import jdk.incubator.foreign.NativeSymbol;
 import jdk.incubator.foreign.ResourceScope;
+import jdk.internal.misc.ScopedMemoryAccess;
 
 public record NativeSymbolImpl(String name, MemoryAddress address, ResourceScope scope) implements NativeSymbol, Scoped {
     @Override
     public MemoryAddress address() {
-        ((ResourceScopeImpl)scope).checkValidState();
+        ((ResourceScopeImpl)scope).checkValidStateSlow();
         return address;
     }
 }
diff --git a/src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/ResourceScopeImpl.java b/src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/ResourceScopeImpl.java
index ab47db827e70a0661cbedeb2597b3563e509e30b..173753b15864f65d558f35a3b5b1ddb556eabb5c 100644
--- a/src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/ResourceScopeImpl.java
+++ b/src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/ResourceScopeImpl.java
@@ -32,6 +32,8 @@ import jdk.incubator.foreign.SegmentAllocator;
 import jdk.internal.misc.ScopedMemoryAccess;
 import jdk.internal.vm.annotation.ForceInline;
 
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
 import java.lang.ref.Cleaner;
 import java.lang.ref.Reference;
 import java.util.Objects;
@@ -53,6 +55,23 @@ public abstract non-sealed class ResourceScopeImpl implements ResourceScope, Seg
 
     final ResourceList resourceList;
     final Cleaner.Cleanable cleanable;
+    final Thread owner;
+
+    static final int ALIVE = 0;
+    static final int CLOSING = -1;
+    static final int CLOSED = -2;
+
+    int state = ALIVE;
+
+    static final VarHandle STATE;
+
+    static {
+        try {
+            STATE = MethodHandles.lookup().findVarHandle(ResourceScopeImpl.class, "state", int.class);
+        } catch (Throwable ex) {
+            throw new ExceptionInInitializerError(ex);
+        }
+    }
 
     static final int MAX_FORKS = Integer.MAX_VALUE;
 
@@ -89,7 +108,8 @@ public abstract non-sealed class ResourceScopeImpl implements ResourceScope, Seg
         }
     }
 
-    protected ResourceScopeImpl(ResourceList resourceList, Cleaner cleaner) {
+    protected ResourceScopeImpl(Thread owner, ResourceList resourceList, Cleaner cleaner) {
+        this.owner = owner;
         this.resourceList = resourceList;
         cleanable = (cleaner != null) ?
             cleaner.register(this, resourceList) : null;
@@ -147,7 +167,9 @@ public abstract non-sealed class ResourceScopeImpl implements ResourceScope, Seg
      * Returns "owner" thread of this scope.
      * @return owner thread (or null for a shared scope)
      */
-    public abstract Thread ownerThread();
+    public final Thread ownerThread() {
+        return owner;
+    }
 
     /**
      * Returns true, if this scope is still alive. This method may be called in any thread.
@@ -155,14 +177,23 @@ public abstract non-sealed class ResourceScopeImpl implements ResourceScope, Seg
      */
     public abstract boolean isAlive();
 
-
     /**
      * This is a faster version of {@link #checkValidStateSlow()}, which is called upon memory access, and which
-     * relies on invariants associated with the memory scope implementations (typically, volatile access
-     * to the closed state bit is replaced with plain access, and ownership check is removed where not needed.
-     * Should be used with care.
+     * relies on invariants associated with the memory scope implementations (volatile access
+     * to the closed state bit is replaced with plain access). This method should be monomorphic,
+     * to avoid virtual calls in the memory access hot path. This method is not intended as general purpose method
+     * and should only be used in the memory access handle hot path; for liveness checks triggered by other API methods,
+     * please use {@link #checkValidStateSlow()}.
      */
-    public abstract void checkValidState();
+    @ForceInline
+    public final void checkValidState() {
+        if (owner != null && owner != Thread.currentThread()) {
+            throw new IllegalStateException("Attempted access outside owning thread");
+        }
+        if (state < ALIVE) {
+            throw ScopedAccessError.INSTANCE;
+        }
+    }
 
     /**
      * Checks that this scope is still alive (see {@link #isAlive()}).
@@ -170,7 +201,7 @@ public abstract non-sealed class ResourceScopeImpl implements ResourceScope, Seg
      * a confined scope and this method is called outside of the owner thread.
      */
     public final void checkValidStateSlow() {
-        if (ownerThread() != null && Thread.currentThread() != ownerThread()) {
+        if (owner != null && Thread.currentThread() != owner) {
             throw new IllegalStateException("Attempted access outside owning thread");
         } else if (!isAlive()) {
             throw new IllegalStateException("Already closed");
diff --git a/src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/SharedScope.java b/src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/SharedScope.java
index 93ecf08d468503e5d64823866f6bb854be5d2b71..4d80eb9bbe586ceed5beeff0841589f7ffea29c7 100644
--- a/src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/SharedScope.java
+++ b/src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/SharedScope.java
@@ -45,36 +45,8 @@ class SharedScope extends ResourceScopeImpl {
 
     private static final ScopedMemoryAccess SCOPED_MEMORY_ACCESS = ScopedMemoryAccess.getScopedMemoryAccess();
 
-    private static final int ALIVE = 0;
-    private static final int CLOSING = -1;
-    private static final int CLOSED = -2;
-
-    private int state = ALIVE;
-
-    private static final VarHandle STATE;
-
-    static {
-        try {
-            STATE = MethodHandles.lookup().findVarHandle(jdk.internal.foreign.SharedScope.class, "state", int.class);
-        } catch (Throwable ex) {
-            throw new ExceptionInInitializerError(ex);
-        }
-    }
-
     SharedScope(Cleaner cleaner) {
-        super(new SharedResourceList(), cleaner);
-    }
-
-    @Override
-    public Thread ownerThread() {
-        return null;
-    }
-
-    @Override
-    public void checkValidState() {
-        if (state < ALIVE) {
-            throw ScopedAccessError.INSTANCE;
-        }
+        super(null, new SharedResourceList(), cleaner);
     }
 
     @Override
diff --git a/src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/Utils.java b/src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/Utils.java
index 6272e6e31005de03b6610013e831dd7c5dccfae9..bb9db16eff2514354806fe9475a253f4bca9f3d8 100644
--- a/src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/Utils.java
+++ b/src/jdk.incubator.foreign/share/classes/jdk/internal/foreign/Utils.java
@@ -98,7 +98,7 @@ public final class Utils {
     }
 
     public static long bitsToBytesOrThrow(long bits, Supplier exFactory) {
-        if (bits % 8 == 0) {
+        if (Utils.isAligned(bits, 8)) {
             return bits / 8;
         } else {
             throw exFactory.get();
@@ -173,4 +173,16 @@ public final class Utils {
         // note: we know size is a small value (as it comes from ValueLayout::byteSize())
         return MemorySegmentProxy.multiplyOffsets(index, (int)size, (AbstractMemorySegmentImpl)segment);
     }
+
+    @ForceInline
+    public static boolean isAligned(long offset, long align) {
+        return (offset & (align - 1)) == 0;
+    }
+
+    @ForceInline
+    public static void checkElementAlignment(MemoryLayout layout, String msg) {
+        if (layout.byteAlignment() > layout.byteSize()) {
+            throw new IllegalArgumentException(msg);
+        }
+    }
 }
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/MemoryBarriers.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/MemoryBarriers.java
index 074882c9054fcd3e0dd91899a268174ab7639ac7..08bc0856d3ed664774d1d0cd79ff54ecb71f04a5 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/MemoryBarriers.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.code/src/jdk/vm/ci/code/MemoryBarriers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java
index 50f35021ac8ae272b771331165c5fa9666cf5856..2c9097839b6bc560c4f6f4d5b342ceaa7e8f3f35 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2022, 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
@@ -849,7 +849,7 @@ final class CompilerToVM {
     /**
      * @see HotSpotJVMCIRuntime#translate(Object)
      */
-    native long translate(Object obj);
+    native long translate(Object obj, boolean callPostTranslation);
 
     /**
      * @see HotSpotJVMCIRuntime#unhand(Class, long)
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCallingConventionType.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCallingConventionType.java
index b554f17397228af599fe85d9c069c5e76ebda550..3a6f28ce2a9ef588aca63abf96f1c086df27e98b 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCallingConventionType.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCallingConventionType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCodeCacheProvider.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCodeCacheProvider.java
index 6c642e84bbd027c6eddaf6893cd182c7898d0514..6dfca075566530714d35c2e7d17edc21c10fdf0b 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCodeCacheProvider.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotCodeCacheProvider.java
@@ -109,22 +109,12 @@ public class HotSpotCodeCacheProvider implements CodeCacheProvider {
         HotSpotCompiledCode hsCompiledCode = (HotSpotCompiledCode) compiledCode;
         String name = hsCompiledCode.getName();
         HotSpotCompiledNmethod hsCompiledNmethod = null;
-        if (method == null) {
-            // Must be a stub
-            resultInstalledCode = new HotSpotRuntimeStub(name);
-        } else {
-            hsCompiledNmethod = (HotSpotCompiledNmethod) hsCompiledCode;
-            HotSpotResolvedJavaMethodImpl hsMethod = (HotSpotResolvedJavaMethodImpl) method;
-            resultInstalledCode = new HotSpotNmethod(hsMethod, name, isDefault, hsCompiledNmethod.id);
-        }
-
         HotSpotSpeculationLog speculationLog = null;
         if (log != null) {
             if (log.hasSpeculations()) {
                 speculationLog = (HotSpotSpeculationLog) log;
             }
         }
-
         byte[] speculations;
         long failedSpeculationsAddress;
         if (speculationLog != null) {
@@ -134,6 +124,18 @@ public class HotSpotCodeCacheProvider implements CodeCacheProvider {
             speculations = new byte[0];
             failedSpeculationsAddress = 0L;
         }
+
+        if (method == null) {
+            // Must be a stub
+            resultInstalledCode = new HotSpotRuntimeStub(name);
+        } else {
+            hsCompiledNmethod = (HotSpotCompiledNmethod) hsCompiledCode;
+            HotSpotResolvedJavaMethodImpl hsMethod = (HotSpotResolvedJavaMethodImpl) method;
+            HotSpotNmethod nmethod = new HotSpotNmethod(hsMethod, name, isDefault, hsCompiledNmethod.id);
+            nmethod.setSpeculationLog(speculationLog);
+            resultInstalledCode = nmethod;
+        }
+
         int result = runtime.getCompilerToVM().installCode(target, (HotSpotCompiledCode) compiledCode, resultInstalledCode, failedSpeculationsAddress, speculations);
         if (result != config.codeInstallResultOk) {
             String resultDesc = config.getCodeInstallResultDescription(result);
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java
index c7bfc83401c14987c780f82f730166d1e73cda85..b15035dd5cc74b30cd65d13dea406600c7ac9b71 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022, 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,8 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.ServiceLoader;
 import java.util.function.Predicate;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import jdk.internal.misc.Unsafe;
 import jdk.vm.ci.code.Architecture;
@@ -66,6 +68,7 @@ import jdk.vm.ci.runtime.JVMCICompiler;
 import jdk.vm.ci.runtime.JVMCICompilerFactory;
 import jdk.vm.ci.runtime.JVMCIRuntime;
 import jdk.vm.ci.services.JVMCIServiceLocator;
+import jdk.vm.ci.services.Services;
 
 /**
  * HotSpot implementation of a JVMCI runtime.
@@ -199,14 +202,44 @@ public final class HotSpotJVMCIRuntime implements JVMCIRuntime {
         return result;
     }
 
+    /**
+     * Decodes the exception encoded in {@code buffer} and throws it.
+     *
+     * @param buffer a native byte buffer containing an exception encoded by
+     *            {@link #encodeThrowable}
+     */
     @VMEntryPoint
-    static Throwable decodeThrowable(String encodedThrowable) throws Throwable {
-        return TranslatedException.decodeThrowable(encodedThrowable);
+    static void decodeAndThrowThrowable(long buffer) throws Throwable {
+        Unsafe unsafe = UnsafeAccess.UNSAFE;
+        int encodingLength = unsafe.getInt(buffer);
+        byte[] encoding = new byte[encodingLength];
+        unsafe.copyMemory(null, buffer + 4, encoding, Unsafe.ARRAY_BYTE_BASE_OFFSET, encodingLength);
+        throw TranslatedException.decodeThrowable(encoding);
     }
 
+    /**
+     * If {@code bufferSize} is large enough, encodes {@code throwable} into a byte array and writes
+     * it to {@code buffer}. The encoding in {@code buffer} can be decoded by
+     * {@link #decodeAndThrowThrowable}.
+     *
+     * @param throwable the exception to encode
+     * @param buffer a native byte buffer
+     * @param bufferSize the size of {@code buffer} in bytes
+     * @return the number of bytes written into {@code buffer} if {@code bufferSize} is large
+     *         enough, otherwise {@code -N} where {@code N} is the value {@code bufferSize} needs to
+     *         be to fit the encoding
+     */
     @VMEntryPoint
-    static String encodeThrowable(Throwable throwable) throws Throwable {
-        return TranslatedException.encodeThrowable(throwable);
+    static int encodeThrowable(Throwable throwable, long buffer, int bufferSize) throws Throwable {
+        byte[] encoding = TranslatedException.encodeThrowable(throwable);
+        int requiredSize = 4 + encoding.length;
+        if (bufferSize < requiredSize) {
+            return -requiredSize;
+        }
+        Unsafe unsafe = UnsafeAccess.UNSAFE;
+        unsafe.putInt(buffer, encoding.length);
+        unsafe.copyMemory(encoding, Unsafe.ARRAY_BYTE_BASE_OFFSET, null, buffer + 4, encoding.length);
+        return requiredSize;
     }
 
     @VMEntryPoint
@@ -235,6 +268,10 @@ public final class HotSpotJVMCIRuntime implements JVMCIRuntime {
         // Note: The following one is not used (see InitTimer.ENABLED). It is added here
         // so that -XX:+JVMCIPrintProperties shows the option.
         InitTimer(Boolean.class, false, "Specifies if initialization timing is enabled."),
+        ForceTranslateFailure(String.class, null, "Forces HotSpotJVMCIRuntime.translate to throw an exception in the context " +
+                "of the peer runtime. The value is a filter that can restrict the forced failure to matching translated " +
+                "objects. See HotSpotJVMCIRuntime.postTranslation for more details. This option exists soley to test " +
+                "correct handling of translation failure."),
         PrintConfig(Boolean.class, false, "Prints VM configuration available via JVMCI."),
         AuditHandles(Boolean.class, false, "Record stack trace along with scoped foreign object reference wrappers " +
                 "to debug issue with a wrapper being used after its scope has closed."),
@@ -1180,7 +1217,88 @@ public final class HotSpotJVMCIRuntime implements JVMCIRuntime {
      * @see "https://docs.oracle.com/javase/8/docs/technotes/guides/jni/spec/design.html#global_and_local_references"
      */
     public long translate(Object obj) {
-        return compilerToVm.translate(obj);
+        return compilerToVm.translate(obj, Option.ForceTranslateFailure.getString() != null);
+    }
+
+    private static final Pattern FORCE_TRANSLATE_FAILURE_FILTER_RE = Pattern.compile("(?:(method|type|nmethod)/)?([^:]+)(?::(hotspot|native))?");
+
+    /**
+     * Forces translation failure based on {@code translatedObject} and the value of
+     * {@link Option#ForceTranslateFailure}. The value is zero or more filters separated by a comma.
+     * The syntax for a filter is:
+     *
+     * 
    +     *   Filter = [ TypeSelector "/" ] Substring [ ":" JVMCIEnvSelector ] .
+     *   TypeSelector = "type" | "method" | "nmethod"
+     *   JVMCIEnvSelector = "native" | "hotspot"
+     * 
    
+     *
+     * For example:
+     *
+     * 
    +     *   -Djvmci.ForceTranslateFailure=nmethod/StackOverflowError:native,method/computeHash,execute
+     * 
    
+     *
+     * will cause failure of:
+     * 
      
+     * 
    • translating a {@link HotSpotNmethod} to the libjvmci heap whose fully qualified name
+     * contains "StackOverflowError"
      • 
+     * 
    • translating a {@link HotSpotResolvedJavaMethodImpl} to the libjvmci or HotSpot heap whose
+     * fully qualified name contains "computeHash"
      • 
+     * 
    • translating a {@link HotSpotNmethod}, {@link HotSpotResolvedJavaMethodImpl} or
+     * {@link HotSpotResolvedObjectTypeImpl} to the libjvmci or HotSpot heap whose fully qualified
+     * name contains "execute"
      • 
+     * 
    
+     */
+    @VMEntryPoint
+    static void postTranslation(Object translatedObject) {
+        String value = Option.ForceTranslateFailure.getString();
+        String toMatch;
+        String type;
+        if (translatedObject instanceof HotSpotResolvedJavaMethodImpl) {
+            toMatch = ((HotSpotResolvedJavaMethodImpl) translatedObject).format("%H.%n");
+            type = "method";
+        } else if (translatedObject instanceof HotSpotResolvedObjectTypeImpl) {
+            toMatch = ((HotSpotResolvedObjectTypeImpl) translatedObject).toJavaName();
+            type = "type";
+        } else if (translatedObject instanceof HotSpotNmethod) {
+            HotSpotNmethod nmethod = (HotSpotNmethod) translatedObject;
+            if (nmethod.getMethod() != null) {
+                toMatch = nmethod.getMethod().format("%H.%n");
+            } else {
+                toMatch = String.valueOf(nmethod.getName());
+            }
+            type = "nmethod";
+        } else {
+            return;
+        }
+        String[] filters = value.split(",");
+        for (String filter : filters) {
+            Matcher m = FORCE_TRANSLATE_FAILURE_FILTER_RE.matcher(filter);
+            if (!m.matches()) {
+                throw new JVMCIError(Option.ForceTranslateFailure + " filter does not match " + FORCE_TRANSLATE_FAILURE_FILTER_RE + ": " + filter);
+            }
+            String typeSelector = m.group(1);
+            String substring = m.group(2);
+            String jvmciEnvSelector = m.group(3);
+            if (jvmciEnvSelector != null) {
+                if (jvmciEnvSelector.equals("native")) {
+                    if (!Services.IS_IN_NATIVE_IMAGE) {
+                        continue;
+                    }
+                } else {
+                    if (Services.IS_IN_NATIVE_IMAGE) {
+                        continue;
+                    }
+                }
+            }
+            if (typeSelector != null && !typeSelector.equals(type)) {
+                continue;
+            }
+            if (toMatch.contains(substring)) {
+                throw new JVMCIError("translation of " + translatedObject + " failed due to matching " + Option.ForceTranslateFailure + " filter \"" + filter + "\"");
+            }
+        }
     }
 
     /**
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotNmethod.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotNmethod.java
index 99fd3016f9834eb7ec54a3e2294901126c7bdb24..a18f7b556fafaacf04f27f1acccc37f989ea0c8e 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotNmethod.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotNmethod.java
@@ -68,8 +68,8 @@ public class HotSpotNmethod extends HotSpotInstalledCode {
 
     /**
      * If this field is 0, this object is in the oops table of the nmethod. Otherwise, the value of
-     * the field records the nmethod's compile identifier. This value is used to confirm an entry in
-     * the code cache retrieved by {@link #address} is indeed the nmethod represented by this
+     * the field records the nmethod's compile identifier. This value is used to confirm if an entry
+     * in the code cache retrieved by {@link #address} is indeed the nmethod represented by this
      * object.
      *
      * @see #inOopsTable
@@ -85,6 +85,23 @@ public class HotSpotNmethod extends HotSpotInstalledCode {
         assert inOopsTable || compileId != 0L : this;
     }
 
+    /**
+     * Attaches {@code log} to this object. If {@code log.managesFailedSpeculations() == true}, this
+     * ensures the failed speculation list lives at least as long as this object.
+     */
+    public void setSpeculationLog(HotSpotSpeculationLog log) {
+        this.speculationLog = log;
+    }
+
+    /**
+     * The speculation log containing speculations embedded in the nmethod.
+     *
+     * If {@code speculationLog.managesFailedSpeculations() == true}, this field ensures the failed
+     * speculation list lives at least as long as this object. This prevents deoptimization from
+     * appending to an already freed list.
+     */
+    @SuppressWarnings("unused") private HotSpotSpeculationLog speculationLog;
+
     /**
      * Determines if the nmethod associated with this object is the compiled entry point for
      * {@link #getMethod()}.
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/TranslatedException.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/TranslatedException.java
index a47735faf802006bf72031dc60ba6c5b6f235ec1..53f99733ba93f86d27059f525f7038a58f26598d 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/TranslatedException.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/TranslatedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, 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
@@ -22,13 +22,20 @@
  */
 package jdk.vm.ci.hotspot;
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.Formatter;
 import java.util.List;
-import java.util.Objects;
+import java.util.zip.GZIPInputStream;
+import java.util.zip.GZIPOutputStream;
+
+import jdk.vm.ci.common.JVMCIError;
 
 /**
  * Support for translating exceptions between different runtime heaps.
@@ -36,6 +43,26 @@ import java.util.Objects;
 @SuppressWarnings("serial")
 final class TranslatedException extends Exception {
 
+    /**
+     * The value returned by {@link #encodeThrowable(Throwable)} when encoding fails due to an
+     * {@link OutOfMemoryError}.
+     */
+    private static final byte[] FALLBACK_ENCODED_OUTOFMEMORYERROR_BYTES;
+
+    /**
+     * The value returned by {@link #encodeThrowable(Throwable)} when encoding fails for any reason
+     * other than {@link OutOfMemoryError}.
+     */
+    private static final byte[] FALLBACK_ENCODED_THROWABLE_BYTES;
+    static {
+        try {
+            FALLBACK_ENCODED_THROWABLE_BYTES = encodeThrowable(new TranslatedException("error during encoding", ""), false);
+            FALLBACK_ENCODED_OUTOFMEMORYERROR_BYTES = encodeThrowable(new OutOfMemoryError(), false);
+        } catch (IOException e) {
+            throw new JVMCIError(e);
+        }
+    }
+
     /**
      * Class name of exception that could not be instantiated.
      */
@@ -110,83 +137,74 @@ final class TranslatedException extends Exception {
         }
     }
 
-    /**
-     * Encodes an exception message to distinguish a null message from an empty message.
-     *
-     * @return {@code value} with a space prepended iff {@code value != null}
-     */
-    private static String encodeMessage(String value) {
-        return value != null ? ' ' + value : value;
-    }
-
-    private static String decodeMessage(String value) {
-        if (value.length() == 0) {
-            return null;
-        }
-        return value.substring(1);
+    private static String emptyIfNull(String value) {
+        return value == null ? "" : value;
     }
 
-    private static String encodedString(String value) {
-        return Objects.toString(value, "").replace('|', '_');
+    private static String emptyAsNull(String value) {
+        return value.isEmpty() ? null : value;
     }
 
     /**
-     * Encodes {@code throwable} including its stack and causes as a string. The encoding format of
-     * a single exception is:
-     *
-     * 
    -     *  '|'  '|'  '|' [  '|'  '|'  '|'  '|'  '|'  '|'  '|' ]*
-     * 
    
-     *
-     * Each exception is encoded before the exception it causes.
+     * Encodes {@code throwable} including its stack and causes as a {@linkplain GZIPOutputStream
+     * compressed} byte array that can be decoded by {@link #decodeThrowable}.
      */
     @VMEntryPoint
-    static String encodeThrowable(Throwable throwable) throws Throwable {
+    static byte[] encodeThrowable(Throwable throwable) throws Throwable {
         try {
-            Formatter enc = new Formatter();
+            return encodeThrowable(throwable, true);
+        } catch (OutOfMemoryError e) {
+            return FALLBACK_ENCODED_OUTOFMEMORYERROR_BYTES;
+        } catch (Throwable e) {
+            return FALLBACK_ENCODED_THROWABLE_BYTES;
+        }
+    }
+
+    private static byte[] encodeThrowable(Throwable throwable, boolean withCauseAndStack) throws IOException {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        try (DataOutputStream dos = new DataOutputStream(new GZIPOutputStream(baos))) {
             List throwables = new ArrayList<>();
             for (Throwable current = throwable; current != null; current = current.getCause()) {
                 throwables.add(current);
+                if (!withCauseAndStack) {
+                    break;
+                }
             }
 
             // Encode from inner most cause outwards
             Collections.reverse(throwables);
 
             for (Throwable current : throwables) {
-                enc.format("%s|%s|", current.getClass().getName(), encodedString(encodeMessage(current.getMessage())));
-                StackTraceElement[] stackTrace = current.getStackTrace();
+                dos.writeUTF(current.getClass().getName());
+                dos.writeUTF(emptyIfNull(current.getMessage()));
+                StackTraceElement[] stackTrace = withCauseAndStack ? current.getStackTrace() : null;
                 if (stackTrace == null) {
                     stackTrace = new StackTraceElement[0];
                 }
-                enc.format("%d|", stackTrace.length);
+                dos.writeInt(stackTrace.length);
                 for (int i = 0; i < stackTrace.length; i++) {
                     StackTraceElement frame = stackTrace[i];
                     if (frame != null) {
-                        enc.format("%s|%s|%s|%s|%s|%s|%d|", encodedString(frame.getClassLoaderName()),
-                                encodedString(frame.getModuleName()), encodedString(frame.getModuleVersion()),
-                                frame.getClassName(), frame.getMethodName(),
-                                encodedString(frame.getFileName()), frame.getLineNumber());
+                        dos.writeUTF(emptyIfNull(frame.getClassLoaderName()));
+                        dos.writeUTF(emptyIfNull(frame.getModuleName()));
+                        dos.writeUTF(emptyIfNull(frame.getModuleVersion()));
+                        dos.writeUTF(emptyIfNull(frame.getClassName()));
+                        dos.writeUTF(emptyIfNull(frame.getMethodName()));
+                        dos.writeUTF(emptyIfNull(frame.getFileName()));
+                        dos.writeInt(frame.getLineNumber());
                     }
                 }
             }
-            return enc.toString();
-        } catch (Throwable e) {
-            assert printStackTrace(e);
-            try {
-                return e.getClass().getName() + "|" + encodedString(e.getMessage()) + "|0|";
-            } catch (Throwable e2) {
-                assert printStackTrace(e2);
-                return "java.lang.Throwable|too many errors during encoding|0|";
-            }
         }
+        return baos.toByteArray();
     }
 
     /**
      * Gets the stack of the current thread without the frames between this call and the one just
-     * below the frame of the first method in {@link CompilerToVM}. The chopped frames are specific
-     * to the implementation of {@link HotSpotJVMCIRuntime#decodeThrowable(String)}.
+     * below the frame of the first method in {@link CompilerToVM}. The chopped frames are for the
+     * VM call to {@link HotSpotJVMCIRuntime#decodeAndThrowThrowable}.
      */
-    private static StackTraceElement[] getStackTraceSuffix() {
+    private static StackTraceElement[] getMyStackTrace() {
         StackTraceElement[] stack = new Exception().getStackTrace();
         for (int i = 0; i < stack.length; i++) {
             StackTraceElement e = stack[i];
@@ -206,43 +224,47 @@ final class TranslatedException extends Exception {
      *            {@link #encodeThrowable}
      */
     @VMEntryPoint
-    static Throwable decodeThrowable(String encodedThrowable) {
-        try {
-            int i = 0;
-            String[] parts = encodedThrowable.split("\\|");
+    static Throwable decodeThrowable(byte[] encodedThrowable) {
+        try (DataInputStream dis = new DataInputStream(new GZIPInputStream(new ByteArrayInputStream(encodedThrowable)))) {
             Throwable cause = null;
             Throwable throwable = null;
-            while (i != parts.length) {
-                String exceptionClassName = parts[i++];
-                String exceptionMessage = decodeMessage(parts[i++]);
+            StackTraceElement[] myStack = getMyStackTrace();
+            while (dis.available() != 0) {
+                String exceptionClassName = dis.readUTF();
+                String exceptionMessage = emptyAsNull(dis.readUTF());
                 throwable = create(exceptionClassName, exceptionMessage, cause);
-                int stackTraceDepth = Integer.parseInt(parts[i++]);
-
-                StackTraceElement[] suffix = getStackTraceSuffix();
-                StackTraceElement[] stackTrace = new StackTraceElement[stackTraceDepth + suffix.length];
+                int stackTraceDepth = dis.readInt();
+                StackTraceElement[] stackTrace = new StackTraceElement[stackTraceDepth + myStack.length];
+                int stackTraceIndex = 0;
+                int myStackIndex = 0;
                 for (int j = 0; j < stackTraceDepth; j++) {
-                    String classLoaderName = parts[i++];
-                    String moduleName = parts[i++];
-                    String moduleVersion = parts[i++];
-                    String className = parts[i++];
-                    String methodName = parts[i++];
-                    String fileName = parts[i++];
-                    int lineNumber = Integer.parseInt(parts[i++]);
-                    if (classLoaderName.isEmpty()) {
-                        classLoaderName = null;
-                    }
-                    if (moduleName.isEmpty()) {
-                        moduleName = null;
-                    }
-                    if (moduleVersion.isEmpty()) {
-                        moduleVersion = null;
-                    }
-                    if (fileName.isEmpty()) {
-                        fileName = null;
+                    String classLoaderName = emptyAsNull(dis.readUTF());
+                    String moduleName = emptyAsNull(dis.readUTF());
+                    String moduleVersion = emptyAsNull(dis.readUTF());
+                    String className = emptyAsNull(dis.readUTF());
+                    String methodName = emptyAsNull(dis.readUTF());
+                    String fileName = emptyAsNull(dis.readUTF());
+                    int lineNumber = dis.readInt();
+                    StackTraceElement ste = new StackTraceElement(classLoaderName, moduleName, moduleVersion, className, methodName, fileName, lineNumber);
+
+                    if (ste.isNativeMethod()) {
+                        // Best effort attempt to weave stack traces from two heaps into
+                        // a single stack trace using native method frames as stitching points.
+                        // This is not 100% reliable as there's no guarantee that native method
+                        // frames only exist for calls between HotSpot and libjvmci.
+                        while (myStackIndex < myStack.length) {
+                            StackTraceElement suffixSTE = myStack[myStackIndex++];
+                            if (suffixSTE.isNativeMethod()) {
+                                break;
+                            }
+                            stackTrace[stackTraceIndex++] = suffixSTE;
+                        }
                     }
-                    stackTrace[j] = new StackTraceElement(classLoaderName, moduleName, moduleVersion, className, methodName, fileName, lineNumber);
+                    stackTrace[stackTraceIndex++] = ste;
+                }
+                while (myStackIndex < myStack.length) {
+                    stackTrace[stackTraceIndex++] = myStack[myStackIndex++];
                 }
-                System.arraycopy(suffix, 0, stackTrace, stackTraceDepth, suffix.length);
                 throwable.setStackTrace(stackTrace);
                 cause = throwable;
             }
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/UnsafeAccess.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/UnsafeAccess.java
index 61b0f949655b442c0f43bf064424c0ac9327a4dc..afdff7a88901b6b2d67c653d78911c6ec5391361 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/UnsafeAccess.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/UnsafeAccess.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/Constant.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/Constant.java
index c7cc38959877642fd49845808aee74d815001078..63002463fb595ff971266cc165957044459ce968 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/Constant.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/Constant.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/DeoptimizationReason.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/DeoptimizationReason.java
index bcefe66cc79151783ccaa11f4309f39674c75c88..36c422beda59b108a894ffaf3215f03675c7ce60 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/DeoptimizationReason.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/DeoptimizationReason.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/InvokeTarget.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/InvokeTarget.java
index afaa0f635c6efd03447da74a3ba44998b5869252..d22d7a9d622d7b44acc657240d10faeb0c02885c 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/InvokeTarget.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/InvokeTarget.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/MethodHandleAccessProvider.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/MethodHandleAccessProvider.java
index c533123ccd84d24ac894962bcd9951b0fa3ac57d..0faa2af57047457248331015120846cb3e20c3ae 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/MethodHandleAccessProvider.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/MethodHandleAccessProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ProfilingInfo.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ProfilingInfo.java
index 2ba915c9892714d763bc6f5dfa0403dd42fa2cc5..7eaa8e966705652037085a9190915194a8fd57cb 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ProfilingInfo.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ProfilingInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/VMConstant.java b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/VMConstant.java
index e7b0484dbd3188e8db8e96f85cfcc5d3e3638027..ecd15057e97693a4ea88415b82c26d98717835b6 100644
--- a/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/VMConstant.java
+++ b/src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/VMConstant.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
diff --git a/src/jdk.jartool/share/man/jarsigner.1 b/src/jdk.jartool/share/man/jarsigner.1
index 0d51b7040afa18f570c5d2921dfe4a3669f2d440..bcf457fb6f65603e70b40af8bc5150667766e584 100644
--- a/src/jdk.jartool/share/man/jarsigner.1
+++ b/src/jdk.jartool/share/man/jarsigner.1
@@ -1,4 +1,4 @@
-.\" Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
+.\" Copyright (c) 1998, 2022, 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
@@ -33,6 +33,8 @@ jarsigner \- sign and verify Java Archive (JAR) files
 .PP
 \f[CB]jarsigner\f[R] \f[CB]\-verify\f[R] [\f[I]options\f[R]]
 \f[I]jar\-file\f[R] [\f[I]alias\f[R] ...]
+.PP
+\f[CB]jarsigner\f[R] \f[CB]\-version\f[R]
 .TP
 .B \f[I]options\f[R]
 The command\-line options.
@@ -69,6 +71,12 @@ The aliases are defined in the keystore specified by \f[CB]\-keystore\f[R]
 or the default keystore.
 .RS
 .RE
+.TP
+.B \f[CB]\-version\f[R]
+The \f[CB]\-version\f[R] option prints the program version of
+\f[CB]jarsigner\f[R].
+.RS
+.RE
 .SH DESCRIPTION
 .PP
 The \f[CB]jarsigner\f[R] tool has two purposes:
@@ -1079,6 +1087,11 @@ The property keys supported are "jarsigner.all" for all actions,
 name(s) cannot be set in this file.
 .RS
 .RE
+.TP
+.B \f[CB]\-version\f[R]
+Prints the program version.
+.RS
+.RE
 .SH DEPRECATED OPTIONS
 .PP
 The following \f[CB]jarsigner\f[R] options are deprecated as of JDK 9 and
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassUseWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassUseWriter.java
index f91b06105a3a82d8043a6e1e6cd4be4123e74e5e..840676e875cab6ec486a4f948ddd24605c8e2004 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassUseWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassUseWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2022, 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
@@ -296,8 +296,7 @@ public class ClassUseWriter extends SubWriterHolderWriter {
      * @param contentTree the content tree to which the class elements will be added
      */
     protected void addClassList(Content contentTree) {
-        HtmlTree ul = new HtmlTree(TagName.UL);
-        ul.setStyle(HtmlStyle.blockList);
+        HtmlTree ul = HtmlTree.UL(HtmlStyle.blockList);
         for (PackageElement pkg : pkgSet) {
             HtmlTree htmlTree = HtmlTree.SECTION(HtmlStyle.detail)
                     .setId(htmlIds.forPackage(pkg));
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriterImpl.java
index 40db035c8b9a4263672d9c29545ebbf5c65d65d2..3b1b8537bf0a6933a8c1bdb816fded501f9ad8b6 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriterImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022, 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
@@ -105,8 +105,7 @@ public class ClassWriterImpl extends SubWriterHolderWriter implements ClassWrite
     @Override
     public Content getHeader(String header) {
         HtmlTree bodyTree = getBody(getWindowTitle(utils.getSimpleName(typeElement)));
-        HtmlTree div = new HtmlTree(TagName.DIV);
-        div.setStyle(HtmlStyle.header);
+        HtmlTree div = HtmlTree.DIV(HtmlStyle.header);
         if (configuration.showModules) {
             ModuleElement mdle = configuration.docEnv.getElementUtils().getModuleOf(typeElement);
             Content classModuleLabel = HtmlTree.SPAN(HtmlStyle.moduleLabelInType, contents.moduleLabel);
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstantsSummaryWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstantsSummaryWriterImpl.java
index 2bd163b24de86046c962b2522202ea4248682ef0..1723bc6ecfd5a93650116abae9618c3b4c8947ef 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstantsSummaryWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ConstantsSummaryWriterImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2022, 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
@@ -165,9 +165,7 @@ public class ConstantsSummaryWriterImpl extends HtmlDocletWriter implements Cons
 
     @Override
     public Content getClassConstantHeader() {
-        HtmlTree ul = new HtmlTree(TagName.UL);
-        ul.setStyle(HtmlStyle.blockList);
-        return ul;
+        return HtmlTree.UL(HtmlStyle.blockList);
     }
 
     @Override
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HelpWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HelpWriter.java
index 167b24b622b8ede28cd7ab7bcde464eccdfb8e7d..11ed54c2d864f4eb9c6873b3533ea921a0194238 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HelpWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HelpWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2022, 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
@@ -128,9 +128,7 @@ public class HelpWriter extends HtmlDocletWriter {
      * 
      */
     protected void addHelpFileContents(Content contentTree) {
-        HtmlTree mainTOC = new HtmlTree(TagName.UL).setStyle(HtmlStyle.helpTOC);
-
-
+        HtmlTree mainTOC = HtmlTree.UL(HtmlStyle.helpTOC);
 
         contentTree.add(HtmlTree.HEADING(Headings.PAGE_TITLE_HEADING, HtmlStyle.title,
                                         getContent("doclet.help.main_heading")))
@@ -185,7 +183,7 @@ public class HelpWriter extends HtmlDocletWriter {
         }
         content.add(navSection);
 
-        HtmlTree subTOC = new HtmlTree(TagName.UL).setStyle(HtmlStyle.helpSubTOC);
+        HtmlTree subTOC = HtmlTree.UL(HtmlStyle.helpSubTOC);
 
         HtmlTree section;
 
@@ -193,7 +191,7 @@ public class HelpWriter extends HtmlDocletWriter {
         if (options.createIndex()) {
             section = newHelpSection(getContent("doclet.help.search.head"), subTOC, HtmlIds.HELP_SEARCH);
             Content searchIntro = HtmlTree.P(getContent("doclet.help.search.intro"));
-            Content searchExamples = new HtmlTree(TagName.UL).setStyle(HtmlStyle.helpSectionList);
+            Content searchExamples = HtmlTree.UL(HtmlStyle.helpSectionList);
             for (String[] example : SEARCH_EXAMPLES) {
                 searchExamples.add(HtmlTree.LI(
                         getContent("doclet.help.search.example",
@@ -240,7 +238,7 @@ public class HelpWriter extends HtmlDocletWriter {
                 .add(HtmlTree.HEADING(Headings.CONTENT_HEADING, pageKindsHeading).setId(HtmlIds.HELP_PAGES))
                 .add(contents.getContent("doclet.help.page_kinds.intro"));
 
-        HtmlTree subTOC = new HtmlTree(TagName.UL).setStyle(HtmlStyle.helpSubTOC);
+        HtmlTree subTOC = HtmlTree.UL(HtmlStyle.helpSubTOC);
 
         HtmlTree section;
 
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlConfiguration.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlConfiguration.java
index 100ad33940b19d780525a88a042ba5bed448504c..a11ad5db0446d0d9d7fad9d113a4540736bd1e7e 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlConfiguration.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2022, 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 @@
 
 package jdk.javadoc.internal.doclets.formats.html;
 
+import java.time.ZonedDateTime;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.EnumSet;
@@ -166,6 +167,11 @@ public class HtmlConfiguration extends BaseConfiguration {
      */
     public final Set conditionalPages;
 
+    /**
+     * The build date, to be recorded in generated files.
+     */
+    private ZonedDateTime buildDate;
+
     /**
      * Constructs the full configuration needed by the doclet, including
      * the format-specific part, defined in this class, and the format-independent
@@ -215,6 +221,7 @@ public class HtmlConfiguration extends BaseConfiguration {
 
         conditionalPages = EnumSet.noneOf(ConditionalPage.class);
     }
+
     protected void initConfiguration(DocletEnvironment docEnv,
                                      Function resourceKeyMapper) {
         super.initConfiguration(docEnv, resourceKeyMapper);
@@ -223,7 +230,6 @@ public class HtmlConfiguration extends BaseConfiguration {
     }
 
     private final Runtime.Version docletVersion;
-    public final Date startTime = new Date();
 
     @Override
     public Runtime.Version getDocletVersion() {
@@ -259,6 +265,10 @@ public class HtmlConfiguration extends BaseConfiguration {
         if (!options.validateOptions()) {
             return false;
         }
+
+        ZonedDateTime zdt = options.date();
+        buildDate = zdt != null ? zdt : ZonedDateTime.now();
+
         if (!getSpecifiedTypeElements().isEmpty()) {
             Map map = new HashMap<>();
             PackageElement pkg;
@@ -279,6 +289,13 @@ public class HtmlConfiguration extends BaseConfiguration {
         return true;
     }
 
+    /**
+     * {@return the date to be recorded in generated files}
+     */
+    public ZonedDateTime getBuildDate() {
+        return buildDate;
+    }
+
     /**
      * Decide the page which will appear first in the right-hand frame. It will
      * be "overview-summary.html" if "-overview" option is used or no
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java
index 1a73541288693b8cb75ec31d689e1e2652d1704f..8934d547213dcbca49476572c929ab29a31cf817 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2022, 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 @@ package jdk.javadoc.internal.doclets.formats.html;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -263,7 +264,7 @@ public class HtmlDocletWriter {
         do {
             int match = docrootMatcher.start();
             // append htmlstr up to start of next {@docroot}
-            buf.append(htmlstr.substring(prevEnd, match));
+            buf.append(htmlstr, prevEnd, match);
             prevEnd = docrootMatcher.end();
             if (options.docrootParent().length() > 0 && htmlstr.startsWith("/..", prevEnd)) {
                 // Insert the absolute link if {@docRoot} is followed by "/..".
@@ -452,7 +453,7 @@ public class HtmlDocletWriter {
             throws DocFileIOException {
         List additionalStylesheets = configuration.getAdditionalStylesheets();
         additionalStylesheets.addAll(localStylesheets);
-        Head head = new Head(path, configuration.getDocletVersion(), configuration.startTime)
+        Head head = new Head(path, configuration.getDocletVersion(), configuration.getBuildDate())
                 .setTimestamp(!options.noTimestamp())
                 .setDescription(description)
                 .setGenerator(getGenerator(getClass()))
@@ -549,8 +550,7 @@ public class HtmlDocletWriter {
     protected Content getNavLinkMainTree(String label) {
         Content mainTreeContent = links.createLink(pathToRoot.resolve(DocPaths.OVERVIEW_TREE),
                 Text.of(label));
-        Content li = HtmlTree.LI(mainTreeContent);
-        return li;
+        return HtmlTree.LI(mainTreeContent);
     }
 
     /**
@@ -623,7 +623,7 @@ public class HtmlDocletWriter {
         } else {
             flags = EnumSet.noneOf(ElementFlag.class);
         }
-        DocLink targetLink = null;
+        DocLink targetLink;
         if (included || packageElement == null) {
             targetLink = new DocLink(pathString(packageElement, DocPaths.PACKAGE_SUMMARY));
         } else {
@@ -1531,18 +1531,11 @@ public class HtmlDocletWriter {
                         return false;
                     }
                     sb.append("=");
-                    String quote;
-                    switch (node.getValueKind()) {
-                        case DOUBLE:
-                            quote = "\"";
-                            break;
-                        case SINGLE:
-                            quote = "'";
-                            break;
-                        default:
-                            quote = "";
-                            break;
-                    }
+                    String quote = switch (node.getValueKind()) {
+                        case DOUBLE -> "\"";
+                        case SINGLE -> "'";
+                        default -> "";
+                    };
                     sb.append(quote);
                     result.add(sb);
                     Content docRootContent = new ContentBuilder();
@@ -1794,9 +1787,9 @@ public class HtmlDocletWriter {
         if (detail.isEmpty() || detail.get().isEmpty()) {
             return HtmlTree.SPAN(HtmlStyle.invalidTag, Text.of(summary));
         }
-        return new HtmlTree(TagName.DETAILS).addStyle(HtmlStyle.invalidTag)
-                .add(new HtmlTree(TagName.SUMMARY).add(Text.of(summary)))
-                .add(new HtmlTree(TagName.PRE).add(detail.get()));
+        return HtmlTree.DETAILS(HtmlStyle.invalidTag)
+                .add(HtmlTree.SUMMARY(Text.of(summary)))
+                .add(HtmlTree.PRE(detail.get()));
     }
 
     /**
@@ -2226,17 +2219,13 @@ public class HtmlDocletWriter {
         for (Element e: chain) {
             String name;
             switch (e.getKind()) {
-                case MODULE:
-                case PACKAGE:
+                case MODULE, PACKAGE -> {
                     name = ((QualifiedNameable) e).getQualifiedName().toString();
                     if (name.length() == 0) {
                         name = "";
                     }
-                    break;
-
-                default:
-                    name = e.getSimpleName().toString();
-                    break;
+                }
+                default -> name = e.getSimpleName().toString();
             }
 
             if (sb.length() == 0) {
@@ -2380,8 +2369,7 @@ public class HtmlDocletWriter {
                 Content leadingNote = contents.getContent("doclet.PreviewLeadingNote", nameCode);
                 previewDiv.add(HtmlTree.SPAN(HtmlStyle.previewLabel,
                                              leadingNote));
-                HtmlTree ul = new HtmlTree(TagName.UL);
-                ul.setStyle(HtmlStyle.previewComment);
+                HtmlTree ul = HtmlTree.UL(HtmlStyle.previewComment);
                 for (Content note : previewNotes) {
                     ul.add(HtmlTree.LI(note));
                 }
@@ -2445,8 +2433,7 @@ public class HtmlDocletWriter {
     private Content withPreviewFeatures(String key, String className, String featureName, List features) {
         String[] sep = new String[] {""};
         ContentBuilder featureCodes = new ContentBuilder();
-        features.stream()
-                .forEach(c -> {
+        features.forEach(c -> {
                     featureCodes.add(sep[0]);
                     featureCodes.add(HtmlTree.CODE(new ContentBuilder().add(c)));
                     sep[0] = ", ";
@@ -2461,7 +2448,7 @@ public class HtmlDocletWriter {
         String[] sep = new String[] {""};
         ContentBuilder links = new ContentBuilder();
         elements.stream()
-                .sorted((te1, te2) -> te1.getSimpleName().toString().compareTo(te2.getSimpleName().toString()))
+                .sorted(Comparator.comparing(te -> te.getSimpleName().toString()))
                 .distinct()
                 .map(te -> getLink(new HtmlLinkInfo(configuration, HtmlLinkInfo.Kind.CLASS, te)
                         .label(HtmlTree.CODE(Text.of(te.getSimpleName()))).skipPreview(true)))
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlSerialFieldWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlSerialFieldWriter.java
index d57d82d98479deab4d7c06ea8952d8ef016f42cd..7278ac8e3155a030914e5c3e29a23a79f92ea423 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlSerialFieldWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlSerialFieldWriter.java
@@ -71,9 +71,7 @@ public class HtmlSerialFieldWriter extends FieldWriterImpl
      */
     @Override
     public Content getSerializableFieldsHeader() {
-        HtmlTree ul = new HtmlTree(TagName.UL);
-        ul.setStyle(HtmlStyle.blockList);
-        return ul;
+        return HtmlTree.UL(HtmlStyle.blockList);
     }
 
     /**
@@ -84,9 +82,7 @@ public class HtmlSerialFieldWriter extends FieldWriterImpl
      */
     @Override
     public Content getFieldsContentHeader(boolean isLastContent) {
-        HtmlTree li = new HtmlTree(TagName.LI);
-        li.setStyle(HtmlStyle.blockList);
-        return li;
+        return new HtmlTree(TagName.LI).setStyle(HtmlStyle.blockList);
     }
 
     /**
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlSerialMethodWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlSerialMethodWriter.java
index aa6e31e7c12ff1105cfd2cdc7bcb810a8f90c170..8b2bed47a00593cba96ab8b275e7a7b9ae1b13e8 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlSerialMethodWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlSerialMethodWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2022, 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,9 +60,7 @@ public class HtmlSerialMethodWriter extends MethodWriterImpl implements
      */
     @Override
     public Content getSerializableMethodsHeader() {
-        HtmlTree ul = new HtmlTree(TagName.UL);
-        ul.setStyle(HtmlStyle.blockList);
-        return ul;
+        return HtmlTree.UL(HtmlStyle.blockList);
     }
 
     /**
@@ -73,9 +71,7 @@ public class HtmlSerialMethodWriter extends MethodWriterImpl implements
      */
     @Override
     public Content getMethodsContentHeader(boolean isLastContent) {
-        HtmlTree li = new HtmlTree(TagName.LI);
-        li.setStyle(HtmlStyle.blockList);
-        return li;
+        return new HtmlTree(TagName.LI);
     }
 
     /**
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexRedirectWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexRedirectWriter.java
index 3e169dab6f0a9d2628a26ea5b41e42106b7f5c19..299e565a65782735981e105330e9a7a8ee329675 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexRedirectWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexRedirectWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2022, 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
@@ -74,7 +74,7 @@ public class IndexRedirectWriter extends HtmlDocletWriter {
      * @throws DocFileIOException if there is a problem generating the file
      */
     private void generateIndexFile() throws DocFileIOException {
-        Head head = new Head(path, configuration.getDocletVersion(), configuration.startTime)
+        Head head = new Head(path, configuration.getDocletVersion(), configuration.getBuildDate())
                 .setTimestamp(!options.noTimestamp())
                 .setDescription("index redirect")
                 .setGenerator(getGenerator(getClass()))
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexWriter.java
index 4fadb86baa7562bb85897cb71662cea841c93ade..9e486b74ab9af8a8021a9ee8a75eccb2ad31d728 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/IndexWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2022, 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
@@ -292,8 +292,7 @@ public class IndexWriter extends HtmlDocletWriter {
      */
     protected void addComment(Element element, Content contentTree) {
         Content span = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, getDeprecatedPhrase(element));
-        HtmlTree div = new HtmlTree(TagName.DIV);
-        div.setStyle(HtmlStyle.deprecationBlock);
+        HtmlTree div = HtmlTree.DIV(HtmlStyle.deprecationBlock);
         if (utils.isDeprecated(element)) {
             div.add(span);
             List tags = utils.getDeprecatedTrees(element);
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java
index e4dd2efd10dfe5c961e43e10ddbe3b8fa460a7b8..30803551b2fc66bf6d3825f1b93a0c39515ae68f 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2022, 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
@@ -180,8 +180,7 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW
     @Override
     public Content getModuleHeader(String heading) {
         HtmlTree bodyTree = getBody(getWindowTitle(mdle.getQualifiedName().toString()));
-        HtmlTree div = new HtmlTree(TagName.DIV);
-        div.setStyle(HtmlStyle.header);
+        HtmlTree div = HtmlTree.DIV(HtmlStyle.header);
         Content moduleHead = new ContentBuilder();
         moduleHead.add(mdle.isOpen() && (configuration.docEnv.getModuleMode() == ModuleMode.ALL)
                 ? contents.openModuleLabel : contents.moduleLabel);
@@ -222,7 +221,7 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW
      */
     @Override
     public Content getSummariesList() {
-        return new HtmlTree(TagName.UL).setStyle(HtmlStyle.summaryList);
+        return HtmlTree.UL(HtmlStyle.summaryList);
     }
 
     /**
@@ -799,8 +798,7 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW
         List deprs = utils.getDeprecatedTrees(mdle);
         if (utils.isDeprecated(mdle)) {
             CommentHelper ch = utils.getCommentHelper(mdle);
-            HtmlTree deprDiv = new HtmlTree(TagName.DIV);
-            deprDiv.setStyle(HtmlStyle.deprecationBlock);
+            HtmlTree deprDiv = HtmlTree.DIV(HtmlStyle.deprecationBlock);
             Content deprPhrase = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, getDeprecatedPhrase(mdle));
             deprDiv.add(deprPhrase);
             if (!deprs.isEmpty()) {
@@ -859,8 +857,7 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW
     public void addPackageDeprecationInfo(Content li, PackageElement pkg) {
         if (utils.isDeprecated(pkg)) {
             List deprs = utils.getDeprecatedTrees(pkg);
-            HtmlTree deprDiv = new HtmlTree(TagName.DIV);
-            deprDiv.setStyle(HtmlStyle.deprecationBlock);
+            HtmlTree deprDiv = HtmlTree.DIV(HtmlStyle.deprecationBlock);
             Content deprPhrase = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, getDeprecatedPhrase(pkg));
             deprDiv.add(deprPhrase);
             if (!deprs.isEmpty()) {
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Navigation.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Navigation.java
index 4ebd0c3f5c0df01feffcd945ff6d4e73b18f67e8..3e8e556974a300210e1bc63c8db5101ac9eaf63a 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Navigation.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Navigation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, 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
@@ -29,7 +29,6 @@ import java.util.List;
 import java.util.Set;
 
 import javax.lang.model.element.Element;
-import javax.lang.model.element.ElementKind;
 import javax.lang.model.element.ModuleElement;
 import javax.lang.model.element.PackageElement;
 import javax.lang.model.element.TypeElement;
@@ -635,21 +634,21 @@ public class Navigation {
                 .put(HtmlAttr.TITLE, rowListTitle);
         addMainNavLinks(navList);
         navDiv.add(navList);
-        HtmlTree ulNavSummaryRight = new HtmlTree(TagName.UL).setStyle(HtmlStyle.subNavListSmall);
+        HtmlTree ulNavSummaryRight = HtmlTree.UL(HtmlStyle.subNavListSmall);
         addSummaryLinks(ulNavSummaryRight, true);
         addDetailLinks(ulNavSummaryRight, true);
         navDiv.add(ulNavSummaryRight);
         tree.add(navDiv);
 
-        HtmlTree subDiv = new HtmlTree(TagName.DIV).setStyle(HtmlStyle.subNav);
+        HtmlTree subDiv = HtmlTree.DIV(HtmlStyle.subNav);
 
         HtmlTree div = new HtmlTree(TagName.DIV).setId(HtmlIds.NAVBAR_SUB_LIST);
         // Add the summary links if present.
-        HtmlTree ulNavSummary = new HtmlTree(TagName.UL).setStyle(HtmlStyle.subNavList);
+        HtmlTree ulNavSummary = HtmlTree.UL(HtmlStyle.subNavList);
         addSummaryLinks(ulNavSummary, false);
         div.add(ulNavSummary);
         // Add the detail links if present.
-        HtmlTree ulNavDetail = new HtmlTree(TagName.UL).setStyle(HtmlStyle.subNavList);
+        HtmlTree ulNavDetail = HtmlTree.UL(HtmlStyle.subNavList);
         addDetailLinks(ulNavDetail, false);
         div.add(ulNavDetail);
         subDiv.add(div);
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageTreeWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageTreeWriter.java
index ba54e2a26dcada166c5c793796f82479b0c7e30f..9618be166f994cb766ae7467d2a9099ad27f3c35 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageTreeWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageTreeWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2022, 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
@@ -147,8 +147,7 @@ public class PackageTreeWriter extends AbstractTreeWriter {
         Content span = HtmlTree.SPAN(HtmlStyle.packageHierarchyLabel,
                 contents.packageHierarchies);
         div.add(span);
-        HtmlTree ul = new HtmlTree (TagName.UL);
-        ul.setStyle(HtmlStyle.horizontal);
+        HtmlTree ul = HtmlTree.UL(HtmlStyle.horizontal);
         ul.add(getNavLinkMainTree(resources.getText("doclet.All_Packages")));
         div.add(ul);
     }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageUseWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageUseWriter.java
index b6c40c39a577876cdffbf206bf09bafbb40b55fc..1c44a1308685a2870f036d1bcc8608b4d9af6ba3 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageUseWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageUseWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2022, 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
@@ -181,8 +181,7 @@ public class PackageUseWriter extends SubWriterHolderWriter {
     protected void addClassList(Content contentTree) {
         TableHeader classTableHeader = new TableHeader(
                 contents.classLabel, contents.descriptionLabel);
-        HtmlTree ul = new HtmlTree(TagName.UL);
-        ul.setStyle(HtmlStyle.blockList);
+        HtmlTree ul = HtmlTree.UL(HtmlStyle.blockList);
         for (String packageName : usingPackageToUsedClasses.keySet()) {
             PackageElement usingPackage = utils.elementUtils.getPackageElement(packageName);
             HtmlTree section = HtmlTree.SECTION(HtmlStyle.detail)
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriterImpl.java
index 6bca82f17be7eb30e862a027eb4f4f5b272e584e..231ab6c50e2a3e357ee503005e7c74a1a1c9507e 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriterImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022, 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
@@ -111,8 +111,7 @@ public class PackageWriterImpl extends HtmlDocletWriter
     public Content getPackageHeader() {
         String packageName = getLocalizedPackageName(packageElement).toString();
         HtmlTree bodyTree = getBody(getWindowTitle(packageName));
-        HtmlTree div = new HtmlTree(TagName.DIV);
-        div.setStyle(HtmlStyle.header);
+        HtmlTree div = HtmlTree.DIV(HtmlStyle.header);
         if (configuration.showModules) {
             ModuleElement mdle = configuration.docEnv.getElementUtils().getModuleOf(packageElement);
             Content classModuleLabel = HtmlTree.SPAN(HtmlStyle.moduleLabelInPackage, contents.moduleLabel);
@@ -212,8 +211,7 @@ public class PackageWriterImpl extends HtmlDocletWriter
         List deprs = utils.getDeprecatedTrees(packageElement);
         if (utils.isDeprecated(packageElement)) {
             CommentHelper ch = utils.getCommentHelper(packageElement);
-            HtmlTree deprDiv = new HtmlTree(TagName.DIV);
-            deprDiv.setStyle(HtmlStyle.deprecationBlock);
+            HtmlTree deprDiv = HtmlTree.DIV(HtmlStyle.deprecationBlock);
             Content deprPhrase = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, getDeprecatedPhrase(packageElement));
             deprDiv.add(deprPhrase);
             if (!deprs.isEmpty()) {
@@ -228,7 +226,7 @@ public class PackageWriterImpl extends HtmlDocletWriter
 
     @Override
     public Content getSummariesList() {
-        return new HtmlTree(TagName.UL).setStyle(HtmlStyle.summaryList);
+        return HtmlTree.UL(HtmlStyle.summaryList);
     }
 
     @Override
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SerializedFormWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SerializedFormWriterImpl.java
index 8d97e0c5b4ff6c4681bac97242f1e4b9b26988b3..242ebf371999841833b6f5a2fe3aa6d5866c0a33 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SerializedFormWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SerializedFormWriterImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2022, 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
@@ -33,7 +33,6 @@ import javax.lang.model.element.TypeElement;
 import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
 import jdk.javadoc.internal.doclets.formats.html.markup.Entity;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.TagName;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
 import jdk.javadoc.internal.doclets.formats.html.Navigation.PageMode;
 import jdk.javadoc.internal.doclets.formats.html.markup.Text;
@@ -90,9 +89,7 @@ public class SerializedFormWriterImpl extends SubWriterHolderWriter
      */
     @Override
     public Content getSerializedSummariesHeader() {
-        HtmlTree ul = new HtmlTree(TagName.UL);
-        ul.setStyle(HtmlStyle.blockList);
-        return ul;
+        return HtmlTree.UL(HtmlStyle.blockList);
     }
 
     /**
@@ -127,9 +124,8 @@ public class SerializedFormWriterImpl extends SubWriterHolderWriter
      */
     @Override
     public Content getClassSerializedHeader() {
-        HtmlTree ul = new HtmlTree(TagName.UL);
-        ul.setStyle(HtmlStyle.blockList);
-        return ul;
+        return HtmlTree.UL(HtmlStyle.blockList);
+
     }
 
     /**
@@ -220,9 +216,8 @@ public class SerializedFormWriterImpl extends SubWriterHolderWriter
      */
     @Override
     public Content getClassContentHeader() {
-        HtmlTree ul = new HtmlTree(TagName.UL);
-        ul.setStyle(HtmlStyle.blockList);
-        return ul;
+        return HtmlTree.UL(HtmlStyle.blockList);
+
     }
 
     /**
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SourceToHTMLConverter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SourceToHTMLConverter.java
index 7bc1f96b6488420756cd530640d54d94acc2c28e..4efa6a70d229eb80bf471a8b56c6a6c391b8232f 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SourceToHTMLConverter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SourceToHTMLConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2022, 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
@@ -232,7 +232,7 @@ public class SourceToHTMLConverter {
      * @param path the path for the file.
      */
     private void writeToFile(Content body, DocPath path, TypeElement te) throws DocFileIOException {
-        Head head = new Head(path, configuration.getDocletVersion(), configuration.startTime)
+        Head head = new Head(path, configuration.getDocletVersion(), configuration.getBuildDate())
 //                .setTimestamp(!options.notimestamp) // temporary: compatibility!
                 .setTitle(resources.getText("doclet.Window_Source_title"))
 //                .setCharset(options.charset) // temporary: compatibility!
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SubWriterHolderWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SubWriterHolderWriter.java
index 5f09e20fd7404c2c7226b7a6db3ccdfefedd2504..0a22ce4ae4a1333b0166534658632991167aba35 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SubWriterHolderWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SubWriterHolderWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022, 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,7 +36,6 @@ import jdk.javadoc.internal.doclets.formats.html.markup.BodyContents;
 import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlId;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.TagName;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
 import jdk.javadoc.internal.doclets.toolkit.Content;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
@@ -207,9 +206,7 @@ public abstract class SubWriterHolderWriter extends HtmlDocletWriter {
      * @return a content tree for the member header
      */
     public Content getMemberTreeHeader() {
-        HtmlTree ul = new HtmlTree(TagName.UL);
-        ul.setStyle(HtmlStyle.blockList);
-        return ul;
+        return HtmlTree.UL(HtmlStyle.blockList);
     }
 
     /**
@@ -218,7 +215,7 @@ public abstract class SubWriterHolderWriter extends HtmlDocletWriter {
      * @return a list to be used for the list of summaries for members of a given kind
      */
     public Content getSummariesList() {
-        return new HtmlTree(TagName.UL).setStyle(HtmlStyle.summaryList);
+        return HtmlTree.UL(HtmlStyle.summaryList);
     }
 
     /**
@@ -238,7 +235,7 @@ public abstract class SubWriterHolderWriter extends HtmlDocletWriter {
      * @return a list to be used for the list of details for members of a given kind
      */
     public Content getDetailsList() {
-        return new HtmlTree(TagName.UL).setStyle(HtmlStyle.detailsList);
+        return HtmlTree.UL(HtmlStyle.detailsList);
     }
 
     /**
@@ -257,7 +254,7 @@ public abstract class SubWriterHolderWriter extends HtmlDocletWriter {
      * @return a list to be used for the list of members of a given kind
      */
     public Content getMemberList() {
-        return new HtmlTree(TagName.UL).setStyle(HtmlStyle.memberList);
+        return HtmlTree.UL(HtmlStyle.memberList);
     }
 
     /**
@@ -271,9 +268,7 @@ public abstract class SubWriterHolderWriter extends HtmlDocletWriter {
     }
 
     public Content getMemberInheritedTree() {
-        HtmlTree div = new HtmlTree(TagName.DIV);
-        div.setStyle(HtmlStyle.inheritedList);
-        return div;
+        return HtmlTree.DIV(HtmlStyle.inheritedList);
     }
 
     /**
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Table.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Table.java
index 25f7e98f4f259017d0de7e3e9e13c632d94555f6..8cf2e3710f08c4460135dc8b8092415d80f4362b 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Table.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Table.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, 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
@@ -386,7 +386,7 @@ public class Table extends Content {
             default -> throw new IllegalStateException();
         };
 
-        HtmlTree table = new HtmlTree(TagName.DIV).setStyle(tableStyle).addStyle(columnStyle);
+        HtmlTree table = HtmlTree.DIV(tableStyle).addStyle(columnStyle);
         if ((tabMap == null || tabs.size() == 1) && !alwaysShowDefaultTab) {
             if (tabMap == null) {
                 main.add(caption);
@@ -396,7 +396,7 @@ public class Table extends Content {
             table.add(getTableBody());
             main.add(table);
         } else {
-            HtmlTree tablist = new HtmlTree(TagName.DIV).setStyle(tabListStyle)
+            HtmlTree tablist = HtmlTree.DIV(tabListStyle)
                     .put(HtmlAttr.ROLE, "tablist")
                     .put(HtmlAttr.ARIA_ORIENTATION, "horizontal");
 
@@ -481,8 +481,6 @@ public class Table extends Content {
     }
 
     private HtmlTree getCaption(Content title) {
-        return new HtmlTree(TagName.DIV)
-                .setStyle(HtmlStyle.caption)
-                .add(HtmlTree.SPAN(title));
+        return HtmlTree.DIV(HtmlStyle.caption, HtmlTree.SPAN(title));
     }
 }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TagletWriterImpl.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TagletWriterImpl.java
index 576597ae86e0c69fd65d59344d63b4728cfbe0c0..fdac4e55576804f710f58c0fb964b124ca69fb03 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TagletWriterImpl.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TagletWriterImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, 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
@@ -352,8 +352,7 @@ public class TagletWriterImpl extends TagletWriter {
         // Use a different style if any link label is longer than 30 chars or contains commas.
         boolean hasLongLabels = links.stream()
                 .anyMatch(c -> c.charCount() > SEE_TAG_MAX_INLINE_LENGTH || c.toString().contains(","));
-        HtmlTree seeList = new HtmlTree(TagName.UL)
-                .setStyle(hasLongLabels ? HtmlStyle.seeListLong : HtmlStyle.seeList);
+        HtmlTree seeList = HtmlTree.UL(hasLongLabels ? HtmlStyle.seeListLong : HtmlStyle.seeList);
         links.stream().filter(Content::isValid).forEach(item -> {
             seeList.add(HtmlTree.LI(item));
         });
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TreeWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TreeWriter.java
index 12971fc19dcba2d78ec7bc9aad512fa8f0b521e4..57b2b470dee83178bf8c72435fb4233c253f3727 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TreeWriter.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TreeWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022, 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
@@ -32,10 +32,8 @@ import javax.lang.model.element.PackageElement;
 import jdk.javadoc.internal.doclets.formats.html.markup.BodyContents;
 import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
-import jdk.javadoc.internal.doclets.formats.html.markup.TagName;
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
 import jdk.javadoc.internal.doclets.formats.html.Navigation.PageMode;
-import jdk.javadoc.internal.doclets.formats.html.markup.Text;
 import jdk.javadoc.internal.doclets.toolkit.Content;
 import jdk.javadoc.internal.doclets.toolkit.util.ClassTree;
 import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
@@ -135,8 +133,7 @@ public class TreeWriter extends AbstractTreeWriter {
             Content span = HtmlTree.SPAN(HtmlStyle.packageHierarchyLabel,
                     contents.packageHierarchies);
             contentTree.add(span);
-            HtmlTree ul = new HtmlTree(TagName.UL);
-            ul.setStyle(HtmlStyle.horizontal);
+            HtmlTree ul = HtmlTree.UL(HtmlStyle.horizontal);
             int i = 0;
             for (PackageElement pkg : packages) {
                 // If the package name length is 0 or if -nodeprecated option
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Head.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Head.java
index 975154b7d1d29c67947d1f89bd833bfa82e11089..adbd5ef09fd3b257b77087fbcb2032592e022a5d 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Head.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Head.java
@@ -27,12 +27,14 @@ package jdk.javadoc.internal.doclets.formats.html.markup;
 
 import java.io.IOException;
 import java.io.Writer;
-import java.text.SimpleDateFormat;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
+import java.util.Locale;
 
 import jdk.javadoc.internal.doclets.toolkit.Content;
 import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
@@ -50,7 +52,7 @@ import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
  */
 public class Head extends Content {
     private final Runtime.Version docletVersion;
-    private final Date generatedDate;
+    private final ZonedDateTime generatedDate;
     private final DocPath pathToRoot;
     private String title;
     private String charset;
@@ -78,7 +80,7 @@ public class Head extends Content {
      * @param path the path for the file that will include this HEAD element
      * @param docletVersion the doclet version
      */
-    public Head(DocPath path, Runtime.Version docletVersion, Date generatedDate) {
+    public Head(DocPath path, Runtime.Version docletVersion, ZonedDateTime generatedDate) {
         this.docletVersion = docletVersion;
         this.generatedDate = generatedDate;
         pathToRoot = path.parent().invert();
@@ -279,8 +281,8 @@ public class Head extends Content {
         }
 
         if (showTimestamp) {
-            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
-            tree.add(HtmlTree.META("dc.created", dateFormat.format(generatedDate)));
+            DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+            tree.add(HtmlTree.META("dc.created", generatedDate.format(dateFormat)));
         }
 
         if (description != null) {
@@ -309,11 +311,14 @@ public class Head extends Content {
         return tree;
     }
 
-    private Comment getGeneratedBy(boolean timestamp, Date now) {
+
+    private Comment getGeneratedBy(boolean timestamp, ZonedDateTime buildDate) {
         String text = "Generated by javadoc"; // marker string, deliberately not localized
         text += " (" + docletVersion.feature() + ")";
         if (timestamp) {
-            text += " on " + now;
+            DateTimeFormatter fmt =
+                    DateTimeFormatter.ofPattern("EEE MMM dd HH:mm:ss zzz yyyy").withLocale(Locale.US);
+            text += " on " + buildDate.format(fmt);
         }
         return new Comment(text);
     }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlStyle.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlStyle.java
index ad74b81eee5af286d90228f5179dff267232f2cc..8301e9b9255cc0a900505b8a95d2dd0535df7cc2 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlStyle.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlStyle.java
@@ -48,20 +48,14 @@ import java.util.regex.Pattern;
  * or {@link javax.lang.model.element.Element "language model elements"}.
  * The usage is made explicit when it is not clear from the surrounding context.
  *
+ * @apiNote
+ * The stylized use of {@code editor-fold} comments and line comments (beginning {@code //})
+ * is to support extracting details of declarations with external tools.  Edit with care!
+ *
  * @see WhatWG: {@code class} attribute
  */
 public enum HtmlStyle {
 
-    /**
-     * The class of the {@code div} element containing a snippet element.
-     */
-    snippetContainer,
-
-    /**
-     * The class of the {@code a} element to copy snippet content to the clipboard.
-     */
-    snippetCopy,
-
     //
     //
     // The following constants are used for the main navigation bar that appears in the
@@ -324,17 +318,6 @@ public enum HtmlStyle {
      */
     propertyDetails,
 
-    /**
-     * The class for the list containing the {@code @see} tags of an element.
-     */
-    seeList,
-
-    /**
-     * The class for the list containing the {@code @see} tags of an element
-     * when some of the tags have longer labels.
-     */
-    seeListLong,
-
     /**
      * The class for a {@code section} element containing details of the
      * serialized form of an element, on the "Serialized Form" page.
@@ -391,6 +374,17 @@ public enum HtmlStyle {
      */
     previewLabel,
 
+    /**
+     * The class for the list containing the {@code @see} tags of an element.
+     */
+    seeList,
+
+    /**
+     * The class for the list containing the {@code @see} tags of an element
+     * when some of the tags have longer labels.
+     */
+    seeListLong,
+
     //
 
     //
@@ -844,6 +838,44 @@ public enum HtmlStyle {
 
     //
 
+    //
+    //
+    // The following constants are used for the contents of snippets.
+    // In addition, the translation of a snippet may use the class
+    // {@code language-LANG} where LANG is either specified explicitly
+    // by the "lang" attribute in a snippet tag, or can be inferred
+    // from the kind of an external snippet.
+
+    /**
+     * The class of the {@code pre} element presenting a snippet.
+     */
+    snippet,
+
+    /**
+     * The class of the {@code div} element containing a snippet element.
+     */
+    snippetContainer,
+
+    /**
+     * The class of the UI element to copy snippet content to the clipboard.
+     */
+    snippetCopy,
+
+    /**
+     * The class of text highlighted with the type {@code bold}.
+     */
+    bold,
+
+    /**
+     * The class of text highlighted with the type {@code italic}.
+     */
+    italic,
+
+    /**
+     * The class of text highlighted with the type {@code highlighted}.
+     */
+    highlighted,
+
     //
     //
     // The following constants are used in various places across a variety of pages.
@@ -908,7 +940,8 @@ public enum HtmlStyle {
     inheritedList,
 
     /**
-     * The class of an element that acts as a notification for an invalid tag.
+     * The class of an element that acts as a notification for an invalid tag
+     * or other invalid items.
      */
     invalidTag,
 
@@ -923,7 +956,7 @@ public enum HtmlStyle {
     memberNameLink,
 
     /**
-     * The class for a {@code dl} element containing serial UID information in
+     * The class of a {@code dl} element containing serial UID information in
      * the serialized form page.
      */
     nameValue,
@@ -964,11 +997,6 @@ public enum HtmlStyle {
      */
     sourceLineNo,
 
-    /**
-     * The class of the {@code pre} element presenting a snippet.
-     */
-    snippet,
-
     /**
      * The class of an {@code a} element for a link to a class or interface.
      */
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlTree.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlTree.java
index 1d05cd8c4d4cd676531fb4c0aeb74cc1ff241d98..4b954ef1a31b7570caaf8cf1618a96f98cfff75c 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlTree.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlTree.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2022, 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,14 +27,17 @@ package jdk.javadoc.internal.doclets.formats.html.markup;
 
 import java.io.IOException;
 import java.io.Writer;
+import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.BitSet;
+import java.util.Collection;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.function.Function;
 
 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlAttr.Role;
 import jdk.javadoc.internal.doclets.toolkit.Content;
@@ -222,6 +225,20 @@ public class HtmlTree extends Content {
         return this;
     }
 
+    /**
+     * Adds each of a collection of items, using a map function to create the content for each item.
+     *
+     * @param items  the items
+     * @param mapper the map function to generate the content for each item
+     *
+     * @return this object
+     */
+    @Override
+    public  HtmlTree addAll(Collection items, Function mapper) {
+        items.forEach(item -> add(mapper.apply(item)));
+        return this;
+    }
+
     @Override
     public int charCount() {
         int n = 0;
@@ -301,6 +318,7 @@ public class HtmlTree extends Content {
 
     /**
      * Creates an HTML {@code A} element.
+     * The {@code ref} argument will be URL-encoded for use as the attribute value.
      *
      * @param ref the value for the {@code href} attribute}
      * @param body the content for element
@@ -312,6 +330,22 @@ public class HtmlTree extends Content {
                 .add(body);
     }
 
+    /**
+     * Creates an HTML {@code A} element.
+     * The {@code ref} argument is assumed to be already suitably encoded,
+     * and will not be additionally URL-encoded, but will be
+     * {@link URI#toASCIIString() converted} to ASCII for use as the attribute value.
+     *
+     * @param ref the value for the {@code href} attribute}
+     * @param body the content for element
+     * @return the element
+     */
+    public static HtmlTree A(URI ref, Content body) {
+        return new HtmlTree(TagName.A)
+                .put(HtmlAttr.HREF, ref.toASCIIString())
+                .add(body);
+    }
+
     /**
      * Creates an HTML {@code CAPTION} element with the given content.
      *
@@ -345,6 +379,16 @@ public class HtmlTree extends Content {
                 .add(body);
     }
 
+    /**
+     * Creates an HTML {@code DETAILS} element.
+     *
+     * @return the element
+     */
+    public static HtmlTree DETAILS(HtmlStyle style) {
+        return new HtmlTree(TagName.DETAILS)
+                .setStyle(style);
+    }
+
     /**
      * Creates an HTML {@code DL} element with the given style.
      *
@@ -495,12 +539,10 @@ public class HtmlTree extends Content {
     }
 
     private static TagName checkHeading(TagName headingTag) {
-        switch (headingTag) {
-            case H1: case H2: case H3: case H4: case H5: case H6:
-                return headingTag;
-            default:
-                throw new IllegalArgumentException(headingTag.toString());
-        }
+        return switch (headingTag) {
+            case H1, H2, H3, H4, H5, H6 -> headingTag;
+            default -> throw new IllegalArgumentException(headingTag.toString());
+        };
     }
 
     /**
@@ -682,6 +724,16 @@ public class HtmlTree extends Content {
                 .setStyle(style);
     }
 
+    /**
+     * Creates an HTML {@code PRE} element with some content.
+     *
+     * @param body  the content
+     * @return the element
+     */
+    public static HtmlTree PRE(Content body) {
+        return new HtmlTree(TagName.PRE).add(body);
+    }
+
     /**
      * Creates an HTML {@code SCRIPT} element with some script content.
      * The type of the script is set to {@code text/javascript}.
@@ -782,6 +834,17 @@ public class HtmlTree extends Content {
                 .add(body);
     }
 
+    /**
+     * Creates an HTML {@code SUMMARY} element with the given content.
+     *
+     * @param body the content
+     * @return the element
+     */
+    public static HtmlTree SUMMARY(Content body) {
+        return new HtmlTree(TagName.SUMMARY)
+                .add(body);
+    }
+
     /**
      * Creates an HTML {@code SUP} element with the given content.
      *
@@ -845,6 +908,17 @@ public class HtmlTree extends Content {
             .add(body);
     }
 
+    /**
+     * Creates an HTML {@code UL} element with the given style.
+     *
+     * @param style the style
+     * @return the element
+     */
+    public static HtmlTree UL(HtmlStyle style) {
+        return new HtmlTree(TagName.UL)
+                .setStyle(style);
+    }
+
     /**
      * Creates an HTML {@code UL} element with the given style and some content.
      *
@@ -863,6 +937,21 @@ public class HtmlTree extends Content {
         return htmlTree;
     }
 
+    /**
+     * Creates an HTML {@code UL} element with the given style and content generated
+     * from a collection of items..
+     *
+     * @param style the style
+     * @param items the items to be added to the list
+     * @param mapper a mapper to create the content for each item
+     * @return the element
+     */
+    public static  HtmlTree UL(HtmlStyle style, Collection items, Function mapper) {
+        return new HtmlTree(TagName.UL)
+                .setStyle(style)
+                .addAll(items, mapper);
+    }
+
     @Override
     public boolean isEmpty() {
         return (!hasContent() && !hasAttrs());
@@ -905,30 +994,29 @@ public class HtmlTree extends Content {
      */
     @Override
     public boolean isValid() {
-        switch (tagName) {
-            case A:
-                return (hasAttr(HtmlAttr.ID) || (hasAttr(HtmlAttr.HREF) && hasContent()));
-            case BR:
-                return (!hasContent() && (!hasAttrs() || hasAttr(HtmlAttr.CLEAR)));
-            case HR:
-            case INPUT:
-                return (!hasContent());
-            case IMG:
-                return (hasAttr(HtmlAttr.SRC) && hasAttr(HtmlAttr.ALT) && !hasContent());
-            case LINK:
-                return (hasAttr(HtmlAttr.HREF) && !hasContent());
-            case META:
-                return (hasAttr(HtmlAttr.CONTENT) && !hasContent());
-            case SCRIPT:
-                return ((hasAttr(HtmlAttr.TYPE) && hasAttr(HtmlAttr.SRC) && !hasContent()) ||
-                        (hasAttr(HtmlAttr.TYPE) && hasContent()));
-            case SPAN:
-                return (hasAttr(HtmlAttr.ID) || hasContent());
-            case WBR:
-                return (!hasContent());
-            default :
-                return hasContent();
-        }
+        return switch (tagName) {
+            case A ->
+                    hasAttr(HtmlAttr.ID) || (hasAttr(HtmlAttr.HREF) && hasContent());
+            case BR ->
+                    !hasContent() && (!hasAttrs() || hasAttr(HtmlAttr.CLEAR));
+            case HR, INPUT ->
+                    !hasContent();
+            case IMG ->
+                    hasAttr(HtmlAttr.SRC) && hasAttr(HtmlAttr.ALT) && !hasContent();
+            case LINK ->
+                    hasAttr(HtmlAttr.HREF) && !hasContent();
+            case META ->
+                    hasAttr(HtmlAttr.CONTENT) && !hasContent();
+            case SCRIPT ->
+                    (hasAttr(HtmlAttr.TYPE) && hasAttr(HtmlAttr.SRC) && !hasContent())
+                            || (hasAttr(HtmlAttr.TYPE) && hasContent());
+            case SPAN ->
+                    hasAttr(HtmlAttr.ID) || hasContent();
+            case WBR ->
+                    !hasContent();
+            default ->
+                    hasContent();
+        };
     }
 
     /**
@@ -939,14 +1027,10 @@ public class HtmlTree extends Content {
      * @see Phrasing Content
      */
     public boolean isInline() {
-        switch (tagName) {
-            case A: case BUTTON: case BR: case CODE: case EM: case I: case IMG:
-            case LABEL: case SMALL: case SPAN: case STRONG: case SUB: case SUP:
-            case WBR:
-                return true;
-            default:
-                return false;
-        }
+        return switch (tagName) {
+            case A, BUTTON, BR, CODE, EM, I, IMG, LABEL, SMALL, SPAN, STRONG, SUB, SUP, WBR -> true;
+            default -> false;
+        };
     }
 
     /**
@@ -957,12 +1041,10 @@ public class HtmlTree extends Content {
      * @see Void Elements
      */
     public boolean isVoid() {
-        switch (tagName) {
-            case BR: case HR: case IMG: case INPUT: case LINK: case META: case WBR:
-                return true;
-            default:
-                return false;
-        }
+        return switch (tagName) {
+            case BR, HR, IMG, INPUT, LINK, META, WBR -> true;
+            default -> false;
+        };
     }
 
     @Override
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties
index 8a511b8ca4fa884adb72ee677af6d9e59d831629..285acb051fd7a551a7c881e1f6f672a973e46d12 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2022, 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
@@ -169,6 +169,12 @@ doclet.systemPropertiesSummary=System Properties Summary
 doclet.Window_Source_title=Source code
 doclet.Window_Help_title=API Help
 
+# 0: a date
+doclet.Option_date_out_of_range=value for ''--date'' out of range: {0}
+
+# 0: a date
+doclet.Option_date_not_valid=value for ''--date'' not valid: {0}
+
 doclet.help.main_heading=\
     JavaDoc Help
 doclet.help.navigation.head=\
@@ -420,6 +426,12 @@ doclet.usage.windowtitle.parameters=\
 doclet.usage.windowtitle.description=\
     Browser window title for the documentation
 
+doclet.usage.date.parameters=\
+    
+doclet.usage.date.description=\
+    Specifies the value to be used to timestamp the generated\n\
+    pages, in ISO 8601 format
+
 doclet.usage.doctitle.parameters=\
     
 doclet.usage.doctitle.description=\
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/BaseOptions.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/BaseOptions.java
index 6445f4fc6a088f4eaf0d52de680218f771f1bba3..42110c4aa70a5476049401c120921bae5fc326a1 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/BaseOptions.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/BaseOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022, 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
@@ -30,8 +30,16 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.UnsupportedEncodingException;
+import java.time.Instant;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+import java.time.temporal.ChronoUnit;
+import java.time.temporal.TemporalUnit;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Calendar;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
@@ -82,6 +90,12 @@ public abstract class BaseOptions {
      */
     private final LinkedHashSet> customTagStrs = new LinkedHashSet<>();
 
+    /**
+     * Argument for command-line option {@code --date}.
+     * {@code null} if option not given.
+     */
+    private ZonedDateTime date;
+
     /**
      * Argument for command-line option {@code -d}.
      * Destination directory name, in which doclet will generate the entire
@@ -338,6 +352,33 @@ public abstract class BaseOptions {
                     }
                 },
 
+                new XOption(resources, "--date", 1) {
+                    // Valid --date range: within ten years of now
+                    private static final ZonedDateTime now = ZonedDateTime.now();
+                    static final ZonedDateTime DATE_MIN = now.minusYears(10);
+                    static final ZonedDateTime DATE_MAX = now.plusYears(10);
+
+                    @Override
+                    public boolean process(String opt,  List args) {
+                        if (noTimestamp) {
+                            messages.error("doclet.Option_conflict", "--date", "-notimestamp");
+                            return false;
+                        }
+                        String arg = args.get(0);
+                        try {
+                            date = ZonedDateTime.parse(arg, DateTimeFormatter.ISO_ZONED_DATE_TIME);
+                            if (date.isBefore(DATE_MIN) || date.isAfter(DATE_MAX)) {
+                                messages.error("doclet.Option_date_out_of_range", arg);
+                                return false;
+                            }
+                            return true;
+                        } catch (DateTimeParseException x) {
+                            messages.error("doclet.Option_date_not_valid", arg);
+                            return false;
+                        }
+                    }
+                },
+
                 new Option(resources, "-docencoding", 1) {
                     @Override
                     public boolean process(String opt, List args) {
@@ -471,6 +512,10 @@ public abstract class BaseOptions {
                     @Override
                     public boolean process(String opt, List args) {
                         noTimestamp = true;
+                        if (date != null) {
+                            messages.error("doclet.Option_conflict", "--date", "-notimestamp");
+                            return false;
+                        }
                         return true;
                     }
                 },
@@ -739,6 +784,13 @@ public abstract class BaseOptions {
         return customTagStrs;
     }
 
+    /**
+     * Argument for command-line option {@code --date}.
+     */
+    public ZonedDateTime date() {
+        return date;
+    }
+
     /**
      * Argument for command-line option {@code -d}.
      * Destination directory name, in which doclet will generate the entire
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/Content.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/Content.java
index 84cc66912b4a712bcb9b0794fccd0a69383852da..80dd9c48587167ec891a2d32982a8f52f51e4141 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/Content.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/Content.java
@@ -28,6 +28,8 @@ package jdk.javadoc.internal.doclets.toolkit;
 import java.io.IOException;
 import java.io.StringWriter;
 import java.io.Writer;
+import java.util.Collection;
+import java.util.function.Function;
 
 /**
  * A class to create content for javadoc output pages.
@@ -89,6 +91,25 @@ public abstract class Content {
         throw new UnsupportedOperationException();
     }
 
+    /**
+     * Adds content to the existing content, generated from a collection of items
+     * This is an optional operation.
+     *
+     * @implSpec This implementation delegates to {@link #add(Content)}.
+     *
+     * @param items  the items to be added
+     * @param mapper the function to create content for each item
+     *
+     * @return this object
+     * @throws UnsupportedOperationException if this operation is not supported by
+     *                                       a particular implementation
+     * @throws IllegalArgumentException      if the content is not suitable to be added
+     */
+    public  Content addAll(Collection items, Function mapper) {
+        items.forEach(item -> add(mapper.apply(item)));
+        return this;
+    }
+
     /**
      * Writes content to a writer.
      *
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/ParamTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/ParamTaglet.java
index b41260743ee5be3ee222050fa5b6d1207eb4dd1f..2af114d322b2cd0f3b420702cac57f40a868e628 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/ParamTaglet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/ParamTaglet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2022, 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
@@ -152,7 +152,7 @@ public class ParamTaglet extends BaseTaglet implements InheritableTaglet {
     }
 
     /**
-     * Given an array of {@code @param DocTree}s,return its string representation.
+     * Given an array of {@code @param DocTree}s, return its string representation.
      * Try to inherit the param tags that are missing.
      *
      * @param holder            the element that holds the param tags.
@@ -165,54 +165,29 @@ public class ParamTaglet extends BaseTaglet implements InheritableTaglet {
     private Content getTagletOutput(ParamKind kind, Element holder,
             TagletWriter writer, List formalParameters, List paramTags) {
         Content result = writer.getOutputInstance();
-        Set alreadyDocumented = new HashSet<>();
-        if (!paramTags.isEmpty()) {
-            result.add(
-                processParamTags(holder, kind, paramTags,
-                getRankMap(writer.configuration().utils, formalParameters), writer, alreadyDocumented)
-            );
-        }
-        if (alreadyDocumented.size() != formalParameters.size()) {
-            //Some parameters are missing corresponding @param tags.
-            //Try to inherit them.
-            result.add(getInheritedTagletOutput(kind, holder,
-                writer, formalParameters, alreadyDocumented));
-        }
+        result.add(processParamTags(holder, kind, paramTags, formalParameters, writer));
         return result;
     }
 
     /**
-     * Loop through each individual parameter, despite not having a
-     * corresponding param tag, try to inherit it.
+     * Try to get the inherited taglet documentation for a specific parameter.
      */
     private Content getInheritedTagletOutput(ParamKind kind, Element holder,
-            TagletWriter writer, List formalParameters,
-            Set alreadyDocumented) {
+                                             TagletWriter writer, Element param, int rank,
+                                             boolean isFirst) {
         Utils utils = writer.configuration().utils;
         Content result = writer.getOutputInstance();
-        if ((!alreadyDocumented.contains(null)) && utils.isExecutableElement(holder)) {
-            for (int i = 0; i < formalParameters.size(); i++) {
-                if (alreadyDocumented.contains(String.valueOf(i))) {
-                    continue;
-                }
-                // This parameter does not have any @param documentation.
-                // Try to inherit it.
-                Input input = new DocFinder.Input(writer.configuration().utils, holder, this,
-                        Integer.toString(i), kind == ParamKind.TYPE_PARAMETER);
-                DocFinder.Output inheritedDoc = DocFinder.search(writer.configuration(), input);
-                if (inheritedDoc.inlineTags != null && !inheritedDoc.inlineTags.isEmpty()) {
-                    Element e = formalParameters.get(i);
-                    String lname = kind != ParamKind.TYPE_PARAMETER
-                            ? utils.getSimpleName(e)
-                            : utils.getTypeName(e.asType(), false);
-                    Content content = processParamTag(inheritedDoc.holder, kind, writer,
-                            (ParamTree) inheritedDoc.holderTag,
-                            lname,
-                            alreadyDocumented.isEmpty());
-                    result.add(content);
-                }
-                alreadyDocumented.add(String.valueOf(i));
-            }
+        Input input = new DocFinder.Input(writer.configuration().utils, holder, this,
+                Integer.toString(rank), kind == ParamKind.TYPE_PARAMETER);
+        DocFinder.Output inheritedDoc = DocFinder.search(writer.configuration(), input);
+        if (inheritedDoc.inlineTags != null && !inheritedDoc.inlineTags.isEmpty()) {
+            String lname = kind != ParamKind.TYPE_PARAMETER
+                    ? utils.getSimpleName(param)
+                    : utils.getTypeName(param.asType(), false);
+            Content content = processParamTag(inheritedDoc.holder, kind, writer,
+                    (ParamTree) inheritedDoc.holderTag,
+                    lname, isFirst);
+            result.add(content);
         }
         return result;
     }
@@ -225,23 +200,15 @@ public class ParamTaglet extends BaseTaglet implements InheritableTaglet {
      *
      * @param paramTags the array of {@code @param DocTree} to convert.
      * @param writer the TagletWriter that will write this tag.
-     * @param alreadyDocumented the set of exceptions that have already
-     *        been documented.
-     * @param rankMap a {@link java.util.Map} which holds ordering
-     *                    information about the parameters.
-     * @param rankMap a {@link java.util.Map} which holds a mapping
-                of a rank of a parameter to its name.  This is
-                used to ensure that the right name is used
-                when parameter documentation is inherited.
      * @return the Content representation of this {@code @param DocTree}.
      */
-    private Content processParamTags(Element e, ParamKind kind,
-            List paramTags, Map rankMap, TagletWriter writer,
-            Set alreadyDocumented) {
+    private Content processParamTags(Element e, ParamKind kind, List paramTags,
+                                     List formalParameters, TagletWriter writer) {
+        Map documented = new HashMap<>();
         Messages messages = writer.configuration().getMessages();
-        Content result = writer.getOutputInstance();
+        CommentHelper ch = writer.configuration().utils.getCommentHelper(e);
         if (!paramTags.isEmpty()) {
-            CommentHelper ch = writer.configuration().utils.getCommentHelper(e);
+            Map rankMap = getRankMap(writer.configuration().utils, formalParameters);
             for (ParamTree dt : paramTags) {
                 String name = ch.getParameterName(dt);
                 String paramName = kind == ParamKind.TYPE_PARAMETER ? "<" + name + ">" : name;
@@ -250,23 +217,45 @@ public class ParamTaglet extends BaseTaglet implements InheritableTaglet {
                         case PARAMETER        -> "doclet.Parameters_warn";
                         case TYPE_PARAMETER   -> "doclet.TypeParameters_warn";
                         case RECORD_COMPONENT -> "doclet.RecordComponents_warn";
-                        default -> throw new IllegalArgumentException(kind.toString());
                     };
                     messages.warning(ch.getDocTreePath(dt), key, paramName);
                 }
                 String rank = rankMap.get(name);
-                if (rank != null && alreadyDocumented.contains(rank)) {
-                    String key = switch (kind) {
-                        case PARAMETER        -> "doclet.Parameters_dup_warn";
-                        case TYPE_PARAMETER   -> "doclet.TypeParameters_dup_warn";
-                        case RECORD_COMPONENT -> "doclet.RecordComponents_dup_warn";
-                        default -> throw new IllegalArgumentException(kind.toString());
-                    };
-                    messages.warning(ch.getDocTreePath(dt), key, paramName);
+                if (rank != null) {
+                    if (documented.containsKey(rank)) {
+                        String key = switch (kind) {
+                            case PARAMETER -> "doclet.Parameters_dup_warn";
+                            case TYPE_PARAMETER -> "doclet.TypeParameters_dup_warn";
+                            case RECORD_COMPONENT -> "doclet.RecordComponents_dup_warn";
+                        };
+                        messages.warning(ch.getDocTreePath(dt), key, paramName);
+                    } else {
+                        documented.put(rank, dt);
+                    }
                 }
+            }
+        }
+        // Document declared parameters for which taglet documentation is available
+        // (either directly or inherited) in order of their declaration.
+        Content result = writer.getOutputInstance();
+        for (int i = 0; i < formalParameters.size(); i++) {
+            ParamTree dt = documented.get(String.valueOf(i));
+            if (dt != null) {
                 result.add(processParamTag(e, kind, writer, dt,
-                        name, alreadyDocumented.isEmpty()));
-                alreadyDocumented.add(rank);
+                        ch.getParameterName(dt), result.isEmpty()));
+            } else if (writer.configuration().utils.isExecutableElement(e)) {
+                result.add(getInheritedTagletOutput(kind, e, writer,
+                        formalParameters.get(i), i, result.isEmpty()));
+            }
+        }
+        if (paramTags.size() > documented.size()) {
+            // Generate documentation for remaining taglets that do not match a declared parameter.
+            // These are erroneous but we generate them anyway.
+            for (ParamTree dt : paramTags) {
+                if (!documented.containsValue(dt)) {
+                    result.add(processParamTag(e, kind, writer, dt,
+                            ch.getParameterName(dt), result.isEmpty()));
+                }
             }
         }
         return result;
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/TagletManager.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/TagletManager.java
index 19928eee306456eb1bd32a323a46d5fdf5a2cafd..134d54276340ffed28277e853d3f67f063ea63b8 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/TagletManager.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/TagletManager.java
@@ -250,23 +250,22 @@ public class TagletManager {
      * @param fileManager the file manager to load classes and resources
      */
     public void addCustomTag(String classname, JavaFileManager fileManager) {
+        ClassLoader tagClassLoader = fileManager.getClassLoader(TAGLET_PATH);
+        if (configuration.workArounds.accessInternalAPI()) {
+            Module thisModule = getClass().getModule();
+            Module tagletLoaderUnnamedModule = tagClassLoader.getUnnamedModule();
+            List pkgs = List.of(
+                    "jdk.javadoc.doclet",
+                    "jdk.javadoc.internal.doclets.toolkit",
+                    "jdk.javadoc.internal.doclets.formats.html");
+            pkgs.forEach(p -> thisModule.addOpens(p, tagletLoaderUnnamedModule));
+        }
         try {
-            ClassLoader tagClassLoader;
-            tagClassLoader = fileManager.getClassLoader(TAGLET_PATH);
-            if (configuration.workArounds.accessInternalAPI()) {
-                Module thisModule = getClass().getModule();
-                Module tagletLoaderUnnamedModule = tagClassLoader.getUnnamedModule();
-                List pkgs = List.of(
-                        "jdk.javadoc.doclet",
-                        "jdk.javadoc.internal.doclets.toolkit",
-                        "jdk.javadoc.internal.doclets.formats.html");
-                pkgs.forEach(p -> thisModule.addOpens(p, tagletLoaderUnnamedModule));
-            }
             Class customTagClass =
                     tagClassLoader.loadClass(classname).asSubclass(jdk.javadoc.doclet.Taglet.class);
             jdk.javadoc.doclet.Taglet instance = customTagClass.getConstructor().newInstance();
             registerTaglet(instance);
-        } catch (ReflectiveOperationException exc) {
+        } catch (ReflectiveOperationException | ExceptionInInitializerError | ClassCastException exc) {
             messages.error("doclet.Error_taglet_not_registered", exc.getClass().getName(),
                     classname);
         }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/Checker.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/Checker.java
index abf8c698bbab039823dacd40ec764052ffde72de..446757513a17e6756089b1e5f04d5772a2fb7abd 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/Checker.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/Checker.java
@@ -41,6 +41,7 @@ import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import javax.lang.model.SourceVersion;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ElementKind;
 import javax.lang.model.element.ExecutableElement;
@@ -952,11 +953,31 @@ public class Checker extends DocTreePathScanner {
     @Override @DefinedBy(Api.COMPILER_TREE)
     public Void visitReference(ReferenceTree tree, Void ignore) {
         Element e = env.trees.getElement(getCurrentPath());
-        if (e == null)
-            env.messages.error(REFERENCE, tree, "dc.ref.not.found");
+        if (e == null) {
+            reportBadReference(tree);
+        }
         return super.visitReference(tree, ignore);
     }
 
+    private void reportBadReference(ReferenceTree tree) {
+        if (!env.strictReferenceChecks) {
+            String refSig = tree.getSignature();
+            int sep = refSig.indexOf("/");
+            if (sep > 0) {
+                String moduleName = refSig.substring(0, sep);
+                if (SourceVersion.isName(moduleName)) {
+                    Element m = env.elements.getModuleElement(moduleName);
+                    if (m == null) {
+                        env.messages.warning(REFERENCE, tree, "dc.ref.in.missing.module", moduleName);
+                        return;
+                    }
+                }
+            }
+        }
+
+        env.messages.error(REFERENCE, tree, "dc.ref.not.found");
+    }
+
     @Override @DefinedBy(Api.COMPILER_TREE)
     public Void visitReturn(ReturnTree tree, Void ignore) {
         if (foundReturn) {
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/DocLint.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/DocLint.java
index 1c4f3a3d6509b1bfc987877636f9454927cd3d4b..9a1d0f2e4ccb3240af39c95cca3dfdaf030dc9bc 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/DocLint.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/DocLint.java
@@ -274,6 +274,14 @@ public class DocLint extends com.sun.tools.doclint.DocLint {
 
     // 
 
+    /**
+     * Initialize DocLint for use with a {@code JavacTask}.
+     * {@link Env#strictReferenceChecks Strict reference checks} are not enabled by default.
+     *
+     * @param task            the task
+     * @param args            arguments to configure DocLint
+     * @param addTaskListener whether or not to register a {@code TaskListener} to invoke DocLint
+     */
     public void init(JavacTask task, String[] args, boolean addTaskListener) {
         env = new Env();
         env.init(task);
@@ -319,9 +327,19 @@ public class DocLint extends com.sun.tools.doclint.DocLint {
         }
     }
 
+    /**
+     * Initialize DocLint with the given utility objects and arguments.
+     * {@link Env#strictReferenceChecks Strict reference checks} are enabled by default.
+     *
+     * @param trees    the {@code DocTrees} utility class
+     * @param elements the {@code Elements} utility class
+     * @param types    the {@code Types} utility class
+     * @param args     arguments to configure DocLint
+     */
     public void init(DocTrees trees, Elements elements, Types types, String... args) {
         env = new Env();
         env.init(trees, elements, types);
+        env.strictReferenceChecks = true;
         processArgs(env, args);
 
         checker = new Checker(env);
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/Env.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/Env.java
index 01a0a8676732f1403256569254722eac3e30e2a1..be13ca43fd1c0d9fe0cf7ab473fd5eb7a475e612 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/Env.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/Env.java
@@ -108,6 +108,20 @@ public class Env {
     Set includePackages;
     Set excludePackages;
 
+    /**
+     * How to handle bad references.
+     *
+     * If {@code false}, a reference into a module that is not
+     * in the module graph will just be reported as a warning.
+     * All other bad references will be reported as errors.
+     * This is the desired behavior for javac.
+     *
+     * If {@code true}, all bad references will be reported as
+     * errors. This is the desired behavior for javadoc.
+     *
+     */
+    boolean strictReferenceChecks = false;
+
     // Utility classes
     DocTrees trees;
     Elements elements;
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint.properties b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint.properties
index 091316f0e29d075bbdb1c36dd83261105ade4bfe..fbcb2c0088149a0b9395daa55c67d8f4e8c697a6 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint.properties
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclint/resources/doclint.properties
@@ -61,6 +61,7 @@ dc.no.alt.attr.for.image = no "alt" attribute for image
 dc.no.summary.or.caption.for.table=no caption for table
 dc.param.name.not.found = @param name not found
 dc.ref.not.found = reference not found
+dc.ref.in.missing.module = module for reference not found: {0}
 dc.return.not.first = '{@return} not at beginning of description
 dc.service.not.found = service-type not found
 dc.tag.code.within.code = '{@code} within 
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/package-info.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/package-info.java
index 473e44ff4214a07f59007c58270638c68dedf5eb..4d7da0ba7cded3b005c9abce0ca1f993d34447bf 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/package-info.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, 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,21 +24,146 @@
  */
 
 /**
- *  The implementation of the javadoc tool, and associated doclets.
+ *  The implementation of the javadoc tool and associated doclets.
  *
- *  
    Internally, javadoc is composed of two primary parts:
+ *  
    Internally, javadoc is composed of two primary parts:
  *  the {@link jdk.javadoc.internal.tool tool}, and a series of
  *  {@link jdk.javadoc.internal.doclets doclets}.
  *
- *  The tool provides a common infrastructure for command-line processing,
- *  and for reading the documentation comments in Java source files,
+ *  
    The tool provides a common infrastructure for command-line processing,
+ *  and for reading the declarations and documentation comments in Java source files,
  *  while doclets provide a user-selectable backend for determining
- *  how to process the documentation comments.
+ *  how to process the declarations and their documentation comments.
+ *
+ * 
    The following provides a top-down description of the overall javadoc
+ * software stack.
+ *
+ * 
    
+ *   
    Doclets
+ *   
    
+ *      
    
+ *        
    The Standard Doclet
+ *        
    
+ *          The {@link jdk.javadoc.doclet.StandardDoclet} is a thin public wrapper
+ *          around the internal HTML doclet.
+ *
+ *        
    The HTML Doclet
+ *        
    
+ *          The {@link jdk.javadoc.internal.doclets.formats.html.HtmlDoclet} class
+ *          and other classes in the
+ *          {@link jdk.javadoc.internal.doclets.formats.html formats.html} package
+ *          customize the abstract pages generated by the toolkit layer to generate
+ *          HTML pages.  Some pages are specific to the HTML output format,
+ *          and do not have an abstract builder in the toolkit layer.
+ *
+ *          
    Individual pages of output are generated by page-specific subtypes of
+ *          {@link jdk.javadoc.internal.doclets.formats.html.HtmlDocletWriter}.
+ *
+ *          
    The {@link jdk.javadoc.internal.doclets.formats.html.HtmlConfiguration} class
+ *          provides configuration information that is relevant to all the generated pages.
+ *          The class extends the {@link jdk.javadoc.internal.doclets.toolkit.BaseConfiguration}
+ *          class provided by the toolkit layer.
+ *
+ *          
    The classes in the {@code formats.html} package use an internal
+ *          library in the
+ *          {@link jdk.javadoc.internal.doclets.formats.html.markup formats.html.markup} package,
+ *          to create trees (or acyclic graphs) of
+ *          {@linkplain jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree HTML tree nodes}.
+ *          Apart from using a common format-neutral supertype,
+ *          {@link jdk.javadoc.internal.doclets.toolkit.Content}, the {@code markup} library
+ *          is mostly independent of the rest of the javadoc software stack.
+ *
+ *        
    Toolkit
+ *        
    
+ *          The {@link jdk.javadoc.internal.doclets.toolkit toolkit} package provides
+ *          support for a format-neutral
+ *          {@linkplain jdk.javadoc.internal.doclets.toolkit.AbstractDoclet abstract doclet},
+ *          which uses
+ *          {@linkplain jdk.javadoc.internal.doclets.toolkit.builders.AbstractBuilder builders}
+ *          to generate pages of abstract
+ *          {@linkplain jdk.javadoc.internal.doclets.toolkit.Content content}.
+ *
+ *          
    The format-specific content for each page is provided by implementations
+ *          of various writer interfaces, created by a format-specific
+ *          {@linkplain jdk.javadoc.internal.doclets.toolkit.WriterFactory writer factory}.
+ *
+ *          
    The {@link jdk.javadoc.internal.doclets.toolkit.BaseConfiguration} provides
+ *          configuration information that is relevant to all the generated pages.
+ *          Some of the information is provided by abstract methods which are implemented
+ *          in format-specific subtypes of the class.
+ *
+ *          
    The toolkit layer also provides
+ *          {@linkplain jdk.javadoc.internal.doclets.toolkit.util utility classes}
+ *          used by this layer and by format-specific layers.
+ *
+ *          
    Generally, it is intended that doclets should use the
+ *          {@link javax.lang.model Language Model API} to navigate the structure of a Java program,
+ *          without needing to access any internal details of the underlying javac implementation.
+ *          However, there are still some shortcomings of the Language Model API,
+ *          and so it is still necessary to provide limited access to some of those internal details.
+ *          Although not enforceable by the module system, by design the access to javac
+ *          internal details by doclets based on {@code AbstractDoclet} is restricted to the aptly-named
+ *          {@link jdk.javadoc.internal.doclets.toolkit.WorkArounds} class.
+ *
+ *        
    Other Doclets
+ *        
    
+ *          Doclets are obviously not required to use
+ *          {@link jdk.javadoc.internal.doclets.toolkit.AbstractDoclet} and other classes in
+ *          the toolkit layer. In times past, it was common to write doclets to analyze
+ *          code using the then-current API as an early version of a Java language model.
+ *          That old API has been replaced by the {@link javax.lang.model Language Model API},
+ *          and tools that wish to use that API to analyze Java programs have a choice of
+ *          how to invoke it, using the javac support for
+ *          {@linkplain javax.annotation.processing annotation processing},
+ *          or {@linkplain com.sun.source.util.Plugin plugins}, as well as doclets.
+ *          Which is best for any application will depend of the circumstances, but
+ *          if a tool does not need access to the documentation comments in a program,
+ *          it is possible that one of the other invocation mechanisms will be more convenient.
+ *
+ *      
    
+ *
+ *   
    The Doclet Interface
+ *   
    
+ *     The {@linkplain jdk.javadoc.doclet Doclet API} is the interface layer between
+ *     the javadoc tool and the code to process the elements specified to the tool.
+ *
+ *     
    Above this layer, in any doclet, the code is expected to use the
+ *     {@linkplain javax.lang.model Language Model API} to navigate around the specified
+ *     elements, and/or the {@linkplain com.sun.source.doctree DocTree API} to examine
+ *     the corresponding documentation comments.
+ *
+ *   
    The javadoc Tool
+ *   
    
+ *       After reading the command-line options, the tool uses a modified javac
+ *       front end to read the necessary files and thus instantiate the
+ *       {@linkplain javax.lang.model.element.Element elements} to be made available to
+ *       the doclet that will be used to process them.
+ *
+ *       The tool uses an internal feature of the javac architecture, which
+ *       allows various components to be replaced by subtypes with modified behavior.
+ *       This is done by pre-registering the desired components in the javac
+ *       {@code Context}.
+ *       The tool uses this mechanism to do the following:
+ *       
      
+ *         
    • although source files are parsed in their entirety, the
+ *           content of method bodies is quickly discarded as unnecessary;
+ *         
    • the class reader is updated to handle {@code package.html}
+ *           files in any package directories that are read; and
+ *         
    • the compilation pipeline for each source file is terminated
+ *           after the parse and enter phases, meaning that
+ *           the files are processed enough to instantiate the elements to
+ *           be made available to the doclet, but no more.
+ *       
    
+ * 
    
  *
  *
  *  
    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.
+ *
+ * @see JavaDoc Architecture
+ * @see Using the new Doclet API
+ * @see Processing Code
  */
-package jdk.javadoc.internal;
+package jdk.javadoc.internal;
\ No newline at end of file
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ElementsTable.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ElementsTable.java
index 20362f6a09d099b39f3708ff551e170e0e4541ce..e92176cbd8573abce616ecbd49936741c739173a 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ElementsTable.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ElementsTable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2022, 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
@@ -793,7 +793,7 @@ public class ElementsTable {
             Collection collection,
             boolean recurse) throws ToolException {
         for (ModulePackage modpkg : collection) {
-            toolEnv.notice("main.Loading_source_files_for_package", modpkg.toString());
+            toolEnv.printInfo("main.Loading_source_files_for_package", modpkg.toString());
             List files = getFiles(modpkg, recurse);
             if (files.isEmpty()) {
                 String text = log.getText("main.no_source_files_for_package",
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocLog.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocLog.java
index 8409169968b0f6dc5636a43f9741509c88bc816d..04f24fcde9cb35c9a861a4144c8648c5804588ee 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocLog.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocLog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022, 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
@@ -292,12 +292,6 @@ public class JavadocLog extends Log implements Reporter {
         report(dt, flags, ds, dp, message);
     }
 
-    private int getSourcePos(DocTreePath path, int offset) {
-        DCTree.DCDocComment docComment = (DCTree.DCDocComment) path.getDocComment();
-        DCTree tree = (DCTree) path.getLeaf();
-        return docComment.getSourcePosition(tree.getStartPosition() + offset);
-    }
-
     @Override  // Reporter
     public void print(Kind kind, Element element, String message) {
         DiagnosticType dt = getDiagnosticType(kind);
@@ -450,22 +444,27 @@ public class JavadocLog extends Log implements Reporter {
     }
 
     /**
-     * Prints a "notice" message to the standard writer.
+     * Prints a "notice" message.
      *
-     * @param key  the resource key for the message
-     * @param args the arguments for the message
+     * @param message the message
      */
-    public void noticeUsingKey(String key, Object... args) {
-        printRawLines(getStandardWriter(), getText(key, args));
+    public void printNote(String message) {
+        // Ideally, for consistency with errors and warnings, we would use the following:
+        //      report(Kind.NOTE, null, null, message);
+        // but the default formatting in Log for Kind.NOTE is to prefix the line with "Note:"
+        // which is undesirable and inconsistent with existing javadoc output.
+        // For now, to avoid the prefix, we write directly to the underlying stream.
+        printRawLines(WriterKind.NOTICE, message);
     }
 
     /**
-     * Prints a "notice" message to the standard writer.
+     * Prints a "notice" message.
      *
-     * @param message the message
+     * @param key the resource key for the message
+     * @param args the arguments for the message
      */
-    public void notice(String message) {
-        printRawLines(getStandardWriter(), message);
+    public void printNoteUsingKey(String key, Object... args) {
+        printNote(getText(key, args));
     }
 
     /**
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocTool.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocTool.java
index 16f9ce2ca68c81261ec44c5a1828efdc9e3d68ca..94d3d21413172b138f9d7079b9f964a5b796be49 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocTool.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocTool.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2022, 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
@@ -207,7 +207,7 @@ public class JavadocTool extends com.sun.tools.javac.main.JavaCompiler {
             }
 
             // Enter symbols for all files
-            toolEnv.notice("main.Building_tree");
+            toolEnv.printInfo("main.Building_tree");
             javadocEnter.main(allTrees.toList());
 
             if (log.hasErrors()) {
@@ -284,7 +284,7 @@ public class JavadocTool extends com.sun.tools.javac.main.JavaCompiler {
         for (JavaFileObject fo: files) {
             if (uniquefiles.add(fo)) { // ignore duplicates
                 if (trace)
-                    toolEnv.notice("main.Loading_source_file", fo.getName());
+                    toolEnv.printInfo("main.Loading_source_file", fo.getName());
                 trees.append(parse(fo));
             }
         }
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Start.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Start.java
index 231130b071f3d0ac192d941538fd441ce35f128b..4d25ac5f22adc892c7eeb06b8b01662593e71337 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Start.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Start.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022, 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
@@ -196,7 +196,7 @@ public class Start {
     }
 
     private void showUsage(String headerKey, ToolOption.Kind kind, String footerKey) {
-        log.noticeUsingKey(headerKey);
+        showLinesUsingKey(headerKey);
         showToolOptions(kind);
 
         // let doclet print usage information
@@ -205,12 +205,13 @@ public class Start {
                     ? Option.Kind.EXTENDED
                     : Option.Kind.STANDARD);
         }
-        if (footerKey != null)
-            log.noticeUsingKey(footerKey);
+        if (footerKey != null) {
+            showLinesUsingKey(footerKey);
+        }
     }
 
     private void showVersion(String labelKey, String value) {
-        log.noticeUsingKey(labelKey, log.programName, value);
+        showLinesUsingKey(labelKey, log.programName, value);
     }
 
     private void showToolOptions(ToolOption.Kind kind) {
@@ -253,7 +254,7 @@ public class Start {
         if (options.isEmpty()) {
             return;
         }
-        log.noticeUsingKey("main.doclet.usage.header", name);
+        showLinesUsingKey("main.doclet.usage.header", name);
 
         Comparator comp = new Comparator() {
             final Collator collator = Collator.getInstance(Locale.US);
@@ -308,22 +309,30 @@ public class Start {
         if (synopses.length() < DEFAULT_SYNOPSIS_WIDTH
                 && !description.contains("\n")
                 && (SMALL_INDENT.length() + DEFAULT_SYNOPSIS_WIDTH + 1 + description.length() <= DEFAULT_MAX_LINE_LENGTH)) {
-            log.notice(String.format(COMPACT_FORMAT, synopses, description));
+            showLines(String.format(COMPACT_FORMAT, synopses, description));
             return;
         }
 
         // If option synopses fit on a single line of reasonable length, show that;
         // otherwise, show 1 per line
         if (synopses.length() <= DEFAULT_MAX_LINE_LENGTH) {
-            log.notice(SMALL_INDENT + synopses);
+            showLines(SMALL_INDENT + synopses);
         } else {
             for (String name: names) {
-                log.notice(SMALL_INDENT + name + parameters);
+                showLines(SMALL_INDENT + name + parameters);
             }
         }
 
         // Finally, show the description
-        log.notice(LARGE_INDENT + description.replace("\n", "\n" + LARGE_INDENT));
+        showLines(LARGE_INDENT + description.replace("\n", "\n" + LARGE_INDENT));
+    }
+
+    private void showLinesUsingKey(String key, Object... args) {
+        showLines(log.getText(key, args));
+    }
+
+    private void showLines(String message) {
+        log.printRawLines(Log.WriterKind.STDOUT, message);
     }
 
 
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ToolEnvironment.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ToolEnvironment.java
index ef6f1b74940ff4ef79d24f4c85d9aa366872c3fb..b42245da5a973be96b679f20b2c19d807a2718cc 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ToolEnvironment.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ToolEnvironment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2022, 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
@@ -191,28 +191,14 @@ public class ToolEnvironment {
     }
 
     /**
-     * Print a notice, iff quiet is not specified.
+     * Prints a notice unless {@code -quiet} was specified.
      *
      * @param key selects message from resource
      */
-    public void notice(String key) {
-        if (quiet) {
-            return;
+    public void printInfo(String key, Object... args) {
+        if (!quiet) {
+            log.printNoteUsingKey(key, args);
         }
-        JavadocLog.printRawLines(log.getDiagnosticWriter(), log.getText(key));
-    }
-
-    /**
-     * Print a notice, iff quiet is not specified.
-     *
-     * @param key selects message from resource
-     * @param a1 first argument
-     */
-    public void notice(String key, String a1) {
-        if (quiet) {
-            return;
-        }
-        JavadocLog.printRawLines(log.getDiagnosticWriter(), log.getText(key, a1));
     }
 
     TreePath getTreePath(JCCompilationUnit tree) {
@@ -247,8 +233,4 @@ public class ToolEnvironment {
     public Env getEnv(ClassSymbol tsym) {
         return enter.getEnv(tsym);
     }
-
-    public boolean isQuiet() {
-        return quiet;
-    }
 }
diff --git a/src/jdk.jcmd/share/man/jcmd.1 b/src/jdk.jcmd/share/man/jcmd.1
index 65adf880911b0bb5a0fd5a40a46cd8fa7d196053..9342943ac2a99b40ac22e85c8823564747d217f8 100644
--- a/src/jdk.jcmd/share/man/jcmd.1
+++ b/src/jdk.jcmd/share/man/jcmd.1
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
+.\" Copyright (c) 2012, 2022, 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
@@ -802,7 +802,8 @@ false)
 .RE
 .TP
 .B \f[CB]VM.cds\f[R] [\f[I]arguments\f[R]]
-Dump a static or dynamic shared archive including all shareable classes.
+Dumps a static or dynamic shared archive that includes all currently
+loaded classes.
 .RS
 .PP
 Impact: Medium \-\-\- pause time depends on number of loaded classes
@@ -811,11 +812,22 @@ Permission: \f[CB]java.lang.management.ManagementPermission(monitor)\f[R]
 .PP
 \f[I]arguments\f[R]:
 .IP \[bu] 2
-\f[CB]subcmd\f[R]: \f[CB]static_dump\f[R] | \f[CB]dynamic_dump\f[R] (STRING,
-no default value)
+\f[CB]subcmd\f[R]: must be either \f[CB]static_dump\f[R] or
+\f[CB]dynamic_dump\f[R] (STRING, no default value)
 .IP \[bu] 2
 \f[CB]filename\f[R]: (Optional) Name of the shared archive to be dumped
 (STRING, no default value)
+.PP
+If \f[CB]filename\f[R] is not specified, a default file name is chosen
+using the pid of the target JVM process.
+For example, java_pid1234_static.jsa, java_pid5678_dynamic.jsa, etc.
+.PP
+If \f[CB]filename\f[R] is not specified as an absolute path, the archive
+file is created in a directory relative to the current directory of the
+target JVM process.
+.PP
+If \f[CB]dynamic_dump\f[R] is specified, the target JVM must be started
+with the JVM option \f[CB]\-XX:+RecordDynamicDumpInfo\f[R].
 .RE
 .TP
 .B \f[CB]VM.classloaders\f[R] [\f[I]options\f[R]]
diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleDotGraph.java b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleDotGraph.java
index 21c4d67829c412fa83923b84d3587c58bac2248e..a23f25be9d2aeda5bfe8d92d8261cab937e298ed 100644
--- a/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleDotGraph.java
+++ b/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleDotGraph.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2021, 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
@@ -65,7 +65,6 @@ public class ModuleDotGraph {
         this(config,
              config.rootModules().stream()
                    .map(Module::name)
-                   .sorted()
                    .collect(toMap(Function.identity(), mn -> config.resolve(Set.of(mn)))),
              apiOnly);
     }
diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachineManager.java b/src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachineManager.java
index 8b5957dc0d90a07e3911c515971a85730675cb4e..eee09ded39b0b27601711e78b9051b1ee42b6461 100644
--- a/src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachineManager.java
+++ b/src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachineManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2022, 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
@@ -97,7 +97,7 @@ import com.sun.jdi.event.VMStartEvent;
  * {@code -agentlib:jdwp=transport=xxx,server=y}
  * 
    • 
  * 
  • 
- * Target VM generates and outputs the tranport-specific address at which it will
+ * Target VM generates and outputs the transport-specific address at which it will
  * listen for a connection.
    • 
  * 
  • 
  * Debugger is launched. Debugger selects a connector in the list
@@ -158,7 +158,7 @@ import com.sun.jdi.event.VMStartEvent;
  * 
    • 
  * 
  • 
  * Later, an uncaught exception is thrown in the target VM. The target
- * VM generates the tranport-specific address at which it will
+ * VM generates the transport-specific address at which it will
  * listen for a connection.
  * 
  • Target VM launches the debugger with the following items concatenated
  * together (separated by spaces) to form the command line:
diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/commonRef.c b/src/jdk.jdwp.agent/share/native/libjdwp/commonRef.c
index bc7ddb660bf048714b5aea061bb2e99e5c866c46..d55c517332bd93f0e8df04b6178c628260f014ea 100644
--- a/src/jdk.jdwp.agent/share/native/libjdwp/commonRef.c
+++ b/src/jdk.jdwp.agent/share/native/libjdwp/commonRef.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2022, 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,6 +82,14 @@ newSeqNum(void)
     return gdata->nextSeqNum++;
 }
 
+/* Returns true if this is a strong reference, meaning that either or both of
+   isPinAll and isCommonPin are true. */
+static jboolean
+isStrong(RefNode* node)
+{
+    return node->isPinAll || node->isCommonPin;
+}
+
 /* Create a fresh RefNode structure, create a weak ref and tag the object */
 static RefNode *
 createNode(JNIEnv *env, jobject ref)
@@ -89,7 +97,7 @@ createNode(JNIEnv *env, jobject ref)
     RefNode   *node;
     jobject    strongOrWeakRef;
     jvmtiError error;
-    jboolean   pin = gdata->pinAllCount != 0;
+    jboolean   pinAll = gdata->pinAllCount != 0;
 
     /* Could allocate RefNode's in blocks, not sure it would help much */
     node = (RefNode*)jvmtiAllocate((int)sizeof(RefNode));
@@ -97,7 +105,7 @@ createNode(JNIEnv *env, jobject ref)
         return NULL;
     }
 
-    if (pin) {
+    if (pinAll) {
         /* Create strong reference to make sure we have a reference */
         strongOrWeakRef = JNI_FUNC_PTR(env,NewGlobalRef)(env, ref);
     } else {
@@ -116,7 +124,7 @@ createNode(JNIEnv *env, jobject ref)
     error = JVMTI_FUNC_PTR(gdata->jvmti, SetTag)
                           (gdata->jvmti, strongOrWeakRef, ptr_to_jlong(node));
     if ( error != JVMTI_ERROR_NONE ) {
-        if (pin) {
+        if (pinAll) {
             JNI_FUNC_PTR(env,DeleteGlobalRef)(env, strongOrWeakRef);
         } else {
             JNI_FUNC_PTR(env,DeleteWeakGlobalRef)(env, strongOrWeakRef);
@@ -128,7 +136,8 @@ createNode(JNIEnv *env, jobject ref)
     /* Fill in RefNode */
     node->ref         = strongOrWeakRef;
     node->count       = 1;
-    node->strongCount = pin ? 1 : 0;
+    node->isPinAll    = pinAll;
+    node->isCommonPin = JNI_FALSE;
     node->seqNum      = newSeqNum();
 
     /* Count RefNode's created */
@@ -146,7 +155,7 @@ deleteNode(JNIEnv *env, RefNode *node)
         /* Clear tag */
         (void)JVMTI_FUNC_PTR(gdata->jvmti,SetTag)
                             (gdata->jvmti, node->ref, NULL_OBJECT_ID);
-        if (node->strongCount != 0) {
+        if (isStrong(node)) {
             JNI_FUNC_PTR(env,DeleteGlobalRef)(env, node->ref);
         } else {
             JNI_FUNC_PTR(env,DeleteWeakGlobalRef)(env, node->ref);
@@ -158,9 +167,9 @@ deleteNode(JNIEnv *env, RefNode *node)
 
 /* Change a RefNode to have a strong reference */
 static jobject
-strengthenNode(JNIEnv *env, RefNode *node)
+strengthenNode(JNIEnv *env, RefNode *node, jboolean isPinAll)
 {
-    if (node->strongCount == 0) {
+    if (!isStrong(node)) {
         jobject strongRef;
 
         strongRef = JNI_FUNC_PTR(env,NewGlobalRef)(env, node->ref);
@@ -176,20 +185,27 @@ strengthenNode(JNIEnv *env, RefNode *node)
         if (strongRef != NULL) {
             JNI_FUNC_PTR(env,DeleteWeakGlobalRef)(env, node->ref);
             node->ref         = strongRef;
-            node->strongCount = 1;
+        } else {
+          return NULL;
         }
-        return strongRef;
+    }
+    if (isPinAll) {
+        node->isPinAll = JNI_TRUE;
     } else {
-        node->strongCount++;
-        return node->ref;
+        node->isCommonPin = JNI_TRUE;
     }
+    return node->ref;
 }
 
 /* Change a RefNode to have a weak reference */
 static jweak
-weakenNode(JNIEnv *env, RefNode *node)
+weakenNode(JNIEnv *env, RefNode *node, jboolean isUnpinAll)
 {
-    if (node->strongCount == 1) {
+    jboolean willStillBeStrong = (node->isPinAll && !isUnpinAll) || (node->isCommonPin && isUnpinAll);
+
+    // If the node is strong, but the reason(s) for it being strong
+    // will no longer exist, then weaken it.
+    if (isStrong(node) && !willStillBeStrong) {
         jweak weakRef;
 
         weakRef = JNI_FUNC_PTR(env,NewWeakGlobalRef)(env, node->ref);
@@ -200,16 +216,18 @@ weakenNode(JNIEnv *env, RefNode *node)
 
         if (weakRef != NULL) {
             JNI_FUNC_PTR(env,DeleteGlobalRef)(env, node->ref);
-            node->ref         = weakRef;
-            node->strongCount = 0;
+            node->ref      = weakRef;
+        } else {
+          return NULL;
         }
-        return weakRef;
+    }
+
+    if (isUnpinAll) {
+        node->isPinAll = JNI_FALSE;
     } else {
-        if (node->strongCount > 0) {
-            node->strongCount--;
-        }
-        return node->ref;
+        node->isCommonPin = JNI_FALSE;
     }
+    return node->ref;
 }
 
 /*
@@ -470,7 +488,7 @@ commonRef_idToRef(JNIEnv *env, jlong id)
 
         node = findNodeByID(env, id);
         if (node != NULL) {
-            if (node->strongCount != 0) {
+          if (isStrong(node)) {
                 saveGlobalRef(env, node->ref, &ref);
             } else {
                 jobject lref;
@@ -522,7 +540,7 @@ commonRef_pin(jlong id)
         } else {
             jobject strongRef;
 
-            strongRef = strengthenNode(env, node);
+            strongRef = strengthenNode(env, node, JNI_FALSE /* isPinAll */);
             if (strongRef == NULL) {
                 /*
                  * Referent has been collected, clean up now.
@@ -551,7 +569,7 @@ commonRef_unpin(jlong id)
         if (node != NULL) {
             jweak weakRef;
 
-            weakRef = weakenNode(env, node);
+            weakRef = weakenNode(env, node, JNI_FALSE /* isUnpinAll */);
             if (weakRef == NULL) {
                 error = AGENT_ERROR_OUT_OF_MEMORY;
             }
@@ -585,7 +603,7 @@ commonRef_pinAll()
                 while (node != NULL) {
                     jobject strongRef;
 
-                    strongRef = strengthenNode(env, node);
+                    strongRef = strengthenNode(env, node, JNI_TRUE /* isPinAll */);
 
                     /* Has the object been collected? */
                     if (strongRef == NULL) {
@@ -628,7 +646,7 @@ commonRef_unpinAll()
                 for (node = gdata->objectsByID[i]; node != NULL; node = node->next) {
                     jweak weakRef;
 
-                    weakRef = weakenNode(env, node);
+                    weakRef = weakenNode(env, node, JNI_TRUE /* isUnpinAll */);
                     if (weakRef == NULL) {
                         EXIT_ERROR(AGENT_ERROR_NULL_POINTER,"NewWeakGlobalRef");
                     }
@@ -676,8 +694,7 @@ commonRef_compact(void)
                 prev = NULL;
                 while (node != NULL) {
                     /* Has the object been collected? */
-                    if ( (node->strongCount == 0) &&
-                          isSameObject(env, node->ref, NULL)) {
+                  if (!isStrong(node) && isSameObject(env, node->ref, NULL)) {
                         RefNode *freed;
 
                         /* Detach from the ID list */
diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/invoker.c b/src/jdk.jdwp.agent/share/native/libjdwp/invoker.c
index fdc7a0bc613aa07a05c1c9e9c842ebc85ccaa97b..42e6741d467c54dded2bade9daa5d773131f9b21 100644
--- a/src/jdk.jdwp.agent/share/native/libjdwp/invoker.c
+++ b/src/jdk.jdwp.agent/share/native/libjdwp/invoker.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2022, 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
@@ -752,7 +752,9 @@ invoker_completeInvokeRequest(jthread thread)
         }
         id = request->id;
         exc = request->exception;
+        request->exception = NULL;
         returnValue = request->returnValue;
+        request->returnValue.l = NULL;
 
         /* Release return value and exception references, but delay the release
          * until after the return packet was sent. */
@@ -790,23 +792,20 @@ invoker_completeInvokeRequest(jthread thread)
         (void)outStream_writeValue(env, &out, tag, returnValue);
         (void)outStream_writeObjectTag(env, &out, exc);
         (void)outStream_writeObjectRef(env, &out, exc);
+        /*
+         * Delete potentially saved global references for return value
+         * and exception. This must be done before sending the reply or
+         * these objects will briefly be viewable by the debugger as live
+         * when they shouldn't be.
+         */
+        if (mustReleaseReturnValue && returnValue.l != NULL) {
+            tossGlobalRef(env, &returnValue.l);
+        }
+        if (exc != NULL) {
+            tossGlobalRef(env, &exc);
+        }
         outStream_sendReply(&out);
     }
-
-    /*
-     * Delete potentially saved global references of return value
-     * and exception
-     */
-    eventHandler_lock(); // for proper lock order
-    debugMonitorEnter(invokerLock);
-    if (mustReleaseReturnValue && returnValue.l != NULL) {
-        tossGlobalRef(env, &returnValue.l);
-    }
-    if (exc != NULL) {
-        tossGlobalRef(env, &exc);
-    }
-    debugMonitorExit(invokerLock);
-    eventHandler_unlock();
 }
 
 jboolean
diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/util.h b/src/jdk.jdwp.agent/share/native/libjdwp/util.h
index 134bf03db7aae089a6f6ef196df31ce1b8e378d1..0619648d9579960ba430950ce8ce474dc038df7b 100644
--- a/src/jdk.jdwp.agent/share/native/libjdwp/util.h
+++ b/src/jdk.jdwp.agent/share/native/libjdwp/util.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2022, 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
@@ -65,7 +65,8 @@ typedef struct RefNode {
     jobject      ref;           /* could be strong or weak */
     struct RefNode *next;       /* next RefNode* in bucket chain */
     jint         count;         /* count of references */
-    unsigned     strongCount;   /* count of strong reference */
+    jboolean     isPinAll;      /* true if this is a strong reference due to a commonRef_pinAll() */
+    jboolean     isCommonPin;   /* true if this is a strong reference due to a commonRef_pin() */
 } RefNode;
 
 /* Value of a NULL ID */
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/FlightRecorder.java b/src/jdk.jfr/share/classes/jdk/jfr/FlightRecorder.java
index b7f558a17cbe60cf31a6d41bb94165aee854cce6..5e2bac1ba74e22589c6f16dc33629bcc0a314108 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/FlightRecorder.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/FlightRecorder.java
@@ -192,7 +192,6 @@ public final class FlightRecorder {
                     Logger.log(JFR, DEBUG, "globalbuffersize: " + Options.getGlobalBufferSize()+ " bytes");
                     Logger.log(JFR, DEBUG, "globalbuffercount: " + Options.getGlobalBufferCount());
                     Logger.log(JFR, DEBUG, "dumppath: " + Options.getDumpPath());
-                    Logger.log(JFR, DEBUG, "samplethreads: " + Options.getSampleThreads());
                     Logger.log(JFR, DEBUG, "stackdepth: " + Options.getStackDepth());
                     Logger.log(JFR, DEBUG, "threadbuffersize: " + Options.getThreadBufferSize());
                 }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/Recording.java b/src/jdk.jfr/share/classes/jdk/jfr/Recording.java
index 71ef9cebc258b26f2b2088ae4f1bb9c2bc7c80ea..1dd4b3030133e94e152751b29ba6baf4235727b3 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/Recording.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/Recording.java
@@ -424,25 +424,6 @@ public final class Recording implements Closeable {
         internal.setMaxSize(maxSize);
     }
 
-        /**
-         * Determines how often events are made available for streaming.
-         *
-         * @param interval the interval at which events are made available for streaming.
-         *
-         * @throws IllegalArgumentException if {@code interval} is negative
-         *
-         * @throws IllegalStateException if the recording is in the {@code CLOSED} state
-         *
-         * @since 14
-         */
-        /*package private*/ void setFlushInterval(Duration interval) {
-            Objects.requireNonNull(interval);
-            if (interval.isNegative()) {
-                throw new IllegalArgumentException("Stream interval can't be negative");
-            }
-            internal.setFlushInterval(interval);
-        }
-
     /**
      * Returns how often events are made available for streaming purposes.
      *
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordedEvent.java b/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordedEvent.java
index 7a9cc510985b353bf7f54f734c55aa02745b0e8d..b0ffe88b9c71edcb65bf151f25f68a8db1b249a2 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordedEvent.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordedEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2022, 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
@@ -107,6 +107,9 @@ public final class RecordedEvent extends RecordedObject {
      * @return the duration in nanoseconds, not {@code null}
      */
     public Duration getDuration() {
+        if(startTimeTicks == endTimeTicks) {
+            return Duration.ZERO;
+        }
         return Duration.ofNanos(getEndTimeNanos() - getStartTimeNanos());
     }
 
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordedObject.java b/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordedObject.java
index c366934f23b8d30c19edd0cc3156d9b392de132f..d9def94ff8ab70259f83dcd7c21e39497773b37f 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordedObject.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/consumer/RecordedObject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2022, 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
@@ -150,16 +150,7 @@ public class RecordedObject {
         JdkJfrConsumer.setAccess(access);
     }
 
-    private static final class UnsignedValue {
-        private final Object o;
-
-        UnsignedValue(Object o) {
-            this.o = o;
-        }
-
-        Object value() {
-            return o;
-        }
+    private static final record UnsignedValue(Object value) {
     }
 
     final Object[] objects;
@@ -827,8 +818,11 @@ public class RecordedObject {
         throw newIllegalArgumentException(name, "java.time.Duration");
     }
 
-    private Duration getDuration(long timespan, String name) throws InternalError {
+    private Duration getDuration(long timespan, String name) {
         ValueDescriptor v = getValueDescriptor(objectContext.fields, name, null);
+        if (timespan == 0) {
+            return Duration.ZERO;
+        }
         if (timespan == Long.MIN_VALUE) {
             return Duration.ofSeconds(Long.MIN_VALUE, 0);
         }
@@ -997,7 +991,7 @@ public class RecordedObject {
         if (instant.equals(Instant.MIN)) {
             return OffsetDateTime.MIN;
         }
-        return OffsetDateTime.ofInstant(getInstant(name), objectContext.getZoneOffset());
+        return OffsetDateTime.ofInstant(instant, objectContext.getZoneOffset());
     }
 
     private static IllegalArgumentException newIllegalArgumentException(String name, String typeName) {
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/events/FileReadEvent.java b/src/jdk.jfr/share/classes/jdk/jfr/events/FileReadEvent.java
index 703f0d1271c73c7e48df79c0821f2157d07d9990..a3a53c6a7e92318bd31c85b5fcb65811dbd9b750 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/events/FileReadEvent.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/events/FileReadEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2022, 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,7 +42,7 @@ public final class FileReadEvent extends AbstractJDKEvent {
     // EventHandler::write(..., String, long, boolean)
 
     @Label("Path")
-    @Description("Full path of the file")
+    @Description("Full path of the file, or N/A if a file descriptor was used to create the stream, for example System.in")
     public String path;
 
     @Label("Bytes Read")
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/events/FileWriteEvent.java b/src/jdk.jfr/share/classes/jdk/jfr/events/FileWriteEvent.java
index 7554fee09c29c487f190b3e43e9566e9819c1855..01ffc5dfa48045750743df781613a3bd3f4c113f 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/events/FileWriteEvent.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/events/FileWriteEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2022, 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,7 +42,7 @@ public final class FileWriteEvent extends AbstractJDKEvent {
     // EventHandler::write(..., String, long)
 
     @Label("Path")
-    @Description("Full path of the file")
+    @Description("Full path of the file, or N/A if a file descriptor was used to create the stream, for example System.out and System.err")
     public String path;
 
     @Label("Bytes Written")
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/Control.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/Control.java
index 0887d1ce0ed9c2c04c677e0dba49f07d51fe0115..27281cd5f58b8bfee4163f3ffd95380e988a6977 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/Control.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/Control.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2022, 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
@@ -75,7 +75,7 @@ public final class Control {
     public String getValue() {
         if (context == null) {
             // VM events requires no access control context
-            return getValue();
+            return delegate.getValue();
         } else {
             return AccessController.doPrivileged(new PrivilegedAction() {
                 @Override
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/JVM.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/JVM.java
index ff84b31b0cda7922fec0a6bfce783fe8efad4ad9..0739a0bfacbf2093bd8130a72f503c14a1b98b1b 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/JVM.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/JVM.java
@@ -301,15 +301,6 @@ public final class JVM {
      */
     public native void setForceInstrumentation(boolean force);
 
-    /**
-     * Turn on/off thread sampling.
-     *
-     * @param sampleThreads true if threads should be sampled, false otherwise.
-     *
-     * @throws IllegalStateException if state can't be changed.
-     */
-    public native void setSampleThreads(boolean sampleThreads) throws IllegalStateException;
-
     /**
      * Turn on/off compressed integers.
      *
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/MetadataRepository.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/MetadataRepository.java
index 5a6e12989f903b59cd1860a174484f77b9438226..f76fdc62a74c5f671479ee30e8b4feca375e897d 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/MetadataRepository.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/MetadataRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2022, 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
@@ -280,9 +280,12 @@ public final class MetadataRepository {
         if (staleMetadata) {
             storeDescriptorInJVM();
         }
-        awaitUniqueTimestamp();
         jvm.setOutput(filename);
-        long nanos = jvm.getChunkStartNanos();
+        // Each chunk needs a unique start timestamp and
+        // if the clock resolution is low, two chunks may
+        // get the same timestamp. Utils.getChunkStartNanos()
+        // ensures the timestamp is unique for the next chunk
+        long chunkStart = Utils.getChunkStartNanos();
         if (filename != null) {
             RepositoryFiles.notifyNewFile();
         }
@@ -293,29 +296,7 @@ public final class MetadataRepository {
             }
             unregistered = false;
         }
-        return Utils.epochNanosToInstant(nanos);
-    }
-
-    // Each chunk needs a unique start timestamp and
-    // if the clock resolution is low, two chunks may
-    // get the same timestamp.
-    private void awaitUniqueTimestamp() {
-        if (outputChange == null) {
-            outputChange = Instant.now();
-            return;
-        }
-        while (true) {
-            Instant time = Instant.now();
-            if (!time.equals(outputChange)) {
-                outputChange = time;
-                return;
-            }
-            try {
-                Thread.sleep(0, 100);
-            } catch (InterruptedException iex) {
-                // ignore
-            }
-        }
+        return Utils.epochNanosToInstant(chunkStart);
     }
 
     private void unregisterUnloaded() {
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/Options.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/Options.java
index 204badc4242ec74e7564c57a63920f73b9af352c..efd3ce6480799d84486b6ec38dce7efcfcee1a3f 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/Options.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/Options.java
@@ -53,7 +53,6 @@ public final class Options {
     private static final long DEFAULT_MEMORY_SIZE = DEFAULT_GLOBAL_BUFFER_COUNT * DEFAULT_GLOBAL_BUFFER_SIZE;
     private static long DEFAULT_THREAD_BUFFER_SIZE;
     private static final int DEFAULT_STACK_DEPTH = 64;
-    private static final boolean DEFAULT_SAMPLE_THREADS = true;
     private static final long DEFAULT_MAX_CHUNK_SIZE = 12 * 1024 * 1024;
     private static final SafePath DEFAULT_DUMP_PATH = null;
 
@@ -62,7 +61,6 @@ public final class Options {
     private static long globalBufferCount;
     private static long threadBufferSize;
     private static int stackDepth;
-    private static boolean sampleThreads;
     private static long maxChunkSize;
 
     static {
@@ -143,15 +141,6 @@ public final class Options {
         return stackDepth;
     }
 
-    public static synchronized void setSampleThreads(Boolean sample) {
-        jvm.setSampleThreads(sample);
-        sampleThreads = sample;
-    }
-
-    public static synchronized boolean getSampleThreads() {
-        return sampleThreads;
-    }
-
     private static synchronized void reset() {
         setMaxChunkSize(DEFAULT_MAX_CHUNK_SIZE);
         setMemorySize(DEFAULT_MEMORY_SIZE);
@@ -162,7 +151,6 @@ public final class Options {
         } catch (IOException e) {
             // Ignore (depends on default value in JVM: it would be NULL)
         }
-        setSampleThreads(DEFAULT_SAMPLE_THREADS);
         setStackDepth(DEFAULT_STACK_DEPTH);
         setThreadBufferSize(DEFAULT_THREAD_BUFFER_SIZE);
     }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformRecorder.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformRecorder.java
index 63a4840618faaa629b130d7baed90f77c5979be9..c0c62c64bb0c4dd2e48baa8ac8bfffd4590beaee 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformRecorder.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformRecorder.java
@@ -248,7 +248,7 @@ public final class PlatformRecorder {
             }
             currentChunk = newChunk;
             jvm.beginRecording();
-            startNanos = jvm.getChunkStartNanos();
+            startNanos = Utils.getChunkStartNanos();
             startTime = Utils.epochNanosToInstant(startNanos);
             if (currentChunk != null) {
                 currentChunk.setStartTime(startTime);
@@ -269,7 +269,7 @@ public final class PlatformRecorder {
                 startTime = MetadataRepository.getInstance().setOutput(p);
                 newChunk.setStartTime(startTime);
             }
-            startNanos = jvm.getChunkStartNanos();
+            startNanos = Utils.getChunkStartNanos();
             startTime = Utils.epochNanosToInstant(startNanos);
             recording.setStartTime(startTime);
             recording.setState(RecordingState.RUNNING);
@@ -316,7 +316,7 @@ public final class PlatformRecorder {
             }
         }
         OldObjectSample.emit(recording);
-        recording.setFinalStartnanos(jvm.getChunkStartNanos());
+        recording.setFinalStartnanos(Utils.getChunkStartNanos());
 
         if (endPhysical) {
             RequestEngine.doChunkEnd();
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/SecuritySupport.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/SecuritySupport.java
index ae03bce313d85b1c99e26dba720ff8652ebd87cd..ee30821dcf83b4f660af48f777a03e7d3e976b83 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/SecuritySupport.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/SecuritySupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2022, 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
@@ -33,7 +33,6 @@ import java.io.RandomAccessFile;
 import java.io.Reader;
 import java.lang.invoke.MethodHandles;
 import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.lang.reflect.ReflectPermission;
 import java.nio.channels.FileChannel;
@@ -150,7 +149,7 @@ public final class SecuritySupport {
     }
 
     /**
-     * Path created by the default file provider,and not
+     * Path created by the default file provider, and not
      * a malicious provider.
      *
      */
@@ -267,14 +266,11 @@ public final class SecuritySupport {
 
     public static List getPredefinedJFCFiles() {
         List list = new ArrayList<>();
-        try {
-            Iterator pathIterator = doPrivilegedIOWithReturn(() -> {
-                return Files.newDirectoryStream(JFC_DIRECTORY.toPath(), "*").iterator();
-            });
-            while (pathIterator.hasNext()) {
-                Path path = pathIterator.next();
-                if (path.toString().endsWith(".jfc")) {
-                    list.add(new SafePath(path));
+        try (var ds = doPrivilegedIOWithReturn(() -> Files.newDirectoryStream(JFC_DIRECTORY.toPath(), "*.jfc"))) {
+            for (Path path : ds) {
+                SafePath s = new SafePath(path);
+                if (!SecuritySupport.isDirectory(s)) {
+                    list.add(s);
                 }
             }
         } catch (IOException ioe) {
@@ -357,10 +353,6 @@ public final class SecuritySupport {
         doPrivileged(() -> thread.setUncaughtExceptionHandler(eh), new RuntimePermission("modifyThread"));
     }
 
-    static void moveReplace(SafePath from, SafePath to) throws IOException {
-        doPrivilegedIOWithReturn(() -> Files.move(from.toPath(), to.toPath()));
-    }
-
     static void clearDirectory(SafePath safePath) throws IOException {
         doPriviligedIO(() -> Files.walkFileTree(safePath.toPath(), new DirectoryCleaner()));
     }
@@ -407,10 +399,6 @@ public final class SecuritySupport {
         return doPrivilegedIOWithReturn(() -> Files.isWritable(safePath.toPath()));
     }
 
-    static void deleteOnExit(SafePath safePath) {
-        doPrivileged(() -> safePath.toPath().toFile().deleteOnExit());
-    }
-
     static ReadableByteChannel newFileChannelToRead(SafePath safePath) throws IOException {
         return doPrivilegedIOWithReturn(() -> FileChannel.open(safePath.toPath(), StandardOpenOption.READ));
     }
@@ -423,10 +411,6 @@ public final class SecuritySupport {
         return doPrivilegedIOWithReturn(() -> Files.newBufferedReader(safePath.toPath()));
     }
 
-    static void touch(SafePath path) throws IOException {
-        doPriviligedIO(() -> new RandomAccessFile(path.toPath().toFile(), "rw").close());
-    }
-
     static void setAccessible(Method method) {
         doPrivileged(() -> method.setAccessible(true), new ReflectPermission("suppressAccessChecks"));
     }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/Utils.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/Utils.java
index 38179ba891b75553fad3987d42d9fd23c68bff93..c0324d2d7f6d38fb8b29e55900ab55b04bcda3bf 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/Utils.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/Utils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2022, 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
@@ -97,6 +97,7 @@ public final class Utils {
      * The possible data race is benign and is worth of not introducing any contention here.
      */
     private static Metrics[] metrics;
+    private static Instant lastTimestamp;
 
     public static void checkAccessFlightRecorder() throws SecurityException {
         @SuppressWarnings("removal")
@@ -866,4 +867,30 @@ public final class Utils {
             throw new IllegalArgumentException("'" + name + "' is not a valid Java identifier");
         }
     }
+
+    public static long getChunkStartNanos() {
+        long nanos = JVM.getJVM().getChunkStartNanos();
+        // JVM::getChunkStartNanos() may return a bumped timestamp, +1 ns or +2 ns.
+        // Spin here to give Instant.now() a chance to catch up.
+        awaitUniqueTimestamp();
+        return nanos;
+    }
+
+    private static void awaitUniqueTimestamp() {
+        if (lastTimestamp == null) {
+            lastTimestamp = Instant.now(); // lazy initialization
+        }
+        while (true) {
+            Instant time = Instant.now();
+            if (!time.equals(lastTimestamp)) {
+                lastTimestamp = time;
+                return;
+            }
+            try {
+                Thread.sleep(0, 100);
+            } catch (InterruptedException iex) {
+                // ignore
+            }
+        }
+    }
 }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/ChunkHeader.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/ChunkHeader.java
index 4027f447cf4caba8867b0d69c8f1a54cdc573bbc..95aa47a34bbcf7ad5157d0f5a1b5795c7adbbba3 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/ChunkHeader.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/ChunkHeader.java
@@ -163,14 +163,6 @@ public final class ChunkHeader {
         }
     }
 
-    public boolean readHeader(byte[] bytes, int count) throws IOException {
-        input.position(absoluteChunkStart);
-        for (int i = 0; i< count; i++) {
-            bytes[i] = input.readPhysicalByte();
-        }
-        return bytes[(int)FILE_STATE_POSITION] != UPDATING_CHUNK_HEADER;
-    }
-
     public void awaitFinished() throws IOException {
         if (finished) {
             return;
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/Dispatcher.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/Dispatcher.java
index 721d5b190fc9cbbc4a6e4e5d8b1a2d7510111ed8..e8a565deb5d0ebdea99e993b7fff15bd79f28149 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/Dispatcher.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/Dispatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2022, 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
@@ -160,6 +160,7 @@ final class Dispatcher {
                 dispatcherLookup.put(type.getId(), dispatchers);
             }
             cacheDispatchers = dispatchers;
+            cacheEventType = type;
         }
         // Expected behavior if exception occurs in onEvent:
         //
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/EventDirectoryStream.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/EventDirectoryStream.java
index d5efcb90d3c84e074198b5943570899b86a4bd27..37fea4b9439980a74113e3af0de0a511cfcdcc90 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/EventDirectoryStream.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/EventDirectoryStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2022, 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,7 +28,6 @@ package jdk.jfr.internal.consumer;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.security.AccessControlContext;
-import java.time.Duration;
 import java.time.Instant;
 import java.util.Arrays;
 import java.util.Comparator;
@@ -49,7 +48,7 @@ import jdk.jfr.internal.consumer.ChunkParser.ParserConfiguration;
  * with chunk files.
  *
  */
-public class EventDirectoryStream extends AbstractEventStream {
+public final class EventDirectoryStream extends AbstractEventStream {
 
     private static final Comparator EVENT_COMPARATOR = JdkJfrConsumer.instance().eventComparator();
 
@@ -60,8 +59,6 @@ public class EventDirectoryStream extends AbstractEventStream {
     private long currentChunkStartNanos;
     private RecordedEvent[] sortedCache;
     private int threadExclusionLevel = 0;
-    protected volatile long maxSize;
-    protected volatile Duration maxAge;
 
     private volatile Consumer onCompleteHandler;
 
@@ -259,12 +256,4 @@ public class EventDirectoryStream extends AbstractEventStream {
             c.dispatch(e);
         }
     }
-
-    public void setMaxSize(long maxSize)  {
-        this.maxSize = maxSize;
-    }
-
-    public void setMaxAge(Duration maxAge)  {
-        this.maxAge = maxAge;
-    }
 }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/ObjectContext.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/ObjectContext.java
index 3c946ba2097535aba8efa5acd4e9643b22e3f7ce..e855d0212a232923ec1cb5751b1066343d413258 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/ObjectContext.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/consumer/ObjectContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,8 @@
 package jdk.jfr.internal.consumer;
 
 import java.time.ZoneId;
-import java.util.HashMap;
+import java.util.ArrayDeque;
+import java.util.IdentityHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -34,33 +35,48 @@ import jdk.jfr.EventType;
 import jdk.jfr.ValueDescriptor;
 
 public final class ObjectContext {
-    private final Map contextLookup;
+    private Map contextLookup;
     private final TimeConverter timeConverter;
-
     public final EventType eventType;
     public final List fields;
 
     ObjectContext(EventType eventType, List fields, TimeConverter timeConverter) {
-        this.contextLookup = new HashMap<>();
         this.eventType = eventType;
         this.fields = fields;
         this.timeConverter = timeConverter;
     }
 
-    private ObjectContext(ObjectContext parent, ValueDescriptor descriptor) {
-        this.eventType = parent.eventType;
-        this.contextLookup = parent.contextLookup;
-        this.timeConverter = parent.timeConverter;
-        this.fields = descriptor.getFields();
+    private ObjectContext(Map contextLookup, EventType eventType, List fields, TimeConverter timeConverter) {
+        this.eventType = eventType;
+        this.contextLookup = contextLookup;
+        this.timeConverter = timeConverter;
+        this.fields = fields;
     }
 
     public ObjectContext getInstance(ValueDescriptor descriptor) {
-        ObjectContext context = contextLookup.get(descriptor);
-        if (context == null) {
-            context = new ObjectContext(this, descriptor);
-            contextLookup.put(descriptor, context);
+        if (contextLookup == null) {
+            // Lazy, only needed when accessing nested structures.
+            contextLookup = buildContextLookup(fields);
+        }
+        return contextLookup.get(descriptor);
+    }
+
+    // Create mapping from ValueDescriptor to ObjectContext for all reachable
+    // ValueDescriptors.
+    public Map buildContextLookup(List fields) {
+        Map lookup = new IdentityHashMap<>();
+        ArrayDeque q = new ArrayDeque<>(fields);
+        while (!q.isEmpty()) {
+            ValueDescriptor vd = q.pop();
+            if (!lookup.containsKey(vd)) {
+                List children = vd.getFields();
+                lookup.put(vd, new ObjectContext(lookup, eventType, children, timeConverter));
+                for (ValueDescriptor v : children) {
+                    q.add(v);
+                }
+            }
         }
-        return context;
+        return lookup;
     }
 
     public long convertTimestamp(long ticks) {
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdConfigure.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdConfigure.java
index edcb153047419449e5ba28b15240e6832302d954..69a0bd88378a697219fdef8347399a3f11fd3517 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdConfigure.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdConfigure.java
@@ -69,8 +69,7 @@ final class DCmdConfigure extends AbstractDCmd {
             Long globalBufferSize,
             Long threadBufferSize,
             Long memorySize,
-            Long maxChunkSize,
-            Boolean sampleThreads
+            Long maxChunkSize
 
     ) throws DCmdException {
         if (Logger.shouldLog(LogTag.JFR_DCMD, LogLevel.DEBUG)) {
@@ -81,8 +80,7 @@ final class DCmdConfigure extends AbstractDCmd {
                     ", globalbuffersize=" + globalBufferSize +
                     ", thread_buffer_size=" + threadBufferSize +
                     ", memorysize=" + memorySize +
-                    ", maxchunksize=" + maxChunkSize +
-                    ", samplethreads=" + sampleThreads);
+                    ", maxchunksize=" + maxChunkSize);
         }
 
 
@@ -172,14 +170,6 @@ final class DCmdConfigure extends AbstractDCmd {
             updated = true;
         }
 
-        if (sampleThreads != null)  {
-            Options.setSampleThreads(sampleThreads);
-            Logger.log(LogTag.JFR, LogLevel.INFO, "Sample threads set to " + sampleThreads);
-            if (verbose) {
-                printSampleThreads();
-            }
-            updated = true;
-        }
         if (!verbose) {
             return new String[0];
         }
@@ -194,7 +184,6 @@ final class DCmdConfigure extends AbstractDCmd {
             printThreadBufferSize();
             printMemorySize();
             printMaxChunkSize();
-            printSampleThreads();
         }
         return getResult();
     }
@@ -211,10 +200,6 @@ final class DCmdConfigure extends AbstractDCmd {
         println();
     }
 
-    private void printSampleThreads() {
-        println("Sample threads: " + Options.getSampleThreads());
-    }
-
     private void printStackDepth() {
         println("Stack depth: " +  Options.getStackDepth());
     }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdStart.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdStart.java
index 77b8cccd77a17d615f7fa08325c9a1477bb51790..5d7f70c2a3409f135d1baaaa9ebba11dfe6a80f2 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdStart.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdStart.java
@@ -42,10 +42,14 @@ import java.util.Set;
 import jdk.jfr.FlightRecorder;
 import jdk.jfr.Recording;
 import jdk.jfr.internal.JVM;
+import jdk.jfr.internal.LogLevel;
+import jdk.jfr.internal.LogTag;
+import jdk.jfr.internal.Logger;
 import jdk.jfr.internal.OldObjectSample;
 import jdk.jfr.internal.PlatformRecording;
 import jdk.jfr.internal.PrivateAccess;
 import jdk.jfr.internal.SecuritySupport.SafePath;
+import jdk.jfr.internal.SecuritySupport;
 import jdk.jfr.internal.Type;
 import jdk.jfr.internal.jfc.JFC;
 import jdk.jfr.internal.jfc.model.JFCModel;
@@ -240,7 +244,7 @@ final class DCmdStart extends AbstractDCmd {
             paths.add(JFC.createSafePath(setting));
         }
         try {
-            JFCModel model = new JFCModel(paths);
+            JFCModel model = new JFCModel(paths, l -> logWarning(l));
             Set jfcOptions = new HashSet<>();
             for (XmlInput input : model.getInputs()) {
                 jfcOptions.add(input.getName());
@@ -364,7 +368,7 @@ final class DCmdStart extends AbstractDCmd {
                                  Turn on this flag only when you have an application that you
                                  suspect has a memory leak. If the settings parameter is set to
                                  'profile', then the information collected includes the stack
-                                 trace from where the potential leaking object wasallocated.
+                                 trace from where the potential leaking object was allocated.
                                  (BOOLEAN, false)
 
                  settings        (Optional) Name of the settings file that identifies which events
@@ -394,7 +398,7 @@ final class DCmdStart extends AbstractDCmd {
                take  precedence. The whitespace character can be omitted for timespan values,
                i.e. 20s. For more information about the settings syntax, see Javadoc of the
                jdk.jfr package.
-
+               %s
                Options must be specified using the  or = syntax.
 
                Example usage:
@@ -414,7 +418,28 @@ final class DCmdStart extends AbstractDCmd {
 
                Note, if the default event settings are modified, overhead may exceed 1%%.
 
-               """.formatted(exampleDirectory()).lines().toArray(String[]::new);
+               """.formatted(jfcOptions(), exampleDirectory()).lines().toArray(String[]::new);
+    }
+
+    private static String jfcOptions() {
+        try {
+            StringBuilder sb = new StringBuilder();
+            for (SafePath s : SecuritySupport.getPredefinedJFCFiles()) {
+                String name = JFC.nameFromPath(s.toPath());
+                JFCModel model = JFCModel.create(s, l -> {});
+                sb.append('\n');
+                sb.append("Options for ").append(name).append(":\n");
+                sb.append('\n');
+                for (XmlInput input : model.getInputs()) {
+                    sb.append("  ").append(input.getOptionSyntax()).append('\n');
+                    sb.append('\n');
+                }
+            }
+            return sb.toString();
+        } catch (IOException | ParseException e) {
+            Logger.log(LogTag.JFR_DCMD, LogLevel.DEBUG, "Could not list .jfc options for JFR.start. " + e.getMessage());
+            return "";
+        }
     }
 
     @Override
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/jfc/JFC.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/jfc/JFC.java
index 6d798e294dddc2ed2ab2408c13b05e26cd983c3b..6a37bea34ad4e6caebf9f97834076d32c05a63fc 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/jfc/JFC.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/jfc/JFC.java
@@ -25,9 +25,11 @@
 
 package jdk.jfr.internal.jfc;
 
+import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
+import java.io.StringReader;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.NoSuchFileException;
@@ -62,9 +64,11 @@ public final class JFC {
         private final String content;
         private final String filename;
         private final String name;
+        private final SafePath path;
         private Configuration configuration;
 
         public KnownConfiguration(SafePath knownPath) throws IOException {
+            this.path = knownPath;
             this.content = readContent(knownPath);
             this.name = nameFromPath(knownPath.toPath());
             this.filename = nullSafeFileName(knownPath.toPath());
@@ -270,4 +274,13 @@ public final class JFC {
         }
         throw new NoSuchFileException("Could not locate configuration with name " + name);
     }
+
+    public static Reader newReader(SafePath sf) throws IOException {
+        for (KnownConfiguration c : getKnownConfigurations()) {
+            if (c.path.equals(sf)) {
+                return new StringReader(c.content);
+            }
+        }
+        return new FileReader(sf.toFile(), StandardCharsets.UTF_8);
+    }
 }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/jfc/model/JFCModel.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/jfc/model/JFCModel.java
index bf9424265b8ea25c9059dd2af28bd573995c7833..746954a3e715a8718624a2d121f1d06b8ce98714 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/jfc/model/JFCModel.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/jfc/model/JFCModel.java
@@ -26,14 +26,17 @@ package jdk.jfr.internal.jfc.model;
 
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.io.Reader;
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Consumer;
 
 import jdk.jfr.internal.SecuritySupport.SafePath;
+import jdk.jfr.internal.jfc.JFC;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
@@ -42,19 +45,23 @@ public final class JFCModel {
     private final Map> controls = new LinkedHashMap<>();
     private final XmlConfiguration configuration;
 
-    public JFCModel(SafePath file) throws ParseException, IOException {
-        this.configuration = createConfiguration(file);
-        this.configuration.validate();
+    private JFCModel(XmlConfiguration configuration) throws ParseException {
+        configuration.validate();
+        this.configuration = configuration;
+    }
+
+    public JFCModel(Reader reader,  Consumer logger) throws ParseException, IOException {
+        this(Parser.parse(reader));
         addControls();
         wireConditions();
-        wireSettings();
+        wireSettings(logger);
     }
 
-    public JFCModel(List files) throws IOException, ParseException {
+    public JFCModel(List files, Consumer logger) throws IOException, ParseException {
         this.configuration = new XmlConfiguration();
         this.configuration.setAttribute("version", "2.0");
         for (SafePath file : files) {
-            JFCModel model = new JFCModel(file);
+            JFCModel model = JFCModel.create(file, logger);
             for (var entry : model.controls.entrySet()) {
                 String name = entry.getKey();
                 // Fail-fast checks that prevents an ambiguous file to be written later
@@ -69,6 +76,18 @@ public final class JFCModel {
         }
     }
 
+    public static JFCModel create(SafePath file, Consumer logger) throws ParseException, IOException {
+        if (file.toString().equals("none")) {
+            XmlConfiguration configuration = new XmlConfiguration();
+            configuration.setAttribute("version", "2.0");
+            configuration.setAttribute("label", "None");
+            return new JFCModel(configuration);
+        }
+        try (Reader r = JFC.newReader(file)) {
+            return new JFCModel(r, logger);
+        }
+    }
+
     public void setLabel(String label) {
         configuration.setAttribute("label", label);
     }
@@ -183,14 +202,14 @@ public final class JFCModel {
         }
     }
 
-    private void wireSettings() {
+    private void wireSettings(Consumer logger) {
         for (XmlEvent event : configuration.getEvents()) {
             for (XmlSetting setting : event.getSettings()) {
                 var controlName = setting.getControl();
                 if (controlName.isPresent()) {
                     List controls = getControlElements(controlName.get());
                     if (controls.isEmpty()) {
-                        System.out.println("Warning! Setting '" + setting.getFullName() + "' refers to missing control '" + controlName.get() + "'");
+                        logger.accept("Setting '" + setting.getFullName() + "' refers to missing control '" + controlName.get() + "'");
                     }
                     for (ControlElement ce : controls) {
                         XmlElement control = (XmlElement) ce;
@@ -204,14 +223,4 @@ public final class JFCModel {
     private void add(ControlElement control) {
         controls.computeIfAbsent(control.getName(), x -> new ArrayList<>()).add(control);
     }
-
-    private XmlConfiguration createConfiguration(SafePath file) throws ParseException, IOException {
-        if (file.toString().equals("none")) {
-            XmlConfiguration configuration = new XmlConfiguration();
-            configuration.setAttribute("version", "2.0");
-            configuration.setAttribute("label", "None");
-            return configuration;
-        }
-        return Parser.parse(file.toPath());
-    }
 }
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/jfc/model/Parser.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/jfc/model/Parser.java
index 78fd246ca7eb76a4fde8df0f3be2c30b8102d533..3b6aa05d9bd49d86fbf5e7fb170930ff7ed5520f 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/jfc/model/Parser.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/jfc/model/Parser.java
@@ -24,9 +24,8 @@
  */
 package jdk.jfr.internal.jfc.model;
 
-import java.io.FileReader;
 import java.io.IOException;
-import java.nio.file.Path;
+import java.io.Reader;
 import java.text.ParseException;
 import java.util.ArrayDeque;
 import java.util.Deque;
@@ -38,15 +37,13 @@ import jdk.internal.org.xml.sax.helpers.DefaultHandler;
 import jdk.internal.util.xml.SAXParser;
 import jdk.internal.util.xml.impl.SAXParserImpl;
 
-import static java.nio.charset.StandardCharsets.UTF_8;
-
 final class Parser {
 
-    static XmlConfiguration parse(Path path) throws ParseException, IOException {
-        try (FileReader r = new FileReader(path.toFile(), UTF_8)) {
+    static XmlConfiguration parse(Reader reader) throws ParseException, IOException {
+        try {
             SAXParser saxParser = new SAXParserImpl();
             ConfigurationHandler handler = new ConfigurationHandler();
-            saxParser.parse(new InputSource(r), handler);
+            saxParser.parse(new InputSource(reader), handler);
             return handler.configuration;
         } catch (SAXException sp) {
             ParseException pe = new ParseException(sp.getMessage(), -1);
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/jfc/model/XmlFlag.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/jfc/model/XmlFlag.java
index d494d3eb57ded2ba185ee1725f02c74eace40a3e..8e3431bc5a343761e302bc518237b514caac4418 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/jfc/model/XmlFlag.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/jfc/model/XmlFlag.java
@@ -29,7 +29,7 @@ final class XmlFlag extends XmlInput {
 
     @Override
     public String getOptionSyntax() {
-        return getName() + "=";
+        return getName() + "=" + "  (" + getContent() + ")";
     }
 
     @Override
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/jfc/model/XmlSelection.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/jfc/model/XmlSelection.java
index d3bf22404797777b9caf69b09b7c6cb22a0d640c..c451119fb1af2881ca63cdd9ab030e4b3db2dc62 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/jfc/model/XmlSelection.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/jfc/model/XmlSelection.java
@@ -36,7 +36,15 @@ final class XmlSelection extends XmlInput {
         for (XmlOption option : getOptions()) {
             sj.add(option.getName());
         }
-        return getName() + "=" + sj.toString();
+        StringBuilder sb = new StringBuilder();
+        sb.append(getName());
+        sb.append("=");
+        sb.append(sj.toString());
+        XmlOption selected = getSelected();
+        if (selected != null) {
+            sb.append("  (").append(selected.getName()).append(")");
+        }
+        return sb.toString();
     }
 
     @Override
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/jfc/model/XmlText.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/jfc/model/XmlText.java
index 789243d2d5fb4fa651c4aa019f1984174178232b..4d90dd3c51cebb477b6c039f94471b97c656b535 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/jfc/model/XmlText.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/jfc/model/XmlText.java
@@ -34,6 +34,14 @@ final class XmlText extends XmlInput {
         sb.append("=<");
         sb.append(getContentType().orElse("text"));
         sb.append(">");
+        sb.append("  (");
+        String content = getContent();
+        if (isTimespan()) {
+            // "20 ms" becomes "20ms"
+            content = content.replaceAll("\\s", "");
+        }
+        sb.append(content);
+        sb.append(")");
         return sb.toString();
     }
 
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/CutoffSetting.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/CutoffSetting.java
index 8a35a6b963915a90ee21fb232effc65dc33447fc..bdbeb4959b38feaddda9a28703bad8e38a8b730d 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/CutoffSetting.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/CutoffSetting.java
@@ -78,10 +78,6 @@ public final class CutoffSetting extends JDKSettingControl {
         return value;
     }
 
-    public static boolean isType(long typeId) {
-        return CutoffSetting.typeId == typeId;
-    }
-
     public static long parseValueSafe(String value) {
         if (value == null) {
             return 0L;
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/ThrottleSetting.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/ThrottleSetting.java
index a05544c25c481e33dfdce3463da65b2643a7c4f3..49d676d636a80d2295f3dd8d7cbc8322b1fb0ee6 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/ThrottleSetting.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/settings/ThrottleSetting.java
@@ -91,9 +91,5 @@ public final class ThrottleSetting extends JDKSettingControl {
     public String getValue() {
         return value;
     }
-
-    public static boolean isType(long typeId) {
-        return ThrottleSetting.typeId == typeId;
-    }
 }
 
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/Configure.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/Configure.java
index 037ad6dbf060c97a43851a5b1b53af5d92fcc7cc..551264c6889f77d79395ee6f396a760c167ac904 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/Configure.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/Configure.java
@@ -127,7 +127,7 @@ final class Configure extends Command {
     }
 
     private void displayParameters(PrintStream stream, SafePath path, String name) throws ParseException, IOException {
-        JFCModel parameters = new JFCModel(path);
+        JFCModel parameters = JFCModel.create(path, l -> stream.println("Warning! " + l));
         stream.println();
         stream.println("Options for " + name + ":");
         stream.println();
@@ -195,7 +195,7 @@ final class Configure extends Command {
                 output = new SafePath(Path.of("custom.jfc"));
             }
             UserInterface ui = new UserInterface();
-            JFCModel model = new JFCModel(inputFiles);
+            JFCModel model = new JFCModel(inputFiles, l -> ui.println("Warning! " + l));
             model.setLabel("Custom");
             if (log) {
                 SettingsLog.enable();
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/AbstractPlugin.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/AbstractPlugin.java
index 758cb17e83e6803ff81f71b4fab1182bdffd8441..cf46ac684079381d1300e17f23d9635f236808b0 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/AbstractPlugin.java
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/AbstractPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, 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,7 @@ import java.util.Locale;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 import jdk.internal.org.objectweb.asm.ClassReader;
+import jdk.tools.jlink.plugin.ResourcePoolEntry;
 
 public abstract class AbstractPlugin implements Plugin {
 
@@ -83,16 +84,31 @@ public abstract class AbstractPlugin implements Plugin {
         }
     }
 
+    ClassReader newClassReader(String path, ResourcePoolEntry resource) {
+        byte[] content = resource.contentBytes();
+        try {
+            return new ClassReader(content);
+        } catch (Exception e) {
+            if (JlinkTask.DEBUG) {
+                System.err.printf("Failed to parse class file: %s from resource of type %s\n", path,
+                        resource.getClass().getName());
+                e.printStackTrace();
+                dumpClassFile(path, content);
+            }
+            throw e;
+        }
+    }
+
     protected ClassReader newClassReader(String path, byte[] buf) {
         try {
             return new ClassReader(buf);
-        } catch (IllegalArgumentException iae) {
+        } catch (Exception e) {
             if (JlinkTask.DEBUG) {
                 System.err.printf("Failed to parse class file: %s\n", path);
-                iae.printStackTrace();
+                e.printStackTrace();
                 dumpClassFile(path, buf);
             }
-            throw iae;
+            throw e;
         }
     }
 
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/StripJavaDebugAttributesPlugin.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/StripJavaDebugAttributesPlugin.java
index 8e212f649c834000b05a011c46864df870261c36..d56ffc729ad95d2910a8160d694ad5bdbf112617 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/StripJavaDebugAttributesPlugin.java
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/StripJavaDebugAttributesPlugin.java
@@ -59,7 +59,7 @@ public final class StripJavaDebugAttributesPlugin extends AbstractPlugin {
                     if (path.endsWith("module-info.class")) {
                         // XXX. Do we have debug info? Is Asm ready for module-info?
                     } else {
-                        ClassReader reader = newClassReader(path, resource.contentBytes());
+                        ClassReader reader = newClassReader(path, resource);
                         ClassWriter writer = new ClassWriter(ClassWriter.COMPUTE_MAXS);
                         reader.accept(writer, ClassReader.SKIP_DEBUG);
                         byte[] content = writer.toByteArray();
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jmod/JmodTask.java b/src/jdk.jlink/share/classes/jdk/tools/jmod/JmodTask.java
index b440e536235e995b3370763e7f61f72d9a3417d3..52d6222d5a2288a9959821611334c5c831d59e8c 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jmod/JmodTask.java
+++ b/src/jdk.jlink/share/classes/jdk/tools/jmod/JmodTask.java
@@ -690,7 +690,6 @@ public class JmodTask {
                         .filter(path -> isResource(path.toString()))
                         .map(path -> toPackageName(path))
                         .filter(pkg -> pkg.length() > 0)
-                        .distinct()
                         .collect(Collectors.toSet());
             } catch (IOException ioe) {
                 throw new UncheckedIOException(ioe);
@@ -705,7 +704,6 @@ public class JmodTask {
                      .filter(e -> !e.isDirectory() && isResource(e.getName()))
                      .map(e -> toPackageName(e))
                      .filter(pkg -> pkg.length() > 0)
-                     .distinct()
                      .collect(Collectors.toSet());
         }
 
diff --git a/src/jdk.jpackage/share/native/applauncher/JvmLauncher.cpp b/src/jdk.jpackage/share/native/applauncher/JvmLauncher.cpp
index 105b512b260a9544abb2bed34b7341b5946aef3c..db01cd164bc50d0905cc23b59f2ba14d9371d15a 100644
--- a/src/jdk.jpackage/share/native/applauncher/JvmLauncher.cpp
+++ b/src/jdk.jpackage/share/native/applauncher/JvmLauncher.cpp
@@ -23,6 +23,7 @@
  * questions.
  */
 
+#include 
 #include 
 #include "tstrings.h"
 #include "JvmLauncher.h"
diff --git a/src/jdk.jstatd/share/classes/sun/tools/jstatd/Jstatd.java b/src/jdk.jstatd/share/classes/sun/tools/jstatd/Jstatd.java
index 30fe303fa61c8c337381e8895283ba9a462713fb..5dc7f1fa2fbcec72cb04fb1e24838993ed99394c 100644
--- a/src/jdk.jstatd/share/classes/sun/tools/jstatd/Jstatd.java
+++ b/src/jdk.jstatd/share/classes/sun/tools/jstatd/Jstatd.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2022, 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 @@
 
 package sun.tools.jstatd;
 
+import java.io.ObjectInputFilter;
 import java.rmi.*;
 import java.rmi.server.*;
 import java.rmi.registry.Registry;
@@ -47,6 +48,8 @@ public class Jstatd {
     private static boolean startRegistry = true;
     private static RemoteHost remoteHost;
 
+    private static final String rmiFilterPattern = "sun.jvmstat.monitor.remote.RemoteVm;com.sun.proxy.jdk.proxy*;java.lang.reflect.Proxy;java.rmi.server.RemoteObjectInvocationHandler;java.rmi.server.RemoteObject;!*";
+
     private static void printUsage() {
         System.err.println("usage: jstatd [-nr] [-p port] [-r rmiport] [-n rminame]\n" +
                            "       jstatd -?|-h|--help");
@@ -72,7 +75,6 @@ public class Jstatd {
         }
     }
 
-    @SuppressWarnings({"removal","deprecation"}) // Use of RMISecurityManager
     public static void main(String[] args) {
         String rminame = null;
         int rmiPort = 0;
@@ -132,10 +134,6 @@ public class Jstatd {
             System.exit(1);
         }
 
-        if (System.getSecurityManager() == null) {
-            System.setSecurityManager(new RMISecurityManager());
-        }
-
         StringBuilder name = new StringBuilder();
 
         if (port >= 0) {
@@ -149,11 +147,10 @@ public class Jstatd {
         name.append("/").append(rminame);
 
         try {
-            // use 1.5.0 dynamically generated subs.
-            System.setProperty("java.rmi.server.ignoreSubClasses", "true");
             remoteHost = new RemoteHostImpl(rmiPort);
+            ObjectInputFilter filter = ObjectInputFilter.Config.createFilter(rmiFilterPattern);
             RemoteHost stub = (RemoteHost) UnicastRemoteObject.exportObject(
-                    remoteHost, rmiPort);
+                    remoteHost, rmiPort, filter);
             bind(name.toString(), stub);
             System.out.println("jstatd started (bound to " + name.toString() + ")");
             System.out.flush();
diff --git a/src/jdk.management.agent/share/classes/jdk/internal/agent/Agent.java b/src/jdk.management.agent/share/classes/jdk/internal/agent/Agent.java
index 06856f972783773c04759623b2f8f6b722576437..2d261bfb3a74b0433995752faf27639720ae3444 100644
--- a/src/jdk.management.agent/share/classes/jdk/internal/agent/Agent.java
+++ b/src/jdk.management.agent/share/classes/jdk/internal/agent/Agent.java
@@ -564,8 +564,7 @@ public class Agent {
         InputStream in = null;
         try {
             in = new FileInputStream(configFile);
-            BufferedInputStream bin = new BufferedInputStream(in);
-            p.load(bin);
+            p.load(in);
         } catch (FileNotFoundException e) {
             error(CONFIG_FILE_OPEN_FAILED, e.getMessage());
         } catch (IOException e) {
diff --git a/src/jdk.management.agent/share/classes/sun/management/jmxremote/ConnectorBootstrap.java b/src/jdk.management.agent/share/classes/sun/management/jmxremote/ConnectorBootstrap.java
index 6630124f374c3c6d85b31dcd50f4920afbedd2b8..aaa32944ddff771e2199c15b8355111742e97920 100644
--- a/src/jdk.management.agent/share/classes/sun/management/jmxremote/ConnectorBootstrap.java
+++ b/src/jdk.management.agent/share/classes/sun/management/jmxremote/ConnectorBootstrap.java
@@ -692,8 +692,7 @@ public final class ConnectorBootstrap {
                 // Load the SSL keystore properties from the config file
                 Properties p = new Properties();
                 try (InputStream in = new FileInputStream(sslConfigFileName)) {
-                    BufferedInputStream bin = new BufferedInputStream(in);
-                    p.load(bin);
+                    p.load(in);
                 }
                 String keyStore =
                         p.getProperty("javax.net.ssl.keyStore");
diff --git a/src/jdk.security.auth/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java b/src/jdk.security.auth/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java
index 44692bdd21959169196e3b3c8a4a4bd97f5ef268..a399447405013592703d0b01af25121178375518 100644
--- a/src/jdk.security.auth/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java
+++ b/src/jdk.security.auth/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2022, 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
@@ -712,7 +712,7 @@ public class KeyStoreLoginModule implements LoginModule {
      * {@code login} method), then this method associates a
      * {@code X500Principal} for the subject distinguished name of the
      * first certificate in the alias's credentials in the subject's
-     * principals,the alias's certificate path in the subject's public
+     * principals, the alias's certificate path in the subject's public
      * credentials, and a {@code X500PrivateCredential} whose certificate
      * is the first  certificate in the alias's certificate path and whose
      * private key is the alias's private key in the subject's private
diff --git a/test/hotspot/gtest/classfile/test_AltHashing.cpp b/test/hotspot/gtest/classfile/test_AltHashing.cpp
index d11dc0fb4a202c2d3271ab9f32830f1974d29bd3..0070c4fd2c12fd0b5892adb73acb1c40cc1a43fa 100644
--- a/test/hotspot/gtest/classfile/test_AltHashing.cpp
+++ b/test/hotspot/gtest/classfile/test_AltHashing.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2022, 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 @@
 #include "classfile/altHashing.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/formatBuffer.hpp"
+#include "utilities/globalDefinitions.hpp"
 #include "unittest.hpp"
 
 class AltHashingTest : public ::testing::Test {
diff --git a/test/hotspot/gtest/logging/logTestUtils.inline.hpp b/test/hotspot/gtest/logging/logTestUtils.inline.hpp
index 4295c6a000f2eb52726533ae56e2997e3d379578..3e49c610b4189ddfd7d345264e1769606b2f43ef 100644
--- a/test/hotspot/gtest/logging/logTestUtils.inline.hpp
+++ b/test/hotspot/gtest/logging/logTestUtils.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2022, 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
@@ -138,8 +138,8 @@ static inline char* read_line(FILE* fp) {
 
 static bool file_contains_substrings_in_order(const char* filename, const char* substrs[]) {
   AsyncLogWriter::flush();
-  FILE* fp = fopen(filename, "r");
-  assert(fp != NULL, "error opening file %s: %s", filename, strerror(errno));
+  FILE* fp = os::fopen(filename, "r");
+  assert(fp != NULL, "error opening file %s: %s", filename, os::strerror(errno));
 
   size_t idx = 0;
   while (substrs[idx] != NULL) {
diff --git a/test/hotspot/gtest/logging/test_asynclog.cpp b/test/hotspot/gtest/logging/test_asynclog.cpp
index 2525f40ec4e561bb1b78361f84b23a5a25c7c019..16bdd6e18c72440a93796fffa6b397f272df7f37 100644
--- a/test/hotspot/gtest/logging/test_asynclog.cpp
+++ b/test/hotspot/gtest/logging/test_asynclog.cpp
@@ -1,5 +1,6 @@
 /*
  * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+ * Copyright (c) 2022, 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
@@ -85,7 +86,7 @@ LOG_LEVEL_LIST
 
   // stdout/stderr support
   bool write_to_file(const std::string& output) {
-    FILE* f = fopen(TestLogFileName, "w");
+    FILE* f = os::fopen(TestLogFileName, "w");
 
     if (f != NULL) {
       size_t sz = output.size();
diff --git a/test/hotspot/gtest/logging/test_log.cpp b/test/hotspot/gtest/logging/test_log.cpp
index ccd928474d438ef339471395bb7907290d4d39a6..7ae276aad376851744d6020a04897b3eb5041bd1 100644
--- a/test/hotspot/gtest/logging/test_log.cpp
+++ b/test/hotspot/gtest/logging/test_log.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022, 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 @@ TEST_VM_F(LogTest, large_message) {
 
   AsyncLogWriter::flush();
   ResourceMark rm;
-  FILE* fp = fopen(TestLogFileName, "r");
+  FILE* fp = os::fopen(TestLogFileName, "r");
   ASSERT_NE((void*)NULL, fp);
   char* output = read_line(fp);
   fclose(fp);
diff --git a/test/hotspot/gtest/logging/test_logTagSetDescriptions.cpp b/test/hotspot/gtest/logging/test_logTagSetDescriptions.cpp
index 7cb37ff43498f05f7287442c4428217aab8d4bce..84253e19433786937a64aef8cebe056711106d27 100644
--- a/test/hotspot/gtest/logging/test_logTagSetDescriptions.cpp
+++ b/test/hotspot/gtest/logging/test_logTagSetDescriptions.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022, 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
@@ -50,7 +50,7 @@ TEST_VM(LogTagSetDescriptions, describe) {
 TEST_VM(LogTagSetDescriptions, command_line_help) {
   ResourceMark rm;
   const char* filename = prepend_temp_dir("logtagset_descriptions");
-  FILE* fp = fopen(filename, "w+");
+  FILE* fp = os::fopen(filename, "w+");
   ASSERT_NE((void*)NULL, fp);
   fileStream stream(fp);
   LogConfiguration::print_command_line_help(&stream);
diff --git a/test/hotspot/gtest/nmt/test_nmt_buffer_overflow_detection.cpp b/test/hotspot/gtest/nmt/test_nmt_buffer_overflow_detection.cpp
index c1aeb3e845ced23769ca0eb17ccc5abd912225a3..ce30fb8d61d71751bf98be76c32abf7106728f30 100644
--- a/test/hotspot/gtest/nmt/test_nmt_buffer_overflow_detection.cpp
+++ b/test/hotspot/gtest/nmt/test_nmt_buffer_overflow_detection.cpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2021 SAP SE. All rights reserved.
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022 SAP SE. All rights reserved.
+ * Copyright (c) 2022, 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
@@ -31,14 +31,10 @@
 #include "unittest.hpp"
 #include "testutils.hpp"
 
-#if INCLUDE_NMT
-
 // This prefix shows up on any c heap corruption NMT detects. If unsure which assert will
 // come, just use this one.
 #define COMMON_NMT_HEAP_CORRUPTION_MESSAGE_PREFIX "NMT corruption"
 
-
-
 #define DEFINE_TEST(test_function, expected_assertion_message)                            \
   TEST_VM_FATAL_ERROR_MSG(NMT, test_function, ".*" expected_assertion_message ".*") {     \
     if (MemTracker::tracking_level() > NMT_off) {                                         \
@@ -165,5 +161,3 @@ TEST_VM(NMT, test_realloc) {
     }
   }
 }
-
-#endif // INCLUDE_NMT
diff --git a/test/hotspot/gtest/nmt/test_nmtpreinit.cpp b/test/hotspot/gtest/nmt/test_nmtpreinit.cpp
index 310cbb187b2fe3c393a80c92f47ed260c48210f9..6475e86570881fac7da9c12737066c417e631f3a 100644
--- a/test/hotspot/gtest/nmt/test_nmtpreinit.cpp
+++ b/test/hotspot/gtest/nmt/test_nmtpreinit.cpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2021 SAP SE. All rights reserved.
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022 SAP SE. All rights reserved.
+ * Copyright (c) 2021, 2022, 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
@@ -54,8 +54,6 @@
 //   us. So inside that scope VM initialization ran and with it the NMT initialization.
 // To be sure, we assert those assumptions.
 
-#if INCLUDE_NMT
-
 // Some shorts to save writing out the flags every time
 static void* os_malloc(size_t s)              { return os::malloc(s, mtTest); }
 static void* os_realloc(void* old, size_t s)  { return os::realloc(old, s, mtTest); }
@@ -127,5 +125,3 @@ TEST_VM(NMTPreInit, pre_to_post_allocs) {
   g_test_allocations.test_post();
   g_test_allocations.free_all();
 }
-
-#endif // INCLUDE_NMT
diff --git a/test/hotspot/gtest/nmt/test_nmtpreinitmap.cpp b/test/hotspot/gtest/nmt/test_nmtpreinitmap.cpp
index 356c79a8d4a08cfeed10a0cef368b679a749f988..e68d5ca069aae2f8f9e7a8d45c427cf95aa9600c 100644
--- a/test/hotspot/gtest/nmt/test_nmtpreinitmap.cpp
+++ b/test/hotspot/gtest/nmt/test_nmtpreinitmap.cpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2021 SAP SE. All rights reserved.
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022 SAP SE. All rights reserved.
+ * Copyright (c) 2021, 2022, 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
@@ -31,8 +31,6 @@
 #include "utilities/ostream.hpp"
 #include "unittest.hpp"
 
-#if INCLUDE_NMT
-
 // This tests the NMTPreInitAllocationTable hash table used to store C-heap allocations before NMT initialization ran.
 
 static size_t small_random_nonzero_size() {
@@ -132,5 +130,3 @@ TEST_VM_ASSERT_MSG(NMTPreInit, assert_on_lu_table_overflow, ".*NMT preinit looku
   table.verify();
 }
 #endif // ASSERT
-
-#endif // INCLUDE_NMT
diff --git a/test/hotspot/gtest/runtime/test_committed_virtualmemory.cpp b/test/hotspot/gtest/runtime/test_committed_virtualmemory.cpp
index 0abc004a93542aaba5a9f5f21ff8cdba357312e5..b95b86c1247b19eaae31627a61217e19b1771d02 100644
--- a/test/hotspot/gtest/runtime/test_committed_virtualmemory.cpp
+++ b/test/hotspot/gtest/runtime/test_committed_virtualmemory.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,8 +26,6 @@
 // Included early because the NMT flags don't include it.
 #include "utilities/macros.hpp"
 
-#if INCLUDE_NMT
-
 #include "runtime/thread.hpp"
 #include "services/memTracker.hpp"
 #include "services/virtualMemoryTracker.hpp"
@@ -223,5 +221,3 @@ TEST_VM(CommittedVirtualMemoryTracker, test_committed_virtualmemory_region) {
   }
 
 }
-
-#endif // INCLUDE_NMT
diff --git a/test/hotspot/gtest/runtime/test_os.cpp b/test/hotspot/gtest/runtime/test_os.cpp
index 1c8ed269b54c28a03de783d662ed14dc722a6f7a..a0859e7e2960263daf6eeb02c791fe2329f2ea5e 100644
--- a/test/hotspot/gtest/runtime/test_os.cpp
+++ b/test/hotspot/gtest/runtime/test_os.cpp
@@ -351,6 +351,23 @@ TEST_VM(os, jio_snprintf) {
   test_snprintf(jio_snprintf, false);
 }
 
+#ifdef __APPLE__
+// Not all macOS versions can use os::reserve_memory (i.e. anon_mmap) API
+// to reserve executable memory, so before attempting to use it,
+// we need to verify that we can do so by asking for a tiny executable
+// memory chunk.
+static inline bool can_reserve_executable_memory(void) {
+  bool executable = true;
+  size_t len = 128;
+  char* p = os::reserve_memory(len, executable);
+  bool exec_supported = (p != NULL);
+  if (exec_supported) {
+    os::release_memory(p, len);
+  }
+  return exec_supported;
+}
+#endif
+
 // Test that os::release_memory() can deal with areas containing multiple mappings.
 #define PRINT_MAPPINGS(s) { tty->print_cr("%s", s); os::print_memory_mappings((char*)p, total_range_len, tty); }
 //#define PRINT_MAPPINGS
@@ -360,6 +377,13 @@ TEST_VM(os, jio_snprintf) {
 //  (from multiple calls to os::reserve_memory)
 static address reserve_multiple(int num_stripes, size_t stripe_len) {
   assert(is_aligned(stripe_len, os::vm_allocation_granularity()), "Sanity");
+
+#ifdef __APPLE__
+  // Workaround: try reserving executable memory to figure out
+  // if such operation is supported on this macOS version
+  const bool exec_supported = can_reserve_executable_memory();
+#endif
+
   size_t total_range_len = num_stripes * stripe_len;
   // Reserve a large contiguous area to get the address space...
   address p = (address)os::reserve_memory(total_range_len);
@@ -371,7 +395,11 @@ static address reserve_multiple(int num_stripes, size_t stripe_len) {
     address q = p + (stripe * stripe_len);
     // Commit, alternatingly with or without exec permission,
     //  to prevent kernel from folding these mappings.
+#ifdef __APPLE__
+    const bool executable = exec_supported ? (stripe % 2 == 0) : false;
+#else
     const bool executable = stripe % 2 == 0;
+#endif
     q = (address)os::attempt_reserve_memory_at((char*)q, stripe_len, executable);
     EXPECT_NE(q, (address)NULL);
     EXPECT_TRUE(os::commit_memory((char*)q, stripe_len, executable));
@@ -413,11 +441,7 @@ struct NUMASwitcher {
 #endif
 
 #ifndef _AIX // JDK-8257041
-#if defined(__APPLE__) && !defined(AARCH64)  // See JDK-8267341.
-  TEST_VM(os, DISABLED_release_multi_mappings) {
-#else
   TEST_VM(os, release_multi_mappings) {
-#endif
 
   // With NMT enabled, this will trigger JDK-8263464. For now disable the test if NMT=on.
   if (MemTracker::tracking_level() > NMT_off) {
diff --git a/test/hotspot/gtest/runtime/test_virtualMemoryTracker.cpp b/test/hotspot/gtest/runtime/test_virtualMemoryTracker.cpp
index ae4457f3e9358e5b52ae17b65c14b5275dbfa0ce..4aa058dc160e3c70059801f52d6671380d9a0436 100644
--- a/test/hotspot/gtest/runtime/test_virtualMemoryTracker.cpp
+++ b/test/hotspot/gtest/runtime/test_virtualMemoryTracker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, 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
@@ -32,16 +32,13 @@
 
 #include "precompiled.hpp"
 
-// Included early because the NMT flags don't include it.
-#include "utilities/macros.hpp"
-
-#if INCLUDE_NMT
-
 #include "memory/virtualspace.hpp"
 #include "services/memTracker.hpp"
 #include "services/virtualMemoryTracker.hpp"
 #include "utilities/globalDefinitions.hpp"
+#include "utilities/macros.hpp"
 #include "unittest.hpp"
+
 #include 
 
 // #define LOG(...) printf(__VA_ARGS__); printf("\n"); fflush(stdout);
@@ -566,5 +563,3 @@ TEST_VM(NMT_VirtualMemoryTracker, remove_uncommitted_region) {
     tty->print_cr("skipped.");
   }
 }
-
-#endif // INCLUDE_NMT
diff --git a/test/hotspot/gtest/threadHelper.inline.hpp b/test/hotspot/gtest/threadHelper.inline.hpp
index 52c044850e8def28e7bbd07506b8b67c2e495a60..3c6b951df0a208055ec5d65e60f572d25e54e267 100644
--- a/test/hotspot/gtest/threadHelper.inline.hpp
+++ b/test/hotspot/gtest/threadHelper.inline.hpp
@@ -49,13 +49,13 @@ static void startTestThread(JavaThread* thread, const char* name) {
   }
 }
 
-class VM_StopSafepoint : public VM_Operation {
+class VM_GTestStopSafepoint : public VM_Operation {
 public:
   Semaphore* _running;
   Semaphore* _test_complete;
-  VM_StopSafepoint(Semaphore* running, Semaphore* wait_for) :
+  VM_GTestStopSafepoint(Semaphore* running, Semaphore* wait_for) :
     _running(running), _test_complete(wait_for) {}
-  VMOp_Type type() const          { return VMOp_None; }
+  VMOp_Type type() const          { return VMOp_GTestStopSafepoint; }
   bool evaluate_at_safepoint() const { return false; }
   void doit()                     { _running->signal(); _test_complete->wait(); }
 };
@@ -67,7 +67,7 @@ class VMThreadBlocker : public JavaThread {
 
   static void blocker_thread_entry(JavaThread* thread, TRAPS) {
     VMThreadBlocker* t = static_cast(thread);
-    VM_StopSafepoint ss(&t->_ready, &t->_unblock);
+    VM_GTestStopSafepoint ss(&t->_ready, &t->_unblock);
     VMThread::execute(&ss);
   }
 
diff --git a/test/hotspot/jtreg/ProblemList-Xcomp.txt b/test/hotspot/jtreg/ProblemList-Xcomp.txt
index b56e43c4e92fed78201a50ed2cd7f01f28a39279..23f25da41d0aa997b30f091c8c4bc56f3a244c31 100644
--- a/test/hotspot/jtreg/ProblemList-Xcomp.txt
+++ b/test/hotspot/jtreg/ProblemList-Xcomp.txt
@@ -27,8 +27,6 @@
 #
 #############################################################################
 
-compiler/intrinsics/bmi/verifycode/BzhiTestI2L.java 8268033 generic-x64
-
 vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw001/TestDescription.java 8205957 generic-all
 
 vmTestbase/vm/mlvm/mixed/stress/regression/b6969574/INDIFY_Test.java 8265295 linux-x64,windows-x64
diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index b05f3317527afdbcfa172874867c2d74ace6b6b4..e08217cd776225763a835cb44cc4bbebca2e9487 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2022, 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
@@ -121,10 +121,10 @@ serviceability/dcmd/gc/RunFinalizationTest.java 8227120 linux-all,windows-x64
 serviceability/sa/ClhsdbCDSCore.java 8269982,8267433 macosx-aarch64,macosx-x64
 serviceability/sa/ClhsdbFindPC.java#xcomp-core 8269982,8267433 macosx-aarch64,macosx-x64
 serviceability/sa/ClhsdbFindPC.java#no-xcomp-core 8269982,8267433 macosx-aarch64,macosx-x64
-serviceability/sa/ClhsdbPmap.java#core 8267433 macosx-x64
+serviceability/sa/ClhsdbPmap.java#core 8269982,8267433 macosx-aarch64,macosx-x64
 serviceability/sa/ClhsdbPstack.java#core 8269982,8267433 macosx-aarch64,macosx-x64
-serviceability/sa/TestJmapCore.java 8267433 macosx-x64
-serviceability/sa/TestJmapCoreMetaspace.java 8267433 macosx-x64
+serviceability/sa/TestJmapCore.java 8269982,8267433 macosx-aarch64,macosx-x64
+serviceability/sa/TestJmapCoreMetaspace.java 8269982,8267433 macosx-aarch64,macosx-x64
 
 #############################################################################
 
diff --git a/test/hotspot/jtreg/compiler/c1/Test8275337.java b/test/hotspot/jtreg/compiler/c1/Test8275337.java
new file mode 100644
index 0000000000000000000000000000000000000000..5e7ab912e20c010f86b98eb5ce48f8a36e573b1f
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c1/Test8275337.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2022, 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 8275337
+ * @run main/othervm -Xcomp -XX:TieredStopAtLevel=1 compiler.c1.Test8275337
+ */
+
+
+package compiler.c1;
+
+public class Test8275337 {
+    public static final int N = 400;
+
+    public static void mainTest() {
+        int iArr1[] = new int[N];
+        float fArr1[][] = new float[N][N];
+
+        for (int i = 9; i < 171; i++) {
+            int z;
+            try {
+                z = i % i;
+            } catch (ArithmeticException a_e) {}
+            for (int j = 1; j < 155; ++j) {
+                fArr1[j - 1][i] -= 1;
+                iArr1[i - 1] = 1;
+            }
+            for (int j = 4; j < 155; j++) {
+                for (int k = 1; k < 2; ++k) {
+                    iArr1[i - 1] += 1;
+                    fArr1[k - 1][j] -= 2;
+                }
+            }
+        }
+    }
+    public static void main(String[] strArr) {
+
+        try {
+            for (int i = 0; i < 10; i++) {
+                mainTest();
+            }
+         } catch (Exception ex) {
+         }
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/c2/TestCMoveInfiniteGVN.java b/test/hotspot/jtreg/compiler/c2/TestCMoveInfiniteGVN.java
new file mode 100644
index 0000000000000000000000000000000000000000..50d9d02dea651ce3cd4e4edd2d1147293ae32c2c
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c2/TestCMoveInfiniteGVN.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2022, 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
+ * @key stress randomness
+ * @bug 8280123
+ * @run main/othervm -Xcomp -XX:-TieredCompilation
+ *                   -XX:CompileCommand=compileonly,compiler.c2.TestCMoveInfiniteGVN::test
+ *                   -XX:+UnlockDiagnosticVMOptions -XX:+StressIGVN -XX:StressSeed=43739875
+ *                   compiler.c2.TestCMoveInfiniteGVN
+ * @run main/othervm -Xcomp -XX:-TieredCompilation
+ *                   -XX:CompileCommand=compileonly,compiler.c2.TestCMoveInfiniteGVN::test
+ *                   -XX:+UnlockDiagnosticVMOptions -XX:+StressIGVN
+ *                   compiler.c2.TestCMoveInfiniteGVN
+ */
+
+package compiler.c2;
+
+public class TestCMoveInfiniteGVN {
+
+    static int test(boolean b, int i) {
+        int iArr[] = new int[2];
+
+        double d = Math.max(i, i);
+        for (int i1 = 1; i1 < 2; i1++) {
+            if (i1 != 0) {
+                return (b ? 1 : 0); // CMoveI
+            }
+            for (int i2 = 1; i2 < 2; i2++) {
+                switch (i2) {
+                    case 1: d -= Math.max(i1, i2); break;
+                }
+                d -= iArr[i1 - 1];
+            }
+        }
+        return 0;
+    }
+
+    static void test() {
+        test(true, 234);
+    }
+
+    public static void main(String[] strArr) {
+        test(); // compilation, then nmethod invalidation during execution
+        test(); // trigger crashing recompilation
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestAutoVectorization2DArray.java b/test/hotspot/jtreg/compiler/c2/irTests/TestAutoVectorization2DArray.java
new file mode 100644
index 0000000000000000000000000000000000000000..c79fbf993dbeca0fb80b62158ac2d9f0a31c8cf6
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestAutoVectorization2DArray.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2022 THL A29 Limited, a Tencent company. 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 compiler.c2.irTests;
+
+import compiler.lib.ir_framework.*;
+
+/*
+ * @test
+ * @bug 8279258
+ * @summary Auto-vectorization enhancement for two-dimensional array operations
+ * @library /test/lib /
+ * @run driver compiler.c2.irTests.TestAutoVectorization2DArray
+ */
+
+public class TestAutoVectorization2DArray {
+    final private static int NUM = 64;
+
+    private static double[][] a = new double[NUM][NUM];
+    private static double[][] b = new double[NUM][NUM];
+    private static double[][] c = new double[NUM][NUM];
+
+    public static void main(String[] args) {
+        TestFramework.run();
+    }
+
+    @Test
+    @IR(counts = { IRNode.LOAD_VECTOR,  " >0 " })
+    @IR(counts = { IRNode.ADD_VD,       " >0 " })
+    @IR(counts = { IRNode.STORE_VECTOR, " >0 " })
+    private static void testDouble(double[][] a , double[][] b, double[][] c) {
+        for(int i = 0; i < a.length; i++) {
+            for (int j = 0; j < a[0].length; j++) {
+                a[i][j] = b[i][j] + c[i][j];
+            }
+        }
+    }
+
+    @Run(test = "testDouble")
+    private void testDouble_runner() {
+        testDouble(a, b, c);
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestBackToBackIfs.java b/test/hotspot/jtreg/compiler/c2/irTests/TestBackToBackIfs.java
new file mode 100644
index 0000000000000000000000000000000000000000..207b16a806270d0ad46dd2cf08a51bdedbbea1b3
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestBackToBackIfs.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2022, Red Hat, 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.
+ */
+
+package compiler.c2.irTests;
+
+import compiler.lib.ir_framework.*;
+import jdk.test.lib.Utils;
+import java.util.Random;
+
+/*
+ * @test
+ * @bug 8278228
+ * @summary C2: Improve identical back-to-back if elimination
+ * @library /test/lib /
+ * @run driver compiler.c2.irTests.TestBackToBackIfs
+ */
+
+public class TestBackToBackIfs {
+    public static void main(String[] args) {
+        TestFramework.run();
+    }
+
+    static private int int_field;
+
+    @Test
+    @IR(counts = { IRNode.IF, "1" })
+    public static void test(int a, int b) {
+        if (a == b) {
+            int_field = 0x42;
+        } else {
+            int_field = 42;
+        }
+        if (a == b) {
+            int_field = 0x42;
+        } else {
+            int_field = 42;
+        }
+    }
+
+    @Run(test = "test")
+    public static void test_runner() {
+        test(42, 0x42);
+        test(0x42, 0x42);
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestIRAbs.java b/test/hotspot/jtreg/compiler/c2/irTests/TestIRAbs.java
new file mode 100644
index 0000000000000000000000000000000000000000..8ba786d6f20e5b4acff95e17c7073e3fd3bf48da
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestIRAbs.java
@@ -0,0 +1,232 @@
+/*
+ * Copyright (c) 2022, Arm Limited. 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 compiler.c2.irTests;
+
+import jdk.test.lib.Asserts;
+import compiler.lib.ir_framework.*;
+
+/*
+ * @test
+ * @bug 8276673 8280089
+ * @summary Test abs nodes optimization in C2.
+ * @requires os.arch=="amd64" | os.arch=="x86_64" | os.arch=="aarch64"
+ * @library /test/lib /
+ * @run driver compiler.c2.irTests.TestIRAbs
+ */
+
+public class TestIRAbs {
+
+    public static char [] cspecial = {
+        0, 42, 128, 256, 1024, 4096, 65535
+    };
+
+    public static int [] ispecial = {
+        0, Integer.MAX_VALUE, Integer.MIN_VALUE, -42, 42, -1, 1
+    };
+
+    public static long [] lspecial = {
+        0, Long.MAX_VALUE, Long.MIN_VALUE, -42, 42, -1, 1
+    };
+
+    public static float [] fspecial = {
+        0.0f,
+        -0.0f,
+        Float.MAX_VALUE,
+        Float.MIN_VALUE,
+        -Float.MAX_VALUE,
+        -Float.MIN_VALUE,
+        Float.NaN,
+        Float.POSITIVE_INFINITY,
+        Float.NEGATIVE_INFINITY,
+        Integer.MAX_VALUE,
+        Integer.MIN_VALUE,
+        Long.MAX_VALUE,
+        Long.MIN_VALUE,
+        -1.0f,
+        1.0f,
+        -42.0f,
+        42.0f
+    };
+
+    public static double [] dspecial = {
+        0.0,
+        -0.0,
+        Double.MAX_VALUE,
+        Double.MIN_VALUE,
+        -Double.MAX_VALUE,
+        -Double.MIN_VALUE,
+        Double.NaN,
+        Double.POSITIVE_INFINITY,
+        Double.NEGATIVE_INFINITY,
+        Integer.MAX_VALUE,
+        Integer.MIN_VALUE,
+        Long.MIN_VALUE,
+        Long.MAX_VALUE,
+        -1,
+        1,
+        42,
+        -42,
+        Math.PI,
+        Math.E,
+        Float.MAX_VALUE,
+        Float.MIN_VALUE,
+        -Float.MAX_VALUE,
+        -Float.MIN_VALUE,
+        Float.NaN,
+        Float.POSITIVE_INFINITY,
+        Float.NEGATIVE_INFINITY
+    };
+
+    public static void main(String[] args) {
+        TestFramework.run();
+    }
+
+    @Test
+    @IR(failOn = {IRNode.ABS_I, IRNode.ABS_L, IRNode.ABS_F, IRNode.ABS_D})
+    public void testAbsConstant() {
+        // Test abs(constant) optimization for int
+        Asserts.assertEquals(Integer.MAX_VALUE, Math.abs(Integer.MAX_VALUE));
+        Asserts.assertEquals(Integer.MIN_VALUE, Math.abs(Integer.MIN_VALUE));
+        Asserts.assertEquals(Integer.MAX_VALUE, Math.abs(-Integer.MAX_VALUE));
+
+        // Test abs(constant) optimization for long
+        Asserts.assertEquals(Long.MAX_VALUE, Math.abs(Long.MAX_VALUE));
+        Asserts.assertEquals(Long.MIN_VALUE, Math.abs(Long.MIN_VALUE));
+        Asserts.assertEquals(Long.MAX_VALUE, Math.abs(-Long.MAX_VALUE));
+
+        // Test abs(constant) optimization for float
+        Asserts.assertTrue(Float.isNaN(Math.abs(Float.NaN)));
+        Asserts.assertEquals(Float.POSITIVE_INFINITY, Math.abs(Float.NEGATIVE_INFINITY));
+        Asserts.assertEquals(Float.POSITIVE_INFINITY, Math.abs(Float.POSITIVE_INFINITY));
+        Asserts.assertEquals(0.0f, Math.abs(0.0f));
+        Asserts.assertEquals(0.0f, Math.abs(-0.0f));
+        Asserts.assertEquals(Float.MAX_VALUE, Math.abs(Float.MAX_VALUE));
+        Asserts.assertEquals(Float.MIN_VALUE, Math.abs(Float.MIN_VALUE));
+        Asserts.assertEquals(Float.MAX_VALUE, Math.abs(-Float.MAX_VALUE));
+        Asserts.assertEquals(Float.MIN_VALUE, Math.abs(-Float.MIN_VALUE));
+
+        // Test abs(constant) optimization for double
+        Asserts.assertTrue(Double.isNaN(Math.abs(Double.NaN)));
+        Asserts.assertEquals(Double.POSITIVE_INFINITY, Math.abs(Double.NEGATIVE_INFINITY));
+        Asserts.assertEquals(Double.POSITIVE_INFINITY, Math.abs(Double.POSITIVE_INFINITY));
+        Asserts.assertEquals(0.0, Math.abs(0.0));
+        Asserts.assertEquals(0.0, Math.abs(-0.0));
+        Asserts.assertEquals(Double.MAX_VALUE, Math.abs(Double.MAX_VALUE));
+        Asserts.assertEquals(Double.MIN_VALUE, Math.abs(Double.MIN_VALUE));
+        Asserts.assertEquals(Double.MAX_VALUE, Math.abs(-Double.MAX_VALUE));
+        Asserts.assertEquals(Double.MIN_VALUE, Math.abs(-Double.MIN_VALUE));
+    }
+
+    @Test
+    @IR(counts = {IRNode.ABS_I, "1"})
+    public int testInt0(int x) {
+        return Math.abs(Math.abs(x)); // transformed to Math.abs(x)
+    }
+
+    @Test
+    @IR(failOn = {IRNode.SUB_I})
+    @IR(counts = {IRNode.ABS_I, "1"})
+    public int testInt1(int x) {
+        return Math.abs(0 - x); // transformed to Math.abs(x)
+    }
+
+    @Run(test = {"testInt0", "testInt1"})
+    public void checkTestInt(RunInfo info) {
+        for (int i = 0; i < ispecial.length; i++) {
+            Asserts.assertEquals(Math.abs(ispecial[i]), testInt0(ispecial[i]));
+            Asserts.assertEquals(Math.abs(ispecial[i]), testInt1(ispecial[i]));
+        }
+    }
+
+    @Test
+    @IR(counts = {IRNode.ABS_L, "1"})
+    public long testLong0(long x) {
+        return Math.abs(Math.abs(x)); // transformed to Math.abs(x)
+    }
+
+    @Test
+    @IR(failOn = {IRNode.SUB_L})
+    @IR(counts = {IRNode.ABS_L, "1"})
+    public long testLong1(long x) {
+        return Math.abs(0 - x); // transformed to Math.abs(x)
+    }
+
+    @Run(test = {"testLong0", "testLong1"})
+    public void checkTestLong(RunInfo info) {
+        for (int i = 0; i < lspecial.length; i++) {
+            Asserts.assertEquals(Math.abs(lspecial[i]), testLong0(lspecial[i]));
+            Asserts.assertEquals(Math.abs(lspecial[i]), testLong1(lspecial[i]));
+        }
+    }
+
+    @Test
+    @IR(counts = {IRNode.ABS_F, "1"})
+    public float testFloat0(float x) {
+        return Math.abs(Math.abs(x)); // transformed to Math.abs(x)
+    }
+
+    @Test
+    @IR(failOn = {IRNode.SUB_F})
+    @IR(counts = {IRNode.ABS_F, "1"})
+    public float testFloat1(float x) {
+        return Math.abs(0 - x); // transformed to Math.abs(x)
+    }
+
+    @Run(test = {"testFloat0", "testFloat1"})
+    public void checkTestFloat(RunInfo info) {
+        for (int i = 0; i < fspecial.length; i++) {
+            Asserts.assertEquals(Math.abs(fspecial[i]), testFloat0(fspecial[i]));
+            Asserts.assertEquals(Math.abs(fspecial[i]), testFloat1(fspecial[i]));
+        }
+    }
+
+    @Test
+    @IR(counts = {IRNode.ABS_D, "1"})
+    public double testDouble0(double x) {
+        return Math.abs(Math.abs(x)); // transformed to Math.abs(x)
+    }
+
+    @Test
+    @IR(failOn = {IRNode.SUB_D})
+    @IR(counts = {IRNode.ABS_D, "1"})
+    public double testDouble1(double x) {
+        return Math.abs(0 - x); // transformed to Math.abs(x)
+    }
+
+    @Run(test = {"testDouble0", "testDouble1"})
+    public void checkTestDouble(RunInfo info) {
+        for (int i = 0; i < dspecial.length; i++) {
+            Asserts.assertEquals(Math.abs(dspecial[i]), testDouble0(dspecial[i]));
+            Asserts.assertEquals(Math.abs(dspecial[i]), testDouble1(dspecial[i]));
+        }
+    }
+
+    @Test
+    @IR(failOn = {IRNode.ABS_I})
+    public void testChar() {
+        for (int i = 0; i < cspecial.length; i++) {
+            Asserts.assertEquals(cspecial[i], (char) Math.abs(cspecial[i]));
+        }
+    }
+ }
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestIRAddIdealNotXPlusC.java b/test/hotspot/jtreg/compiler/c2/irTests/TestIRAddIdealNotXPlusC.java
new file mode 100644
index 0000000000000000000000000000000000000000..3d632b998566d5565ed1f39b6d345782a2a0961f
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestIRAddIdealNotXPlusC.java
@@ -0,0 +1,366 @@
+/*
+ * Copyright (c) 2022, 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 compiler.c2.irTests;
+
+import jdk.test.lib.Asserts;
+import compiler.lib.ir_framework.*;
+
+/*
+ * @test
+ * @bug 8279607
+ * @summary Test that transformation from ~x + c to (c - 1) - x and
+ *          from ~(x + c) to (-c - 1) - x works as intended.
+ * @library /test/lib /
+ * @run driver compiler.c2.irTests.TestIRAddIdealNotXPlusC
+ */
+public class TestIRAddIdealNotXPlusC {
+
+    public static void main(String[] args) {
+        TestFramework.run();
+    }
+
+    @Test
+    @IR(failOn = {IRNode.ADD_I, IRNode.XOR_I})
+    @IR(counts = {IRNode.SUB_I, "1"})
+    public int testIntConIsNormal1(int x) {
+        return ~x + 1234; // transformed to 1233 - x
+    }
+
+    @Run(test = "testIntConIsNormal1")
+    public void checkTestIntConIsNormal1(RunInfo info) {
+        assertC2Compiled(info);
+        Asserts.assertEquals(1223, testIntConIsNormal1(10));
+        Asserts.assertEquals(1233, testIntConIsNormal1(0));
+    }
+
+    @Test
+    @IR(failOn = {IRNode.ADD_I, IRNode.XOR_I})
+    @IR(counts = {IRNode.SUB_I, "1"})
+    public int testIntConIsNormal2(int x) {
+        return ~(x + -1234); // transformed to 1233 - x
+    }
+
+    @Run(test = "testIntConIsNormal2")
+    public void checkTestIntConIsNormal2(RunInfo info) {
+        assertC2Compiled(info);
+        Asserts.assertEquals(1223, testIntConIsNormal2(10));
+        Asserts.assertEquals(1233, testIntConIsNormal2(0));
+    }
+
+    @Test
+    @IR(failOn = {IRNode.ADD_L, IRNode.XOR_L})
+    @IR(counts = {IRNode.SUB_L, "1"})
+    public long testLongConIsNormal1(long x) {
+        return ~x + 123_456_789_123L; // transformed to 123_456_789_122L - x
+    }
+
+    @Run(test = "testLongConIsNormal1")
+    public void checkTestLongConIsNormal1(RunInfo info) {
+        assertC2Compiled(info);
+        Asserts.assertEquals(113_456_789_122L, testLongConIsNormal1(10_000_000_000L));
+        Asserts.assertEquals(123_456_789_122L, testLongConIsNormal1(0L));
+    }
+
+    @Test
+    @IR(failOn = {IRNode.ADD_L, IRNode.XOR_L})
+    @IR(counts = {IRNode.SUB_L, "1"})
+    public long testLongConIsNormal2(long x) {
+        return ~(x + -123_456_789_123L); // transformed to 123_456_789_122L - x
+    }
+
+    @Run(test = "testLongConIsNormal2")
+    public void checkTestLongConIsNormal2(RunInfo info) {
+        assertC2Compiled(info);
+        Asserts.assertEquals(113_456_789_122L, testLongConIsNormal2(10_000_000_000L));
+        Asserts.assertEquals(123_456_789_122L, testLongConIsNormal2(0L));
+    }
+
+    @Test
+    @IR(failOn = {IRNode.ADD_I, IRNode.XOR_I})
+    @IR(counts = {IRNode.SUB_I, "1"})
+    public int testIntConIsZero1(int x) {
+        return ~x + 0; // transformed to -1 - x
+    }
+
+    @Run(test = "testIntConIsZero1")
+    public void checkTestIntConIsZero1(RunInfo info) {
+        assertC2Compiled(info);
+        Asserts.assertEquals(-11, testIntConIsZero1(10));
+    }
+
+    @Test
+    @IR(failOn = {IRNode.ADD_I, IRNode.SUB_I})
+    @IR(counts = {IRNode.XOR_I, "1"})
+    public int testIntConIsZero2(int x) {
+        return ~(x + 0); // should not happen, transformed to ~x
+    }
+
+    @Run(test = "testIntConIsZero2")
+    public void checkTestIntConIsZero2(RunInfo info) {
+        assertC2Compiled(info);
+        Asserts.assertEquals(-11, testIntConIsZero2(10));
+    }
+
+    @Test
+    @IR(failOn = {IRNode.ADD_L, IRNode.XOR_L})
+    @IR(counts = {IRNode.SUB_L, "1"})
+    public long testLongConIsZero1(long x) {
+        return ~x + 0L; // transformed to -1 - x
+    }
+
+    @Run(test = "testLongConIsZero1")
+    public void checkTestLongConIsZero1(RunInfo info) {
+        assertC2Compiled(info);
+        Asserts.assertEquals(-10_000_000_001L, testLongConIsZero1(10_000_000_000L));
+    }
+
+    @Test
+    @IR(failOn = {IRNode.ADD_L, IRNode.SUB_L})
+    @IR(counts = {IRNode.XOR_L, "1"})
+    public long testLongConIsZero2(long x) {
+        return ~(x + 0L); // should not happen, transformed to ~x
+    }
+
+    @Run(test = "testLongConIsZero2")
+    public void checkTestLongConIsZero2(RunInfo info) {
+        assertC2Compiled(info);
+        Asserts.assertEquals(-10_000_000_001L, testLongConIsZero2(10_000_000_000L));
+    }
+
+    @Test
+    @IR(failOn = {IRNode.ADD_I, IRNode.XOR_I})
+    @IR(counts = {IRNode.SUB_I, "1"})
+    public int testIntConIsOne1(int x) {
+        return ~x + 1; // transformed to 0 - x
+    }
+
+    @Run(test = "testIntConIsOne1")
+    public void checkTestIntConIsOne1(RunInfo info) {
+        assertC2Compiled(info);
+        Asserts.assertEquals(-10, testIntConIsOne1(10));
+    }
+
+    @Test
+    @IR(failOn = {IRNode.ADD_I, IRNode.XOR_I})
+    @IR(counts = {IRNode.SUB_I, "1"})
+    public int testIntConIsNegOne2(int x) {
+        return ~(x + -1); // transformed to 0 - x
+    }
+
+    @Run(test = "testIntConIsNegOne2")
+    public void checkTestIntConIsNegOne2(RunInfo info) {
+        assertC2Compiled(info);
+        Asserts.assertEquals(-10, testIntConIsNegOne2(10));
+    }
+
+    @Test
+    @IR(failOn = {IRNode.ADD_L, IRNode.XOR_L})
+    @IR(counts = {IRNode.SUB_L, "1"})
+    public long testLongConIsOne1(long x) {
+        return ~x + 1L; // transformed to 0 - x
+    }
+
+    @Run(test = "testLongConIsOne1")
+    public void checkTestLongConIsOne1(RunInfo info) {
+        assertC2Compiled(info);
+        Asserts.assertEquals(-10_000_000_000L, testLongConIsOne1(10_000_000_000L));
+    }
+
+    @Test
+    @IR(failOn = {IRNode.ADD_L, IRNode.XOR_L})
+    @IR(counts = {IRNode.SUB_L, "1"})
+    public long testLongConIsNegOne2(long x) {
+        return ~(x + -1L); // transformed to 0 - x
+    }
+
+    @Run(test = "testLongConIsNegOne2")
+    public void checkTestLongConIsNegOne2(RunInfo info) {
+        assertC2Compiled(info);
+        Asserts.assertEquals(-10_000_000_000L, testLongConIsNegOne2(10_000_000_000L));
+    }
+
+    @Test
+    @IR(failOn = {IRNode.ADD_I, IRNode.XOR_I})
+    @IR(counts = {IRNode.SUB_I, "1"})
+    public int testIntConMinusOneIsUnderflow1(int x) {
+        return ~x + Integer.MIN_VALUE; // transformed to Integer.MAX_VALUE - x
+    }
+
+    @Run(test = "testIntConMinusOneIsUnderflow1")
+    public void checkTestIntConMinusOneIsUnderflow1(RunInfo info) {
+        assertC2Compiled(info);
+        Asserts.assertEquals(2147483637, testIntConMinusOneIsUnderflow1(10));
+    }
+
+    @Test
+    @IR(failOn = {IRNode.ADD_I, IRNode.XOR_I})
+    @IR(counts = {IRNode.SUB_I, "1"})
+    public int testIntNegConMinusOneIsUnderflow2(int x) {
+        return ~(x + Integer.MIN_VALUE); // transformed to Integer.MAX_VALUE - x
+    }
+
+    @Run(test = "testIntNegConMinusOneIsUnderflow2")
+    public void checkTestIntNegConMinusOneIsUnderflow2(RunInfo info) {
+        assertC2Compiled(info);
+        Asserts.assertEquals(2147483637, testIntNegConMinusOneIsUnderflow2(10));
+    }
+
+    @Test
+    @IR(failOn = {IRNode.ADD_L, IRNode.XOR_L})
+    @IR(counts = {IRNode.SUB_L, "1"})
+    public long testLongConMinusOneIsUnderflow1(long x) {
+        return ~x + Long.MIN_VALUE; // transformed to Long.MAX_VALUE - x
+    }
+
+    @Run(test = "testLongConMinusOneIsUnderflow1")
+    public void checkTestLongConMinusOneIsUnderflow1(RunInfo info) {
+        assertC2Compiled(info);
+        Asserts.assertEquals(9223372036854775797L, testLongConMinusOneIsUnderflow1(10));
+    }
+
+    @Test
+    @IR(failOn = {IRNode.ADD_L, IRNode.XOR_L})
+    @IR(counts = {IRNode.SUB_L, "1"})
+    public long testLongNegConMinusOneIsUnderflow2(long x) {
+        return ~(x + Long.MIN_VALUE); // transformed to Long.MAX_VALUE - x
+    }
+
+    @Run(test = "testLongNegConMinusOneIsUnderflow2")
+    public void checkTestLongNegConMinusOneIsUnderflow2(RunInfo info) {
+        assertC2Compiled(info);
+        Asserts.assertEquals(9223372036854775797L, testLongNegConMinusOneIsUnderflow2(10));
+    }
+
+    @Test
+    @IR(failOn = {IRNode.ADD_I, IRNode.XOR_I})
+    @IR(counts = {IRNode.SUB_I, "1"})
+    public int testIntResultIsUnderflow1(int x) {
+        return ~x + -2147483638; // transformed to -2147483639 - x
+    }
+
+    @Run(test = "testIntResultIsUnderflow1")
+    public void checkTestIntResultIsUnderflow1(RunInfo info) {
+        assertC2Compiled(info);
+        Asserts.assertEquals(Integer.MAX_VALUE, testIntResultIsUnderflow1(10));
+    }
+
+    @Test
+    @IR(failOn = {IRNode.ADD_I, IRNode.XOR_I})
+    @IR(counts = {IRNode.SUB_I, "1"})
+    public int testIntResultIsUnderflow2(int x) {
+        return ~(x + 2147483638); // transformed to -2147483639 - x
+    }
+
+    @Run(test = "testIntResultIsUnderflow2")
+    public void checkTestIntResultIsUnderflow2(RunInfo info) {
+        assertC2Compiled(info);
+        Asserts.assertEquals(Integer.MAX_VALUE, testIntResultIsUnderflow2(10));
+    }
+
+    @Test
+    @IR(failOn = {IRNode.ADD_L, IRNode.XOR_L})
+    @IR(counts = {IRNode.SUB_L, "1"})
+    public long testLongResultIsUnderflow1(long x) {
+        return ~x + -9223372036854775798L; // transformed to -9223372036854775799L - x
+    }
+
+    @Run(test = "testLongResultIsUnderflow1")
+    public void checkTestLongResultIsUnderflow1(RunInfo info) {
+        assertC2Compiled(info);
+        Asserts.assertEquals(Long.MAX_VALUE, testLongResultIsUnderflow1(10));
+    }
+
+    @Test
+    @IR(failOn = {IRNode.ADD_L, IRNode.XOR_L})
+    @IR(counts = {IRNode.SUB_L, "1"})
+    public long testLongResultIsUnderflow2(long x) {
+        return ~(x + 9223372036854775798L); // transformed to -9223372036854775799L - x
+    }
+
+    @Run(test = "testLongResultIsUnderflow2")
+    public void checkTestLongResultIsUnderflow2(RunInfo info) {
+        assertC2Compiled(info);
+        Asserts.assertEquals(Long.MAX_VALUE, testLongResultIsUnderflow2(10));
+    }
+
+    @Test
+    @IR(failOn = {IRNode.ADD_I, IRNode.XOR_I})
+    @IR(counts = {IRNode.SUB_I, "1"})
+    public int testIntResultIsOverflow1(int x) {
+        return ~x + 2147483637; // transformed to 2147483646 - x
+    }
+
+    @Run(test = "testIntResultIsOverflow1")
+    public void checkTestIntResultIsOverflow1(RunInfo info) {
+        assertC2Compiled(info);
+        Asserts.assertEquals(Integer.MIN_VALUE, testIntResultIsOverflow1(-12));
+    }
+    @Test
+    @IR(failOn = {IRNode.ADD_I, IRNode.XOR_I})
+    @IR(counts = {IRNode.SUB_I, "1"})
+    public int testIntResultIsOverflow2(int x) {
+        return ~(x + -2147483637); // transformed to 2147483646 - x
+    }
+
+    @Run(test = "testIntResultIsOverflow2")
+    public void checkTestIntResultIsOverflow2(RunInfo info) {
+        assertC2Compiled(info);
+        Asserts.assertEquals(Integer.MIN_VALUE, testIntResultIsOverflow2(-12));
+    }
+
+    @Test
+    @IR(failOn = {IRNode.ADD_L, IRNode.XOR_L})
+    @IR(counts = {IRNode.SUB_L, "1"})
+    public long testLongResultIsOverflow1(long x) {
+        return ~x + 9223372036854775797L; // transformed to 9223372036854775798L - x
+    }
+
+    @Run(test = "testLongResultIsOverflow1")
+    public void checkTestLongResultIsOverflow1(RunInfo info) {
+        assertC2Compiled(info);
+        Asserts.assertEquals(Long.MIN_VALUE, testLongResultIsOverflow1(-12));
+    }
+
+    @Test
+    @IR(failOn = {IRNode.ADD_L, IRNode.XOR_L})
+    @IR(counts = {IRNode.SUB_L, "1"})
+    public long testLongResultIsOverflow2(long x) {
+        return ~(x + -9223372036854775797L); // transformed to 9223372036854775798L - x
+    }
+
+    @Run(test = "testLongResultIsOverflow2")
+    public void checkTestLongResultIsOverflow2(RunInfo info) {
+        assertC2Compiled(info);
+        Asserts.assertEquals(Long.MIN_VALUE, testLongResultIsOverflow2(-12));
+    }
+
+    private void assertC2Compiled(RunInfo info) {
+        // Test VM allows C2 to work
+        Asserts.assertTrue(info.isC2CompilationEnabled());
+        if (!info.isWarmUp()) {
+            // C2 compilation happens
+            Asserts.assertTrue(info.isTestC2Compiled());
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestIRLShiftIdeal_XPlusX_LShiftC.java b/test/hotspot/jtreg/compiler/c2/irTests/TestIRLShiftIdeal_XPlusX_LShiftC.java
new file mode 100644
index 0000000000000000000000000000000000000000..dc42ff9cdc13c3a46c02723624aa952ce4be0b80
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestIRLShiftIdeal_XPlusX_LShiftC.java
@@ -0,0 +1,151 @@
+/*
+ * Copyright (c) 2022, 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 compiler.c2.irTests;
+
+import jdk.test.lib.Asserts;
+import compiler.lib.ir_framework.*;
+
+/*
+ * @test
+ * @bug 8278114
+ * @summary Test that transformation from (x + x) >> c to x >> (c + 1) works as intended.
+ * @library /test/lib /
+ * @run driver compiler.c2.irTests.TestIRLShiftIdeal_XPlusX_LShiftC
+ */
+public class TestIRLShiftIdeal_XPlusX_LShiftC {
+
+    private static final int[] INT_IN = {
+        -10, -2, -1, 0, 1, 2, 10,
+        0x8000_0000, 0x7FFF_FFFF, 0x5678_1234,
+    };
+
+    private static final int[][] INT_OUT = {
+        // Do testInt0(x) for each x in INT_IN
+        {
+            -160, -32, -16, 0, 16, 32, 160,
+            0x0000_0000, 0xFFFF_FFF0, 0x6781_2340,
+        },
+
+        // Do testInt1(x) for each x in INT_IN
+        {
+            -10485760, -2097152, -1048576, 0, 1048576, 2097152, 10485760,
+            0x0000_0000, 0xFFF0_0000, 0x2340_0000,
+        },
+    };
+
+    private static final long[] LONG_IN = {
+        -10L, -2L, -1L, 0L, 1L, 2L, 10L,
+        0x8000_0000_0000_0000L, 0x7FFF_FFFF_FFFF_FFFFL, 0x5678_1234_4321_8765L,
+    };
+
+    private static final long[][] LONG_OUT = {
+        // Do testLong0(x) for each x in LONG_IN
+        {
+            -160L, -32L, -16L, 0L, 16L, 32L, 160L,
+            0x0000_0000_0000_0000L, 0xFFFF_FFFF_FFFF_FFF0L, 0x6781_2344_3218_7650L,
+        },
+
+        // Do testLong1(x) for each x in LONG_IN
+        {
+            -687194767360L, -137438953472L, -68719476736L, 0L, 68719476736L, 137438953472L, 687194767360L,
+            0x0000_0000_0000_0000L, 0xFFFF_FFF0_0000_0000L, 0x3218_7650_0000_0000L,
+        },
+    };
+
+    public static void main(String[] args) {
+        TestFramework.run();
+    }
+
+    @Test
+    @IR(failOn = {IRNode.ADD_I, IRNode.MUL_I})
+    @IR(counts = {IRNode.LSHIFT_I, "1"})
+    public int testInt0(int x) {
+        return (x + x) << 3; // transformed to x << 4
+    }
+
+    @Run(test = "testInt0")
+    public void checkTestInt0(RunInfo info) {
+        assertC2Compiled(info);
+        for (int i = 0; i < INT_IN.length; i++) {
+            Asserts.assertEquals(INT_OUT[0][i], testInt0(INT_IN[i]));
+        }
+    }
+
+    @Test
+    @IR(failOn = {IRNode.MUL_I})
+    @IR(counts = {IRNode.LSHIFT_I, "1",
+                  IRNode.ADD_I, "1"})
+    public int testInt1(int x) {
+        return (x + x) << 19; // no transformation because 19 is
+                              // greater than 16 (see implementation
+                              // in LShiftINode::Ideal)
+    }
+
+    @Run(test = "testInt1")
+    public void checkTestInt1(RunInfo info) {
+        assertC2Compiled(info);
+        for (int i = 0; i < INT_IN.length; i++) {
+            Asserts.assertEquals(INT_OUT[1][i], testInt1(INT_IN[i]));
+        }
+    }
+
+    @Test
+    @IR(failOn = {IRNode.ADD_L, IRNode.MUL_L})
+    @IR(counts = {IRNode.LSHIFT_L, "1"})
+    public long testLong0(long x) {
+        return (x + x) << 3; // transformed to x << 4
+    }
+
+    @Run(test = "testLong0")
+    public void checkTestLong0(RunInfo info) {
+        assertC2Compiled(info);
+        for (int i = 0; i < LONG_IN.length; i++) {
+            Asserts.assertEquals(LONG_OUT[0][i], testLong0(LONG_IN[i]));
+        }
+    }
+
+    @Test
+    @IR(failOn = {IRNode.ADD_L, IRNode.MUL_L})
+    @IR(counts = {IRNode.LSHIFT_L, "1"})
+    public long testLong1(long x) {
+        return (x + x) << 35; // transformed to x << 36
+    }
+
+    @Run(test = "testLong1")
+    public void checkTestLong1(RunInfo info) {
+        assertC2Compiled(info);
+        for (int i = 0; i < LONG_IN.length; i++) {
+            Asserts.assertEquals(LONG_OUT[1][i], testLong1(LONG_IN[i]));
+        }
+    }
+
+    private void assertC2Compiled(RunInfo info) {
+        // Test VM allows C2 to work
+        Asserts.assertTrue(info.isC2CompilationEnabled());
+        if (!info.isWarmUp()) {
+            // C2 compilation happens
+            Asserts.assertTrue(info.isTestC2Compiled());
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestRemixAddressExpressions.java b/test/hotspot/jtreg/compiler/c2/irTests/TestRemixAddressExpressions.java
new file mode 100644
index 0000000000000000000000000000000000000000..f35b9273a56185fbc4b0584e2592e8c52125ecb8
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/c2/irTests/TestRemixAddressExpressions.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2022, Red Hat, 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.
+ */
+
+package compiler.c2.irTests;
+
+import compiler.lib.ir_framework.*;
+
+/*
+ * @test
+ * @bug 8278784
+ * @summary C2: Refactor PhaseIdealLoop::remix_address_expressions() so it operates on longs
+ * @library /test/lib /
+ * @run driver compiler.c2.irTests.TestRemixAddressExpressions
+ */
+
+public class TestRemixAddressExpressions {
+    public static void main(String[] args) {
+        TestFramework.run();
+    }
+
+    @Test
+    @IR(counts = { IRNode.ADD_I, "1", IRNode.LSHIFT_I, "2" })
+    @Arguments({Argument.RANDOM_EACH, Argument.RANDOM_EACH})
+    public static float invPlusVarLshiftInt(int inv, int scale) {
+        float res = 0;
+        for (int i = 1; i < 100; i *= 11) {
+            res += (i + inv) << scale;
+        }
+        return res;
+    }
+
+    @Test
+    @IR(counts = { IRNode.ADD_L, "1", IRNode.LSHIFT_L, "2" })
+    @Arguments({Argument.RANDOM_EACH, Argument.RANDOM_EACH})
+    public static float invPlusVarLshiftLong(long inv, int scale) {
+        float res = 0;
+        for (long i = 1; i < 100; i *= 11) {
+            res += (i + inv) << scale;
+        }
+        return res;
+    }
+
+    @Test
+    @IR(counts = { IRNode.ADD_I, "1", IRNode.SUB_I, "1", IRNode.LSHIFT_I, "2" })
+    @Arguments({Argument.RANDOM_EACH, Argument.RANDOM_EACH})
+    public static float invMinusVarLshiftInt(int inv, int scale) {
+        float res = 0;
+        for (int i = 1; i < 100; i *= 11) {
+            res += (inv - i) << scale;
+        }
+        return res;
+    }
+
+    @Test
+    @IR(counts = { IRNode.ADD_L, "1", IRNode.SUB_L, "1", IRNode.LSHIFT_L, "2" })
+    @Arguments({Argument.RANDOM_EACH, Argument.RANDOM_EACH})
+    public static float invMinusVarLshiftLong(long inv, int scale) {
+        float res = 0;
+        for (long i = 1; i < 100; i *= 11) {
+            res += (inv - i) << scale;
+        }
+        return res;
+    }
+
+    @Test
+    @IR(counts = { IRNode.ADD_I, "1", IRNode.SUB_I, "1", IRNode.LSHIFT_I, "2" })
+    @Arguments({Argument.RANDOM_EACH, Argument.RANDOM_EACH})
+    public static float varMinusInvLshiftInt(int inv, int scale) {
+        float res = 0;
+        for (int i = 1; i < 100; i *= 11) {
+            res += (i - inv) << scale;
+        }
+        return res;
+    }
+
+    @Test
+    @IR(counts = { IRNode.ADD_L, "1", IRNode.SUB_L, "1", IRNode.LSHIFT_L, "2" })
+    @Arguments({Argument.RANDOM_EACH, Argument.RANDOM_EACH})
+    public static float varMinusInvLshiftLong(long inv, int scale) {
+        float res = 0;
+        for (long i = 1; i < 100; i *= 11) {
+            res += (i - inv) << scale;
+        }
+        return res;
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/cha/AbstractRootMethod.java b/test/hotspot/jtreg/compiler/cha/AbstractRootMethod.java
index a450b1e02e138c0d7aff33968e9622990d6159bb..01787593412e44c89cb52b8fe0f77c80354bb92f 100644
--- a/test/hotspot/jtreg/compiler/cha/AbstractRootMethod.java
+++ b/test/hotspot/jtreg/compiler/cha/AbstractRootMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022, 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
@@ -50,12 +50,23 @@
  */
 package compiler.cha;
 
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+
 import static compiler.cha.Utils.*;
 
 public class AbstractRootMethod {
     public static void main(String[] args) {
         run(AbstractClass.class);
         run(AbstractInterface.class);
+
+        // Implementation limitation: CHA is not performed by C1 during inlining through MH linkers.
+        if (!sun.hotspot.code.Compiler.isC1Enabled()) {
+            run(AbstractClass.TestMH.class, AbstractClass.class);
+            run(AbstractInterface.TestMH.class, AbstractInterface.class);
+        }
+
+        System.out.println("TEST PASSED");
     }
 
     public static class AbstractClass extends ATest {
@@ -124,7 +135,21 @@ public class AbstractRootMethod {
             call(new G() { public Object m() { return CORRECT; } }); //  Gn <: G.m <: C.m ABSTRACT
             assertCompiled();
         }
+
+        public static class TestMH extends AbstractClass {
+            static final MethodHandle TEST_MH = findVirtualHelper(C.class, "m", Object.class, MethodHandles.lookup());
+
+            @Override
+            public Object test(C obj) {
+                try {
+                    return TEST_MH.invokeExact(obj); // invokevirtual C.m()
+                } catch (Throwable e) {
+                    throw new InternalError(e);
+                }
+            }
+        }
     }
+
     public static class AbstractInterface extends ATest {
         public AbstractInterface() {
             super(C.class, D.class);
@@ -193,5 +218,18 @@ public class AbstractRootMethod {
             call(new G() { public Object m() { return CORRECT; } }); //  Gn <: G.m <: C <: I.m ABSTRACT
             assertCompiled();
         }
+
+        public static class TestMH extends AbstractInterface {
+            static final MethodHandle TEST_MH = findVirtualHelper(C.class, "m", Object.class, MethodHandles.lookup());
+
+            @Override
+            public Object test(C obj) {
+                try {
+                    return TEST_MH.invokeExact(obj); // invokevirtual C.m()
+                } catch (Throwable e) {
+                    throw new InternalError(e);
+                }
+            }
+        }
     }
 }
diff --git a/test/hotspot/jtreg/compiler/cha/DefaultRootMethod.java b/test/hotspot/jtreg/compiler/cha/DefaultRootMethod.java
index 354412d77480c47c5d9a0043f7f97e2a4db97a09..a13a9cfdd26a190d8b6f97fd50a35b2e59d5405f 100644
--- a/test/hotspot/jtreg/compiler/cha/DefaultRootMethod.java
+++ b/test/hotspot/jtreg/compiler/cha/DefaultRootMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022, 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
@@ -50,12 +50,22 @@
  */
 package compiler.cha;
 
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+
 import static compiler.cha.Utils.*;
 
 public class DefaultRootMethod {
     public static void main(String[] args) {
         run(DefaultRoot.class);
         run(InheritedDefault.class);
+
+        // Implementation limitation: CHA is not performed by C1 during inlining through MH linkers.
+        if (!sun.hotspot.code.Compiler.isC1Enabled()) {
+            run(DefaultRoot.TestMH.class, DefaultRoot.class);
+            run(InheritedDefault.TestMH.class, InheritedDefault.class);
+        }
+
         System.out.println("TEST PASSED");
     }
 
@@ -83,7 +93,7 @@ public class DefaultRootMethod {
         static          class G  extends C { public Object m() { return CORRECT; } }
 
         @Override
-        public Object test(C obj) {
+        public Object test(C obj) throws Throwable {
             return obj.m(); // invokevirtual C.m()
         }
 
@@ -122,6 +132,15 @@ public class DefaultRootMethod {
             call(new G() { public Object m() { return CORRECT; } }); //  Gn <: G.m <: C <: I.m DEFAULT
             assertCompiled();
         }
+
+        public static class TestMH extends DefaultRoot {
+            static final MethodHandle TEST_MH = findVirtualHelper(C.class, "m", Object.class, MethodHandles.lookup());
+
+            @Override
+            public Object test(C obj) throws Throwable {
+                return TEST_MH.invokeExact(obj); // invokevirtual C.m()
+            }
+        }
     }
 
     public static class InheritedDefault extends ATest {
@@ -151,7 +170,7 @@ public class DefaultRootMethod {
         static class G extends C implements K { /* inherits K.m DEFAULT */ }
 
         @Override
-        public Object test(C obj) {
+        public Object test(C obj) throws Throwable {
             return obj.m(); // invokevirtual C.m()
         }
 
@@ -190,5 +209,14 @@ public class DefaultRootMethod {
             call(new G() { public Object m() { return CORRECT; } }); //  Gn <: G.m <: C <: I.m DEFAULT
             assertCompiled();
         }
+
+        public static class TestMH extends InheritedDefault {
+            static final MethodHandle TEST_MH = findVirtualHelper(C.class, "m", Object.class, MethodHandles.lookup());
+
+            @Override
+            public Object test(C obj) throws Throwable {
+                return TEST_MH.invokeExact(obj); // invokevirtual C.m()
+            }
+        }
     }
 }
diff --git a/test/hotspot/jtreg/compiler/cha/Utils.java b/test/hotspot/jtreg/compiler/cha/Utils.java
index cad185b1110306147f20daa34c76f30eaa782b66..f45ab256fbb710206b0994a0c6e06ea2fd610d17 100644
--- a/test/hotspot/jtreg/compiler/cha/Utils.java
+++ b/test/hotspot/jtreg/compiler/cha/Utils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022, 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
@@ -34,6 +34,7 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
 import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.concurrent.Callable;
@@ -45,6 +46,7 @@ import static jdk.test.lib.Asserts.assertTrue;
 
 public class Utils {
     public static final Unsafe U = Unsafe.getUnsafe();
+    public static final WhiteBox WB = WhiteBox.getWhiteBox();
 
     interface Test {
         void call(T o);
@@ -99,8 +101,6 @@ public class Utils {
     }
 
     public static abstract class ATest implements Test {
-        public static final WhiteBox WB = WhiteBox.getWhiteBox();
-
         public static final Object CORRECT = new Object();
         public static final Object WRONG   = new Object();
 
@@ -117,7 +117,7 @@ public class Utils {
         }
 
         @DontInline
-        public abstract Object test(T i);
+        public abstract Object test(T i) throws Throwable;
 
         public abstract void checkInvalidReceiver();
 
@@ -133,7 +133,6 @@ public class Utils {
             }));
         }
 
-
         public void compile(Runnable r) {
             while (!WB.isMethodCompiled(TEST)) {
                 for (int i = 0; i < 100; i++) {
@@ -161,19 +160,35 @@ public class Utils {
 
         @Override
         public void call(T i) {
-            assertTrue(test(i) != WRONG);
+            try {
+                assertTrue(test(i) != WRONG);
+            } catch (Throwable e) {
+                throw new InternalError(e);
+            }
+        }
+
+        public static  T compute(Callable c) {
+            try {
+                return c.call();
+            } catch (Exception e) {
+                throw new Error(e);
+            }
+        }
+
+        public static MethodHandle findVirtualHelper(Class refc, String name, Class returnType, MethodHandles.Lookup lookup) {
+            return compute(() -> lookup.findVirtual(refc, name, MethodType.methodType(returnType)));
         }
     }
 
     @Retention(value = RetentionPolicy.RUNTIME)
     public @interface TestCase {}
 
-    static void run(Class test) {
+    static void run(Class test, Class enclosed) {
         try {
-            for (Method m : test.getDeclaredMethods()) {
+            for (Method m : test.getMethods()) {
                 if (m.isAnnotationPresent(TestCase.class)) {
                     System.out.println(m.toString());
-                    ClassLoader cl = new MyClassLoader(test);
+                    ClassLoader cl = new MyClassLoader(enclosed);
                     Class c = cl.loadClass(test.getName());
                     c.getMethod(m.getName()).invoke(c.getDeclaredConstructor().newInstance());
                 }
@@ -183,6 +198,10 @@ public class Utils {
         }
     }
 
+    static void run(Class test) {
+        run(test, test);
+    }
+
     static class ObjectToStringHelper {
         static Object testHelper(Object o) {
             throw new Error("not used");
@@ -303,7 +322,7 @@ public class Utils {
         try {
             r.run();
             throw new AssertionError("Exception not thrown: " + expectedException.getName());
-        } catch(Throwable e) {
+        } catch (Throwable e) {
             if (expectedException == e.getClass()) {
                 // success: proper exception is thrown
             } else {
@@ -320,12 +339,4 @@ public class Utils {
             throw new Error(e);
         }
     }
-
-    static  T compute(Callable c) {
-        try {
-            return c.call();
-        } catch (Exception e) {
-            throw new Error(e);
-        }
-    }
 }
diff --git a/test/hotspot/jtreg/compiler/codecache/OverflowCodeCacheTest.java b/test/hotspot/jtreg/compiler/codecache/OverflowCodeCacheTest.java
index 1dc02e25312292cef167b78215c84df82b90fdf1..cd69d0a31daaffd6d7b8f77d701f9bc44045510a 100644
--- a/test/hotspot/jtreg/compiler/codecache/OverflowCodeCacheTest.java
+++ b/test/hotspot/jtreg/compiler/codecache/OverflowCodeCacheTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2022, 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 OverflowCodeCacheTest
- * @bug 8059550
+ * @bug 8059550 8279356
  * @summary testing of code cache segments overflow
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
@@ -33,11 +33,14 @@
  * @run driver jdk.test.lib.helpers.ClassFileInstaller sun.hotspot.WhiteBox
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI -XX:CompileCommand=compileonly,null::*
- *                   -XX:-SegmentedCodeCache
- *                   compiler.codecache.OverflowCodeCacheTest
+ *                   -XX:-SegmentedCodeCache -Xmixed
+ *                   compiler.codecache.OverflowCodeCacheTest CompilationDisabled
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI -XX:CompileCommand=compileonly,null::*
- *                   -XX:+SegmentedCodeCache
+ *                   -XX:+SegmentedCodeCache -Xmixed
+ *                   compiler.codecache.OverflowCodeCacheTest CompilationDisabled
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ *                   -XX:+WhiteBoxAPI -XX:-SegmentedCodeCache -Xmixed
  *                   compiler.codecache.OverflowCodeCacheTest
  */
 
@@ -49,13 +52,21 @@ import sun.hotspot.code.BlobType;
 import sun.hotspot.code.CodeBlob;
 
 import java.lang.management.MemoryPoolMXBean;
+import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.EnumSet;
 
+class Helper {
+    // Uncommon signature to prevent sharing and force creation of a new adapter
+    public void method(float a, float b, float c, Object o) { }
+}
+
 public class OverflowCodeCacheTest {
     private static final WhiteBox WHITE_BOX = WhiteBox.getWhiteBox();
+    private static boolean COMPILATION_DISABLED = false;
 
     public static void main(String[] args) {
+        COMPILATION_DISABLED = args.length > 0;
         EnumSet blobTypes = BlobType.getAvailable();
         for (BlobType type : blobTypes) {
             new OverflowCodeCacheTest(type).test();
@@ -74,6 +85,8 @@ public class OverflowCodeCacheTest {
         System.out.println("allocating till possible...");
         ArrayList blobs = new ArrayList<>();
         int compilationActivityMode = -1;
+        // Lock compilation to be able to better control code cache space
+        WHITE_BOX.lockCompilation();
         try {
             long addr;
             int size = (int) (getHeapSize() >> 7);
@@ -88,15 +101,43 @@ public class OverflowCodeCacheTest {
                 }
             }
             /* now, remember compilationActivityMode to check it later, after freeing, since we
-               possibly have no free cache for futher work */
+               possibly have no free cache for further work */
             compilationActivityMode = WHITE_BOX.getCompilationActivityMode();
+
+            // Use smallest allocation size to make sure all of the available space
+            // is filled up. Don't free these below to put some pressure on the sweeper.
+            while ((addr = WHITE_BOX.allocateCodeBlob(1, type.id)) != 0) { }
         } finally {
+            try {
+                // Trigger creation of a new adapter for Helper::method
+                // which will fail because we are out of code cache space.
+                Helper helper = new Helper();
+            } catch (VirtualMachineError e) {
+                // Expected
+            }
+            // Free code cache space
             for (Long blob : blobs) {
                 WHITE_BOX.freeCodeBlob(blob);
             }
+
+            // Convert some nmethods to zombie and then free them to re-enable compilation
+            WHITE_BOX.unlockCompilation();
+            WHITE_BOX.forceNMethodSweep();
+            WHITE_BOX.forceNMethodSweep();
+
+            // Trigger compilation of Helper::method which will hit an assert because
+            // adapter creation failed above due to a lack of code cache space.
+            Helper helper = new Helper();
+            for (int i = 0; i < 100_000; i++) {
+                helper.method(0, 0, 0, null);
+            }
+        }
+        // Only check this if compilation is disabled, otherwise the sweeper might have
+        // freed enough nmethods to allow for re-enabling compilation.
+        if (COMPILATION_DISABLED) {
+            Asserts.assertNotEquals(compilationActivityMode, 1 /* run_compilation*/,
+                    "Compilation must be disabled when CodeCache(CodeHeap) overflows");
         }
-        Asserts.assertNotEquals(compilationActivityMode, 1 /* run_compilation*/,
-                "Compilation must be disabled when CodeCache(CodeHeap) overflows");
     }
 
     private long getHeapSize() {
diff --git a/test/hotspot/jtreg/compiler/codecache/stress/ReturnBlobToWrongHeapTest.java b/test/hotspot/jtreg/compiler/codecache/stress/ReturnBlobToWrongHeapTest.java
index 37d570e460f52f9995cac40d6e41020569beefbe..1ef65182a0e9b6d0f666e0cc3cae2a97a80494c6 100644
--- a/test/hotspot/jtreg/compiler/codecache/stress/ReturnBlobToWrongHeapTest.java
+++ b/test/hotspot/jtreg/compiler/codecache/stress/ReturnBlobToWrongHeapTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, 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,6 +37,7 @@
  *                   -XX:+SegmentedCodeCache
  *                   -XX:ReservedCodeCacheSize=16M
  *                   -XX:CodeCacheMinBlockLength=1
+ *                   -XX:CICompilerCount=2
  *                   compiler.codecache.stress.ReturnBlobToWrongHeapTest
  */
 
diff --git a/test/hotspot/jtreg/compiler/exceptions/TestLateMHInlineExceptions.java b/test/hotspot/jtreg/compiler/exceptions/TestLateMHInlineExceptions.java
index 7d478df33b147f94fbe2c0dd049cf437860b688d..6949c9948dfb5fe3eb8ead10a27163a75174369b 100644
--- a/test/hotspot/jtreg/compiler/exceptions/TestLateMHInlineExceptions.java
+++ b/test/hotspot/jtreg/compiler/exceptions/TestLateMHInlineExceptions.java
@@ -23,7 +23,7 @@
 
 /**
  * @test
- * @bug 8275638
+ * @bug 8275638 8278966
  * @summary GraphKit::combine_exception_states fails with "matching stack sizes" assert
  *
  * @run main/othervm -XX:-BackgroundCompilation -XX:-UseOnStackReplacement -XX:CompileCommand=dontinline,TestLateMHInlineExceptions::m
@@ -55,18 +55,37 @@ public class TestLateMHInlineExceptions {
             }
             test4(test);
             test4(null);
+            test5(test);
+            try {
+                test5(null);
+            } catch (NullPointerException npe) {
+            }
+            test6(test);
+            try {
+                test6(null);
+            } catch (NullPointerException npe) {
+            }
         }
     }
 
     void m() {
     }
 
+    static void nothing(Throwable t) {
+    }
+
     static final MethodHandle mh;
+    static final MethodHandle mh_nothing;
+    static final MethodHandle mh2;
+    static final MethodHandle mh3;
 
     static {
         MethodHandles.Lookup lookup = MethodHandles.lookup();
         try {
             mh = lookup.findVirtual(TestLateMHInlineExceptions.class, "m", MethodType.methodType(void.class));
+            mh_nothing = lookup.findStatic(TestLateMHInlineExceptions.class, "nothing", MethodType.methodType(void.class, Throwable.class));
+            mh2 = MethodHandles.tryFinally(mh, mh_nothing);
+            mh3 = MethodHandles.catchException(mh, Throwable.class, mh_nothing);
         } catch (NoSuchMethodException e) {
             e.printStackTrace();
             throw new RuntimeException("Method handle lookup failed");
@@ -102,4 +121,12 @@ public class TestLateMHInlineExceptions {
         } catch (NullPointerException npe) {
         }
     }
+
+    private static void test5(TestLateMHInlineExceptions test) throws Throwable {
+        mh2.invokeExact(test);
+    }
+
+    private static void test6(TestLateMHInlineExceptions test) throws Throwable {
+        mh3.invokeExact(test);
+    }
 }
diff --git a/test/hotspot/jtreg/compiler/inlining/ResolvedClassTest.java b/test/hotspot/jtreg/compiler/inlining/ResolvedClassTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..dfeee6cdd7b1075eb157d53dba07afa49095966b
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/inlining/ResolvedClassTest.java
@@ -0,0 +1,158 @@
+/*
+ * Copyright (c) 2022, 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 8279515
+ *
+ * @requires vm.flagless
+ * @modules java.base/jdk.internal.misc
+ * @library /test/lib /
+ *
+ * @run driver compiler.jsr292.ResolvedClassTest
+ */
+
+package compiler.jsr292;
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+
+import java.io.IOException;
+
+public class ResolvedClassTest {
+    /* ======================================================================== */
+    static void testStatic() throws IOException {
+        ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+                "-XX:+IgnoreUnrecognizedVMOptions", "-showversion",
+                "-XX:+PrintCompilation", "-XX:+UnlockDiagnosticVMOptions", "-XX:+PrintInlining",
+                "-Xbatch", "-XX:CompileCommand=quiet", "-XX:CompileCommand=compileonly," + TestStatic.class.getName() + "::test",
+                TestStatic.class.getName());
+
+        OutputAnalyzer analyzer = new OutputAnalyzer(pb.start());
+
+        analyzer.shouldHaveExitValue(0);
+
+        analyzer.shouldNotContain("TestStatic$A::m (1 bytes)   not inlineable");
+        analyzer.shouldNotContain("TestStatic$A::m (1 bytes)   no static binding");
+
+        analyzer.shouldContain("TestStatic$A::m (1 bytes)   inline");
+    }
+
+    static class TestStatic {
+        static class A {
+            static void m() {}
+        }
+        static class B extends A {}
+
+        // @DontInline
+        static void test() {
+            B.m(); // invokestatic B "m" => A::m
+        }
+
+        public static void main(String[] args) {
+            for (int i = 0; i < 20_000; i++) {
+                test();
+            }
+        }
+    }
+
+    /* ======================================================================== */
+    static void testStaticInit() throws IOException {
+        ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+                "-XX:+IgnoreUnrecognizedVMOptions", "-showversion",
+                "-XX:+PrintCompilation", "-XX:+UnlockDiagnosticVMOptions", "-XX:+PrintInlining",
+                "-Xbatch", "-XX:CompileCommand=quiet", "-XX:CompileCommand=compileonly," + TestStaticInit.class.getName() + "::test",
+                TestStaticInit.class.getName());
+
+        OutputAnalyzer analyzer = new OutputAnalyzer(pb.start());
+
+        analyzer.shouldHaveExitValue(0);
+
+        analyzer.shouldContain("TestStaticInit$A::m (1 bytes)   no static binding");
+    }
+
+    static class TestStaticInit {
+        static class A {
+            static {
+                for (int i = 0; i < 20_000; i++) {
+                    TestStaticInit.test();
+                }
+            }
+
+            static void m() {}
+        }
+        static class B extends A {}
+
+        // @DontInline
+        static void test() {
+            B.m(); // A:: => test() => A::m()
+        }
+
+        public static void main(String[] args) {
+            A.m(); // trigger initialization of A
+        }
+    }
+
+    /* ======================================================================== */
+    static void testIndy() throws IOException {
+        ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+                "-XX:+IgnoreUnrecognizedVMOptions", "-showversion",
+                "-XX:+PrintCompilation", "-XX:+UnlockDiagnosticVMOptions", "-XX:+PrintInlining",
+                "-Xbatch", "-XX:CompileCommand=quiet", "-XX:CompileCommand=compileonly," + TestIndy.class.getName() + "::test",
+                TestIndy.class.getName());
+
+        OutputAnalyzer analyzer = new OutputAnalyzer(pb.start());
+
+        analyzer.shouldHaveExitValue(0);
+
+        analyzer.shouldNotContain("java.lang.invoke.Invokers$Holder::linkToTargetMethod (9 bytes)   not inlineable");
+
+        analyzer.shouldContain("java.lang.invoke.Invokers$Holder::linkToTargetMethod (9 bytes)   force inline by annotation");
+        analyzer.shouldContain("java/lang/invoke/MethodHandle::invokeBasic (not loaded)   not inlineable");
+    }
+
+    static class TestIndy {
+        static String str = "";
+
+        // @DontInline
+        static void test() {
+            String s1 = "" + str; // indy (linked)
+
+            for (int i = 0; i < 200_000; i++) {} // trigger OSR compilation
+
+            String s2 = "" + str; // indy (not linked)
+        }
+
+        public static void main(String[] args) {
+            test();
+        }
+    }
+
+    /* ======================================================================== */
+
+    public static void main(String[] args) throws IOException {
+        testStatic();
+        testStaticInit();
+        testIndy();
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/intrinsics/bmi/verifycode/BzhiTestI2L.java b/test/hotspot/jtreg/compiler/intrinsics/bmi/verifycode/BzhiTestI2L.java
index 93f54bdef73f57e944e47b9381d993d80e6db35f..08f83e1b8f044469ff8c89f42b230fb32fe714f9 100644
--- a/test/hotspot/jtreg/compiler/intrinsics/bmi/verifycode/BzhiTestI2L.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/bmi/verifycode/BzhiTestI2L.java
@@ -31,6 +31,7 @@
  * @build sun.hotspot.WhiteBox
  * @run driver jdk.test.lib.helpers.ClassFileInstaller sun.hotspot.WhiteBox
  * @run main/bootclasspath/othervm -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:+AbortVMOnCompilationFailure
+ *      -XX:CompileCommand=compileonly,compiler.intrinsics.bmi.*::*
  *      -XX:+IgnoreUnrecognizedVMOptions -XX:+UseBMI2Instructions
  *      compiler.intrinsics.bmi.verifycode.BzhiTestI2L
  */
diff --git a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/TestTranslatedException.java b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/TestTranslatedException.java
index ac2c220adb540f499655ac10eef69dc71721603d..57a505901a5b35baedf14fb0b4a6a9a25624cf30 100644
--- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/TestTranslatedException.java
+++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/TestTranslatedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 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,7 +24,8 @@
 /*
  * @test
  * @requires vm.jvmci
- * @modules jdk.internal.vm.ci/jdk.vm.ci.hotspot:open
+ * @modules jdk.internal.vm.ci/jdk.vm.ci.hotspot:+open
+ *          java.base/jdk.internal.misc
  * @library /compiler/jvmci/jdk.vm.ci.hotspot.test/src
  * @run testng/othervm
  *      -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:-UseJVMCICompiler
@@ -41,6 +42,9 @@ import java.lang.reflect.Method;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
+import jdk.internal.misc.Unsafe;
+import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime;
+
 public class TestTranslatedException {
     @SuppressWarnings("serial")
     public static class Untranslatable extends RuntimeException {
@@ -56,7 +60,7 @@ public class TestTranslatedException {
         Class translatedExceptionClass = Class.forName("jdk.vm.ci.hotspot.TranslatedException");
 
         Method encode = translatedExceptionClass.getDeclaredMethod("encodeThrowable", Throwable.class);
-        Method decode = translatedExceptionClass.getDeclaredMethod("decodeThrowable", String.class);
+        Method decode = translatedExceptionClass.getDeclaredMethod("decodeThrowable", byte[].class);
         encode.setAccessible(true);
         decode.setAccessible(true);
 
@@ -64,11 +68,50 @@ public class TestTranslatedException {
         for (int i = 0; i < 10; i++) {
             throwable = new ExceptionInInitializerError(new InvocationTargetException(new RuntimeException(String.valueOf(i), throwable), "invoke"));
         }
-        String encoding = (String) encode.invoke(null, throwable);
+        byte[] encoding = (byte[]) encode.invoke(null, throwable);
         Throwable decoded = (Throwable) decode.invoke(null, encoding);
         assertThrowableEquals(throwable, decoded);
     }
 
+    @SuppressWarnings("unchecked")
+    @Test
+    public void encodeDecodeTest2() throws Exception {
+        Unsafe unsafe = Unsafe.getUnsafe();
+        int bufferSize = 512;
+        long buffer = 0L;
+        while (true) {
+            buffer = unsafe.allocateMemory(bufferSize);
+            try {
+                Throwable throwable = new ExceptionInInitializerError(new InvocationTargetException(new Untranslatable("test exception", new NullPointerException()), "invoke"));
+                for (int i = 0; i < 10; i++) {
+                    throwable = new ExceptionInInitializerError(new InvocationTargetException(new RuntimeException(String.valueOf(i), throwable), "invoke"));
+                }
+
+                Method encode = HotSpotJVMCIRuntime.class.getDeclaredMethod("encodeThrowable", Throwable.class, long.class, int.class);
+                Method decode = HotSpotJVMCIRuntime.class.getDeclaredMethod("decodeAndThrowThrowable", long.class);
+                encode.setAccessible(true);
+                decode.setAccessible(true);
+
+                int res = (Integer) encode.invoke(null, throwable, buffer, bufferSize);
+
+                if (res < 0) {
+                    bufferSize = -res;
+                } else {
+                    try {
+                        decode.invoke(null, buffer);
+                        throw new AssertionError("expected decodeAndThrowThrowable to throw an exception");
+                    } catch (InvocationTargetException e) {
+                        Throwable decoded = e.getCause();
+                        assertThrowableEquals(throwable, decoded);
+                    }
+                    return;
+                }
+            } finally {
+                unsafe.freeMemory(buffer);
+            }
+        }
+    }
+
     private static void assertThrowableEquals(Throwable original, Throwable decoded) {
         try {
             Assert.assertEquals(original == null, decoded == null);
diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
index 331e00e53a4f141195b7ff96c4f11d68c5d16cc7..c2e8a64f2b45939f3f65ef392853ef372aafb427 100644
--- a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
+++ b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022, 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
@@ -74,6 +74,7 @@ public class IRNode {
     public static final String STORE_D = START + "StoreD" + MID + END;
     public static final String STORE_P = START + "StoreP" + MID + END;
     public static final String STORE_N = START + "StoreN" + MID + END;
+    public static final String STORE_VECTOR = START + "StoreVector" + MID + END;
     public static final String STORE_OF_CLASS = COMPOSITE_PREFIX + START + "Store(B|C|S|I|L|F|D|P|N)" + MID + "@\\S*" + IS_REPLACED + STORE_OF_CLASS_POSTFIX;
     public static final String STORE_B_OF_CLASS = COMPOSITE_PREFIX + START + "StoreB" + MID + "@\\S*" + IS_REPLACED + STORE_OF_CLASS_POSTFIX;
     public static final String STORE_C_OF_CLASS = COMPOSITE_PREFIX + START + "StoreC" + MID + "@\\S*" + IS_REPLACED + STORE_OF_CLASS_POSTFIX;
@@ -96,6 +97,7 @@ public class IRNode {
     public static final String LOAD_D = START + "LoadD" + MID + END;
     public static final String LOAD_P = START + "LoadP" + MID + END;
     public static final String LOAD_N = START + "LoadN" + MID + END;
+    public static final String LOAD_VECTOR = START + "LoadVector" + MID + END;
     public static final String LOAD_OF_CLASS = COMPOSITE_PREFIX + START + "Load(B|UB|S|US|I|L|F|D|P|N)" + MID + "@\\S*"+  IS_REPLACED + LOAD_OF_CLASS_POSTFIX;
     public static final String LOAD_B_OF_CLASS = COMPOSITE_PREFIX + START + "LoadB" + MID + "@\\S*" + IS_REPLACED + LOAD_OF_CLASS_POSTFIX;
     public static final String LOAD_UB_OF_CLASS = COMPOSITE_PREFIX + START + "LoadUB" + MID + "@\\S*" + IS_REPLACED + LOAD_OF_CLASS_POSTFIX;
@@ -113,6 +115,7 @@ public class IRNode {
     public static final String LOOP   = START + "Loop" + MID + END;
     public static final String COUNTEDLOOP = START + "CountedLoop\\b" + MID + END;
     public static final String COUNTEDLOOP_MAIN = START + "CountedLoop\\b" + MID + "main" + END;
+    public static final String IF = START + "If\\b" + MID + END;
 
     public static final String CALL = START + "Call.*Java" + MID + END;
     public static final String CALL_OF_METHOD = COMPOSITE_PREFIX + START + "Call.*Java" + MID + IS_REPLACED + " " +  END;
@@ -133,14 +136,25 @@ public class IRNode {
     public static final String SCOPE_OBJECT = "(.*# ScObj.*" + END;
     public static final String MEMBAR = START + "MemBar" + MID + END;
 
+    public static final String ABS_I = START + "AbsI" + MID + END;
+    public static final String ABS_L = START + "AbsL" + MID + END;
+    public static final String ABS_F = START + "AbsF" + MID + END;
+    public static final String ABS_D = START + "AbsD" + MID + END;
     public static final String AND_I = START + "AndI" + MID + END;
     public static final String AND_L = START + "AndL" + MID + END;
+    public static final String XOR_I = START + "XorI" + MID + END;
+    public static final String XOR_L = START + "XorL" + MID + END;
     public static final String LSHIFT_I = START + "LShiftI" + MID + END;
     public static final String LSHIFT_L = START + "LShiftL" + MID + END;
     public static final String ADD_I = START + "AddI" + MID + END;
     public static final String ADD_L = START + "AddL" + MID + END;
+    public static final String ADD_VD = START + "AddVD" + MID + END;
     public static final String SUB_I = START + "SubI" + MID + END;
     public static final String SUB_L = START + "SubL" + MID + END;
+    public static final String SUB_F = START + "SubF" + MID + END;
+    public static final String SUB_D = START + "SubD" + MID + END;
+    public static final String MUL_I = START + "MulI" + MID + END;
+    public static final String MUL_L = START + "MulL" + MID + END;
     public static final String CONV_I2L = START + "ConvI2L" + MID + END;
 
     public static final String VECTOR_CAST_B2X = START + "VectorCastB2X" + MID + END;
diff --git a/test/hotspot/jtreg/compiler/loopopts/TestIterationSplitWithRegionHead.java b/test/hotspot/jtreg/compiler/loopopts/TestIterationSplitWithRegionHead.java
new file mode 100644
index 0000000000000000000000000000000000000000..7a29be60908949a710222cd7f3c635c6e5ed7346
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/loopopts/TestIterationSplitWithRegionHead.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2022, 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.compiler2.enabled
+ * @bug 8279837
+ * @summary Tests infinite loop with region head in iteration split.
+ * @run main/othervm -Xcomp -XX:-TieredCompilation
+ *      -XX:CompileCommand=compileonly,compiler.loopopts.TestIterationSplitWithRegionHead::test
+ *      -XX:CompileCommand=dontinline,compiler.loopopts.TestIterationSplitWithRegionHead::*
+ *      compiler.loopopts.TestIterationSplitWithRegionHead
+ */
+
+package compiler.loopopts;
+
+public class TestIterationSplitWithRegionHead {
+
+    static boolean flagFalse = false;
+
+    public static void main(String[] args) {
+        test();
+    }
+
+    public static void test() {
+        // 1) The loop tree is built. We find that nested loop N2 is an infinite loop and add a NeverBranch
+        // to the inner loop to make it reachable. But the current loop tree does not have N2, yet. The
+        // resulting loop tree is:
+        //
+        //   Loop: N0/N0  has_call has_sfpt
+        //     Loop: N77/N121  has_call // N1 outer
+        //       Loop: N77/N111  has_call sfpts={ 111 97 } // N1 inner
+        //
+        // 2) beautify_loops() finds that the outer loop head of N1 is shared and thus adds a new region
+        // in merge_many_backedges(). As a result, the loop tree is built again. This time, the NeverBranch
+        // in the inner loop of N2 allows that a loop tree can be built for it:
+        //
+        //   Loop: N0/N0  has_call has_sfpt
+        //     Loop: N216/N213  limit_check profile_predicated predicated has_call sfpts={ 111 97 } // N1 shared loop head
+        //     Loop: N196/N201  sfpts={ 201 } // N2 inner loop now discovered with the new NeverBranch
+        //
+        // However, a LoopNode is only added by beautify_loops() which won't be called until the next iteration of loop opts.
+        // This means that we have a Region node (N196) as head in the loop tree which cannot be handled by iteration_split_impl()
+        // resulting in an assertion failure.
+
+        // Nested loop N1
+        while (flagFalse) {
+            while (dontInlineFalse()) {
+            }
+        }
+        dontInlineFalse();
+
+        // Nested loop N2
+        while (flagFalse) {
+            while (true) ;  // Detected as infinite inner loop by C2 -> NeverBranch added
+        }
+    }
+
+    public static boolean dontInlineFalse() {
+        return false;
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/loopopts/TestSkeletonPredicateNegation.java b/test/hotspot/jtreg/compiler/loopopts/TestSkeletonPredicateNegation.java
index cbb82a07ea0ed8229b8938a2963c346b23835ad0..759503005840b306d23d7ff2875952f206808416 100644
--- a/test/hotspot/jtreg/compiler/loopopts/TestSkeletonPredicateNegation.java
+++ b/test/hotspot/jtreg/compiler/loopopts/TestSkeletonPredicateNegation.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2021 THL A29 Limited, a Tencent company. All rights reserved.
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022, 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
@@ -49,11 +49,11 @@ public class TestSkeletonPredicateNegation {
     }
 
     public void mainTest (String[] args){
-        long loa11[] = new long[1987];
+        long loa11[] = new long[19];
 
         for (long lo14 : loa11) {
             TestSkeletonPredicateNegation.in0 = -128;
-            for (int i18 = 0; i18 < 52; i18++) {
+            for (int i18 = 0; i18 < 13; i18++) {
                 try {
                     loa11[TestSkeletonPredicateNegation.in0] %= 2275269548L;
                     Math.ceil(1374905370.2785515599);
diff --git a/test/hotspot/jtreg/compiler/vectorapi/Test8278948.java b/test/hotspot/jtreg/compiler/vectorapi/Test8278948.java
new file mode 100644
index 0000000000000000000000000000000000000000..5218e10c4af6275bdafa725767f964e06046402c
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/vectorapi/Test8278948.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2022, 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 compiler.vectorapi;
+
+import java.util.Random;
+import jdk.incubator.vector.ByteVector;
+import jdk.incubator.vector.DoubleVector;
+import jdk.incubator.vector.ShortVector;
+import jdk.test.lib.Asserts;
+import jdk.test.lib.Utils;
+
+/*
+ * @test
+ * @bug 8278948
+ * @summary Intermediate integer promotion vector length encoding is calculated incorrectly on x86
+ * @modules jdk.incubator.vector
+ * @library /test/lib
+ * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-TieredCompilation -XX:CompileThreshold=100 -XX:UseAVX=1
+ *                   compiler.vectorapi.Test8278948
+ */
+public class Test8278948 {
+    static final int INVOCATIONS = 10000;
+
+    static final Random random = Utils.getRandomInstance();
+    static final byte[] BYTES = new byte[8];
+    static final short[] SHORTS = new short[4];
+    static final double[] DOUBLES = new double[4];
+
+
+    public static void main(String[] args) {
+        for (int i = 0; i < INVOCATIONS; i++) {
+            for (int j = 0; j < DOUBLES.length; j++) {
+                BYTES[j] = (byte)random.nextInt();
+            }
+            bytesToDoubles();
+            for (int j = 0; j < DOUBLES.length; j++) {
+                Asserts.assertEquals((double)BYTES[j], DOUBLES[j]);
+            }
+
+            for (int j = 0; j < DOUBLES.length; j++) {
+                SHORTS[j] = (short)random.nextInt();
+            }
+            shortsToDoubles();
+            for (int j = 0; j < DOUBLES.length; j++) {
+                Asserts.assertEquals((double)SHORTS[j], DOUBLES[j]);
+            }
+        }
+    }
+
+    static void bytesToDoubles() {
+        ((DoubleVector)ByteVector.fromArray(ByteVector.SPECIES_64, BYTES, 0)
+                .castShape(DoubleVector.SPECIES_256, 0))
+                .intoArray(DOUBLES, 0);
+    }
+
+    static void shortsToDoubles() {
+        ((DoubleVector)ShortVector.fromArray(ShortVector.SPECIES_64, SHORTS, 0)
+                .castShape(DoubleVector.SPECIES_256, 0))
+                .intoArray(DOUBLES, 0);
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/vectorapi/TestMaskedMacroLogicVector.java b/test/hotspot/jtreg/compiler/vectorapi/TestMaskedMacroLogicVector.java
new file mode 100644
index 0000000000000000000000000000000000000000..e5f2e34040d288e5abe6d4a544972ce6348da4ed
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/vectorapi/TestMaskedMacroLogicVector.java
@@ -0,0 +1,844 @@
+/*
+ * Copyright (c) 2022, 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 8273322
+ * @key randomness
+ * @summary Enhance macro logic optimization for masked logic operations.
+ * @modules jdk.incubator.vector
+ * @requires vm.compiler2.enabled
+ * @requires os.simpleArch == "x64"
+ * @library /test/lib /
+ * @run driver compiler.vectorapi.TestMaskedMacroLogicVector
+ */
+
+package compiler.vectorapi;
+
+import java.util.concurrent.Callable;
+import compiler.lib.ir_framework.*;
+import compiler.lib.ir_framework.driver.IRViolationException;
+import jdk.test.lib.Asserts;
+import jdk.test.lib.Asserts;
+import jdk.test.lib.Utils;
+import java.util.Random;
+
+import jdk.incubator.vector.*;
+
+public class TestMaskedMacroLogicVector {
+    boolean [] br;
+    boolean [] ba;
+    boolean [] bb;
+
+    short [] sr;
+    char  [] ca;
+    char  [] cb;
+
+    int [] r;
+    int [] a;
+    int [] b;
+    int [] c;
+    int [] d;
+    int [] e;
+    int [] f;
+
+    long [] rl;
+    long [] al;
+    long [] bl;
+    long [] cl;
+
+    boolean [] mask;
+
+    static boolean booleanFunc1(boolean a, boolean b) {
+        return a & b;
+    }
+
+    @Test
+    @IR(applyIf = {"UseAVX", "3"}, counts = {"MacroLogicV" , " > 0 "})
+    public void testSubWordBoolean(boolean[] r, boolean[] a, boolean[] b) {
+        for (int i = 0; i < r.length; i++) {
+            r[i] = booleanFunc1(a[i], b[i]);
+        }
+    }
+    public void verifySubWordBoolean(boolean[] r, boolean[] a, boolean[] b) {
+        for (int i = 0; i < r.length; i++) {
+            boolean expected = booleanFunc1(a[i], b[i]);
+            if (r[i] != expected) {
+                throw new AssertionError(
+                        String.format("at #%d: r=%b, expected = %b = booleanFunc1(%b,%b)",
+                                      i, r[i], expected, a[i], b[i]));
+            }
+        }
+    }
+
+
+    static short charFunc1(char a, char b) {
+        return (short)((a & b) & 1);
+    }
+
+    @Test
+    @IR(applyIf = {"UseAVX", "3"}, counts = {"MacroLogicV" , " > 0 "})
+    public void testSubWordChar(short[] r, char[] a, char[] b) {
+        for (int i = 0; i < r.length; i++) {
+            r[i] = charFunc1(a[i], b[i]);
+        }
+    }
+    public void verifySubWordChar(short[] r, char[] a, char[] b) {
+        for (int i = 0; i < r.length; i++) {
+            short expected = charFunc1(a[i], b[i]);
+            if (r[i] != expected) {
+                throw new AssertionError(
+                        String.format("testSubWordChar: at #%d: r=%d, expected = %d = booleanFunc1(%d,%d)",
+                                      i, r[i], expected, (int)a[i], (int)b[i]));
+            }
+        }
+    }
+
+    // Case 1): Unmasked expression tree.
+    //        P_LOP
+    //   L_LOP     R_LOP
+
+    static int intFunc1(int a, int b, int c) {
+        return (a & b) ^ (a & c);
+    }
+
+    @ForceInline
+    public void testInt1Kernel(VectorSpecies SPECIES, int [] r, int [] a, int [] b, int [] c) {
+        for (int i = 0; i < SPECIES.loopBound(r.length); i += SPECIES.length()) {
+            IntVector va = IntVector.fromArray(SPECIES, a, i);
+            IntVector vb = IntVector.fromArray(SPECIES, b, i);
+            IntVector vc = IntVector.fromArray(SPECIES, c, i);
+            va.lanewise(VectorOperators.AND, vc)
+            .lanewise(VectorOperators.XOR, va.lanewise(VectorOperators.AND, vb))
+            .intoArray(r, i);
+        }
+    }
+
+    @Test
+    @IR(applyIf = {"UseAVX", "3"}, counts = {"MacroLogicV", " > 0 "})
+    public void testInt1_Int128(int[] r, int[] a, int[] b, int[] c) {
+        testInt1Kernel(IntVector.SPECIES_128, r, a, b, c);
+    }
+
+    @Test
+    @IR(applyIf = {"UseAVX", "3"}, counts = {"MacroLogicV", " > 0 "})
+    public void testInt1_Int256(int[] r, int[] a, int[] b, int[] c) {
+        testInt1Kernel(IntVector.SPECIES_256, r, a, b, c);
+    }
+
+    @Test
+    @IR(applyIf = {"UseAVX", "3"}, counts = {"MacroLogicV", " > 0 "})
+    public void testInt1_Int512(int[] r, int[] a, int[] b, int[] c) {
+        testInt1Kernel(IntVector.SPECIES_512, r, a, b, c);
+    }
+
+    public void verifyInt1(int[] r, int[] a, int[] b, int[] c) {
+        for (int i = 0; i < r.length; i++) {
+            int expected = intFunc1(a[i], b[i], c[i]);
+            if (r[i] != expected) {
+                throw new AssertionError(String.format("testInt1: at #%d: r=%d, expected = %d = intFunc1(%d,%d,%d)",
+                                                       i, r[i], expected, a[i], b[i], c[i]));
+            }
+        }
+    }
+
+    // Case 2): Only right child is masked.
+    //        P_LOP
+    //   L_LOP    R_LOP(mask)
+
+    static int intFunc2(int a, int b, int c, boolean mask) {
+        return (a & b) ^ (mask == true ? a & c : a);
+    }
+
+    @ForceInline
+    public void testInt2Kernel(VectorSpecies SPECIES, int[] r, int[] a, int[] b, int[] c, boolean [] mask) {
+        for (int i = 0; i < SPECIES.loopBound(r.length); i += SPECIES.length()) {
+            VectorMask vmask = VectorMask.fromArray(SPECIES, mask , i);
+            IntVector va = IntVector.fromArray(SPECIES, a, i);
+            IntVector vb = IntVector.fromArray(SPECIES, b, i);
+            IntVector vc = IntVector.fromArray(SPECIES, c, i);
+            va.lanewise(VectorOperators.AND, vb)
+            .lanewise(VectorOperators.XOR,
+                      va.lanewise(VectorOperators.AND, vc, vmask))
+           .intoArray(r, i);
+        }
+    }
+
+    @Test
+    @IR(applyIf = {"UseAVX", "3"}, counts = {"MacroLogicV", " > 0 "})
+    public void testInt2_Int128(int[] r, int[] a, int[] b, int[] c, boolean [] mask) {
+        testInt2Kernel(IntVector.SPECIES_128, r, a, b, c, mask);
+    }
+    @Test
+    @IR(applyIf = {"UseAVX", "3"}, counts = {"MacroLogicV", " > 0 "})
+    public void testInt2_Int256(int[] r, int[] a, int[] b, int[] c, boolean [] mask) {
+        testInt2Kernel(IntVector.SPECIES_256, r, a, b, c, mask);
+    }
+    @Test
+    @IR(applyIf = {"UseAVX", "3"}, counts = {"MacroLogicV", " > 0 "})
+    public void testInt2_Int512(int[] r, int[] a, int[] b, int[] c, boolean [] mask) {
+        testInt2Kernel(IntVector.SPECIES_512, r, a, b, c, mask);
+    }
+
+    public void verifyInt2(int[] r, int[] a, int[] b, int[] c, boolean [] mask) {
+        for (int i = 0; i < r.length; i++) {
+            int expected = intFunc2(a[i], b[i], c[i], mask[i]);
+            if (r[i] != expected) {
+                throw new AssertionError(String.format("testInt2: at #%d: r=%d, expected = %d = intFunc2(%d,%d,%d,%b)",
+                                                       i, r[i], expected, a[i], b[i], c[i], mask[i]));
+            }
+        }
+    }
+
+    // Case 3): Only left child is masked.
+    //             P_LOP
+    //   L_LOP(mask)    R_LOP
+
+    static int intFunc3(int a, int b, int c, boolean mask) {
+        return (mask == true ? a & b : a) ^ (a & c);
+    }
+
+    @ForceInline
+    public void testInt3Kernel(VectorSpecies SPECIES, int[] r, int[] a, int[] b, int[] c, boolean [] mask) {
+        for (int i = 0; i < SPECIES.loopBound(r.length); i += SPECIES.length()) {
+            VectorMask vmask = VectorMask.fromArray(SPECIES, mask , i);
+            IntVector va = IntVector.fromArray(SPECIES, a, i);
+            IntVector vb = IntVector.fromArray(SPECIES, b, i);
+            IntVector vc = IntVector.fromArray(SPECIES, c, i);
+            va.lanewise(VectorOperators.AND, vb, vmask)
+            .lanewise(VectorOperators.XOR,
+                      va.lanewise(VectorOperators.AND, vc))
+           .intoArray(r, i);
+        }
+    }
+
+    @Test
+    @IR(applyIf = {"UseAVX", "3"}, counts = {"MacroLogicV", " > 0 "})
+    public void testInt3_Int128(int[] r, int[] a, int[] b, int[] c, boolean [] mask) {
+        testInt3Kernel(IntVector.SPECIES_128, r, a, b, c, mask);
+    }
+    @Test
+    @IR(applyIf = {"UseAVX", "3"}, counts = {"MacroLogicV", " > 0 "})
+    public void testInt3_Int256(int[] r, int[] a, int[] b, int[] c, boolean [] mask) {
+        testInt3Kernel(IntVector.SPECIES_256, r, a, b, c, mask);
+    }
+    @Test
+    @IR(applyIf = {"UseAVX", "3"}, counts = {"MacroLogicV", " > 0 "})
+    public void testInt3_Int512(int[] r, int[] a, int[] b, int[] c, boolean [] mask) {
+        testInt3Kernel(IntVector.SPECIES_512, r, a, b, c, mask);
+    }
+
+
+    @ForceInline
+    public void verifyInt3(int[] r, int[] a, int[] b, int[] c, boolean [] mask) {
+        for (int i = 0; i < r.length; i++) {
+            int expected = intFunc3(a[i], b[i], c[i], mask[i]);
+            if (r[i] != expected) {
+                throw new AssertionError(String.format("testInt3: at #%d: r=%d, expected = %d = intFunc3(%d,%d,%d,%b)",
+                                                       i, r[i], expected, a[i], b[i], c[i], mask[i]));
+            }
+        }
+    }
+
+    // Case 4): Both child nodes are masked.
+    //             P_LOP
+    //   L_LOP(mask)    R_LOP(mask)
+
+    static int intFunc4(int a, int b, int c, boolean mask) {
+        return (mask == true ? b & a : b) ^ (mask == true ? c & a : c);
+    }
+
+    @ForceInline
+    public void testInt4Kernel(VectorSpecies SPECIES, int[] r, int[] a, int[] b, int[] c, boolean [] mask) {
+        for (int i = 0; i < SPECIES.loopBound(r.length); i += SPECIES.length()) {
+            VectorMask vmask = VectorMask.fromArray(SPECIES, mask , i);
+            IntVector va = IntVector.fromArray(SPECIES, a, i);
+            IntVector vb = IntVector.fromArray(SPECIES, b, i);
+            IntVector vc = IntVector.fromArray(SPECIES, c, i);
+            vb.lanewise(VectorOperators.AND, va, vmask)
+            .lanewise(VectorOperators.XOR,
+                      vc.lanewise(VectorOperators.AND, va, vmask))
+           .intoArray(r, i);
+        }
+    }
+
+    @Test
+    @IR(applyIf = {"UseAVX", "3"}, counts = {"AndV", " > 0 ", "XorV", " > 0 "})
+    public void testInt4_Int128(int[] r, int[] a, int[] b, int[] c, boolean [] mask) {
+        testInt4Kernel(IntVector.SPECIES_128, r, a, b, c, mask);
+    }
+    @Test
+    @IR(applyIf = {"UseAVX", "3"}, counts = {"AndV", " > 0 ", "XorV", " > 0 "})
+    public void testInt4_Int256(int[] r, int[] a, int[] b, int[] c, boolean [] mask) {
+        testInt4Kernel(IntVector.SPECIES_256, r, a, b, c, mask);
+    }
+    @Test
+    @IR(applyIf = {"UseAVX", "3"}, counts = {"AndV", " > 0 ", "XorV", " > 0 "})
+    public void testInt4_Int512(int[] r, int[] a, int[] b, int[] c, boolean [] mask) {
+        testInt4Kernel(IntVector.SPECIES_512, r, a, b, c, mask);
+    }
+
+    public void verifyInt4(int[] r, int[] a, int[] b, int[] c, boolean [] mask) {
+        for (int i = 0; i < r.length; i++) {
+            int expected = intFunc4(a[i], b[i], c[i], mask[i]);
+            if (r[i] != expected) {
+                throw new AssertionError(String.format("testInt4: at #%d: r=%d, expected = %d = intFunc4(%d,%d,%d,%b)",
+                                                       i, r[i], expected, a[i], b[i], c[i], mask[i]));
+            }
+        }
+    }
+
+    // Case 5): Parent is masked with unmasked child expressions.
+    //        P_LOP(mask)
+    //   L_LOP     R_LOP
+
+    static int intFunc5(int a, int b, int c, boolean mask) {
+        return mask == true ? ((a & b) ^ (a & c)) : (a & b);
+    }
+
+    @ForceInline
+    public void testInt5Kernel(VectorSpecies SPECIES, int[] r, int[] a, int[] b, int[] c, boolean [] mask) {
+        for (int i = 0; i < SPECIES.loopBound(r.length); i += SPECIES.length()) {
+            VectorMask vmask = VectorMask.fromArray(SPECIES, mask , i);
+            IntVector va = IntVector.fromArray(SPECIES, a, i);
+            IntVector vb = IntVector.fromArray(SPECIES, b, i);
+            IntVector vc = IntVector.fromArray(SPECIES, c, i);
+            va.lanewise(VectorOperators.AND, vb)
+            .lanewise(VectorOperators.XOR,
+                      va.lanewise(VectorOperators.AND, vc), vmask)
+           .intoArray(r, i);
+        }
+    }
+
+    @Test
+    @IR(applyIf = {"UseAVX", "3"}, counts = {"MacroLogicV", " > 0 "})
+    public void testInt5_Int128(int[] r, int[] a, int[] b, int[] c, boolean [] mask) {
+        testInt5Kernel(IntVector.SPECIES_128, r, a, b, c, mask);
+    }
+    @Test
+    @IR(applyIf = {"UseAVX", "3"}, counts = {"MacroLogicV", " > 0 "})
+    public void testInt5_Int256(int[] r, int[] a, int[] b, int[] c, boolean [] mask) {
+        testInt5Kernel(IntVector.SPECIES_256, r, a, b, c, mask);
+    }
+    @Test
+    @IR(applyIf = {"UseAVX", "3"}, counts = {"MacroLogicV", " > 0 "})
+    public void testInt5_Int512(int[] r, int[] a, int[] b, int[] c, boolean [] mask) {
+        testInt5Kernel(IntVector.SPECIES_512, r, a, b, c, mask);
+    }
+
+    @ForceInline
+    public void verifyInt5(int[] r, int[] a, int[] b, int[] c, boolean [] mask) {
+        for (int i = 0; i < r.length; i++) {
+            int expected = intFunc5(a[i], b[i], c[i], mask[i]);
+            if (r[i] != expected) {
+                throw new AssertionError(String.format("testInt5: at #%d: r=%d, expected = %d = intFunc5(%d,%d,%d,%b)",
+                                                       i, r[i], expected, a[i], b[i], c[i], mask[i]));
+            }
+        }
+    }
+
+    // Case 6): Parent and right child are masked.
+    //        P_LOP(mask)
+    //   L_LOP     R_LOP(mask)
+
+    static int intFunc6(int a, int b, int c, boolean mask) {
+        return mask == true ? ((a & b) ^ (mask == true ? a & c : a)) : (a & b);
+    }
+
+    @ForceInline
+    public void testInt6Kernel(VectorSpecies SPECIES, int[] r, int[] a, int[] b, int[] c, boolean [] mask) {
+        for (int i = 0; i < SPECIES.loopBound(r.length); i += SPECIES.length()) {
+            VectorMask vmask = VectorMask.fromArray(SPECIES, mask , i);
+            IntVector va = IntVector.fromArray(SPECIES, a, i);
+            IntVector vb = IntVector.fromArray(SPECIES, b, i);
+            IntVector vc = IntVector.fromArray(SPECIES, c, i);
+            va.lanewise(VectorOperators.AND, vb)
+            .lanewise(VectorOperators.XOR,
+                      va.lanewise(VectorOperators.AND, vc, vmask), vmask)
+           .intoArray(r, i);
+        }
+    }
+    @Test
+    @IR(applyIf = {"UseAVX", "3"}, counts = {"MacroLogicV", " > 0 "})
+    public void testInt6_Int128(int[] r, int[] a, int[] b, int[] c, boolean [] mask) {
+        testInt6Kernel(IntVector.SPECIES_128, r, a, b, c, mask);
+    }
+    @Test
+    @IR(applyIf = {"UseAVX", "3"}, counts = {"MacroLogicV", " > 0 "})
+    public void testInt6_Int256(int[] r, int[] a, int[] b, int[] c, boolean [] mask) {
+        testInt6Kernel(IntVector.SPECIES_256, r, a, b, c, mask);
+    }
+    @Test
+    @IR(applyIf = {"UseAVX", "3"}, counts = {"MacroLogicV", " > 0 "})
+    public void testInt6_Int512(int[] r, int[] a, int[] b, int[] c, boolean [] mask) {
+        testInt6Kernel(IntVector.SPECIES_512, r, a, b, c, mask);
+    }
+
+
+    public void verifyInt6(int[] r, int[] a, int[] b, int[] c, boolean [] mask) {
+        for (int i = 0; i < r.length; i++) {
+            int expected = intFunc6(a[i], b[i], c[i], mask[i]);
+            if (r[i] != expected) {
+                throw new AssertionError(String.format("testInt6: at #%d: r=%d, expected = %d = intFunc6(%d,%d,%d,%b)",
+                                                       i, r[i], expected, a[i], b[i], c[i], mask[i]));
+            }
+        }
+    }
+
+    // Case 7): Parent and left child are masked.
+    //            P_LOP(mask)
+    //   L_LOP(mask)       R_LOP
+
+    static int intFunc7(int a, int b, int c, boolean mask) {
+        return mask == true ? ((mask == true ? a & b : a) ^ (a & c)) : a;
+    }
+
+    @ForceInline
+    public void testInt7Kernel(VectorSpecies SPECIES, int[] r, int[] a, int[] b, int[] c, boolean [] mask) {
+        for (int i = 0; i < SPECIES.loopBound(r.length); i += SPECIES.length()) {
+            VectorMask vmask = VectorMask.fromArray(SPECIES, mask , i);
+            IntVector va = IntVector.fromArray(SPECIES, a, i);
+            IntVector vb = IntVector.fromArray(SPECIES, b, i);
+            IntVector vc = IntVector.fromArray(SPECIES, c, i);
+            va.lanewise(VectorOperators.AND, vb, vmask)
+            .lanewise(VectorOperators.XOR,
+                      va.lanewise(VectorOperators.AND, vc), vmask)
+           .intoArray(r, i);
+        }
+    }
+
+    @Test
+    @IR(applyIf = {"UseAVX", "3"}, counts = {"MacroLogicV", " > 0 "})
+    public void testInt7_Int128(int[] r, int[] a, int[] b, int[] c, boolean [] mask) {
+        testInt7Kernel(IntVector.SPECIES_128, r, a, b, c, mask);
+    }
+    @Test
+    @IR(applyIf = {"UseAVX", "3"}, counts = {"MacroLogicV", " > 0 "})
+    public void testInt7_Int256(int[] r, int[] a, int[] b, int[] c, boolean [] mask) {
+        testInt7Kernel(IntVector.SPECIES_256, r, a, b, c, mask);
+    }
+    @Test
+    @IR(applyIf = {"UseAVX", "3"}, counts = {"MacroLogicV", " > 0 "})
+    public void testInt7_Int512(int[] r, int[] a, int[] b, int[] c, boolean [] mask) {
+        testInt7Kernel(IntVector.SPECIES_512, r, a, b, c, mask);
+    }
+
+    public void verifyInt7(int[] r, int[] a, int[] b, int[] c, boolean [] mask) {
+        for (int i = 0; i < r.length; i++) {
+            int expected = intFunc7(a[i], b[i], c[i], mask[i]);
+            if (r[i] != expected) {
+                throw new AssertionError(String.format("testInt7: at #%d: r=%d, expected = %d = intFunc7(%d,%d,%d,%b)",
+                                                       i, r[i], expected, a[i], b[i], c[i], mask[i]));
+            }
+        }
+    }
+
+    // Case 8): Parent and both child expressions are masked.
+    //            P_LOP(mask)
+    //   L_LOP(mask)       R_LOP (mask)
+
+    static int intFunc8(int a, int b, int c, boolean mask) {
+        return mask == true ? ((mask == true ? b & a : b) ^ (mask == true ? c & a  : c)) : b;
+    }
+
+    @ForceInline
+    public void testInt8Kernel(VectorSpecies SPECIES, int[] r, int[] a, int[] b, int[] c, boolean [] mask) {
+        for (int i = 0; i < SPECIES.loopBound(r.length); i += SPECIES.length()) {
+            VectorMask vmask = VectorMask.fromArray(SPECIES, mask , i);
+            IntVector va = IntVector.fromArray(SPECIES, a, i);
+            IntVector vb = IntVector.fromArray(SPECIES, b, i);
+            IntVector vc = IntVector.fromArray(SPECIES, c, i);
+            vb.lanewise(VectorOperators.AND, va, vmask)
+            .lanewise(VectorOperators.XOR,
+                      vc.lanewise(VectorOperators.AND, va, vmask), vmask)
+           .intoArray(r, i);
+        }
+    }
+
+    @Test
+    @IR(applyIf = {"UseAVX", "3"}, counts = {"MacroLogicV", " > 0 "})
+    public void testInt8_Int128(int[] r, int[] a, int[] b, int[] c, boolean [] mask) {
+        testInt8Kernel(IntVector.SPECIES_128, r, a, b, c, mask);
+    }
+    @Test
+    @IR(applyIf = {"UseAVX", "3"}, counts = {"MacroLogicV", " > 0 "})
+    public void testInt8_Int256(int[] r, int[] a, int[] b, int[] c, boolean [] mask) {
+        testInt8Kernel(IntVector.SPECIES_256, r, a, b, c, mask);
+    }
+    @Test
+    @IR(applyIf = {"UseAVX", "3"}, counts = {"MacroLogicV", " > 0 "})
+    public void testInt8_Int512(int[] r, int[] a, int[] b, int[] c, boolean [] mask) {
+        testInt8Kernel(IntVector.SPECIES_512, r, a, b, c, mask);
+    }
+
+    public void verifyInt8(int[] r, int[] a, int[] b, int[] c, boolean [] mask) {
+        for (int i = 0; i < r.length; i++) {
+            int expected = intFunc8(a[i], b[i], c[i], mask[i]);
+            if (r[i] != expected) {
+                throw new AssertionError(String.format("testInt8: at #%d: r=%d, expected = %d = intFunc8(%d,%d,%d,%b)",
+                                                       i, r[i], expected, a[i], b[i], c[i], mask[i]));
+            }
+        }
+    }
+
+
+    // ===================================================== //
+
+    static long longFunc(long a, long b, long c) {
+        long v1 = (a & b) ^ (a & c) ^ (b & c);
+        long v2 = (~a & b) | (~b & c) | (~c & a);
+        return v1 & v2;
+    }
+
+    @ForceInline
+    public void testLongKernel(VectorSpecies SPECIES, long[] r, long[] a, long[] b, long[] c) {
+        for (int i = 0; i < SPECIES.loopBound(r.length); i  +=  SPECIES.length()) {
+            LongVector va = LongVector.fromArray(SPECIES, a, i);
+            LongVector vb = LongVector.fromArray(SPECIES, b, i);
+            LongVector vc = LongVector.fromArray(SPECIES, c, i);
+
+            va.lanewise(VectorOperators.AND, vb)
+            .lanewise(VectorOperators.XOR, va.lanewise(VectorOperators.AND, vc))
+            .lanewise(VectorOperators.XOR, vb.lanewise(VectorOperators.AND, vc))
+            .lanewise(VectorOperators.AND,
+                       va.lanewise(VectorOperators.NOT).lanewise(VectorOperators.AND, vb)
+                      .lanewise(VectorOperators.OR, vb.lanewise(VectorOperators.NOT).lanewise(VectorOperators.AND, vc))
+                      .lanewise(VectorOperators.OR, vc.lanewise(VectorOperators.NOT).lanewise(VectorOperators.AND, va)))
+            .intoArray(r, i);
+        }
+    }
+
+    @Test
+    @IR(applyIf = {"UseAVX", "3"}, counts = {"MacroLogicV", " > 0 "})
+    public void testLong_Long256(long[] r, long[] a, long[] b, long[] c) {
+        testLongKernel(LongVector.SPECIES_256, r, a, b, c);
+    }
+    @Test
+    @IR(applyIf = {"UseAVX", "3"}, counts = {"MacroLogicV", " > 0 "})
+    public void testLong_Long512(long[] r, long[] a, long[] b, long[] c) {
+        testLongKernel(LongVector.SPECIES_512, r, a, b, c);
+    }
+
+    public void verifyLong(long[] r, long[] a, long[] b, long[] c) {
+        for (int i = 0; i < r.length; i++) {
+            long expected = longFunc(a[i], b[i], c[i]);
+            if (r[i] != expected) {
+                throw new AssertionError(
+                        String.format("testLong: at #%d: r=%d, expected = %d = longFunc(%d,%d,%d)",
+                                      i, r[i], expected, a[i], b[i], c[i]));
+            }
+        }
+    }
+
+    // ===================================================== //
+
+    private static final Random R = Utils.getRandomInstance();
+
+    static boolean[] fillBooleanRandom(Callable factory) {
+        try {
+            boolean[] arr = factory.call();
+            for (int i = 0; i < arr.length; i++) {
+                arr[i] = R.nextBoolean();
+            }
+            return arr;
+        } catch (Exception e) {
+            throw new InternalError(e);
+        }
+    }
+    static char[] fillCharRandom(Callable factory) {
+        try {
+            char[] arr = factory.call();
+            for (int i = 0; i < arr.length; i++) {
+                arr[i] = (char)R.nextInt();
+            }
+            return arr;
+        } catch (Exception e) {
+            throw new InternalError(e);
+        }
+    }
+    static int[] fillIntRandom(Callable factory) {
+        try {
+            int[] arr = factory.call();
+            for (int i = 0; i < arr.length; i++) {
+                arr[i] = R.nextInt();
+            }
+            return arr;
+        } catch (Exception e) {
+            throw new InternalError(e);
+        }
+    }
+    static long[] fillLongRandom(Callable factory) {
+        try {
+            long[] arr = factory.call();
+            for (int i = 0; i < arr.length; i++) {
+                arr[i] = R.nextLong();
+            }
+            return arr;
+        } catch (Exception e) {
+            throw new InternalError(e);
+        }
+    }
+
+    // ===================================================== //
+
+    static final int SIZE = 512;
+
+    @Run(test = {"testInt4_Int128"}, mode = RunMode.STANDALONE)
+    public void kernel_testInt4_Int128() {
+        for (int i = 0; i < 10000; i++) {
+            testInt4_Int128(r, a, b, c, mask);
+            verifyInt4(r, a, b, c, mask);
+        }
+    }
+    @Run(test = {"testInt4_Int256"}, mode = RunMode.STANDALONE)
+    public void kernel_testInt4_Int256() {
+        for (int i = 0; i < 10000; i++) {
+            testInt4_Int256(r, a, b, c, mask);
+            verifyInt4(r, a, b, c, mask);
+        }
+    }
+    @Run(test = {"testInt4_Int512"}, mode = RunMode.STANDALONE)
+    public void kernel_testInt4_Int512() {
+        for (int i = 0; i < 10000; i++) {
+            testInt4_Int512(r, a, b, c, mask);
+            verifyInt4(r, a, b, c, mask);
+        }
+    }
+
+    @Run(test = {"testSubWordBoolean"}, mode = RunMode.STANDALONE)
+    public void kernel_test_SubWordBoolean() {
+        for (int i = 0; i < 10000; i++) {
+            testSubWordBoolean(br, ba, bb);
+            verifySubWordBoolean(br, ba, bb);
+        }
+    }
+
+    @Run(test = {"testSubWordChar"}, mode = RunMode.STANDALONE)
+    public void kernel_test_SubWordChar() {
+        for (int i = 0; i < 10000; i++) {
+            testSubWordChar(sr, ca, cb);
+            verifySubWordChar(sr, ca, cb);
+        }
+    }
+
+    @Run(test = {"testInt1_Int128"}, mode = RunMode.STANDALONE)
+    public void kernel_testInt1_Int128() {
+        for (int i = 0; i < 10000; i++) {
+            testInt1_Int128(r, a, b, c);
+            verifyInt1(r, a, b, c);
+        }
+    }
+    @Run(test = {"testInt1_Int256"}, mode = RunMode.STANDALONE)
+    public void kernel_testInt1_Int256() {
+        for (int i = 0; i < 10000; i++) {
+            testInt1_Int256(r, a, b, c);
+            verifyInt1(r, a, b, c);
+        }
+    }
+    @Run(test = {"testInt1_Int512"}, mode = RunMode.STANDALONE)
+    public void kernel_testInt1_Int512() {
+        for (int i = 0; i < 10000; i++) {
+            testInt1_Int512(r, a, b, c);
+            verifyInt1(r, a, b, c);
+        }
+    }
+
+    @Run(test = {"testInt2_Int128"}, mode = RunMode.STANDALONE)
+    public void kernel_testInt2_Int128() {
+        for (int i = 0; i < 10000; i++) {
+            testInt2_Int128(r, a, b, c, mask);
+            verifyInt2(r, a, b, c, mask);
+        }
+    }
+    @Run(test = {"testInt2_Int256"}, mode = RunMode.STANDALONE)
+    public void kernel_testInt2_Int256() {
+        for (int i = 0; i < 10000; i++) {
+            testInt2_Int256(r, a, b, c, mask);
+            verifyInt2(r, a, b, c, mask);
+        }
+    }
+    @Run(test = {"testInt2_Int512"}, mode = RunMode.STANDALONE)
+    public void kernel_testInt2_Int512() {
+        for (int i = 0; i < 10000; i++) {
+            testInt2_Int512(r, a, b, c, mask);
+            verifyInt2(r, a, b, c, mask);
+        }
+    }
+
+    @Run(test = {"testInt3_Int128"}, mode = RunMode.STANDALONE)
+    public void kernel_testInt3_Int128() {
+        for (int i = 0; i < 10000; i++) {
+            testInt3_Int128(r, a, b, c, mask);
+            verifyInt3(r, a, b, c, mask);
+        }
+    }
+    @Run(test = {"testInt3_Int256"}, mode = RunMode.STANDALONE)
+    public void kernel_testInt3_Int256() {
+        for (int i = 0; i < 10000; i++) {
+            testInt3_Int256(r, a, b, c, mask);
+            verifyInt3(r, a, b, c, mask);
+        }
+    }
+    @Run(test = {"testInt3_Int512"}, mode = RunMode.STANDALONE)
+    public void kernel_testInt3_Int512() {
+        for (int i = 0; i < 10000; i++) {
+            testInt3_Int512(r, a, b, c, mask);
+            verifyInt3(r, a, b, c, mask);
+        }
+    }
+
+    @Run(test = {"testInt5_Int128"}, mode = RunMode.STANDALONE)
+    public void kernel_testInt5_128() {
+        for (int i = 0; i < 10000; i++) {
+            testInt5_Int128(r, a, b, c, mask);
+            verifyInt5(r, a, b, c, mask);
+        }
+    }
+    @Run(test = {"testInt5_Int256"}, mode = RunMode.STANDALONE)
+    public void kernel_testInt5_256() {
+        for (int i = 0; i < 10000; i++) {
+            testInt5_Int256(r, a, b, c, mask);
+            verifyInt5(r, a, b, c, mask);
+        }
+    }
+    @Run(test = {"testInt5_Int512"}, mode = RunMode.STANDALONE)
+    public void kernel_testInt5_Int512() {
+        for (int i = 0; i < 10000; i++) {
+            testInt5_Int512(r, a, b, c, mask);
+            verifyInt5(r, a, b, c, mask);
+        }
+    }
+
+    @Run(test = {"testInt6_Int128"}, mode = RunMode.STANDALONE)
+    public void kernel_testInt6_Int128() {
+        for (int i = 0; i < 10000; i++) {
+            testInt6_Int128(r, a, b, c, mask);
+            verifyInt6(r, a, b, c, mask);
+        }
+    }
+    @Run(test = {"testInt6_Int256"}, mode = RunMode.STANDALONE)
+    public void kernel_testInt6_Int256() {
+        for (int i = 0; i < 10000; i++) {
+            testInt6_Int256(r, a, b, c, mask);
+            verifyInt6(r, a, b, c, mask);
+        }
+    }
+    @Run(test = {"testInt6_Int512"}, mode = RunMode.STANDALONE)
+    public void kernel_testInt6_Int512() {
+        for (int i = 0; i < 10000; i++) {
+            testInt6_Int512(r, a, b, c, mask);
+            verifyInt6(r, a, b, c, mask);
+        }
+    }
+
+    @Run(test = {"testInt7_Int128"}, mode = RunMode.STANDALONE)
+    public void kernel_testInt7_Int128() {
+        for (int i = 0; i < 10000; i++) {
+            testInt7_Int128(r, a, b, c, mask);
+            verifyInt7(r, a, b, c, mask);
+        }
+    }
+    @Run(test = {"testInt7_Int256"}, mode = RunMode.STANDALONE)
+    public void kernel_testInt7_Int256() {
+        for (int i = 0; i < 10000; i++) {
+            testInt7_Int256(r, a, b, c, mask);
+            verifyInt7(r, a, b, c, mask);
+        }
+    }
+    @Run(test = {"testInt7_Int512"}, mode = RunMode.STANDALONE)
+    public void kernel_testInt7_Int512() {
+        for (int i = 0; i < 10000; i++) {
+            testInt7_Int512(r, a, b, c, mask);
+            verifyInt7(r, a, b, c, mask);
+        }
+    }
+
+    @Run(test = {"testInt8_Int128"}, mode = RunMode.STANDALONE)
+    public void kernel_testInt8_Int128() {
+        for (int i = 0; i < 10000; i++) {
+            testInt8_Int128(r, a, b, c, mask);
+            verifyInt8(r, a, b, c, mask);
+        }
+    }
+    @Run(test = {"testInt8_Int256"}, mode = RunMode.STANDALONE)
+    public void kernel_testInt8_Int256() {
+        for (int i = 0; i < 10000; i++) {
+            testInt8_Int256(r, a, b, c, mask);
+            verifyInt8(r, a, b, c, mask);
+        }
+    }
+    @Run(test = {"testInt8_Int512"}, mode = RunMode.STANDALONE)
+    public void kernel_testInt8_Int512() {
+        for (int i = 0; i < 10000; i++) {
+            testInt8_Int512(r, a, b, c, mask);
+            verifyInt8(r, a, b, c, mask);
+        }
+    }
+
+    @Run(test = {"testLong_Long256"}, mode = RunMode.STANDALONE)
+    public void kernel_testLong_Long256() {
+        for (int i = 0; i < 10000; i++) {
+            testLong_Long256(rl, al, bl, cl);
+            verifyLong(rl, al, bl, cl);
+        }
+    }
+    @Run(test = {"testLong_Long512"}, mode = RunMode.STANDALONE)
+    public void kernel_testLong_Long512() {
+        for (int i = 0; i < 10000; i++) {
+            testLong_Long512(rl, al, bl, cl);
+            verifyLong(rl, al, bl, cl);
+        }
+    }
+
+    public TestMaskedMacroLogicVector() {
+        br = new boolean[SIZE];
+        ba = fillBooleanRandom((()-> new boolean[SIZE]));
+        bb = fillBooleanRandom((()-> new boolean[SIZE]));
+
+        sr = new short[SIZE];
+        ca = fillCharRandom((()-> new char[SIZE]));
+        cb = fillCharRandom((()-> new char[SIZE]));
+
+        r = new int[SIZE];
+        a = fillIntRandom(()-> new int[SIZE]);
+        b = fillIntRandom(()-> new int[SIZE]);
+        c = fillIntRandom(()-> new int[SIZE]);
+        d = fillIntRandom(()-> new int[SIZE]);
+        e = fillIntRandom(()-> new int[SIZE]);
+        f = fillIntRandom(()-> new int[SIZE]);
+
+        rl = new long[SIZE];
+        al = fillLongRandom(() -> new long[SIZE]);
+        bl = fillLongRandom(() -> new long[SIZE]);
+        cl = fillLongRandom(() -> new long[SIZE]);
+
+        mask = fillBooleanRandom((()-> new boolean[SIZE]));
+    }
+
+    public static void main(String[] args) {
+        TestFramework.runWithFlags("-XX:-TieredCompilation",
+                                   "-XX:UseAVX=3",
+                                   "--add-modules=jdk.incubator.vector",
+                                   "-XX:CompileThresholdScaling=0.3");
+    }
+}
diff --git a/test/hotspot/jtreg/compiler/vectorapi/reshape/utils/TestCastMethods.java b/test/hotspot/jtreg/compiler/vectorapi/reshape/utils/TestCastMethods.java
index d6a4c6cdd19eca0753ca7b962fe25d2227bd0c89..4bf1c9799f17bd70edba5c5c68b38aeda6a75f18 100644
--- a/test/hotspot/jtreg/compiler/vectorapi/reshape/utils/TestCastMethods.java
+++ b/test/hotspot/jtreg/compiler/vectorapi/reshape/utils/TestCastMethods.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022, 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
@@ -30,8 +30,7 @@ import static compiler.vectorapi.reshape.utils.VectorReshapeHelper.*;
 import static compiler.vectorapi.reshape.utils.VectorSpeciesPair.makePair;
 
 /**
- * The cast intrinsics implemented on each platform, commented out tests are the ones that are
- * supposed to work but currently don't.
+ * The cast intrinsics implemented on each platform.
  */
 public class TestCastMethods {
     public static final List AVX1_CAST_TESTS = List.of(
@@ -39,7 +38,7 @@ public class TestCastMethods {
             makePair(BSPEC64, SSPEC128),
             makePair(BSPEC64, ISPEC128),
             makePair(BSPEC64, FSPEC128),
-//            makePair(BSPEC64, DSPEC256),
+            makePair(BSPEC64, DSPEC256),
             makePair(SSPEC64, BSPEC64),
             makePair(SSPEC128, BSPEC64),
             makePair(SSPEC64, ISPEC64),
@@ -48,7 +47,7 @@ public class TestCastMethods {
             makePair(SSPEC64, FSPEC64),
             makePair(SSPEC64, FSPEC128),
             makePair(SSPEC64, DSPEC128),
-//            makePair(SSPEC64, DSPEC256),
+            makePair(SSPEC64, DSPEC256),
             makePair(ISPEC128, BSPEC64),
             makePair(ISPEC64, SSPEC64),
             makePair(ISPEC128, SSPEC64),
diff --git a/test/hotspot/jtreg/compiler/vectorization/TestPopCountVectorLong.java b/test/hotspot/jtreg/compiler/vectorization/TestPopCountVectorLong.java
new file mode 100644
index 0000000000000000000000000000000000000000..e80c7cfac954101dc0049b47d1b766ef6b598543
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/vectorization/TestPopCountVectorLong.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2022, 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 Test vectorization of popcount for Long
+* @requires vm.cpu.features ~= ".*avx512dq.*"
+* @requires vm.cpu.features ~= ".*vpopcntdq.*"
+* @requires vm.compiler2.enabled
+* @requires os.arch=="x86" | os.arch=="i386" | os.arch=="amd64" | os.arch=="x86_64"
+* @library /test/lib /
+* @run driver compiler.vectorization.TestPopCountVectorLong
+*/
+
+package compiler.vectorization;
+import compiler.lib.ir_framework.*;
+import java.util.Random;
+
+
+public class TestPopCountVectorLong {
+    private long[] input;
+    private int[] output;
+    private static final int LEN = 1024;
+    private Random rng;
+
+    public static void main(String args[]) {
+        TestFramework.run(TestPopCountVectorLong.class);
+    }
+
+    public TestPopCountVectorLong() {
+        input = new long[LEN];
+        output = new int[LEN];
+        rng = new Random(42);
+        for (int i = 0; i < LEN; ++i) {
+            input[i] = rng.nextLong();
+        }
+    }
+
+    @Test // needs to be run in (fast) debug mode
+    @Warmup(10000)
+    @IR(counts = {"PopCountVL", ">= 1"}) // Atleast one PopCountVL node is generated if vectorization is successful
+    public void vectorizeBitCount() {
+        for (int i = 0; i < LEN; ++i) {
+            output[i] = Long.bitCount(input[i]);
+        }
+        checkResult();
+    }
+
+    public void checkResult() {
+        for (int i = 0; i < LEN; ++i) {
+            int expected = Long.bitCount(input[i]);
+            if (output[i] != expected) {
+                throw new RuntimeException("Invalid result: output[" + i + "] = " + output[i] + " != " + expected);
+            }
+        }
+    }
+}
+
diff --git a/test/hotspot/jtreg/gc/g1/TestGCLogMessages.java b/test/hotspot/jtreg/gc/g1/TestGCLogMessages.java
index 3b997d74dc16f02f67ff3a044f863e71bd0830e3..3117b7a3077e8949f42758ccff503e82474a732f 100644
--- a/test/hotspot/jtreg/gc/g1/TestGCLogMessages.java
+++ b/test/hotspot/jtreg/gc/g1/TestGCLogMessages.java
@@ -265,7 +265,8 @@ public class TestGCLogMessages {
     LogMessageWithLevel exhFailureMessages[] = new LogMessageWithLevel[] {
         new LogMessageWithLevel("Recalculate Used Memory", Level.DEBUG),
         new LogMessageWithLevel("Restore Preserved Marks", Level.DEBUG),
-        new LogMessageWithLevel("Remove Self Forwards", Level.DEBUG),
+        new LogMessageWithLevel("Restore Retained Regions", Level.DEBUG),
+        new LogMessageWithLevel("Evacuation Failure Regions", Level.DEBUG),
     };
 
     private void testWithEvacuationFailureLogs() throws Exception {
diff --git a/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData30.java b/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData27.java
similarity index 86%
rename from test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData30.java
rename to test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData27.java
index 960fce63afa849a2d370eff6b763dffaab18848b..7324cad9f3c13b6b929bac60d02878c3893a1a92 100644
--- a/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData30.java
+++ b/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData27.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2022, 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,7 +24,7 @@
 package gc.g1;
 
 /**
- * @test TestShrinkAuxiliaryData30
+ * @test TestShrinkAuxiliaryData27
  * @key randomness
  * @bug 8038423 8061715 8078405
  * @summary Checks that decommitment occurs for JVM with different
@@ -36,11 +36,11 @@ package gc.g1;
  *          java.management
  * @build sun.hotspot.WhiteBox
  * @run driver jdk.test.lib.helpers.ClassFileInstaller sun.hotspot.WhiteBox
- * @run main/timeout=720 gc.g1.TestShrinkAuxiliaryData30
+ * @run main/timeout=720 gc.g1.TestShrinkAuxiliaryData27
  */
-public class TestShrinkAuxiliaryData30 {
+public class TestShrinkAuxiliaryData27 {
 
     public static void main(String[] args) throws Exception {
-        new TestShrinkAuxiliaryData(30).test();
+        new TestShrinkAuxiliaryData(27).test();
     }
 }
diff --git a/test/hotspot/jtreg/gc/logging/TestPrintReferences.java b/test/hotspot/jtreg/gc/logging/TestPrintReferences.java
index c3bf80a48a03c693b3dd9b1d7205c3f92d6adfce..6272f08e9943b86895e5fa044767f5930dcde38a 100644
--- a/test/hotspot/jtreg/gc/logging/TestPrintReferences.java
+++ b/test/hotspot/jtreg/gc/logging/TestPrintReferences.java
@@ -80,9 +80,11 @@ public class TestPrintReferences {
 
     private static String refRegex(String reftype) {
         String countRegex = "[0-9]+";
-        return gcLogTimeRegex + indent(6) + reftype + ":\n" +
-               gcLogTimeRegex + indent(8) + "Discovered: " + countRegex + "\n" +
-               gcLogTimeRegex + indent(8) + "Cleared: " + countRegex + "\n";
+        return gcLogTimeRegex + indent(6) + reftype + " " +
+               "Discovered: " + countRegex + ", " +
+               "Dropped: "    + countRegex + ", " +
+               "Processed: "  + countRegex + "\n"
+               ;
     }
 
     private static void checkRefsLogFormat(OutputAnalyzer output) {
diff --git a/test/hotspot/jtreg/gtest/NMTGtests.java b/test/hotspot/jtreg/gtest/NMTGtests.java
index b79f46395fbecc53a450ac57d5db13ff559cde07..57666680b6ba54a66bf29af2813f2586df2503bb 100644
--- a/test/hotspot/jtreg/gtest/NMTGtests.java
+++ b/test/hotspot/jtreg/gtest/NMTGtests.java
@@ -24,10 +24,15 @@
  */
 
 /*
- * This tests NMT by running gtests with NMT enabled.
- *
- * To save time, we just run them for debug builds (where we would catch assertions) and only a selection of tests
- * (namely, NMT tests themselves, and - for the detail statistics - os tests, since those reserve a lot and stress NMT)
+ * This tests NMT by running gtests with NMT enabled (only those which are relevant for NMT)
+ */
+
+/* @test id=nmt-off
+ * @summary Run NMT-related gtests with NMT switched off
+ * @library /test/lib
+ * @modules java.base/jdk.internal.misc
+ *          java.xml
+ * @run main/native GTestWrapper --gtest_filter=NMT*:os* -XX:NativeMemoryTracking=off
  */
 
 /* @test id=nmt-summary
@@ -35,8 +40,7 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.xml
- * @requires vm.debug
- * @run main/native GTestWrapper --gtest_filter=NMT* -XX:NativeMemoryTracking=summary
+ * @run main/native GTestWrapper --gtest_filter=NMT*:os* -XX:NativeMemoryTracking=summary
  */
 
 /* @test id=nmt-detail
@@ -44,6 +48,5 @@
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.xml
- * @requires vm.debug
  * @run main/native GTestWrapper --gtest_filter=NMT*:os* -XX:NativeMemoryTracking=detail
  */
diff --git a/test/hotspot/jtreg/resourcehogs/serviceability/sa/LingeredAppWithLargeArray.java b/test/hotspot/jtreg/resourcehogs/serviceability/sa/LingeredAppWithLargeArray.java
index 44929f05b15213be690d35bdf6c068ed4f66b0e2..244f41873340e9ee8adcce270407083dc0f4e7ab 100644
--- a/test/hotspot/jtreg/resourcehogs/serviceability/sa/LingeredAppWithLargeArray.java
+++ b/test/hotspot/jtreg/resourcehogs/serviceability/sa/LingeredAppWithLargeArray.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, 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,9 +23,12 @@
 
 import jdk.test.lib.apps.LingeredApp;
 
+import java.lang.ref.Reference;
+
 public class LingeredAppWithLargeArray extends LingeredApp {
     public static void main(String args[]) {
         int[] hugeArray = new int[Integer.MAX_VALUE/2];
         LingeredApp.main(args);
+        Reference.reachabilityFence(hugeArray);
     }
  }
diff --git a/test/hotspot/jtreg/runtime/8176717/TestInheritFD.java b/test/hotspot/jtreg/runtime/8176717/TestInheritFD.java
index 04a739079f9f8d5b204c94cb4e26019438c5601c..37c5280d2367fcf251daab9404e03deb3787293a 100644
--- a/test/hotspot/jtreg/runtime/8176717/TestInheritFD.java
+++ b/test/hotspot/jtreg/runtime/8176717/TestInheritFD.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -79,6 +79,7 @@ public class TestInheritFD {
     public static final String RETAINS_FD = "VM RESULT => RETAINS FD";
     public static final String EXIT = "VM RESULT => VM EXIT";
     public static final String LOG_SUFFIX = ".strangelogsuffixthatcanbecheckedfor";
+    public static final String USER_DIR = System.getProperty("user.dir");
 
     // first VM
     public static void main(String[] args) throws Exception {
@@ -187,10 +188,10 @@ public class TestInheritFD {
 
     static Collection outputContainingFilenames() {
         long pid = ProcessHandle.current().pid();
-
         String[] command = lsofCommand().orElseThrow(() -> new RuntimeException("lsof like command not found"));
-        System.out.println("using command: " + command[0] + " " + command[1]);
-        return run(command[0], command[1], "" + pid).collect(toList());
+        // Only search the directory in which the VM is running (user.dir property).
+        System.out.println("using command: " + command[0] + " -a +d " + USER_DIR + " " + command[1] + " " + pid);
+        return run(command[0], "-a", "+d", USER_DIR, command[1], "" + pid).collect(toList());
     }
 
     static boolean findOpenLogFile(Collection fileNames) {
diff --git a/test/hotspot/jtreg/runtime/BootClassAppendProp/GetBootClassPathAppendProp.java b/test/hotspot/jtreg/runtime/BootClassAppendProp/GetBootClassPathAppendProp.java
new file mode 100644
index 0000000000000000000000000000000000000000..59d62e5615b015d3dcf97dba55e6ee71b4b6e9b7
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/BootClassAppendProp/GetBootClassPathAppendProp.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2021, 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 8225093
+ * @summary Check that JVMTI GetSystemProperty API returns the right values for
+ *          property jdk.boot.class.path.append.
+ * @requires vm.jvmti
+ * @library /test/lib
+ * @run main/othervm/native -agentlib:GetBootClassPathAppendProp GetBootClassPathAppendProp
+ * @run main/othervm/native -Xbootclasspath/a:blah -agentlib:GetBootClassPathAppendProp GetBootClassPathAppendProp one_arg
+ *
+ */
+
+public class GetBootClassPathAppendProp {
+    private static native String getSystemProperty();
+
+    public static void main(String[] args) throws Exception {
+        String path = getSystemProperty();
+        if (args.length > 0) {
+            if (!path.equals("blah")) {
+                throw new RuntimeException("Wrong value returned for jdk.boot.class.path.append: " +
+                                           path);
+           }
+        } else {
+            if (path != null) {
+                throw new RuntimeException("Null value expected for jdk.boot.class.path.append: " +
+                                           path);
+            }
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/BootClassAppendProp/libGetBootClassPathAppendProp.c b/test/hotspot/jtreg/runtime/BootClassAppendProp/libGetBootClassPathAppendProp.c
new file mode 100644
index 0000000000000000000000000000000000000000..07f57cff267b4d2c24bae29e8e9bdaba4c88097a
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/BootClassAppendProp/libGetBootClassPathAppendProp.c
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2021, 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 
+#include 
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+static jvmtiEnv *jvmti = NULL;
+
+JNIEXPORT jint JNICALL Agent_OnLoad(JavaVM *jvm, char *options, void *reserved) {
+  int err = (*jvm)->GetEnv(jvm, (void**) &jvmti, JVMTI_VERSION_9);
+  if (err != JNI_OK) {
+    return JNI_ERR;
+  }
+  return JNI_OK;
+}
+
+JNIEXPORT jstring JNICALL
+Java_GetBootClassPathAppendProp_getSystemProperty(JNIEnv *env, jclass cls) {
+  jvmtiError err;
+  char* prop_value;
+
+  err = (*jvmti)->GetSystemProperty(jvmti, "jdk.boot.class.path.append", &prop_value);
+  if (err == JVMTI_ERROR_NOT_AVAILABLE) {
+    return NULL;
+  }
+  if (err != JVMTI_ERROR_NONE) {
+    char err_msg[50];
+    snprintf(err_msg, 50, "Wrong JVM TI error code: %d", err);
+    return (*env)->NewStringUTF(env, err_msg);
+  }
+
+  return (*env)->NewStringUTF(env, prop_value);
+}
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/test/hotspot/jtreg/runtime/NMT/JcmdWithNMTDisabled.java b/test/hotspot/jtreg/runtime/NMT/JcmdWithNMTDisabled.java
index 891f82be0bd9f6f7ae0f2c855c01a756c44cecb2..da1dd4979759b772b67f0d563242e10c0092f082 100644
--- a/test/hotspot/jtreg/runtime/NMT/JcmdWithNMTDisabled.java
+++ b/test/hotspot/jtreg/runtime/NMT/JcmdWithNMTDisabled.java
@@ -30,6 +30,7 @@
  * @run driver JcmdWithNMTDisabled 1
  */
 
+import jdk.test.lib.Platform;
 import jdk.test.lib.process.ProcessTools;
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.JDKToolFinder;
@@ -47,10 +48,12 @@ public class JcmdWithNMTDisabled {
       OutputAnalyzer output;
       String testjdkPath = System.getProperty("test.jdk");
 
-      // First run without enabling NMT
-      pb = ProcessTools.createJavaProcessBuilder("-Dtest.jdk=" + testjdkPath, "JcmdWithNMTDisabled");
-      output = new OutputAnalyzer(pb.start());
-      output.shouldHaveExitValue(0);
+      // First run without enabling NMT (not in debug, where NMT is by default on)
+      if (!Platform.isDebugBuild()) {
+        pb = ProcessTools.createJavaProcessBuilder("-Dtest.jdk=" + testjdkPath, "JcmdWithNMTDisabled");
+        output = new OutputAnalyzer(pb.start());
+        output.shouldHaveExitValue(0);
+      }
 
       // Then run with explicitly disabling NMT, should not be any difference
       pb = ProcessTools.createJavaProcessBuilder("-Dtest.jdk=" + testjdkPath, "-XX:NativeMemoryTracking=off", "JcmdWithNMTDisabled");
diff --git a/test/hotspot/jtreg/runtime/NMT/PrintNMTStatisticsWithNMTDisabled.java b/test/hotspot/jtreg/runtime/NMT/PrintNMTStatisticsWithNMTDisabled.java
index 7e45c3f16d74998ba91931618aa47aeef92055a8..31ab2537fe1e9864e7210c612278ed7b529c0027 100644
--- a/test/hotspot/jtreg/runtime/NMT/PrintNMTStatisticsWithNMTDisabled.java
+++ b/test/hotspot/jtreg/runtime/NMT/PrintNMTStatisticsWithNMTDisabled.java
@@ -38,7 +38,7 @@ public class PrintNMTStatisticsWithNMTDisabled {
   public static void main(String args[]) throws Exception {
     ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
       "-XX:+UnlockDiagnosticVMOptions",
-      "-XX:+PrintNMTStatistics",
+      "-XX:+PrintNMTStatistics", "-XX:NativeMemoryTracking=off",
       "-version");
     OutputAnalyzer output = new OutputAnalyzer(pb.start());
     output.shouldContain("warning: PrintNMTStatistics is disabled, because native memory tracking is not enabled");
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/ClassListWithCustomClassNoSource.java b/test/hotspot/jtreg/runtime/cds/appcds/ClassListWithCustomClassNoSource.java
new file mode 100644
index 0000000000000000000000000000000000000000..4e5c52402a0705cef38c98d3fcc6cdc680fd0076
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/ClassListWithCustomClassNoSource.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2022, 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.File;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.security.ProtectionDomain;
+
+
+public class ClassListWithCustomClassNoSource {
+    private static byte[] helloBytes;
+    private static final String HELLO = "Hello";
+    static class CL extends ClassLoader {
+        private ProtectionDomain pd;
+        public CL(String name, ClassLoader parent, ProtectionDomain protD) {
+            super(name, parent);
+            pd = protD;
+        }
+
+        @Override
+        protected Class findClass(String name) throws ClassNotFoundException {
+            if (pd == null) {
+                pd = new ProtectionDomain(null, null);
+            }
+            return defineClass(name, helloBytes, 0, helloBytes.length, pd);
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+        if (args.length != 1) {
+            throw new RuntimeException("Invalid arg, Use 1, 2, or 3");
+        }
+
+        ClassLoader thisLoader = ClassListWithCustomClassNoSource.class.getClassLoader();
+        helloBytes = thisLoader.getResourceAsStream(HELLO + ".class").readAllBytes();
+
+        switch(args[0]) {
+        case "1":
+            Class cls1 = (new CL("HelloLoader", null, null)).loadClass(HELLO);
+            System.out.println(HELLO + " was successfully loaded by " + cls1.getClassLoader().getName());
+            break;
+        case "2":
+            ProtectionDomain p = ClassListWithCustomClassNoSource.class.getProtectionDomain();
+            Class cls2 = (new CL("HelloLoader", null, p)).loadClass(HELLO);
+            System.out.println(HELLO + " was successfully loaded by " + cls2.getClassLoader().getName());
+            break;
+        case "3":
+            URL url = ClassListWithCustomClassNoSource.class.getProtectionDomain().getCodeSource().getLocation();
+            URLClassLoader urlLoader = new URLClassLoader("HelloClassLoader", new URL[] {url}, null);
+            Class cls = urlLoader.loadClass(HELLO);
+            if (cls != null) {
+                System.out.println(HELLO + " was loaded by " + cls.getClassLoader().getName());
+                if (urlLoader != cls.getClassLoader()) {
+                    System.out.println(HELLO + " was not loaded by " + urlLoader.getName());
+                }
+            } else {
+                System.out.println(HELLO + " is not loaded");
+            }
+            break;
+        default:
+            throw new RuntimeException("Should have one argument,  1, 2 or 3");
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/ClassSpecializerTestApp.java b/test/hotspot/jtreg/runtime/cds/appcds/ClassSpecializerTestApp.java
new file mode 100644
index 0000000000000000000000000000000000000000..7b9363e8c8f0f849719086ad5c13fb0d9a2f9039
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/ClassSpecializerTestApp.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2022, 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.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+
+// When this class is executed, the following classes will be generated by
+// java.lang.invoke.ClassSpecializer with the code source
+// "_ClassSpecializer_generateConcreteSpeciesCode".
+//
+//   - java.lang.invoke.BoundMethodHandle$Species_LFDIIL
+//   - java.lang.invoke.BoundMethodHandle$Species_LFDIILJ
+//   - java.lang.invoke.BoundMethodHandle$Species_LFDIILJD
+//   - ...
+//
+// The TestDumpClassListSource test case checks that these classes are not
+// written into the classlist, as they cannot be handled by -Xshare:dump
+public class ClassSpecializerTestApp {
+    public static void main(String args[]) throws Throwable {
+
+        MethodHandles.Lookup lookup = MethodHandles.lookup();
+        MethodType mt = MethodType.methodType(void.class, float.class, double.class, int.class,
+                                              boolean.class, Object.class, long.class, double.class);
+        MethodHandle mh = lookup.findStatic(ClassSpecializerTestApp.class, "callme", mt);
+        invoke(mh, 4.0f, 5.0, 6, true, null, 7L, 8.0);
+    }
+
+    private static Object invoke(MethodHandle mh, Object ... args) throws Throwable {
+        try {
+            for (Object o : args) {
+                mh = MethodHandles.insertArguments(mh, 0, o);
+            }
+            return mh.invoke();
+        } catch (Throwable t) {
+            System.out.println("Failed to find, link and/or invoke " + mh.toString() + ": " + t.getMessage());
+            throw t;
+        }
+    }
+
+    private static void callme(float f, double d, int i, boolean b, Object o, long l, double d2) {}
+}
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/CommandLineFlagCombo.java b/test/hotspot/jtreg/runtime/cds/appcds/CommandLineFlagCombo.java
index 045d286115b80805a5a42c783ad72befd4f3aef7..b0f18cd453e0c56612f4aef6f8bcfc9ea24e9ad5 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/CommandLineFlagCombo.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/CommandLineFlagCombo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2022, 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
@@ -38,8 +38,11 @@
  * @run main/othervm/timeout=240 -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. CommandLineFlagCombo
  */
 
+import java.io.File;
+
 import jdk.test.lib.BuildHelper;
 import jdk.test.lib.Platform;
+import jdk.test.lib.process.ProcessTools;
 import jdk.test.lib.process.OutputAnalyzer;
 
 import sun.hotspot.code.Compiler;
@@ -47,6 +50,7 @@ import sun.hotspot.WhiteBox;
 
 public class CommandLineFlagCombo {
 
+    private static String HELLO_WORLD = "Hello World";
     // shared base address test table
     private static final String[] testTable = {
         "-XX:+UseG1GC", "-XX:+UseSerialGC", "-XX:+UseParallelGC",
@@ -83,7 +87,7 @@ public class CommandLineFlagCombo {
             if ((TestCommon.isDynamicArchive() && !testEntry.contains("ObjectAlignmentInBytes")) ||
                 !TestCommon.isDynamicArchive()) {
                 OutputAnalyzer execOutput = TestCommon.exec(appJar, testEntry, "Hello");
-                TestCommon.checkExec(execOutput, "Hello World");
+                TestCommon.checkExec(execOutput, HELLO_WORLD);
             }
         }
 
@@ -105,8 +109,10 @@ public class CommandLineFlagCombo {
             TestCommon.checkDump(dumpOutput, "Loading classes to share");
 
             OutputAnalyzer execOutput = TestCommon.exec(appJar, run_g1Flag, run_serialFlag, "Hello");
-            TestCommon.checkExec(execOutput, "Hello World");
+            TestCommon.checkExec(execOutput, HELLO_WORLD);
         }
+
+        testExtraCase(appJar, classList);
     }
 
     private static boolean skipTestCase(String testEntry) throws Exception {
@@ -128,4 +134,41 @@ public class CommandLineFlagCombo {
         }
         return false;
     }
+
+    // { -Xshare:dump, -XX:ArchiveClassesAtExit} x { -XX:DumpLoadedClassList }
+    private static void testExtraCase(String jarFile, String[] classList) throws Exception {
+        // 1. -Xshare:dump -XX:-XX:DumpLoadedClassFile
+        String dumpedListName = "tmpClassList.list";
+        File listFile = new File(dumpedListName);
+        if (listFile.exists()) {
+            listFile.delete();
+        }
+        OutputAnalyzer dumpOutput = TestCommon.dump(jarFile, classList, "-XX:DumpLoadedClassList=" + dumpedListName);
+        TestCommon.checkDump(dumpOutput, "Loading classes to share");
+        if (!listFile.exists()) {
+            throw new RuntimeException("ClassList file " + dumpedListName + " should be created");
+        }
+
+        // 2. -XX:ArchiveClassesAtExit -XX:DumpLoadedClassFile
+        String dynName = "tmpDyn.jsa";
+        File dynFile = new File(dynName);
+        if (dynFile.exists()) {
+            dynFile.delete();
+        }
+        if (listFile.exists()) {
+            listFile.delete();
+        }
+        String[] args = new String[] {
+            "-cp", jarFile, "-XX:ArchiveClassesAtExit=" + dynName, "-XX:DumpLoadedClassList=" + dumpedListName, "Hello"};
+        ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(args);
+        OutputAnalyzer output = TestCommon.executeAndLog(pb, "combo");
+        output.shouldHaveExitValue(0)
+              .shouldContain(HELLO_WORLD);
+        if (!dynFile.exists()) {
+            throw new RuntimeException("Dynamic archive file " + dynName + " should be created");
+        }
+        if (!listFile.exists()) {
+            throw new RuntimeException("ClassList file " + dumpedListName + " should be created");
+        }
+    }
 }
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/MoveJDKTest.java b/test/hotspot/jtreg/runtime/cds/appcds/MoveJDKTest.java
index c5ad8e53873a0e25c8f220b8c29e2b2136e00fb9..b127fec860461d7adb123b915cfe6b3faf62956b 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/MoveJDKTest.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/MoveJDKTest.java
@@ -47,37 +47,39 @@ public class MoveJDKTest {
     public static void main(String[] args) throws Exception {
         String java_home_src = System.getProperty("java.home");
         String java_home_dst = CDSTestUtils.getOutputDir() + File.separator + "moved_jdk";
+        String homeJava = java_home_src + File.separator + "bin" + File.separator + "java";
+        String dstJava  = java_home_dst + File.separator + "bin" + File.separator + "java";
 
         TestCommon.startNewArchiveName();
         String jsaFile = TestCommon.getCurrentArchiveName();
         String jsaOpt = "-XX:SharedArchiveFile=" + jsaFile;
         {
-            ProcessBuilder pb = makeBuilder(java_home_src + "/bin/java", "-Xshare:dump", jsaOpt);
+            ProcessBuilder pb = CDSTestUtils.makeBuilder(homeJava, "-Xshare:dump", jsaOpt);
             TestCommon.executeAndLog(pb, "dump")
                       .shouldHaveExitValue(0);
         }
         {
-            ProcessBuilder pb = makeBuilder(java_home_src + "/bin/java",
-                                            "-Xshare:auto",
-                                            jsaOpt,
-                                            "-Xlog:class+path=info",
-                                            "-version");
+            ProcessBuilder pb = CDSTestUtils.makeBuilder(homeJava,
+                                                         "-Xshare:auto",
+                                                         jsaOpt,
+                                                         "-Xlog:class+path=info",
+                                                         "-version");
             OutputAnalyzer out = TestCommon.executeAndLog(pb, "exec-src");
             out.shouldHaveExitValue(0);
             out.shouldNotContain("shared class paths mismatch");
             out.shouldNotContain("BOOT classpath mismatch");
         }
 
-        clone(new File(java_home_src), new File(java_home_dst));
+        CDSTestUtils.clone(new File(java_home_src), new File(java_home_dst));
         System.out.println("============== Cloned JDK at " + java_home_dst);
 
         // Test runtime with cloned JDK
         {
-            ProcessBuilder pb = makeBuilder(java_home_dst + "/bin/java",
-                                            "-Xshare:auto",
-                                            jsaOpt,
-                                            "-Xlog:class+path=info",
-                                            "-version");
+            ProcessBuilder pb = CDSTestUtils.makeBuilder(dstJava,
+                                                         "-Xshare:auto",
+                                                         jsaOpt,
+                                                         "-Xlog:class+path=info",
+                                                         "-version");
             OutputAnalyzer out = TestCommon.executeAndLog(pb, "exec-dst");
             out.shouldHaveExitValue(0);
             out.shouldNotContain("shared class paths mismatch");
@@ -89,21 +91,21 @@ public class MoveJDKTest {
         String fake_modules = copyFakeModulesFromHelloJar();
         String dumptimeBootAppendOpt = "-Xbootclasspath/a:" + fake_modules;
         {
-            ProcessBuilder pb = makeBuilder(java_home_src + "/bin/java",
-                                            "-Xshare:dump",
-                                            dumptimeBootAppendOpt,
-                                            jsaOpt);
+            ProcessBuilder pb = CDSTestUtils.makeBuilder(homeJava,
+                                                         "-Xshare:dump",
+                                                         dumptimeBootAppendOpt,
+                                                         jsaOpt);
             TestCommon.executeAndLog(pb, "dump")
                       .shouldHaveExitValue(0);
         }
         {
             String runtimeBootAppendOpt = dumptimeBootAppendOpt + System.getProperty("path.separator") + helloJar;
-            ProcessBuilder pb = makeBuilder(java_home_dst + "/bin/java",
-                                            "-Xshare:auto",
-                                            runtimeBootAppendOpt,
-                                            jsaOpt,
-                                            "-Xlog:class+path=info",
-                                            "-version");
+            ProcessBuilder pb = CDSTestUtils.makeBuilder(dstJava,
+                                                         "-Xshare:auto",
+                                                         runtimeBootAppendOpt,
+                                                         jsaOpt,
+                                                         "-Xlog:class+path=info",
+                                                         "-version");
             OutputAnalyzer out = TestCommon.executeAndLog(pb, "exec-dst");
             out.shouldHaveExitValue(0);
             out.shouldNotContain("shared class paths mismatch");
@@ -111,78 +113,17 @@ public class MoveJDKTest {
         }
 
         // Test with no modules image in the /lib directory
-        renameModulesFile(java_home_dst);
+        String locDir = java_home_dst + File.separator + "lib";
+        CDSTestUtils.rename(new File(locDir + File.separator + "modules"),
+                            new File(locDir + File.separator + "orig-modules"));
         {
-            ProcessBuilder pb = makeBuilder(java_home_dst + "/bin/java",
-                                            "-version");
+            ProcessBuilder pb = CDSTestUtils.makeBuilder(dstJava, "-version");
             OutputAnalyzer out = TestCommon.executeAndLog(pb, "exec-missing-modules");
             out.shouldHaveExitValue(1);
             out.shouldContain("Failed setting boot class path.");
         }
     }
 
-    // Do a cheap clone of the JDK. Most files can be sym-linked. However, $JAVA_HOME/bin/java and $JAVA_HOME/lib/.../libjvm.so"
-    // must be copied, because the java.home property is derived from the canonicalized paths of these 2 files.
-    static void clone(File src, File dst) throws Exception {
-        if (dst.exists()) {
-            if (!dst.isDirectory()) {
-                throw new RuntimeException("Not a directory :" + dst);
-            }
-        } else {
-            if (!dst.mkdir()) {
-                throw new RuntimeException("Cannot create directory: " + dst);
-            }
-        }
-        final String jvmLib = System.mapLibraryName("jvm");
-        for (String child : src.list()) {
-            if (child.equals(".") || child.equals("..")) {
-                continue;
-            }
-
-            File child_src = new File(src, child);
-            File child_dst = new File(dst, child);
-            if (child_dst.exists()) {
-                throw new RuntimeException("Already exists: " + child_dst);
-            }
-            if (child_src.isFile()) {
-                if (child.equals(jvmLib) || child.equals("java")) {
-                    Files.copy(child_src.toPath(), /* copy data to -> */ child_dst.toPath());
-                } else {
-                    Files.createSymbolicLink(child_dst.toPath(),  /* link to -> */ child_src.toPath());
-                }
-            } else {
-                clone(child_src, child_dst);
-            }
-        }
-    }
-
-    static void renameModulesFile(String javaHome) throws Exception {
-        String modulesDir = javaHome + File.separator + "lib";
-        File origModules = new File(modulesDir, "modules");
-        if (!origModules.exists()) {
-            throw new RuntimeException("modules file not found");
-        }
-
-        File renamedModules = new File(modulesDir, "orig_modules");
-        if (renamedModules.exists()) {
-            throw new RuntimeException("found orig_modules unexpectedly");
-        }
-
-        boolean success = origModules.renameTo(renamedModules);
-        if (!success) {
-            throw new RuntimeException("rename modules file failed");
-        }
-    }
-
-    static ProcessBuilder makeBuilder(String... args) throws Exception {
-        System.out.print("[");
-        for (String s : args) {
-            System.out.print(" " + s);
-        }
-        System.out.println(" ]");
-        return new ProcessBuilder(args);
-    }
-
     private static String copyFakeModulesFromHelloJar() throws Exception {
         String outDir = CDSTestUtils.getOutputDir();
         String newFile = "hello.modules";
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/NonExistClasspath.java b/test/hotspot/jtreg/runtime/cds/appcds/NonExistClasspath.java
index a08f1c5ff150aebc791fb91b34eff5b88e7f8f33..7f2af4bdcab5e60ebc04239ef88bf647cb5cfeb9 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/NonExistClasspath.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/NonExistClasspath.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,6 +40,13 @@ import jdk.test.lib.cds.CDSTestUtils;
 import jdk.test.lib.process.OutputAnalyzer;
 
 public class NonExistClasspath {
+    static final String outDir = CDSTestUtils.getOutputDir();
+    static final String newFile = "non-exist.jar";
+    static final String nonExistPath = outDir + File.separator + newFile;
+    static final String emptyJarPath = outDir + File.separator + "empty.jar";
+    static final String errorMessage1 = "Unable to use shared archive";
+    static final String errorMessage2 = "shared class paths mismatch";
+
     public static void main(String[] args) throws Exception {
         String appJar = JarBuilder.getOrCreateHelloJar();
         doTest(appJar, false);
@@ -47,13 +54,7 @@ public class NonExistClasspath {
     }
 
     static void doTest(String appJar, boolean bootcp) throws Exception {
-        String outDir = CDSTestUtils.getOutputDir();
-        String newFile = "non-exist.jar";
-        String nonExistPath = outDir + File.separator + newFile;
-        final String errorMessage1 = "Unable to use shared archive";
-        final String errorMessage2 = "shared class paths mismatch";
         final String errorMessage3 = (bootcp ? "BOOT" : "APP") + " classpath mismatch";
-
         (new File(nonExistPath)).delete();
 
         String classPath = nonExistPath + File.pathSeparator + appJar;
@@ -100,6 +101,81 @@ public class NonExistClasspath {
                                  "-Xlog:class+path=trace",
                                  "Hello"))
             .assertAbnormalExit(errorMessage1, errorMessage2, errorMessage3);
+
+        if (bootcp) {
+            doMoreBCPTests(appJar, errorMessage3);
+        }
+    }
+
+    static void doMoreBCPTests(String appJar, String errorMessage3) throws Exception {
+
+        // Dump an archive with non-existent boot class path.
+        (new File(nonExistPath)).delete();
+        TestCommon.testDump("foobar", TestCommon.list("Hello"), make_args(true, nonExistPath, "-cp", appJar));
+
+        // Run with non-existent boot class path, test should pass.
+        TestCommon.run(make_args(true,
+                                 nonExistPath,
+                                 "-cp", appJar,
+                                 "-Xlog:class+path=trace",
+                                 "Hello"))
+            .assertNormalExit();
+
+        // Run with existent boot class path, test should fail.
+        TestCommon.run(make_args(true,
+                                 appJar,
+                                 "-cp", appJar,
+                                 "-Xlog:class+path=trace",
+                                 "Hello"))
+            .assertAbnormalExit(errorMessage1, errorMessage2, errorMessage3);
+
+        // Dump an archive with existent boot class path.
+        TestCommon.testDump("foobar", TestCommon.list("Hello"), make_args(true, appJar));
+
+        // Run with non-existent boot class path, test should fail.
+        TestCommon.run(make_args(true,
+                                 nonExistPath,
+                                 "-Xlog:class+path=trace",
+                                 "Hello"))
+            .assertAbnormalExit(errorMessage1, errorMessage2, errorMessage3);
+
+        // Run with existent boot class path, test should pass.
+        TestCommon.run(make_args(true,
+                                 appJar,
+                                 "-Xlog:class+path=trace",
+                                 "Hello"))
+            .assertNormalExit();
+
+        // Test with empty jar file.
+        (new File(emptyJarPath)).delete();
+        (new File(emptyJarPath)).createNewFile();
+
+        // Dump an archive with an empty jar in the boot class path.
+        TestCommon.testDump("foobar", TestCommon.list("Hello"), make_args(true, emptyJarPath, "-cp", appJar));
+
+        // Run with an empty jar in boot class path, test should pass.
+        TestCommon.run(make_args(true,
+                                 emptyJarPath,
+                                 "-cp", appJar,
+                                 "-Xlog:class+path=trace",
+                                 "Hello"))
+            .assertNormalExit();
+
+        // Run with non-existent boot class path, test should pass.
+        TestCommon.run(make_args(true,
+                                 nonExistPath,
+                                 "-cp", appJar,
+                                 "-Xlog:class+path=trace",
+                                 "Hello"))
+            .assertNormalExit();
+
+        // Run with existent boot class path, test should fail.
+        TestCommon.run(make_args(true,
+                                 appJar,
+                                 "-cp", appJar,
+                                 "-Xlog:class+path=trace",
+                                 "Hello"))
+            .assertAbnormalExit(errorMessage1, errorMessage2, errorMessage3);
     }
 
     static String[] make_args(boolean bootcp, String cp, String... suffix) {
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/PrintSharedArchiveAndExit.java b/test/hotspot/jtreg/runtime/cds/appcds/PrintSharedArchiveAndExit.java
index fc34e932dc450b50c2810b61c370cda806d83865..9a74dcb0d3b39c5469dedaf0eabf3cddbf1fc3c3 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/PrintSharedArchiveAndExit.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/PrintSharedArchiveAndExit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2022, 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
@@ -87,16 +87,16 @@ public class PrintSharedArchiveAndExit {
     TestCommon.run("-cp", cp, "-XX:+PrintSharedArchiveAndExit", "Hello")
       .ifNoMappingFailure(output -> check(output, 0, true, lastCheckMsg));
 
-    log("Execution with simple errors -- with 'simple' errors like missing or modified\n" +
-        "JAR files, the VM should try to continue to print the remaining information.\n" +
-        "Use an invalid Boot CP -- all the JAR paths should be checked");
+    log("Non-existent boot cp should be ignored, test should pass.");
     TestCommon.run(
         "-cp", cp,
         "-Xbootclasspath/a:foo.jar",
         "-XX:+PrintSharedArchiveAndExit")
-      .ifNoMappingFailure(output -> check(output, 1, true, lastCheckMsg, "[BOOT classpath mismatch, "));
+      .ifNoMappingFailure(output -> check(output, 0, true, lastCheckMsg));
 
-    log("Use an App CP shorter than the one at dump time -- all the JAR paths should be checked");
+    log("Execution with simple errors -- with 'simple' errors like missing or modified\n" +
+        "JAR files, the VM should try to continue to print the remaining information.\n" +
+        "Use an App CP shorter than the one at dump time -- all the JAR paths should be checked");
     TestCommon.run(
         "-cp", ".",
         "-XX:+PrintSharedArchiveAndExit")
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/SharedArchiveConsistency.java b/test/hotspot/jtreg/runtime/cds/appcds/SharedArchiveConsistency.java
index 0d5296801b26a8bc7ef6a9eeb4b1207f5068d851..fd0291f06e01ca0dbba3a1cb9f5e9ca816f5a329 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/SharedArchiveConsistency.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/SharedArchiveConsistency.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2022, 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
@@ -181,9 +181,7 @@ public class SharedArchiveConsistency {
         copiedJsa = CDSArchiveUtils.copyArchiveFile(orgJsaFile, modVersion);
         CDSArchiveUtils.modifyHeaderIntField(copiedJsa, CDSArchiveUtils.offsetVersion(), version);
         output = shareAuto ? TestCommon.execAuto(execArgs) : TestCommon.execCommon(execArgs);
-        output.shouldContain("The shared archive file has the wrong version")
-              .shouldContain("_version expected: " + currentCDSArchiveVersion)
-              .shouldContain("actual: " + version);
+        output.shouldContain("The shared archive file version " + version + " does not match the required version " + currentCDSArchiveVersion);
         if (shareAuto) {
             output.shouldContain(HELLO_WORLD);
         }
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/TestDumpClassListSource.java b/test/hotspot/jtreg/runtime/cds/appcds/TestDumpClassListSource.java
new file mode 100644
index 0000000000000000000000000000000000000000..647e44bc455760eece80dbb057c61ff27555e823
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/TestDumpClassListSource.java
@@ -0,0 +1,234 @@
+/*
+ * Copyright (c) 2022, 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
+ * @key randomness
+ * @summary test dynamic dump meanwhile output loaded class list
+ * @bug 8279009 8275084
+ * @requires vm.cds
+ * @requires vm.cds.custom.loaders
+ * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
+ * @compile test-classes/Hello.java ClassSpecializerTestApp.java ClassListWithCustomClassNoSource.java
+ * @run main/othervm TestDumpClassListSource
+ */
+
+/* Test two senarios:
+ *   1. ClassSpecializerTestApp.java:
+ *      Test case for bug 8275084, make sure the filtering of source class to
+ *      dumped class list.
+ *   2. ClassListWithCustomClassNoSource: test custom class loader
+ *      2.1 class loaded without source.
+ *      2.2 class loaded with ProtectionDomain set as same as main class.
+ *      2.3 class loaded by custom loader from shared space.
+ */
+
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.io.File;
+
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.cds.CDSTestUtils;
+
+public class TestDumpClassListSource {
+    private static final boolean EXPECT_MATCH = true;
+    private static final boolean EXPECT_NOMATCH  = !EXPECT_MATCH;
+
+    private static void checkMatch(String file, String regexp, boolean expectMatch, String exceptionMessage) throws Exception {
+        String listData = new String(Files.readAllBytes(Paths.get(file)));
+        Pattern pattern = Pattern.compile(regexp, Pattern.MULTILINE);
+        Matcher matcher = pattern.matcher(listData);
+        boolean found   = matcher.find();
+        if (expectMatch) {
+            if (!found) {
+                throw new RuntimeException(exceptionMessage);
+            }
+        } else {
+            if (found) {
+                throw new RuntimeException(exceptionMessage);
+            }
+        }
+    }
+
+    static final String mainInvokeClass = "ClassSpecializerTestApp";
+    static final String mainCutomClass  = "ClassListWithCustomClassNoSource";
+    static final String sourceTarget    = "_ClassSpecializer_generateConcreteSpeciesCode";
+
+    private static void checkFileExistence(String type, File file) throws Exception {
+        if (!file.exists()) {
+            throw new RuntimeException(type + " file " + file.getName() + " should be created");
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+        String listFileName = "test-classlist.list";
+        String archiveName  = "test-dynamic.jsa";
+        String jarFile = JarBuilder.build("test-hello", "ClassSpecializerTestApp", "ClassListWithCustomClassNoSource",
+                                          "ClassListWithCustomClassNoSource$CL", "Hello");
+        // 1. Invoke lambda
+        File fileList = new File(listFileName);
+        if (fileList.exists()) {
+            fileList.delete();
+        }
+        File fileArchive = new File(archiveName);
+        if (fileArchive.exists()) {
+            fileArchive.delete();
+        }
+        String[] launchArgs  = {
+                "-Xshare:auto",
+                "-XX:DumpLoadedClassList=" + listFileName,
+                "-XX:ArchiveClassesAtExit=" + archiveName,
+                "-Xlog:cds",
+                "-Xlog:cds+lambda",
+                "-cp",
+                jarFile,
+                mainInvokeClass};
+        ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(launchArgs);
+        OutputAnalyzer output = TestCommon.executeAndLog(pb, "invoke-class");
+
+        checkFileExistence("Archive", fileArchive);
+        checkFileExistence("ClassList", fileList);
+
+        output.shouldHaveExitValue(0);
+        checkMatch(listFileName, sourceTarget, EXPECT_NOMATCH, "Failed to filter " + sourceTarget + " in class list file");
+
+        fileArchive.delete();
+        fileList.delete();
+
+        // 2. Custom loaded class
+        //    2.1 test in memory class generation without source
+        launchArgs  = new String[] {
+                "-Xshare:auto",
+                "-XX:DumpLoadedClassList=" + listFileName,
+                "-XX:ArchiveClassesAtExit=" + archiveName,
+                "-Xlog:cds",
+                "-Xlog:cds+lambda",
+                "-Xlog:class+path=info",
+                 "-cp",
+                jarFile,
+                mainCutomClass,
+                "1"};
+        pb = ProcessTools.createJavaProcessBuilder(launchArgs);
+        output = TestCommon.executeAndLog(pb, "custom-nosource");
+
+        checkFileExistence("Archive", fileArchive);
+        checkFileExistence("ClassList", fileList);
+
+        output.shouldHaveExitValue(0);
+        checkMatch(listFileName, sourceTarget, EXPECT_NOMATCH, "Failed to filter " + sourceTarget + " in class list file");
+        checkMatch(listFileName, "Hello", EXPECT_NOMATCH, "Hello should not be logged in class list file");
+
+        fileArchive.delete();
+        fileList.delete();
+
+        //    2.2 test in memory class with ProtectionDomain as main class.
+        //    "Hello" will be printed in list file and its source set as main class.
+        launchArgs  = new String[] {
+                "-Xshare:auto",
+                "-XX:DumpLoadedClassList=" + listFileName,
+                "-XX:ArchiveClassesAtExit=" + archiveName,
+                "-Xlog:cds",
+                "-Xlog:cds+lambda",
+                "-Xlog:class+path=info",
+                 "-cp",
+                jarFile,
+                mainCutomClass,
+                "2"};
+        pb = ProcessTools.createJavaProcessBuilder(launchArgs);
+        output = TestCommon.executeAndLog(pb, "custom-nosource");
+
+        checkFileExistence("Archive", fileArchive);
+        checkFileExistence("ClassList", fileList);
+
+        output.shouldHaveExitValue(0);
+        checkMatch(listFileName, sourceTarget, EXPECT_NOMATCH, "Failed to filter " + sourceTarget + " in class list file");
+        checkMatch(listFileName, "Hello", EXPECT_MATCH, "Hello should be logged in class list file");
+
+        fileArchive.delete();
+        fileList.delete();
+
+        //    2.3 class loaded by custom loader from shared space.
+        //      2.3.1 dump class list
+        launchArgs = new String[] {
+                "-XX:DumpLoadedClassList=" + listFileName,
+                 "-cp",
+                jarFile,
+                mainCutomClass,
+                "3"};
+        pb = ProcessTools.createJavaProcessBuilder(launchArgs);
+        output = TestCommon.executeAndLog(pb, "custom-dump-classlist");
+
+        checkFileExistence("ClassList", fileList);
+
+        checkMatch(listFileName, "Hello id: [0-9]+ super: [0-9]+ source: .*/test-hello.jar", EXPECT_MATCH,
+                   "Class Hello should be printed in classlist");
+        //      2.3.2 dump shared archive based on listFileName
+        String archive = "test-hello.jsa";
+        File archiveFile = new File(archive);
+        if (archiveFile.exists()) {
+            archiveFile.delete();
+        }
+        launchArgs = new String[] {
+                "-Xshare:dump",
+                "-XX:SharedClassListFile=" + listFileName,
+                "-XX:SharedArchiveFile=" + archive,
+                 "-cp",
+                jarFile,
+                mainCutomClass,
+                "3"};
+        pb = ProcessTools.createJavaProcessBuilder(launchArgs);
+        output = TestCommon.executeAndLog(pb, "custom-dump");
+
+        checkFileExistence("Archive", archiveFile);
+
+        //       2.3.3 run with the shared archive and -XX:DumpLoadedClassList
+        //             Hello should not be printed out in class list file.
+        String classList = "new-test-list.list";
+        File newFile = new File(classList);
+        if (newFile.exists()) {
+            newFile.delete();
+        }
+        launchArgs = new String[] {
+                "-Xshare:on",
+                "-XX:SharedArchiveFile=" + archive,
+                "-XX:DumpLoadedClassList=" + classList,
+                 "-cp",
+                jarFile,
+                mainCutomClass,
+                "3"};
+        pb = ProcessTools.createJavaProcessBuilder(launchArgs);
+        output = TestCommon.executeAndLog(pb, "custom-share");
+
+        checkFileExistence("ClassList", newFile);
+        checkMatch(classList, "Hello id: ?", EXPECT_NOMATCH, "Failed to filter custom loaded class Hello from class list");
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/DynamicArchiveTestBase.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/DynamicArchiveTestBase.java
index 050ccef88e258abfe9b2e4f6a4692c8439cd221b..6cbfec37175116a681ed0c8deb0b108822aff694 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/DynamicArchiveTestBase.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/DynamicArchiveTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2022, 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,8 @@ import sun.hotspot.WhiteBox;
 class DynamicArchiveTestBase {
     private static boolean executedIn_run = false;
     private static boolean autoMode = false;  // -Xshare:auto
-
     private static final WhiteBox WB = WhiteBox.getWhiteBox();
+    private static String[] baseArchiveOptions = new String[] {};
 
     public static interface DynamicArchiveTest {
         public void run() throws Exception;
@@ -96,6 +96,23 @@ class DynamicArchiveTestBase {
         return TestCommon.getNewArchiveName(stem);
     }
 
+    public static void setBaseArchiveOptions(String... opts) {
+        baseArchiveOptions = opts;
+    }
+
+    /**
+     * Excute a JVM to dump a base archive by
+     *  -Xshare:dump -XX:SharedArchiveFile=baseArchiveName
+     */
+    public static Result dumpBaseArchive(String baseArchiveName, String... cmdLineSuffix)
+        throws Exception
+    {
+        OutputAnalyzer output = TestCommon.dumpBaseArchive(baseArchiveName, cmdLineSuffix);
+        CDSOptions opts = new CDSOptions();
+        opts.setXShareMode("dump");
+        return new Result(opts, output);
+    }
+
     /**
      * Execute a JVM using the base archive (given by baseArchiveName) with the command line
      * (given by cmdLineSuffix). At JVM exit, dump all eligible classes into the top archive
@@ -274,7 +291,7 @@ class DynamicArchiveTestBase {
     private static String getTempBaseArchive() throws Exception {
         if (tempBaseArchive == null) {
             tempBaseArchive = getNewArchiveName("tempBaseArchive");
-            TestCommon.dumpBaseArchive(tempBaseArchive);
+            TestCommon.dumpBaseArchive(tempBaseArchive, baseArchiveOptions);
         }
         return tempBaseArchive;
     }
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/TestAutoCreateSharedArchive.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/TestAutoCreateSharedArchive.java
new file mode 100644
index 0000000000000000000000000000000000000000..e06a4c98c3789d6914c0ac68173a8023f4792ac7
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/TestAutoCreateSharedArchive.java
@@ -0,0 +1,697 @@
+/*
+ * Copyright (c) 2022, 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 8261455
+ * @summary test -XX:+AutoCreateSharedArchive feature
+ * @requires vm.cds
+ * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds /test/hotspot/jtreg/runtime/cds/appcds/test-classes
+ * @build Hello
+ * @build sun.hotspot.WhiteBox
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar hello.jar Hello
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar WhiteBox.jar sun.hotspot.WhiteBox
+ * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:./WhiteBox.jar TestAutoCreateSharedArchive verifySharedSpacesOff
+ * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:./WhiteBox.jar TestAutoCreateSharedArchive verifySharedSpacesOn
+ */
+
+/*
+ * -XX:SharedArchiveFile can be specified in two styles:
+ *
+ *  (A) Test with default base archive -XX:+SharedArchiveFile=
+ *  (B) Test with the base archive specified: -XX:SharedArchiveFile=:
+ *  all the following if not explained explicitly, run with flag -XX:+AutoCreateSharedArchive
+ *
+ *  Note VerifySharedSpaces will affect output so the tests run twice: one with -XX:+VerifySharedSpaces and the other with -XX:-VerifySharedSpaces
+ *
+ * 10 Case (A)
+ *
+ *   10.01 run with non-existing archive should automatically create dynamic archive.
+ *        If the JDK's default CDS archive cannot be loaded, print out warning, run continue without shared archive and no shared archive created at exit.
+ *   10.02 run with the created dynamic archive should pass.
+ *   10.03 run with the created dynamic archive and -XX:+AutoCreateSharedArchive should pass and no shared archive created at exit.
+ *
+ * 11 run with static archive.
+ *    run with static archive should printout warning and continue, share or no share depends on the archive validation at exit,
+ *    no shared archive (top) will be generated.
+ *
+ * 12 run with damaged magic should not regenerate dynamic archive.
+ *    if magic is not expected, no shared archive will be regenerated at exit.
+ *
+ * 13 run with a bad versioned archive.
+ *   13.01  run with a bad versioned (< CDS_GENERIC_HEADER_SUPPORTED_MIN_VERSION) archive should not create dynamic archive at exit.
+ *   13.02  run with a bad versioned (> CDS_GENERIC_HEADER_SUPPORTED_MIN_VERSION) archive should create dynamic archive at exit.
+ *
+ * 14 run with an archive whose base name is not matched, no shared archive at exit.
+ *
+ * 15 run with an archive whose jvm_ident is corrupted should
+ *     create dynamic archive at exit with -XX:-VerifySharedSpaces
+ *     not create dynamic archive at exit with -XX:+VerifySharedSpaces
+ *
+ * 16 run with an archive only containing magic in the file (size of 4 bytes)
+ *    the archive will be created at exit.
+ *
+ * 20 (case B)
+ *
+ *   20.01 dump base archive which will be used for dumping top archive.
+ *   20.02 dump top archive based on base archive obtained in 20.1.
+ *   20.03 run -XX:SharedArchiveFile=: to verify the archives.
+ *   20.04 run with -XX:SharedArchveFile=base:top (reversed)
+ *
+ * 21 Mismatched versions
+ *   21.01 if version of top archive is higher than CDS_GENERIC_HEADER_SUPPORTED_MIN_VERSION, the archive cannot be shared and will be
+ *         regenerated at exit.
+ *   21.02 if version of top archive is lower than CDS_GENERIC_HEADER_SUPPORTED_MIN_VERSION, the archive cannot be shared and will be
+ *         created at exit.
+ *
+ * 22 create an archive with dynamic magic number only
+ *    archive will be created at exit if base can be shared.
+ *
+ * 23  mismatched jvm_indent in base/top archive
+ *     23.01 mismatched jvm_indent in top archive
+ *     23.02 mismatched jvm_indent in base archive
+ *
+ * 24 run with non-existing shared archives
+ *   24.01 run -Xshare:auto -XX:+AutoCreateSharedArchive -XX:SharedArchiveFile=base.jsa:non-exist-top.jsa
+ *     The top archive will be regenerated.
+ *   24.02 run -Xshare:auto -XX:+AutoCreateSharedArchive -XX:SharedArchiveFile=non-exist-base.jsa:top.jsa
+ *     top archive will not be shared if base archive failed to load.
+ */
+
+import java.io.IOException;
+import java.io.File;
+import java.nio.file.attribute.FileTime;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+
+import jdk.test.lib.cds.CDSTestUtils;
+import jdk.test.lib.cds.CDSArchiveUtils;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.helpers.ClassFileInstaller;
+
+import jtreg.SkippedException;
+
+public class TestAutoCreateSharedArchive extends DynamicArchiveTestBase {
+    private static final String BASE_NAME = CDSTestUtils.getOutputFileName("base.jsa");
+    private static final String TOP_NAME  = CDSTestUtils.getOutputFileName("top.jsa");
+    private static final String mainAppClass = "Hello";
+    private static final String HELLO_SOURCE = "Hello source: shared objects file (top)";
+    private static final String HELLO_WORLD = "Hello World";
+    private static boolean verifyOn = false;
+
+    private static int   genericHeaderMinVersion = CDSArchiveUtils.getGenericHeaderMinVersion();
+    private static int   currentCDSVersion = CDSArchiveUtils.getCurrentCDSArchiveVersion();
+
+    public static void main(String[] args) throws Exception {
+        if (isUseSharedSpacesDisabled()) {
+            throw new SkippedException("Skipped -- This test is not applicable when JTREG tests are executed with -Xshare:off, or if the JDK doesn't have a default archive.");
+        }
+        if (args.length != 1 || (!args[0].equals("verifySharedSpacesOff") && !args[0].equals("verifySharedSpacesOn"))) {
+            throw new RuntimeException("Must run with verifySharedSpacesOff or verifySharedSpacesOn");
+        }
+        verifyOn = args[0].equals("verifySharedSpacesOn");
+        runTest(TestAutoCreateSharedArchive::testAutoCreateSharedArchive);
+    }
+
+    public static void checkFileExists(String fileName) throws Exception {
+        File file = new File(fileName);
+        if (!file.exists()) {
+             throw new IOException("Archive " + fileName + " is not automatically created");
+        }
+    }
+
+    public static String startNewArchive(String testName) {
+        String newArchiveName = TestCommon.getNewArchiveName(testName);
+        TestCommon.setCurrentArchiveName(newArchiveName);
+        return newArchiveName;
+    }
+
+    public static void print(String message) {
+        System.out.println(message);
+    }
+
+    private static void testAutoCreateSharedArchive() throws Exception {
+        String appJar = ClassFileInstaller.getJarPath("hello.jar");
+        boolean fileModified = false;
+
+        String verifySharedSpaces = verifyOn ? "-XX:+VerifySharedSpaces" : "-XX:-VerifySharedSpaces";
+        File archiveFile = new File(TOP_NAME);
+        if (archiveFile.exists()) {
+          archiveFile.delete();
+        }
+
+        // dump a static archive, used later.
+        // 0. Dump a static archive
+        print("0. dump a static archive " + BASE_NAME);
+        dumpBaseArchive(BASE_NAME,
+                        "-Xlog:cds",
+                        "-cp", appJar,
+                        mainAppClass)
+            .assertNormalExit(output -> {
+                output.shouldHaveExitValue(0);
+            });
+        checkFileExists(BASE_NAME);
+
+        // The list numbers try to match JDK-8272331 (CSR for JDK-8261455) test items but not exactly matched.
+
+        // 10 non-existing archive should automatically create dynamic archive based on default shared archive
+        // if base archive loaded.
+        print("10 Test with default base shared archive");
+        print("    10.01 run with non-existing archive should automatically create dynamic archive");
+        File fileTop = new File(TOP_NAME);
+        if (fileTop.exists()) {
+            fileTop.delete();
+        }
+        run(TOP_NAME,
+            "-Xshare:auto",
+            "-XX:+AutoCreateSharedArchive",
+            "-Xlog:cds",
+            "-cp", appJar,
+            mainAppClass)
+            .assertNormalExit(output -> {
+                output.shouldHaveExitValue(0)
+                      .shouldContain(HELLO_WORLD)
+                      .shouldContain("Dumping shared data to file:")
+                      .shouldContain(TOP_NAME);
+                });
+        checkFileExists(TOP_NAME);
+
+        //10.02 run with the created dynamic archive should pass
+        print("    10.02 run with the created dynamic archive should pass");
+        run(TOP_NAME,
+            "-Xlog:cds",
+            "-Xlog:class+load",
+            "-cp", appJar,
+            mainAppClass)
+            .assertNormalExit(output -> {
+                output.shouldHaveExitValue(0)
+                      .shouldContain(HELLO_WORLD)
+                      .shouldContain(HELLO_SOURCE);
+                });
+        // remember the FileTime
+        FileTime ft1 = Files.getLastModifiedTime(Paths.get(TOP_NAME));
+
+        // 10.03 run with the created dynamic archive with -XX:+AutoCreateSharedArchive should pass
+        //      archive should not be created again.
+        print("    10.03 run with the created dynamic archive with -XX:+AutoCreateSharedArchive should pass");
+        run(TOP_NAME,
+            "-Xlog:cds",
+            "-Xlog:class+load",
+            "-Xlog:cds+dynamic=info",
+            "-XX:+AutoCreateSharedArchive",
+            "-cp", appJar,
+            mainAppClass)
+            .assertNormalExit(output -> {
+                output.shouldHaveExitValue(0)
+                      .shouldContain(HELLO_WORLD)
+                      .shouldContain(HELLO_SOURCE)
+                      .shouldNotContain("Dumping shared data to file");
+                });
+        FileTime ft2 = Files.getLastModifiedTime(Paths.get(TOP_NAME));
+        fileModified = !ft2.equals(ft1);
+        if (fileModified) {
+            throw new RuntimeException("Archive file " + TOP_NAME + "  should not be updated");
+        }
+
+        // 11 run with static archive
+        print("11 run with static archive");
+        ft1 = Files.getLastModifiedTime(Paths.get(BASE_NAME));
+        run(BASE_NAME,
+            "-Xlog:cds",
+            "-Xlog:cds+dynamic=info",
+            "-Xshare:auto",
+            "-XX:+AutoCreateSharedArchive",
+            verifySharedSpaces,
+            "-cp", appJar,
+            mainAppClass)
+            .assertNormalExit(output -> {
+                output.shouldHaveExitValue(0)
+                      .shouldContain(HELLO_WORLD)
+                      .shouldContain("AutoCreateSharedArchive is ignored because " + BASE_NAME + " is a static archive")
+                      .shouldNotContain("Dumping shared data to file");
+                });
+        ft2 = Files.getLastModifiedTime(Paths.get(BASE_NAME));
+        fileModified = !ft1.equals(ft2);
+        if (fileModified) {
+            throw new RuntimeException("Run -XX:+AutoCreateSharedArchive on static archive create new archive");
+        }
+
+        // 12 run with damaged magic should not regenerate dynamic archive
+        print("12 run with damaged magic should not regenerate dynamic archive");
+        String modMagic = startNewArchive("modify-magic");
+        File copiedJsa = CDSArchiveUtils.copyArchiveFile(archiveFile, modMagic);
+        CDSArchiveUtils.modifyHeaderIntField(copiedJsa, CDSArchiveUtils.offsetMagic(), 0x1234);
+        ft1 = Files.getLastModifiedTime(Paths.get(modMagic));
+
+        run(modMagic,
+            "-Xshare:auto",
+            "-XX:+AutoCreateSharedArchive",
+            "-Xlog:cds",
+            "-Xlog:cds+dynamic=info",
+            verifySharedSpaces,
+            "-cp", appJar,
+            mainAppClass)
+            .assertNormalExit(output -> {
+                output.shouldHaveExitValue(0)
+                      .shouldContain(HELLO_WORLD)
+                      .shouldNotContain("Dumping shared data to file");
+                });
+        ft2 = Files.getLastModifiedTime(Paths.get(modMagic));
+        fileModified = !ft1.equals(ft2);
+        if (fileModified) {
+            throw new RuntimeException("Shared archive " + modMagic + " should not automatically be generated");
+        }
+
+        // 13 run with a bad versioned (< genericHeaderMinVersion) archive
+        print("13 run with a bad versioned archive");
+        print("    13.01 run with a bad versioned (< genericHeaderMinVersion) archive should not create new archive");
+        String modVersion = startNewArchive("modify-version-b");
+        copiedJsa = CDSArchiveUtils.copyArchiveFile(archiveFile, modVersion);
+        final int version1 = genericHeaderMinVersion - 1;
+        CDSArchiveUtils.modifyHeaderIntField(copiedJsa, CDSArchiveUtils.offsetVersion(), version1);
+        ft1 = Files.getLastModifiedTime(Paths.get(modVersion));
+
+        run(modVersion,
+            "-Xshare:auto",
+            "-XX:+AutoCreateSharedArchive",
+            "-Xlog:cds",
+            "-Xlog:cds+dynamic=info",
+            verifySharedSpaces,
+            "-cp", appJar,
+            mainAppClass)
+            .assertNormalExit(output -> {
+                output.shouldHaveExitValue(0)
+                      .shouldContain(HELLO_WORLD)
+                      .shouldContain("Cannot handle shared archive file version " + version1 + ". Must be at least " + genericHeaderMinVersion)
+                      .shouldContain("Unable to use shared archive: invalid archive")
+                      .shouldNotContain("Dumping shared data to file");
+            });
+        ft2 = Files.getLastModifiedTime(Paths.get(modVersion));
+        fileModified = !ft1.equals(ft2);
+        if (fileModified) {
+            throw new RuntimeException("Run -XX:+AutoCreateSharedArchive with lower version archive " + modVersion + " should not create new archive");
+        }
+        //    13.02 run with a bad versioned (> currentCDSVersion) archive
+        print("    13.02 run with a bad versioned (> currentCDSVersion) archive");
+        modVersion = startNewArchive("modify-version-d");
+        copiedJsa = CDSArchiveUtils.copyArchiveFile(archiveFile, modVersion);
+        final int version2 = currentCDSVersion + 1;
+        CDSArchiveUtils.modifyHeaderIntField(copiedJsa, CDSArchiveUtils.offsetVersion(), version2);
+        ft1 = Files.getLastModifiedTime(Paths.get(modVersion));
+
+        run(modVersion,
+            "-Xshare:auto",
+            "-XX:+AutoCreateSharedArchive",
+            "-Xlog:cds",
+            "-Xlog:cds+dynamic=info",
+            verifySharedSpaces,
+            "-cp", appJar,
+            mainAppClass)
+            .assertNormalExit(output -> {
+                output.shouldHaveExitValue(0)
+                      .shouldContain(HELLO_WORLD)
+                      .shouldContain("The shared archive file version " + version2 + " does not match the required version " + currentCDSVersion)
+                      .shouldContain("UseSharedSpaces: The shared archive file has the wrong version")
+                      .shouldContain("UseSharedSpaces: Initialize dynamic archive failed")
+                      .shouldContain("Dumping shared data to file");
+            });
+        ft2 = Files.getLastModifiedTime(Paths.get(modVersion));
+        fileModified = !ft1.equals(ft2);
+        if (!fileModified) {
+            throw new RuntimeException("Run -XX:+AutoCreateSharedArchive with higher version archive " + modVersion + " should create new archive");
+        }
+
+        // 14 run with an archive whose base name is not matched, no share
+        print("14 run with an archive whose base name is not matched, no share");
+        String baseNameMismatch= startNewArchive("basename-mismatch");
+        copiedJsa = CDSArchiveUtils.copyArchiveFile(archiveFile, baseNameMismatch);
+        int nameSize = CDSArchiveUtils.baseArchiveNameSize(copiedJsa);
+        int offset = CDSArchiveUtils.baseArchiveNameOffset(copiedJsa);
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < nameSize - 4; i++) {
+            sb.append('Z');
+        }
+        sb.append(".jsa");
+        sb.append('\0');
+        String newName = sb.toString();
+        CDSArchiveUtils.writeData(copiedJsa, offset, newName.getBytes());
+
+        ft1 = Files.getLastModifiedTime(Paths.get(baseNameMismatch));
+        run(baseNameMismatch,
+            "-Xshare:auto",
+            "-XX:+AutoCreateSharedArchive",
+            "-Xlog:cds",
+            "-Xlog:cds+dynamic=info",
+            verifySharedSpaces,
+            "-cp", appJar,
+            mainAppClass)
+            .assertNormalExit(output -> {
+                output.shouldHaveExitValue(0)
+                      .shouldContain(HELLO_WORLD)
+                      .shouldNotContain("Dumping shared data to file");
+                });
+        ft2 = Files.getLastModifiedTime(Paths.get(baseNameMismatch));
+
+        fileModified = !ft1.equals(ft2);
+        if (fileModified) {
+            throw new RuntimeException("Shared archive " + baseNameMismatch+ " should not automatically be generated");
+        }
+
+        // 15 mismatched jvm_indent in archive, create (-VerifySharedSpaces) or not (-XX:+VerifySharedSpaces) create the new archive
+        print("15 mismatched jvm_indent in archive, " + (verifyOn ? "-XX:+VerifySharedSpaces not " : "-XX:-VerifySharedSpaces ") + "create new archive");
+        String modJvmIdent = startNewArchive("modify-jvmident");
+        copiedJsa = CDSArchiveUtils.copyArchiveFile(archiveFile, modJvmIdent);
+        CDSArchiveUtils.modifyHeaderIntField(copiedJsa, CDSArchiveUtils.offsetJvmIdent(), 0x65656565);
+        ft1 = Files.getLastModifiedTime(Paths.get(modJvmIdent));
+
+        run(modJvmIdent,
+            "-Xshare:auto",
+            "-XX:+AutoCreateSharedArchive",
+            "-Xlog:cds",
+            "-Xlog:cds+dynamic=info",
+            verifySharedSpaces,
+            "-cp", appJar,
+            mainAppClass)
+            .assertNormalExit(output -> {
+                output.shouldHaveExitValue(0);
+                if (verifyOn) {
+                    output.shouldContain("UseSharedSpaces: Header checksum verification failed")
+                          .shouldContain("Unable to use shared archive: invalid archive")
+                          .shouldNotContain("Dumping shared data to file");
+                } else {
+                    output.shouldContain(HELLO_WORLD)
+                          .shouldContain("Dumping shared data to file");
+                }
+            });
+        ft2 = Files.getLastModifiedTime(Paths.get(modJvmIdent));
+        fileModified = !ft1.equals(ft2);
+        if (verifyOn) {
+            if (fileModified) {
+                throw new RuntimeException("Shared archive " + modJvmIdent + " should not be generated");
+            }
+
+        } else {
+            if (!fileModified) {
+                throw new RuntimeException("Shared archive " + modJvmIdent + " should be generated");
+            }
+        }
+
+        // 16 run with an archive of only containing dynamic magic (size of 4) will not create new archive at exit
+        print("16 run with an archive of only containing dynamic magic (size of 4) will not create new archive at exit");
+        String magicOnly = startNewArchive("magic-only");
+        copiedJsa = CDSArchiveUtils.createMagicOnlyFile(magicOnly, false/*dynamic*/);
+        ft1 = Files.getLastModifiedTime(Paths.get(magicOnly));
+        run(magicOnly,
+            "-Xshare:auto",
+            "-XX:+AutoCreateSharedArchive",
+            "-Xlog:cds",
+            "-Xlog:cds+dynamic=info",
+            "-cp", appJar,
+            mainAppClass)
+            .assertNormalExit(output -> {
+                output.shouldHaveExitValue(0)
+                      .shouldContain(HELLO_WORLD)
+                      .shouldContain("Unable to read generic CDS file map header from shared archive")
+                      .shouldNotContain("Dumping shared data to file:");
+                });
+        ft2 = Files.getLastModifiedTime(Paths.get(magicOnly));
+        fileModified = !ft1.equals(ft2);
+        if (fileModified) {
+            throw new RuntimeException("Shared archive " + magicOnly + " should not automatically be generated");
+        }
+
+        // Do some base tests for -XX:SharedArchiveFile=base:top, they should be same as default archive as base.
+        // delete top archive
+        if (archiveFile.exists()) {
+            archiveFile.delete();
+        }
+        // delete base archive
+        File baseFile = new File(BASE_NAME);
+        if (baseFile.exists()) {
+            baseFile.delete();
+        }
+
+        // 20 Testing with -XX:SharedArchiveFile=base:top
+        print("20 Testing with -XX:SharedArchiveFile=base:top");
+        // 20.01 dump base archive and top archive
+        print("    20.01 dump base archive " + BASE_NAME);
+        dumpBaseArchive(BASE_NAME, "-Xlog:cds")
+            .assertNormalExit(output -> {
+                output.shouldHaveExitValue(0);
+            });
+        checkFileExists(BASE_NAME);
+
+        // 20.02 dump top based on base
+        print("    20.02 dump top based on base");
+        dump2(BASE_NAME, TOP_NAME,
+              "-Xlog:cds",
+              "-cp", appJar, mainAppClass)
+              .assertNormalExit(output -> {
+                  output.shouldHaveExitValue(0)
+                        .shouldContain("Dumping shared data to file:")
+                        .shouldContain(TOP_NAME);
+              });
+        checkFileExists(TOP_NAME);
+
+        // 20.03 run with -XX:SharedArchveFile=base:top
+        print("    20.03 run with -XX:SharedArchveFile=base:top");
+        run2(BASE_NAME, TOP_NAME,
+             "-Xlog:cds",
+             "-Xlog:cds+dynamic=info",
+             "-Xlog:class+load",
+             "-cp", appJar,
+             mainAppClass)
+            .assertNormalExit(output -> {
+                output.shouldHaveExitValue(0)
+                      .shouldContain(HELLO_SOURCE);
+            });
+
+        // 20.04 run with -XX:SharedArchveFile=top:base (reversed)
+        print("    20.04 run with -XX:SharedArchveFile=top:base (reversed)");
+        run2(TOP_NAME, BASE_NAME,
+             "-Xlog:cds",
+             "-Xlog:cds+dynamic=info",
+             "-Xlog:class+load",
+             "-cp", appJar,
+             mainAppClass)
+            .assertAbnormalExit(output -> {
+                output.shouldHaveExitValue(1)
+                      .shouldContain("Not a base shared archive: " + TOP_NAME)
+                      .shouldContain("An error has occurred while processing the shared archive file")
+                      .shouldNotContain(HELLO_WORLD);
+            });
+
+        // 21 Mismatched versions
+        print("21 Mismatched versions");
+        //   21.01 top version is lower than CDS_GENERIC_HEADER_SUPPORTED_MIN_VERSION, regenerate top
+        print("  21.01 top version is lower than CDS_GENERIC_HEADER_SUPPORTED_MIN_VERSION, regenerate top");
+        String versionB = startNewArchive("modify-version-B");
+        archiveFile = new File(TOP_NAME);
+        copiedJsa = CDSArchiveUtils.copyArchiveFile(archiveFile, versionB);
+        CDSArchiveUtils.modifyHeaderIntField(copiedJsa, CDSArchiveUtils.offsetVersion(), version1);
+        ft1 = Files.getLastModifiedTime(Paths.get(versionB));
+
+        run2(BASE_NAME, versionB,
+             "-Xshare:auto",
+             "-XX:+AutoCreateSharedArchive",
+             "-Xlog:cds",
+             "-Xlog:cds+dynamic=info",
+             verifySharedSpaces,
+             "-cp", appJar,
+             mainAppClass)
+             .assertNormalExit(output -> {
+                 output.shouldHaveExitValue(0)
+                       .shouldContain(HELLO_WORLD)
+                       .shouldContain("Cannot handle shared archive file version " + version1)
+                       .shouldContain(versionB)
+                       .shouldContain("Dumping shared data to file:");
+             });
+        ft2 = Files.getLastModifiedTime(Paths.get(versionB));
+        fileModified = !ft1.equals(ft2);
+        if (!fileModified) {
+            throw new RuntimeException("Shared archive " + versionB + " should automatically be generated");
+        }
+
+        //   21.02 top version is higher than CDS_GENERIC_HEADER_SUPPORTED_MIN_VERSION, no share for top, create archive at exit
+        print("  21.02 top version is higher than CDS_GENERIC_HEADER_SUPPORTED_MIN_VERSION, no share for top, create archive at exit");
+        String versionF = startNewArchive("versionF");
+        copiedJsa = CDSArchiveUtils.copyArchiveFile(archiveFile, versionF);
+        CDSArchiveUtils.modifyHeaderIntField(copiedJsa, CDSArchiveUtils.offsetVersion(), version2);
+        ft1 = Files.getLastModifiedTime(Paths.get(versionF));
+        run2(BASE_NAME, versionF,
+             "-Xshare:auto",
+             "-XX:+AutoCreateSharedArchive",
+             "-Xlog:cds",
+             "-Xlog:cds+dynamic=info",
+             verifySharedSpaces,
+             "-cp", appJar,
+             mainAppClass)
+             .assertNormalExit(output -> {
+                 output.shouldContain("The shared archive file version " + version2 + " does not match the required version " + currentCDSVersion)
+                       .shouldContain(HELLO_WORLD)
+                       .shouldContain("Dumping shared data to file:");
+             });
+        ft2 = Files.getLastModifiedTime(Paths.get(versionB));
+        fileModified = !ft1.equals(ft2);
+        if (!fileModified) {
+            throw new RuntimeException("Shared archive " + versionB + " should be created at exit");
+        }
+
+        // 22 create an archive with dynamic magic number only
+        //    archive will be created at exit if base can be shared.
+        print("22 create an archive with dynamic magic number only");
+        copiedJsa = CDSArchiveUtils.createMagicOnlyFile(magicOnly, false /*dynamic*/);
+        ft1 = Files.getLastModifiedTime(Paths.get(magicOnly));
+        run2(BASE_NAME, magicOnly,
+             "-Xshare:auto",
+             "-XX:+AutoCreateSharedArchive",
+             "-Xlog:cds",
+             "-Xlog:cds+dynamic=info",
+             verifySharedSpaces,
+             "-cp", appJar,
+             mainAppClass)
+             .assertNormalExit(output -> {
+                 output.shouldContain(HELLO_WORLD)
+                       .shouldContain("Unable to read generic CDS file map header from shared archive")
+                       .shouldContain("Dumping shared data to file:");
+             });
+        ft2 = Files.getLastModifiedTime(Paths.get(magicOnly));
+        fileModified = !ft1.equals(ft2);
+        if (!fileModified) {
+            throw new RuntimeException("Shared archive " + magicOnly + " should be created at exit");
+        }
+
+        // 23  mismatched jvm_indent in top or base archive
+        //    23.01 mismatched jvm_indent in top archive
+        print("    23.01  mismatched jvm_indent in top archive");
+        String modJvmIdentTop = startNewArchive("modify-jvmident-top");
+        copiedJsa = CDSArchiveUtils.copyArchiveFile(archiveFile, modJvmIdentTop);
+        CDSArchiveUtils.modifyHeaderIntField(copiedJsa, CDSArchiveUtils.offsetJvmIdent(), 0x65656565);
+        ft1 = Files.getLastModifiedTime(Paths.get(modJvmIdentTop));
+
+        run2(BASE_NAME, modJvmIdentTop,
+            "-Xshare:auto",
+            "-XX:+AutoCreateSharedArchive",
+            "-Xlog:cds",
+            "-Xlog:cds+dynamic=info",
+            verifySharedSpaces,
+            "-cp", appJar,
+            mainAppClass)
+            .assertNormalExit(output -> {
+                output.shouldHaveExitValue(0);
+                if (verifyOn) {
+                    output.shouldContain("UseSharedSpaces: Header checksum verification failed");
+                }
+                output.shouldContain(HELLO_WORLD)
+                      .shouldContain("Dumping shared data to file");
+            });
+        ft2 = Files.getLastModifiedTime(Paths.get(modJvmIdentTop));
+        fileModified = !ft1.equals(ft2);
+        if (!fileModified) {
+            throw new RuntimeException("Shared archive " + modJvmIdentTop + " should be generated");
+        }
+        //    23.02 mismatched jvm_indent in base archive
+        print("    23.02  mismatched jvm_indent in base archive");
+        String modJvmIdentBase = startNewArchive("modify-jvmident-base");
+        copiedJsa = CDSArchiveUtils.copyArchiveFile(new File(BASE_NAME), modJvmIdentBase);
+        CDSArchiveUtils.modifyHeaderIntField(copiedJsa, CDSArchiveUtils.offsetJvmIdent(), 0x65656565);
+        ft1 = Files.getLastModifiedTime(Paths.get(TOP_NAME));
+
+        run2(modJvmIdentBase, TOP_NAME,
+            "-Xshare:auto",
+            "-XX:+AutoCreateSharedArchive",
+            "-Xlog:cds",
+            "-Xlog:cds+dynamic=info",
+            verifySharedSpaces,
+            "-cp", appJar,
+            mainAppClass)
+            .assertNormalExit(output -> {
+                output.shouldHaveExitValue(0)
+                      .shouldContain(HELLO_WORLD);
+                if (verifyOn) {
+                    output.shouldContain("UseSharedSpaces: Header checksum verification failed");
+                }
+                output.shouldContain("Unable to map shared spaces")
+                      .shouldNotContain("Dumping shared data to file");
+            });
+        ft2 = Files.getLastModifiedTime(Paths.get(TOP_NAME));
+        fileModified = !ft1.equals(ft2);
+        if (fileModified) {
+            throw new RuntimeException("Shared archive " + TOP_NAME + " should not be generated");
+        }
+
+        // 24 run with non-existing shared archives
+        print("24 run with non-existing shared archives");
+        //   24.01 run -Xshare:auto -XX:+AutoCreateSharedArchive -XX:SharedArchiveFile=base.jsa:non-exist-top.jsa
+        print("    24.01 run -Xshare:auto -XX:+AutoCreateSharedArchive -XX:SharedArchiveFile=base.jsa:non-exist-top.jsa");
+        String nonExistTop = "non-existing-top.jsa";
+        File fileNonExist = new File(nonExistTop);
+        if (fileNonExist.exists()) {
+            fileNonExist.delete();
+        }
+        run2(BASE_NAME, nonExistTop,
+             "-Xshare:auto",
+             "-XX:+AutoCreateSharedArchive",
+             "-Xlog:cds",
+             "-Xlog:cds+dynamic=info",
+             verifySharedSpaces,
+             "-cp", appJar,
+             mainAppClass)
+             .assertNormalExit(output -> {
+                 output.shouldContain("Specified shared archive not found (" + nonExistTop + ")")
+                       .shouldContain(HELLO_WORLD)
+                       .shouldContain("Dumping shared data to file:");
+             });
+        if (!fileNonExist.exists()) {
+            throw new RuntimeException("Shared archive " + nonExistTop + " should be created at exit");
+        }
+
+        //    24.02 run -Xshare:auto -XX:+AutoCreateSharedArchive -XX:SharedArchiveFile=non-exist-base.jsa:top.jsa
+        print("    24.02 run -Xshare:auto -XX:+AutoCreateSharedArchive -XX:SharedArchiveFile=non-exist-base.jsa:top.jsa");
+        String nonExistBase = "non-existing-base.jsa";
+        fileNonExist = new File(nonExistBase);
+        if (fileNonExist.exists()) {
+            fileNonExist.delete();
+        }
+        ft1 = Files.getLastModifiedTime(Paths.get(TOP_NAME));
+        run2(nonExistBase, TOP_NAME,
+             "-Xshare:auto",
+             "-XX:+AutoCreateSharedArchive",
+             "-Xlog:cds",
+             "-Xlog:cds+dynamic=info",
+             verifySharedSpaces,
+             "-cp", appJar,
+             mainAppClass)
+             .assertNormalExit(output -> {
+                 output.shouldContain("Specified shared archive not found (" + nonExistBase + ")")
+                       .shouldContain(HELLO_WORLD)
+                       .shouldNotContain("Dumping shared data to file:");
+             });
+        ft2 = Files.getLastModifiedTime(Paths.get(TOP_NAME));
+        fileModified = !ft1.equals(ft2);
+        if (fileModified) {
+            throw new RuntimeException("Shared archive " + TOP_NAME + " should not be created at exit");
+        }
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/TestAutoCreateSharedArchiveNoDefaultArchive.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/TestAutoCreateSharedArchiveNoDefaultArchive.java
new file mode 100644
index 0000000000000000000000000000000000000000..d2db4a3b2ad76fabca96b92914a3eb9db4ef8962
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/TestAutoCreateSharedArchiveNoDefaultArchive.java
@@ -0,0 +1,147 @@
+/*
+ * Copyright (c) 2022, 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 Test -XX:+AutoCreateSharedArchive on a copied JDK without default shared archive
+ * @bug 8261455
+ * @requires vm.cds
+ * @requires vm.flagless
+ * @comment This test doesn't work on Windows because it depends on symlinks
+ * @requires os.family != "windows"
+ * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
+ * @compile ../test-classes/Hello.java
+ * @run driver TestAutoCreateSharedArchiveNoDefaultArchive
+ */
+
+import java.io.File;
+import jdk.test.lib.cds.CDSTestUtils;
+import jdk.test.lib.process.OutputAnalyzer;
+
+public class TestAutoCreateSharedArchiveNoDefaultArchive {
+    public static void main(String[] args) throws Exception {
+        String mainClass = "Hello";
+        String java_home_src = System.getProperty("java.home");
+        String java_home_dst = CDSTestUtils.getOutputDir() + File.separator + "moved_jdk";
+        CDSTestUtils.clone(new File(java_home_src), new File(java_home_dst));
+        System.out.println("======== Cloned JDK at " + java_home_dst);
+
+        String homeJava = java_home_src + File.separator + "bin" + File.separator + "java";
+        String dstJava  = java_home_dst + File.separator + "bin" + File.separator + "java";
+
+        TestCommon.startNewArchiveName();
+        String jsaFileName = TestCommon.getCurrentArchiveName();
+        File jsaFile = new File(jsaFileName);
+        if (jsaFile.exists()) {
+            jsaFile.delete();
+        }
+
+        String jsaOpt = "-XX:SharedArchiveFile=" + jsaFileName;
+        String autoCreateArchive = "-XX:+AutoCreateSharedArchive";
+        {
+            ProcessBuilder pb = CDSTestUtils.makeBuilder(homeJava,
+                                                         "-Xshare:dump",
+                                                         jsaOpt);
+            TestCommon.executeAndLog(pb, "dump")
+                      .shouldHaveExitValue(0);
+        }
+        {
+            ProcessBuilder pb = CDSTestUtils.makeBuilder(homeJava,
+                                                         "-Xshare:auto",
+                                                         jsaOpt,
+                                                         "-Xlog:class+path=info",
+                                                         "-version");
+            OutputAnalyzer out = TestCommon.executeAndLog(pb, "exec-src");
+            out.shouldHaveExitValue(0);
+            out.shouldNotContain("shared class paths mismatch");
+            out.shouldNotContain("BOOT classpath mismatch");
+        }
+
+        String helloJar = JarBuilder.getOrCreateHelloJar();
+
+        if (jsaFile.exists()) {
+            jsaFile.delete();
+        }
+        // Test runtime with cloned JDK
+        System.out.println("======== run with cloned jdk to created dynamic shared archive at exit");
+        {
+            ProcessBuilder pb = CDSTestUtils.makeBuilder(dstJava,
+                                                         "-Xshare:auto",
+                                                         autoCreateArchive,
+                                                         jsaOpt,
+                                                         "-Xlog:cds",
+                                                         "-Xlog:class+path=info",
+                                                         "-cp", helloJar,
+                                                         mainClass);
+            OutputAnalyzer out = TestCommon.executeAndLog(pb, "exec-dst");
+            out.shouldHaveExitValue(0);
+            out.shouldContain("Dumping shared data to file");
+            if (!jsaFile.exists()) {
+                throw new RuntimeException("Shared archive " + jsaFileName + " should be created at exit");
+            }
+        }
+
+        // Now rename classes.jsa to old-classes.jsa
+        String dstDir = java_home_dst + File.separator + "lib" + File.separator + "server";
+        CDSTestUtils.rename(new File(dstDir + File.separator +  "classes.jsa"),
+                            new File(dstDir + File.separator +  "old-classes.jsa"));
+        System.out.println("======= renamed classes.jsa to old-classes.jsa");
+
+        {
+            ProcessBuilder pb = CDSTestUtils.makeBuilder(dstJava,
+                                                         "-Xlog:cds",
+                                                         "-version");
+            TestCommon.executeAndLog(pb, "show-version")
+                      .shouldHaveExitValue(0)
+                      .shouldContain("UseSharedSpaces: Initialize static archive failed")
+                      .shouldContain("UseSharedSpaces: Unable to map shared spaces")
+                      .shouldContain("mixed mode")
+                      .shouldNotContain("sharing");
+        }
+        // delete existing jsa file
+        if (jsaFile.exists()) {
+            jsaFile.delete();
+        }
+        System.out.println("======= run with no default shared archive should not create shared archive at exit");
+        {
+            ProcessBuilder pb = CDSTestUtils.makeBuilder(dstJava,
+                                                         "-Xshare:auto",
+                                                         autoCreateArchive,
+                                                         jsaOpt,
+                                                         "-Xlog:cds",
+                                                         "-Xlog:class+path=info",
+                                                         "-cp", helloJar,
+                                                         mainClass);
+            TestCommon.executeAndLog(pb, "no-default-archive")
+                      .shouldHaveExitValue(0)
+                      .shouldContain("UseSharedSpaces: Initialize static archive failed")
+                      .shouldContain("UseSharedSpaces: Unable to map shared spaces")
+                      .shouldNotContain("Dumping shared data to file");
+            if (jsaFile.exists()) {
+                throw new RuntimeException("Archive file " + jsaFileName + " should not be created at exit");
+            }
+        }
+
+    }
+}
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/jcmd/JCmdTestDynamicDump.java b/test/hotspot/jtreg/runtime/cds/appcds/jcmd/JCmdTestDynamicDump.java
index 72cb5c24d9a553b3dcd8b3906a1a501a89337800..61ec63258549b2be6511fba3d2089b5e422d2b80 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/jcmd/JCmdTestDynamicDump.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jcmd/JCmdTestDynamicDump.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -117,6 +117,17 @@ public class JCmdTestDynamicDump extends JCmdTestDumpBase {
                 throw new RuntimeException("The JCmdTestLingeredApp should not start up!");
             }
         }
+        // Test dynamic dump with -Xlog:cds to check lambda invoker class regeneration
+        print2ln(test_count++ + " Test dynamic dump with -Xlog:cds to check lambda invoker class regeneration");
+        app = createLingeredApp("-cp", allJars, "-XX:+RecordDynamicDumpInfo", "-Xlog:cds",
+                                "-XX:SharedArchiveFile=" + archiveFile);
+        pid = app.getPid();
+        test(null, pid, noBoot, EXPECT_PASS, DYNAMIC_MESSAGES);
+        String stdout = app.getProcessStdout();
+        if (stdout.contains("Regenerate MethodHandle Holder classes...")) {
+            throw new RuntimeException("jcmd VM.cds dynamic_dump should not regenerate MethodHandle Holder classes");
+        }
+        app.stopApp();
     }
 
     // Dump a static archive, not using TestCommon.dump(...), we do not take jtreg args.
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/OptimizeModuleHandlingTest.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/OptimizeModuleHandlingTest.java
index 189559a46618dd2b72bd672f88ef164a640549ab..eecc218a71aa305d270596a5b3a8c03f7c4ad040 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/OptimizeModuleHandlingTest.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/OptimizeModuleHandlingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, 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
@@ -219,6 +219,16 @@ public class OptimizeModuleHandlingTest {
                        "-Xbootclasspath/a:", ".",
                        "--module-path", libsDir.toString(),
                        MAIN_CLASS)
+            .assertAbnormalExit(out -> {
+                out.shouldNotContain(CLASS_FOUND_MESSAGE)
+                   .shouldContain(OPTIMIZE_DISABLED)           // mapping info
+                   .shouldContain("Error: Could not find or load main class .");
+            });
+        tty("11. run with CDS on, --module-path, with -Xbootclasspath/a:.");
+        TestCommon.run("-Xlog:cds",
+                       "-Xbootclasspath/a:.",
+                       "--module-path", libsDir.toString(),
+                       MAIN_CLASS)
             .assertAbnormalExit(out -> {
                 out.shouldNotContain(CLASS_FOUND_MESSAGE)
                    .shouldContain(OPTIMIZE_DISABLED)           // mapping info
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/loaderConstraints/DynamicLoaderConstraintsTest.java b/test/hotspot/jtreg/runtime/cds/appcds/loaderConstraints/DynamicLoaderConstraintsTest.java
index e983b5a7aecea943407b3e69a8ff349cd27f123e..67cc06e38ca03c7e73b079a56f06fe73257ad0d2 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/loaderConstraints/DynamicLoaderConstraintsTest.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/loaderConstraints/DynamicLoaderConstraintsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, 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
@@ -130,7 +130,7 @@ public class DynamicLoaderConstraintsTest extends DynamicArchiveTestBase {
   static void doTest(boolean errorInDump) throws Exception  {
         for (int i = 1; i <= 3; i++) {
             System.out.println("========================================");
-            System.out.println("errorInDump: " + errorInDump + ", useCustomLoader: " + useCustomLoader + ", case: " + i);
+            System.out.println("errorInDump: " + errorInDump + ", useCustomLoader: " + useCustomLoader + ", useZGC: " + useZGC + ", case: " + i);
             System.out.println("========================================");
             String topArchiveName = getNewArchiveName();
             String testCase = Integer.toString(i);
@@ -148,6 +148,7 @@ public class DynamicLoaderConstraintsTest extends DynamicArchiveTestBase {
                     cmdLine = TestCommon.concat(cmdLine, "-cp", loaderJar,
                                                 "-XX:+UseZGC", "-XX:ZCollectionInterval=0.01",
                                                 loaderMainClass, appJar);
+                    setBaseArchiveOptions("-XX:+UseZGC", "-Xlog:cds");
                 } else {
                     cmdLine = TestCommon.concat(cmdLine, "-cp", loaderJar,
                                                 loaderMainClass, appJar);
diff --git a/test/hotspot/jtreg/runtime/logging/ThreadLoggingTest.java b/test/hotspot/jtreg/runtime/logging/ThreadLoggingTest.java
index 82a189a92cbe2abc1e05015af6dbbde1ff5fdd59..d98fc455319386c806d9722ed4d361b689d55d40 100644
--- a/test/hotspot/jtreg/runtime/logging/ThreadLoggingTest.java
+++ b/test/hotspot/jtreg/runtime/logging/ThreadLoggingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016 SAP SE and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -24,7 +24,7 @@
 
 /*
  * @test
- * @bug 8149036 8150619
+ * @bug 8149036 8150619 8277531
  * @summary os+thread output should contain logging calls for thread start stop attaches detaches
  * @requires vm.flagless
  * @library /test/lib
@@ -36,6 +36,7 @@
 
 import java.io.File;
 import java.util.Map;
+import jdk.test.lib.Platform;
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
 
@@ -43,7 +44,11 @@ public class ThreadLoggingTest {
 
     static void analyzeOutputForInfoLevel(OutputAnalyzer output) throws Exception {
         output.shouldMatch("Thread .* started");
-        output.shouldContain("Thread is alive");
+        if (Platform.isWindows()) {
+            output.shouldMatch("Thread is alive \\(tid: [0-9]+, stacksize: [0-9]+k\\)");
+        } else {
+            output.shouldContain("Thread is alive");
+        }
         output.shouldContain("Thread finished");
         output.shouldHaveExitValue(0);
     }
diff --git a/test/hotspot/jtreg/runtime/modules/AccessCheck/MethodAccessReadTwice.java b/test/hotspot/jtreg/runtime/modules/AccessCheck/MethodAccessReadTwice.java
index 29bbe7f39b0f0f29b3d5bb59d4fd639b76518692..d6b85ced2576be3fb576d7b804c27613cc72de04 100644
--- a/test/hotspot/jtreg/runtime/modules/AccessCheck/MethodAccessReadTwice.java
+++ b/test/hotspot/jtreg/runtime/modules/AccessCheck/MethodAccessReadTwice.java
@@ -29,8 +29,8 @@
  *          after the module read edge is added.
  * @compile ModuleLibrary.java
  *          p2/c2.java
- *          p5/c5.java
- *          p7/c7.java
+ *          p5/c5.jasm
+ *          p7/c7.jasm
  * @run main/othervm MethodAccessReadTwice
  */
 
diff --git a/test/hotspot/jtreg/runtime/modules/AccessCheck/p5/c5.jasm b/test/hotspot/jtreg/runtime/modules/AccessCheck/p5/c5.jasm
new file mode 100644
index 0000000000000000000000000000000000000000..b1178eaab6c1f2b50346695519ba46846983b0df
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/modules/AccessCheck/p5/c5.jasm
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2021, Google LLC. 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 input for the fix for JDK-8174954, which checks for an expected
+ * IllegalAccessError when the parameter type of an invokedynamic is
+ * inaccessible.
+ *
+ * The test assumes that given the string concatenation expression "" + param,
+ * javac generates an invokedynamic that uses the specific type of param. The
+ * fix for JDK-8273914 make javac eagerly convert param to a String before
+ * passing it to the invokedynamic call, which avoids the accessibility issue
+ * the test is trying to exercise.
+ *
+ * This jasm file contains the bytecode javac generated before the fix for
+ * JDK-8273914, to continue to exercise the invokedynamic behaviour that
+ * JDK-8174954 is testing.
+ */
+
+package  p5;
+
+super public class c5
+	version 61:0
+{
+  public Method "":"()V"
+	stack 1 locals 1
+  {
+		aload_0;
+		invokespecial	Method java/lang/Object."":"()V";
+		return;
+  }
+  public Method method5:"(Lp2/c2;)V"
+	stack 2 locals 2
+  {
+		getstatic	Field java/lang/System.out:"Ljava/io/PrintStream;";
+		aload_1;
+		invokedynamic	InvokeDynamic REF_invokeStatic:Method java/lang/invoke/StringConcatFactory.makeConcatWithConstants:"(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/invoke/CallSite;":makeConcatWithConstants:"(Lp2/c2;)Ljava/lang/String;" {
+			String "In c5\'s method5 with param = "
+		};
+		invokevirtual	Method java/io/PrintStream.println:"(Ljava/lang/String;)V";
+		return;
+  }
+  public Method methodAddReadEdge:"(Ljava/lang/Module;)V"
+	stack 2 locals 2
+  {
+		ldc	class c5;
+		invokevirtual	Method java/lang/Class.getModule:"()Ljava/lang/Module;";
+		aload_1;
+		invokevirtual	Method java/lang/Module.addReads:"(Ljava/lang/Module;)Ljava/lang/Module;";
+		pop;
+		return;
+  }
+
+  public static final InnerClass Lookup=class java/lang/invoke/MethodHandles$Lookup of class java/lang/invoke/MethodHandles;
+
+} // end Class c5
diff --git a/test/hotspot/jtreg/runtime/modules/AccessCheck/p7/c7.jasm b/test/hotspot/jtreg/runtime/modules/AccessCheck/p7/c7.jasm
new file mode 100644
index 0000000000000000000000000000000000000000..6ca4e6850e3e031f8bcce0ea7e75c7f3034c2dea
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/modules/AccessCheck/p7/c7.jasm
@@ -0,0 +1,113 @@
+/*
+ * Copyright (c) 2021, Google LLC. 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 input for the fix for JDK-8174954, which checks for an expected
+ * IllegalAccessError when the parameter type of an invokedynamic is
+ * inaccessible.
+ *
+ * The test assumes that given the string concatenation expression "" + param,
+ * javac generates an invokedynamic that uses the specific type of param. The
+ * fix for JDK-8273914 make javac eagerly convert param to a String before
+ * passing it to the invokedynamic call, which avoids the accessibility issue
+ * the test is trying to exercise.
+ *
+ * This jasm file contains the bytecode javac generated before the fix for
+ * JDK-8273914, to continue to exercise the invokedynamic behaviour that
+ * JDK-8174954 is testing.
+ */
+
+package  p7;
+
+super public class c7
+	version 61:0
+{
+  public Method "":"()V"
+	stack 1 locals 1
+  {
+		aload_0;
+		invokespecial	Method java/lang/Object."":"()V";
+		return;
+  }
+  public Method method7:"(Lp2/c2;Ljava/lang/Module;)V"
+	stack 3 locals 4
+  {
+		try t0;
+		getstatic	Field java/lang/System.out:"Ljava/io/PrintStream;";
+		aload_1;
+		invokedynamic	InvokeDynamic REF_invokeStatic:Method java/lang/invoke/StringConcatFactory.makeConcatWithConstants:"(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/invoke/CallSite;":makeConcatWithConstants:"(Lp2/c2;)Ljava/lang/String;" {
+			String "In c7\'s method7 with param = "
+		};
+		invokevirtual	Method java/io/PrintStream.println:"(Ljava/lang/String;)V";
+		new	class java/lang/RuntimeException;
+		dup;
+		ldc	String "c7 failed to throw expected IllegalAccessError";
+		invokespecial	Method java/lang/RuntimeException."":"(Ljava/lang/String;)V";
+		athrow;
+		endtry t0;
+		catch t0 java/lang/IllegalAccessError;
+		stack_frame_type stack1;
+		stack_map class java/lang/IllegalAccessError;
+		astore_3;
+		aload_0;
+		aload_2;
+		invokevirtual	Method methodAddReadEdge:"(Ljava/lang/Module;)V";
+		try t1;
+		getstatic	Field java/lang/System.out:"Ljava/io/PrintStream;";
+		aload_1;
+		invokedynamic	InvokeDynamic REF_invokeStatic:Method java/lang/invoke/StringConcatFactory.makeConcatWithConstants:"(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/invoke/CallSite;":makeConcatWithConstants:"(Lp2/c2;)Ljava/lang/String;" {
+			String "In c7\'s method7 with param = "
+		};
+		invokevirtual	Method java/io/PrintStream.println:"(Ljava/lang/String;)V";
+		endtry t1;
+		goto	L61;
+		catch t1 java/lang/IllegalAccessError;
+		stack_frame_type stack1;
+		stack_map class java/lang/IllegalAccessError;
+		astore_3;
+		new	class java/lang/RuntimeException;
+		dup;
+		aload_3;
+		invokevirtual	Method java/lang/IllegalAccessError.getMessage:"()Ljava/lang/String;";
+		invokedynamic	InvokeDynamic REF_invokeStatic:Method java/lang/invoke/StringConcatFactory.makeConcatWithConstants:"(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/invoke/CallSite;":makeConcatWithConstants:"(Ljava/lang/String;)Ljava/lang/String;" {
+			String "Unexpected IllegalAccessError: "
+		};
+		invokespecial	Method java/lang/RuntimeException."":"(Ljava/lang/String;)V";
+		athrow;
+	L61:	stack_frame_type same;
+		return;
+  }
+  public Method methodAddReadEdge:"(Ljava/lang/Module;)V"
+	stack 2 locals 2
+  {
+		ldc	class c7;
+		invokevirtual	Method java/lang/Class.getModule:"()Ljava/lang/Module;";
+		aload_1;
+		invokevirtual	Method java/lang/Module.addReads:"(Ljava/lang/Module;)Ljava/lang/Module;";
+		pop;
+		return;
+  }
+
+  public static final InnerClass Lookup=class java/lang/invoke/MethodHandles$Lookup of class java/lang/invoke/MethodHandles;
+
+} // end Class c7
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbThreadContext.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbThreadContext.java
new file mode 100644
index 0000000000000000000000000000000000000000..207978ba5c688e7e3a883c8d50608377907d9f61
--- /dev/null
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbThreadContext.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2021, 2022, 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 jdk.test.lib.apps.LingeredApp;
+import jtreg.SkippedException;
+
+/**
+ * @test
+ * @summary Test clhsdb where command
+ * @requires vm.hasSA
+ * @library /test/lib
+ * @run main/othervm ClhsdbThreadContext
+ */
+
+public class ClhsdbThreadContext {
+    public static void main(String[] args) throws Exception {
+        System.out.println("Starting ClhsdbThreadContext test");
+
+        LingeredApp theApp = null;
+        try {
+            ClhsdbLauncher test = new ClhsdbLauncher();
+            theApp = LingeredApp.startApp();
+            System.out.println("Started LingeredApp with pid " + theApp.getPid());
+
+            // Run threadcontext on all threads
+            String cmdStr = "threadcontext -a";
+            List cmds = List.of(cmdStr);
+            Map> expStrMap = new HashMap<>();
+            expStrMap.put(cmdStr, List.of(
+                    "Thread \"Common-Cleaner\"",
+                    "Thread \"Service Thread\"",
+                    "Thread \"Finalizer\"",
+                    "Thread \"SteadyStateThread\"",
+                    "In java stack for thread \"SteadyStateThread\""));
+            String cmdOutput = test.run(theApp.getPid(), cmds, expStrMap, null);
+
+            // Run threadcontext on all threads in verbose mode
+            cmdStr = "threadcontext -v -a";
+            cmds = List.of(cmdStr);
+            expStrMap = new HashMap<>();
+            expStrMap.put(cmdStr, List.of(
+                    "Thread \"Common-Cleaner\"",
+                    "Thread \"Service Thread\"",
+                    "Thread \"Finalizer\"",
+                    "Thread \"SteadyStateThread\""));
+            Map> unexpStrMap = new HashMap<>();
+            unexpStrMap.put(cmdStr, List.of(
+                    "In java stack for thread \"SteadyStateThread\""));
+            test.run(theApp.getPid(), cmds, expStrMap, unexpStrMap);
+
+            // Look for a line like the following and parse the threadID out of it.
+            //    Thread "SteadyStateThread" id=18010 Address=0x000014bf103eaf50
+            String[] parts = cmdOutput.split("Thread \"SteadyStateThread\" id=");
+            String[] tokens = parts[1].split(" ");
+            String threadID = tokens[0];
+
+            // Run threadcontext on the SteadyStateThread in verbose mode
+            cmdStr = "threadcontext -v " + threadID;
+            cmds = List.of(cmdStr);
+            expStrMap = new HashMap<>();
+            expStrMap.put(cmdStr, List.of(
+                    "Thread \"SteadyStateThread\"",
+                    "java.lang.Thread.State: BLOCKED",
+                    "In java stack \\[0x\\p{XDigit}+,0x\\p{XDigit}+,0x\\p{XDigit}+\\] for thread"));
+            unexpStrMap = new HashMap<>();
+            unexpStrMap.put(cmdStr, List.of(
+                    "Thread \"Common-Cleaner\"",
+                    "Thread \"Service Thread\"",
+                    "Thread \"Finalizer\""));
+            test.run(theApp.getPid(), cmds, expStrMap, unexpStrMap);
+
+            // Run threadcontext on all threads in verbose mode
+
+        } catch (SkippedException se) {
+            throw se;
+        } catch (Exception ex) {
+            throw new RuntimeException("Test ERROR " + ex, ex);
+        } finally {
+            LingeredApp.stopApp(theApp);
+        }
+
+        System.out.println("Test PASSED");
+    }
+}
diff --git a/test/hotspot/jtreg/serviceability/sa/TestObjectMonitorIterate.java b/test/hotspot/jtreg/serviceability/sa/TestObjectMonitorIterate.java
index 5f1e6c48f5f98e2bed92b705b9636eb939d90529..e2d79b1ce9df751fd5592f343067e977b95e4eda 100644
--- a/test/hotspot/jtreg/serviceability/sa/TestObjectMonitorIterate.java
+++ b/test/hotspot/jtreg/serviceability/sa/TestObjectMonitorIterate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2021, NTT DATA.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -59,8 +59,12 @@ public class TestObjectMonitorIterate {
 
             while (itr.hasNext()) {
                 ObjectMonitor mon = (ObjectMonitor)itr.next();
-                Oop oop = heap.newOop(mon.object());
-                System.out.println("Monitor found: " + oop.getKlass().getName().asString());
+                if (mon.object() == null) {
+                    System.out.println("Monitor found: object is null");
+                } else {
+                    Oop oop = heap.newOop(mon.object());
+                    System.out.println("Monitor found: " + oop.getKlass().getName().asString());
+                }
             }
         } finally {
             agent.detach();
diff --git a/test/hotspot/jtreg/serviceability/sa/sadebugd/SADebugDTest.java b/test/hotspot/jtreg/serviceability/sa/sadebugd/SADebugDTest.java
index a0bbdbc809b0c4c5fc8f6fd8dfe4ffff122ed70e..49f90f7f9fd155515c6773dc6b4f3c840f01c7b2 100644
--- a/test/hotspot/jtreg/serviceability/sa/sadebugd/SADebugDTest.java
+++ b/test/hotspot/jtreg/serviceability/sa/sadebugd/SADebugDTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2022, 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 8163805 8224252 8196751
+ * @bug 8163805 8224252 8196751 8279351
  * @summary Checks that the jshdb debugd utility successfully starts
  *          and tries to attach to a running process
  * @requires vm.hasSA
@@ -71,6 +71,16 @@ public class SADebugDTest {
         }
     }
 
+    private static boolean checkOutput(final String line, final boolean useRmiPort, final int rmiPort) {
+        if (!useRmiPort && line.contains(GOLDEN)) {
+            testResult = true;
+        } else if (useRmiPort && line.contains(RMI_CONNECTOR_IS_BOUND + rmiPort)) {
+            testResult = true;
+        } else if (line.contains(ADDRESS_ALREADY_IN_USE)) {
+            portInUse = true;
+        }
+        return (line.contains(GOLDEN) || portInUse);
+    }
 
     private static void testWithPid(final boolean useRmiPort, final boolean useRegistryPort, final boolean useHostName) throws Exception {
         LingeredApp app = null;
@@ -95,9 +105,8 @@ public class SADebugDTest {
                     jhsdbLauncher.addToolArg(Integer.toString(registryPort));
                 }
 
-                int rmiPort = -1;
+                final int rmiPort = useRmiPort ? Utils.findUnreservedFreePort(REGISTRY_DEFAULT_PORT, registryPort) : -1;
                 if (useRmiPort) {
-                    rmiPort = Utils.findUnreservedFreePort(REGISTRY_DEFAULT_PORT, registryPort);
                     jhsdbLauncher.addToolArg("--rmiport");
                     jhsdbLauncher.addToolArg(Integer.toString(rmiPort));
                 }
@@ -107,28 +116,16 @@ public class SADebugDTest {
                 }
                 ProcessBuilder pb = SATestUtils.createProcessBuilder(jhsdbLauncher);
 
-                final int finalRmiPort = rmiPort;
-
                 // The startProcess will block until the 'golden' string appears in either process' stdout or stderr
                 // In case of timeout startProcess kills the debugd process
-                Process debugd = startProcess("debugd", pb, null,
-                        l -> {
-                            if (!useRmiPort && l.contains(GOLDEN)) {
-                                testResult = true;
-                            } else if (useRmiPort && l.contains(RMI_CONNECTOR_IS_BOUND + finalRmiPort)) {
-                                testResult = true;
-                            } else if (l.contains(ADDRESS_ALREADY_IN_USE)) {
-                                portInUse = true;
-                            }
-                            return (l.contains(GOLDEN) || portInUse);
-                        }, 20, TimeUnit.SECONDS);
+                Process debugd = startProcess("debugd", pb, null, l -> checkOutput(l, useRmiPort, rmiPort), 20, TimeUnit.SECONDS);
 
                 // If we are here, this means we have received the golden line and the test has passed
                 // The debugd remains running, we have to kill it
                 debugd.destroy();
                 debugd.waitFor();
 
-                if (!testResult) {
+                if (!testResult && !portInUse) {
                     throw new RuntimeException("Expected message \"" +
                             RMI_CONNECTOR_IS_BOUND + rmiPort + "\" is not found in the output.");
                 }
diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index 2bd5819f82dfb5df8f5f55300bca0cd8de3ee7ce..6b54c726277cfa24685bd9f2be20ce08da22adb5 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -242,7 +242,6 @@ sun/awt/shell/ShellFolderMemoryLeak.java 8197794 windows-all
 sun/java2d/DirectX/OnScreenRenderingResizeTest/OnScreenRenderingResizeTest.java 8022403 generic-all
 sun/java2d/DirectX/OverriddenInsetsTest/OverriddenInsetsTest.java 8196102 generic-all
 sun/java2d/DirectX/RenderingToCachedGraphicsTest/RenderingToCachedGraphicsTest.java 8196180 windows-all,macosx-all
-java/awt/Graphics2D/CopyAreaOOB.java 7001973 windows-all,macosx-all
 sun/java2d/SunGraphics2D/EmptyClipRenderingTest.java 8144029 macosx-all,linux-all
 sun/java2d/SunGraphics2D/DrawImageBilinear.java 8191406 generic-all
 sun/java2d/SunGraphics2D/PolyVertTest.java 6986565 generic-all
@@ -517,6 +516,7 @@ java/awt/KeyboardFocusmanager/TypeAhead/ButtonActionKeyTest/ButtonActionKeyTest.
 java/awt/Window/GetScreenLocation/GetScreenLocationTest.java 8225787 linux-x64
 java/awt/Dialog/MakeWindowAlwaysOnTop/MakeWindowAlwaysOnTop.java 8266243 macosx-aarch64
 java/awt/dnd/BadSerializationTest/BadSerializationTest.java 8277817 linux-x64,windows-x64
+java/awt/GraphicsDevice/CheckDisplayModes.java 8266242 macosx-aarch64
 
 ############################################################################
 
@@ -606,6 +606,8 @@ java/nio/channels/DatagramChannel/Unref.java                    8233519 generic-
 
 java/nio/channels/AsynchronousSocketChannel/StressLoopback.java 8211851 aix-ppc64
 
+java/nio/channels/DatagramChannel/ManySourcesAndTargets.java    8264385 macosx-aarch64
+
 ############################################################################
 
 # jdk_rmi
@@ -669,6 +671,7 @@ javax/security/auth/kerberos/KerberosTixDateTest.java           8039280 generic-
 sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.java 8039280 generic-all
 sun/security/provider/PolicyParser/ExtDirsChange.java           8039280 generic-all
 sun/security/provider/PolicyParser/PrincipalExpansionError.java 8039280 generic-all
+sun/security/ssl/SSLSessionImpl/NoInvalidateSocketException.java 8277970 linux-all,macosx-x64
 
 ############################################################################
 
@@ -822,7 +825,8 @@ jdk/jfr/event/compiler/TestCodeSweeper.java                     8225209 generic-
 jdk/jfr/event/os/TestThreadContextSwitches.java                 8247776 windows-all
 jdk/jfr/startupargs/TestStartName.java                          8214685 windows-x64
 jdk/jfr/startupargs/TestStartDuration.java                      8214685 windows-x64
-jdk/jfr/event/oldobject/TestLargeRootSet.java                   8276333 macosx-x64,windows-x64
+jdk/jfr/event/oldobject/TestLargeRootSet.java                   8276333 generic-x64
+jdk/jfr/api/consumer/recordingstream/TestOnEvent.java           8255404 linux-x64
 
 ############################################################################
 
diff --git a/test/jdk/com/sun/jdi/TestScaffold.java b/test/jdk/com/sun/jdi/TestScaffold.java
index 18da0b4e9c75d26cb38577285b31eb94f61b0d8a..2d4885c90e7764315e29a8e59030630ef1bde2b9 100644
--- a/test/jdk/com/sun/jdi/TestScaffold.java
+++ b/test/jdk/com/sun/jdi/TestScaffold.java
@@ -535,16 +535,15 @@ abstract public class TestScaffold extends TargetAdapter {
                         Location loc = ((Locatable)event).location();
                         ReferenceType rt = loc.declaringType();
                         String name = rt.name();
-                        if (name.startsWith("java.") &&
-                                       !name.startsWith("sun.") &&
-                                       !name.startsWith("com.")) {
+                        if (name.startsWith("java.")
+                            || name.startsWith("sun.")
+                            || name.startsWith("com.")
+                            || name.startsWith("jdk.")) {
                             if (mainStartClass != null) {
                                 redefine(mainStartClass);
                             }
                         } else {
-                            if (!name.startsWith("jdk.")) {
-                                redefine(rt);
-                            }
+                            redefine(rt);
                         }
                     }
                 }
diff --git a/test/jdk/com/sun/jndi/ldap/LdapCBPropertiesTest.java b/test/jdk/com/sun/jndi/ldap/LdapCBPropertiesTest.java
index 16b4400310a2d213a7433ec8442f214d5447c434..2f2ce50e8d6654d229c0ea56e44f8b31a80a9cc6 100644
--- a/test/jdk/com/sun/jndi/ldap/LdapCBPropertiesTest.java
+++ b/test/jdk/com/sun/jndi/ldap/LdapCBPropertiesTest.java
@@ -25,6 +25,7 @@
  * @test
  * @bug 8245527
  * @library lib/ /test/lib
+ * @modules java.base/sun.security.util
  * @run main/othervm LdapCBPropertiesTest true  true  com.sun.jndi.ldap.tls.cbtype tls-server-end-point
  * @run main/othervm LdapCBPropertiesTest false false com.sun.jndi.ldap.tls.cbtype tls-server-end-point
  * @run main/othervm LdapCBPropertiesTest true  true  com.sun.jndi.ldap.tls.cbtype tls-server-end-point com.sun.jndi.ldap.connect.timeout 2000
@@ -53,6 +54,8 @@ import javax.security.sasl.SaslException;
 
 import jdk.test.lib.net.URIBuilder;
 
+import sun.security.util.ChannelBindingException;
+
 public class LdapCBPropertiesTest {
     /*
      * Where do we find the keystores?
@@ -187,7 +190,8 @@ public class LdapCBPropertiesTest {
                 }
             }
         }
-        if (!shouldPass && ne.getRootCause() == null) {
+        Throwable rc = ne.getRootCause();
+        if (!shouldPass && (rc == null || rc instanceof ChannelBindingException)) {
             // Expected exception caused by Channel Binding parameter inconsistency
             return true;
         }
diff --git a/test/jdk/com/sun/net/httpserver/simpleserver/jwebserver/MaxRequestTimeTest.java b/test/jdk/com/sun/net/httpserver/simpleserver/jwebserver/MaxRequestTimeTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..e530c9805657ce54fdd855b1dd95e8c8491c4103
--- /dev/null
+++ b/test/jdk/com/sun/net/httpserver/simpleserver/jwebserver/MaxRequestTimeTest.java
@@ -0,0 +1,207 @@
+/*
+ * Copyright (c) 2022, 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 8278398
+ * @summary Tests the jwebserver's maximum request time
+ * @modules jdk.httpserver
+ * @library /test/lib
+ * @run testng/othervm MaxRequestTimeTest
+ */
+
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLException;
+import jdk.test.lib.Platform;
+import jdk.test.lib.net.SimpleSSLContext;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.util.FileUtils;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+import static java.lang.System.out;
+import static java.net.http.HttpClient.Builder.NO_PROXY;
+import static org.testng.Assert.*;
+
+/**
+ * This test confirms that the jwebserver does not wait indefinitely for
+ * a request to arrive.
+ *
+ * The jwebserver has a maximum request time of 5 seconds, which is set with the
+ * "sun.net.httpserver.maxReqTime" system property. If this threshold is
+ * reached, for example in the case of an HTTPS request where the server keeps
+ * waiting for a plaintext request, the server closes the connection. Subsequent
+ * requests are expected to be handled as normal.
+ *
+ * The test checks in the following order that:
+ *    1. an HTTP request is handled successfully,
+ *    2. an HTTPS request fails due to the server closing the connection
+ *    3. another HTTP request is handled successfully.
+ */
+public class MaxRequestTimeTest {
+    static final Path JAVA_HOME = Path.of(System.getProperty("java.home"));
+    static final String JWEBSERVER = getJwebserver(JAVA_HOME);
+    static final Path CWD = Path.of(".").toAbsolutePath().normalize();
+    static final Path TEST_DIR = CWD.resolve("MaxRequestTimeTest");
+    static final String LOOPBACK_ADDR = InetAddress.getLoopbackAddress().getHostAddress();
+    static final AtomicInteger PORT = new AtomicInteger();
+
+    static SSLContext sslContext;
+
+    @BeforeTest
+    public void setup() throws IOException {
+        if (Files.exists(TEST_DIR)) {
+            FileUtils.deleteFileTreeWithRetry(TEST_DIR);
+        }
+        Files.createDirectories(TEST_DIR);
+
+        sslContext = new SimpleSSLContext().get();
+        if (sslContext == null)
+            throw new AssertionError("Unexpected null sslContext");
+    }
+
+    @Test
+    public void testMaxRequestTime() throws Throwable {
+        final var sb = new StringBuffer();  // stdout & stderr
+        final var p = startProcess("jwebserver", sb);
+        try {
+            sendHTTPSRequest();  // server expected to terminate connection
+            sendHTTPRequest();   // server expected to respond successfully
+            sendHTTPSRequest();  // server expected to terminate connection
+            sendHTTPRequest();   // server expected to respond successfully
+        } finally {
+            p.destroy();
+            int exitCode = p.waitFor();
+            checkOutput(sb, exitCode);
+        }
+    }
+
+    static String expectedBody = """
+                
+                
+                
+                
+                
+                
+                
    Directory listing for /
    
+                
      
+                
    
+                
+                
+                """;
+
+    void sendHTTPRequest() throws IOException, InterruptedException {
+        out.println("\n--- sendHTTPRequest");
+        var client = HttpClient.newBuilder()
+                .proxy(NO_PROXY)
+                .build();
+        var request = HttpRequest.newBuilder(URI.create("http://localhost:" + PORT.get() + "/")).build();
+        var response = client.send(request, HttpResponse.BodyHandlers.ofString());
+        assertEquals(response.body(), expectedBody);
+    }
+
+    void sendHTTPSRequest() throws IOException, InterruptedException {
+        out.println("\n--- sendHTTPSRequest");
+        var client = HttpClient.newBuilder()
+                .sslContext(sslContext)
+                .proxy(NO_PROXY)
+                .build();
+        var request = HttpRequest.newBuilder(URI.create("https://localhost:" + PORT.get() + "/")).build();
+        try {
+            client.send(request, HttpResponse.BodyHandlers.ofString());
+            throw new RuntimeException("Expected SSLException not thrown");
+        } catch (SSLException expected) {  // server closes connection when max request time is reached
+            expected.printStackTrace(System.out);
+        }
+    }
+
+    @AfterTest
+    public void teardown() throws IOException {
+        if (Files.exists(TEST_DIR)) {
+            FileUtils.deleteFileTreeWithRetry(TEST_DIR);
+        }
+    }
+
+    // --- infra ---
+
+    static String getJwebserver(Path image) {
+        boolean isWindows = System.getProperty("os.name").startsWith("Windows");
+        Path jwebserver = image.resolve("bin").resolve(isWindows ? "jwebserver.exe" : "jwebserver");
+        if (Files.notExists(jwebserver))
+            throw new RuntimeException(jwebserver + " not found");
+        return jwebserver.toAbsolutePath().toString();
+    }
+
+    // The stdout/stderr output line to wait for when starting the jwebserver
+    static final String REGULAR_STARTUP_LINE_STRING_1 = "URL http://";
+    static final String REGULAR_STARTUP_LINE_STRING_2 = "Serving ";
+
+    static void parseAndSetPort(String line) {
+        PORT.set(Integer.parseInt(line.split(" port ")[1]));
+    }
+
+    static Process startProcess(String name, StringBuffer sb) throws Throwable {
+        // starts the process, parses the port and awaits startup line before sending requests
+        return ProcessTools.startProcess(name,
+                new ProcessBuilder(JWEBSERVER, "-p", "0").directory(TEST_DIR.toFile()),
+                line -> {
+                    if (line.startsWith(REGULAR_STARTUP_LINE_STRING_2)) { parseAndSetPort(line); }
+                    sb.append(line + "\n");
+                },
+                line -> line.startsWith(REGULAR_STARTUP_LINE_STRING_1),
+                30,  // suitably high default timeout, not expected to timeout
+                TimeUnit.SECONDS);
+    }
+
+    static final int SIGTERM = 15;
+    static final int NORMAL_EXIT_CODE = normalExitCode();
+
+    static int normalExitCode() {
+        if (Platform.isWindows()) {
+            return 1; // expected process destroy exit code
+        } else {
+            // signal terminated exit code on Unix is 128 + signal value
+            return 128 + SIGTERM;
+        }
+    }
+
+    static void checkOutput(StringBuffer sb, int exitCode) {
+        out.println("\n--- server output: \n" + sb);
+        var outputAnalyser = new OutputAnalyzer(sb.toString(), "", exitCode);
+            outputAnalyser.shouldHaveExitValue(NORMAL_EXIT_CODE)
+                          .shouldContain("Binding to loopback by default. For all interfaces use \"-b 0.0.0.0\" or \"-b ::\".")
+                          .shouldContain("Serving " + TEST_DIR + " and subdirectories on " + LOOPBACK_ADDR + " port " + PORT)
+                          .shouldContain("URL http://" + LOOPBACK_ADDR);
+    }
+}
diff --git a/test/jdk/java/awt/Choice/ChoiceKeyEventReaction/ChoiceKeyEventReaction.java b/test/jdk/java/awt/Choice/ChoiceKeyEventReaction/ChoiceKeyEventReaction.java
index 4b835b11063e59b34247d43c9588cf0651460c07..84e5b4d62e45b639da2d97db179a9ba90b8ba935 100644
--- a/test/jdk/java/awt/Choice/ChoiceKeyEventReaction/ChoiceKeyEventReaction.java
+++ b/test/jdk/java/awt/Choice/ChoiceKeyEventReaction/ChoiceKeyEventReaction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2022, 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
@@ -131,7 +131,7 @@ public class ChoiceKeyEventReaction
 
         if (toolkit.equals("sun.awt.X11.XToolkit") &&
                 keyTypedOnTextField) {
-            throw new RuntimeException("Test failed. (XToolkit/MToolkit). KeyEvent was addressed to TextField.");
+            throw new RuntimeException("Test failed. (XToolkit). KeyEvent was addressed to TextField.");
         }
 
         System.out.println("Test passed. Unfocusable Choice doesn't react on keys.");
diff --git a/test/jdk/java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowBlockingTest.java b/test/jdk/java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowBlockingTest.java
index a87b59a9388faa644adf15d2fd3f8550e7d0523a..1e5b27892087c9268e7440b7997365c08c9c0d63 100644
--- a/test/jdk/java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowBlockingTest.java
+++ b/test/jdk/java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowBlockingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, 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
@@ -69,11 +69,6 @@ public class ActualFocusedWindowBlockingTest {
     }
 
     public void start() {
-        if ("sun.awt.motif.MToolkit".equals(Toolkit.getDefaultToolkit().getClass().getName())) {
-            System.out.println("No testing on Motif. Test passed.");
-            return;
-        }
-
         System.out.println("\nTest started:\n");
 
         // Test 1.
diff --git a/test/jdk/java/awt/Focus/AutoRequestFocusTest/AutoRequestFocusSetVisibleTest.java b/test/jdk/java/awt/Focus/AutoRequestFocusTest/AutoRequestFocusSetVisibleTest.java
index 0a7a1afff619d3e7e952bb025faeb57f879531b3..45914e0670bba2e3c3977aaafc2489fb913daf6c 100644
--- a/test/jdk/java/awt/Focus/AutoRequestFocusTest/AutoRequestFocusSetVisibleTest.java
+++ b/test/jdk/java/awt/Focus/AutoRequestFocusTest/AutoRequestFocusSetVisibleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2022, 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
@@ -293,43 +293,39 @@ public class AutoRequestFocusSetVisibleTest {
         // 6. Show unblocking modal Dialog.
         ///////////////////////////////////
 
-        if ("sun.awt.motif.MToolkit".equals(toolkitClassName)) {
-            System.out.println("Stage 6 - Skiping.");
-        } else {
-            System.out.println("Stage 6 in progress...");
+        System.out.println("Stage 6 in progress...");
 
-            // ---
-            // Testing the bug of activating invisible modal Dialog (awt_Window::SetAndActivateModalBlocker).
-            // Having some window not excluded from modality, so that it would be blocked.
-            Frame f = new Frame("Aux. Frame");
-            f.setSize(100, 100);
-            setVisible(f, true);
-            // ---
+        // ---
+        // Testing the bug of activating invisible modal Dialog (awt_Window::SetAndActivateModalBlocker).
+        // Having some window not excluded from modality, so that it would be blocked.
+        Frame f = new Frame("Aux. Frame");
+        f.setSize(100, 100);
+        setVisible(f, true);
+        // ---
 
-            setVisible(focusedFrame, true);
+        setVisible(focusedFrame, true);
+        if (!focusOwner.hasFocus()) {
+            Util.clickOnComp(focusOwner, robot);
+            Util.waitForIdle(robot);
             if (!focusOwner.hasFocus()) {
-                Util.clickOnComp(focusOwner, robot);
-                Util.waitForIdle(robot);
-                if (!focusOwner.hasFocus()) {
-                    throw new Error("Test error: the frame couldn't be focused.");
-                }
+                throw new Error("Test error: the frame couldn't be focused.");
             }
+        }
 
-            dialog.setModal(true);
-            dialog.setAutoRequestFocus(false);
-            focusedFrame.setModalExclusionType(Dialog.ModalExclusionType.APPLICATION_EXCLUDE);
+        dialog.setModal(true);
+        dialog.setAutoRequestFocus(false);
+        focusedFrame.setModalExclusionType(Dialog.ModalExclusionType.APPLICATION_EXCLUDE);
 
-            TestHelper.invokeLaterAndWait(new Runnable() {
-                    public void run() {
-                        dialog.setVisible(true);
-                    }
-                }, robot);
+        TestHelper.invokeLaterAndWait(new Runnable() {
+                public void run() {
+                    dialog.setVisible(true);
+                }
+            }, robot);
 
-            if (dialog.isFocused()) {
-                throw new TestFailedException("the unblocking dialog shouldn't gain focus but it did!");
-            }
-            setVisible(dialog, false);
+        if (dialog.isFocused()) {
+            throw new TestFailedException("the unblocking dialog shouldn't gain focus but it did!");
         }
+        setVisible(dialog, false);
 
         System.out.println("Test passed.");
     }
diff --git a/test/jdk/java/awt/Focus/AutoRequestFocusTest/AutoRequestFocusToFrontTest.java b/test/jdk/java/awt/Focus/AutoRequestFocusTest/AutoRequestFocusToFrontTest.java
index 8ca4d4d6f7b1112d794331a646a548e83189ba2c..b1b8b8458ff0885db76bd56df844e86a87453cd5 100644
--- a/test/jdk/java/awt/Focus/AutoRequestFocusTest/AutoRequestFocusToFrontTest.java
+++ b/test/jdk/java/awt/Focus/AutoRequestFocusTest/AutoRequestFocusToFrontTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2022, 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
@@ -202,26 +202,22 @@ public class AutoRequestFocusToFrontTest {
         //      Focused frame is excluded from modality.
         ////////////////////////////////////////////////
 
-        if (!"sun.awt.motif.MToolkit".equals(toolkitClassName)) {
-            recreateGUI();
-            auxFrame.setModalExclusionType(Dialog.ModalExclusionType.APPLICATION_EXCLUDE);
+        recreateGUI();
+        auxFrame.setModalExclusionType(Dialog.ModalExclusionType.APPLICATION_EXCLUDE);
 
-            Test.setWindows(modalDialog, modalDialog, new Window[] {modalDialog, frame3});
-            Test.test("Test stage 6.1 in progress", modalDlgButton);
-        }
+        Test.setWindows(modalDialog, modalDialog, new Window[] {modalDialog, frame3});
+        Test.test("Test stage 6.1 in progress", modalDlgButton);
 
 
         // 6.2. Owner Frame (with owned modal Dialog).
         //      Focused frame is excluded from modality.
         ////////////////////////////////////////////////
 
-        if (!"sun.awt.motif.MToolkit".equals(toolkitClassName)) {
-            recreateGUI();
-            auxFrame.setModalExclusionType(Dialog.ModalExclusionType.APPLICATION_EXCLUDE);
+        recreateGUI();
+        auxFrame.setModalExclusionType(Dialog.ModalExclusionType.APPLICATION_EXCLUDE);
 
-            Test.setWindows(frame3, modalDialog, new Window[] {modalDialog, frame3});
-            Test.test("Test stage 6.2 in progress", modalDlgButton, true);
-        }
+        Test.setWindows(frame3, modalDialog, new Window[] {modalDialog, frame3});
+        Test.test("Test stage 6.2 in progress", modalDlgButton, true);
 
         ///////////////////////////////////////////////////
         // 7. Calling setVisible(true) for the shown Frame.
@@ -422,4 +418,3 @@ class TestFailedException extends RuntimeException {
         super("Test failed: " + msg);
     }
 }
-
diff --git a/test/jdk/java/awt/Focus/ModalBlockedStealsFocusTest/ModalBlockedStealsFocusTest.java b/test/jdk/java/awt/Focus/ModalBlockedStealsFocusTest/ModalBlockedStealsFocusTest.java
index 9a0d476133badf25515c8a9056fd1a615e5f9914..27be25773f2b382e688a0174b31ee8ec26979b69 100644
--- a/test/jdk/java/awt/Focus/ModalBlockedStealsFocusTest/ModalBlockedStealsFocusTest.java
+++ b/test/jdk/java/awt/Focus/ModalBlockedStealsFocusTest/ModalBlockedStealsFocusTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2022, 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
@@ -47,11 +47,6 @@ public class ModalBlockedStealsFocusTest {
     }
 
     public void start() {
-        if ("sun.awt.motif.MToolkit".equals(Toolkit.getDefaultToolkit().getClass().getName())) {
-            System.out.println("The test is not for MToolkit.");
-            return;
-        }
-
         dialog.setBounds(800, 0, 200, 100);
         frame.setBounds(800, 150, 200, 100);
 
diff --git a/test/jdk/java/awt/Focus/ModalExcludedWindowClickTest/ModalExcludedWindowClickTest.java b/test/jdk/java/awt/Focus/ModalExcludedWindowClickTest/ModalExcludedWindowClickTest.java
index 0ee37cbce69f10abd136156af4c7f7ffc3c6236a..7cfe66834bc4a826deef50935c8be22fbe4f2eb0 100644
--- a/test/jdk/java/awt/Focus/ModalExcludedWindowClickTest/ModalExcludedWindowClickTest.java
+++ b/test/jdk/java/awt/Focus/ModalExcludedWindowClickTest/ModalExcludedWindowClickTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2022, 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
@@ -57,12 +57,6 @@ public class ModalExcludedWindowClickTest {
     }
 
     public void start() {
-
-        if ("sun.awt.motif.MToolkit".equals(Toolkit.getDefaultToolkit().getClass().getName())) {
-            System.out.println("No testing on MToolkit.");
-            return;
-        }
-
         button.addActionListener(new ActionListener() {
                 public void actionPerformed(ActionEvent e) {
                     actionPerformed = true;
diff --git a/test/jdk/java/awt/Focus/NonFocusableBlockedOwnerTest/NonFocusableBlockedOwnerTest.java b/test/jdk/java/awt/Focus/NonFocusableBlockedOwnerTest/NonFocusableBlockedOwnerTest.java
index b6d4c962efa4d32f42cc44bafb4ec995f3d70f09..abf8d57cecdbcebaf745fe952b9d0df0ee5ad186 100644
--- a/test/jdk/java/awt/Focus/NonFocusableBlockedOwnerTest/NonFocusableBlockedOwnerTest.java
+++ b/test/jdk/java/awt/Focus/NonFocusableBlockedOwnerTest/NonFocusableBlockedOwnerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2022, 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
@@ -56,12 +56,6 @@ public class NonFocusableBlockedOwnerTest {
     }
 
     public void start() {
-
-        if ("sun.awt.motif.MToolkit".equals(Toolkit.getDefaultToolkit().getClass().getName())) {
-            System.out.println("No testing on MToolkit.");
-            return;
-        }
-
         try {
             EventQueue.invokeLater(new Runnable() {
                 public void run() {
diff --git a/test/jdk/java/awt/Focus/SimpleWindowActivationTest/SimpleWindowActivationTest.java b/test/jdk/java/awt/Focus/SimpleWindowActivationTest/SimpleWindowActivationTest.java
index a63d8194714fa46040d93741ddfa55a802382940..212d5274a8910ee51cf7f118156abb09029d0568 100644
--- a/test/jdk/java/awt/Focus/SimpleWindowActivationTest/SimpleWindowActivationTest.java
+++ b/test/jdk/java/awt/Focus/SimpleWindowActivationTest/SimpleWindowActivationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2022, 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
@@ -47,12 +47,6 @@ public class SimpleWindowActivationTest {
     private static Robot robot;
 
     public static void main(String[] args) throws Exception {
-
-        if ("sun.awt.motif.MToolkit".equals(Toolkit.getDefaultToolkit().getClass().getName())) {
-            System.out.println("No testing on Motif. Test passed.");
-            return;
-        }
-
         robot = new Robot();
         robot.setAutoDelay(50);
 
diff --git a/test/jdk/java/awt/Focus/WindowUpdateFocusabilityTest/WindowUpdateFocusabilityTest.java b/test/jdk/java/awt/Focus/WindowUpdateFocusabilityTest/WindowUpdateFocusabilityTest.java
index 962f6b4665cdf55f4f8709c0ba6f3fdf567d3551..6a6cfc9393926aff6934a7b43c06d13bac1e29aa 100644
--- a/test/jdk/java/awt/Focus/WindowUpdateFocusabilityTest/WindowUpdateFocusabilityTest.java
+++ b/test/jdk/java/awt/Focus/WindowUpdateFocusabilityTest/WindowUpdateFocusabilityTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2022, 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,11 +63,6 @@ public class WindowUpdateFocusabilityTest {
     }
 
     public void start() {
-        if ("sun.awt.motif.MToolkit".equals(Toolkit.getDefaultToolkit().getClass().getName())) {
-            System.out.println("No testing on Motif.");
-            return;
-        }
-
         test(new Frame("Frame owner"));
         Frame dialog_owner = new Frame("dialog's owner");
         test(new Dialog(dialog_owner));
diff --git a/test/jdk/java/awt/Graphics2D/CopyAreaOOB.java b/test/jdk/java/awt/Graphics2D/CopyAreaOOB.java
index d4f9533f09680af0411f14119c4cc5242926313f..8d218d9f18919d8e3f812b63ff79261b85056f9a 100644
--- a/test/jdk/java/awt/Graphics2D/CopyAreaOOB.java
+++ b/test/jdk/java/awt/Graphics2D/CopyAreaOOB.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2021, 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,15 +36,9 @@ import java.awt.image.*;
 
 public class CopyAreaOOB extends Canvas {
 
-    private static boolean done;
+    private static Robot robot = null;
 
     public void paint(Graphics g) {
-        synchronized (this) {
-            if (done) {
-                return;
-            }
-        }
-
         int w = getWidth();
         int h = getHeight();
 
@@ -64,10 +58,23 @@ public class CopyAreaOOB extends Canvas {
 
         Toolkit.getDefaultToolkit().sync();
 
-        synchronized (this) {
-            done = true;
-            notifyAll();
+        BufferedImage capture = null;
+        try {
+            Thread.sleep(500);
+            if (robot == null) robot = new Robot();
+            Point pt1 = getLocationOnScreen();
+            Rectangle rect = new Rectangle(pt1.x, pt1.y, 400, 400);
+            capture = robot.createScreenCapture(rect);
+        } catch (Exception e) {
+            throw new RuntimeException("Problems handling Robot");
         }
+        // Test pixels
+        testRegion(capture, "green",          0,   0, 400,  10, 0xff00ff00);
+        testRegion(capture, "original red",   0,  10,  50, 400, 0xffff0000);
+        testRegion(capture, "background",    50,  10,  60, 400, 0xff000000);
+        testRegion(capture, "in-between",    60,  10, 110,  20, 0xff000000);
+        testRegion(capture, "copied red",    60,  20, 110, 400, 0xffff0000);
+        testRegion(capture, "background",   110,  10, 400, 400, 0xff000000);
     }
 
     public Dimension getPreferredSize() {
@@ -105,42 +112,11 @@ public class CopyAreaOOB extends Canvas {
         frame.setLocationRelativeTo(null);
         frame.setVisible(true);
 
-        // Wait until the component's been painted
-        synchronized (test) {
-            while (!done) {
-                try {
-                    test.wait();
-                } catch (InterruptedException e) {
-                    throw new RuntimeException("Failed: Interrupted");
-                }
-            }
-        }
-
         try {
-            Thread.sleep(2000);
+            Thread.sleep(3000);
         } catch (InterruptedException ex) {}
-
-        // Grab the screen region
-        BufferedImage capture = null;
-        try {
-            Robot robot = new Robot();
-            Point pt1 = test.getLocationOnScreen();
-            Rectangle rect = new Rectangle(pt1.x, pt1.y, 400, 400);
-            capture = robot.createScreenCapture(rect);
-        } catch (Exception e) {
-            throw new RuntimeException("Problems creating Robot");
-        } finally {
-            if (!show) {
-                frame.dispose();
-            }
+        if (!show) {
+            frame.dispose();
         }
-
-        // Test pixels
-        testRegion(capture, "green",          0,   0, 400,  10, 0xff00ff00);
-        testRegion(capture, "original red",   0,  10,  50, 400, 0xffff0000);
-        testRegion(capture, "background",    50,  10,  60, 400, 0xff000000);
-        testRegion(capture, "in-between",    60,  10, 110,  20, 0xff000000);
-        testRegion(capture, "copied red",    60,  20, 110, 400, 0xffff0000);
-        testRegion(capture, "background",   110,  10, 400, 400, 0xff000000);
     }
 }
diff --git a/test/jdk/java/awt/Mouse/MouseModifiersUnitTest/ExtraButtonDrag.java b/test/jdk/java/awt/Mouse/MouseModifiersUnitTest/ExtraButtonDrag.java
index 29b90c9d4302dd2d22c57c2637b3c0efbe881cd2..3f8eeb17b38f68c9cdc1673019a2487993c9af6e 100644
--- a/test/jdk/java/awt/Mouse/MouseModifiersUnitTest/ExtraButtonDrag.java
+++ b/test/jdk/java/awt/Mouse/MouseModifiersUnitTest/ExtraButtonDrag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, 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
@@ -105,7 +105,7 @@ public class ExtraButtonDrag extends Frame {
                 //XToolkit: extra buttons should report MOVED events only
                 //WToolkit: extra buttons should report DRAGGED events only
                 if (i > 2){ //extra buttons only
-                    if (tk.equals("sun.awt.X11.XToolkit") || tk.equals("sun.awt.motif.MToolkit")) {
+                    if (tk.equals("sun.awt.X11.XToolkit")) {
                         if (!moved || dragged) {
                             throw new RuntimeException("Test failed."+ tk +" Button = " +(i+1) + " moved = "+moved +" : dragged = " +dragged);
                         }
@@ -152,4 +152,3 @@ public class ExtraButtonDrag extends Frame {
     }
 
 }
-
diff --git a/test/jdk/java/awt/Robot/AcceptExtraMouseButtons/AcceptExtraMouseButtons.java b/test/jdk/java/awt/Robot/AcceptExtraMouseButtons/AcceptExtraMouseButtons.java
index 3ab3ba3ff877ec30044fbb9bc74a83261772ba8e..ee83a328f0fc2aad8ec5aaa46dc16736517e2846 100644
--- a/test/jdk/java/awt/Robot/AcceptExtraMouseButtons/AcceptExtraMouseButtons.java
+++ b/test/jdk/java/awt/Robot/AcceptExtraMouseButtons/AcceptExtraMouseButtons.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, 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
@@ -57,7 +57,7 @@ public class AcceptExtraMouseButtons extends Frame {
 
         //MouseInfo.getNumberOfButtons() reports two more buttons on XToolkit
         //as they reserved for wheel (both directions).
-        if (tk.equals("sun.awt.X11.XToolkit") || tk.equals("sun.awt.motif.MToolkit")) {
+        if (tk.equals("sun.awt.X11.XToolkit")) {
             buttonsNum = buttonsNum - 2;
         }
         System.out.println("Number Of Buttons = "+ buttonsNum);
diff --git a/test/jdk/java/awt/Scrollbar/AquaLFScrollbarTest/ScrollBarBorderTest.java b/test/jdk/java/awt/Scrollbar/AquaLFScrollbarTest/ScrollBarBorderTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..9fbea551b832fee9758ff768bc1ec8df52724f02
--- /dev/null
+++ b/test/jdk/java/awt/Scrollbar/AquaLFScrollbarTest/ScrollBarBorderTest.java
@@ -0,0 +1,194 @@
+/*
+ * Copyright (c) 2021, 2022, 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.awt.Color;
+import java.awt.Component;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Insets;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+import javax.imageio.ImageIO;
+import javax.swing.JScrollBar;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+import javax.swing.border.Border;
+
+import static java.awt.image.BufferedImage.TYPE_INT_ARGB;
+
+/*
+ * @test
+ * @bug 8190264
+ * @summary JScrollBar ignores its border when using macOS Mac OS X Aqua look and feel
+ * @run main ScrollBarBorderTest
+ */
+public class ScrollBarBorderTest {
+    private static JScrollBar scrollBar;
+    public static final int BORDER_WIDTH = 150;
+    public static final int WIDTH = BORDER_WIDTH + 200;
+    public static final int HEIGHT = 20;
+
+    public static void main(String[] args) throws Exception {
+        for (UIManager.LookAndFeelInfo laf : UIManager.getInstalledLookAndFeels()) {
+            SwingUtilities.invokeAndWait(() -> setLookAndFeel(laf));
+            SwingUtilities.invokeAndWait(ScrollBarBorderTest::testHorizontal);
+            SwingUtilities.invokeAndWait(ScrollBarBorderTest::testVertical);
+        }
+    }
+
+    public static void testHorizontal() {
+        // create scroll bar
+        scrollBar = new JScrollBar(JScrollBar.HORIZONTAL);
+        scrollBar.setSize(WIDTH, HEIGHT);
+        scrollBar.setBorder(new HorizontalCustomBorder());
+
+        // paint image with thumb set to default value
+        BufferedImage image1 = new BufferedImage(WIDTH, HEIGHT, TYPE_INT_ARGB);
+        Graphics2D graphics2D = image1.createGraphics();
+        scrollBar.paint(graphics2D);
+        graphics2D.dispose();
+
+        // paint image with thumb set to max value
+        scrollBar.setValue(Integer.MAX_VALUE);
+        BufferedImage image2 = new BufferedImage(WIDTH, HEIGHT, TYPE_INT_ARGB);
+        Graphics2D graphics2D2 = image2.createGraphics();
+        scrollBar.paint(graphics2D2);
+        graphics2D2.dispose();
+
+        // check border for thumb
+        for (int x = WIDTH - BORDER_WIDTH; x < WIDTH; x++) {
+            for (int y = 0; y < HEIGHT; y++) {
+                int c1 = image1.getRGB(x, y);
+                int c2 = image2.getRGB(x, y);
+                if (c1 != c2) {
+                    System.out.println(x + " " + y + " " + "Color1: "
+                                       + Integer.toHexString(c1));
+                    System.out.println(x + " " + y + " " + "Color2: "
+                                       + Integer.toHexString(c2));
+                    saveImage(image1, "himage1.png");
+                    saveImage(image2, "himage2.png");
+                    throw new RuntimeException("Horizontal border has a thumb in it");
+                }
+            }
+        }
+    }
+
+    public static void testVertical() {
+        // create scroll bar
+        scrollBar = new JScrollBar(JScrollBar.VERTICAL);
+        scrollBar.setSize(HEIGHT, WIDTH);
+        scrollBar.setBorder(new VerticalCustomBorder());
+
+        // paint image with thumb set to 0
+        scrollBar.setValue(0);
+        BufferedImage image1 = new BufferedImage(HEIGHT, WIDTH, TYPE_INT_ARGB);
+        Graphics2D graphics2D = image1.createGraphics();
+        scrollBar.paint(graphics2D);
+        graphics2D.dispose();
+
+        // paint image with thumb set to max value
+        scrollBar.setValue(Integer.MAX_VALUE);
+        BufferedImage image2 = new BufferedImage(HEIGHT, WIDTH, TYPE_INT_ARGB);
+        Graphics2D graphics2D2 = image2.createGraphics();
+        scrollBar.paint(graphics2D2);
+        graphics2D2.dispose();
+
+        // check border for thumb
+        for (int y = WIDTH - BORDER_WIDTH; y < WIDTH; y++) {
+            for (int x = 0; x < HEIGHT; x++) {
+                int c1 = image1.getRGB(x, y);
+                int c2 = image2.getRGB(x, y);
+                if (c1 != c2) {
+                    System.out.println(x + " " + y + " " + "Color1: "
+                                       + Integer.toHexString(c1));
+                    System.out.println(x + " " + y + " " + "Color2: "
+                                       + Integer.toHexString(c2));
+                    saveImage(image1, "vimage1.png");
+                    saveImage(image2, "vimage2.png");
+                    throw new RuntimeException("Vertical border has a thumb in it");
+                }
+            }
+        }
+    }
+
+    private static void setLookAndFeel(UIManager.LookAndFeelInfo laf) {
+        try {
+            UIManager.setLookAndFeel(laf.getClassName());
+            System.out.println(laf.getName());
+        } catch (UnsupportedLookAndFeelException ignored){
+            System.out.println("Unsupported LookAndFeel: " + laf.getClassName());
+        } catch (ClassNotFoundException | InstantiationException |
+                IllegalAccessException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private static void saveImage(BufferedImage image, String filename) {
+        try {
+            ImageIO.write(image, "png", new File(filename));
+        } catch (IOException e) {
+            // Don't propagate the exception
+            e.printStackTrace();
+        }
+    }
+
+    // custom border
+    private static class HorizontalCustomBorder implements Border {
+        @Override
+        public void paintBorder(Component c, Graphics g, int x, int y, int width, int height) {
+            g.setColor(new Color(255, 0, 0, 100));
+            g.fillRect(width - BORDER_WIDTH, y, width, height);
+        }
+
+        @Override
+        public Insets getBorderInsets(Component c) {
+            return new Insets(0, 0, 0, BORDER_WIDTH);
+        }
+
+        @Override
+        public boolean isBorderOpaque() {
+            return true;
+        }
+    }
+
+    // custom border
+    private static class VerticalCustomBorder implements Border {
+        @Override
+        public void paintBorder(Component c, Graphics g, int x, int y, int width, int height) {
+            g.setColor(new Color(255, 0, 0, 100));
+            g.fillRect(x, height - BORDER_WIDTH, width, height);
+        }
+
+        @Override
+        public Insets getBorderInsets(Component c) {
+            return new Insets(0, 0, BORDER_WIDTH, 0);
+        }
+
+        @Override
+        public boolean isBorderOpaque() {
+            return true;
+        }
+    }
+}
diff --git a/test/jdk/java/awt/Window/GrabSequence/GrabSequence.java b/test/jdk/java/awt/Window/GrabSequence/GrabSequence.java
index 686cae28010639243386695df2aa55136f25bc36..da419e10ef1d5c7ab2ba4cf6a54cc5ccffcc2170 100644
--- a/test/jdk/java/awt/Window/GrabSequence/GrabSequence.java
+++ b/test/jdk/java/awt/Window/GrabSequence/GrabSequence.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,11 +40,6 @@ public class GrabSequence
 {
     private static void init()
     {
-        String toolkit = Toolkit.getDefaultToolkit().getClass().getName();
-        if ( toolkit.equals("sun.awt.motif.MToolkit")){
-            System.out.println("This test is for XToolkit and WToolkit only. Now using " + toolkit + ". Automatically passed.");
-            return;
-        }
         Frame frame = new Frame("Frame");
         frame.setBackground(Color.green);
         frame.setForeground(Color.green);
diff --git a/test/jdk/java/awt/Window/TranslucentShapedFrameTest/TranslucentShapedFrameTest.form b/test/jdk/java/awt/Window/TranslucentShapedFrameTest/TranslucentShapedFrameTest.form
index 4291e0eeaac0f55d3bc8da1c10531ab47e5c8c6b..6735391ad3810cd16aaaa7ef4323929416f86545 100644
--- a/test/jdk/java/awt/Window/TranslucentShapedFrameTest/TranslucentShapedFrameTest.form
+++ b/test/jdk/java/awt/Window/TranslucentShapedFrameTest/TranslucentShapedFrameTest.form
@@ -158,7 +158,7 @@
           
             
             
-            
+            
           
         
       
diff --git a/test/jdk/java/awt/Window/TranslucentShapedFrameTest/TranslucentShapedFrameTest.java b/test/jdk/java/awt/Window/TranslucentShapedFrameTest/TranslucentShapedFrameTest.java
index bdcf99c3a3c0dcd26927284bd676c3bd16a8a555..b87c44d907859dc8fea727ea7f2ef06c1b9c0118 100644
--- a/test/jdk/java/awt/Window/TranslucentShapedFrameTest/TranslucentShapedFrameTest.java
+++ b/test/jdk/java/awt/Window/TranslucentShapedFrameTest/TranslucentShapedFrameTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, 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
@@ -122,7 +122,7 @@ public class TranslucentShapedFrameTest extends javax.swing.JFrame {
 
         jTextArea1.setColumns(20);
         jTextArea1.setRows(5);
-        jTextArea1.setText("Create translucent and/or shaped, or\nnon-opaque frame. Make sure it behaves\ncorrectly (no artifacts left on the screen\nwhen dragging - if dragging is possible).\nClick \"Passed\" if the test behaves correctly,\n\"Falied\" otherwise.");
+        jTextArea1.setText("Create translucent and/or shaped, or\nnon-opaque frame. Make sure it behaves\ncorrectly (no artifacts left on the screen\nwhen dragging - if dragging is possible).\nClick \"Passed\" if the test behaves correctly,\n\"Failed\" otherwise.");
         jScrollPane1.setViewportView(jTextArea1);
 
         jLabel2.setText("Instructions:");
diff --git a/test/jdk/java/awt/datatransfer/UnicodeTransferTest/UnicodeTransferTest.java b/test/jdk/java/awt/datatransfer/UnicodeTransferTest/UnicodeTransferTest.java
index 3a7ea0c59951ca01a5f1cf6a2ad2692c3a873abb..7dba15b5a1f56469604725e2227ff29ea1e048e2 100644
--- a/test/jdk/java/awt/datatransfer/UnicodeTransferTest/UnicodeTransferTest.java
+++ b/test/jdk/java/awt/datatransfer/UnicodeTransferTest/UnicodeTransferTest.java
@@ -25,7 +25,7 @@
 /*
   @test
   @key headful
-  @bug 4718897
+  @bug 4718897 8278908
   @summary tests that a Unicode string can be transferred between JVMs.
   @author das@sparc.spb.su area=datatransfer
   @library ../../regtesthelpers/process
@@ -35,7 +35,6 @@
 
 import java.awt.datatransfer.*;
 import java.awt.*;
-import java.text.Normalizer;
 
 import test.java.awt.regtesthelpers.process.ProcessResults;
 import test.java.awt.regtesthelpers.process.ProcessCommunicator;
@@ -77,10 +76,7 @@ class Util {
                 buf.append(0x20);
             }
         }
-        // On OS X the unicode string is normalized but the clipboard,
-        // so we need to use normalized strings as well to be able to
-        // check the result
-        testString = Normalizer.normalize(buf.toString(), Normalizer.Form.NFC);
+        testString = buf.toString();
     }
 
     public static String getTestString() {
diff --git a/test/jdk/java/awt/event/HierarchyEvent/AncestorResized/AncestorResized.java b/test/jdk/java/awt/event/HierarchyEvent/AncestorResized/AncestorResized.java
index dafa0ead939f69d5d27b254f1d81d1c9be207d8c..156f3f75db5ed74e83b08b0cc51b40230d920859 100644
--- a/test/jdk/java/awt/event/HierarchyEvent/AncestorResized/AncestorResized.java
+++ b/test/jdk/java/awt/event/HierarchyEvent/AncestorResized/AncestorResized.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2021, 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
@@ -21,37 +21,30 @@
  * questions.
  */
 
-/*
-  @test
-  @key headful
-  @bug 6533330
-  @summary ANCESTOR_RESIZED is not sent while resizing a frame. Regression caused by 6500477.
-  @author anthony.petrov: area=awt.toplevel
-  @library ../../../regtesthelpers
-  @build Util
-  @run main AncestorResized
-*/
-
+import java.awt.Button;
+import java.awt.Component;
+import java.awt.FlowLayout;
+import java.awt.Frame;
+import java.awt.Insets;
+import java.awt.Label;
+import java.awt.Panel;
+import java.awt.Rectangle;
+import java.awt.Robot;
+import java.awt.event.HierarchyBoundsListener;
+import java.awt.event.HierarchyEvent;
+import java.awt.event.InputEvent;
 
 /**
- * AncestorResized.java
- *
- * summary:  After fixing the 6500477, the ANCESTOR_RESIZED event stoped
- *           firing while resizing a frame. This was a regression.
- *           The test checks whether the event starts dispatching as it
- *           was before fixing the 6500477.
+ * @test
+ * @key headful
+ * @bug 6533330
+ * @summary ANCESTOR_RESIZED is not sent while resizing a frame. Regression
+ *          caused by 6500477.
  */
+public class AncestorResized {
 
-import java.awt.*;
-import java.awt.event.*;
-import test.java.awt.regtesthelpers.Util;
-
-
-public class AncestorResized
-{
     public static volatile int ancestorResizedCounter = 0;
 
-
     static class HierarchyBoundsListenerImpl implements HierarchyBoundsListener {
         public void ancestorMoved(HierarchyEvent ce) {
             // ANCESTOR_MOVED seems to work OK.
@@ -61,8 +54,7 @@ public class AncestorResized
         }
     }
 
-    private static void init()
-    {
+    public static void main(String[] args) throws Exception {
         Frame frame;
         Panel panel;
         Button button;
@@ -83,17 +75,17 @@ public class AncestorResized
         frame.setSize(300, 300);
         frame.setVisible(true);
 
-        Robot robot = Util.createRobot();
-        robot.setAutoDelay(20);
+        Robot robot = new Robot();
+        robot.setAutoDelay(50);
 
         // To ensure the window is shown and packed
-        Util.waitForIdle(robot);
+        robot.waitForIdle();
 
         Insets insets = frame.getInsets();
         if (insets.right == 0 || insets.bottom == 0) {
+            frame.dispose();
             // Because we want to catch the "size-grip" of the frame.
             System.out.println("The test environment must have non-zero right & bottom insets! The current insets are: " + insets);
-            pass();
             return;
         }
 
@@ -112,177 +104,12 @@ public class AncestorResized
         // ... and start resizing
         robot.mousePress( InputEvent.BUTTON1_MASK );
         robot.mouseMove(bounds.x + bounds.width + 20, bounds.y + bounds.height + 15);
-        Util.waitForIdle(robot);
+        robot.mouseRelease(InputEvent.BUTTON1_MASK);
+        robot.waitForIdle();
+        frame.dispose();
 
         if (ancestorResizedCounter == 0) {
-            robot.mouseRelease( InputEvent.BUTTON1_MASK );
-            AncestorResized.fail("No ANCESTOR_RESIZED events received.");
-            return;
-        }
-
-        robot.mouseRelease( InputEvent.BUTTON1_MASK );
-
-        AncestorResized.pass();
-    }//End  init()
-
-
-
-    /*****************************************************
-     * Standard Test Machinery Section
-     * DO NOT modify anything in this section -- it's a
-     * standard chunk of code which has all of the
-     * synchronisation necessary for the test harness.
-     * By keeping it the same in all tests, it is easier
-     * to read and understand someone else's test, as
-     * well as insuring that all tests behave correctly
-     * with the test harness.
-     * There is a section following this for test-
-     * classes
-     ******************************************************/
-    private static boolean theTestPassed = false;
-    private static boolean testGeneratedInterrupt = false;
-    private static String failureMessage = "";
-
-    private static Thread mainThread = null;
-
-    private static int sleepTime = 300000;
-
-    // Not sure about what happens if multiple of this test are
-    //  instantiated in the same VM.  Being static (and using
-    //  static vars), it aint gonna work.  Not worrying about
-    //  it for now.
-    public static void main( String args[] ) throws InterruptedException
-    {
-        mainThread = Thread.currentThread();
-        try
-        {
-            init();
-        }
-        catch( TestPassedException e )
-        {
-            //The test passed, so just return from main and harness will
-            // interepret this return as a pass
-            return;
+            throw new RuntimeException("No ANCESTOR_RESIZED events received.");
         }
-        //At this point, neither test pass nor test fail has been
-        // called -- either would have thrown an exception and ended the
-        // test, so we know we have multiple threads.
-
-        //Test involves other threads, so sleep and wait for them to
-        // called pass() or fail()
-        try
-        {
-            Thread.sleep( sleepTime );
-            //Timed out, so fail the test
-            throw new RuntimeException( "Timed out after " + sleepTime/1000 + " seconds" );
-        }
-        catch (InterruptedException e)
-        {
-            //The test harness may have interrupted the test.  If so, rethrow the exception
-            // so that the harness gets it and deals with it.
-            if( ! testGeneratedInterrupt ) throw e;
-
-            //reset flag in case hit this code more than once for some reason (just safety)
-            testGeneratedInterrupt = false;
-
-            if ( theTestPassed == false )
-            {
-                throw new RuntimeException( failureMessage );
-            }
-        }
-
-    }//main
-
-    public static synchronized void setTimeoutTo( int seconds )
-    {
-        sleepTime = seconds * 1000;
-    }
-
-    public static synchronized void pass()
-    {
-        System.out.println( "The test passed." );
-        System.out.println( "The test is over, hit  Ctl-C to stop Java VM" );
-        //first check if this is executing in main thread
-        if ( mainThread == Thread.currentThread() )
-        {
-            //Still in the main thread, so set the flag just for kicks,
-            // and throw a test passed exception which will be caught
-            // and end the test.
-            theTestPassed = true;
-            throw new TestPassedException();
-        }
-        theTestPassed = true;
-        testGeneratedInterrupt = true;
-        mainThread.interrupt();
-    }//pass()
-
-    public static synchronized void fail()
-    {
-        //test writer didn't specify why test failed, so give generic
-        fail( "it just plain failed! :-)" );
     }
-
-    public static synchronized void fail( String whyFailed )
-    {
-        System.out.println( "The test failed: " + whyFailed );
-        System.out.println( "The test is over, hit  Ctl-C to stop Java VM" );
-        //check if this called from main thread
-        if ( mainThread == Thread.currentThread() )
-        {
-            //If main thread, fail now 'cause not sleeping
-            throw new RuntimeException( whyFailed );
-        }
-        theTestPassed = false;
-        testGeneratedInterrupt = true;
-        failureMessage = whyFailed;
-        mainThread.interrupt();
-    }//fail()
-
-}// class AncestorResized
-
-//This exception is used to exit from any level of call nesting
-// when it's determined that the test has passed, and immediately
-// end the test.
-class TestPassedException extends RuntimeException
-{
 }
-
-//*********** End Standard Test Machinery Section **********
-
-
-//************ Begin classes defined for the test ****************
-
-// if want to make listeners, here is the recommended place for them, then instantiate
-//  them in init()
-
-/* Example of a class which may be written as part of a test
-class NewClass implements anInterface
- {
-   static int newVar = 0;
-
-   public void eventDispatched(AWTEvent e)
-    {
-      //Counting events to see if we get enough
-      eventCount++;
-
-      if( eventCount == 20 )
-       {
-         //got enough events, so pass
-
-         AncestorResized.pass();
-       }
-      else if( tries == 20 )
-       {
-         //tried too many times without getting enough events so fail
-
-         AncestorResized.fail();
-       }
-
-    }// eventDispatched()
-
- }// NewClass class
-
-*/
-
-
-//************** End classes defined for the test *******************
diff --git a/test/jdk/java/awt/regtesthelpers/Util.java b/test/jdk/java/awt/regtesthelpers/Util.java
index dde65574460417b75558d4488b6545989063456e..af1cafe42974970b1eb143ebf0d88e2532588dcc 100644
--- a/test/jdk/java/awt/regtesthelpers/Util.java
+++ b/test/jdk/java/awt/regtesthelpers/Util.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2022, 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
@@ -405,8 +405,7 @@ public final class Util {
     }
 
     /*
-     * The values directly map to the ones of
-     * sun.awt.X11.XWM & sun.awt.motif.MToolkit classes.
+     * The values directly map to the ones of sun.awt.X11.XWM class.
      */
     public final static int
         UNDETERMINED_WM = 1,
@@ -433,8 +432,6 @@ public final class Util {
         try {
             if ("sun.awt.X11.XToolkit".equals(Toolkit.getDefaultToolkit().getClass().getName())) {
                 clazz = Class.forName("sun.awt.X11.XWM");
-            } else if ("sun.awt.motif.MToolkit".equals(Toolkit.getDefaultToolkit().getClass().getName())) {
-                clazz = Class.forName("sun.awt.motif.MToolkit");
             }
         } catch (ClassNotFoundException cnfe) {
             cnfe.printStackTrace();
@@ -446,7 +443,6 @@ public final class Util {
         try {
             final Class _clazz = clazz;
             Method m_addExports = Class.forName("java.awt.Helper").getDeclaredMethod("addExports", String.class, java.lang.Module.class);
-            // No MToolkit anymore: nothing to do about it.
             // We may be called from non-X11 system, and this permission cannot be delegated to a test.
             m_addExports.invoke(null, "sun.awt.X11", Util.class.getModule());
             Method m_getWMID = (Method)AccessController.doPrivileged(new PrivilegedAction() {
diff --git a/test/jdk/java/foreign/TestArrayCopy.java b/test/jdk/java/foreign/TestArrayCopy.java
index b8a36307fdeec1040cc3b56690c791409cd6874f..e45fcf395f7c4712f0e130c413d27585484422fc 100644
--- a/test/jdk/java/foreign/TestArrayCopy.java
+++ b/test/jdk/java/foreign/TestArrayCopy.java
@@ -253,6 +253,18 @@ public class TestArrayCopy {
         MemorySegment.copy(new byte[] { 1, 2, 3, 4 }, 0, segment, JAVA_INT, 0, 4);
     }
 
+    @Test(expectedExceptions = IllegalArgumentException.class)
+    public void testHyperAlignedSrc() {
+        MemorySegment segment = MemorySegment.ofArray(new byte[] {1, 2, 3, 4});
+        MemorySegment.copy(new byte[] { 1, 2, 3, 4 }, 0, segment, JAVA_BYTE.withBitAlignment(16), 0, 4);
+    }
+
+    @Test(expectedExceptions = IllegalArgumentException.class)
+    public void testHyperAlignedDst() {
+        MemorySegment segment = MemorySegment.ofArray(new byte[] {1, 2, 3, 4});
+        MemorySegment.copy(segment, JAVA_BYTE.withBitAlignment(16), 0, new byte[] { 1, 2, 3, 4 }, 0, 4);
+    }
+
     /***** Utilities *****/
 
     public static MemorySegment srcSegment(int bytesLength) {
diff --git a/test/jdk/java/foreign/TestByteBuffer.java b/test/jdk/java/foreign/TestByteBuffer.java
index 57d953f771d9acc525258a9e5f6199c90f8a289f..ce5f55efb0d6344743524ef59c670678454611a9 100644
--- a/test/jdk/java/foreign/TestByteBuffer.java
+++ b/test/jdk/java/foreign/TestByteBuffer.java
@@ -369,7 +369,7 @@ public class TestByteBuffer {
             Throwable cause = ex.getCause();
             if (cause instanceof IllegalStateException) {
                 //all get/set buffer operation should fail because of the scope check
-                assertTrue(ex.getCause().getMessage().contains("Already closed"));
+                assertTrue(ex.getCause().getMessage().contains("already closed"));
             } else {
                 //all other exceptions were unexpected - fail
                 fail("Unexpected exception", cause);
@@ -406,7 +406,7 @@ public class TestByteBuffer {
                 handle.invoke(e.getValue());
                 fail();
             } catch (IllegalStateException ex) {
-                assertTrue(ex.getMessage().contains("Already closed"));
+                assertTrue(ex.getMessage().contains("already closed"));
             } catch (UnsupportedOperationException ex) {
                 //skip
             } catch (Throwable ex) {
diff --git a/test/jdk/java/foreign/TestHeapAlignment.java b/test/jdk/java/foreign/TestHeapAlignment.java
new file mode 100644
index 0000000000000000000000000000000000000000..3395a686f38e7114e7b1c0a7505b8eb99263cfc1
--- /dev/null
+++ b/test/jdk/java/foreign/TestHeapAlignment.java
@@ -0,0 +1,131 @@
+/*
+ *  Copyright (c) 2021, 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 ((os.arch == "amd64" | os.arch == "x86_64") & sun.arch.data.model == "64") | os.arch == "aarch64"
+ * @run testng/othervm --enable-native-access=ALL-UNNAMED TestHeapAlignment
+ */
+
+import jdk.incubator.foreign.MemoryAddress;
+import jdk.incubator.foreign.MemoryLayout;
+import jdk.incubator.foreign.MemorySegment;
+import jdk.incubator.foreign.ResourceScope;
+import jdk.incubator.foreign.ValueLayout;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Function;
+
+import static org.testng.Assert.fail;
+
+public class TestHeapAlignment {
+
+    @Test(dataProvider = "layouts")
+    public void testHeapAlignment(MemorySegment segment, int align, Object val, Object arr, ValueLayout layout, Function segmentFactory) {
+        assertAligned(align, layout, () -> layout.varHandle().get(segment));
+        assertAligned(align, layout, () -> layout.varHandle().set(segment, val));
+        MemoryLayout seq = MemoryLayout.sequenceLayout(10, layout);
+        assertAligned(align, layout, () -> seq.varHandle(MemoryLayout.PathElement.sequenceElement()).get(segment, 0L));
+        assertAligned(align, layout, () -> seq.varHandle(MemoryLayout.PathElement.sequenceElement()).set(segment, 0L, val));
+        assertAligned(align, layout, () -> segment.spliterator(layout));
+        if (arr != null) {
+            assertAligned(align, layout, () -> MemorySegment.copy(arr, 0, segment, layout, 0, 1));
+            assertAligned(align, layout, () -> MemorySegment.copy(segment, layout, 0, arr, 0, 1));
+            assertAligned(align, layout, () -> {
+                MemorySegment other = segmentFactory.apply(arr);
+                MemorySegment.copy(other, layout, 0, segment, layout, 0, 1);
+            });
+            MemorySegment other = segmentFactory.apply(arr);
+            assertAligned(align, layout, () -> {
+                MemorySegment.copy(segment, layout, 0, other, layout, 0, 1);
+            });
+            assertAligned(align, layout, () -> {
+                MemorySegment.copy(other, layout, 0, segment, layout, 0, 1);
+            });
+        }
+    }
+
+    static void assertAligned(int align, ValueLayout layout, Runnable runnable) {
+        boolean shouldFail = layout.byteAlignment() > align && align != -1;
+        try {
+            runnable.run();
+            if (shouldFail) {
+                fail("Should not get here!");
+            }
+        } catch (IllegalArgumentException ex) {
+            if (!shouldFail) {
+                fail("Should not get here!");
+            } else if (!ex.getMessage().contains("alignment") && !ex.getMessage().contains("Misaligned")) {
+                fail("Unexpected exception: " + ex);
+            }
+        }
+    }
+
+    static final ValueLayout.OfChar JAVA_CHAR_ALIGNED = ValueLayout.JAVA_CHAR.withBitAlignment(16);
+    static final ValueLayout.OfShort JAVA_SHORT_ALIGNED = ValueLayout.JAVA_SHORT.withBitAlignment(16);
+    static final ValueLayout.OfInt JAVA_INT_ALIGNED = ValueLayout.JAVA_INT.withBitAlignment(32);
+    static final ValueLayout.OfFloat JAVA_FLOAT_ALIGNED = ValueLayout.JAVA_FLOAT.withBitAlignment(32);
+    static final ValueLayout.OfLong JAVA_LONG_ALIGNED = ValueLayout.JAVA_LONG.withBitAlignment(64);
+    static final ValueLayout.OfDouble JAVA_DOUBLE_ALIGNED = ValueLayout.JAVA_DOUBLE.withBitAlignment(64);
+    static final ValueLayout.OfAddress ADDRESS_ALIGNED = ValueLayout.ADDRESS.withBitAlignment(ValueLayout.ADDRESS.bitSize());
+
+    enum SegmentAndAlignment {
+        HEAP_BYTE(MemorySegment.ofArray(new byte[8]), 1),
+        HEAP_SHORT(MemorySegment.ofArray(new short[4]), 2),
+        HEAP_CHAR(MemorySegment.ofArray(new char[4]), 2),
+        HEAP_INT(MemorySegment.ofArray(new int[2]), 4),
+        HEAP_FLOAT(MemorySegment.ofArray(new float[2]), 4),
+        HEAP_LONG(MemorySegment.ofArray(new long[1]), 8),
+        HEAP_DOUBLE(MemorySegment.ofArray(new double[1]), 8),
+        NATIVE(MemorySegment.allocateNative(8, ResourceScope.newImplicitScope()), -1);
+
+        final MemorySegment segment;
+        final int align;
+
+        SegmentAndAlignment(MemorySegment segment, int align) {
+            this.segment = segment;
+            this.align = align;
+        }
+    }
+
+    @DataProvider
+    public static Object[][] layouts() {
+        List layouts = new ArrayList<>();
+        for (SegmentAndAlignment testCase : SegmentAndAlignment.values()) {
+            layouts.add(new Object[] { testCase.segment, testCase.align, (byte) 42, new byte[]{42}, ValueLayout.JAVA_BYTE, (Function)MemorySegment::ofArray });
+            layouts.add(new Object[] { testCase.segment, testCase.align, true, null, ValueLayout.JAVA_BOOLEAN, null });
+            layouts.add(new Object[] { testCase.segment, testCase.align, (char) 42, new char[]{42}, JAVA_CHAR_ALIGNED, (Function)MemorySegment::ofArray });
+            layouts.add(new Object[] { testCase.segment, testCase.align, (short) 42, new short[]{42}, JAVA_SHORT_ALIGNED, (Function)MemorySegment::ofArray });
+            layouts.add(new Object[] { testCase.segment, testCase.align, 42, new int[]{42}, JAVA_INT_ALIGNED, (Function)MemorySegment::ofArray });
+            layouts.add(new Object[] { testCase.segment, testCase.align, 42f, new float[]{42}, JAVA_FLOAT_ALIGNED, (Function)MemorySegment::ofArray });
+            layouts.add(new Object[] { testCase.segment, testCase.align, 42L, new long[]{42}, JAVA_LONG_ALIGNED, (Function)MemorySegment::ofArray });
+            layouts.add(new Object[] { testCase.segment, testCase.align, 42d, new double[]{42}, JAVA_DOUBLE_ALIGNED, (Function)MemorySegment::ofArray });
+            layouts.add(new Object[] { testCase.segment, testCase.align, MemoryAddress.ofLong(42), null, ADDRESS_ALIGNED, null });
+        }
+        return layouts.toArray(new Object[0][]);
+    }
+}
diff --git a/test/jdk/java/foreign/TestMemoryAccessInstance.java b/test/jdk/java/foreign/TestMemoryAccessInstance.java
index 702e95bf8da38c72ef5c25b314418c36cd9bdeff..83daa11ce4ea984478229f7f0cc91a6ae5bc5815 100644
--- a/test/jdk/java/foreign/TestMemoryAccessInstance.java
+++ b/test/jdk/java/foreign/TestMemoryAccessInstance.java
@@ -35,12 +35,13 @@ import java.util.function.Function;
 
 import jdk.incubator.foreign.ResourceScope;
 import jdk.incubator.foreign.ValueLayout;
+import org.testng.SkipException;
 import org.testng.annotations.*;
 import static org.testng.Assert.*;
 
 public class TestMemoryAccessInstance {
 
-    static class Accessor {
+    static class Accessor {
 
         interface SegmentGetter {
             X get(T buffer, L layout, long offset);
@@ -90,13 +91,34 @@ public class TestMemoryAccessInstance {
             }
         }
 
-        static  Accessor ofSegment(L layout, X value,
+        @SuppressWarnings("unchecked")
+        void testHyperAligned() {
+            try (ResourceScope scope = ResourceScope.newConfinedScope()) {
+                MemorySegment segment = MemorySegment.allocateNative(64, scope);
+                T t = transform.apply(segment);
+                L alignedLayout = (L)layout.withBitAlignment(layout.byteSize() * 8 * 2);
+                try {
+                    segmentSetter.set(t, alignedLayout, 0, value);
+                    fail();
+                } catch (IllegalArgumentException exception) {
+                    assertTrue(exception.getMessage().contains("greater"));
+                }
+                try {
+                    segmentGetter.get(t, alignedLayout, 0);
+                    fail();
+                } catch (IllegalArgumentException exception) {
+                    assertTrue(exception.getMessage().contains("greater"));
+                }
+            }
+        }
+
+        static  Accessor ofSegment(L layout, X value,
                          SegmentGetter segmentGetter, SegmentSetter segmentSetter,
                          BufferGetter bufferGetter, BufferSetter bufferSetter) {
             return new Accessor<>(Function.identity(), layout, value, segmentGetter, segmentSetter, bufferGetter, bufferSetter);
         }
 
-        static  Accessor ofAddress(L layout, X value,
+        static  Accessor ofAddress(L layout, X value,
                                                               SegmentGetter segmentGetter, SegmentSetter segmentSetter,
                                                               BufferGetter bufferGetter, BufferSetter bufferSetter) {
             return new Accessor<>(MemorySegment::address, layout, value, segmentGetter, segmentSetter, bufferGetter, bufferSetter);
@@ -113,6 +135,24 @@ public class TestMemoryAccessInstance {
         accessor.test();
     }
 
+    @Test(dataProvider = "segmentAccessors")
+    public void testSegmentAccessHyper(String testName, Accessor accessor) {
+        if (testName.contains("index")) {
+            accessor.testHyperAligned();
+        } else {
+            throw new SkipException("Skipping");
+        }
+    }
+
+    @Test(dataProvider = "addressAccessors")
+    public void testAddressAccessHyper(String testName, Accessor accessor) {
+        if (testName.contains("index")) {
+            accessor.testHyperAligned();
+        } else {
+            throw new SkipException("Skipping");
+        }
+    }
+
     static final ByteOrder NE = ByteOrder.nativeOrder();
 
     @DataProvider(name = "segmentAccessors")
diff --git a/test/jdk/java/foreign/TestMemoryAlignment.java b/test/jdk/java/foreign/TestMemoryAlignment.java
index d486581435a7efa70ac666b205df678830b5fd1f..2726fd6d91eee0abe6d28f93ea346ed0adb19dfb 100644
--- a/test/jdk/java/foreign/TestMemoryAlignment.java
+++ b/test/jdk/java/foreign/TestMemoryAlignment.java
@@ -74,7 +74,7 @@ public class TestMemoryAlignment {
             MemorySegment segment = MemorySegment.allocateNative(alignedGroup, scope);
             vh.set(segment.asSlice(1L), -42);
             assertEquals(align, 8); //this is the only case where access is aligned
-        } catch (IllegalStateException ex) {
+        } catch (IllegalArgumentException ex) {
             assertNotEquals(align, 8); //if align != 8, access is always unaligned
         }
     }
diff --git a/test/jdk/java/foreign/TestSegmentCopy.java b/test/jdk/java/foreign/TestSegmentCopy.java
index de2dba0848341758a3969c19dca198cddc6ecbc3..1185f4360271072a0b03661f66d58719f47e326e 100644
--- a/test/jdk/java/foreign/TestSegmentCopy.java
+++ b/test/jdk/java/foreign/TestSegmentCopy.java
@@ -40,6 +40,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.function.IntFunction;
 
+import static jdk.incubator.foreign.ValueLayout.JAVA_BYTE;
 import static org.testng.Assert.*;
 
 public class TestSegmentCopy {
@@ -81,12 +82,16 @@ public class TestSegmentCopy {
         }
     }
 
-    interface Getter {
-        X get(MemorySegment segment, ValueLayout layout, long index);
+    @Test(expectedExceptions = IllegalArgumentException.class)
+    public void testHyperAlignedSrc() {
+        MemorySegment segment = MemorySegment.ofArray(new byte[] {1, 2, 3, 4});
+        MemorySegment.copy(segment, 0, segment, JAVA_BYTE.withBitAlignment(16), 0, 4);
     }
 
-    interface Setter {
-        void set(MemorySegment segment, ValueLayout layout, long index, X val);
+    @Test(expectedExceptions = IllegalArgumentException.class)
+    public void testHyperAlignedDst() {
+        MemorySegment segment = MemorySegment.ofArray(new byte[] {1, 2, 3, 4});
+        MemorySegment.copy(segment, JAVA_BYTE.withBitAlignment(16), 0, segment, 0, 4);
     }
 
     enum Type {
diff --git a/test/jdk/java/foreign/TestSpliterator.java b/test/jdk/java/foreign/TestSpliterator.java
index 17f4ef392590420b42337971f8fd3051df18ddcf..7fcd6a16d3628d4a06b6e2dca5b041231c567942 100644
--- a/test/jdk/java/foreign/TestSpliterator.java
+++ b/test/jdk/java/foreign/TestSpliterator.java
@@ -127,6 +127,11 @@ public class TestSpliterator {
         MemorySegment.ofArray(new byte[7]).elements(MemoryLayout.sequenceLayout(0, ValueLayout.JAVA_INT));
     }
 
+    @Test(expectedExceptions = IllegalArgumentException.class)
+    public void testHyperAligned() {
+        MemorySegment.ofArray(new byte[8]).elements(MemoryLayout.sequenceLayout(2, ValueLayout.JAVA_INT.withBitAlignment(64)));
+    }
+
     static long sumSingle(long acc, MemorySegment segment) {
         return acc + (int)INT_HANDLE.get(segment, 0L);
     }
diff --git a/test/jdk/java/foreign/TestVarHandleCombinators.java b/test/jdk/java/foreign/TestVarHandleCombinators.java
index e9beaebafa84c00377da2281a0e9fd209b1de9b7..e2c9d0bcfc2833d094d4c0348fe3c70e0db420d0 100644
--- a/test/jdk/java/foreign/TestVarHandleCombinators.java
+++ b/test/jdk/java/foreign/TestVarHandleCombinators.java
@@ -51,7 +51,7 @@ public class TestVarHandleCombinators {
         assertEquals((byte) vh.get(segment, 2), (byte) -1);
     }
 
-    @Test(expectedExceptions = IllegalStateException.class)
+    @Test(expectedExceptions = IllegalArgumentException.class)
     public void testUnalignedElement() {
         VarHandle vh = MemoryHandles.varHandle(ValueLayout.JAVA_BYTE.withBitAlignment(32));
         MemorySegment segment = MemorySegment.ofArray(new byte[4]);
diff --git a/test/jdk/java/io/ClassCache/ContinuousGCTest.java b/test/jdk/java/io/ClassCache/ContinuousGCTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..681663029e40dc73c8098e58cd5e0c3518eae40e
--- /dev/null
+++ b/test/jdk/java/io/ClassCache/ContinuousGCTest.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2022, Red Hat, 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.
+ */
+
+import java.io.NameClassCache;
+
+/**
+ * @test
+ * @bug 8280041
+ * @summary Sanity test for ClassCache under continuous GC
+ * @compile/module=java.base java/io/NameClassCache.java
+ * @run main ContinuousGCTest
+ */
+public class ContinuousGCTest {
+    static final NameClassCache CACHE = new NameClassCache();
+    static final String VALUE = "ClassCache-ContinuousGCTest";
+
+    public static void main(String... args) throws Throwable {
+        for (int c = 0; c < 1000; c++) {
+            test();
+            System.gc();
+        }
+    }
+
+    public static void test() {
+        String cached = CACHE.get(ContinuousGCTest.class);
+        if (!cached.equals(VALUE)) {
+            throw new IllegalStateException("Cache failure, got: " + cached);
+        }
+    }
+}
diff --git a/test/jdk/java/io/ClassCache/NullValueTest.java b/test/jdk/java/io/ClassCache/NullValueTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..22b41fa071d163c55f58ccabca3a13fd01aac8ad
--- /dev/null
+++ b/test/jdk/java/io/ClassCache/NullValueTest.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2022, Red Hat, 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.
+ */
+
+import java.io.NullClassCache;
+
+/**
+ * @test
+ * @bug 8280041
+ * @summary Test that ClassCache throws on trying to pass null value
+ * @compile/module=java.base java/io/NullClassCache.java
+ * @run main NullValueTest
+ */
+public class NullValueTest {
+    public static void main(String... args) throws Throwable {
+        try {
+            new NullClassCache().get(Object.class);
+            throw new IllegalStateException("Should have failed");
+        } catch (NullPointerException npe) {
+            // Expected
+        }
+    }
+}
diff --git a/test/jdk/java/io/ClassCache/java.base/java/io/NameClassCache.java b/test/jdk/java/io/ClassCache/java.base/java/io/NameClassCache.java
new file mode 100644
index 0000000000000000000000000000000000000000..ff2149fc6a28158a38cac54566aa17d391aa875a
--- /dev/null
+++ b/test/jdk/java/io/ClassCache/java.base/java/io/NameClassCache.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2022, Red Hat, 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.
+ */
+
+package java.io;
+
+public class NameClassCache extends ClassCache {
+    protected String computeValue(Class cl) {
+        // Return string that is not interned and specific to class
+        return "ClassCache-" + cl.getName();
+    }
+
+    public String get(Class cl) {
+        return super.get(cl);
+    }
+}
diff --git a/test/jdk/java/io/ClassCache/java.base/java/io/NullClassCache.java b/test/jdk/java/io/ClassCache/java.base/java/io/NullClassCache.java
new file mode 100644
index 0000000000000000000000000000000000000000..58c92ef139906fdda469242fa609b0343c158f21
--- /dev/null
+++ b/test/jdk/java/io/ClassCache/java.base/java/io/NullClassCache.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2022, Red Hat, 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.
+ */
+
+package java.io;
+
+public class NullClassCache extends ClassCache {
+    protected Object computeValue(Class cl) {
+        return null;
+    }
+
+    public Object get(Class cl) {
+        return super.get(cl);
+    }
+}
diff --git a/test/jdk/java/io/File/GetXSpace.java b/test/jdk/java/io/File/GetXSpace.java
index eacc75652272a453f8c7026301518f131f7f37d6..ac80bdf68fd2cfdeff8980d1318f8874beec28ee 100644
--- a/test/jdk/java/io/File/GetXSpace.java
+++ b/test/jdk/java/io/File/GetXSpace.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2022, 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
@@ -34,7 +34,6 @@
 
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FilePermission;
 import java.io.InputStreamReader;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -108,8 +107,8 @@ public class GetXSpace {
 
         Space(String total, String free, String name) {
             try {
-                this.total = Long.valueOf(total) * KSIZE;
-                this.free = Long.valueOf(free) * KSIZE;
+                this.total = Long.parseLong(total) * KSIZE;
+                this.free = Long.parseLong(free) * KSIZE;
             } catch (NumberFormatException x) {
                 throw new RuntimeException("the regex should have caught this", x);
             }
@@ -157,7 +156,7 @@ public class GetXSpace {
                     }
                     al.add(new Space(m.group(2), m.group(3), name));;
                 }
-                j = m.end() + 1;
+                j = m.end();
             } else {
                 throw new RuntimeException("unrecognized df output format: "
                                            + "charAt(" + j + ") = '"
@@ -227,7 +226,7 @@ public class GetXSpace {
                 // On Linux, ignore the NSFE if the path is one of the
                 // /run/user/$UID mounts created by pam_systemd(8) as it
                 // might be deleted during the test
-                if (!Platform.isLinux() || s.name().indexOf("/run/user") == -1)
+                if (!Platform.isLinux() || !s.name().contains("/run/user"))
                     throw new RuntimeException(nsfe);
             } catch (IOException e) {
                 throw new RuntimeException(e);
diff --git a/test/jdk/java/io/OutputStreamWriter/WriteAfterClose.java b/test/jdk/java/io/OutputStreamWriter/WriteAfterClose.java
index 0982df62a6de6a9b20e6b72a9a7e47e86276891d..d2bdd362065197bf3f4829256f96e614e9ae4aa0 100644
--- a/test/jdk/java/io/OutputStreamWriter/WriteAfterClose.java
+++ b/test/jdk/java/io/OutputStreamWriter/WriteAfterClose.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2022, 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
@@ -74,7 +74,7 @@ public class WriteAfterClose {
 
         try {
             wtr.write("a", 0, 1);
-            System.out.println("FALIED: Allows string buf write on a closed stream");
+            System.out.println("FAILED: Allows string buf write on a closed stream");
             failed = true;
         } catch (Exception e) {
         }
diff --git a/test/jdk/java/lang/Character/UnicodeBlock/OptimalMapSize.java b/test/jdk/java/lang/Character/UnicodeBlock/OptimalMapSize.java
index 8883f0d8263296b52ec6111ece22a043cb745b3d..abe63eb0b7c881885241ef39f36f064f606b7806 100644
--- a/test/jdk/java/lang/Character/UnicodeBlock/OptimalMapSize.java
+++ b/test/jdk/java/lang/Character/UnicodeBlock/OptimalMapSize.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022, 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 8080535 8191410 8215194 8221431 8239383
+ * @bug 8080535 8191410 8215194 8221431 8239383 8268081
  * @summary Expected size of Character.UnicodeBlock.map is not optimal
  * @library /test/lib
  * @modules java.base/java.lang:open
@@ -48,13 +48,14 @@ import jdk.test.lib.util.OptimalCapacity;
 // As of Unicode 11, 667 entries are expected.
 // As of Unicode 12.1, 676 entries are expected.
 // As of Unicode 13.0, 684 entries are expected.
+// As of Unicode 14.0, 696 entries are expected.
 //
 // Initialization of the map and this test will have to be adjusted
 // accordingly then.
 //
 // Note that HashMap's implementation aligns the initial capacity to
 // a power of two size, so it will end up 1024 (and thus succeed) in
-// cases, such as 638, 667, 676, and 684.
+// cases, such as 638, 667, 676, 684, and 696.
 
 public class OptimalMapSize {
     public static void main(String[] args) throws Throwable {
@@ -63,7 +64,7 @@ public class OptimalMapSize {
         Field f = Character.UnicodeBlock.class.getDeclaredField("NUM_ENTITIES");
         f.setAccessible(true);
         int num_entities = f.getInt(null);
-        assert num_entities == 684;
+        assert num_entities == 696;
         int initialCapacity = (int)(num_entities / 0.75f + 1.0f);
 
         OptimalCapacity.ofHashMap(Character.UnicodeBlock.class,
diff --git a/test/jdk/java/lang/Math/Atan2Tests.java b/test/jdk/java/lang/Math/Atan2Tests.java
index d6ff8605dddc154e6d24b06491cef00927e2cc65..7e5dca17f1b5033b0a5e6c761284622141854b10 100644
--- a/test/jdk/java/lang/Math/Atan2Tests.java
+++ b/test/jdk/java/lang/Math/Atan2Tests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2022, 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,7 +25,6 @@
  * @test
  * @bug 4984407
  * @summary Tests for {Math, StrictMath}.atan2
- * @author Joseph D. Darcy
  */
 
 public class Atan2Tests {
@@ -33,10 +32,8 @@ public class Atan2Tests {
 
     static int testAtan2Case(double input1, double input2, double expected) {
         int failures = 0;
-        failures += Tests.test("StrictMath.atan2(double, double)", input1, input2,
-                               StrictMath.atan2(input1, input2), expected);
-        failures += Tests.test("Math.atan2(double, double)", input1, input2,
-                               Math.atan2(input1, input2), expected);
+        failures += Tests.test("StrictMath.atan2", input1, input2, StrictMath::atan2, expected);
+        failures += Tests.test("Math.atan2",       input1, input2, Math::atan2,       expected);
 
         return failures;
     }
@@ -55,7 +52,7 @@ public class Atan2Tests {
         return failures;
     }
 
-    public static void main(String [] argv) {
+    public static void main(String... argv) {
         int failures = 0;
 
         failures += testAtan2();
diff --git a/test/jdk/java/lang/Math/CeilAndFloorTests.java b/test/jdk/java/lang/Math/CeilAndFloorTests.java
index d4508f839c8d329719c3caabc7a49dc1fc63b758..6b75b2a8dcb663712145361753f57a0d1dff1324 100644
--- a/test/jdk/java/lang/Math/CeilAndFloorTests.java
+++ b/test/jdk/java/lang/Math/CeilAndFloorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2022, 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
@@ -30,15 +30,15 @@
 public class CeilAndFloorTests {
     private static int testCeilCase(double input, double expected) {
         int failures = 0;
-        failures += Tests.test("Math.ceil",  input, Math.ceil(input),   expected);
-        failures += Tests.test("StrictMath.ceil",  input, StrictMath.ceil(input), expected);
+        failures += Tests.test("Math.ceil",        input, Math::ceil,       expected);
+        failures += Tests.test("StrictMath.ceil",  input, StrictMath::ceil, expected);
         return failures;
     }
 
     private static int testFloorCase(double input, double expected) {
         int failures = 0;
-        failures += Tests.test("Math.floor",  input, Math.floor(input),   expected);
-        failures += Tests.test("StrictMath.floor",  input, StrictMath.floor(input), expected);
+        failures += Tests.test("Math.floor",        input, Math::floor,       expected);
+        failures += Tests.test("StrictMath.floor",  input, StrictMath::floor, expected);
         return failures;
     }
 
diff --git a/test/jdk/java/lang/Math/CubeRootTests.java b/test/jdk/java/lang/Math/CubeRootTests.java
index 53ef270377fffacb2005939cff18f7d0a7808c62..a6350702d90baa9645e64603a3fcfd8dcfa1598b 100644
--- a/test/jdk/java/lang/Math/CubeRootTests.java
+++ b/test/jdk/java/lang/Math/CubeRootTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, 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,7 +28,6 @@
  * @run main CubeRootTests
  * @bug 4347132 4939441 8078672
  * @summary Tests for {Math, StrictMath}.cbrt (use -Dseed=X to set PRNG seed)
- * @author Joseph D. Darcy
  * @key randomness
  */
 
@@ -46,17 +45,10 @@ public class CubeRootTests {
     static int testCubeRootCase(double input, double expected) {
         int failures=0;
 
-        double minus_input = -input;
-        double minus_expected = -expected;
-
-        failures+=Tests.test("Math.cbrt(double)", input,
-                             Math.cbrt(input), expected);
-        failures+=Tests.test("Math.cbrt(double)", minus_input,
-                             Math.cbrt(minus_input), minus_expected);
-        failures+=Tests.test("StrictMath.cbrt(double)", input,
-                             StrictMath.cbrt(input), expected);
-        failures+=Tests.test("StrictMath.cbrt(double)", minus_input,
-                             StrictMath.cbrt(minus_input), minus_expected);
+        failures+=Tests.test("Math.cbrt",        input, Math::cbrt,        expected);
+        failures+=Tests.test("Math.cbrt",       -input, Math::cbrt,       -expected);
+        failures+=Tests.test("StrictMath.cbrt",  input, StrictMath::cbrt,  expected);
+        failures+=Tests.test("StrictMath.cbrt", -input, StrictMath::cbrt, -expected);
 
         return failures;
     }
@@ -324,7 +316,7 @@ public class CubeRootTests {
         return failures;
     }
 
-    public static void main(String argv[]) {
+    public static void main(String... argv) {
         int failures = 0;
 
         failures += testCubeRoot();
diff --git a/test/jdk/java/lang/Math/ExpCornerCaseTests.java b/test/jdk/java/lang/Math/ExpCornerCaseTests.java
index 16168254378ec1cb224e3f262fea7aad6968faaf..e48f31beb9106ac77dddbccde046280c7b542006 100644
--- a/test/jdk/java/lang/Math/ExpCornerCaseTests.java
+++ b/test/jdk/java/lang/Math/ExpCornerCaseTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2022, 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
@@ -61,8 +61,8 @@ public class ExpCornerCaseTests {
 
     private static int testExp(double input, double expected) {
         int failures = 0;
-        failures += Tests.test("StrictMath.exp", input, StrictMath.exp(input), expected);
-        failures += Tests.test("Math.exp", input, Math.exp(input), expected);
+        failures += Tests.test("StrictMath.exp", input, StrictMath::exp, expected);
+        failures += Tests.test("Math.exp",       input, Math::exp,       expected);
         return failures;
     }
 }
diff --git a/test/jdk/java/lang/Math/Expm1Tests.java b/test/jdk/java/lang/Math/Expm1Tests.java
index 5bf267d15fd23f0985d156283db078c9030b8afc..204fe44ef15813529e5f01056fae59c7fb61d695 100644
--- a/test/jdk/java/lang/Math/Expm1Tests.java
+++ b/test/jdk/java/lang/Math/Expm1Tests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, 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,7 +25,6 @@
  * @test
  * @bug 4851638 4900189 4939441
  * @summary Tests for {Math, StrictMath}.expm1
- * @author Joseph D. Darcy
  */
 
 /*
@@ -214,7 +213,7 @@ public class Expm1Tests {
         return failures;
     }
 
-    public static void main(String argv[]) {
+    public static void main(String... argv) {
         int failures = 0;
 
         failures += testExpm1();
diff --git a/test/jdk/java/lang/Math/FusedMultiplyAddTests.java b/test/jdk/java/lang/Math/FusedMultiplyAddTests.java
index 03e164c2198842a85ab4b8c531b31ace32d3d367..61a3bfb0de171ebaea1a06d2e09465945053a700 100644
--- a/test/jdk/java/lang/Math/FusedMultiplyAddTests.java
+++ b/test/jdk/java/lang/Math/FusedMultiplyAddTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2022, 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
@@ -365,16 +365,12 @@ public class FusedMultiplyAddTests {
 
     private static int testFusedMacCase(double input1, double input2, double input3, double expected) {
         int failures = 0;
-        failures += Tests.test("Math.fma(double)", input1, input2, input3,
-                               Math.fma(input1, input2, input3), expected);
-        failures += Tests.test("StrictMath.fma(double)", input1, input2, input3,
-                               StrictMath.fma(input1, input2, input3), expected);
+        failures += Tests.test("Math.fma",       input1, input2, input3, Math::fma,       expected);
+        failures += Tests.test("StrictMath.fma", input1, input2, input3, StrictMath::fma, expected);
 
         // Permute first two inputs
-        failures += Tests.test("Math.fma(double)", input2, input1, input3,
-                               Math.fma(input2, input1, input3), expected);
-        failures += Tests.test("StrictMath.fma(double)", input2, input1, input3,
-                               StrictMath.fma(input2, input1, input3), expected);
+        failures += Tests.test("Math.fma",       input2, input1, input3, Math::fma,       expected);
+        failures += Tests.test("StrictMath.fma", input2, input1, input3, StrictMath::fma, expected);
         return failures;
     }
 
diff --git a/test/jdk/java/lang/Math/HyperbolicTests.java b/test/jdk/java/lang/Math/HyperbolicTests.java
index 0df493698fe1c4f6069000068e4fa741ac7cdf34..8309606f63d745c7a2678bfc6b7e0249ae842e08 100644
--- a/test/jdk/java/lang/Math/HyperbolicTests.java
+++ b/test/jdk/java/lang/Math/HyperbolicTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, 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,7 +25,6 @@
  * @test
  * @bug 4851625 4900189 4939441
  * @summary Tests for {Math, StrictMath}.{sinh, cosh, tanh}
- * @author Joseph D. Darcy
  */
 
 public class HyperbolicTests {
@@ -33,6 +32,20 @@ public class HyperbolicTests {
 
     static final double NaNd = Double.NaN;
 
+    public static void main(String... argv) {
+        int failures = 0;
+
+        failures += testSinh();
+        failures += testCosh();
+        failures += testTanh();
+
+        if (failures > 0) {
+            System.err.println("Testing the hyperbolic functions incurred "
+                               + failures + " failures.");
+            throw new RuntimeException();
+        }
+    }
+
     /**
      * Test accuracy of {Math, StrictMath}.sinh.  The specified
      * accuracy is 2.5 ulps.
@@ -355,19 +368,11 @@ public class HyperbolicTests {
                                                 double expected,
                                                 double tolerance) {
         int failures = 0;
-        failures += Tests.testTolerance("Math.sinh(double)",
-                                        input, Math.sinh(input),
-                                        expected, tolerance);
-        failures += Tests.testTolerance("Math.sinh(double)",
-                                        -input, Math.sinh(-input),
-                                        -expected, tolerance);
+        failures += Tests.testTolerance("Math.sinh",        input, Math::sinh,        expected, tolerance);
+        failures += Tests.testTolerance("Math.sinh",       -input, Math::sinh,       -expected, tolerance);
 
-        failures += Tests.testTolerance("StrictMath.sinh(double)",
-                                        input, StrictMath.sinh(input),
-                                        expected, tolerance);
-        failures += Tests.testTolerance("StrictMath.sinh(double)",
-                                        -input, StrictMath.sinh(-input),
-                                        -expected, tolerance);
+        failures += Tests.testTolerance("StrictMath.sinh",  input, StrictMath::sinh,  expected, tolerance);
+        failures += Tests.testTolerance("StrictMath.sinh", -input, StrictMath::sinh, -expected, tolerance);
         return failures;
     }
 
@@ -375,23 +380,14 @@ public class HyperbolicTests {
                                               double expected,
                                               double ulps) {
         int failures = 0;
-        failures += Tests.testUlpDiff("Math.sinh(double)",
-                                      input, Math.sinh(input),
-                                      expected, ulps);
-        failures += Tests.testUlpDiff("Math.sinh(double)",
-                                      -input, Math.sinh(-input),
-                                      -expected, ulps);
-
-        failures += Tests.testUlpDiff("StrictMath.sinh(double)",
-                                      input, StrictMath.sinh(input),
-                                      expected, ulps);
-        failures += Tests.testUlpDiff("StrictMath.sinh(double)",
-                                      -input, StrictMath.sinh(-input),
-                                      -expected, ulps);
+        failures += Tests.testUlpDiff("Math.sinh",        input, Math::sinh,        expected, ulps);
+        failures += Tests.testUlpDiff("Math.sinh",       -input, Math::sinh,       -expected, ulps);
+
+        failures += Tests.testUlpDiff("StrictMath.sinh",  input, StrictMath::sinh,  expected, ulps);
+        failures += Tests.testUlpDiff("StrictMath.sinh", -input, StrictMath::sinh, -expected, ulps);
         return failures;
     }
 
-
     /**
      * Test accuracy of {Math, StrictMath}.cosh.  The specified
      * accuracy is 2.5 ulps.
@@ -594,7 +590,6 @@ public class HyperbolicTests {
                                                 3.0);
         }
 
-
         double [][] specialTestCases = {
             {0.0,                       1.0},
             {NaNd,                      NaNd},
@@ -733,23 +728,14 @@ public class HyperbolicTests {
                                               double expected,
                                               double ulps) {
         int failures = 0;
-        failures += Tests.testUlpDiff("Math.cosh(double)",
-                                      input, Math.cosh(input),
-                                      expected, ulps);
-        failures += Tests.testUlpDiff("Math.cosh(double)",
-                                      -input, Math.cosh(-input),
-                                      expected, ulps);
-
-        failures += Tests.testUlpDiff("StrictMath.cosh(double)",
-                                      input, StrictMath.cosh(input),
-                                      expected, ulps);
-        failures += Tests.testUlpDiff("StrictMath.cosh(double)",
-                                      -input, StrictMath.cosh(-input),
-                                      expected, ulps);
+        failures += Tests.testUlpDiff("Math.cosh",        input, Math::cosh,       expected, ulps);
+        failures += Tests.testUlpDiff("Math.cosh",       -input, Math::cosh,       expected, ulps);
+
+        failures += Tests.testUlpDiff("StrictMath.cosh",  input, StrictMath::cosh, expected, ulps);
+        failures += Tests.testUlpDiff("StrictMath.cosh", -input, StrictMath::cosh, expected, ulps);
         return failures;
     }
 
-
     /**
      * Test accuracy of {Math, StrictMath}.tanh.  The specified
      * accuracy is 2.5 ulps.
@@ -952,7 +938,6 @@ public class HyperbolicTests {
                                                 3.0);
         }
 
-
         double [][] specialTestCases = {
             {0.0,                       0.0},
             {NaNd,                      NaNd},
@@ -1007,19 +992,11 @@ public class HyperbolicTests {
                                                 double expected,
                                                 double tolerance) {
         int failures = 0;
-        failures += Tests.testTolerance("Math.tanh(double",
-                                        input, Math.tanh(input),
-                                        expected, tolerance);
-        failures += Tests.testTolerance("Math.tanh(double",
-                                        -input, Math.tanh(-input),
-                                        -expected, tolerance);
+        failures += Tests.testTolerance("Math.tanh",       input, Math::tanh,         expected, tolerance);
+        failures += Tests.testTolerance("Math.tanh",      -input, Math::tanh,        -expected, tolerance);
 
-        failures += Tests.testTolerance("StrictMath.tanh(double",
-                                        input, StrictMath.tanh(input),
-                                        expected, tolerance);
-        failures += Tests.testTolerance("StrictMath.tanh(double",
-                                        -input, StrictMath.tanh(-input),
-                                        -expected, tolerance);
+        failures += Tests.testTolerance("StrictMath.tanh",  input, StrictMath::tanh,  expected, tolerance);
+        failures += Tests.testTolerance("StrictMath.tanh", -input, StrictMath::tanh, -expected, tolerance);
         return failures;
     }
 
@@ -1028,35 +1005,11 @@ public class HyperbolicTests {
                                               double ulps) {
         int failures = 0;
 
-        failures += Tests.testUlpDiffWithAbsBound("Math.tanh(double)",
-                                                  input, Math.tanh(input),
-                                                  expected, ulps, 1.0);
-        failures += Tests.testUlpDiffWithAbsBound("Math.tanh(double)",
-                                                  -input, Math.tanh(-input),
-                                                  -expected, ulps, 1.0);
-
-        failures += Tests.testUlpDiffWithAbsBound("StrictMath.tanh(double)",
-                                                  input, StrictMath.tanh(input),
-                                                  expected, ulps, 1.0);
-        failures += Tests.testUlpDiffWithAbsBound("StrictMath.tanh(double)",
-                                                  -input, StrictMath.tanh(-input),
-                                                  -expected, ulps, 1.0);
-        return failures;
-    }
-
-
-    public static void main(String argv[]) {
-        int failures = 0;
+        failures += Tests.testUlpDiffWithAbsBound("Math.tanh",       input,  Math::tanh,       expected, ulps, 1.0);
+        failures += Tests.testUlpDiffWithAbsBound("Math.tanh",      -input,  Math::tanh,      -expected, ulps, 1.0);
 
-        failures += testSinh();
-        failures += testCosh();
-        failures += testTanh();
-
-        if (failures > 0) {
-            System.err.println("Testing the hyperbolic functions incurred "
-                               + failures + " failures.");
-            throw new RuntimeException();
-        }
+        failures += Tests.testUlpDiffWithAbsBound("StrictMath.tanh",  input, StrictMath::tanh,  expected, ulps, 1.0);
+        failures += Tests.testUlpDiffWithAbsBound("StrictMath.tanh", -input, StrictMath::tanh, -expected, ulps, 1.0);
+        return failures;
     }
-
 }
diff --git a/test/jdk/java/lang/Math/HypotTests.java b/test/jdk/java/lang/Math/HypotTests.java
index d7e562ca5fd27cde31f2d4409534306fe77786cd..e09799e34a4f3e3c1c00991bbd4bbc7c9c9b5f8d 100644
--- a/test/jdk/java/lang/Math/HypotTests.java
+++ b/test/jdk/java/lang/Math/HypotTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, 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,7 +28,6 @@
  * @run main HypotTests
  * @bug 4851638 4939441 8078672 8240632
  * @summary Tests for {Math, StrictMath}.hypot (use -Dseed=X to set PRNG seed)
- * @author Joseph D. Darcy
  * @key randomness
  */
 
@@ -51,7 +50,6 @@ public class HypotTests {
         long N = n;
         long result[] = new long[3];
 
-
         result[0] = Math.abs(M*M - N*N);
         result[1] = Math.abs(2*M*N);
         result[2] = Math.abs(M*M + N*N);
@@ -188,13 +186,11 @@ public class HypotTests {
                                           pcNeighborsStrictHypot[j+1] );
                     }
 
-
                 }
 
             }
         }
 
-
         return failures;
     }
 
@@ -221,26 +217,22 @@ public class HypotTests {
         // each input negated singly, and both inputs negated.  Also
         // test inputs in reversed order.
 
-        for(int i = -1; i <= 1; i+=2) {
-            for(int j = -1; j <= 1; j+=2) {
+        for(int i = -1; i <= 1; i += 2) {
+            for(int j = -1; j <= 1; j += 2) {
                 double x = i * input1;
                 double y = j * input2;
-                failures += Tests.testUlpDiff("Math.hypot", x, y,
-                                              Math.hypot(x, y), expected, ulps);
-                failures += Tests.testUlpDiff("Math.hypot", y, x,
-                                              Math.hypot(y, x ), expected, ulps);
-
-                failures += Tests.testUlpDiff("StrictMath.hypot", x, y,
-                                              StrictMath.hypot(x, y), expected, ulps);
-                failures += Tests.testUlpDiff("StrictMath.hypot", y, x,
-                                              StrictMath.hypot(y, x), expected, ulps);
+                failures += Tests.testUlpDiff("Math.hypot",       x, y, Math::hypot,       expected, ulps);
+                failures += Tests.testUlpDiff("Math.hypot",       y, x, Math::hypot,       expected, ulps);
+
+                failures += Tests.testUlpDiff("StrictMath.hypot", x, y, StrictMath::hypot, expected, ulps);
+                failures += Tests.testUlpDiff("StrictMath.hypot", y, x, StrictMath::hypot, expected, ulps);
             }
         }
 
         return failures;
     }
 
-    public static void main(String argv[]) {
+    public static void main(String... argv) {
         int failures = 0;
 
         failures += testHypot();
@@ -252,5 +244,4 @@ public class HypotTests {
             throw new RuntimeException();
         }
     }
-
 }
diff --git a/test/jdk/java/lang/Math/Ieee754SpecialCaseTests.java b/test/jdk/java/lang/Math/Ieee754SpecialCaseTests.java
index d8192f2fee36d088bddd15e09b01eb33be562555..f53f231464760b2ce93f146915e69b0e77f8c91b 100644
--- a/test/jdk/java/lang/Math/Ieee754SpecialCaseTests.java
+++ b/test/jdk/java/lang/Math/Ieee754SpecialCaseTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -62,8 +62,8 @@ public class Ieee754SpecialCaseTests {
 
     private static int testCosCase(double input, double expected) {
         int failures = 0;
-        failures += Tests.test("Math.cos",       input, Math.cos(input),       expected);
-        failures += Tests.test("StrictMath.cos", input, StrictMath.cos(input), expected);
+        failures += Tests.test("Math.cos",       input, Math::cos,       expected);
+        failures += Tests.test("StrictMath.cos", input, StrictMath::cos, expected);
         return failures;
     }
 
@@ -82,8 +82,8 @@ public class Ieee754SpecialCaseTests {
 
     private static int testAcosCase(double input, double expected) {
         int failures = 0;
-        failures += Tests.test("Math.acos",       input, Math.acos(input),       expected);
-        failures += Tests.test("StrictMath.acos", input, StrictMath.acos(input), expected);
+        failures += Tests.test("Math.acos",       input, Math::acos,       expected);
+        failures += Tests.test("StrictMath.acos", input, StrictMath::acos, expected);
         return failures;
     }
 
@@ -103,8 +103,8 @@ public class Ieee754SpecialCaseTests {
 
     private static int testAtanCase(double input, double expected) {
         int failures = 0;
-        failures += Tests.test("Math.atan",       input, Math.atan(input),       expected);
-        failures += Tests.test("StrictMath.atan", input, StrictMath.atan(input), expected);
+        failures += Tests.test("Math.atan",       input, Math::atan,       expected);
+        failures += Tests.test("StrictMath.atan", input, StrictMath::atan, expected);
         return failures;
     }
 
@@ -123,8 +123,8 @@ public class Ieee754SpecialCaseTests {
 
     private static int testLogCase(double input, double expected) {
         int failures = 0;
-        failures += Tests.test("Math.log",       input, Math.log(input),       expected);
-        failures += Tests.test("StrictMath.log", input, StrictMath.log(input), expected);
+        failures += Tests.test("Math.log",       input, Math::log,       expected);
+        failures += Tests.test("StrictMath.log", input, StrictMath::log, expected);
         return failures;
     }
 }
diff --git a/test/jdk/java/lang/Math/IeeeRecommendedTests.java b/test/jdk/java/lang/Math/IeeeRecommendedTests.java
index 830b16d765a45e48588a1d32c0512d514a13d27a..8570508ff446f6e0204f6aa11fdfdcd559f72035 100644
--- a/test/jdk/java/lang/Math/IeeeRecommendedTests.java
+++ b/test/jdk/java/lang/Math/IeeeRecommendedTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, 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,7 +28,6 @@
  * @run main IeeeRecommendedTests
  * @bug 4860891 4826732 4780454 4939441 4826652 8078672
  * @summary Tests for IEEE 754[R] recommended functions and similar methods (use -Dseed=X to set PRNG seed)
- * @author Joseph D. Darcy
  * @key randomness
  */
 
@@ -364,14 +363,14 @@ public class IeeeRecommendedTests {
         double minus_expected = -expected;
 
         failures+=Tests.test("Math.nextAfter(double,double)", start, direction,
-                             Math.nextAfter(start, direction), expected);
+                             Math::nextAfter, expected);
         failures+=Tests.test("Math.nextAfter(double,double)", minus_start, minus_direction,
-                             Math.nextAfter(minus_start, minus_direction), minus_expected);
+                             Math::nextAfter, minus_expected);
 
         failures+=Tests.test("StrictMath.nextAfter(double,double)", start, direction,
-                             StrictMath.nextAfter(start, direction), expected);
+                             StrictMath::nextAfter, expected);
         failures+=Tests.test("StrictMath.nextAfter(double,double)", minus_start, minus_direction,
-                             StrictMath.nextAfter(minus_start, minus_direction), minus_expected);
+                             StrictMath::nextAfter, minus_expected);
         return failures;
     }
 
@@ -586,10 +585,10 @@ public class IeeeRecommendedTests {
 
         for(int i = 0; i < testCases.length; i++) {
             failures+=Tests.test("Math.nextUp(double)",
-                                 testCases[i][0], Math.nextUp(testCases[i][0]), testCases[i][1]);
+                                 testCases[i][0], Math::nextUp, testCases[i][1]);
 
             failures+=Tests.test("StrictMath.nextUp(double)",
-                                 testCases[i][0], StrictMath.nextUp(testCases[i][0]), testCases[i][1]);
+                                 testCases[i][0], StrictMath::nextUp, testCases[i][1]);
         }
 
         return failures;
@@ -665,10 +664,10 @@ public class IeeeRecommendedTests {
 
         for(int i = 0; i < testCases.length; i++) {
             failures+=Tests.test("Math.nextDown(double)",
-                                 testCases[i][0], Math.nextDown(testCases[i][0]), testCases[i][1]);
+                                 testCases[i][0], Math::nextDown, testCases[i][1]);
 
             failures+=Tests.test("StrictMath.nextDown(double)",
-                                 testCases[i][0], StrictMath.nextDown(testCases[i][0]), testCases[i][1]);
+                                 testCases[i][0], StrictMath::nextDown, testCases[i][1]);
         }
 
         return failures;
@@ -906,12 +905,12 @@ public class IeeeRecommendedTests {
                         // copySign(magnitude, sign)
                         failures+=Tests.test("MathcopySign(double,double)",
                                              testCases[i][m],testCases[j][n],
-                                             Math.copySign(testCases[i][m], testCases[j][n]),
+                                             Math::copySign,
                                              (j==0?1.0f:-1.0f)*Math.abs(testCases[i][m]) );
 
                         failures+=Tests.test("StrictMath.copySign(double,double)",
                                              testCases[i][m],testCases[j][n],
-                                             StrictMath.copySign(testCases[i][m], testCases[j][n]),
+                                             StrictMath::copySign,
                                              (j==0?1.0f:-1.0f)*Math.abs(testCases[i][m]) );
                     }
                 }
@@ -932,7 +931,7 @@ public class IeeeRecommendedTests {
 
                     failures+=Tests.test("StrictMath.copySign(double,double)",
                                          testCases[i][m], NaNs[j],
-                                         StrictMath.copySign(testCases[i][m], NaNs[j]),
+                                         StrictMath::copySign,
                                          Math.abs(testCases[i][m]) );
                 }
             }
@@ -1384,13 +1383,13 @@ public class IeeeRecommendedTests {
         int failures=0;
 
         failures+=Tests.test("Math.ulp(double)", d,
-                             Math.ulp(d), expected);
+                             Math::ulp, expected);
         failures+=Tests.test("Math.ulp(double)", minus_d,
-                             Math.ulp(minus_d), expected);
+                             Math::ulp, expected);
         failures+=Tests.test("StrictMath.ulp(double)", d,
-                             StrictMath.ulp(d), expected);
+                             StrictMath::ulp, expected);
         failures+=Tests.test("StrictMath.ulp(double)", minus_d,
-                             StrictMath.ulp(minus_d), expected);
+                             StrictMath::ulp, expected);
         return failures;
     }
 
@@ -1664,16 +1663,16 @@ public class IeeeRecommendedTests {
 
         for(int i = 0; i < testCases.length; i++) {
             failures+=Tests.test("Math.signum(double)",
-                                 testCases[i][0], Math.signum(testCases[i][0]), testCases[i][1]);
+                                 testCases[i][0], Math::signum, testCases[i][1]);
             failures+=Tests.test("StrictMath.signum(double)",
-                                 testCases[i][0], StrictMath.signum(testCases[i][0]), testCases[i][1]);
+                                 testCases[i][0], StrictMath::signum, testCases[i][1]);
         }
 
         return failures;
     }
 
 
-    public static void main(String argv[]) {
+    public static void main(String... argv) {
         int failures = 0;
 
         failures += testFloatGetExponent();
diff --git a/test/jdk/java/lang/Math/Log10Tests.java b/test/jdk/java/lang/Math/Log10Tests.java
index 7bc75644f2b155c953b761af836e9e31272d8261..dbdd7c141794f98dc8ba5a4e8ca7107fab32f846 100644
--- a/test/jdk/java/lang/Math/Log10Tests.java
+++ b/test/jdk/java/lang/Math/Log10Tests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, 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,7 +25,6 @@
  * @test
  * @bug 4074599 4939441
  * @summary Tests for {Math, StrictMath}.log10
- * @author Joseph D. Darcy
  */
 
 public class Log10Tests {
@@ -41,11 +40,8 @@ public class Log10Tests {
     static int testLog10Case(double input, double expected) {
         int failures=0;
 
-        failures+=Tests.test("Math.log10(double)", input,
-                             Math.log10(input), expected);
-
-        failures+=Tests.test("StrictMath.log10(double)", input,
-                             StrictMath.log10(input), expected);
+        failures+=Tests.test("Math.log10",       input, Math::log10,       expected);
+        failures+=Tests.test("StrictMath.log10", input, StrictMath::log10, expected);
 
         return failures;
     }
@@ -121,8 +117,6 @@ public class Log10Tests {
                                            "log(input)/log(10): log10(input) = " + result +
                                            "\tlog(input)/log(10) = " + expected);
                     }
-
-
                 }
             }
         }
@@ -205,7 +199,7 @@ public class Log10Tests {
         return failures;
     }
 
-    public static void main(String argv[]) {
+    public static void main(String... argv) {
         int failures = 0;
 
         failures += testLog10();
@@ -216,5 +210,4 @@ public class Log10Tests {
             throw new RuntimeException();
         }
     }
-
 }
diff --git a/test/jdk/java/lang/Math/Log1pTests.java b/test/jdk/java/lang/Math/Log1pTests.java
index 021a651ed1870727609d5f38fb34b40e7665210f..2fa7ddec4429d353b5cfac8b4cf47879dfa35d82 100644
--- a/test/jdk/java/lang/Math/Log1pTests.java
+++ b/test/jdk/java/lang/Math/Log1pTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, 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,7 +28,6 @@
  * @run main Log1pTests
  * @bug 4851638 4939441 8078672
  * @summary Tests for {Math, StrictMath}.log1p (use -Dseed=X to set PRNG seed)
- * @author Joseph D. Darcy
  * @key randomness
  */
 
@@ -167,9 +166,7 @@ public class Log1pTests {
                                           pcNeighborsStrictLog1p[j+1] );
                     }
 
-
                 }
-
             }
         }
 
@@ -185,16 +182,12 @@ public class Log1pTests {
                                                double expected,
                                                double ulps) {
         int failures = 0;
-        failures += Tests.testUlpDiff("Math.lop1p(double",
-                                      input, Math.log1p(input),
-                                      expected, ulps);
-        failures += Tests.testUlpDiff("StrictMath.log1p(double",
-                                      input, StrictMath.log1p(input),
-                                      expected, ulps);
+        failures += Tests.testUlpDiff("Math.lop1p",       input, Math::log1p,       expected, ulps);
+        failures += Tests.testUlpDiff("StrictMath.log1p", input, StrictMath::log1p, expected, ulps);
         return failures;
     }
 
-    public static void main(String argv[]) {
+    public static void main(String... argv) {
         int failures = 0;
 
         failures += testLog1p();
diff --git a/test/jdk/java/lang/Math/PowTests.java b/test/jdk/java/lang/Math/PowTests.java
index 88221c5415a4eb76ed321dd71d92c1173b2770c4..8f8ea098bdaef20ace6fd930b28cb770dbbab8ab 100644
--- a/test/jdk/java/lang/Math/PowTests.java
+++ b/test/jdk/java/lang/Math/PowTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2022, 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,7 +25,6 @@
  * @test
  * @bug 4984407 5033578 8134795
  * @summary Tests for {Math, StrictMath}.pow
- * @author Joseph D. Darcy
  */
 
 public class PowTests {
@@ -35,35 +34,29 @@ public class PowTests {
 
     static int testPowCase(double input1, double input2, double expected) {
         int failures = 0;
-        failures += Tests.test("StrictMath.pow(double, double)", input1, input2,
-                               StrictMath.pow(input1, input2), expected);
-        failures += Tests.test("Math.pow(double, double)", input1, input2,
-                               Math.pow(input1, input2), expected);
+        failures += Tests.test("StrictMath.pow", input1, input2, StrictMath::pow, expected);
+        failures += Tests.test("Math.pow",       input1, input2, Math::pow,       expected);
         return failures;
     }
 
-
     static int testStrictPowCase(double input1, double input2, double expected) {
         int failures = 0;
-        failures += Tests.test("StrictMath.pow(double, double)", input1, input2,
-                               StrictMath.pow(input1, input2), expected);
+        failures += Tests.test("StrictMath.pow", input1, input2,
+                               StrictMath::pow, expected);
         return failures;
     }
 
     static int testNonstrictPowCase(double input1, double input2, double expected) {
         int failures = 0;
-        failures += Tests.test("Math.pow(double, double)", input1, input2,
-                               Math.pow(input1, input2), expected);
+        failures += Tests.test("Math.pow", input1, input2,
+                               Math::pow, expected);
         return failures;
     }
 
     static int testStrictVsNonstrictPowCase(double input1, double input2) {
-        double smResult = StrictMath.pow(input1, input2);
-        double mResult = Math.pow(input1, input2);
         return Tests.testUlpDiff(
             "StrictMath.pow(double, double) vs Math.pow(double, double)",
-            input1, input2, mResult, smResult, 2.0
-        );
+            input1, input2, Math::pow, StrictMath.pow(input1, input2), 2.0);
     }
 
     /*
@@ -313,7 +306,7 @@ public class PowTests {
         }
     }
 
-    public static void main(String [] argv) {
+    public static void main(String... argv) {
         int failures = 0;
 
         failures += testPow();
diff --git a/test/jdk/java/lang/Math/Rint.java b/test/jdk/java/lang/Math/Rint.java
index 53e4d26b13134887e8cf924649af15c1db1230e0..a9c6952b90b1227906f2e3c78fa03da20e611447 100644
--- a/test/jdk/java/lang/Math/Rint.java
+++ b/test/jdk/java/lang/Math/Rint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2022, 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
@@ -32,17 +32,14 @@ public class Rint {
     static int testRintCase(double input, double expected) {
         int failures = 0;
         double result;
-        failures += Tests.test("Math.rint",  input, Math.rint(input),   expected);
-        failures += Tests.test("Math.rint", -input, Math.rint(-input), -expected);
-        failures += Tests.test("StrictMath.rint",
-                               input, StrictMath.rint(input),   expected);
-        failures += Tests.test("StrictMath.rint", -input,
-                               StrictMath.rint(-input), -expected);
+        failures += Tests.test("Math.rint",        input, Math::rint,        expected);
+        failures += Tests.test("Math.rint",       -input, Math::rint,       -expected);
+        failures += Tests.test("StrictMath.rint",  input, StrictMath::rint,  expected);
+        failures += Tests.test("StrictMath.rint", -input, StrictMath::rint, -expected);
         return failures;
     }
 
-
-    public static void main(String args[]) {
+    public static void main(String... args) {
         int failures = 0;
         double twoToThe52 = Math.scalb(1.0, 52); // 2^52
 
@@ -97,7 +94,6 @@ public class Rint {
 
         };
 
-
         for(int i = 0; i < testCases.length; i++) {
             failures += testRintCase(testCases[i][0], testCases[i][1]);
         }
diff --git a/test/jdk/java/lang/Math/RoundTests.java b/test/jdk/java/lang/Math/RoundTests.java
index cae190f9770218e9f924f5fd8aabc447245527d8..0a51b426386b8ded5d75a43dfaefa84759430a33 100644
--- a/test/jdk/java/lang/Math/RoundTests.java
+++ b/test/jdk/java/lang/Math/RoundTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2022, 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
@@ -64,8 +64,8 @@ public class RoundTests {
     private static int testNearHalfCases(double input, double expected) {
         int failures = 0;
 
-        failures += Tests.test("Math.round",        input, Math.round(input),       expected);
-        failures += Tests.test("StrictMath.round",  input, StrictMath.round(input), expected);
+        failures += Tests.test("Math.round",        input, Math::round,       expected);
+        failures += Tests.test("StrictMath.round",  input, StrictMath::round, expected);
 
         return failures;
     }
@@ -145,20 +145,14 @@ public class RoundTests {
         failures += Tests.test("Math.round", -Float.MIN_VALUE,
                 Math.round(-Float.MIN_VALUE), 0.0F);
 
-        failures += Tests.test("Math.round", Double.NaN, Math.round(Double.NaN), 0.0);
-        failures += Tests.test("Math.round", Double.POSITIVE_INFINITY,
-                Math.round(Double.POSITIVE_INFINITY), Long.MAX_VALUE);
-        failures += Tests.test("Math.round", Double.NEGATIVE_INFINITY,
-                Math.round(Double.NEGATIVE_INFINITY), Long.MIN_VALUE);
-        failures += Tests.test("Math.round", -(double)Long.MIN_VALUE,
-                Math.round(-(double)Long.MIN_VALUE), Long.MAX_VALUE);
-        failures += Tests.test("Math.round", (double) Long.MIN_VALUE,
-                Math.round((double) Long.MIN_VALUE), Long.MIN_VALUE);
-        failures += Tests.test("Math.round", 0, Math.round(0), 0.0);
-        failures += Tests.test("Math.round", Double.MIN_VALUE,
-                Math.round(Double.MIN_VALUE), 0.0);
-        failures += Tests.test("Math.round", -Double.MIN_VALUE,
-                Math.round(-Double.MIN_VALUE), 0.0);
+        failures += Tests.test("Math.round", Double.NaN,               Math::round, 0.0);
+        failures += Tests.test("Math.round", Double.POSITIVE_INFINITY, Math::round, Long.MAX_VALUE);
+        failures += Tests.test("Math.round", Double.NEGATIVE_INFINITY, Math::round, Long.MIN_VALUE);
+        failures += Tests.test("Math.round", -(double)Long.MIN_VALUE,  Math::round, Long.MAX_VALUE);
+        failures += Tests.test("Math.round", (double) Long.MIN_VALUE,  Math::round, Long.MIN_VALUE);
+        failures += Tests.test("Math.round", 0,                        Math::round, 0.0);
+        failures += Tests.test("Math.round", Double.MIN_VALUE,         Math::round, 0.0);
+        failures += Tests.test("Math.round", -Double.MIN_VALUE,        Math::round, 0.0);
 
         return failures;
     }
diff --git a/test/jdk/java/lang/Math/SinCosCornerCasesTests.java b/test/jdk/java/lang/Math/SinCosCornerCasesTests.java
index e144857443f9916b9fe10ea3cb19645113e58a69..225cdaebf0ef08a1be94cc1bbfba78794f097d26 100644
--- a/test/jdk/java/lang/Math/SinCosCornerCasesTests.java
+++ b/test/jdk/java/lang/Math/SinCosCornerCasesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2022, 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,7 +28,6 @@
  * @build Tests
  * @build SinCosCornerCasesTests
  * @run main SinCosCornerCasesTests
- * @author Vivek Deshpande
  */
 
 public class SinCosCornerCasesTests {
@@ -1502,7 +1501,7 @@ public class SinCosCornerCasesTests {
 
     private static int testSinCase(double input, double bound1, double bound2) {
         int failures = 0;
-        failures += Tests.testBounds("Math.sin", input, Math.sin(input), bound1, bound2);
+        failures += Tests.testBounds("Math.sin", input, Math::sin, bound1, bound2);
         return failures;
     }
 
@@ -2921,7 +2920,7 @@ public class SinCosCornerCasesTests {
 
     private static int testCosCase(double input, double bound1, double bound2) {
         int failures = 0;
-        failures += Tests.testBounds("Math.cos", input, Math.cos(input), bound1, bound2);
+        failures += Tests.testBounds("Math.cos", input, Math::cos, bound1, bound2);
         return failures;
     }
 }
diff --git a/test/jdk/java/lang/Math/TanTests.java b/test/jdk/java/lang/Math/TanTests.java
index f4ad1872238f3ce3f179d7ce15c2d92a937911ee..04ed7d47ed1ca0f055973b9a3f0dc488d5be06a3 100644
--- a/test/jdk/java/lang/Math/TanTests.java
+++ b/test/jdk/java/lang/Math/TanTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2022, 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,7 +25,6 @@
  * @test
  * @bug 5033578
  * @summary Tests for {Math, StrictMath}.tan
- * @author Joseph D. Darcy
  */
 
 public class TanTests {
@@ -33,10 +32,8 @@ public class TanTests {
 
     static int testTanCase(double input, double expected, double ulps) {
         int failures = 0;
-        failures += Tests.testUlpDiff("StrictMath.tan(double, double)", input,
-                               StrictMath.tan(input), expected, ulps);
-        failures += Tests.testUlpDiff("Math.tan(double, double)", input,
-                               Math.tan(input), expected, ulps);
+        failures += Tests.testUlpDiff("StrictMath.tan", input, StrictMath::tan, expected, ulps);
+        failures += Tests.testUlpDiff("Math.tan",       input, Math::tan,       expected, ulps);
         return failures;
     }
 
@@ -173,7 +170,7 @@ public class TanTests {
         return failures;
     }
 
-    public static void main(String [] argv) {
+    public static void main(String... argv) {
         int failures = 0;
 
         failures += testTan();
diff --git a/test/jdk/java/lang/Math/Tests.java b/test/jdk/java/lang/Math/Tests.java
index 98821142fc971f085b60ca0a8edca6d9a0f411f7..f1de6319a9ed3438a64ac2969ab37a3b483a7c78 100644
--- a/test/jdk/java/lang/Math/Tests.java
+++ b/test/jdk/java/lang/Math/Tests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, 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
@@ -21,6 +21,10 @@
  * questions.
  */
 
+import java.util.function.DoubleBinaryOperator;
+import java.util.function.DoubleUnaryOperator;
+import java.util.function.DoubleToIntFunction;
+
 /*
  * Shared static test methods for numerical tests.  Sharing these
  * helper test methods avoids repeated functions in the various test
@@ -235,9 +239,9 @@ public class Tests {
                                "\texpected  " + expected + "\n"  +
                                "\tgot       " + result   + ").");
             return 1;
-        }
-        else
+        } else {
             return 0;
+        }
     }
 
     public static int test(String testName, double input,
@@ -248,9 +252,9 @@ public class Tests {
                                "\texpected  " + expected + "\n"  +
                                "\tgot       " + result   + ").");
             return 1;
-        }
-        else
+        } else {
             return 0;
+        }
     }
 
     public static int test(String testName, float input1, float input2,
@@ -291,6 +295,13 @@ public class Tests {
         return 0;
     }
 
+    public static int test(String testName,
+                           double input,
+                           DoubleToIntFunction func,
+                           int expected) {
+        return test(testName, input, func.applyAsInt(input), expected);
+    }
+
     public  static int test(String testName, double input,
                             int result, int expected) {
         if (expected != result) {
@@ -299,9 +310,9 @@ public class Tests {
                                "\texpected  " + expected + "\n"  +
                                "\tgot       " + result   + ").");
             return 1;
-        }
-        else
+        } else {
             return 0;
+        }
     }
 
     public static int test(String testName, float input,
@@ -312,11 +323,17 @@ public class Tests {
                                "\texpected  " + expected + "\t(" + toHexString(expected) + ")\n" +
                                "\tgot       " + result   + "\t(" + toHexString(result) + ").");
             return 1;
-        }
-        else
+        } else {
             return 0;
+        }
     }
 
+    public static int test(String testName,
+                           double input,
+                           DoubleUnaryOperator func,
+                           double expected) {
+        return test(testName, input, func.applyAsDouble(input), expected);
+    }
 
     public static int test(String testName, double input,
                            double result, double expected) {
@@ -326,9 +343,9 @@ public class Tests {
                                "\texpected  " + expected + "\t(" + toHexString(expected) + ")\n" +
                                "\tgot       " + result   + "\t(" + toHexString(result) + ").");
             return 1;
-        }
-        else
+        } else {
             return 0;
+        }
     }
 
     public static int test(String testName,
@@ -341,9 +358,16 @@ public class Tests {
                                "\texpected  "  + expected + "\t(" + toHexString(expected) + ")\n" +
                                "\tgot       "  + result   + "\t(" + toHexString(result) + ").");
             return 1;
-        }
-        else
+        } else {
             return 0;
+        }
+    }
+
+    public static int test(String testName,
+                           double input1, double input2,
+                           DoubleBinaryOperator func,
+                           double expected) {
+        return test(testName, input1, input2, func.applyAsDouble(input1, input2), expected);
     }
 
     public static int test(String testName,
@@ -356,9 +380,9 @@ public class Tests {
                                "\texpected  "  + expected + "\t(" + toHexString(expected) + ")\n" +
                                "\tgot       "  + result   + "\t(" + toHexString(result) + ").");
             return 1;
-        }
-        else
+        } else {
             return 0;
+        }
     }
 
     public static int test(String testName,
@@ -371,9 +395,9 @@ public class Tests {
                                "\texpected  "  + expected + "\t(" + toHexString(expected) + ")\n" +
                                "\tgot       "  + result   + "\t(" + toHexString(result) + ").");
             return 1;
-        }
-        else
+        } else {
             return 0;
+        }
     }
 
     public static int test(String testName,
@@ -386,9 +410,9 @@ public class Tests {
                                "\texpected  "  + expected + "\t(" + toHexString(expected) + ")\n" +
                                "\tgot       "  + result   + "\t(" + toHexString(result) + ").");
             return 1;
-        }
-        else
+        } else {
             return 0;
+        }
     }
 
     public static int test(String testName,
@@ -402,9 +426,21 @@ public class Tests {
                                "\texpected  "  + expected + "\t(" + toHexString(expected) + ")\n" +
                                "\tgot       "  + result   + "\t(" + toHexString(result) + ").");
             return 1;
-        }
-        else
+        } else {
             return 0;
+        }
+    }
+
+    @FunctionalInterface
+    public interface DoubleTernaryOperator {
+        double applyAsDouble(double input1, double input2, double input3);
+    }
+
+    public static int test(String testName,
+                           double input1, double input2, double input3,
+                           DoubleTernaryOperator func, double expected) {
+        return test(testName, input1, input2, input3, func.applyAsDouble(input1, input2, input3), expected);
+
     }
 
     public static int test(String testName,
@@ -418,9 +454,9 @@ public class Tests {
                                "\texpected  "  + expected + "\t(" + toHexString(expected) + ")\n" +
                                "\tgot       "  + result   + "\t(" + toHexString(result) + ").");
             return 1;
-        }
-        else
+        } else {
             return 0;
+        }
     }
 
     static int testUlpCore(double result, double expected, double ulps) {
@@ -442,14 +478,19 @@ public class Tests {
                     // fail if greater than or unordered
                     !(Math.abs( difference/Math.ulp(expected) ) <= Math.abs(ulps)) ) {
                     return 1;
-                }
-                else
+                } else {
                     return 0;
+                }
             }
         }
     }
 
     // One input argument.
+    public static int testUlpDiff(String testName, double input,
+                                  DoubleUnaryOperator func, double expected, double ulps) {
+        return testUlpDiff(testName, input, func.applyAsDouble(input), expected, ulps);
+    }
+
     public static int testUlpDiff(String testName, double input,
                                   double result, double expected, double ulps) {
         int code = testUlpCore(result, expected, ulps);
@@ -464,6 +505,11 @@ public class Tests {
     }
 
     // Two input arguments.
+    public static int testUlpDiff(String testName, double input1, double input2,
+                                  DoubleBinaryOperator func, double expected, double ulps) {
+        return testUlpDiff(testName, input1, input2, func.applyAsDouble(input1, input2), expected, ulps);
+    }
+
     public static int testUlpDiff(String testName, double input1, double input2,
                                   double result, double expected, double ulps) {
         int code = testUlpCore(result, expected, ulps);
@@ -481,6 +527,14 @@ public class Tests {
     // For a successful test, the result must be within the ulp bound of
     // expected AND the result must have absolute value less than or
     // equal to absBound.
+    public static int testUlpDiffWithAbsBound(String testName, double input,
+                                              DoubleUnaryOperator func, double expected,
+                                              double ulps, double absBound) {
+        return testUlpDiffWithAbsBound(testName, input,
+                                       func.applyAsDouble(input), expected,
+                                       ulps, absBound);
+    }
+
     public static int testUlpDiffWithAbsBound(String testName, double input,
                                               double result, double expected,
                                               double ulps, double absBound) {
@@ -506,6 +560,14 @@ public class Tests {
     // For a successful test, the result must be within the ulp bound of
     // expected AND the result must have absolute value greater than
     // or equal to the lowerBound.
+    public static int testUlpDiffWithLowerBound(String testName, double input,
+                                                DoubleUnaryOperator func, double expected,
+                                                double ulps, double lowerBound) {
+        return testUlpDiffWithLowerBound(testName, input,
+                                         func.applyAsDouble(input), expected,
+                                         ulps, lowerBound);
+    }
+
     public static int testUlpDiffWithLowerBound(String testName, double input,
                                                 double result, double expected,
                                                 double ulps, double lowerBound) {
@@ -513,8 +575,9 @@ public class Tests {
 
         if (!(result >= lowerBound) && !Double.isNaN(expected)) {
             code = 1;
-        } else
+        } else {
             code = testUlpCore(result, expected, ulps);
+        }
 
         if (code == 1) {
             System.err.println("Failure for " + testName +
@@ -528,6 +591,11 @@ public class Tests {
         return code;
     }
 
+    public static int testTolerance(String testName, double input,
+                                    DoubleUnaryOperator func, double expected, double tolerance) {
+        return testTolerance(testName, input, func.applyAsDouble(input), expected, tolerance);
+
+    }
     public static int testTolerance(String testName, double input,
                                     double result, double expected, double tolerance) {
         if (Double.compare(expected, result ) != 0) {
@@ -544,13 +612,18 @@ public class Tests {
                 return 1;
             }
             return 0;
-        }
-        else
+        } else {
             return 0;
+        }
     }
 
     // For a successful test, the result must be within the upper and
     // lower bounds.
+    public static int testBounds(String testName, double input, DoubleUnaryOperator func,
+                                 double bound1, double bound2) {
+        return testBounds(testName, input, func.applyAsDouble(input), bound1, bound2);
+    }
+
     public static int testBounds(String testName, double input, double result,
                                  double bound1, double bound2) {
         if ((result >= bound1 && result <= bound2) ||
diff --git a/test/jdk/java/lang/Math/WorstCaseTests.java b/test/jdk/java/lang/Math/WorstCaseTests.java
index be98d977aabbc926df801d6debf56f13ce7fac0f..2cffa8fabfc0deec5c5137d4250f177de2b7db09 100644
--- a/test/jdk/java/lang/Math/WorstCaseTests.java
+++ b/test/jdk/java/lang/Math/WorstCaseTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2022, 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
@@ -29,7 +29,6 @@
  * @build WorstCaseTests
  * @run main WorstCaseTests
  * @run main/othervm -Xcomp WorstCaseTests
- * @author Joseph D. Darcy
  */
 
 /**
@@ -126,8 +125,8 @@ public class WorstCaseTests {
     private static int testExpCase(double input, double expected) {
         int failures = 0;
         double out = Tests.nextOut(expected);
-        failures += Tests.testBounds("Math.exp",       input, Math.exp(input),       expected, out);
-        failures += Tests.testBounds("StrictMath.exp", input, StrictMath.exp(input), expected, out);
+        failures += Tests.testBounds("Math.exp",       input, Math::exp,       expected, out);
+        failures += Tests.testBounds("StrictMath.exp", input, StrictMath::exp, expected, out);
         return failures;
     }
 
@@ -158,8 +157,8 @@ public class WorstCaseTests {
     private static int testLogCase(double input, double expected) {
         int failures = 0;
         double out = Tests.nextOut(expected);
-        failures += Tests.testBounds("Math.log",       input, Math.log(input),       expected, out);
-        failures += Tests.testBounds("StrictMath.log", input, StrictMath.log(input), expected, out);
+        failures += Tests.testBounds("Math.log",       input, Math::log,       expected, out);
+        failures += Tests.testBounds("StrictMath.log", input, StrictMath::log, expected, out);
         return failures;
     }
 
@@ -191,8 +190,8 @@ public class WorstCaseTests {
     private static int testSinCase(double input, double expected) {
         int failures = 0;
         double out = Tests.nextOut(expected);
-        failures += Tests.testBounds("Math.sin",       input, Math.sin(input),       expected, out);
-        failures += Tests.testBounds("StrictMath.sin", input, StrictMath.sin(input), expected, out);
+        failures += Tests.testBounds("Math.sin",       input, Math::sin,       expected, out);
+        failures += Tests.testBounds("StrictMath.sin", input, StrictMath::sin, expected, out);
         return failures;
     }
 
@@ -223,8 +222,8 @@ public class WorstCaseTests {
     private static int testAsinCase(double input, double expected) {
         int failures = 0;
         double out = Tests.nextOut(expected);
-        failures += Tests.testBounds("Math.asin",       input, Math.asin(input),       expected, out);
-        failures += Tests.testBounds("StrictMath.asin", input, StrictMath.asin(input), expected, out);
+        failures += Tests.testBounds("Math.asin",       input, Math::asin,       expected, out);
+        failures += Tests.testBounds("StrictMath.asin", input, StrictMath::asin, expected, out);
         return failures;
     }
 
@@ -256,8 +255,8 @@ public class WorstCaseTests {
     private static int testCosCase(double input, double expected) {
         int failures = 0;
         double out = Tests.nextOut(expected);
-        failures += Tests.testBounds("Math.cos",       input, Math.cos(input),       expected, out);
-        failures += Tests.testBounds("StrictMath.cos", input, StrictMath.cos(input), expected, out);
+        failures += Tests.testBounds("Math.cos",       input, Math::cos,       expected, out);
+        failures += Tests.testBounds("StrictMath.cos", input, StrictMath::cos, expected, out);
         return failures;
     }
 
@@ -280,8 +279,8 @@ public class WorstCaseTests {
     private static int testAcosCase(double input, double expected) {
         int failures = 0;
         double out = Tests.nextOut(expected);
-        failures += Tests.testBounds("Math.acos",       input, Math.acos(input),       expected, out);
-        failures += Tests.testBounds("StrictMath.acos", input, StrictMath.acos(input), expected, out);
+        failures += Tests.testBounds("Math.acos",       input, Math::acos,       expected, out);
+        failures += Tests.testBounds("StrictMath.acos", input, StrictMath::acos, expected, out);
         return failures;
     }
 
@@ -309,8 +308,8 @@ public class WorstCaseTests {
     private static int testTanCase(double input, double expected) {
         int failures = 0;
         double out = Tests.nextOut(expected);
-        failures += Tests.testBounds("Math.tan",       input, Math.tan(input),       expected, out);
-        failures += Tests.testBounds("StrictMath.tan", input, StrictMath.tan(input), expected, out);
+        failures += Tests.testBounds("Math.tan",       input, Math::tan,       expected, out);
+        failures += Tests.testBounds("StrictMath.tan", input, StrictMath::tan, expected, out);
         return failures;
     }
 
@@ -341,8 +340,8 @@ public class WorstCaseTests {
     private static int testAtanCase(double input, double expected) {
         int failures = 0;
         double out = Tests.nextOut(expected);
-        failures += Tests.testBounds("Math.atan",       input, Math.atan(input),       expected, out);
-        failures += Tests.testBounds("StrictMath.atan", input, StrictMath.atan(input), expected, out);
+        failures += Tests.testBounds("Math.atan",       input, Math::atan,       expected, out);
+        failures += Tests.testBounds("StrictMath.atan", input, StrictMath::atan, expected, out);
         return failures;
     }
 
@@ -367,8 +366,8 @@ public class WorstCaseTests {
     private static int testPow2Case(double input, double expected) {
         int failures = 0;
         double out = Tests.nextOut(expected);
-        failures += Tests.testBounds("Math.pow2",       input, Math.pow(2, input),       expected, out);
-        failures += Tests.testBounds("StrictMath.pow2", input, StrictMath.pow(2, input), expected, out);
+        failures += Tests.testBounds("Math.pow2",       input, d -> Math.pow(2, d),       expected, out);
+        failures += Tests.testBounds("StrictMath.pow2", input, d -> StrictMath.pow(2, d), expected, out);
         return failures;
     }
 
@@ -400,8 +399,8 @@ public class WorstCaseTests {
     private static int testSinhCase(double input, double expected) {
         int failures = 0;
         double out = Tests.nextOut(expected);
-        failures += Tests.testBounds("Math.sinh",       input, Math.sinh(input),       expected, out);
-        failures += Tests.testBounds("StrictMath.sinh", input, StrictMath.sinh(input), expected, out);
+        failures += Tests.testBounds("Math.sinh",       input, Math::sinh,       expected, out);
+        failures += Tests.testBounds("StrictMath.sinh", input, StrictMath::sinh, expected, out);
         return failures;
     }
 
@@ -428,8 +427,8 @@ public class WorstCaseTests {
     private static int testCoshCase(double input, double expected) {
         int failures = 0;
         double out = Tests.nextOut(expected);
-        failures += Tests.testBounds("Math.cosh",       input, Math.cosh(input),       expected, out);
-        failures += Tests.testBounds("StrictMath.cosh", input, StrictMath.cosh(input), expected, out);
+        failures += Tests.testBounds("Math.cosh",       input, Math::cosh,       expected, out);
+        failures += Tests.testBounds("StrictMath.cosh", input, StrictMath::cosh, expected, out);
         return failures;
     }
 }
diff --git a/test/jdk/java/lang/StrictMath/CubeRootTests.java b/test/jdk/java/lang/StrictMath/CubeRootTests.java
index f4a3978075d4ad1dee36c1fbfe885c1dce4d3f95..0423f1ff087532a1ff3c7291501d651e8d8af0cc 100644
--- a/test/jdk/java/lang/StrictMath/CubeRootTests.java
+++ b/test/jdk/java/lang/StrictMath/CubeRootTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, 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
@@ -32,7 +32,6 @@
  * @build CubeRootTests
  * @run main CubeRootTests
  * @summary Tests specifically for StrictMath.cbrt
- * @author Joseph D. Darcy
  */
 
 import jdk.test.lib.RandomFactory;
@@ -71,9 +70,9 @@ public class CubeRootTests {
         double minus_expected = -expected;
 
         failures+=Tests.test("StrictMath.cbrt(double)", input,
-                             StrictMath.cbrt(input), expected);
+                             StrictMath::cbrt, expected);
         failures+=Tests.test("StrictMath.cbrt(double)", minus_input,
-                             StrictMath.cbrt(minus_input), minus_expected);
+                             StrictMath::cbrt, minus_expected);
         return failures;
     }
 
diff --git a/test/jdk/java/lang/StrictMath/Expm1Tests.java b/test/jdk/java/lang/StrictMath/Expm1Tests.java
index 368d1025993c42c5a6fb412a304e28613c80b67d..e7d9696535d9b9033abc075b5bc86f9c250e8434 100644
--- a/test/jdk/java/lang/StrictMath/Expm1Tests.java
+++ b/test/jdk/java/lang/StrictMath/Expm1Tests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, 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,7 +25,8 @@
  * @test
  * @bug 4851638
  * @summary Tests for StrictMath.expm1
- * @author Joseph D. Darcy
+ * @compile -Xdiags:verbose Expm1Tests.java
+ * @run main Expm1Tests
  */
 
 /**
@@ -44,7 +45,7 @@ public class Expm1Tests {
 
     static int testExpm1Case(double input, double expected) {
         return Tests.test("StrictMath.expm1(double)", input,
-                          StrictMath.expm1(input), expected);
+                          StrictMath::expm1, expected);
     }
 
     static int testExpm1() {
diff --git a/test/jdk/java/lang/StrictMath/HyperbolicTests.java b/test/jdk/java/lang/StrictMath/HyperbolicTests.java
index 37b851dd795e85b366bd4ad7c4bf903e71b5b049..4dfc7596d38d40fa1b2f5d0e4960c42d5ab19cf1 100644
--- a/test/jdk/java/lang/StrictMath/HyperbolicTests.java
+++ b/test/jdk/java/lang/StrictMath/HyperbolicTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, 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,7 +25,6 @@
  * @test
  * @bug 4851625
  * @summary Tests for StrictMath.{sinh, cosh, tanh}
- * @author Joseph D. Darcy
  */
 
 /**
@@ -45,17 +44,17 @@ public class HyperbolicTests {
 
     static int testSinhCase(double input, double expected) {
         return Tests.test("StrictMath.sinh(double)", input,
-                          StrictMath.sinh(input), expected);
+                          StrictMath::sinh, expected);
     }
 
     static int testCoshCase(double input, double expected) {
         return Tests.test("StrictMath.cosh(double)", input,
-                          StrictMath.cosh(input), expected);
+                          StrictMath::cosh, expected);
     }
 
     static int testTanhCase(double input, double expected) {
         return Tests.test("StrictMath.tanh(double)", input,
-                          StrictMath.tanh(input), expected);
+                          StrictMath::tanh, expected);
     }
 
     static int testSinh() {
diff --git a/test/jdk/java/lang/StrictMath/HypotTests.java b/test/jdk/java/lang/StrictMath/HypotTests.java
index 0b1dd41691fda3a90c5a553d09cf3f00d84750e5..c714dcf1499dd76f7b2c74c2b19e1e54cea29b76 100644
--- a/test/jdk/java/lang/StrictMath/HypotTests.java
+++ b/test/jdk/java/lang/StrictMath/HypotTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, 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
@@ -32,7 +32,6 @@
  * @build FdlibmTranslit
  * @build HypotTests
  * @run main HypotTests
- * @author Joseph D. Darcy
  */
 
 import jdk.test.lib.RandomFactory;
@@ -72,28 +71,28 @@ public class HypotTests {
     static int testHypotCase(double input1, double input2, double expected) {
         int failures = 0;
         failures += Tests.test("StrictMath.hypot(double)", input1, input2,
-                               StrictMath.hypot(input1, input2), expected);
+                               StrictMath::hypot, expected);
 
         failures += Tests.test("StrictMath.hypot(double)", input2, input1,
-                          StrictMath.hypot(input2, input1), expected);
+                               StrictMath::hypot, expected);
 
         failures += Tests.test("StrictMath.hypot(double)", -input1, input2,
-                               StrictMath.hypot(-input1, input2), expected);
+                               StrictMath::hypot, expected);
 
         failures += Tests.test("StrictMath.hypot(double)", input2, -input1,
-                          StrictMath.hypot(input2, -input1), expected);
+                               StrictMath::hypot, expected);
 
         failures += Tests.test("StrictMath.hypot(double)", input1, -input2,
-                               StrictMath.hypot(input1, -input2), expected);
+                               StrictMath::hypot, expected);
 
         failures += Tests.test("StrictMath.hypot(double)", -input2, input1,
-                          StrictMath.hypot(-input2, input1), expected);
+                               StrictMath::hypot, expected);
 
         failures += Tests.test("StrictMath.hypot(double)", -input1, -input2,
-                               StrictMath.hypot(-input1, -input2), expected);
+                               StrictMath::hypot, expected);
 
         failures +=  Tests.test("StrictMath.hypot(double)", -input2, -input1,
-                          StrictMath.hypot(-input2, -input1), expected);
+                                StrictMath::hypot, expected);
         return failures;
     }
 
diff --git a/test/jdk/java/lang/StrictMath/Log10Tests.java b/test/jdk/java/lang/StrictMath/Log10Tests.java
index af07eac7e66f084478c51526ac0769bbd4e8c772..eed6e8a510637c89297b6a8f813f6ffe1c3a8076 100644
--- a/test/jdk/java/lang/StrictMath/Log10Tests.java
+++ b/test/jdk/java/lang/StrictMath/Log10Tests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, 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,7 +25,6 @@
  * @test
  * @bug 4074599
  * @summary Tests for StrictMath.log10
- * @author Joseph D. Darcy
  */
 
 
@@ -45,7 +44,7 @@ public class Log10Tests {
 
     static int testLog10Case(double input, double expected) {
         return Tests.test("StrictMath.log10(double)", input,
-                          StrictMath.log10(input), expected);
+                          StrictMath::log10, expected);
     }
 
     static int testLog10() {
diff --git a/test/jdk/java/lang/StrictMath/Log1pTests.java b/test/jdk/java/lang/StrictMath/Log1pTests.java
index 91b0835222c88553c650895053c05f3a7818add3..9cd03d3306af62f71c452418699aeef324bf73fe 100644
--- a/test/jdk/java/lang/StrictMath/Log1pTests.java
+++ b/test/jdk/java/lang/StrictMath/Log1pTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, 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,7 +25,6 @@
  * @test
  * @bug 4851638
  * @summary Tests for StrictMath.log1p
- * @author Joseph D. Darcy
  */
 
 /**
@@ -44,7 +43,7 @@ public class Log1pTests {
 
     static int testLog1pCase(double input, double expected) {
         return Tests.test("StrictMath.log1p(double)", input,
-                          StrictMath.log1p(input), expected);
+                          StrictMath::log1p, expected);
     }
 
     static int testLog1p() {
diff --git a/test/jdk/java/lang/StrictMath/PowTests.java b/test/jdk/java/lang/StrictMath/PowTests.java
index 338cf42d54c8736f9d1fc23f50c4ccc2145b38a4..2936dfdf247087c0988f24c3df25a1bc101fa343 100644
--- a/test/jdk/java/lang/StrictMath/PowTests.java
+++ b/test/jdk/java/lang/StrictMath/PowTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, 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,7 +25,6 @@
  * @test
  * @bug 8136874
  * @summary Tests for StrictMath.pow
- * @author Joseph D. Darcy
  */
 
 /**
@@ -295,7 +294,7 @@ public class PowTests {
     private static int testPowCase(double input1, double input2, double expected) {
         int failures = 0;
         failures += Tests.test("StrictMath.pow(double)", input1, input2,
-                               StrictMath.pow(input1, input2), expected);
+                               StrictMath::pow, expected);
         return failures;
     }
 }
diff --git a/test/jdk/java/lang/StrictMath/Tests.java b/test/jdk/java/lang/StrictMath/Tests.java
index 0513cb70d1e82fc11267d227cbf5eb4879dba087..a675b2e961719e3c9d60c9ce3a2de7700ac0f95c 100644
--- a/test/jdk/java/lang/StrictMath/Tests.java
+++ b/test/jdk/java/lang/StrictMath/Tests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, 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
@@ -21,33 +21,48 @@
  * questions.
  */
 
+import java.util.function.DoubleBinaryOperator;
+import java.util.function.DoubleUnaryOperator;
+
 /*
- *
- *
  * Shared static test method for StrictMath tests.
  */
 
-
 public class Tests {
     private Tests(){}
 
-    static int test(String testName,
-                    double input,
-                    double result,
-                    double expected) {
+    public static int test(String testName,
+                           double input,
+                           DoubleUnaryOperator func,
+                           double expected) {
+        return test(testName, input, func.applyAsDouble(input), expected);
+    }
+
+    public static int test(String testName,
+                           double input,
+                           double result,
+                           double expected) {
         if (Double.compare(expected, result ) != 0) {
             System.err.println("Failure for " + testName + ":\n" +
                                "\tFor input "   + input    + "\t(" + Double.toHexString(input) + ")\n" +
                                "\texpected  " + expected + "\t(" + Double.toHexString(expected) + ")\n" +
                                "\tgot       " + result   + "\t(" + Double.toHexString(result) + ").");
             return 1;
-        }
-        else
+        } else {
             return 0;
+        }
+    }
+
+    public static int test(String testName,
+                           double input1,
+                           double input2,
+                           DoubleBinaryOperator func,
+                           double expected) {
+        return test(testName, input1, input2, func.applyAsDouble(input1, input2), expected);
     }
 
-    static int test(String testName, double input1,  double input2,
-                    double result, double expected) {
+    public static int test(String testName, double input1, double input2,
+                           double result, double expected) {
         if (Double.compare(expected, result ) != 0) {
             System.err.println("Failure for " + testName + ":\n" +
                                "\tFor input "   + input1   + "\t(" + Double.toHexString(input1) + "), " +
@@ -55,9 +70,9 @@ public class Tests {
                                "\texpected  " + expected + "\t(" + Double.toHexString(expected) + ")\n" +
                                "\tgot       " + result   + "\t(" + Double.toHexString(result) + ").");
             return 1;
-        }
-        else
+        } else {
             return 0;
+        }
     }
 
     /**
diff --git a/test/jdk/java/lang/annotation/TypeAnnotationReflection.java b/test/jdk/java/lang/annotation/TypeAnnotationReflection.java
index 64234ccc215ff48deb78e6c9cf696648e3827ccf..9c0a101c2b6af872f8f7856a984ab67677b4ea69 100644
--- a/test/jdk/java/lang/annotation/TypeAnnotationReflection.java
+++ b/test/jdk/java/lang/annotation/TypeAnnotationReflection.java
@@ -39,7 +39,8 @@ public class TypeAnnotationReflection {
         testReturnType();
         testNested();
         testArray();
-        testRunException();
+        testRunException(TestClassException.class.getDeclaredMethod("foo", (Class[])null));
+        testRunException(Outer2.TestClassException2.class.getDeclaredConstructor(Outer2.class));
         testClassTypeVarBounds();
         testMethodTypeVarBounds();
         testFields();
@@ -142,9 +143,8 @@ public class TypeAnnotationReflection {
         check(((TypeAnno)annos[0]).value().equals("return4"));
     }
 
-    private static void testRunException() throws Exception {
-        Method m = TestClassException.class.getDeclaredMethod("foo", (Class[])null);
-        AnnotatedType[] ts = m.getAnnotatedExceptionTypes();
+    private static void testRunException(Executable e) throws Exception {
+        AnnotatedType[] ts = e.getAnnotatedExceptionTypes();
         check(ts.length == 3);
 
         AnnotatedType t;
@@ -624,6 +624,15 @@ abstract class TestClassException {
     }
 }
 
+class Outer2 {
+    abstract class TestClassException2 {
+        public TestClassException2() throws
+                @TypeAnno("RE") @TypeAnno2("RE2") RuntimeException,
+                NullPointerException,
+                @TypeAnno("AIOOBE") ArrayIndexOutOfBoundsException {}
+    }
+}
+
 abstract class TestClassTypeVarAndField  {
diff --git a/test/jdk/java/lang/instrument/GetObjectSizeIntrinsicsTest.java b/test/jdk/java/lang/instrument/GetObjectSizeIntrinsicsTest.java
index 1417eb427a00d3dd3235f3c29a64311b3d247da4..a4fdab2ec4709fe58e444445a671338d2f115108 100644
--- a/test/jdk/java/lang/instrument/GetObjectSizeIntrinsicsTest.java
+++ b/test/jdk/java/lang/instrument/GetObjectSizeIntrinsicsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2020, 2022, Red Hat, 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
@@ -264,6 +264,36 @@
  *                   -javaagent:basicAgent.jar GetObjectSizeIntrinsicsTest GetObjectSizeIntrinsicsTest
  */
 
+/*
+ * @test
+ * @summary Test for fInst.getObjectSize with large arrays
+ * @library /test/lib
+ * @requires vm.bits == 64
+ * @requires vm.debug
+ * @requires os.maxMemory >= 10G
+ *
+ * @build sun.hotspot.WhiteBox
+ * @run build GetObjectSizeIntrinsicsTest
+ * @run shell MakeJAR.sh basicAgent
+ *
+ * @run driver jdk.test.lib.helpers.ClassFileInstaller sun.hotspot.WhiteBox
+ *
+ * @run main/othervm -Xmx8g
+ *                   -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure -XX:+WhiteBoxAPI -Xbootclasspath/a:.
+ *                   -Xint
+ *                   -javaagent:basicAgent.jar GetObjectSizeIntrinsicsTest GetObjectSizeIntrinsicsTest large
+ *
+ * @run main/othervm -Xmx8g
+ *                   -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure -XX:+WhiteBoxAPI -Xbootclasspath/a:.
+ *                   -Xbatch -XX:TieredStopAtLevel=1
+ *                   -javaagent:basicAgent.jar GetObjectSizeIntrinsicsTest GetObjectSizeIntrinsicsTest large
+ *
+ * @run main/othervm -Xmx8g
+ *                   -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure -XX:+WhiteBoxAPI -Xbootclasspath/a:.
+ *                   -Xbatch -XX:-TieredCompilation
+ *                   -javaagent:basicAgent.jar GetObjectSizeIntrinsicsTest GetObjectSizeIntrinsicsTest large
+ */
+
 import java.util.*;
 
 import jdk.test.lib.Platform;
@@ -271,18 +301,27 @@ import sun.hotspot.WhiteBox;
 
 public class GetObjectSizeIntrinsicsTest extends ASimpleInstrumentationTestCase {
 
-    static final Boolean compressedOops = WhiteBox.getWhiteBox().getBooleanVMFlag("UseCompressedOops");
-    static final int REF_SIZE = (compressedOops == null || compressedOops == true) ?  4 : 8;
+    static final Boolean COMPRESSED_OOPS = WhiteBox.getWhiteBox().getBooleanVMFlag("UseCompressedOops");
+    static final long REF_SIZE = (COMPRESSED_OOPS == null || COMPRESSED_OOPS == true) ? 4 : 8;
 
     static final Long align = WhiteBox.getWhiteBox().getIntxVMFlag("ObjectAlignmentInBytes");
     static final int OBJ_ALIGN = (align == null ? 8 : align.intValue());
 
-    public GetObjectSizeIntrinsicsTest(String name) {
+    static final int SMALL_ARRAY_SIZE = 1024;
+
+    // These should overflow 4G size boundary
+    static final int LARGE_INT_ARRAY_SIZE = 1024*1024*1024 + 1024;
+    static final int LARGE_OBJ_ARRAY_SIZE = (4096/(int)REF_SIZE)*1024*1024 + 1024;
+
+    final String mode;
+
+    public GetObjectSizeIntrinsicsTest(String name, String mode) {
         super(name);
+        this.mode = mode;
     }
 
     public static void main(String[] args)throws Throwable {
-        new GetObjectSizeIntrinsicsTest(args[0]).runTest();
+        new GetObjectSizeIntrinsicsTest(args[0], (args.length >= 2 ? args[1] : "")).runTest();
     }
 
     public static final int ITERS = 200_000;
@@ -312,30 +351,35 @@ public class GetObjectSizeIntrinsicsTest extends ASimpleInstrumentationTestCase
         testSize_localObject();
         testSize_fieldObject();
 
-        testSize_newSmallByteArray();
-        testSize_localSmallByteArray();
-        testSize_fieldSmallByteArray();
+        testSize_newSmallIntArray();
+        testSize_localSmallIntArray();
+        testSize_fieldSmallIntArray();
 
         testSize_newSmallObjArray();
         testSize_localSmallObjArray();
         testSize_fieldSmallObjArray();
 
+        if (mode.equals("large")) {
+            testSize_localLargeIntArray();
+            testSize_localLargeObjArray();
+        }
+
         testNulls();
     }
 
-    private static int roundUp(int v, int a) {
+    private static long roundUp(long v, long a) {
         return (v + a - 1) / a * a;
     }
 
     private void testSize_newObject() {
-        int expected = roundUp(Platform.is64bit() ? 16 : 8, OBJ_ALIGN);
+        long expected = roundUp(Platform.is64bit() ? 16 : 8, OBJ_ALIGN);
         for (int c = 0; c < ITERS; c++) {
             assertEquals(expected, fInst.getObjectSize(new Object()));
         }
     }
 
     private void testSize_localObject() {
-        int expected = roundUp(Platform.is64bit() ? 16 : 8, OBJ_ALIGN);
+        long expected = roundUp(Platform.is64bit() ? 16 : 8, OBJ_ALIGN);
         Object o = new Object();
         for (int c = 0; c < ITERS; c++) {
             assertEquals(expected, fInst.getObjectSize(o));
@@ -345,60 +389,76 @@ public class GetObjectSizeIntrinsicsTest extends ASimpleInstrumentationTestCase
     static Object staticO = new Object();
 
     private void testSize_fieldObject() {
-        int expected = roundUp(Platform.is64bit() ? 16 : 8, OBJ_ALIGN);
+        long expected = roundUp(Platform.is64bit() ? 16 : 8, OBJ_ALIGN);
         for (int c = 0; c < ITERS; c++) {
             assertEquals(expected, fInst.getObjectSize(staticO));
         }
     }
 
-    private void testSize_newSmallByteArray() {
-        int expected = roundUp(1024 + 16, OBJ_ALIGN);
+    private void testSize_newSmallIntArray() {
+        long expected = roundUp(4L*SMALL_ARRAY_SIZE + 16, OBJ_ALIGN);
         for (int c = 0; c < ITERS; c++) {
-            assertEquals(expected, fInst.getObjectSize(new byte[1024]));
+            assertEquals(expected, fInst.getObjectSize(new int[SMALL_ARRAY_SIZE]));
         }
     }
 
-    private void testSize_localSmallByteArray() {
-        byte[] arr = new byte[1024];
-        int expected = roundUp(arr.length + 16, OBJ_ALIGN);
+    private void testSize_localSmallIntArray() {
+        int[] arr = new int[SMALL_ARRAY_SIZE];
+        long expected = roundUp(4L*SMALL_ARRAY_SIZE + 16, OBJ_ALIGN);
         for (int c = 0; c < ITERS; c++) {
             assertEquals(expected, fInst.getObjectSize(arr));
         }
     }
 
-    static byte[] smallArr = new byte[1024];
+    static int[] smallArr = new int[SMALL_ARRAY_SIZE];
 
-    private void testSize_fieldSmallByteArray() {
-        int expected = roundUp(smallArr.length + 16, OBJ_ALIGN);
+    private void testSize_fieldSmallIntArray() {
+        long expected = roundUp(4L*SMALL_ARRAY_SIZE + 16, OBJ_ALIGN);
         for (int c = 0; c < ITERS; c++) {
             assertEquals(expected, fInst.getObjectSize(smallArr));
         }
     }
 
     private void testSize_newSmallObjArray() {
-        int expected = roundUp(1024*REF_SIZE + 16, OBJ_ALIGN);
+        long expected = roundUp(REF_SIZE*SMALL_ARRAY_SIZE + 16, OBJ_ALIGN);
         for (int c = 0; c < ITERS; c++) {
-            assertEquals(expected, fInst.getObjectSize(new Object[1024]));
+            assertEquals(expected, fInst.getObjectSize(new Object[SMALL_ARRAY_SIZE]));
         }
     }
 
     private void testSize_localSmallObjArray() {
-        Object[] arr = new Object[1024];
-        int expected = roundUp(arr.length*REF_SIZE + 16, OBJ_ALIGN);
+        Object[] arr = new Object[SMALL_ARRAY_SIZE];
+        long expected = roundUp(REF_SIZE*SMALL_ARRAY_SIZE + 16, OBJ_ALIGN);
         for (int c = 0; c < ITERS; c++) {
             assertEquals(expected, fInst.getObjectSize(arr));
         }
     }
 
-    static Object[] smallObjArr = new Object[1024];
+    static Object[] smallObjArr = new Object[SMALL_ARRAY_SIZE];
 
     private void testSize_fieldSmallObjArray() {
-        int expected = roundUp(smallArr.length*REF_SIZE + 16, OBJ_ALIGN);
+        long expected = roundUp(REF_SIZE*SMALL_ARRAY_SIZE + 16, OBJ_ALIGN);
         for (int c = 0; c < ITERS; c++) {
             assertEquals(expected, fInst.getObjectSize(smallObjArr));
         }
     }
 
+    private void testSize_localLargeIntArray() {
+        int[] arr = new int[LARGE_INT_ARRAY_SIZE];
+        long expected = roundUp(4L*LARGE_INT_ARRAY_SIZE + 16, OBJ_ALIGN);
+        for (int c = 0; c < ITERS; c++) {
+            assertEquals(expected, fInst.getObjectSize(arr));
+        }
+    }
+
+    private void testSize_localLargeObjArray() {
+        Object[] arr = new Object[LARGE_OBJ_ARRAY_SIZE];
+        long expected = roundUp(REF_SIZE*LARGE_OBJ_ARRAY_SIZE + 16, OBJ_ALIGN);
+        for (int c = 0; c < ITERS; c++) {
+            assertEquals(expected, fInst.getObjectSize(arr));
+        }
+    }
+
     private void testNulls() {
         for (int c = 0; c < ITERS; c++) {
             try {
diff --git a/test/jdk/java/lang/invoke/MethodHandleProxies/Driver.java b/test/jdk/java/lang/invoke/MethodHandleProxies/Driver.java
new file mode 100644
index 0000000000000000000000000000000000000000..6acd4fb30e1d9c444ef67a3bc36e09bb42eaf6f8
--- /dev/null
+++ b/test/jdk/java/lang/invoke/MethodHandleProxies/Driver.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2022, 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 8280377
+ * @build m1/* m2/* Unnamed
+ * @run testng/othervm m1/p1.Main
+ * @run testng/othervm Unnamed
+ * @summary Test MethodHandleProxies::asInterfaceInstance with a default
+ *          method with varargs
+ */
diff --git a/test/jdk/java/lang/invoke/MethodHandlesProxiesTest.java b/test/jdk/java/lang/invoke/MethodHandleProxies/MethodHandlesProxiesTest.java
similarity index 100%
rename from test/jdk/java/lang/invoke/MethodHandlesProxiesTest.java
rename to test/jdk/java/lang/invoke/MethodHandleProxies/MethodHandlesProxiesTest.java
diff --git a/test/jdk/java/lang/invoke/MethodHandleProxies/Unnamed.java b/test/jdk/java/lang/invoke/MethodHandleProxies/Unnamed.java
new file mode 100644
index 0000000000000000000000000000000000000000..f42071f04275f3488efc5f2015cb2b9928a74328
--- /dev/null
+++ b/test/jdk/java/lang/invoke/MethodHandleProxies/Unnamed.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2022, 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.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandleProxies;
+import java.lang.invoke.MethodHandles;
+import java.lang.reflect.Method;
+
+import static org.testng.Assert.*;
+
+/*
+ * Test MethodHandleProxies::asInterfaceInstance with an inaccessible interface
+ */
+public class Unnamed {
+    public static void main(String... args) throws Throwable {
+        MethodHandle target = MethodHandles.constant(String.class, "test");
+        Class intf = Class.forName("p2.TestIntf");
+        Object t = MethodHandleProxies.asInterfaceInstance(intf, target);
+
+        // verify that the caller has no access to the proxy created on an
+        // inaccessible interface
+        Method m = intf.getMethod("test", Object[].class);
+        assertFalse(m.canAccess(null));
+    }
+}
diff --git a/test/jdk/java/lang/invoke/MethodHandleProxies/m1/module-info.java b/test/jdk/java/lang/invoke/MethodHandleProxies/m1/module-info.java
new file mode 100644
index 0000000000000000000000000000000000000000..1bdeddce28fd6bb01ddbf7f6c71c5c13f8999585
--- /dev/null
+++ b/test/jdk/java/lang/invoke/MethodHandleProxies/m1/module-info.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2022, 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.
+ */
+module m1 {
+    requires m2;
+    requires org.testng;
+    exports p1;
+}
diff --git a/test/jdk/java/lang/invoke/MethodHandleProxies/m1/p1/Main.java b/test/jdk/java/lang/invoke/MethodHandleProxies/m1/p1/Main.java
new file mode 100644
index 0000000000000000000000000000000000000000..df71809996b3838ff43f753b48385893296eaabf
--- /dev/null
+++ b/test/jdk/java/lang/invoke/MethodHandleProxies/m1/p1/Main.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2022, 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 p1;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandleProxies;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import java.util.Arrays;
+import java.util.stream.Collectors;
+
+import p2.TestIntf;
+
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.*;
+
+public class Main {
+    public interface A {
+        default String aConcat(Object... objs) { return Arrays.deepToString(objs); }
+    }
+
+    public interface B {
+        default String bConcat(Object[] objs) { return Arrays.deepToString(objs); }
+    }
+
+    public interface C extends A, B {
+        String c(Object... objs);
+    }
+
+    private static String concat(Object... objs) {
+        return Arrays.stream(objs).map(Object::toString).collect(Collectors.joining());
+    }
+
+    /*
+     * Test the invocation of default methods with varargs
+     */
+    @Test
+    public static void testVarargsMethods() throws Throwable {
+        MethodHandle target = MethodHandles.lookup().findStatic(Main.class,
+                "concat", MethodType.methodType(String.class, Object[].class));
+        C proxy = MethodHandleProxies.asInterfaceInstance(C.class, target);
+
+        assertEquals(proxy.c("a", "b", "c"), "abc");
+        assertEquals(proxy.aConcat("a", "b", "c"), "[a, b, c]");
+        assertEquals(proxy.aConcat(new Object[] { "a", "b", "c" }), "[a, b, c]");
+        assertEquals(proxy.bConcat(new Object[] { "a", "b", "c" }), "[a, b, c]");
+    }
+
+    /*
+     * Test the invocation of a default method of an accessible interface
+     */
+    @Test
+    public static void modulePrivateInterface() {
+        MethodHandle target = MethodHandles.constant(String.class, "test");
+        TestIntf t = MethodHandleProxies.asInterfaceInstance(TestIntf.class, target);
+        assertEquals(t.test(), "test");
+    }
+}
diff --git a/test/jdk/java/lang/invoke/MethodHandleProxies/m2/module-info.java b/test/jdk/java/lang/invoke/MethodHandleProxies/m2/module-info.java
new file mode 100644
index 0000000000000000000000000000000000000000..1015757fc9c34eb90d6ae679be62bdf36c0f7699
--- /dev/null
+++ b/test/jdk/java/lang/invoke/MethodHandleProxies/m2/module-info.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2022, 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.
+ */
+module m2 {
+    exports p2 to m1;
+}
diff --git a/test/jdk/java/lang/invoke/MethodHandleProxies/m2/p2/TestIntf.java b/test/jdk/java/lang/invoke/MethodHandleProxies/m2/p2/TestIntf.java
new file mode 100644
index 0000000000000000000000000000000000000000..a87d248e0c8efbae08b47cacaa5ecd2765031ed5
--- /dev/null
+++ b/test/jdk/java/lang/invoke/MethodHandleProxies/m2/p2/TestIntf.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2022, 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 p2;
+
+public interface TestIntf {
+    String test();
+}
diff --git a/test/jdk/java/lang/reflect/exeCallerAccessTest/CallerAccessTest.java b/test/jdk/java/lang/reflect/exeCallerAccessTest/CallerAccessTest.java
index 9f625a34a93302b51770b31f1bdb05e79e338b62..85ee270244db8cffcbae9e0367a334a0a515339c 100644
--- a/test/jdk/java/lang/reflect/exeCallerAccessTest/CallerAccessTest.java
+++ b/test/jdk/java/lang/reflect/exeCallerAccessTest/CallerAccessTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2022, 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,7 +24,7 @@
 
 /**
  * @test
- * @bug 8221530
+ * @bug 8221530 8221642
  * @summary Test uses custom launcher that starts VM using JNI that verifies
  *          reflection API with null caller class
  * @library /test/lib
@@ -61,7 +61,10 @@ public class CallerAccessTest {
 
         System.out.println("Launching: " + launcher + " shared library path: " +
                            env.get(sharedLibraryPathEnvName));
-        new OutputAnalyzer(pb.start()).shouldHaveExitValue(0);
+        new OutputAnalyzer(pb.start())
+                .outputTo(System.out)
+                .errorTo(System.err)
+                .shouldHaveExitValue(0);
     }
 }
 
diff --git a/test/jdk/java/lang/reflect/exeCallerAccessTest/exeCallerAccessTest.c b/test/jdk/java/lang/reflect/exeCallerAccessTest/exeCallerAccessTest.c
index c38a0cb094eb0f89793b56b030ef446ce36b4473..31710138aaca5cd11d607a780d5d657732cf15c6 100644
--- a/test/jdk/java/lang/reflect/exeCallerAccessTest/exeCallerAccessTest.c
+++ b/test/jdk/java/lang/reflect/exeCallerAccessTest/exeCallerAccessTest.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2022, 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
@@ -32,9 +32,15 @@ static jclass    iaeClass;
 static jmethodID mid_Class_forName;
 static jmethodID mid_Class_getField;
 static jmethodID mid_Field_get;
+static jmethodID mid_Field_canAccess;
+static jmethodID mid_Field_trySetAccessible;
+static jmethodID mid_Field_setAccessible;
 
 int getField(JNIEnv *env, char* declaringClass_name, char* field_name);
 int checkAndClearIllegalAccessExceptionThrown(JNIEnv *env);
+int setAccessible(JNIEnv *env, char* declaringClass_name, char* field_name);
+int trySetAccessible(JNIEnv *env, char* declaringClass_name, char* field_name, jboolean canAccess);
+int checkAccess(JNIEnv *env, char* declaringClass_name, char* field_name, jboolean canAccess);
 
 int main(int argc, char** args) {
     JavaVM *jvm;
@@ -65,6 +71,12 @@ int main(int argc, char** args) {
     jclass fieldClass = (*env)->FindClass(env, "java/lang/reflect/Field");
     mid_Field_get = (*env)->GetMethodID(env, fieldClass, "get", "(Ljava/lang/Object;)Ljava/lang/Object;");
     assert(mid_Class_getField != NULL);
+    mid_Field_canAccess = (*env)->GetMethodID(env, fieldClass, "canAccess", "(Ljava/lang/Object;)Z");
+    assert(mid_Field_canAccess != NULL);
+    mid_Field_setAccessible = (*env)->GetMethodID(env, fieldClass, "setAccessible", "(Z)V");
+    assert(mid_Field_setAccessible != NULL);
+    mid_Field_trySetAccessible = (*env)->GetMethodID(env, fieldClass, "trySetAccessible", "()Z");
+    assert(mid_Field_trySetAccessible != NULL);
 
     // can access to public member of an exported type
     if ((rc = getField(env, "java.lang.Integer", "TYPE")) != 0) {
@@ -92,6 +104,32 @@ int main(int argc, char** args) {
         exit(-1);
     }
 
+    // expect IAE to jdk.internal.misc.Unsafe class
+    if ((rc = setAccessible(env, "jdk.internal.misc.Unsafe", "INVALID_FIELD_OFFSET")) == 0) {
+        printf("ERROR: IAE not thrown\n");
+        exit(-1);
+    }
+    if (checkAndClearIllegalAccessExceptionThrown(env) != JNI_TRUE) {
+        printf("ERROR: exception is not an instance of IAE\n");
+        exit(-1);
+    }
+
+    if ((rc = trySetAccessible(env, "java.lang.reflect.Modifier", "PUBLIC", JNI_TRUE)) != 0) {
+        printf("ERROR: unexpected result from trySetAccessible on Modifier::PUBLIC field\n");
+        exit(-1);
+    }
+    if ((rc = trySetAccessible(env, "jdk.internal.misc.Unsafe", "INVALID_FIELD_OFFSET", JNI_FALSE)) != 0) {
+        printf("ERROR: unexpected result from trySetAccessible on Unsafe public field\n");
+        exit(-1);
+    }
+
+    if ((rc = checkAccess(env, "java.lang.reflect.Modifier", "PUBLIC", JNI_TRUE)) != 0) {
+        printf("ERROR: unexpected result from trySetAccessible on Modifier::PUBLIC field\n");
+        exit(-1);
+    }
+    if ((rc = checkAccess(env, "jdk.internal.misc.Unsafe", "INVALID_FIELD_OFFSET", JNI_FALSE)) != 0) {
+        printf("ERROR: unexpected result from trySetAccessible on Unsafe public field\n");
+    }
     (*jvm)->DestroyJavaVM(jvm);
     return 0;
 }
@@ -127,3 +165,74 @@ int getField(JNIEnv *env, char* declaringClass_name, char* field_name) {
     return 0;
 }
 
+int setAccessible(JNIEnv *env, char* declaringClass_name, char* field_name) {
+    jobject c = (*env)->CallStaticObjectMethod(env, classClass, mid_Class_forName,
+                                               (*env)->NewStringUTF(env, declaringClass_name));
+    if ((*env)->ExceptionOccurred(env) != NULL) {
+        (*env)->ExceptionDescribe(env);
+        return 1;
+    }
+
+    jobject f = (*env)->CallObjectMethod(env, c, mid_Class_getField, (*env)->NewStringUTF(env, field_name));
+    if ((*env)->ExceptionOccurred(env) != NULL) {
+        (*env)->ExceptionDescribe(env);
+        return 2;
+    }
+
+    (*env)->CallVoidMethod(env, f, mid_Field_setAccessible, JNI_TRUE);
+    if ((*env)->ExceptionOccurred(env) != NULL) {
+        (*env)->ExceptionDescribe(env);
+        return 3;
+    }
+    return 0;
+}
+
+int trySetAccessible(JNIEnv *env, char* declaringClass_name, char* field_name, jboolean canAccess) {
+    jobject c = (*env)->CallStaticObjectMethod(env, classClass, mid_Class_forName,
+                                               (*env)->NewStringUTF(env, declaringClass_name));
+    if ((*env)->ExceptionOccurred(env) != NULL) {
+        (*env)->ExceptionDescribe(env);
+        return 1;
+    }
+
+    jobject f = (*env)->CallObjectMethod(env, c, mid_Class_getField, (*env)->NewStringUTF(env, field_name));
+    if ((*env)->ExceptionOccurred(env) != NULL) {
+        (*env)->ExceptionDescribe(env);
+        return 2;
+    }
+
+    jboolean rc = (*env)->CallBooleanMethod(env, f, mid_Field_trySetAccessible);
+    if ((*env)->ExceptionOccurred(env) != NULL) {
+        (*env)->ExceptionDescribe(env);
+        return 3;
+    }
+    if (rc != canAccess) {
+        return 4;
+    }
+    return 0;
+}
+
+int checkAccess(JNIEnv *env, char* declaringClass_name, char* field_name, jboolean canAccess) {
+    jobject c = (*env)->CallStaticObjectMethod(env, classClass, mid_Class_forName,
+                                               (*env)->NewStringUTF(env, declaringClass_name));
+    if ((*env)->ExceptionOccurred(env) != NULL) {
+        (*env)->ExceptionDescribe(env);
+        return 1;
+    }
+
+    jobject f = (*env)->CallObjectMethod(env, c, mid_Class_getField, (*env)->NewStringUTF(env, field_name));
+    if ((*env)->ExceptionOccurred(env) != NULL) {
+        (*env)->ExceptionDescribe(env);
+        return 2;
+    }
+
+    jboolean rc = (*env)->CallBooleanMethod(env, f, mid_Field_canAccess, NULL);
+    if ((*env)->ExceptionOccurred(env) != NULL) {
+        (*env)->ExceptionDescribe(env);
+        return 3;
+    }
+    if (rc != canAccess) {
+        return 4;
+    }
+    return 0;
+}
diff --git a/test/jdk/java/net/DatagramSocket/SendDatagramToBadAddress.java b/test/jdk/java/net/DatagramSocket/SendDatagramToBadAddress.java
index 0656dca908393a54a98e4b23e09ff88c4c258aae..b0c0afdbd61188bc36e7ff0884d31672535e5f3a 100644
--- a/test/jdk/java/net/DatagramSocket/SendDatagramToBadAddress.java
+++ b/test/jdk/java/net/DatagramSocket/SendDatagramToBadAddress.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2022, 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,7 +28,7 @@
  *
  * @summary DatagramSocket.send should throw exception when connected
  *  to an invalid destination (on platforms that support it).
- * @run main/othervm SendDatagramToBadAddress
+ * @run main/othervm SendDatagramToBadAddress -d
  */
 
 import java.net.*;
@@ -70,6 +70,8 @@ public class SendDatagramToBadAddress {
             for (int i=0; i {
+            write(peer, 99);
+            int n = Channels.newInputStream(sc).read();
+            assertEquals(n, 99);
+        });
+    }
+
+    /**
+     * Test read blocking before bytes are available.
+     */
+    public void testRead2() throws Exception {
+        withConnection((sc, peer) -> {
+            scheduleWrite(peer, 99, 1000);
+            int n = Channels.newInputStream(sc).read();
+            assertEquals(n, 99);
+        });
+    }
+
+    /**
+     * Test read after peer has closed connection.
+     */
+    public void testRead3() throws Exception {
+        withConnection((sc, peer) -> {
+            peer.close();
+            int n = Channels.newInputStream(sc).read();
+            assertEquals(n, -1);
+        });
+    }
+
+    /**
+     * Test read blocking before peer closes connection.
+     */
+    public void testRead4() throws Exception {
+        withConnection((sc, peer) -> {
+            scheduleClose(peer, 1000);
+            int n = Channels.newInputStream(sc).read();
+            assertEquals(n, -1);
+        });
+    }
+
+    /**
+     * Test async close of channel when thread blocked in read.
+     */
+    public void testRead5() throws Exception {
+        withConnection((sc, peer) -> {
+            scheduleClose(sc, 2000);
+            InputStream in = Channels.newInputStream(sc);
+            expectThrows(IOException.class, () -> in.read());
+        });
+    }
+
+    /**
+     * Test async close of input stream, when thread blocked in read.
+     */
+    public void testRead6() throws Exception {
+        withConnection((sc, peer) -> {
+            InputStream in = Channels.newInputStream(sc);
+            scheduleClose(in, 2000);
+            expectThrows(IOException.class, () -> in.read());
+        });
+    }
+
+    /**
+     * Test interrupt status set before read.
+     */
+    public void testRead7() throws Exception {
+        withConnection((sc, peer) -> {
+            Thread.currentThread().interrupt();
+            try {
+                InputStream in = Channels.newInputStream(sc);
+                expectThrows(IOException.class, () -> in.read());
+            } finally {
+                Thread.interrupted();  // clear interrupt
+            }
+            assertFalse(sc.isOpen());
+        });
+    }
+
+    /**
+     * Test interrupt of thread blocked in read.
+     */
+    public void testRead8() throws Exception {
+        withConnection((sc, peer) -> {
+            Future interrupter = scheduleInterrupt(Thread.currentThread(), 2000);
+            try {
+                InputStream in = Channels.newInputStream(sc);
+                expectThrows(IOException.class, () -> in.read());
+            } finally {
+                interrupter.cancel(true);
+                Thread.interrupted();  // clear interrupt
+            }
+            assertFalse(sc.isOpen());
+        });
+    }
+
+    /**
+     * Test that read is untimed when SO_TIMEOUT is set on the Socket adaptor.
+     */
+    public void testRead9() throws Exception {
+        withConnection((sc, peer) -> {
+            sc.socket().setSoTimeout(100);
+            scheduleWrite(peer, 99, 2000);
+            // read should block until bytes are available
+            int b = Channels.newInputStream(sc).read();
+            assertTrue(b == 99);
+        });
+    }
+
+    /**
+     * Test write.
+     */
+    public void testWrite1() throws Exception {
+        withConnection((sc, peer) -> {
+            OutputStream out = Channels.newOutputStream(sc);
+            out.write(99);
+            int n = read(peer);
+            assertEquals(n, 99);
+        });
+    }
+
+    /**
+     * Test async close of channel when thread blocked in write.
+     */
+    public void testWrite2() throws Exception {
+        withConnection((sc, peer) -> {
+            scheduleClose(sc, 2000);
+            expectThrows(IOException.class, () -> {
+                OutputStream out = Channels.newOutputStream(sc);
+                byte[] data = new byte[64*1000];
+                while (true) {
+                    out.write(data);
+                }
+            });
+        });
+    }
+
+    /**
+     * Test async close of output stream when thread blocked in write.
+     */
+    public void testWrite3() throws Exception {
+        withConnection((sc, peer) -> {
+            OutputStream out = Channels.newOutputStream(sc);
+            scheduleClose(out, 2000);
+            expectThrows(IOException.class, () -> {
+                byte[] data = new byte[64*1000];
+                while (true) {
+                    out.write(data);
+                }
+            });
+        });
+    }
+
+    /**
+     * Test interrupt status set before write.
+     */
+    public void testWrite4() throws Exception {
+        withConnection((sc, peer) -> {
+            Thread.currentThread().interrupt();
+            try {
+                OutputStream out = Channels.newOutputStream(sc);
+                expectThrows(IOException.class, () -> out.write(99));
+            } finally {
+                Thread.interrupted();  // clear interrupt
+            }
+            assertFalse(sc.isOpen());
+        });
+    }
+
+    /**
+     * Test interrupt of thread blocked in write.
+     */
+    public void testWrite5() throws Exception {
+        withConnection((sc, peer) -> {
+            Future interrupter = scheduleInterrupt(Thread.currentThread(), 2000);
+            try {
+                expectThrows(IOException.class, () -> {
+                    OutputStream out = Channels.newOutputStream(sc);
+                    byte[] data = new byte[64*1000];
+                    while (true) {
+                        out.write(data);
+                    }
+                });
+            } finally {
+                interrupter.cancel(true);
+                Thread.interrupted();  // clear interrupt
+            }
+            assertFalse(sc.isOpen());
+        });
+    }
+
+    /**
+     * Test read when another thread is blocked in write. The read should
+     * complete immediately.
+     */
+    public void testConcurrentReadWrite1() throws Exception {
+        withConnection((sc, peer) -> {
+            InputStream in = Channels.newInputStream(sc);
+            OutputStream out = Channels.newOutputStream(sc);
+
+            // block thread in write
+            fork(() -> {
+                var data = new byte[64*1024];
+                for (;;) {
+                    out.write(data);
+                }
+            });
+            Thread.sleep(1000); // give writer time to block
+
+            // test read, should not be blocked by writer thread
+            write(peer, 99);
+            int n = in.read();
+            assertEquals(n, 99);
+        });
+    }
+
+    /**
+     * Test read when another thread is blocked in write. The read should
+     * block until bytes are available.
+     */
+    public void testConcurrentReadWrite2() throws Exception {
+        withConnection((sc, peer) -> {
+            InputStream in = Channels.newInputStream(sc);
+            OutputStream out = Channels.newOutputStream(sc);
+
+            // block thread in write
+            fork(() -> {
+                var data = new byte[64*1024];
+                for (;;) {
+                    out.write(data);
+                }
+            });
+            Thread.sleep(1000); // give writer time to block
+
+            // test read, should not be blocked by writer thread
+            scheduleWrite(peer, 99, 500);
+            int n = in.read();
+            assertEquals(n, 99);
+        });
+    }
+
+    /**
+     * Test writing when another thread is blocked in read.
+     */
+    public void testConcurrentReadWrite3() throws Exception {
+        withConnection((sc, peer) -> {
+            InputStream in = Channels.newInputStream(sc);
+            OutputStream out = Channels.newOutputStream(sc);
+
+            // block thread in read
+            fork(() -> {
+                in.read();
+            });
+            Thread.sleep(100); // give reader time to block
+
+            // test write, should not be blocked by reader thread
+            out.write(99);
+            int n = read(peer);
+            assertEquals(n, 99);
+        });
+    }
+
+    /**
+     * Test read/write when channel configured non-blocking.
+     */
+    public void testIllegalBlockingMode() throws Exception {
+        withConnection((sc, peer) -> {
+            InputStream in = Channels.newInputStream(sc);
+            OutputStream out = Channels.newOutputStream(sc);
+
+            sc.configureBlocking(false);
+            expectThrows(IllegalBlockingModeException.class, () -> in.read());
+            expectThrows(IllegalBlockingModeException.class, () -> out.write(99));
+        });
+    }
+
+    /**
+     * Test NullPointerException.
+     */
+    public void testNullPointerException() throws Exception {
+        withConnection((sc, peer) -> {
+            InputStream in = Channels.newInputStream(sc);
+            OutputStream out = Channels.newOutputStream(sc);
+
+            expectThrows(NullPointerException.class, () -> in.read(null));
+            expectThrows(NullPointerException.class, () -> in.read(null, 0, 0));
+
+            expectThrows(NullPointerException.class, () -> out.write(null));
+            expectThrows(NullPointerException.class, () -> out.write(null, 0, 0));
+        });
+    }
+
+    /**
+     * Test IndexOutOfBoundsException.
+     */
+    public void testIndexOutOfBoundsException() throws Exception {
+        withConnection((sc, peer) -> {
+            InputStream in = Channels.newInputStream(sc);
+            OutputStream out = Channels.newOutputStream(sc);
+            byte[] ba = new byte[100];
+
+            expectThrows(IndexOutOfBoundsException.class, () -> in.read(ba, -1, 1));
+            expectThrows(IndexOutOfBoundsException.class, () -> in.read(ba, 0, -1));
+            expectThrows(IndexOutOfBoundsException.class, () -> in.read(ba, 0, 1000));
+            expectThrows(IndexOutOfBoundsException.class, () -> in.read(ba, 1, 100));
+
+            expectThrows(IndexOutOfBoundsException.class, () -> out.write(ba, -1, 1));
+            expectThrows(IndexOutOfBoundsException.class, () -> out.write(ba, 0, -1));
+            expectThrows(IndexOutOfBoundsException.class, () -> out.write(ba, 0, 1000));
+            expectThrows(IndexOutOfBoundsException.class, () -> out.write(ba, 1, 100));
+        });
+    }
+
+    // -- test infrastructure --
+
+    private interface ThrowingTask {
+        void run() throws Exception;
+    }
+
+    private interface ThrowingBiConsumer {
+        void accept(T t, U u) throws Exception;
+    }
+
+    /**
+     * Invokes the consumer with a connected pair of socket channels.
+     */
+    private static void withConnection(ThrowingBiConsumer consumer)
+        throws Exception
+    {
+        var loopback = InetAddress.getLoopbackAddress();
+        try (ServerSocketChannel listener = ServerSocketChannel.open()) {
+            listener.bind(new InetSocketAddress(loopback, 0));
+            try (SocketChannel sc = SocketChannel.open(listener.getLocalAddress())) {
+                try (SocketChannel peer = listener.accept()) {
+                    consumer.accept(sc, peer);
+                }
+            }
+        }
+    }
+
+    /**
+     * Forks a thread to execute the given task.
+     */
+    private Future fork(ThrowingTask task) {
+        ExecutorService pool = Executors.newFixedThreadPool(1);
+        try {
+            return pool.submit(() -> {
+                task.run();
+                return null;
+            });
+        } finally {
+            pool.shutdown();
+        }
+    }
+
+    /**
+     * Read a byte from the given socket channel.
+     */
+    private int read(SocketChannel sc) throws IOException {
+        return sc.socket().getInputStream().read();
+    }
+
+    /**
+     * Write a byte to the given socket channel.
+     */
+    private void write(SocketChannel sc, int b) throws IOException {
+        sc.socket().getOutputStream().write(b);
+    }
+
+    /**
+     * Writes the given data to the socket channel after a delay.
+     */
+    private Future scheduleWrite(SocketChannel sc, byte[] data, long delay) {
+        return schedule(() -> {
+            try {
+                sc.socket().getOutputStream().write(data);
+            } catch (IOException ioe) { }
+        }, delay);
+    }
+
+    /**
+     * Writes a byte to the socket channel after a delay.
+     */
+    private Future scheduleWrite(SocketChannel sc, int b, long delay) {
+        return scheduleWrite(sc, new byte[] { (byte)b }, delay);
+    }
+
+    /**
+     * Closes the given object after a delay.
+     */
+    private Future scheduleClose(Closeable c, long delay) {
+        return schedule(() -> {
+            try {
+                c.close();
+            } catch (IOException ioe) { }
+        }, delay);
+    }
+
+    /**
+     * Interrupts the given Thread after a delay.
+     */
+    private Future scheduleInterrupt(Thread t, long delay) {
+        return schedule(() -> t.interrupt(), delay);
+    }
+
+    /**
+     * Schedules the given task to run after a delay.
+     */
+    private Future schedule(Runnable task, long delay) {
+        return executor.schedule(task, delay, TimeUnit.MILLISECONDS);
+    }
+}
diff --git a/test/jdk/java/security/Provider/CaseSensitiveServices.java b/test/jdk/java/security/Provider/CaseSensitiveServices.java
index 2a6676b4f582b3c2d160ca80495e158eab5f3348..d9b8d315bd033e8cebb553716b44b43737462eb8 100644
--- a/test/jdk/java/security/Provider/CaseSensitiveServices.java
+++ b/test/jdk/java/security/Provider/CaseSensitiveServices.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2022, 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 5097015 8130181
+ * @bug 5097015 8130181 8279222
  * @summary make sure we correctly treat Provider string entries as case insensitive
  * @author Andreas Sterbenz
  */
@@ -36,9 +36,12 @@ public class CaseSensitiveServices extends Provider {
         super("Foo", "1.0", null);
         put("MessageDigest.Foo", "com.Foo");
         put("mESSAGEdIGEST.fOO xYz", "aBc");
-        put("ALg.aliaS.MESSAGEdigest.Fu", "FoO");
+        // first assign the DEF alias to algorithm Foo
+        put("ALg.aliaS.MESSAGEdigest.DEF", "FoO");
         put("messageDigest.Bar", "com.Bar");
         put("MESSAGEDIGEST.BAZ", "com.Baz");
+        // reassign the DEF alias to algorithm Bar
+        put("ALg.aliaS.MESSAGEdigest.DEF", "Bar");
     }
 
     public static void main(String[] args) throws Exception {
@@ -47,12 +50,21 @@ public class CaseSensitiveServices extends Provider {
         if (p.getServices().size() != 3) {
             throw new Exception("services.size() should be 3");
         }
+
         Service s = testService(p, "MessageDigest", "fOO");
         String val = s.getAttribute("Xyz");
         if ("aBc".equals(val) == false) {
             throw new Exception("Wrong value: " + val);
         }
-        testService(p, "MessageDigest", "fU");
+        if (s.toString().indexOf("DEF") != -1) {
+            throw new Exception("Old alias DEF should be removed");
+        }
+
+        // test Service alias DEF and its associated impl is Bar
+        s = testService(p, "MessageDigest", "DeF");
+        if (s.getAttribute("Xyz") != null) {
+            throw new Exception("DEF mapped to the wrong impl");
+        }
         testService(p, "MessageDigest", "BAR");
         testService(p, "MessageDigest", "baz");
         System.out.println("OK");
diff --git a/test/jdk/java/security/spec/IsAssignableFromOrder.java b/test/jdk/java/security/spec/IsAssignableFromOrder.java
new file mode 100644
index 0000000000000000000000000000000000000000..db2b765283094498fa377504264a59fbe501160e
--- /dev/null
+++ b/test/jdk/java/security/spec/IsAssignableFromOrder.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2022, 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 sun.security.util.CurveDB;
+
+import javax.crypto.SecretKeyFactory;
+import javax.crypto.spec.DESKeySpec;
+import javax.crypto.spec.DESedeKeySpec;
+import javax.crypto.spec.DHParameterSpec;
+import javax.crypto.spec.GCMParameterSpec;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.OAEPParameterSpec;
+import javax.crypto.spec.PBEKeySpec;
+import javax.crypto.spec.PBEParameterSpec;
+import javax.crypto.spec.RC2ParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+import java.math.BigInteger;
+import java.nio.charset.StandardCharsets;
+import java.security.AlgorithmParameters;
+import java.security.spec.AlgorithmParameterSpec;
+import java.security.spec.DSAParameterSpec;
+import java.security.spec.ECGenParameterSpec;
+import java.security.spec.ECParameterSpec;
+import java.security.spec.KeySpec;
+import java.security.spec.PSSParameterSpec;
+
+/**
+ * @test
+ * @bug 8279800
+ * @modules java.base/sun.security.util
+ * @summary isAssignableFrom checks in AlgorithmParametersSpi.engineGetParameterSpec appear to be backwards
+ */
+
+public class IsAssignableFromOrder {
+
+    public static void main(String[] args) throws Exception {
+
+        // AlgorithmParameters
+        testAlgSpec("AES", new IvParameterSpec(new byte[16]));
+        testAlgSpec("ChaCha20-Poly1305", new IvParameterSpec(new byte[12]));
+        testAlgSpec("DiffieHellman", new DHParameterSpec(BigInteger.ONE, BigInteger.TWO));
+        testAlgSpec("GCM", new GCMParameterSpec(96, new byte[16]));
+        testAlgSpec("OAEP", OAEPParameterSpec.DEFAULT);
+        testAlgSpec("PBEWithSHA1AndDESede", new PBEParameterSpec(
+                "saltsalt".getBytes(StandardCharsets.UTF_8), 10000));
+        testAlgSpec("PBEWithHmacSHA256AndAES_256", new PBEParameterSpec(
+                "saltsalt".getBytes(StandardCharsets.UTF_8), 10000,
+                new IvParameterSpec(new byte[16])));
+        testAlgSpec("RC2", new RC2ParameterSpec(256, new byte[32]));
+        testAlgSpec("DSA", new DSAParameterSpec(
+                BigInteger.ONE, BigInteger.TWO, BigInteger.TEN));
+        testAlgSpec("RSASSA-PSS", PSSParameterSpec.DEFAULT);
+        testAlgSpec("EC", new ECGenParameterSpec("secp256r1"));
+        testAlgSpec("EC", CurveDB.lookup("secp256r1"),
+                ECParameterSpec.class, AlgorithmParameterSpec.class);
+
+        // SecretKeyFactory
+        var spec = new PBEKeySpec(
+                "password".toCharArray(),
+                "saltsalt".getBytes(StandardCharsets.UTF_8),
+                10000,
+                32);
+
+        testKeySpec("PBE", spec, PBEKeySpec.class);
+        testKeySpec("PBEWithHmacSHA256AndAES_256", spec, PBEKeySpec.class);
+        testKeySpec("PBKDF2WithHmacSHA1", spec, PBEKeySpec.class);
+
+        testKeySpec("DES", new SecretKeySpec(new byte[8], "DES"), DESKeySpec.class);
+        testKeySpec("DESede", new SecretKeySpec(new byte[24], "DESede"), DESedeKeySpec.class);
+    }
+
+
+    static void testAlgSpec(String algorithm, AlgorithmParameterSpec spec,
+            Class... classes) throws Exception {
+        System.out.println(algorithm);
+        var ap1 = AlgorithmParameters.getInstance(algorithm);
+        ap1.init(spec);
+        var ap2 = AlgorithmParameters.getInstance(algorithm);
+        ap2.init(ap1.getEncoded());
+        if (classes.length == 0) {
+            classes = new Class[]{spec.getClass(), AlgorithmParameterSpec.class};
+        }
+        for (var c : classes) {
+            ap1.getParameterSpec(c);
+            ap2.getParameterSpec(c);
+        }
+    }
+
+    static void testKeySpec(String algorithm, KeySpec spec, Class clazz)
+            throws Exception {
+        System.out.println(algorithm);
+        var kf = SecretKeyFactory.getInstance(algorithm);
+        var key = kf.generateSecret(spec);
+        kf.getKeySpec(key, KeySpec.class);
+        kf.getKeySpec(key, clazz);
+    }
+}
diff --git a/test/jdk/java/util/Hashtable/DeserializedLength.java b/test/jdk/java/util/Hashtable/DeserializedLength.java
index 376c1f026d0ebc1f03bebf83d77de6cbe4334e8e..d515878fd3600208cced4a6e8cf1ff935ecbb110 100644
--- a/test/jdk/java/util/Hashtable/DeserializedLength.java
+++ b/test/jdk/java/util/Hashtable/DeserializedLength.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2021, 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
@@ -100,7 +100,7 @@ public class DeserializedLength {
         );
 
         for (int elements : new int[]{10, 50, 500, 5000}) {
-            for (float loadFactor : new float[]{0.15f, 0.5f, 0.75f, 1.0f, 2.5f}) {
+            for (float loadFactor : new float[]{0.25f, 0.5f, 0.75f, 1.0f, 2.5f}) {
                 ok &= testDeserializedLength(elements, loadFactor);
             }
         }
diff --git a/test/jdk/java/util/Objects/BasicObjectsTest.java b/test/jdk/java/util/Objects/BasicObjectsTest.java
index a7636ef11d52b91b99e0af2c9a888955c30b40fe..51268d4cbaf4c0a236dc6b74358faca3f7905d40 100644
--- a/test/jdk/java/util/Objects/BasicObjectsTest.java
+++ b/test/jdk/java/util/Objects/BasicObjectsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2022, 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,9 +23,8 @@
 
 /*
  * @test
- * @bug 6797535 6889858 6891113 8013712 8011800 8014365
+ * @bug 6797535 6889858 6891113 8013712 8011800 8014365 8280168
  * @summary Basic tests for methods in java.util.Objects
- * @author  Joseph D. Darcy
  */
 
 import java.util.*;
@@ -40,6 +39,7 @@ public class BasicObjectsTest {
         errors += testHash();
         errors += testToString();
         errors += testToString2();
+        errors += testToIdentityString();
         errors += testCompare();
         errors += testRequireNonNull();
         errors += testIsNull();
@@ -134,6 +134,37 @@ public class BasicObjectsTest {
         return errors;
     }
 
+    private static int testToIdentityString() {
+        int errors = 0;
+        // Test null behavior
+        try {
+            Objects.toIdentityString(null);
+            errors++;
+        } catch (NullPointerException npe) {
+            ; // Expected
+        }
+        // Behavior on typical objects
+        Object o = new Object(){};
+        errors += (Objects.toIdentityString(o).equals(o.toString()))? 0 : 1;
+        // Verify object's toString *not* called
+        Object badToString = new Object() {
+                @Override
+                public String toString() {
+                    throw new RuntimeException();
+                }
+            };
+        Objects.toIdentityString(badToString);
+        // Verify object's hashCode *not* called
+        Object badHashCode = new Object() {
+                @Override
+                public int hashCode() {
+                    throw new RuntimeException("0xDEADBEFF");
+                }
+            };
+        Objects.toIdentityString(badHashCode);
+        return errors;
+    }
+
     private static int testCompare() {
         int errors = 0;
         String[] values = {"e. e. cummings", "zzz"};
diff --git a/test/jdk/java/util/Random/RandomNextDoubleBoundary.java b/test/jdk/java/util/Random/RandomNextDoubleBoundary.java
new file mode 100644
index 0000000000000000000000000000000000000000..971b22d55c14da5304a61c05c6393cc06b058d15
--- /dev/null
+++ b/test/jdk/java/util/Random/RandomNextDoubleBoundary.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2022, 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 nextDouble stays within range
+ * @bug 8280550 8280950
+ */
+
+import java.util.SplittableRandom;
+import java.util.random.RandomGenerator;
+
+public class RandomNextDoubleBoundary {
+    public static void main(String... args) {
+        negativeBounds();
+        positiveBounds();
+    }
+
+    private static void negativeBounds() {
+        // Both bounds are negative
+        double lowerBound = -1.0000000000000002;
+        double upperBound = -1.0;
+        var sr = new SplittableRandom(42L);
+        var r = sr.nextDouble(lowerBound, upperBound);
+
+        if (r >= upperBound) {
+            System.err.println("r = " + r + "\t" + Double.toHexString(r));
+            System.err.println("ub = " + upperBound + "\t" + Double.toHexString(upperBound));
+            throw new RuntimeException("Greater than upper bound");
+        }
+
+        if (r < lowerBound) {
+            System.err.println("r = " + r + "\t" + Double.toHexString(r));
+            System.err.println("lb = " + lowerBound + "\t" + Double.toHexString(lowerBound));
+            throw new RuntimeException("Less than lower bound");
+        }
+    }
+
+    private static void positiveBounds() {
+        double[][] originAndBounds = {{10, 100},
+                                      {12345, 123456},
+                                      {5432167.234, 54321678.1238}};
+        for (double[] originAndBound : originAndBounds) {
+            nextDoublesWithRange(originAndBound[0], originAndBound[1]);
+        }
+    }
+
+    public static void nextDoublesWithRange(double origin, double bound) {
+        RandomGenerator rg = new RandomGenerator() {
+            @Override
+            public double nextDouble() {
+                return Double.MAX_VALUE;
+            }
+
+            @Override
+            public long nextLong() {
+                return 0;
+            }
+        };
+        double value = rg.nextDouble(origin, bound);
+
+        assertTrue(value >= origin);
+        assertTrue(value < bound);
+    }
+
+    public static void assertTrue(boolean condition) {
+        if (!condition) {
+            throw new AssertionError();
+        }
+    }
+}
diff --git a/test/jdk/java/util/regex/RegExTest.java b/test/jdk/java/util/regex/RegExTest.java
index 370b0d9696b406476176c2b4a934578709ac13df..f46ce327f03e44fbcd32345c7527434897d9da04 100644
--- a/test/jdk/java/util/regex/RegExTest.java
+++ b/test/jdk/java/util/regex/RegExTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2022, 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,7 +35,7 @@
  * 8151481 4867170 7080302 6728861 6995635 6736245 4916384 6328855 6192895
  * 6345469 6988218 6693451 7006761 8140212 8143282 8158482 8176029 8184706
  * 8194667 8197462 8184692 8221431 8224789 8228352 8230829 8236034 8235812
- * 8216332 8214245 8237599 8241055 8247546 8258259 8037397 8269753
+ * 8216332 8214245 8237599 8241055 8247546 8258259 8037397 8269753 8276694
  *
  * @library /test/lib
  * @library /lib/testlibrary/java/lang
@@ -4538,4 +4538,22 @@ public class RegExTest {
         var sep = System.lineSeparator();
         assertTrue(e.getMessage().contains(sep + "\t ^"));
     }
+
+    //This test is for 8276694
+    @Test
+    public static void unescapedBackslash() {
+        String pattern = "\\";
+        var e = expectThrows(PatternSyntaxException.class, () ->
+                Pattern.compile(pattern));
+        assertTrue(e.getMessage().contains("Unescaped trailing backslash"));
+    }
+
+    //This test is for 8280403
+    @Test
+    public static void badIntersectionSyntax() {
+        String pattern = "[˜\\H +F&&]";
+        var e = expectThrows(PatternSyntaxException.class, () ->
+                Pattern.compile(pattern));
+        assertTrue(e.getMessage().contains("Bad intersection syntax"));
+    }
 }
diff --git a/test/jdk/java/util/zip/ZipFile/TestTooManyEntries.java b/test/jdk/java/util/zip/ZipFile/TestTooManyEntries.java
new file mode 100644
index 0000000000000000000000000000000000000000..07ed760c1b76af5917b6bcd4c9aae693dcd0b927
--- /dev/null
+++ b/test/jdk/java/util/zip/ZipFile/TestTooManyEntries.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2022, 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 8272746
+ * @summary ZipFile can't open big file (NegativeArraySizeException)
+ * @requires (sun.arch.data.model == "64" & os.maxMemory > 8g)
+ * @run testng/manual/othervm -Xmx8g TestTooManyEntries
+ */
+
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import java.io.File;
+import java.io.BufferedOutputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipException;
+import java.util.zip.ZipFile;
+import java.util.zip.ZipOutputStream;
+import java.util.UUID;
+
+import static org.testng.Assert.assertThrows;
+
+public class TestTooManyEntries {
+    // Number of directories in the zip file
+    private static final int DIR_COUNT = 25000;
+    // Number of entries per directory
+    private static final int ENTRIES_IN_DIR = 1000;
+
+    // Zip file to create for testing
+    private File hugeZipFile;
+
+    /**
+     * Create a zip file and add entries that exceed the CEN limit.
+     * @throws IOException if an error occurs creating the ZIP File
+     */
+    @BeforeTest
+    public void setup() throws IOException {
+        hugeZipFile = File.createTempFile("hugeZip", ".zip", new File("."));
+        hugeZipFile.deleteOnExit();
+        long startTime = System.currentTimeMillis();
+        try (ZipOutputStream zip = new ZipOutputStream(new BufferedOutputStream(new FileOutputStream(hugeZipFile)))) {
+            for (int dirN = 0; dirN < DIR_COUNT; dirN++) {
+                String dirName = UUID.randomUUID() + "/";
+                for (int fileN = 0; fileN < ENTRIES_IN_DIR; fileN++) {
+                    ZipEntry entry = new ZipEntry(dirName + UUID.randomUUID());
+                    zip.putNextEntry(entry);
+                    zip.closeEntry(); // all files are empty
+                }
+                if ((dirN + 1) % 1000 == 0) {
+                    System.out.printf("%s / %s of entries written, file size is %sMb (%ss)%n",
+                            (dirN + 1) * ENTRIES_IN_DIR, DIR_COUNT * ENTRIES_IN_DIR, hugeZipFile.length() / 1024 / 1024,
+                            (System.currentTimeMillis() - startTime) / 1000);
+                }
+            }
+        }
+    }
+
+    /**
+     * Validates that the ZipException is thrown when the ZipFile class
+     * is initialized with a zip file whose entries exceed the CEN limit.
+     */
+    @Test
+    public void test() {
+        assertThrows(ZipException.class, () -> new ZipFile(hugeZipFile));
+    }
+}
diff --git a/test/jdk/javax/accessibility/manual/ButtonDemo.html b/test/jdk/javax/accessibility/manual/ButtonDemo.html
new file mode 100644
index 0000000000000000000000000000000000000000..c815fad3a9e2233ecc1791ea0ad87b00d9c7b4f6
--- /dev/null
+++ b/test/jdk/javax/accessibility/manual/ButtonDemo.html
@@ -0,0 +1,80 @@
+
+
+
+
+    
+
+
+
+
+
+    
+        
+        
+        
+    
+    
+        
+        
+        
+        
+    
+    
+        
+    
+    
+        
+    
+    
+        
+    
+
    S.NoTestScenario
    1Button Demo
+            
      
+                
    1.  Tab until the Button Demo icon  has focus. Press 'space' to
+                    choose.
      
+                
    2.  Tab until the "Button Demo" tab has focus. Press 'space'. Press 'tab'.
      
+                
    3.  Use the arrow keys to navigate between "Buttons", "Radio Buttons", and "Check Boxes".
      
+                
    4.  Tab to enter the demo pane. Tab & Shift-Tab to move between each button.
      
+                
    5.  Press 'space' to trigger (i.e. "press") a button.
      
+                
    6.  Repeat steps 1 through 5 for the Radio Button & Check Boxes tabs.
      
+            
    
+        
    Expected Result
    
+            
      
+                
    1. Verify that as you navigate, the focus is shown, e.g.
      2. 
+                
+                
    2. As you press 'space' to trigger each button, verify that you see each button visually depress.
+                    e.g.:
+                
      3. 
+                
+            
    
+        
    Note: actual component appearence may vary depending on look and
+            feel.
    
+
+
+
diff --git a/test/jdk/javax/accessibility/manual/ButtonDemo.java b/test/jdk/javax/accessibility/manual/ButtonDemo.java
new file mode 100644
index 0000000000000000000000000000000000000000..0c352ebf906b587f4987cacefa8d2f152e8f21e4
--- /dev/null
+++ b/test/jdk/javax/accessibility/manual/ButtonDemo.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2022, 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
+@key headful
+@summary manual test for accessibility button demo
+@run main/manual SwingSetTest ButtonDemo
+*/
diff --git a/test/jdk/javax/accessibility/manual/ComboBoxDemo.html b/test/jdk/javax/accessibility/manual/ComboBoxDemo.html
new file mode 100644
index 0000000000000000000000000000000000000000..aeb6e8f681a87294c95cfb6781c9ffbbd72417b5
--- /dev/null
+++ b/test/jdk/javax/accessibility/manual/ComboBoxDemo.html
@@ -0,0 +1,75 @@
+
+
+
+
+    
+
+
+
+
+
+    
+        
+        
+        
+    
+    
+        
+        
+        
+        
+    
+    
+        
+    
+    
+        
+    
+
    S.NoTestScenario
    1ComboBox Demo
+            
      
+                
    1.  Tab until ComboBox icon has focus. Press 'Space' to choose.
      2. 
+                
    2. Tab until the "ComboBox Demo" tab has focus. Press 'space'. Press 'tab'.
      3. 
+                
    3.  Use Tab and Shift-Tab to move between the four ComboBox widgets.
+                
    4. Use the space and down arrow keys to bring up the drop-down list.
      5. 
+                
    5.  Use the up and down arrows to navigate up and down the list.
      6. 
+                
    6. Use the 'space' key to make a the selection.
      7. 
+                
    7.  Repeat 4,5 but hit Esc key to cancel the drop-down.
      8. 
+            
    
+        
    Expected Result
    
+            
      
+                
    1. Verify that space and down arrow bring up the drop-down list.
      2. 
+                
+                
    2. Verify that up and down arrows move up and down the list.
      3. 
+                
    3. Verify that 'space' makes the selection (the drop-down list should collapse).
      4. 
+            
    
+        
    
+
+
+
+        
\ No newline at end of file
diff --git a/test/jdk/javax/accessibility/manual/ComboBoxDemo.java b/test/jdk/javax/accessibility/manual/ComboBoxDemo.java
new file mode 100644
index 0000000000000000000000000000000000000000..0522d3caa77f650c919e0847832915c52c14ce50
--- /dev/null
+++ b/test/jdk/javax/accessibility/manual/ComboBoxDemo.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2022, 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
+@key headful
+@summary manual test for accessibility button demo
+@run main/manual SwingSetTest ComboBoxDemo
+*/
diff --git a/test/jdk/javax/accessibility/manual/DemoSelection.html b/test/jdk/javax/accessibility/manual/DemoSelection.html
new file mode 100644
index 0000000000000000000000000000000000000000..7f9a28b05a9cd1241953d2c253eb9a7d08343ce1
--- /dev/null
+++ b/test/jdk/javax/accessibility/manual/DemoSelection.html
@@ -0,0 +1,66 @@
+
+
+
+
+    
+
+
+
+
+
+    
+        
+        
+        
+    
+    
+        
+        
+        
+        
+    
+    
+        
+    
+    
+        
+    
+    
+        
+    
+
    S.NoTestScenario
    1Demo SelectionMove between demos with 'tab' and 'shift-tab', and left and right arrows. Type 'space' to activate a demo.
+            
+        
    Expected Result
    
+            Verify that there is visible focus as you tab (or arrow) between demo icons. Typing 'space' should change
+            the selected demo.
+        
    Note: actual component appearence may vary depending on look and
+            feel.
    
+
+
+
diff --git a/test/jdk/javax/accessibility/manual/DemoSelection.java b/test/jdk/javax/accessibility/manual/DemoSelection.java
new file mode 100644
index 0000000000000000000000000000000000000000..f3e31aa88ecf6c93a1616edc51113868040b3291
--- /dev/null
+++ b/test/jdk/javax/accessibility/manual/DemoSelection.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2022, 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
+@key headful
+@summary manual test for accessibility button demo
+@run main/manual SwingSetTest DemoSelection
+*/
diff --git a/test/jdk/javax/accessibility/manual/OptionPaneDemo.html b/test/jdk/javax/accessibility/manual/OptionPaneDemo.html
new file mode 100644
index 0000000000000000000000000000000000000000..23693043b5d21b7911f8c99060358e731e95ff26
--- /dev/null
+++ b/test/jdk/javax/accessibility/manual/OptionPaneDemo.html
@@ -0,0 +1,78 @@
+
+
+
+
+    
+
+
+
+
+
+    
+        
+        
+        
+    
+    
+        
+        
+        
+    
+    
+        
+    
+    
+        
+    
+
    S.NoTestScenario
    1OptionPane Demo
+            
      
+                
    1. Tab until the OptionPane icon has focus. Press 'space' to choose.
+                
    2. Tab until the "OptionPane Demo" tab has focus. Press 'space'. Press 'tab'. The 'Show Input Dialog'
+                    button should have focus.
+                
    3. Press 'space'. An Input dialog should pop up. Type some text, and hit return. The dialog should
+                    change to a Message dialog with text saying "That was a pretty good movie!" Press return.
+                
    4. Bring up the dialog again (space). Press 'esc' and confirm that the dialog goes away without the
+                    Message from above.
+                
    5. Press Tab to move down through the buttons, and select "Component Dialog Example" (press space). A
+                    dialog should appear. Tab to ensure that you can navigate through all the components:
      
+                    a. Textfield
      
+                    b. ComboBox
      
+                    c. All 4 buttons: "Cancel", "Probably", "Maybe", "No", "Yes".
      
+                    d. Press 'esc' to cancel the dialog.
      
+            
    
+        
    
+            Expected Result
+        
    
+            When a popup window is created, focus must be on the popup window; when the window is closed, focus must
+            return to the previous focus point.
+        
    
+
+
+
+                                            
\ No newline at end of file
diff --git a/test/jdk/javax/accessibility/manual/OptionPaneDemo.java b/test/jdk/javax/accessibility/manual/OptionPaneDemo.java
new file mode 100644
index 0000000000000000000000000000000000000000..42d3bade5297d2c094ff7084b4abc39e3ef3a361
--- /dev/null
+++ b/test/jdk/javax/accessibility/manual/OptionPaneDemo.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2022, 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
+@key headful
+@summary manual test for accessibility button demo
+@run main/manual SwingSetTest OptionPaneDemo
+*/
+
diff --git a/test/jdk/javax/accessibility/manual/README.md b/test/jdk/javax/accessibility/manual/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..3b96515c6326f34dac82c0521cca8cfd74f3ce07
--- /dev/null
+++ b/test/jdk/javax/accessibility/manual/README.md
@@ -0,0 +1,79 @@
+
+
+# Manual javax.accessibility test suite
+
+##  Configure environment
+
+### Swing Set 2
+
+Prepare an appropriate version of Swing Set 2 from JDK demos.
+
+### Acessibility frameworks
+
+Testing can be performed without an accessibility framework or with one of these frameworks:
+
+1. Windows
+   1. JAWS
+   2. NVDA
+2. Mac OS X
+   1. Voice over
+
+## Executing a test run
+
+* Start the required accessibility framework, if necessary
+* Swing Set 2 jar default location is
+<tested jdk>/demo/jfc/SwingSet2/SwingSet2.jar
+* To override Swing Set 2 jar use SWINGSET2_JAR environment variable:
+
+
+    jtreg ... -e:SWINGSET2_JAR= -m .../javax/accessibility/manual/...
+
+
+## Performing tests
+
+When a test a started, a UI appears consisting of two frames: test framework frame and Swing Set 2 frame. Test framework
+frame will contain a name of the test in the title and detailed instructions.
+
+1. Follow the test instructions
+2. If everything goes as expected
+   1. Push "Pass"
+   2. UI for this test closes
+3. If something goes not accordding to the instructions:
+   1. Push "Fail"
+   2. A screenshot is taken automatically
+   3. Describe the problem
+   4. Retake the screenshot, if necessary
+      1. Interract with the Swing Set 2 UI to make it showing the failure. Hit "Retake screenshot"
+      2. If to demonstrate the failure the UI need to be in a state which prevents using test framework UI, such as model dialogs need to be opened or menu expanded
+         1. Enter delay (in seconds)
+         2. Push "Retake screenshot"
+         3. Prepare the UI
+         4. Wait for the screenshot to be retaken
+   5. Push "Fail" button again
+   6. Screenshot and the description are saved for further analysis
+   7. Test UI closes
+   
+**Wasning: Do not close any window directly, all windows will be closed once the test is finished as passed or failed.**
+
+**Note: Keyboard navigation is supported throughout the test framework UI.**
diff --git a/test/jdk/javax/accessibility/manual/SwingSetTest.java b/test/jdk/javax/accessibility/manual/SwingSetTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..33bc2ff430a50f34d977ef39a8d73ac0a39feade
--- /dev/null
+++ b/test/jdk/javax/accessibility/manual/SwingSetTest.java
@@ -0,0 +1,59 @@
+/**
+ * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * ORACLE PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
+ */
+
+import lib.ManualTestFrame;
+import lib.TestResult;
+
+import javax.imageio.ImageIO;
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.nio.file.Files;
+import java.util.function.Supplier;
+
+import static java.io.File.separator;
+
+public class SwingSetTest {
+
+    public static void main(String[] args) throws IOException, InterruptedException,
+            ClassNotFoundException, NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+        System.out.println("test image " + System.getenv("TEST_IMAGE_DIR"));
+        Supplier resultSupplier = ManualTestFrame.showUI(args[0],
+                "Wait for SwingSet2 to load, follow the instructions, select pass or fail. " +
+                        "Do not close windows manually.",
+                SwingSetTest.class.getResource(args[0] + ".html"));
+        String swingSetJar = System.getenv("SWINGSET2_JAR");
+        if (swingSetJar == null) {
+            swingSetJar = "file://" + System.getProperty("java.home") +
+                    separator + "demo" +
+                    separator + "jfc" +
+                    separator + "SwingSet2" +
+                    separator + "SwingSet2.jar";
+        }
+        System.out.println("Loading SwingSet2 from " + swingSetJar);
+        ClassLoader ss = new URLClassLoader(new URL[]{new URL(swingSetJar)});
+        ss.loadClass("SwingSet2").getMethod("main", String[].class).invoke(null, (Object)new String[0]);
+        //this will block until user decision to pass or fail the test
+        TestResult result = resultSupplier.get();
+        if (result != null) {
+            System.err.println("Failure reason: \n" + result.getFailureDescription());
+            if (result.getScreenCapture() != null) {
+                File screenDump = new File(System.getProperty("test.classes") + separator + args[0] + ".png");
+                System.err.println("Saving screen image to " + screenDump.getAbsolutePath());
+                ImageIO.write(result.getScreenCapture(), "png", screenDump);
+            }
+            Throwable e = result.getException();
+            if (e != null) {
+                throw new RuntimeException(e);
+            } else {
+                if (!result.getStatus()) throw new RuntimeException("Test failed!");
+            }
+        } else {
+            throw new RuntimeException("No result returned!");
+        }
+    }
+}
\ No newline at end of file
diff --git a/test/jdk/javax/accessibility/manual/TableDemo.html b/test/jdk/javax/accessibility/manual/TableDemo.html
new file mode 100644
index 0000000000000000000000000000000000000000..1f0b821b410c0e4979dd7dba1b735399d1e3fafa
--- /dev/null
+++ b/test/jdk/javax/accessibility/manual/TableDemo.html
@@ -0,0 +1,81 @@
+
+
+
+
+    
+
+
+
+
+
+    
+        
+        
+        
+    
+    
+        
+        
+        
+    
+    
+        
+    
+    
+        
+    
+    
+        
+    
+
    S.NoTestScenario
    1Table Demo (tests table navigation, as well as textfield input)
+            
      
+                
    1. Tab until the Table icon  has focus. Press 'space' to choose.
+                
    2. Tab until the "Table Demo" tab has focus. Press 'space'. Press 'tab'. "Reordering allowed" should
+                    have focus.
+                
    3. Tab to the Printing/Header textfield. Verify that you can type in some text.
+                
    4. Continue tabbing until focus moves to the table. The table should show focus.
+                
    5. Press the down arrow. "Mike Albers" should have focus.
+                
    6. Use the right and left arrow keys to navigate between cells.
+                
    7. Set focus to a text cell (e.g. someone's first name). Press space to edit. Type some text. Hit
+                    'enter' and verify the text has been changed. After editing a text cell and hitting 'enter', the
+                    focus could remain on the current cell or go to the next line.
+                
    8. Press the 'Page Up' and 'Page Down' keys (if available on your keyboard); verify that the Table
+                    scrolls up and down, page by page.
+                    

        
+                        
+        
    
+            Expected Result
+        
    
+            See above test description.
+        
    Note: actual component appearence may vary depending on look and
+            feel.
    
+
+
+
+                                        
\ No newline at end of file
diff --git a/test/jdk/javax/accessibility/manual/TableDemo.java b/test/jdk/javax/accessibility/manual/TableDemo.java
new file mode 100644
index 0000000000000000000000000000000000000000..ff56bcec4e8dcff58c69d4a67d369d2f0f3a5499
--- /dev/null
+++ b/test/jdk/javax/accessibility/manual/TableDemo.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2022, 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
+@key headful
+@summary manual test for accessibility button demo
+@run main/manual SwingSetTest TableDemo
+*/
diff --git a/test/jdk/javax/accessibility/manual/TabsDemo.html b/test/jdk/javax/accessibility/manual/TabsDemo.html
new file mode 100644
index 0000000000000000000000000000000000000000..06a055d0229374d4a4a0c6bf8fd99a4b354366a6
--- /dev/null
+++ b/test/jdk/javax/accessibility/manual/TabsDemo.html
@@ -0,0 +1,67 @@
+
+
+
+
+    
+
+
+
+
+
+    
+        
+        
+        
+    
+    
+        
+        
+        
+    
+    
+        
+    
+    
+        
+    
+    
+        
+    
+
    S.NoTestScenario
    1Tabs within demos (tests table navigation, as well as textfield input)
+            Continue tabbing to enter a demo's pane. When the top demo tabs have focus, the left and right arrow keys
+            move between tabs.
    
+            
+        
    
+            Expected Result
+        
    
+            Verify that the selected tab changes, e.g. between 'Internal Frame Demo' and "Source Code'.
+        
    Note: actual component appearence may vary depending on look and
+            feel.
    
+
+
\ No newline at end of file
diff --git a/test/jdk/javax/accessibility/manual/TabsDemo.java b/test/jdk/javax/accessibility/manual/TabsDemo.java
new file mode 100644
index 0000000000000000000000000000000000000000..35fad6abf825fd504b6cf4d5bc520a6566d77d9c
--- /dev/null
+++ b/test/jdk/javax/accessibility/manual/TabsDemo.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2022, 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
+@key headful
+@summary manual test for accessibility button demo
+@run main/manual SwingSetTest TabsDemo
+*/
+
diff --git a/test/jdk/javax/accessibility/manual/TreeDemo.html b/test/jdk/javax/accessibility/manual/TreeDemo.html
new file mode 100644
index 0000000000000000000000000000000000000000..c418b3e54048850e42dfc79bac00cb9336dd51a5
--- /dev/null
+++ b/test/jdk/javax/accessibility/manual/TreeDemo.html
@@ -0,0 +1,65 @@
+
+
+
+
+    
+
+
+
+
+
+    
+        
+        
+        
+    
+    
+        
+        
+        
+    
+    
+        
+    
+    
+        
+    
+
    S.NoTestScenario
    1Tree Demo
+            Tab until the Tree icon  has focus. Press 'space' to choose.
+            Tab until the "Tree Demo" tab has focus. Press 'space'. Press 'tab'. Press the down arrow. "Music" should
+            have focus.
+            Navigate up and down the tree using the up and down arrow keys.
+            Expand and collapse folders using the right and left arrow keys.
+        
    
+            Expected Result
+        
    
+            See above test description.
+        
    
+
+
\ No newline at end of file
diff --git a/test/jdk/javax/accessibility/manual/TreeDemo.java b/test/jdk/javax/accessibility/manual/TreeDemo.java
new file mode 100644
index 0000000000000000000000000000000000000000..1f38f9e9f73b8e10261e27cc59252c9d03ba7927
--- /dev/null
+++ b/test/jdk/javax/accessibility/manual/TreeDemo.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2022, 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
+@key headful
+@summary manual test for accessibility button demo
+@run main/manual SwingSetTest TreeDemo
+*/
diff --git a/test/jdk/javax/accessibility/manual/lib/DescriptionPane.java b/test/jdk/javax/accessibility/manual/lib/DescriptionPane.java
new file mode 100644
index 0000000000000000000000000000000000000000..bdd0e23e78896a556d9b80fb3792d01d0bc4f9f3
--- /dev/null
+++ b/test/jdk/javax/accessibility/manual/lib/DescriptionPane.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2022, 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 lib;
+
+import javax.swing.JEditorPane;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.io.IOException;
+import java.net.URL;
+
+/**
+ * Displays instructions provided through a URL.
+ */
+class DescriptionPane extends JPanel {
+
+    DescriptionPane(URL instructions) throws IOException {
+        JEditorPane editorPane = new JEditorPane();
+        editorPane.setFocusable(false);
+        editorPane.setContentType("text/html");
+        editorPane.setPage(instructions);
+        editorPane.setEditable(false);
+
+        JScrollPane esp = new JScrollPane(editorPane);
+        esp.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_ALWAYS);
+        esp.setPreferredSize(new Dimension(250, 350));
+
+        setLayout(new BorderLayout());
+
+        add(esp);
+    }
+}
diff --git a/test/jdk/javax/accessibility/manual/lib/FailureReasonPane.java b/test/jdk/javax/accessibility/manual/lib/FailureReasonPane.java
new file mode 100644
index 0000000000000000000000000000000000000000..b1cfc0d32cbba7e87280237a0efdf9894f87873b
--- /dev/null
+++ b/test/jdk/javax/accessibility/manual/lib/FailureReasonPane.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2022, 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 lib;
+
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JTextArea;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+import java.awt.BorderLayout;
+import java.util.function.Consumer;
+
+import static java.awt.BorderLayout.CENTER;
+import static java.awt.BorderLayout.NORTH;
+
+/**
+ * Allows to enter reason for the test failure.
+ */
+class FailureReasonPane extends JPanel {
+
+    private final JTextArea text;
+
+    FailureReasonPane(Consumer listener) {
+        setLayout(new BorderLayout(10, 10));
+        add(new JLabel("Failure reason:"), NORTH);
+        text = new JTextArea(3, 10);
+        text.getDocument().addDocumentListener(new DocumentListener() {
+            @Override
+            public void insertUpdate(DocumentEvent e) {
+                listener.accept(text.getText());
+            }
+
+            @Override
+            public void removeUpdate(DocumentEvent e) {
+                listener.accept(text.getText());
+            }
+
+            @Override
+            public void changedUpdate(DocumentEvent e) {
+                listener.accept(text.getText());
+            }
+        });
+        add(text, CENTER);
+    }
+
+    public String getReason() {
+        return text.getText();
+    }
+
+    public void requestFocus() {
+        text.requestFocus();
+    }
+}
diff --git a/test/jdk/javax/accessibility/manual/lib/ManualTestFrame.java b/test/jdk/javax/accessibility/manual/lib/ManualTestFrame.java
new file mode 100644
index 0000000000000000000000000000000000000000..57117790b57980e25e4bf653c76eb3f0e13cb654
--- /dev/null
+++ b/test/jdk/javax/accessibility/manual/lib/ManualTestFrame.java
@@ -0,0 +1,159 @@
+/*
+ * Copyright (c) 2022, 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 lib;
+
+import javax.swing.BorderFactory;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JSplitPane;
+import javax.swing.JTextArea;
+import javax.swing.border.BevelBorder;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.GridLayout;
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.net.URL;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Consumer;
+import java.util.function.Supplier;
+
+import static java.awt.BorderLayout.*;
+import static javax.swing.SwingUtilities.invokeAndWait;
+
+/**
+ * A frame which can be used to display manual test descriptions as well as, in case of a failure,
+ * enter failure reason and capture the screen.
+ */
+public class ManualTestFrame extends JFrame {
+
+    private boolean alreadyFailed = false;
+
+    private ManualTestFrame(String testName, String headerText, URL instructions, Consumer listener) throws IOException {
+
+        super(testName);
+
+        JLabel statusLabel = new JLabel("Follow test description, select \"Pass\" or \"Fail\"");
+        statusLabel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
+
+        JSplitPane split = new JSplitPane(JSplitPane.VERTICAL_SPLIT);
+        PassFailPane[] passFail = new PassFailPane[1];
+        FailureReasonPane failureReason = new FailureReasonPane(reason -> {
+            passFail[0].setFailEnabled(!reason.isEmpty());
+        });
+        ScreenImagePane image = new ScreenImagePane(e -> {
+            listener.accept(new TestResult(e));
+            dispose();
+        });
+
+        JPanel failureInfoPane = new JPanel();
+        failureInfoPane.setLayout(new GridLayout(1, 2, 10, 10));
+        failureInfoPane.add(failureReason);
+        failureInfoPane.add(image);
+        failureInfoPane.setVisible(false);
+
+        JPanel main = new JPanel();
+        main.setLayout(new BorderLayout(10, 10));
+        DescriptionPane description = new DescriptionPane(instructions);
+        main.add(description, CENTER);
+        passFail[0] = new PassFailPane((status) -> {
+            if (status) {
+                listener.accept(new TestResult());
+                dispose();
+            } else {
+                if (!alreadyFailed) {
+                    alreadyFailed = true;
+                    split.setDividerLocation(.5);
+                    failureInfoPane.setVisible(true);
+                    pack();
+                    image.capture();
+                    failureReason.requestFocus();
+                    statusLabel.setText("Enter failure reason, re-take screenshot, push \"Fail\"");
+                } else {
+                    listener.accept(new TestResult(failureReason.getReason(), image.getImage()));
+                    dispose();
+                }
+            }
+        });
+        main.add(passFail[0], SOUTH);
+
+        split.setLeftComponent(main);
+        split.setRightComponent(failureInfoPane);
+        split.setDividerLocation(1.);
+
+        getContentPane().setLayout(new BorderLayout());
+
+        if (headerText != null) {
+            JTextArea warningLabel = new JTextArea(headerText);
+            warningLabel.setBorder(BorderFactory.createBevelBorder(BevelBorder.LOWERED));
+            warningLabel.setEditable(false);
+            warningLabel.setFocusable(false);
+            getContentPane().add(warningLabel, NORTH);
+        }
+
+        getContentPane().add(statusLabel, SOUTH);
+        getContentPane().add(split, CENTER);
+
+        setPreferredSize(new Dimension(800, 600));
+        pack();
+        setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
+        setVisible(true);
+    }
+
+    /**
+     * Show a test control frame which allows a user to either pass or fail the test.
+     * @param testName
+     * @param headerText
+     * @param instructions
+     * @return Returning supplier blocks till the test is passed or failed by the user.
+     * @throws InterruptedException
+     * @throws InvocationTargetException
+     */
+    public static Supplier showUI(String testName, String headerText, URL instructions)
+            throws InterruptedException, InvocationTargetException {
+        AtomicReference resultContainer = new AtomicReference<>();
+        CountDownLatch latch = new CountDownLatch(1);
+        invokeAndWait(() -> {
+            try {
+                new ManualTestFrame(testName, headerText, instructions, (status) -> {
+                    resultContainer.set(status);
+                    latch.countDown();
+                });
+            } catch (IOException e) {
+                resultContainer.set(new TestResult(e));
+                e.printStackTrace();
+            }
+        });
+        return () -> {
+            try {
+                latch.await();
+            } catch (InterruptedException e) {
+                return new TestResult(e);
+            }
+            return resultContainer.get();
+        };
+    }
+
+}
diff --git a/test/jdk/javax/accessibility/manual/lib/PassFailPane.java b/test/jdk/javax/accessibility/manual/lib/PassFailPane.java
new file mode 100644
index 0000000000000000000000000000000000000000..0cc99353ef199819d77c0e950e3195f723b4da8c
--- /dev/null
+++ b/test/jdk/javax/accessibility/manual/lib/PassFailPane.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2022, 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 lib;
+
+import javax.swing.JButton;
+import javax.swing.JPanel;
+import java.awt.HeadlessException;
+import java.io.IOException;
+import java.util.function.Consumer;
+
+/**
+ * Allows to chose if a test fails or passes. It is a multi-use component. A chosen answer can be confirmed later
+ * upon providing additional information.
+ */
+class PassFailPane extends JPanel {
+    private final Consumer listener;
+
+    private final JButton btnPass = new JButton("Pass");
+    private final JButton btnFail = new JButton("Fail");
+
+    /**
+     * @param listener gets called with true (pass) or false (fail).
+     * @throws HeadlessException
+     */
+    PassFailPane(Consumer listener)
+            throws HeadlessException, IOException {
+        this.listener = listener;
+
+        add(btnPass);
+        add(btnFail);
+
+        btnPass.requestFocus();
+
+        btnPass.addActionListener((e) -> {
+            disableButtons();
+            listener.accept(true);
+        });
+
+        btnFail.addActionListener((e) -> {
+            disableButtons();
+            listener.accept(false);
+        });
+    }
+
+    private void disableButtons() {
+        btnFail.setEnabled(false);
+        btnPass.setEnabled(false);
+    }
+
+    public void setFailEnabled(boolean enabled) {
+        btnFail.setEnabled(enabled);
+    }
+
+}
diff --git a/test/jdk/javax/accessibility/manual/lib/ScreenImagePane.java b/test/jdk/javax/accessibility/manual/lib/ScreenImagePane.java
new file mode 100644
index 0000000000000000000000000000000000000000..1d35b740dad9c49cc168e89021d94b015cbd9bd1
--- /dev/null
+++ b/test/jdk/javax/accessibility/manual/lib/ScreenImagePane.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2022, 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 lib;
+
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JFormattedTextField;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.Image;
+import java.awt.Rectangle;
+import java.awt.Robot;
+import java.awt.Toolkit;
+import java.awt.image.BufferedImage;
+import java.text.NumberFormat;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Consumer;
+
+import static java.awt.BorderLayout.CENTER;
+import static java.awt.BorderLayout.NORTH;
+import static java.lang.String.format;
+import static javax.swing.SwingUtilities.invokeAndWait;
+import static javax.swing.SwingUtilities.invokeLater;
+
+/**
+ * Allows ti take screenshot, possible with a delay to preapare the UI.
+ */
+class ScreenImagePane extends JPanel {
+    private final JPanel imagePanel;
+    private final JLabel imageLabel;
+    private final AtomicReference image = new AtomicReference<>();
+    private final Rectangle screenRect;
+    private final JFormattedTextField delayField;
+    private final Consumer exceptionHandler;
+
+    /**
+     *
+     * @param handler should an exception appear on other threads
+     */
+    ScreenImagePane(Consumer handler) {
+        exceptionHandler = handler;
+        Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+        screenRect = new Rectangle(0, 0, screenSize.width, screenSize.height);
+        JPanel controls = new JPanel();
+        delayField = new JFormattedTextField(NumberFormat.getNumberInstance());
+        delayField.setText("0");
+        delayField.setColumns(3);
+        JButton capture = new JButton("Retake screenshot");
+        controls.add(new JLabel("in "));
+        controls.add(delayField);
+        controls.add(new JLabel(" seconds "));
+        controls.add(capture);
+        capture.addActionListener((e) -> capture());
+        imagePanel = new JPanel();
+        imageLabel = new JLabel();
+        imagePanel.add(imageLabel);
+
+        setLayout(new BorderLayout());
+        add(controls, NORTH);
+        add(imagePanel, CENTER);
+    }
+
+    public void capture() {
+        new Thread(() -> {
+            try {
+                int delay = Integer.parseInt(delayField.getText());
+                invokeAndWait(() -> imageLabel.setIcon(null));
+                while (delay > 0) {
+                    String message = format("Retaking screenshot in %d seconds", delay);
+                    invokeLater(() -> imageLabel.setText(message));
+                    delay--;
+                    try {
+                        Thread.sleep(1000);
+                    } catch (InterruptedException e) {
+                    }
+                }
+                BufferedImage image = new Robot().createScreenCapture(screenRect);
+                ScreenImagePane.this.image.set(image);
+                int newWidth = imagePanel.getWidth();
+                int newHeight = imagePanel.getHeight();
+                float xratio = (float) newWidth / (float) image.getWidth();
+                float yratio = (float) newHeight / (float) image.getHeight();
+                if (xratio < yratio) {
+                    newHeight = (int) (image.getHeight() * xratio);
+                } else {
+                    newWidth = (int) (image.getWidth() * yratio);
+                }
+                Image scaled = image.getScaledInstance(newWidth, newHeight, Image.SCALE_FAST);
+                invokeAndWait(() -> {
+                    imageLabel.setText(null);
+                    imageLabel.setIcon(new ImageIcon(scaled));
+                });
+            } catch (Throwable e) {
+                exceptionHandler.accept(e);
+            }
+        }).start();
+    }
+
+    public BufferedImage getImage() {
+        return image.get();
+    }
+}
diff --git a/test/jdk/javax/accessibility/manual/lib/TestResult.java b/test/jdk/javax/accessibility/manual/lib/TestResult.java
new file mode 100644
index 0000000000000000000000000000000000000000..42e5c72a49e6e85aeb6dcfcf88f8f40f0cd37315
--- /dev/null
+++ b/test/jdk/javax/accessibility/manual/lib/TestResult.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2022, 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 lib;
+
+import java.awt.image.BufferedImage;
+
+public final class TestResult {
+    private final boolean status;
+    private final String failureDescription;
+    private final BufferedImage screenCapture;
+    private final Throwable exception;
+
+    /**
+     * Failed due to an exception.
+     */
+    public TestResult(Throwable exception) {
+        status = false;
+        failureDescription = exception.getMessage();
+        screenCapture = null;
+        this.exception = exception;
+    }
+
+    /**
+     * Failed by used decision.
+     */
+    public TestResult(String description, BufferedImage capture) {
+        status = false;
+        failureDescription = description;
+        screenCapture = capture;
+        exception = null;
+    }
+
+    /**
+     * Passed.
+     */
+    public TestResult() {
+        this.status = true;
+        failureDescription = null;
+        screenCapture = null;
+        exception = null;
+    }
+
+    /**
+     * true - pass, false - no pass.
+     */
+    public boolean getStatus() {
+        return status;
+    }
+
+    public String getFailureDescription() {
+        return failureDescription;
+    }
+
+    public BufferedImage getScreenCapture() {
+        return screenCapture;
+    }
+
+    public Throwable getException() {return exception;}
+}
diff --git a/test/jdk/javax/accessibility/manual/resource/btn.png b/test/jdk/javax/accessibility/manual/resource/btn.png
new file mode 100644
index 0000000000000000000000000000000000000000..0523db95125a121f77cbc2918a38b5937bb9a368
Binary files /dev/null and b/test/jdk/javax/accessibility/manual/resource/btn.png differ
diff --git a/test/jdk/javax/accessibility/manual/resource/cmb.png b/test/jdk/javax/accessibility/manual/resource/cmb.png
new file mode 100644
index 0000000000000000000000000000000000000000..02d989660c06976f12e982ad726f3a82d3014981
Binary files /dev/null and b/test/jdk/javax/accessibility/manual/resource/cmb.png differ
diff --git a/test/jdk/javax/accessibility/manual/resource/dep.png b/test/jdk/javax/accessibility/manual/resource/dep.png
new file mode 100644
index 0000000000000000000000000000000000000000..89d15e2b5dbde4c621ed8b6611f89f1a87ab7648
Binary files /dev/null and b/test/jdk/javax/accessibility/manual/resource/dep.png differ
diff --git a/test/jdk/javax/accessibility/manual/resource/dms.png b/test/jdk/javax/accessibility/manual/resource/dms.png
new file mode 100644
index 0000000000000000000000000000000000000000..63809383c5e7aa7a1595b4ed2dbaaeea3567d7bd
Binary files /dev/null and b/test/jdk/javax/accessibility/manual/resource/dms.png differ
diff --git a/test/jdk/javax/accessibility/manual/resource/hc.jpg b/test/jdk/javax/accessibility/manual/resource/hc.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..773ca040dcb8439dcbb23ea6dc42dcd30d0154d1
Binary files /dev/null and b/test/jdk/javax/accessibility/manual/resource/hc.jpg differ
diff --git a/test/jdk/javax/accessibility/manual/resource/if.png b/test/jdk/javax/accessibility/manual/resource/if.png
new file mode 100644
index 0000000000000000000000000000000000000000..3c978d685eb325db0809048d882fe2c9c1b75888
Binary files /dev/null and b/test/jdk/javax/accessibility/manual/resource/if.png differ
diff --git a/test/jdk/javax/accessibility/manual/resource/ifm.png b/test/jdk/javax/accessibility/manual/resource/ifm.png
new file mode 100644
index 0000000000000000000000000000000000000000..483ae7c76e33c94c56cd0914a59e75926274d598
Binary files /dev/null and b/test/jdk/javax/accessibility/manual/resource/ifm.png differ
diff --git a/test/jdk/javax/accessibility/manual/resource/list.png b/test/jdk/javax/accessibility/manual/resource/list.png
new file mode 100644
index 0000000000000000000000000000000000000000..1e026e83b2b2111de4c1018a5bad977c4d2e520d
Binary files /dev/null and b/test/jdk/javax/accessibility/manual/resource/list.png differ
diff --git a/test/jdk/javax/accessibility/manual/resource/op.png b/test/jdk/javax/accessibility/manual/resource/op.png
new file mode 100644
index 0000000000000000000000000000000000000000..82ff0253d6eb107b46e81ceab768ac3f2e13f882
Binary files /dev/null and b/test/jdk/javax/accessibility/manual/resource/op.png differ
diff --git a/test/jdk/javax/accessibility/manual/resource/rbtn.png b/test/jdk/javax/accessibility/manual/resource/rbtn.png
new file mode 100644
index 0000000000000000000000000000000000000000..807f29b58c14b69d2140ddbf5346d414cdd9fabb
Binary files /dev/null and b/test/jdk/javax/accessibility/manual/resource/rbtn.png differ
diff --git a/test/jdk/javax/accessibility/manual/resource/tbl.png b/test/jdk/javax/accessibility/manual/resource/tbl.png
new file mode 100644
index 0000000000000000000000000000000000000000..f2eef6a2fb47cbb6be93d50926e32faa2a9db97a
Binary files /dev/null and b/test/jdk/javax/accessibility/manual/resource/tbl.png differ
diff --git a/test/jdk/javax/accessibility/manual/resource/tbld.png b/test/jdk/javax/accessibility/manual/resource/tbld.png
new file mode 100644
index 0000000000000000000000000000000000000000..8e2a3b77d1a2387f57054bed52f0d663ad278ac0
Binary files /dev/null and b/test/jdk/javax/accessibility/manual/resource/tbld.png differ
diff --git a/test/jdk/javax/accessibility/manual/resource/tree.png b/test/jdk/javax/accessibility/manual/resource/tree.png
new file mode 100644
index 0000000000000000000000000000000000000000..9e7f1daa06466e7dd30e675ef5a9d95defb0606c
Binary files /dev/null and b/test/jdk/javax/accessibility/manual/resource/tree.png differ
diff --git a/test/jdk/javax/net/ssl/TLS/TestJSSE.java b/test/jdk/javax/net/ssl/TLS/TestJSSE.java
index 2c5a2c6274d9d38079fa4d065a2ddf8c3dc145f8..29631064011df583680f1511a8314dd1c6d155eb 100644
--- a/test/jdk/javax/net/ssl/TLS/TestJSSE.java
+++ b/test/jdk/javax/net/ssl/TLS/TestJSSE.java
@@ -21,12 +21,13 @@
  * questions.
  */
 
+import java.net.InetAddress;
 import java.security.Provider;
 import java.security.Security;
 
 public class TestJSSE {
 
-    private static final String LOCAL_IP = "127.0.0.1";
+    private static final String LOCAL_IP = InetAddress.getLoopbackAddress().getHostAddress();
 
     public static void main(String... args) throws Exception {
         // reset the security property to make sure that the algorithms
diff --git a/test/jdk/javax/net/ssl/sanity/interop/JSSEClient.java b/test/jdk/javax/net/ssl/sanity/interop/JSSEClient.java
index 2207749302d909dfb53f44af6ad43e4f37b598fd..21416f0aaef21dcf0a2f16cf34314e6df5900bd5 100644
--- a/test/jdk/javax/net/ssl/sanity/interop/JSSEClient.java
+++ b/test/jdk/javax/net/ssl/sanity/interop/JSSEClient.java
@@ -23,6 +23,7 @@
 
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.net.InetAddress;
 import java.security.cert.Certificate;
 
 import javax.net.ssl.KeyManager;
@@ -52,7 +53,8 @@ class JSSEClient extends CipherTest.Client {
                     new TrustManager[] { CipherTest.trustManager },
                     CipherTest.secureRandom);
             SSLSocketFactory factory = (SSLSocketFactory)sslContext.getSocketFactory();
-            socket = (SSLSocket)factory.createSocket("127.0.0.1", CipherTest.serverPort);
+            socket = (SSLSocket)factory.createSocket(
+                    InetAddress.getLoopbackAddress().getHostAddress(), CipherTest.serverPort);
             socket.setSoTimeout(CipherTest.TIMEOUT);
             socket.setEnabledCipherSuites(new String[] { params.cipherSuite.name() });
             socket.setEnabledProtocols(new String[] { params.protocol.name });
diff --git a/test/jdk/javax/print/attribute/StreamServiceAttributeTest.java b/test/jdk/javax/print/attribute/StreamServiceAttributeTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..093bbfd747cb0333f5f8b9376c17772eb0b55ca2
--- /dev/null
+++ b/test/jdk/javax/print/attribute/StreamServiceAttributeTest.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2022, 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 4884570
+ * @summary Attribute support reporting should be consistent
+*/
+
+import java.io.ByteArrayOutputStream;
+import java.io.OutputStream;
+
+import javax.print.DocFlavor;
+import javax.print.StreamPrintService;
+import javax.print.StreamPrintServiceFactory;
+import javax.print.attribute.Attribute;
+import javax.print.attribute.standard.Chromaticity;
+import javax.print.attribute.standard.Media;
+import javax.print.attribute.standard.OrientationRequested;
+import javax.print.attribute.standard.SheetCollate;
+import javax.print.attribute.standard.Sides;
+
+public class StreamServiceAttributeTest {
+
+    private static boolean allSupported = true;
+    private static Class[] attrClasses = {
+         Chromaticity.class,
+         Media.class,
+         OrientationRequested.class,
+         SheetCollate.class,
+         Sides.class,
+    };
+
+    public static void main(String args[]) {
+
+        StreamPrintServiceFactory[] fact =
+          StreamPrintServiceFactory.lookupStreamPrintServiceFactories(
+                null, null);
+
+        if (fact.length == 0) {
+            return;
+        }
+        OutputStream out = new ByteArrayOutputStream();
+        StreamPrintService sps = fact[0].getPrintService(out);
+        for (Class ac : attrClasses) {
+            test(sps, ac);
+        }
+
+        if (!allSupported) {
+            throw new RuntimeException("Inconsistent support reported");
+        }
+    }
+
+    private static void test(StreamPrintService sps,
+                             Class ac) {
+        if (!sps.isAttributeCategorySupported(ac)) {
+            return;
+        }
+        DocFlavor[] dfs = sps.getSupportedDocFlavors();
+        for (DocFlavor f : dfs) {
+            Attribute[] attrs = (Attribute[])
+               sps.getSupportedAttributeValues(ac, f, null);
+            if (attrs == null) {
+               continue;
+            }
+            for (Attribute a : attrs) {
+                if (!sps.isAttributeValueSupported(a, f, null)) {
+                    allSupported = false;
+                    System.out.println("Unsupported : " + f + " " + a);
+                }
+            }
+        }
+    }
+}
diff --git a/test/jdk/javax/sound/sampled/Clip/DataPusherThreadCheck.java b/test/jdk/javax/sound/sampled/Clip/DataPusherThreadCheck.java
new file mode 100644
index 0000000000000000000000000000000000000000..733a317ab37cebeac6ab265310e5295997a476b6
--- /dev/null
+++ b/test/jdk/javax/sound/sampled/Clip/DataPusherThreadCheck.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2022, 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 static javax.sound.sampled.AudioFormat.Encoding.PCM_SIGNED;
+import static javax.sound.sampled.AudioSystem.NOT_SPECIFIED;
+
+import javax.sound.sampled.AudioFileFormat;
+import javax.sound.sampled.AudioFormat;
+import javax.sound.sampled.AudioInputStream;
+import javax.sound.sampled.AudioSystem;
+import java.applet.AudioClip;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.InputStream;
+import java.nio.file.Files;
+
+/*
+ * @test
+ * @key headful
+ * @bug 8279673
+ * @summary Verify no NPE creating threads
+ * @run main/othervm DataPusherThreadCheck
+ */
+public class DataPusherThreadCheck {
+
+    public static void main(String[] args) throws Exception {
+        // Prepare the audio file
+        File file = new File("audio.wav");
+        try {
+            AudioFormat format =
+                    new AudioFormat(PCM_SIGNED, 44100, 8, 1, 1, 44100, false);
+            int dataSize = 6000*1000 * format.getFrameSize();
+            InputStream in = new ByteArrayInputStream(new byte[dataSize]);
+            AudioInputStream audioStream = new AudioInputStream(in, format, NOT_SPECIFIED);
+            AudioSystem.write(audioStream, AudioFileFormat.Type.WAVE, file);
+        } catch (Exception ignored) {
+            return; // the test is not applicable
+        }
+        try {
+            checkThread(file);
+        } finally {
+            Files.delete(file.toPath());
+        }
+    }
+
+    private static void checkThread(File file) throws Exception {
+        AudioClip clip = (AudioClip) file.toURL().getContent();
+        clip.loop();
+        try {
+            Thread.sleep(2000);
+        } catch (InterruptedException ignored) {
+        }
+        boolean found = isDataPushedThreadExist();
+        clip.stop();
+        if (!found) {
+            throw new RuntimeException("Thread 'DataPusher' isn't found");
+        }
+    }
+
+    private static boolean isDataPushedThreadExist() {
+        for (Thread t : Thread.getAllStackTraces().keySet()) {
+            if (t.getName().equals("DataPusher")) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+}
diff --git a/test/jdk/javax/swing/JFileChooser/8277463/UNCFileChooserTest.java b/test/jdk/javax/swing/JFileChooser/8277463/UNCFileChooserTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..738b5da762edada9faa13f6774b6c60a86c99ca7
--- /dev/null
+++ b/test/jdk/javax/swing/JFileChooser/8277463/UNCFileChooserTest.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2021, 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 8277463
+   @requires (os.family == "windows")
+   @summary JFileChooser with Metal L&F doesn't show non-canonical UNC path in - Look in
+   @run main/manual UNCFileChooserTest
+*/
+
+import javax.swing.JButton;
+import javax.swing.JFileChooser;
+import javax.swing.JFrame;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JTextArea;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+import javax.swing.WindowConstants;
+import java.awt.BorderLayout;
+import java.awt.FlowLayout;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+public class UNCFileChooserTest {
+    private static volatile CountDownLatch countDownLatch;
+    private static JFrame instructionFrame;
+    private static JFrame testFrame;
+    private static volatile boolean testPassed = false;
+
+    private static boolean validatePlatform() {
+        String osName = System.getProperty("os.name");
+        if (osName == null) {
+            throw new RuntimeException("Name of the current OS could not be" +
+                    " retrieved.");
+        }
+        return osName.startsWith("Windows");
+    }
+
+    private static void createInstructionUI() throws Exception {
+        UIManager.setLookAndFeel("javax.swing.plaf.metal.MetalLookAndFeel");
+        String instructions =
+                "1. Enter the non-canonical UNC path of the directory to test\n"
+                + "example: \\\\pc-name\\dir\\..\n"
+                + "2. An \"Open File\" file chooser dialog pops up\n"
+                + "3. Check the \"Look in\" Combobox at the top for quickly changing directory is not empty\n"
+                + "4. Close the file chooser Dialog\n"
+                + "5. If the \"Look in\" Combobox is not empty then press PASS else press FAIL\n";
+        instructionFrame = new JFrame("InstructionFrame");
+        JTextArea textArea = new JTextArea(instructions);
+        textArea.setEditable(false);
+        final JButton passButton = new JButton("PASS");
+        passButton.addActionListener((e) -> {
+            testPassed = true;
+            instructionFrame.dispose();
+            countDownLatch.countDown();
+        });
+        final JButton failButton = new JButton("FAIL");
+        failButton.addActionListener((e) -> {
+            instructionFrame.dispose();
+            countDownLatch.countDown();
+        });
+
+        JPanel mainPanel = new JPanel(new BorderLayout());
+        mainPanel.add(textArea, BorderLayout.CENTER);
+
+        JPanel buttonPanel = new JPanel(new FlowLayout());
+        buttonPanel.add(passButton);
+        buttonPanel.add(failButton);
+        mainPanel.add(buttonPanel, BorderLayout.SOUTH);
+        instructionFrame.setDefaultCloseOperation(
+                WindowConstants.DISPOSE_ON_CLOSE);
+        instructionFrame.setBounds(0,0,500,500);
+        instructionFrame.add(mainPanel);
+        instructionFrame.pack();
+        instructionFrame.setVisible(true);
+    }
+
+    private static void showOpenDialog() throws Exception {
+        String path = JOptionPane.showInputDialog(testFrame, "Enter the non-canonical UNC path of the directory to test.\nexample: \\\\pc-name\\dir\\..");
+        if (path == null) {
+            throw new RuntimeException("Enter the directory path to test.");
+        }
+        new JFileChooser(path).showOpenDialog(null);
+    }
+
+    public static void main(String[] args) throws Exception {
+        if (!validatePlatform()) {
+            System.out.println("This test is only for MS Windows OS.");
+            return;
+        }
+        countDownLatch = new CountDownLatch(1);
+        UNCFileChooserTest uncFileChooserTest =
+                new UNCFileChooserTest();
+
+        uncFileChooserTest.createInstructionUI();
+        uncFileChooserTest.showOpenDialog();
+        countDownLatch.await(15, TimeUnit.MINUTES);
+
+        if(!testPassed) {
+            throw new RuntimeException("Test failed!");
+        }
+    }
+}
diff --git a/test/jdk/javax/swing/JInternalFrame/8020708/bug8020708.java b/test/jdk/javax/swing/JInternalFrame/8020708/bug8020708.java
index efd13ff768680e536696719131b35452787776d6..8f78178ada62ec971628c779396b84db6ea1c98b 100644
--- a/test/jdk/javax/swing/JInternalFrame/8020708/bug8020708.java
+++ b/test/jdk/javax/swing/JInternalFrame/8020708/bug8020708.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022, 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 @@ import javax.swing.UIManager;
  * @summary NLS: mnemonics missing in SwingSet2/JInternalFrame demo
  * @library ../../regtesthelpers
  * @build Util
- * @run main bug8020708
+ * @run main/timeout=300 bug8020708
  */
 public class bug8020708 {
 
@@ -68,6 +68,7 @@ public class bug8020708 {
 
     public static void main(String[] args) throws Exception {
         for (Locale locale : SUPPORTED_LOCALES) {
+            System.out.println("locale: " + locale);
             for (String laf : LOOK_AND_FEELS) {
                 Locale.setDefault(locale);
                 if (!installLookAndFeel(laf)) {
@@ -80,7 +81,7 @@ public class bug8020708 {
 
     static void testInternalFrameMnemonic(Locale locale) throws Exception {
         Robot robot = new Robot();
-        robot.setAutoDelay(250);
+        robot.setAutoDelay(100);
         robot.setAutoWaitForIdle(true);
 
         SwingUtilities.invokeAndWait(new Runnable() {
@@ -142,6 +143,7 @@ public class bug8020708 {
         UIManager.LookAndFeelInfo[] infos = UIManager.getInstalledLookAndFeels();
         for (UIManager.LookAndFeelInfo info : infos) {
             if (info.getClassName().contains(lafName)) {
+                System.out.println("LookAndFeel: " + info.getClassName());
                 UIManager.setLookAndFeel(info.getClassName());
                 return true;
             }
diff --git a/test/jdk/jdk/jfr/api/consumer/TestRecordedFullStackTrace.java b/test/jdk/jdk/jfr/api/consumer/TestRecordedFullStackTrace.java
index 1487d2e0258f1f7516d306a6e748273db0562734..6993fe3100178c4b909566160c7e7cd13f665fb8 100644
--- a/test/jdk/jdk/jfr/api/consumer/TestRecordedFullStackTrace.java
+++ b/test/jdk/jdk/jfr/api/consumer/TestRecordedFullStackTrace.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022, 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
@@ -119,7 +119,7 @@ public class TestRecordedFullStackTrace {
             if (!isEventFound[i]) {
                // no assertion, let's retry.
                 // Could be race condition, i.e safe point during Thread.sleep
-                System.out.println("Falied to validate all threads, will retry.");
+                System.out.println("Failed to validate all threads, will retry.");
                 return false;
             }
         }
diff --git a/test/jdk/jdk/jfr/event/gc/collection/TestG1ParallelPhases.java b/test/jdk/jdk/jfr/event/gc/collection/TestG1ParallelPhases.java
index b41b6779ac88312e5454f9711390a161e2ce3633..80f060633ccf117442be7bd1ea29110bbbeb2cbc 100644
--- a/test/jdk/jdk/jfr/event/gc/collection/TestG1ParallelPhases.java
+++ b/test/jdk/jdk/jfr/event/gc/collection/TestG1ParallelPhases.java
@@ -126,7 +126,7 @@ public class TestG1ParallelPhases {
         // since we can not reliably guarantee that they occur (or not).
         Set optPhases = of(
             // The following two phases only occur on evacuation failure.
-            "RemoveSelfForwardingPtr",
+            "RestoreRetainedRegions",
             "RestorePreservedMarks",
 
             "OptScanHR",
diff --git a/test/jdk/jdk/jfr/event/gc/collection/TestGCCauseWithG1ConcurrentMark.java b/test/jdk/jdk/jfr/event/gc/collection/TestGCCauseWithG1ConcurrentMark.java
index 730a3b700c6e80bc960efa444a4bba60fea65e99..d98fdb76e92bad3a2b965ddd9baa18e765627c16 100644
--- a/test/jdk/jdk/jfr/event/gc/collection/TestGCCauseWithG1ConcurrentMark.java
+++ b/test/jdk/jdk/jfr/event/gc/collection/TestGCCauseWithG1ConcurrentMark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,7 +40,8 @@ public class TestGCCauseWithG1ConcurrentMark {
         String testID = "G1ConcurrentMark";
         String[] vmFlags = {"-XX:+UseG1GC", "-XX:+ExplicitGCInvokesConcurrent"};
         String[] gcNames = {GCHelper.gcG1New, GCHelper.gcG1Old, GCHelper.gcG1Full};
-        String[] gcCauses = {"G1 Evacuation Pause", "G1 Preventive Collection", "G1 Compaction Pause", "System.gc()"};
+        String[] gcCauses = {"GCLocker Initiated GC", "G1 Evacuation Pause", "G1 Preventive Collection",
+                             "G1 Compaction Pause", "System.gc()"};
         GCGarbageCollectionUtil.test(testID, vmFlags, gcNames, gcCauses);
     }
 }
diff --git a/test/jdk/jdk/jfr/event/gc/collection/TestGCCauseWithG1FullCollection.java b/test/jdk/jdk/jfr/event/gc/collection/TestGCCauseWithG1FullCollection.java
index 67650dc3ba8a3d24161af3ab835df2e90793ed7b..737b94aa197977bd94bea05301b1821dce2b1e8f 100644
--- a/test/jdk/jdk/jfr/event/gc/collection/TestGCCauseWithG1FullCollection.java
+++ b/test/jdk/jdk/jfr/event/gc/collection/TestGCCauseWithG1FullCollection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,7 +40,8 @@ public class TestGCCauseWithG1FullCollection {
         String testID = "G1FullCollection";
         String[] vmFlags = {"-XX:+UseG1GC"};
         String[] gcNames = {GCHelper.gcG1New, GCHelper.gcG1Old, GCHelper.gcG1Full};
-        String[] gcCauses = {"G1 Evacuation Pause", "G1 Preventive Collection", "G1 Compaction Pause", "System.gc()"};
+        String[] gcCauses = {"GCLocker Initiated GC", "G1 Evacuation Pause", "G1 Preventive Collection",
+                             "G1 Compaction Pause", "System.gc()"};
         GCGarbageCollectionUtil.test(testID, vmFlags, gcNames, gcCauses);
     }
 }
diff --git a/test/jdk/jdk/jfr/event/profiling/TestFullStackTrace.java b/test/jdk/jdk/jfr/event/profiling/TestFullStackTrace.java
index 3306f5c0d31fb313b4297b91c1103bffb765e320..b9f23ebed86229834a8c6dceeac3f167ae88ae5f 100644
--- a/test/jdk/jdk/jfr/event/profiling/TestFullStackTrace.java
+++ b/test/jdk/jdk/jfr/event/profiling/TestFullStackTrace.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022, 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
@@ -111,7 +111,7 @@ public class TestFullStackTrace {
             if(!isEventFound[i]) {
                // no assertion, let's retry.
                // Could be race condition, i.e safe point during Thread.sleep
-               System.out.println("Falied to validate all threads, will retry.");
+               System.out.println("Failed to validate all threads, will retry.");
                return false;
             }
         }
diff --git a/test/jdk/jdk/jfr/javaagent/EventEmitterAgent.java b/test/jdk/jdk/jfr/javaagent/EventEmitterAgent.java
index 5a4cd4f534f5f372804a6e67a52b1dc0ba231661..ee829a412ed7470f76a31aee6a948af513f0f96c 100644
--- a/test/jdk/jdk/jfr/javaagent/EventEmitterAgent.java
+++ b/test/jdk/jdk/jfr/javaagent/EventEmitterAgent.java
@@ -24,6 +24,7 @@
 package jdk.jfr.javaagent;
 
 import java.lang.instrument.Instrumentation;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
@@ -31,6 +32,7 @@ import jdk.jfr.Configuration;
 import jdk.jfr.Event;
 import jdk.jfr.Name;
 import jdk.jfr.Recording;
+import jdk.jfr.consumer.RecordedEvent;
 import jdk.jfr.consumer.RecordingFile;
 import jdk.test.lib.Asserts;
 import jdk.test.lib.jfr.EventNames;
@@ -38,7 +40,7 @@ import jdk.test.lib.jfr.EventNames;
 // Java agent that emits events
 public class EventEmitterAgent {
 
-    private static final long EVENTS = 150_000;
+    private static final long EVENTS = 15_000;
     private static final Path DUMP_PATH = Paths.get("dump.jfr").toAbsolutePath();
 
     // Called when agent is loaded from command line
@@ -88,10 +90,21 @@ public class EventEmitterAgent {
     }
 
     public static void validateRecording() throws Exception {
-        long testEventCount = RecordingFile.readAllEvents(DUMP_PATH)
-                .stream()
-                .filter(e -> e.getEventType().getName().equals("Test"))
-                .count();
+        long testEventCount = 0;
+        try (RecordingFile rf = new RecordingFile(DUMP_PATH)) {
+            while (rf.hasMoreEvents()) {
+                RecordedEvent e = rf.readEvent();
+                switch (e.getEventType().getName()) {
+                case "Test":
+                    testEventCount++;
+                    break;
+                case "jdk.DataLoss":
+                    System.out.println(e);
+                    break;
+                }
+            }
+        }
+        System.out.println("File size: " + Files.size(DUMP_PATH));
         Asserts.assertEquals(testEventCount, EVENTS, "Mismatch in TestEvent count");
     }
 }
diff --git a/test/jdk/jdk/jfr/jcmd/TestJcmdConfigure.java b/test/jdk/jdk/jfr/jcmd/TestJcmdConfigure.java
index a43e0da065abd3c28990cc7c06fd979bab2a4ddd..aa76f5014831bf267dff77fb53f982c230f4fea7 100644
--- a/test/jdk/jdk/jfr/jcmd/TestJcmdConfigure.java
+++ b/test/jdk/jdk/jfr/jcmd/TestJcmdConfigure.java
@@ -52,7 +52,6 @@ public class TestJcmdConfigure {
     private static final String GLOBAL_BUFFER_SIZE = "globalbuffersize";
     private static final String THREAD_BUFFER_SIZE = "thread_buffer_size";
     private static final String MAX_CHUNK_SIZE = "maxchunksize";
-    private static final String SAMPLE_THREADS = "samplethreads";
     private static final String UNSUPPORTED_OPTION = "unsupportedoption";
 
     private static final String REPOSITORYPATH_1 = "." + File.pathSeparator + "repo1";
@@ -80,8 +79,6 @@ public class TestJcmdConfigure {
         test(GLOBAL_BUFFER_SIZE, 6);
         test(THREAD_BUFFER_SIZE, 5);
         test(MAX_CHUNK_SIZE, 14 * 1000 * 1000);
-        test(SAMPLE_THREADS, false);
-        test(SAMPLE_THREADS, true);
         testNegative(UNSUPPORTED_OPTION, 100000);
         testNegative(MAX_CHUNK_SIZE, -500);
 
@@ -125,7 +122,6 @@ public class TestJcmdConfigure {
             case GLOBAL_BUFFER_SIZE: return Options.getGlobalBufferSize();
             case THREAD_BUFFER_SIZE: return Options.getThreadBufferSize();
             case MAX_CHUNK_SIZE: return Options.getMaxChunkSize();
-            case SAMPLE_THREADS: return Options.getSampleThreads();
             default: throw new RuntimeException("Unknown option " + name);
         }
     }
diff --git a/test/jdk/jdk/jfr/jmx/streaming/TestMaxSize.java b/test/jdk/jdk/jfr/jmx/streaming/TestMaxSize.java
index af7493212caed8d6a7732e18856d805c91436f05..7bf389c75ad8546565f927a2279f60a244aba627 100644
--- a/test/jdk/jdk/jfr/jmx/streaming/TestMaxSize.java
+++ b/test/jdk/jdk/jfr/jmx/streaming/TestMaxSize.java
@@ -70,12 +70,17 @@ public class TestMaxSize {
             while (directorySize(dir) < 50_000_000) {
                 emitEvents(500_000);
             }
+            System.out.println("Before setMaxSize(1_000_000)");
+            fileCount(dir);
             e.setMaxSize(1_000_000);
+            System.out.println("After setMaxSize(1_000_000)");
             long count = fileCount(dir);
-            if (count > 2) {
-                // Two chunks can happen when header of new chunk is written and previous
-                // chunk is not finalized.
-                throw new Exception("Expected only one or two chunks with setMaxSize(1_000_000). Found " + count);
+            if (count > 3) {
+                // Three files can happen when:
+                // File 1: Header of new chunk is written to disk
+                // File 2: Previous chunk is not yet finalized and added to list of DiskChunks
+                // File 3: Previous previous file is in the list of DiskChunks.
+                throw new Exception("Expected at most three chunks with setMaxSize(1_000_000). Found " + count);
             }
             finished.set(true);
         }
@@ -94,21 +99,24 @@ public class TestMaxSize {
         System.out.println("Files:");
         AtomicInteger count = new AtomicInteger();
         Files.list(dir).forEach(p -> {
-            System.out.println(p);
+            System.out.println(p + " " + fileSize(p));
             count.incrementAndGet();
         });
         return count.get();
     }
 
     private static long directorySize(Path dir) throws IOException {
-        long p = Files.list(dir).mapToLong(f -> {
-            try {
-                return Files.size(f);
-            } catch (IOException e) {
-                return 0;
-            }
-        }).sum();
+        long p = Files.list(dir).mapToLong(f -> fileSize(f)).sum();
         System.out.println("Directory size: " + p);
         return p;
     }
+
+    private static long fileSize(Path p) {
+        try {
+            return Files.size(p);
+        } catch (IOException e) {
+            System.out.println("Could not determine file size for " + p);
+            return 0;
+        }
+    }
 }
diff --git a/test/jdk/jdk/jfr/tool/TestPrintXML.java b/test/jdk/jdk/jfr/tool/TestPrintXML.java
index 4480c23c7887bda5b64d79a41abab71b0ac2eff1..dd53955e40174f859b1c9ab2fd5d26349e2355f2 100644
--- a/test/jdk/jdk/jfr/tool/TestPrintXML.java
+++ b/test/jdk/jdk/jfr/tool/TestPrintXML.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2022, 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
@@ -47,6 +47,7 @@ import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;
 import org.xml.sax.XMLReader;
+import org.xml.sax.Locator;
 import org.xml.sax.helpers.DefaultHandler;
 
 import jdk.jfr.Timespan;
@@ -105,7 +106,14 @@ public class TestPrintXML {
                 System.out.println();
                 System.out.println("Was (XML)");
                 System.out.println("----------------------");
-                System.out.println(xmlEvent);
+                if (xmlEvent.begin > 0 && xmlEvent.end > 0) {
+                    String lines[] = xml.split("\\r?\\n");
+                    for (int i = xmlEvent.begin - 1; i < xmlEvent.end; i++) {
+                        System.out.println(i + " " + lines[i]);
+                    }
+                } else {
+                    System.out.println("Could not locate XML position");
+                }
                 System.out.println();
                 throw new Exception("Event doesn't match");
             }
@@ -164,6 +172,8 @@ public class TestPrintXML {
     static class XMLEvent {
         String name;
         private Map values = new HashMap<>();
+        private int begin = -1;
+        private int end = -1;
 
         XMLEvent(String name) {
             this.name = name;
@@ -172,10 +182,15 @@ public class TestPrintXML {
 
     public static final class RecordingHandler extends DefaultHandler {
 
+        private Locator locator;
         private Stack objects = new Stack<>();
         private Stack> elements = new Stack<>();
         private List events = new ArrayList<>();
 
+        public void setDocumentLocator(Locator locator) {
+            this.locator = locator;
+        }
+
         @Override
         public void startElement(String uri, String localName, String qName, Attributes attrs) throws SAXException {
             elements.push(new SimpleEntry<>(attrs.getValue("name"), attrs.getValue("index")));
@@ -187,7 +202,9 @@ public class TestPrintXML {
 
             switch (qName) {
             case "event":
-                objects.push(new XMLEvent(attrs.getValue("type")));
+                XMLEvent event = new XMLEvent(attrs.getValue("type"));
+                event.begin = locator.getLineNumber();
+                objects.push(event);
                 break;
             case "struct":
                 objects.push(new HashMap());
@@ -223,7 +240,9 @@ public class TestPrintXML {
                 String name = element.getKey();
                 Object value = objects.pop();
                 if (objects.isEmpty()) {
-                    events.add((XMLEvent) value);
+                    XMLEvent event = (XMLEvent) value;
+                    event.end = locator.getLineNumber();
+                    events.add(event);
                     return;
                 }
                 if (value instanceof StringBuilder) {
diff --git a/test/jdk/jdk/nio/zipfs/ZipFSOutputStreamTest.java b/test/jdk/jdk/nio/zipfs/ZipFSOutputStreamTest.java
index fe59857879b3daeff8a19910de8a93bd46e2a9db..77f866e9fdfdff4bab60eacfd71f280e3bd3387e 100644
--- a/test/jdk/jdk/nio/zipfs/ZipFSOutputStreamTest.java
+++ b/test/jdk/jdk/nio/zipfs/ZipFSOutputStreamTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 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,15 +35,15 @@ import java.nio.file.FileSystem;
 import java.nio.file.FileSystems;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.Arrays;
 import java.util.Map;
-import java.util.Random;
 
 
 /**
  * @test
  * @summary Verify that the outputstream created for zip file entries, through the ZipFileSystem
  * works fine for varying sizes of the zip file entries
- * @bug 8190753 8011146
+ * @bug 8190753 8011146 8279536
  * @run testng/timeout=300 ZipFSOutputStreamTest
  */
 public class ZipFSOutputStreamTest {
@@ -87,7 +87,9 @@ public class ZipFSOutputStreamTest {
     @Test(dataProvider = "zipFSCreationEnv")
     public void testOutputStream(final Map env) throws Exception {
         final byte[] chunk = new byte[1024];
-        new Random().nextBytes(chunk);
+        // fill it with some fixed content (the fixed content will later on help ease
+        // the verification of the content written out)
+        Arrays.fill(chunk, (byte) 42);
         try (final FileSystem zipfs = FileSystems.newFileSystem(ZIP_FILE, env)) {
             // create the zip with varying sized entries
             for (final Map.Entry entry : ZIP_ENTRIES.entrySet()) {
@@ -95,9 +97,12 @@ public class ZipFSOutputStreamTest {
                 if (entryPath.getParent() != null) {
                     Files.createDirectories(entryPath.getParent());
                 }
+                long start = System.currentTimeMillis();
                 try (final OutputStream os = Files.newOutputStream(entryPath)) {
                     writeAsChunks(os, chunk, entry.getValue());
                 }
+                System.out.println("Wrote entry " + entryPath + " of bytes " + entry.getValue()
+                        + " in " + (System.currentTimeMillis() - start) + " milli seconds");
             }
         }
         // now verify the written content
@@ -108,15 +113,15 @@ public class ZipFSOutputStreamTest {
                     final byte[] buf = new byte[chunk.length];
                     int numRead;
                     long totalRead = 0;
+                    long start = System.currentTimeMillis();
                     while ((numRead = is.read(buf)) != -1) {
                         totalRead += numRead;
                         // verify the content
-                        for (int i = 0, chunkoffset = (int) ((totalRead - numRead) % chunk.length);
-                             i < numRead; i++, chunkoffset++) {
-                            Assert.assertEquals(buf[i], chunk[chunkoffset % chunk.length],
-                                    "Unexpected content in " + entryPath);
-                        }
+                        Assert.assertEquals(Arrays.mismatch(buf, chunk), -1,
+                                "Unexpected content in " + entryPath);
                     }
+                    System.out.println("Read entry " + entryPath + " of bytes " + totalRead
+                            + " in " + (System.currentTimeMillis() - start) + " milli seconds");
                     Assert.assertEquals(totalRead, (long) entry.getValue(),
                             "Unexpected number of bytes read from zip entry " + entryPath);
                 }
diff --git a/test/jdk/jdk/security/jarsigner/JarWithOneNonDisabledDigestAlg.java b/test/jdk/jdk/security/jarsigner/JarWithOneNonDisabledDigestAlg.java
new file mode 100644
index 0000000000000000000000000000000000000000..899500672ad4d56bc3be1f119f52b2b3bb7f5561
--- /dev/null
+++ b/test/jdk/jdk/security/jarsigner/JarWithOneNonDisabledDigestAlg.java
@@ -0,0 +1,169 @@
+/*
+ * Copyright (c) 2022, 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 8278851
+ * @summary Check that jar entry with at least one non-disabled digest
+ *          algorithm in manifest is treated as signed
+ * @modules java.base/sun.security.tools.keytool
+ * @library /test/lib
+ * @build jdk.test.lib.util.JarUtils
+ *        jdk.test.lib.security.SecurityUtils
+ * @run main/othervm JarWithOneNonDisabledDigestAlg
+ */
+
+import java.io.InputStream;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.security.CodeSigner;
+import java.security.KeyStore;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.Locale;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+import java.util.zip.ZipFile;
+import jdk.security.jarsigner.JarSigner;
+
+import jdk.test.lib.util.JarUtils;
+import jdk.test.lib.security.SecurityUtils;
+
+public class JarWithOneNonDisabledDigestAlg {
+
+    private static final String PASS = "changeit";
+    private static final String TESTFILE1 = "testfile1";
+    private static final String TESTFILE2 = "testfile2";
+
+    public static void main(String[] args) throws Exception {
+        SecurityUtils.removeFromDisabledAlgs("jdk.jar.disabledAlgorithms",
+            List.of("SHA1"));
+        Files.write(Path.of(TESTFILE1), TESTFILE1.getBytes());
+        JarUtils.createJarFile(Path.of("unsigned.jar"), Path.of("."),
+            Path.of(TESTFILE1));
+
+        genkeypair("-alias SHA1 -sigalg SHA1withRSA");
+        genkeypair("-alias SHA256 -sigalg SHA256withRSA");
+
+        KeyStore ks = KeyStore.getInstance(KeyStore.getDefaultType());
+        try (FileInputStream fis = new FileInputStream("keystore")) {
+            ks.load(fis, PASS.toCharArray());
+        }
+
+        // Sign JAR twice with same signer but different digest algorithms
+        // so that each entry in manifest file contains two digest values.
+        signJarFile(ks, "SHA1", "MD5", "unsigned.jar", "signed.jar");
+        signJarFile(ks, "SHA1", "SHA1", "signed.jar", "signed2.jar");
+        checkThatJarIsSigned("signed2.jar", false);
+
+        // add another file to the JAR
+        Files.write(Path.of(TESTFILE2), "testFile2".getBytes());
+        JarUtils.updateJarFile(Path.of("signed2.jar"), Path.of("."),
+            Path.of(TESTFILE2));
+
+        // Sign again with different signer (SHA256) and SHA-1 digestalg.
+        // TESTFILE1 should have two signers and TESTFILE2 should have one
+        // signer.
+        signJarFile(ks, "SHA256", "SHA1", "signed2.jar", "multi-signed.jar");
+
+        checkThatJarIsSigned("multi-signed.jar", true);
+    }
+
+    private static KeyStore.PrivateKeyEntry getEntry(KeyStore ks, String alias)
+        throws Exception {
+
+        return (KeyStore.PrivateKeyEntry)
+            ks.getEntry(alias,
+                new KeyStore.PasswordProtection(PASS.toCharArray()));
+    }
+
+    private static void genkeypair(String cmd) throws Exception {
+        cmd = "-genkeypair -keystore keystore -storepass " + PASS +
+              " -keypass " + PASS + " -keyalg rsa -dname CN=Duke " + cmd;
+        sun.security.tools.keytool.Main.main(cmd.split(" "));
+    }
+
+    private static void signJarFile(KeyStore ks, String alias,
+        String digestAlg, String inputFile, String outputFile)
+        throws Exception {
+
+        JarSigner signer = new JarSigner.Builder(getEntry(ks, alias))
+                 .digestAlgorithm(digestAlg)
+                 .signerName(alias)
+                 .build();
+
+        try (ZipFile in = new ZipFile(inputFile);
+            FileOutputStream out = new FileOutputStream(outputFile)) {
+            signer.sign(in, out);
+        }
+    }
+
+    private static void checkThatJarIsSigned(String jarFile, boolean multi)
+        throws Exception {
+
+        try (JarFile jf = new JarFile(jarFile, true)) {
+            Enumeration entries = jf.entries();
+            while (entries.hasMoreElements()) {
+                JarEntry entry = entries.nextElement();
+                if (entry.isDirectory() || isSigningRelated(entry.getName())) {
+                    continue;
+                }
+                InputStream is = jf.getInputStream(entry);
+                while (is.read() != -1);
+                CodeSigner[] signers = entry.getCodeSigners();
+                if (signers == null) {
+                    throw new Exception("JarEntry " + entry.getName() +
+                        " is not signed");
+                } else if (multi) {
+                    if (entry.getName().equals(TESTFILE1) &&
+                        signers.length != 2) {
+                        throw new Exception("Unexpected number of signers " +
+                            "for " + entry.getName() + ": " + signers.length);
+                    } else if (entry.getName().equals(TESTFILE2) &&
+                        signers.length != 1) {
+                        throw new Exception("Unexpected number of signers " +
+                            "for " + entry.getName() + ": " + signers.length);
+                    }
+                }
+            }
+        }
+    }
+
+    private static boolean isSigningRelated(String name) {
+        name = name.toUpperCase(Locale.ENGLISH);
+        if (!name.startsWith("META-INF/")) {
+            return false;
+        }
+        name = name.substring(9);
+        if (name.indexOf('/') != -1) {
+            return false;
+        }
+        return name.endsWith(".SF")
+            || name.endsWith(".DSA")
+            || name.endsWith(".RSA")
+            || name.endsWith(".EC")
+            || name.equals("MANIFEST.MF");
+    }
+}
diff --git a/test/jdk/sun/net/www/B8185898.java b/test/jdk/sun/net/www/B8185898.java
index a50c6f93c7e65cc1ebeeb6eec6cb0f0d30b78df4..cfa54e15a521c65e098671e620d71bd0b198c629 100644
--- a/test/jdk/sun/net/www/B8185898.java
+++ b/test/jdk/sun/net/www/B8185898.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2022, 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 8185898
+ * @bug 8185898 8163921
  * @modules java.base/sun.net.www
  * @library /test/lib
  * @run main/othervm B8185898
@@ -143,32 +143,32 @@ public class B8185898 {
         // {{inputString1, expectedToString1, expectedPrint1}, {...}}
         String[][] strings = {
                 {"HTTP/1.1 200 OK\r\n"
-                        + "Accept: text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2\r\n"
+                        + "Accept: */*\r\n"
                         + "Connection: keep-alive\r\n"
                         + "Host: 127.0.0.1:12345\r\n"
                         + "User-agent: Java/12\r\n\r\nfoooo",
                 "pairs: {null: HTTP/1.1 200 OK}"
-                        + "{Accept: text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2}"
+                        + "{Accept: */*}"
                         + "{Connection: keep-alive}"
                         + "{Host: 127.0.0.1:12345}"
                         + "{User-agent: Java/12}",
-                "Accept: text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2\r\n"
+                "Accept: */*\r\n"
                         + "Connection: keep-alive\r\n"
                         + "Host: 127.0.0.1:12345\r\n"
                         + "User-agent: Java/12\r\n\r\n"},
                 {"HTTP/1.1 200 OK\r\n"
-                        + "Accept: text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2\r\n"
+                        + "Accept: */*\r\n"
                         + "Connection: keep-alive\r\n"
                         + "Host: 127.0.0.1:12345\r\n"
                         + "User-agent: Java/12\r\n"
                         + "X-Header:\r\n\r\n",
                 "pairs: {null: HTTP/1.1 200 OK}"
-                        + "{Accept: text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2}"
+                        + "{Accept: */*}"
                         + "{Connection: keep-alive}"
                         + "{Host: 127.0.0.1:12345}"
                         + "{User-agent: Java/12}"
                         + "{X-Header: }",
-                "Accept: text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2\r\n"
+                "Accept: */*\r\n"
                         + "Connection: keep-alive\r\n"
                         + "Host: 127.0.0.1:12345\r\n"
                         + "User-agent: Java/12\r\n"
diff --git a/test/jdk/sun/security/ec/OidInstance.java b/test/jdk/sun/security/ec/OidInstance.java
new file mode 100644
index 0000000000000000000000000000000000000000..972c8e1026a5031588b41785fbc01d76adbaab79
--- /dev/null
+++ b/test/jdk/sun/security/ec/OidInstance.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2022, 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 8279801
+ * @summary EC KeyFactory and KeyPairGenerator do not have aliases for OID format
+ * @modules java.base/sun.security.util
+ *          jdk.crypto.ec
+ */
+
+import sun.security.util.KnownOIDs;
+
+import java.security.AlgorithmParameters;
+import java.security.KeyFactory;
+import java.security.KeyPairGenerator;
+
+public class OidInstance {
+    public static void main(String[] args) throws Exception {
+        String oid = KnownOIDs.EC.value();
+        KeyFactory.getInstance(oid, "SunEC");
+        KeyPairGenerator.getInstance(oid, "SunEC");
+        AlgorithmParameters.getInstance(oid, "SunEC");
+    }
+}
diff --git a/test/jdk/sun/security/krb5/auto/Context.java b/test/jdk/sun/security/krb5/auto/Context.java
index ed8bab0e3d6aee79b117a94fbf7df8ad3a02da77..c18dbe9690fc8690fc5ba86929ddde7a61093016 100644
--- a/test/jdk/sun/security/krb5/auto/Context.java
+++ b/test/jdk/sun/security/krb5/auto/Context.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, 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
@@ -207,13 +207,26 @@ public class Context {
      */
     public static Context fromUserKtab(Subject s,
             String user, String ktab, boolean storeKey) throws Exception {
+        return fromUserKtab(s, user, ktab, false, storeKey);
+    }
+
+    /**
+     * Logins with username/keytab as a client.
+     */
+    public static Context fromUserKtabAsClient(
+            String user, String ktab, boolean storeKey) throws Exception {
+        return fromUserKtab(new Subject(), user, ktab, true, storeKey);
+    }
+
+    private static Context fromUserKtab(Subject s,
+            String user, String ktab, boolean isInitiator, boolean storeKey) throws Exception {
         Context out = new Context();
         out.name = user;
         out.s = s;
         Krb5LoginModule krb5 = new Krb5LoginModule();
         Map map = new HashMap<>();
 
-        map.put("isInitiator", "false");
+        map.put("isInitiator", Boolean.toString(isInitiator));
         map.put("doNotPrompt", "true");
         map.put("useTicketCache", "false");
         map.put("useKeyTab", "true");
diff --git a/test/jdk/sun/security/krb5/auto/HttpsCB.java b/test/jdk/sun/security/krb5/auto/HttpsCB.java
new file mode 100644
index 0000000000000000000000000000000000000000..a65aa5d024117be0563b90dbd08022ce7dfe1998
--- /dev/null
+++ b/test/jdk/sun/security/krb5/auto/HttpsCB.java
@@ -0,0 +1,311 @@
+/*
+ * Copyright (c) 2022, 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 8279842
+ * @modules java.base/sun.security.util
+ *          java.security.jgss/sun.security.jgss
+ *          java.security.jgss/sun.security.jgss.krb5
+ *          java.security.jgss/sun.security.jgss.krb5.internal
+ *          java.security.jgss/sun.security.krb5.internal:+open
+ *          java.security.jgss/sun.security.krb5:+open
+ *          java.security.jgss/sun.security.krb5.internal.ccache
+ *          java.security.jgss/sun.security.krb5.internal.crypto
+ *          java.security.jgss/sun.security.krb5.internal.ktab
+ *          jdk.security.auth
+ *          jdk.security.jgss
+ *          jdk.httpserver
+ * @summary HTTPS Channel Binding support for Java GSS/Kerberos
+ * @library /test/lib
+ * @run main jdk.test.lib.FileInstaller TestHosts TestHosts
+ * @run main/othervm -Djdk.net.hosts.file=TestHosts
+ *          -Djdk.https.negotiate.cbt=always HttpsCB true true
+ * @run main/othervm -Djdk.net.hosts.file=TestHosts
+ *          -Djdk.https.negotiate.cbt=never HttpsCB false true
+ * @run main/othervm -Djdk.net.hosts.file=TestHosts
+ *          -Djdk.https.negotiate.cbt=invalid HttpsCB false true
+ * @run main/othervm -Djdk.net.hosts.file=TestHosts
+ *          HttpsCB false true
+ * @run main/othervm -Djdk.net.hosts.file=TestHosts
+ *          -Djdk.https.negotiate.cbt=domain:other.com HttpsCB false true
+ * @run main/othervm -Djdk.net.hosts.file=TestHosts
+ *          -Djdk.https.negotiate.cbt=domain:host.web.domain HttpsCB true true
+ * @run main/othervm -Djdk.net.hosts.file=TestHosts
+ *          -Djdk.https.negotiate.cbt=domain:*.web.domain HttpsCB true true
+ */
+
+import com.sun.net.httpserver.Headers;
+import com.sun.net.httpserver.HttpExchange;
+import com.sun.net.httpserver.HttpHandler;
+import com.sun.net.httpserver.HttpServer;
+import com.sun.net.httpserver.HttpPrincipal;
+import com.sun.net.httpserver.HttpsConfigurator;
+import com.sun.net.httpserver.HttpsExchange;
+import com.sun.net.httpserver.HttpsServer;
+import com.sun.security.auth.module.Krb5LoginModule;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.InetSocketAddress;
+import java.net.PasswordAuthentication;
+import java.net.Proxy;
+import java.net.Socket;
+import java.net.URL;
+import java.security.cert.X509Certificate;
+import java.util.HashMap;
+import java.util.Map;
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLEngine;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509ExtendedTrustManager;
+import javax.security.auth.Subject;
+
+import jdk.test.lib.Asserts;
+import jdk.test.lib.net.SimpleSSLContext;
+import org.ietf.jgss.GSSContext;
+import org.ietf.jgss.GSSCredential;
+import org.ietf.jgss.GSSManager;
+import sun.security.jgss.GSSUtil;
+import sun.security.jgss.krb5.internal.TlsChannelBindingImpl;
+import sun.security.krb5.Config;
+import sun.security.util.TlsChannelBinding;
+
+import java.util.Base64;
+import java.util.concurrent.Callable;
+
+public class HttpsCB {
+
+    final static String REALM_WEB = "WEB.DOMAIN";
+    final static String KRB5_CONF = "web.conf";
+    final static String KRB5_TAB = "web.ktab";
+
+    final static String WEB_USER = "web";
+    final static char[] WEB_PASS = "webby".toCharArray();
+    final static String WEB_HOST = "host.web.domain";
+    final static String CONTENT = "Hello, World!";
+
+    static int webPort;
+    static URL cbtURL;
+    static URL normalURL;
+
+    public static void main(String[] args)
+            throws Exception {
+
+        boolean expectCBT = Boolean.parseBoolean(args[0]);
+        boolean expectNoCBT = Boolean.parseBoolean(args[1]);
+
+        System.setProperty("sun.security.krb5.debug", "true");
+
+        KDC kdcw = KDC.create(REALM_WEB);
+        kdcw.addPrincipal(WEB_USER, WEB_PASS);
+        kdcw.addPrincipalRandKey("krbtgt/" + REALM_WEB);
+        kdcw.addPrincipalRandKey("HTTP/" + WEB_HOST);
+
+        KDC.saveConfig(KRB5_CONF, kdcw,
+                "default_keytab_name = " + KRB5_TAB,
+                "[domain_realm]",
+                "",
+                ".web.domain="+REALM_WEB);
+
+        System.setProperty("java.security.krb5.conf", KRB5_CONF);
+        Config.refresh();
+        KDC.writeMultiKtab(KRB5_TAB, kdcw);
+
+        // Write a customized JAAS conf file, so that any kinit cache
+        // will be ignored.
+        System.setProperty("java.security.auth.login.config", OneKDC.JAAS_CONF);
+        File f = new File(OneKDC.JAAS_CONF);
+        FileOutputStream fos = new FileOutputStream(f);
+        fos.write((
+                "com.sun.security.jgss.krb5.initiate {\n" +
+                "    com.sun.security.auth.module.Krb5LoginModule required;\n};\n"
+                ).getBytes());
+        fos.close();
+
+        HttpServer h1 = httpd("Negotiate",
+                "HTTP/" + WEB_HOST + "@" + REALM_WEB, KRB5_TAB);
+        webPort = h1.getAddress().getPort();
+
+        cbtURL = new URL("https://" + WEB_HOST +":" + webPort + "/cbt");
+        normalURL = new URL("https://" + WEB_HOST +":" + webPort + "/normal");
+
+        java.net.Authenticator.setDefault(new java.net.Authenticator() {
+            public PasswordAuthentication getPasswordAuthentication () {
+                return new PasswordAuthentication(
+                        WEB_USER+"@"+REALM_WEB, WEB_PASS);
+            }
+        });
+
+        // Client-side SSLContext needs to ignore hostname mismatch
+        // and untrusted certificate.
+        SSLContext sc = SSLContext.getInstance("SSL");
+        sc.init(null, new TrustManager[] {
+                new X509ExtendedTrustManager() {
+                    public X509Certificate[] getAcceptedIssuers() {
+                        return null;
+                    }
+                    public void checkClientTrusted(X509Certificate[] chain,
+                            String authType, Socket socket) { }
+                    public void checkServerTrusted(X509Certificate[] chain,
+                            String authType, Socket socket) { }
+                    public void checkClientTrusted(X509Certificate[] chain,
+                            String authType, SSLEngine engine) { }
+                    public void checkServerTrusted(X509Certificate[] chain,
+                            String authType, SSLEngine engine) { }
+                    public void checkClientTrusted(X509Certificate[] certs,
+                            String authType) { }
+                    public void checkServerTrusted(X509Certificate[] certs,
+                            String authType) { }
+                }
+        }, null);
+
+        Asserts.assertEQ(visit(sc, cbtURL), expectCBT);
+        Asserts.assertEQ(visit(sc, normalURL), expectNoCBT);
+    }
+
+    static boolean visit(SSLContext sc, URL url) {
+        try {
+            HttpsURLConnection conn = (HttpsURLConnection)
+                    url.openConnection(Proxy.NO_PROXY);
+            conn.setSSLSocketFactory(sc.getSocketFactory());
+            BufferedReader reader;
+            reader = new BufferedReader(new InputStreamReader(
+                    conn.getInputStream()));
+            return reader.readLine().equals(CONTENT);
+        } catch (IOException e) {
+            return false;
+        }
+    }
+
+    static HttpServer httpd(String scheme, String principal, String ktab)
+            throws Exception {
+        MyHttpHandler h = new MyHttpHandler();
+        HttpsServer server = HttpsServer.create(new InetSocketAddress(0), 0);
+        server.setHttpsConfigurator(
+                new HttpsConfigurator(new SimpleSSLContext().get()));
+        server.createContext("/", h).setAuthenticator(
+                new MyServerAuthenticator(scheme, principal, ktab));
+        server.start();
+        return server;
+    }
+
+    static class MyHttpHandler implements HttpHandler {
+        public void handle(HttpExchange t) throws IOException {
+            t.sendResponseHeaders(200, 0);
+            t.getResponseBody().write(CONTENT.getBytes());
+            t.close();
+        }
+    }
+
+    static class MyServerAuthenticator
+            extends com.sun.net.httpserver.Authenticator {
+        Subject s = new Subject();
+        GSSManager m;
+        GSSCredential cred;
+        String scheme = null;
+        String reqHdr = "WWW-Authenticate";
+        String respHdr = "Authorization";
+        int err = HttpURLConnection.HTTP_UNAUTHORIZED;
+
+        public MyServerAuthenticator(String scheme,
+                String principal, String ktab) throws Exception {
+
+            this.scheme = scheme;
+            Krb5LoginModule krb5 = new Krb5LoginModule();
+            Map map = new HashMap<>();
+            Map shared = new HashMap<>();
+
+            map.put("storeKey", "true");
+            map.put("isInitiator", "false");
+            map.put("useKeyTab", "true");
+            map.put("keyTab", ktab);
+            map.put("principal", principal);
+            krb5.initialize(s, null, shared, map);
+            krb5.login();
+            krb5.commit();
+            m = GSSManager.getInstance();
+            cred = Subject.callAs(s, new Callable() {
+                @Override
+                public GSSCredential call() throws Exception {
+                    System.err.println("Creating GSSCredential");
+                    return m.createCredential(
+                            null,
+                            GSSCredential.INDEFINITE_LIFETIME,
+                            MyServerAuthenticator.this.scheme
+                                        .equalsIgnoreCase("Negotiate") ?
+                                    GSSUtil.GSS_SPNEGO_MECH_OID :
+                                    GSSUtil.GSS_KRB5_MECH_OID,
+                            GSSCredential.ACCEPT_ONLY);
+                }
+            });
+        }
+
+        @Override
+        public Result authenticate(HttpExchange exch) {
+            // The GSContext is stored in an HttpContext attribute named
+            // "GSSContext" and is created at the first request.
+            GSSContext c = null;
+            String auth = exch.getRequestHeaders().getFirst(respHdr);
+            try {
+                c = (GSSContext)exch.getHttpContext()
+                        .getAttributes().get("GSSContext");
+                if (auth == null) {                 // First request
+                    Headers map = exch.getResponseHeaders();
+                    map.set (reqHdr, scheme);        // Challenge!
+                    c = Subject.callAs(s, () -> m.createContext(cred));
+                    // CBT is required for cbtURL
+                    if (exch instanceof HttpsExchange sexch
+                            && exch.getRequestURI().toString().equals("/cbt")) {
+                        TlsChannelBinding b = TlsChannelBinding.create(
+                                (X509Certificate) sexch.getSSLSession()
+                                        .getLocalCertificates()[0]);
+                        c.setChannelBinding(
+                                new TlsChannelBindingImpl(b.getData()));
+                    }
+                    exch.getHttpContext().getAttributes().put("GSSContext", c);
+                    return new com.sun.net.httpserver.Authenticator.Retry(err);
+                } else {                            // Later requests
+                    byte[] token = Base64.getMimeDecoder()
+                            .decode(auth.split(" ")[1]);
+                    token = c.acceptSecContext(token, 0, token.length);
+                    Headers map = exch.getResponseHeaders();
+                    map.set (reqHdr, scheme + " " + Base64.getMimeEncoder()
+                            .encodeToString(token).replaceAll("\\s", ""));
+                    if (c.isEstablished()) {
+                        return new com.sun.net.httpserver.Authenticator.Success(
+                                new HttpPrincipal(c.getSrcName().toString(), ""));
+                    } else {
+                        return new com.sun.net.httpserver.Authenticator.Retry(err);
+                    }
+                }
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+}
diff --git a/test/jdk/sun/security/krb5/auto/IgnoreChannelBinding.java b/test/jdk/sun/security/krb5/auto/IgnoreChannelBinding.java
index a9760dae9ad1bfdf92483fe5ca796628bd83f937..a393c299b70444261f2d507937024f0fd7d1b32c 100644
--- a/test/jdk/sun/security/krb5/auto/IgnoreChannelBinding.java
+++ b/test/jdk/sun/security/krb5/auto/IgnoreChannelBinding.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2021, 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 6851973 8194486
+ * @bug 6851973 8194486 8279520
  * @summary ignore incoming channel binding if acceptor does not set one
  * @library /test/lib
  * @run main jdk.test.lib.FileInstaller TestHosts TestHosts
@@ -33,6 +33,7 @@
 import java.net.InetAddress;
 import org.ietf.jgss.ChannelBinding;
 import org.ietf.jgss.GSSException;
+import org.ietf.jgss.Oid;
 import sun.security.jgss.GSSUtil;
 
 public class IgnoreChannelBinding {
@@ -41,33 +42,38 @@ public class IgnoreChannelBinding {
             throws Exception {
 
         new OneKDC(null).writeJAASConf();
+        test(GSSUtil.GSS_KRB5_MECH_OID);
+        test(GSSUtil.GSS_SPNEGO_MECH_OID);
+    }
+
+    static void test(Oid mech) throws Exception {
 
         Context c = Context.fromJAAS("client");
         Context s = Context.fromJAAS("server");
 
         // All silent
-        c.startAsClient(OneKDC.SERVER, GSSUtil.GSS_KRB5_MECH_OID);
-        s.startAsServer(GSSUtil.GSS_KRB5_MECH_OID);
+        c.startAsClient(OneKDC.SERVER, mech);
+        s.startAsServer(mech);
         Context.handshake(c, s);
 
         // Initiator req, acceptor ignore
-        c.startAsClient(OneKDC.SERVER, GSSUtil.GSS_KRB5_MECH_OID);
+        c.startAsClient(OneKDC.SERVER, mech);
         c.x().setChannelBinding(new ChannelBinding(
                 InetAddress.getByName("client.rabbit.hole"),
                 InetAddress.getByName("host.rabbit.hole"),
                 new byte[0]
                 ));
-        s.startAsServer(GSSUtil.GSS_KRB5_MECH_OID);
+        s.startAsServer(mech);
         Context.handshake(c, s);
 
         // Both req, and match
-        c.startAsClient(OneKDC.SERVER, GSSUtil.GSS_KRB5_MECH_OID);
+        c.startAsClient(OneKDC.SERVER, mech);
         c.x().setChannelBinding(new ChannelBinding(
                 InetAddress.getByName("client.rabbit.hole"),
                 InetAddress.getByName("host.rabbit.hole"),
                 new byte[0]
                 ));
-        s.startAsServer(GSSUtil.GSS_KRB5_MECH_OID);
+        s.startAsServer(mech);
         s.x().setChannelBinding(new ChannelBinding(
                 InetAddress.getByName("client.rabbit.hole"),
                 InetAddress.getByName("host.rabbit.hole"),
@@ -76,13 +82,13 @@ public class IgnoreChannelBinding {
         Context.handshake(c, s);
 
         // Both req, NOT match
-        c.startAsClient(OneKDC.SERVER, GSSUtil.GSS_KRB5_MECH_OID);
+        c.startAsClient(OneKDC.SERVER, mech);
         c.x().setChannelBinding(new ChannelBinding(
                 InetAddress.getByName("client.rabbit.hole"),
                 InetAddress.getByName("host.rabbit.hole"),
                 new byte[0]
                 ));
-        s.startAsServer(GSSUtil.GSS_KRB5_MECH_OID);
+        s.startAsServer(mech);
         s.x().setChannelBinding(new ChannelBinding(
                 InetAddress.getByName("client.rabbit.hole"),
                 InetAddress.getByName("host.rabbit.hole"),
@@ -96,8 +102,8 @@ public class IgnoreChannelBinding {
         }
 
         // Acceptor req, reject
-        c.startAsClient(OneKDC.SERVER, GSSUtil.GSS_KRB5_MECH_OID);
-        s.startAsServer(GSSUtil.GSS_KRB5_MECH_OID);
+        c.startAsClient(OneKDC.SERVER, mech);
+        s.startAsServer(mech);
         s.x().setChannelBinding(new ChannelBinding(
                 InetAddress.getByName("client.rabbit.hole"),
                 InetAddress.getByName("host.rabbit.hole"),
diff --git a/test/jdk/sun/security/krb5/auto/tools/KtabSalt.java b/test/jdk/sun/security/krb5/auto/tools/KtabSalt.java
new file mode 100644
index 0000000000000000000000000000000000000000..af504d5eab74cb81d12fdb5bda78c160ba04c539
--- /dev/null
+++ b/test/jdk/sun/security/krb5/auto/tools/KtabSalt.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2022, 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 8279064
+ * @summary New options for ktab to provide non-default salt
+ * @requires os.family == "windows"
+ * @library /test/lib
+ * @library /sun/security/krb5/auto
+ * @compile -XDignore.symbol.file KtabSalt.java
+ * @run main jdk.test.lib.FileInstaller ../TestHosts TestHosts
+ * @run main/othervm -Djdk.net.hosts.file=TestHosts KtabSalt
+ */
+
+import jdk.test.lib.SecurityTools;
+import jdk.test.lib.Utils;
+import jdk.test.lib.process.OutputAnalyzer;
+
+import javax.security.auth.login.LoginException;
+
+public class KtabSalt {
+
+    public static void main(String[] args) throws Exception {
+
+        OneKDC kdc = new OneKDC(null).writeJAASConf();
+        kdc.addPrincipal("u1", "password".toCharArray(),
+                "this_is_my_salt", null);
+
+        // Using password works
+        Context.fromUserPass("u1", "password".toCharArray(), true);
+
+        // Using KDC's keytab works
+        kdc.writeKtab("ktab0");
+        Context.fromUserKtabAsClient("u1", "ktab0", true);
+
+        // Self-created keytab with default salt does not work
+        ktab("-a u1 password -k ktab1");
+        Utils.runAndCheckException(
+                () -> Context.fromUserKtabAsClient("u1", "ktab1", true),
+                LoginException.class);
+
+        // Self-creating keytab with specified salt works
+        ktab("-a u1 password -s this_is_my_salt -k ktab2");
+        Context.fromUserKtabAsClient("u1", "ktab2", true);
+
+        // Self-creating keytab with salt from KDC works
+        ktab("-a u1 password -f -k ktab3");
+        Context.fromUserKtabAsClient("u1", "ktab3", true);
+    }
+
+    static OutputAnalyzer ktab(String cmdLine) throws Exception {
+        String fullCmdLine = String.format(
+                "-J-Djava.security.krb5.conf=%s -J-Djdk.net.hosts.file=TestHosts %s",
+                OneKDC.KRB5_CONF, cmdLine);
+        return SecurityTools.ktab(fullCmdLine).shouldHaveExitValue(0);
+    }
+}
diff --git a/test/jdk/sun/security/krb5/tools/KtabCheck.java b/test/jdk/sun/security/krb5/tools/KtabCheck.java
index 8924b70ec93cdc07c48f640bde2eb599590349f3..3b9c42ebff1a4e14b8ab1b2e2fc4f5e844258e0d 100644
--- a/test/jdk/sun/security/krb5/tools/KtabCheck.java
+++ b/test/jdk/sun/security/krb5/tools/KtabCheck.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2022, 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
@@ -69,31 +69,31 @@ public class KtabCheck {
         check(3,17,3,18,3,19,4,17,4,18,4,19,5,17,5,18,5,19);
         ktab("-a me mine -n 6 -append");
         check(3,17,3,18,3,19,4,17,4,18,4,19,5,17,5,18,5,19,6,17,6,18,6,19);
-        ktab("-d me 3");
+        ktab("-d me -f 3");
         check(4,17,4,18,4,19,5,17,5,18,5,19,6,17,6,18,6,19);
-        ktab("-d me -e 17 6");
+        ktab("-d me -f -e 17 6");
         check(4,17,4,18,4,19,5,17,5,18,5,19,6,18,6,19);
-        ktab("-d me -e 19 6");
+        ktab("-d me -f -e 19 6");
         check(4,17,4,18,4,19,5,17,5,18,5,19,6,18);
-        ktab("-d me -e 17 5");
+        ktab("-d me -f -e 17 5");
         check(4,17,4,18,4,19,5,18,5,19,6,18);
-        ktab("-d me old");
+        ktab("-d me -f old");
         check(4,17,5,19,6,18);
         try {
-            ktab("-d me old");
+            ktab("-d me -f old");
             throw new Exception("Should fail");
         } catch (Exception e) {
             // no-op
         }
         check(4,17,5,19,6,18);
-        ktab("-d me");
+        ktab("-d me -f");
         check();
     }
 
     static void ktab(String s) throws Exception {
         File conf = new File(System.getProperty("test.src"), "onlythree.conf");
         SecurityTools.ktab("-J-Djava.security.krb5.conf=" + conf
-                + " -k " + KEYTAB + " -f " + s).shouldHaveExitValue(0);
+                + " -k " + KEYTAB + " " + s).shouldHaveExitValue(0);
     }
 
     /**
diff --git a/test/jdk/sun/security/pkcs12/KeytoolOpensslInteropTest.java b/test/jdk/sun/security/pkcs12/KeytoolOpensslInteropTest.java
index c35bf47d56db1c8dfbc46794786cd3699d50d59b..a3a56c4feccb6bfb58464a33494fe8e91436c88a 100644
--- a/test/jdk/sun/security/pkcs12/KeytoolOpensslInteropTest.java
+++ b/test/jdk/sun/security/pkcs12/KeytoolOpensslInteropTest.java
@@ -462,7 +462,7 @@ public class KeytoolOpensslInteropTest {
                 "pkcs12", "-in", "ksnormal", "-passin", "pass:changeit",
                 "-info", "-nokeys", "-nocerts");
         output1.shouldHaveExitValue(0)
-            .shouldMatch("MAC:.*sha256.*Iteration 10000")
+            .shouldContain("MAC:").shouldContain("sha256").shouldContain("Iteration 10000")
             .shouldContain("Shrouded Keybag: PBES2, PBKDF2, AES-256-CBC,"
                     + " Iteration 10000, PRF hmacWithSHA256")
             .shouldContain("PKCS7 Encrypted data: PBES2, PBKDF2, AES-256-CBC,"
@@ -505,7 +505,7 @@ public class KeytoolOpensslInteropTest {
                 "ksnewic", "-passin", "pass:changeit", "-info", "-nokeys",
                 "-nocerts");
         output1.shouldHaveExitValue(0)
-            .shouldMatch("MAC:.*sha256.*Iteration 5555")
+            .shouldContain("MAC:").shouldContain("sha256").shouldContain("Iteration 5555")
             .shouldContain("Shrouded Keybag: PBES2, PBKDF2, AES-256-CBC,"
                     + " Iteration 7777, PRF hmacWithSHA256")
             .shouldContain("Shrouded Keybag: pbeWithSHA1And128BitRC4,"
diff --git a/test/jdk/sun/security/tools/keytool/TestSha1Usage.java b/test/jdk/sun/security/tools/keytool/TestSha1Usage.java
new file mode 100644
index 0000000000000000000000000000000000000000..0cbece46e147d4ad26c65d829b42a908461ea170
--- /dev/null
+++ b/test/jdk/sun/security/tools/keytool/TestSha1Usage.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2022, 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 8273236
+ * @summary Test SHA1 usage SignedJAR
+ * @library /test/lib
+ */
+
+import jdk.test.lib.SecurityTools;
+import jdk.test.lib.process.OutputAnalyzer;
+
+public class TestSha1Usage {
+
+    static OutputAnalyzer kt(String cmd, String ks) throws Exception {
+        return SecurityTools.keytool("-storepass changeit " + cmd +
+                " -keystore " + ks);
+    }
+
+    public static void main(String[] args) throws Exception {
+
+        SecurityTools.keytool("-keystore ks -storepass changeit " +
+                "-genkeypair -keyalg rsa -alias ca -dname CN=CA " +
+                "-ext eku=codeSigning -sigalg SHA1withRSA")
+                .shouldContain("Warning:")
+                .shouldMatch("The generated certificate.*SHA1withRSA.*considered a security risk")
+                .shouldMatch("cannot be used to sign JARs")
+                .shouldHaveExitValue(0);
+
+        kt("-genkeypair -keyalg rsa -alias e1 -dname CN=E1", "ks");
+        kt("-certreq -alias e1 -file tmp.req", "ks");
+        SecurityTools.keytool("-keystore ks -storepass changeit " +
+                "-gencert -alias ca -infile tmp.req -outfile tmp.cert")
+                .shouldContain("Warning:")
+                .shouldMatch("The issuer.*SHA1withRSA.*considered a security risk")
+                .shouldMatch("cannot be used to sign JARs")
+                .shouldHaveExitValue(0);
+    }
+}
diff --git a/test/jdk/sun/tools/jstatd/JstatdTest.java b/test/jdk/sun/tools/jstatd/JstatdTest.java
index 56c86cbfa075f47c265fedd79012332c6c52fcc4..9eb1ccb3748cb7d781b93ac058eeb99b46469652 100644
--- a/test/jdk/sun/tools/jstatd/JstatdTest.java
+++ b/test/jdk/sun/tools/jstatd/JstatdTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022, 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
@@ -43,7 +43,7 @@ import jdk.test.lib.thread.ProcessThread;
  * 
      * {@code
  * // start jstatd process
- * jstatd -J-XX:+UsePerfData -J-Djava.security.policy=all.policy
+ * jstatd -J-XX:+UsePerfData
  *
  * // run jps and verify its output
  * jps -J-XX:+UsePerfData hostname
@@ -244,20 +244,16 @@ public final class JstatdTest {
     /**
      * Depending on test settings command line can look like:
      *
-     * jstatd -J-XX:+UsePerfData -J-Djava.security.policy=all.policy
-     * jstatd -J-XX:+UsePerfData -J-Djava.security.policy=all.policy -p port
-     * jstatd -J-XX:+UsePerfData -J-Djava.security.policy=all.policy -p port -r rmiport
-     * jstatd -J-XX:+UsePerfData -J-Djava.security.policy=all.policy -n serverName
-     * jstatd -J-XX:+UsePerfData -J-Djava.security.policy=all.policy -p port -n serverName
+     * jstatd -J-XX:+UsePerfData
+     * jstatd -J-XX:+UsePerfData -p port
+     * jstatd -J-XX:+UsePerfData -p port -r rmiport
+     * jstatd -J-XX:+UsePerfData -n serverName
+     * jstatd -J-XX:+UsePerfData -p port -n serverName
      */
     private String[] getJstatdCmd() throws Exception {
         JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("jstatd");
         launcher.addVMArg("-XX:+UsePerfData");
         String testSrc = System.getProperty("test.src");
-        File policy = new File(testSrc, "all.policy");
-        assertTrue(policy.exists() && policy.isFile(),
-                "Security policy " + policy.getAbsolutePath() + " does not exist or not a file");
-        launcher.addVMArg("-Djava.security.policy=" + policy.getAbsolutePath());
         if (port != null) {
             addToolArg(launcher,"-p", port);
         }
diff --git a/test/jdk/sun/tools/jstatd/all.policy b/test/jdk/sun/tools/jstatd/all.policy
deleted file mode 100644
index e202e4e91b6c49790ef9b726e7cf9ef7eee18fb8..0000000000000000000000000000000000000000
--- a/test/jdk/sun/tools/jstatd/all.policy
+++ /dev/null
@@ -1,3 +0,0 @@
-grant {
-   permission java.security.AllPermission;
-};
diff --git a/test/jdk/tools/jar/ReproducibleJar.java b/test/jdk/tools/jar/ReproducibleJar.java
index 5fb46def40d94914d3a0879e3a3bc7e1b067d48e..ed5e2ed2ae3474af0dbde73cda80d9ba5bce2a53 100644
--- a/test/jdk/tools/jar/ReproducibleJar.java
+++ b/test/jdk/tools/jar/ReproducibleJar.java
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @requires vm.bits == 64
  * @bug 8276766
  * @summary Test jar --date source date of entries and that jars are
  *          reproducible
diff --git a/test/langtools/jdk/javadoc/doclet/checkStylesheetClasses/CheckStylesheetClasses.java b/test/langtools/jdk/javadoc/doclet/checkStylesheetClasses/CheckStylesheetClasses.java
index 1cc649b2c272e2e6925883be7788dcf6f123518e..ca3d24aed70b77bd2f4b72ac0c2158e4f7e05bc7 100644
--- a/test/langtools/jdk/javadoc/doclet/checkStylesheetClasses/CheckStylesheetClasses.java
+++ b/test/langtools/jdk/javadoc/doclet/checkStylesheetClasses/CheckStylesheetClasses.java
@@ -139,9 +139,6 @@ public class CheckStylesheetClasses {
                 "search-tag-desc-result", "search-tag-holder-result",
                 "ui-autocomplete", "ui-autocomplete-category", "expanded");
 
-        // snippet-related
-        removeAll(styleSheetNames, "bold", "highlighted", "italic");
-
         // very JDK specific
         styleSheetNames.remove("module-graph");
 
diff --git a/test/langtools/jdk/javadoc/doclet/testCustomTagletRegistration/ClassCastExceptionTaglet.java b/test/langtools/jdk/javadoc/doclet/testCustomTagletRegistration/ClassCastExceptionTaglet.java
new file mode 100644
index 0000000000000000000000000000000000000000..3d6cd7392c93a3a5f9f37d9bfb3779242e894503
--- /dev/null
+++ b/test/langtools/jdk/javadoc/doclet/testCustomTagletRegistration/ClassCastExceptionTaglet.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2021, 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.EnumSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.lang.model.element.Element;
+
+import com.sun.source.doctree.DocTree;
+import jdk.javadoc.doclet.Taglet;
+
+public class ClassCastExceptionTaglet /* does NOT implement jdk.javadoc.doclet.Taglet */ {
+
+    public Set getAllowedLocations() {
+        return EnumSet.allOf(Taglet.Location.class);
+    }
+
+    public boolean isInlineTag() {
+        return false;
+    }
+
+    public String getName() {
+        return "ClassCastExceptionTaglet";
+    }
+
+    public String toString(List tags, Element element) {
+        return "";
+    }
+}
diff --git a/test/langtools/jdk/javadoc/doclet/testCustomTagletRegistration/ExceptionInInitializerErrorTaglet.java b/test/langtools/jdk/javadoc/doclet/testCustomTagletRegistration/ExceptionInInitializerErrorTaglet.java
new file mode 100644
index 0000000000000000000000000000000000000000..22bd088bbe61821e73e87bd282d83d58093b08af
--- /dev/null
+++ b/test/langtools/jdk/javadoc/doclet/testCustomTagletRegistration/ExceptionInInitializerErrorTaglet.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2021, 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.EnumSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.lang.model.element.Element;
+
+import com.sun.source.doctree.DocTree;
+import jdk.javadoc.doclet.Taglet;
+
+public class ExceptionInInitializerErrorTaglet implements Taglet {
+
+    static {
+        if (true) {
+            throw new RuntimeException();
+        }
+    }
+
+    @Override
+    public Set getAllowedLocations() {
+        return EnumSet.allOf(Taglet.Location.class);
+    }
+
+    @Override
+    public boolean isInlineTag() {
+        return false;
+    }
+
+    @Override
+    public String getName() {
+        return "ExceptionInInitializerErrorTaglet";
+    }
+
+    @Override
+    public String toString(List tags, Element element) {
+        return "";
+    }
+}
diff --git a/test/langtools/jdk/javadoc/doclet/testCustomTagletRegistration/InstantiationExceptionTaglet.java b/test/langtools/jdk/javadoc/doclet/testCustomTagletRegistration/InstantiationExceptionTaglet.java
new file mode 100644
index 0000000000000000000000000000000000000000..b3995a033995757898ba8797f519abf78ff269b6
--- /dev/null
+++ b/test/langtools/jdk/javadoc/doclet/testCustomTagletRegistration/InstantiationExceptionTaglet.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2021, 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.EnumSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.lang.model.element.Element;
+
+import com.sun.source.doctree.DocTree;
+import jdk.javadoc.doclet.Taglet;
+
+public abstract class InstantiationExceptionTaglet implements Taglet {
+
+    @Override
+    public Set getAllowedLocations() {
+        return EnumSet.allOf(Taglet.Location.class);
+    }
+
+    @Override
+    public boolean isInlineTag() {
+        return false;
+    }
+
+    @Override
+    public String getName() {
+        return "InstantiationExceptionTaglet";
+    }
+
+    @Override
+    public String toString(List tags, Element element) {
+        return "";
+    }
+}
diff --git a/test/langtools/jdk/javadoc/doclet/testCustomTagletRegistration/InvocationTargetExceptionTaglet.java b/test/langtools/jdk/javadoc/doclet/testCustomTagletRegistration/InvocationTargetExceptionTaglet.java
new file mode 100644
index 0000000000000000000000000000000000000000..37faf0f2ab67c63410fb39d4d3984fff5e310616
--- /dev/null
+++ b/test/langtools/jdk/javadoc/doclet/testCustomTagletRegistration/InvocationTargetExceptionTaglet.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2021, 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.EnumSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.lang.model.element.Element;
+
+import com.sun.source.doctree.DocTree;
+import jdk.javadoc.doclet.Taglet;
+
+public class InvocationTargetExceptionTaglet implements Taglet {
+
+    public InvocationTargetExceptionTaglet() {
+        throw new RuntimeException();
+    }
+
+    @Override
+    public Set getAllowedLocations() {
+        return EnumSet.allOf(Location.class);
+    }
+
+    @Override
+    public boolean isInlineTag() {
+        return false;
+    }
+
+    @Override
+    public String getName() {
+        return "InvocationTargetExceptionTaglet";
+    }
+
+    @Override
+    public String toString(List tags, Element element) {
+        return "";
+    }
+}
diff --git a/test/langtools/jdk/javadoc/doclet/testCustomTagletRegistration/NoSuchMethodExceptionNoNullaryCtorTaglet.java b/test/langtools/jdk/javadoc/doclet/testCustomTagletRegistration/NoSuchMethodExceptionNoNullaryCtorTaglet.java
new file mode 100644
index 0000000000000000000000000000000000000000..5f18ed460c041aa71854331bd16b3b843235f461
--- /dev/null
+++ b/test/langtools/jdk/javadoc/doclet/testCustomTagletRegistration/NoSuchMethodExceptionNoNullaryCtorTaglet.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2021, 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.EnumSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.lang.model.element.Element;
+
+import com.sun.source.doctree.DocTree;
+import jdk.javadoc.doclet.Taglet;
+
+public class NoSuchMethodExceptionNoNullaryCtorTaglet implements Taglet {
+
+    public NoSuchMethodExceptionNoNullaryCtorTaglet(Object obj) {}
+
+    @Override
+    public Set getAllowedLocations() {
+        return EnumSet.allOf(Taglet.Location.class);
+    }
+
+    @Override
+    public boolean isInlineTag() {
+        return false;
+    }
+
+    @Override
+    public String getName() {
+        return "NoSuchMethodExceptionNoNullaryCtorTaglet";
+    }
+
+    @Override
+    public String toString(List tags, Element element) {
+        return "";
+    }
+}
diff --git a/test/langtools/jdk/javadoc/doclet/testCustomTagletRegistration/NoSuchMethodExceptionPrivateCtorTaglet.java b/test/langtools/jdk/javadoc/doclet/testCustomTagletRegistration/NoSuchMethodExceptionPrivateCtorTaglet.java
new file mode 100644
index 0000000000000000000000000000000000000000..cbf71d6021e0a519193f3c8912bbbd0df1afe8db
--- /dev/null
+++ b/test/langtools/jdk/javadoc/doclet/testCustomTagletRegistration/NoSuchMethodExceptionPrivateCtorTaglet.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2021, 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.EnumSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.lang.model.element.Element;
+
+import com.sun.source.doctree.DocTree;
+import jdk.javadoc.doclet.Taglet;
+
+public class NoSuchMethodExceptionPrivateCtorTaglet implements Taglet {
+
+    private NoSuchMethodExceptionPrivateCtorTaglet() {}
+
+    @Override
+    public Set getAllowedLocations() {
+        return EnumSet.allOf(Taglet.Location.class);
+    }
+
+    @Override
+    public boolean isInlineTag() {
+        return false;
+    }
+
+    @Override
+    public String getName() {
+        return "NoSuchMethodExceptionPrivateCtorTaglet";
+    }
+
+    @Override
+    public String toString(List tags, Element element) {
+        return "";
+    }
+}
diff --git a/test/langtools/jdk/javadoc/doclet/testCustomTagletRegistration/TestRegistrationErrors.java b/test/langtools/jdk/javadoc/doclet/testCustomTagletRegistration/TestRegistrationErrors.java
new file mode 100644
index 0000000000000000000000000000000000000000..8d2d95d6a639e055fbbbd1c8d00fefa65d5173a0
--- /dev/null
+++ b/test/langtools/jdk/javadoc/doclet/testCustomTagletRegistration/TestRegistrationErrors.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2021, 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 8206181
+ * @library  ../../lib
+ * @modules jdk.javadoc/jdk.javadoc.internal.tool
+ * @build javadoc.tester.* *
+ * @run main TestRegistrationErrors
+ */
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Stream;
+
+import javadoc.tester.JavadocTester;
+
+public class TestRegistrationErrors extends JavadocTester {
+
+    public static void main(String... args) throws Exception {
+        TestRegistrationErrors tester = new TestRegistrationErrors();
+        tester.runTests();
+    }
+
+    @Test
+    public void test() throws Exception {
+        try (Stream tagletClasses = findTagletClasses()) {
+            tagletClasses.forEach(p -> {
+                String tagletName = getTagletName(p);
+                javadoc("-d", "out-" + tagletName, // a directory per taglet
+                        "-tagletpath", System.getProperty("test.classes"),
+                        "-taglet", tagletName,
+                        testSrc("TestRegistrationErrors.java")); // specify this file
+                checkExit(Exit.ERROR);
+                new OutputChecker(Output.OUT).checkUnique(Pattern.compile("thrown while trying to register Taglet"));
+                checkNoCrashes();
+            });
+        }
+    }
+
+    private static Stream findTagletClasses() throws IOException {
+        var path = Path.of(System.getProperty("test.classes"));
+        return Files.find(path, Integer.MAX_VALUE,
+                (p, a) -> a.isRegularFile() && p.toString().endsWith("Taglet.class"));
+    }
+
+    private static String getTagletName(Path tagletClass) {
+        Path fileName = tagletClass.getFileName();
+        return fileName.toString().substring(0, fileName.toString().lastIndexOf('.'));
+    }
+
+    protected void checkNoCrashes() {
+        checking("check crashes");
+        Matcher matcher = Pattern.compile("\\s*at.*\\(.*\\.java:\\d+\\)")
+                .matcher(getOutput(Output.STDERR));
+        if (!matcher.find()) {
+            passed("");
+        } else {
+            failed("Looks like a stacktrace: " + matcher.group());
+        }
+    }
+}
diff --git a/test/langtools/jdk/javadoc/doclet/testDateOption/TestDateOption.java b/test/langtools/jdk/javadoc/doclet/testDateOption/TestDateOption.java
new file mode 100644
index 0000000000000000000000000000000000000000..411e37efab93de7ecd5d065bbb39797032270928
--- /dev/null
+++ b/test/langtools/jdk/javadoc/doclet/testDateOption/TestDateOption.java
@@ -0,0 +1,147 @@
+/*
+ * Copyright (c) 2022, 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      8272984
+ * @summary  javadoc support for SOURCE_DATE_EPOCH
+ * @library  /tools/lib ../../lib
+ * @modules  jdk.javadoc/jdk.javadoc.internal.tool
+ * @build    toolbox.ToolBox javadoc.tester.*
+ * @run main TestDateOption
+ */
+
+import java.nio.file.Path;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Date;
+import java.util.Locale;
+
+import javadoc.tester.JavadocTester;
+import toolbox.ToolBox;
+
+public class TestDateOption extends JavadocTester {
+
+    /**
+     * The entry point of the test.
+     *
+     * @param args the array of command line arguments
+     * @throws Exception if the test fails
+     */
+    public static void main(String... args) throws Exception {
+        TestDateOption tester = new TestDateOption();
+        tester.runTests(m -> new Object[] { Path.of(m.getName()) });
+    }
+
+    ToolBox tb = new ToolBox();
+
+    @Test
+    public void testDateOption(Path base) throws Exception {
+
+        ZonedDateTime zdt = ZonedDateTime.now(); // uses current date, time, timezone etc
+        // adjust the calendar to some date before the default used by javadoc (i.e. today/now)
+        // set a specific time, such as 10 to 3. (Rupert Brooke, Grantchester)
+        ZonedDateTime testDate = zdt.minusDays(100)
+                        .withHour(14)
+                        .withMinute(50)
+                        .withSecond(0);
+
+        out.println("Test Date: '" + testDate + "'");
+
+        Path srcDir = base.resolve("src");
+        tb.writeJavaFiles(srcDir, """
+                package p;
+                /** Comment. */
+                public interface I { }
+                """);
+        Path outDir = base.resolve("out");
+
+        javadoc("-d", outDir.toString(),
+                "-sourcepath", srcDir.toString(),
+                "--date", testDate.toString(),
+                "p");
+        checkExit(Exit.OK);
+
+        int featureVersion = Runtime.version().feature();
+
+        // The following format is as used by javadoc; it is the historical format used by Date.toString()
+        DateTimeFormatter fmt =
+                DateTimeFormatter.ofPattern("EEE MMM dd HH:mm:ss zzz yyyy").withLocale(Locale.US);
+        String generatedByStamp = testDate.format(fmt);
+        String generatedBy = String.format("",
+                featureVersion, generatedByStamp);
+
+        DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        String dcCreatedStamp = testDate.format(dateFormat);
+        String dcCreated = String.format("""
+                        """,
+                dcCreatedStamp);
+
+        // check the timestamps in all generated HTML files
+        for (Path file : tb.findFiles(".html", outputDir)) {
+            checkOutput(outputDir.relativize(file).toString(), true,
+                    generatedBy,
+                    dcCreated);
+        }
+    }
+
+    @Test
+    public void testBadDateOption(Path base) throws Exception {
+        Path srcDir = base.resolve("src");
+        tb.writeJavaFiles(srcDir, """
+                package p;
+                /** Comment. */
+                public interface I { }
+                """);
+        Path outDir = base.resolve("out");
+
+        javadoc("-d", outDir.toString(),
+                "-sourcepath", srcDir.toString(),
+                "--date", "NOT A DATE",
+                "p");
+        checkExit(Exit.CMDERR);
+
+        checkOutput(Output.OUT, true,
+                "error: value for '--date' not valid: NOT A DATE");
+    }
+
+    @Test
+    public void testInvalidDateOption(Path base) throws Exception {
+        Path srcDir = base.resolve("src");
+        tb.writeJavaFiles(srcDir, """
+                package p;
+                /** Comment. */
+                public interface I { }
+                """);
+        Path outDir = base.resolve("out");
+
+        javadoc("-d", outDir.toString(),
+                "-sourcepath", srcDir.toString(),
+                "--date", new Date(0).toInstant().toString(),
+                "p");
+        checkExit(Exit.CMDERR);
+
+        checkOutput(Output.OUT, true,
+                "error: value for '--date' out of range: 1970-01-01T00:00:00Z");
+    }
+}
\ No newline at end of file
diff --git a/test/langtools/jdk/javadoc/doclet/testParamTaglet/TestParamTaglet.java b/test/langtools/jdk/javadoc/doclet/testParamTaglet/TestParamTaglet.java
index b6b6a7a78d429e8f5f0e0541726db932fc0b2412..200af37a94838c370e7137b8ba535dd084c9c4b0 100644
--- a/test/langtools/jdk/javadoc/doclet/testParamTaglet/TestParamTaglet.java
+++ b/test/langtools/jdk/javadoc/doclet/testParamTaglet/TestParamTaglet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, 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      4802275 4967243 8026567 8239804
+ * @bug      4802275 4967243 8026567 8239804 8234682
  * @summary  Make sure param tags are still printed even though they do not
  *           match up with a real parameters.
  *           Make sure inheritDoc cannot be used in an invalid param tag.
@@ -48,22 +48,51 @@ public class TestParamTaglet extends JavadocTester {
                 "-sourcepath", testSrc,
                 "pkg");
         checkExit(Exit.ERROR);
-
+        checkOutput(Output.OUT, true,
+                "warning: no @param for param1",
+                "error: @param name not found",
+                "warning: @param \"b\" has already been specified");
         checkOutput("pkg/C.html", true,
-                //Regular param tags.
+                // Regular param tags.
                 """
                     
    Parameters:
    
                     
    param1 - testing 1 2 3.
    
-                    
    param2 - testing 1 2 3.""",
-                //Param tags that don't match with any real parameters.
+                    
    param2 - testing 1 2 3.
    
+                    """,
+                // Param tags that don't match with any real parameters.
+                // {@inheritDoc} misuse does not cause doclet to throw exception.
+                // Param is printed with nothing inherited.
                 """
                     
    Parameters:
    
                     
    p1 - testing 1 2 3.
    
-                    
    p2 - testing 1 2 3.""",
-                //{@inherit} doc misuse does not cause doclet to throw exception.
-                // Param is printed with nothing inherited.
-                //XXX: in the future when Configuration is available during doc inheritence,
-                //print a warning for this mistake.
-                "inheritBug -");
+                    
    p2 - testing 1 2 3.
    
+                    
    inheritBug - 
    
+                    """,
+                """
+                    
    Parameters:
    
+                    
    i - an int
    
+                    
    d - a double
    
+                    
    b - a boolean
    
+                    
    x - does not exist
    
+                    
    x - duplicate
    
+                    
    b - another duplicate
    
+                    """,
+                """
+                    
    Type Parameters:
    
+                    
    T2 - type 2
    
+                    
    Parameters:
    
+                    
    t1 - param 1
    
+                    
    t3 - param 3
    
+                    """);
+        checkOutput("pkg/C.Point.html", true,
+                """
+                    
    Record Components:
    
+                    
    y - the y coordinate
    
+                    """);
+        checkOutput("pkg/C.Nested.html", true,
+                """
+                    
    Type Parameters:
    
+                    
    T1 - type 1
    
+                    """);
     }
 }
diff --git a/test/langtools/jdk/javadoc/doclet/testParamTaglet/pkg/C.java b/test/langtools/jdk/javadoc/doclet/testParamTaglet/pkg/C.java
index a50a8d7c6b9be35ed1e0838d7d49c557539a9ed8..ca5bda9eb6053c8ed2d3fd005aa59c113f3dfcc7 100644
--- a/test/langtools/jdk/javadoc/doclet/testParamTaglet/pkg/C.java
+++ b/test/langtools/jdk/javadoc/doclet/testParamTaglet/pkg/C.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, 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,42 @@ public class C extends Parent {
      * @param p2 testing 1 2 3.
      * @param inheritBug {@inheritDoc}
      */
+    @Override
     public void nonMatchingParams(int param1, int param2) {}
 
+    /**
+     * Overriding method with missing/additional/duplicate param tags in non-declaration order.
+     *
+     * @param x does not exist
+     * @param b a boolean
+     * @param i an int
+     * @param x duplicate
+     * @param b another duplicate
+     */
+    @Override
+    public void unorderedParams(int i, double d, boolean b) {}
+
+    /**
+     * Generic method with mixed/missing param tags.
+     *
+     * @param t1 param 1
+     * @param  type 2
+     * @param t3 param 3
+     */
+    public static  void genericMethod(T1 t1, T2 t2, T3 t3) {}
+
+    /**
+     * A partially documented point.
+     *
+     * @param y the y coordinate
+     */
+    public static record Point(int x, int y) {}
+
+    /**
+     * Generic class with missing param tags.
+     *
+     * @param  type 1
+     */
+    public static class Nested {}
+
 }
diff --git a/test/langtools/jdk/javadoc/doclet/testParamTaglet/pkg/Parent.java b/test/langtools/jdk/javadoc/doclet/testParamTaglet/pkg/Parent.java
index f0b380b19bd5ca634c8c690d0f37eadb0d8d8dcd..133c7038cb5ac37d8879f0b83031ac1f7664c498 100644
--- a/test/langtools/jdk/javadoc/doclet/testParamTaglet/pkg/Parent.java
+++ b/test/langtools/jdk/javadoc/doclet/testParamTaglet/pkg/Parent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, 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
@@ -29,4 +29,11 @@ public class Parent {
      * Just a dummy method that is here for inheritDoc testing purposes.
      */
     public void nonMatchingParams(int param1, int param2) {}
+
+    /**
+     * Base method with partially documented params.
+     *
+     * @param d a double
+     */
+    public void unorderedParams(int i, double d, boolean b) {}
 }
diff --git a/test/langtools/jdk/javadoc/doclet/testXOption/TestXOption.java b/test/langtools/jdk/javadoc/doclet/testXOption/TestXOption.java
index 7d00116fccc674b84d81d718e6740250906e8f60..3c65066419c1835945ab3ada7eb3cb7f7c440f75 100644
--- a/test/langtools/jdk/javadoc/doclet/testXOption/TestXOption.java
+++ b/test/langtools/jdk/javadoc/doclet/testXOption/TestXOption.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, 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
@@ -98,6 +98,7 @@ public class TestXOption extends JavadocTester {
                 "-Xmaxwarns ",
                 "-Xdocrootparent ",
                 "-Xdoclint ",
-                "-Xdoclint:");
+                "-Xdoclint:",
+                "--date ");
     }
 }
diff --git a/test/langtools/jdk/javadoc/tool/CheckManPageOptions.java b/test/langtools/jdk/javadoc/tool/CheckManPageOptions.java
index 5a0d83926c8ed954550c43314e8244da0008b994..6d49b54559e9bb48fb7cde33c318144cddc48a66 100644
--- a/test/langtools/jdk/javadoc/tool/CheckManPageOptions.java
+++ b/test/langtools/jdk/javadoc/tool/CheckManPageOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022, 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
@@ -54,13 +54,19 @@ import java.util.stream.Collectors;
  * of the javadoc man page against the set of options declared in the source code.
  */
 public class CheckManPageOptions {
+    static class SourceDirNotFound extends Error { }
+
     public static void main(String... args) throws Exception {
-        new CheckManPageOptions().run(args);
+        try {
+            new CheckManPageOptions().run(args);
+        } catch (SourceDirNotFound e) {
+            System.err.println("NOTE: Cannot find src directory; test skipped");
+        }
     }
 
     static final PrintStream out = System.err;
 
-    List MISSING_IN_MAN_PAGE = List.of();
+    List MISSING_IN_MAN_PAGE = List.of("--date");
 
     void run(String... args) throws Exception {
         var file = args.length == 0 ? findDefaultFile() : Path.of(args[0]);
@@ -143,7 +149,7 @@ public class CheckManPageOptions {
             }
             dir = dir.getParent();
         }
-        throw new IllegalStateException("cannot find root dir");
+        throw new SourceDirNotFound();
     }
 
     List getToolOptions() throws Error {
diff --git a/test/langtools/jdk/javadoc/tool/doclint/DocLintReferencesTest.java b/test/langtools/jdk/javadoc/tool/doclint/DocLintReferencesTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..ee316135e3730d6c15a4c9128467140a14307a68
--- /dev/null
+++ b/test/langtools/jdk/javadoc/tool/doclint/DocLintReferencesTest.java
@@ -0,0 +1,255 @@
+/*
+ * Copyright (c) 2022, 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 8280688
+ * @summary doclint reference checks withstand warning suppression
+ * @library /tools/lib ../../lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.javadoc/jdk.javadoc.internal.api
+ *          jdk.javadoc/jdk.javadoc.internal.tool
+ * @build toolbox.JavacTask toolbox.JavadocTask toolbox.TestRunner toolbox.ToolBox
+ * @run main DocLintReferencesTest
+ */
+
+import toolbox.JavacTask;
+import toolbox.JavadocTask;
+import toolbox.Task;
+import toolbox.TestRunner;
+import toolbox.ToolBox;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+/**
+ * Combo test for how javac and javadoc handle {@code @see MODULE/TYPE}
+ * for different combinations of MODULE and TYPE, with and without
+ * {@code @SuppressWarnings("doclint") }.
+ *
+ * Generally, in javac, references to unknown elements are reported
+ * as suppressible warnings if the module is not resolved in the module graph.
+ * Otherwise, in both javac and javadoc, any issues with references
+ * are reported as errors.
+ *
+ * This allows references to other modules to appear in documentation comments
+ * without causing a hard error if the modules are not available at compile-time.
+ */
+public class DocLintReferencesTest extends TestRunner {
+
+    public static void main(String... args) throws Exception {
+        DocLintReferencesTest t = new DocLintReferencesTest();
+        t.runTests();
+    }
+
+    DocLintReferencesTest() {
+        super(System.err);
+    }
+
+    private final ToolBox tb = new ToolBox();
+
+    enum SuppressKind { NO, YES }
+    enum ModuleKind { NONE, BAD, NOT_FOUND, GOOD }
+    enum TypeKind { NONE, BAD, NOT_FOUND, GOOD }
+
+    @Test
+    public void comboTest () {
+        for (SuppressKind sk : SuppressKind.values() ) {
+            for (ModuleKind mk : ModuleKind.values() ) {
+                for (TypeKind tk: TypeKind.values() ) {
+                    if (mk == ModuleKind.NONE && tk == TypeKind.NONE) {
+                        continue;
+                    }
+
+                    try {
+                        test(sk, mk, tk);
+                    } catch (Throwable e) {
+                        error("Exception " + e);
+                    }
+                }
+            }
+        }
+    }
+
+    void test(SuppressKind sk, ModuleKind mk, TypeKind tk) throws Exception {
+        out.println();
+        out.println("*** Test SuppressKind:" + sk + " ModuleKind: " + mk + " TypeKind: " + tk);
+        Path base = Path.of(sk + "-" + mk + "-" + tk);
+
+        String sw = switch (sk) {
+            case NO -> "";
+            case YES -> "@SuppressWarnings(\"doclint\")";
+        };
+        String m = switch (mk) {
+            case NONE -> "";
+            case BAD -> "bad-name/";
+            case NOT_FOUND -> "not.found/";
+            case GOOD -> "java.base/";
+        };
+        String t = switch (tk) {
+            case NONE -> "";
+            case BAD -> "bad-name";
+            case NOT_FOUND -> "java.lang.NotFound";
+            case GOOD -> "java.lang.Object";
+        };
+
+        Path src = base.resolve("src");
+        tb.writeJavaFiles(src, """
+                package p;
+                /**
+                 * Comment.
+                 * @see #M##T#
+                 */
+                 #SW#
+                public class C {
+                   private C() { }
+                }
+                """
+                .replace("#M#", m)
+                .replace("#T#", t)
+                .replace("#SW#", sw));
+
+        testJavac(sk, mk, tk, base, src);
+        testJavadoc(sk, mk, tk, base, src);
+    }
+
+    void testJavac(SuppressKind sk, ModuleKind mk, TypeKind tk, Path base, Path src) throws Exception {
+        Files.createDirectories(base.resolve("classes"));
+
+        out.println("javac:");
+        try {
+            String s = predictOutput(sk, mk, tk, false);
+            Task.Expect e = s.isEmpty() ? Task.Expect.SUCCESS : Task.Expect.FAIL;
+
+            String o = new JavacTask(tb)
+                    .outdir(base.resolve("classes"))
+                    .options("-Xdoclint:all/protected", "-Werror")
+                    .files(tb.findJavaFiles(src))
+                    .run(e)
+                    .writeAll()
+                    .getOutput(Task.OutputKind.DIRECT);
+
+            checkOutput(s, o);
+
+        } catch (Throwable t) {
+            error("Error: " + t);
+        }
+        out.println();
+    }
+
+    void testJavadoc(SuppressKind sk, ModuleKind mk, TypeKind tk, Path base, Path src) throws Exception {
+        Files.createDirectories(base.resolve("api"));
+
+        out.println("javadoc:");
+        try {
+            String s = predictOutput(sk, mk, tk, true);
+            Task.Expect e = s.isEmpty() ? Task.Expect.SUCCESS : Task.Expect.FAIL;
+
+            String o = new JavadocTask(tb)
+                    .outdir(base.resolve("api"))
+                    .options("-Xdoclint", "-Werror", "-quiet", "-sourcepath", src.toString(), "p")
+                    .run(e)
+                    .writeAll()
+                    .getOutput(Task.OutputKind.DIRECT);
+
+            checkOutput(s, o);
+
+        } catch (Throwable t) {
+            error("Error: " + t);
+        }
+        out.println();
+    }
+
+    private static final String ERROR_UNEXPECTED_TEXT = "error: unexpected text";
+    private static final String ERROR_REFERENCE_NOT_FOUND = "error: reference not found";
+    private static final String WARNING_MODULE_FOR_REFERENCE_NOT_FOUND = "warning: module for reference not found: not.found";
+    private static final String EMPTY = "";
+
+    /**
+     * Returns the expected diagnostic, if any, based on the parameters of the test case.
+     *
+     * The "interesting" cases are those for which the module name is not found,
+     * in which case an error for "reference not found" is reduced to warning,
+     * which may be suppressed.
+     *
+     * @param sk whether @SuppressWarnings is present of not
+     * @param mk the kind of module in the reference
+     * @param tk the kind of class or interface name in the reference
+     * @param strict whether all "not found" references are errors,
+     *               or just warnings if the module name is not found
+     * @return a diagnostic string, or an empty string if no diagnostic should be generated
+     */
+    String predictOutput(SuppressKind sk, ModuleKind mk, TypeKind tk, boolean strict) {
+        return switch (mk) {
+            case NONE -> switch(tk) {
+                case NONE -> throw new Error("should not happen"); // filtered out in combo loops
+                case BAD -> ERROR_UNEXPECTED_TEXT;
+                case NOT_FOUND -> ERROR_REFERENCE_NOT_FOUND;
+                case GOOD -> EMPTY;
+            };
+
+            case BAD -> ERROR_UNEXPECTED_TEXT;
+
+            case NOT_FOUND -> switch(tk) {
+                case BAD -> ERROR_UNEXPECTED_TEXT;
+                case NONE, NOT_FOUND, GOOD -> strict
+                        ? ERROR_REFERENCE_NOT_FOUND
+                        : sk == SuppressKind.YES
+                            ? EMPTY
+                            : WARNING_MODULE_FOR_REFERENCE_NOT_FOUND;
+            };
+
+            case GOOD -> switch(tk) {
+                case BAD -> ERROR_UNEXPECTED_TEXT;
+                case NOT_FOUND -> ERROR_REFERENCE_NOT_FOUND;
+                case GOOD, NONE -> EMPTY;
+            };
+        };
+    }
+
+    /**
+     * Checks the actual output against the expected string, generated by {@code predictError}.
+     * If the expected string is empty, the output should be empty.
+     * If the expected string is not empty, it should be present in the output.
+     *
+     * @param expect the expected string
+     * @param found  the output
+     */
+    void checkOutput(String expect, String found) {
+        if (expect.isEmpty()) {
+            if (found.isEmpty()) {
+                out.println("Output OK");
+            } else {
+                error("unexpected output");
+            }
+        } else {
+            if (found.contains(expect)) {
+                out.println("Output OK");
+            } else {
+                error("expected output not found: " + expect);
+            }
+        }
+
+    }
+}
diff --git a/test/langtools/tools/javac/8203436/T8203436a.java b/test/langtools/tools/javac/8203436/T8203436a.java
index eba0f827c8626865731c112d0afe3c49947d6213..db47a62e67270f3c32266f387139d8eca0f2b838 100644
--- a/test/langtools/tools/javac/8203436/T8203436a.java
+++ b/test/langtools/tools/javac/8203436/T8203436a.java
@@ -1,6 +1,6 @@
 /*
  * @test /nodynamiccopyright/
- * @bug 8203436
+ * @bug 8203436 8211004
  * @summary javac should fail early when emitting illegal signature attributes
  * @compile/fail/ref=T8203436a.out -XDrawDiagnostics T8203436a.java
  */
diff --git a/test/langtools/tools/javac/8203436/T8203436a.out b/test/langtools/tools/javac/8203436/T8203436a.out
index 71b7e6871664f548e7286f68023f60a65c889c40..e076a20a2a84512a63797b05be11af2d1f0c8e89 100644
--- a/test/langtools/tools/javac/8203436/T8203436a.out
+++ b/test/langtools/tools/javac/8203436/T8203436a.out
@@ -1,2 +1,2 @@
-- compiler.err.cannot.generate.class: compiler.misc.anonymous.class: T8203436a$1, (compiler.misc.illegal.signature: compiler.misc.anonymous.class: T8203436a$1, compiler.misc.type.captureof: 1, ?)
+T8203436a.java:12:7: compiler.err.enclosing.class.type.non.denotable: T8203436a
 1 error
diff --git a/test/langtools/tools/javac/8203436/T8203436b.out b/test/langtools/tools/javac/8203436/T8203436b.out
index 979e550fff6c85603ccbff2bc79c0d6ee163770f..48eb947cecf1e5c8f8f91edf73ee018734e18df6 100644
--- a/test/langtools/tools/javac/8203436/T8203436b.out
+++ b/test/langtools/tools/javac/8203436/T8203436b.out
@@ -1,2 +1,2 @@
-- compiler.err.cannot.generate.class: compiler.misc.anonymous.class: T8203436b$1, (compiler.misc.illegal.signature: compiler.misc.anonymous.class: T8203436b$1, java.lang.Object&T8203436b.A&T8203436b.B)
+T8203436b.java:17:10: compiler.err.enclosing.class.type.non.denotable: T8203436b
 1 error
diff --git a/test/langtools/tools/javac/StringConcat/StringAppendEvaluatesInOrder.java b/test/langtools/tools/javac/StringConcat/StringAppendEvaluatesInOrder.java
new file mode 100644
index 0000000000000000000000000000000000000000..b2bd47acde0003a541d1c4edd2e25ab1995da3c5
--- /dev/null
+++ b/test/langtools/tools/javac/StringConcat/StringAppendEvaluatesInOrder.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2021, Google LLC. 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     8273914
+ * @summary Indy string concat changes order of operations
+ *
+ * @clean *
+ * @compile -XDstringConcat=indy              StringAppendEvaluatesInOrder.java
+ * @run main StringAppendEvaluatesInOrder
+ *
+ * @clean *
+ * @compile -XDstringConcat=indyWithConstants StringAppendEvaluatesInOrder.java
+ * @run main StringAppendEvaluatesInOrder
+ *
+ * @clean *
+ * @compile -XDstringConcat=inline            StringAppendEvaluatesInOrder.java
+ * @run main StringAppendEvaluatesInOrder
+ */
+
+public class StringAppendEvaluatesInOrder {
+    static String test() {
+        StringBuilder builder = new StringBuilder("foo");
+        int i = 15;
+        return "Test: " + i + " " + (++i) + builder + builder.append("bar");
+    }
+
+    static String compoundAssignment() {
+        StringBuilder builder2 = new StringBuilder("foo");
+        Object oo = builder2;
+        oo += "" + builder2.append("bar");
+        return oo.toString();
+    }
+
+    public static void main(String[] args) throws Exception {
+        assertEquals(test(), "Test: 15 16foofoobar");
+        assertEquals(compoundAssignment(), "foofoobar");
+    }
+
+    private static void assertEquals(String actual, String expected) {
+      if (!actual.equals(expected)) {
+        throw new AssertionError("expected: " + expected + ", actual: " + actual);
+      }
+    }
+}
diff --git a/test/langtools/tools/javac/StringConcat/WellKnownTypeSignatures.java b/test/langtools/tools/javac/StringConcat/WellKnownTypeSignatures.java
new file mode 100644
index 0000000000000000000000000000000000000000..07cdeef49561535175e4901dd0d51b2d9528c946
--- /dev/null
+++ b/test/langtools/tools/javac/StringConcat/WellKnownTypeSignatures.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright (c) 2021, Google LLC. 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 com.sun.tools.classfile.*;
+import com.sun.tools.classfile.ConstantPool.*;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+/*
+ * @test
+ * @bug     8273914
+ * @summary Indy string concat changes order of operations
+ * @modules jdk.jdeps/com.sun.tools.classfile
+ *
+ * @clean *
+ * @compile -XDstringConcat=indy              WellKnownTypeSignatures.java
+ * @run main WellKnownTypeSignatures
+ *
+ * @clean *
+ * @compile -XDstringConcat=indyWithConstants WellKnownTypeSignatures.java
+ * @run main WellKnownTypeSignatures
+ */
+
+public class WellKnownTypeSignatures {
+    static List actualTypes;
+
+    static int idx = 0;
+
+    static boolean z = true;
+    static char c = (char) 42;
+    static short s = (short) 42;
+    static byte b = (byte) 42;
+    static int i = 42;
+    static long l = 42L;
+    static float f = 42.0f;
+    static double d = 42.0;
+
+    public static void main(String[] argv) throws Exception {
+        readIndyTypes();
+
+        test("" + WellKnownTypeSignatures.class, idx++, "(Ljava/lang/String;)Ljava/lang/String;");
+        test("" + Boolean.valueOf(z), idx++, "(Ljava/lang/Boolean;)Ljava/lang/String;");
+        test("" + Character.valueOf(c), idx++, "(Ljava/lang/Character;)Ljava/lang/String;");
+        test("" + Byte.valueOf(b), idx++, "(Ljava/lang/Byte;)Ljava/lang/String;");
+        test("" + Short.valueOf(s), idx++, "(Ljava/lang/Short;)Ljava/lang/String;");
+        test("" + Integer.valueOf(i), idx++, "(Ljava/lang/Integer;)Ljava/lang/String;");
+        test("" + Long.valueOf(l), idx++, "(Ljava/lang/Long;)Ljava/lang/String;");
+        test("" + Double.valueOf(d), idx++, "(Ljava/lang/Double;)Ljava/lang/String;");
+        test("" + Float.valueOf(f), idx++, "(Ljava/lang/Float;)Ljava/lang/String;");
+        test("" + z, idx++, "(Z)Ljava/lang/String;");
+        test("" + c, idx++, "(C)Ljava/lang/String;");
+        test("" + b, idx++, "(B)Ljava/lang/String;");
+        test("" + s, idx++, "(S)Ljava/lang/String;");
+        test("" + i, idx++, "(I)Ljava/lang/String;");
+        test("" + l, idx++, "(J)Ljava/lang/String;");
+        test("" + d, idx++, "(D)Ljava/lang/String;");
+        test("" + f, idx++, "(F)Ljava/lang/String;");
+    }
+
+    public static void test(String actual, int index, String expectedType) {
+        String actualType = actualTypes.get(index);
+        if (!actualType.equals(expectedType)) {
+            throw new IllegalStateException(
+                    index
+                            + " Unexpected type: expected = "
+                            + expectedType
+                            + ", actual = "
+                            + actualType);
+        }
+    }
+
+    public static void readIndyTypes() throws Exception {
+        actualTypes = new ArrayList();
+
+        ClassFile classFile =
+                ClassFile.read(
+                        new File(
+                                System.getProperty("test.classes", "."),
+                                WellKnownTypeSignatures.class.getName() + ".class"));
+        ConstantPool constantPool = classFile.constant_pool;
+
+        for (Method method : classFile.methods) {
+            if (method.getName(constantPool).equals("main")) {
+                Code_attribute code = (Code_attribute) method.attributes.get(Attribute.Code);
+                for (Instruction i : code.getInstructions()) {
+                    if (i.getOpcode() == Opcode.INVOKEDYNAMIC) {
+                        CONSTANT_InvokeDynamic_info indyInfo =
+                                (CONSTANT_InvokeDynamic_info)
+                                        constantPool.get(i.getUnsignedShort(1));
+                        CONSTANT_NameAndType_info natInfo = indyInfo.getNameAndTypeInfo();
+                        actualTypes.add(natInfo.getType());
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/test/langtools/tools/javac/StringConcat/WellKnownTypes.java b/test/langtools/tools/javac/StringConcat/WellKnownTypes.java
new file mode 100644
index 0000000000000000000000000000000000000000..39150cfc4da42fb02f18f083170d34d49a9cc6da
--- /dev/null
+++ b/test/langtools/tools/javac/StringConcat/WellKnownTypes.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2021, Google LLC. 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 com.sun.tools.classfile.*;
+import com.sun.tools.classfile.ConstantPool.*;
+
+/*
+ * @test
+ * @bug     8273914
+ * @summary Indy string concat changes order of operations
+ * @modules jdk.jdeps/com.sun.tools.classfile
+ *
+ * @compile -XDstringConcat=indy              WellKnownTypes.java
+ * @run main WellKnownTypes
+ *
+ * @compile -XDstringConcat=indyWithConstants WellKnownTypes.java
+ * @run main WellKnownTypes
+ *
+ * @compile -XDstringConcat=inline            WellKnownTypes.java
+ * @run main WellKnownTypes
+ */
+
+public class WellKnownTypes {
+    static int idx = 0;
+
+    static boolean z = true;
+    static char c = (char) 42;
+    static byte b = (byte) 43;
+    static short s = (short) 44;
+    static int i = 45;
+    static long l = 46L;
+    static float f = 47.0f;
+    static double d = 48.0;
+
+    public static void main(String[] argv) throws Exception {
+        test("" + WellKnownTypes.class, idx++, "class WellKnownTypes");
+        test("" + Boolean.valueOf(z), idx++, "true");
+        test("" + Character.valueOf(c), idx++, "*");
+        test("" + Byte.valueOf(b), idx++, "43");
+        test("" + Short.valueOf(s), idx++, "44");
+        test("" + Integer.valueOf(i), idx++, "45");
+        test("" + Long.valueOf(l), idx++, "46");
+        test("" + Float.valueOf(f), idx++, "47.0");
+        test("" + Double.valueOf(d), idx++, "48.0");
+        test("" + z, idx++, "true");
+        test("" + c, idx++, "*");
+        test("" + b, idx++, "43");
+        test("" + s, idx++, "44");
+        test("" + i, idx++, "45");
+        test("" + l, idx++, "46");
+        test("" + f, idx++, "47.0");
+        test("" + d, idx++, "48.0");
+    }
+
+    public static void test(String actual, int index, String expected) {
+        if (!actual.equals(expected)) {
+      throw new IllegalStateException(
+          index + " Unexpected: expected = " + expected + ", actual = " + actual);
+        }
+    }
+}
diff --git a/test/langtools/tools/javac/StringConcat/access/Test.java b/test/langtools/tools/javac/StringConcat/access/Test.java
index 72237e8b4ef7b8d43aaccdbc26979d33bd5956ac..578bbddb1188ca25381d4e4665293b17c3560e78 100644
--- a/test/langtools/tools/javac/StringConcat/access/Test.java
+++ b/test/langtools/tools/javac/StringConcat/access/Test.java
@@ -56,109 +56,109 @@ public class Test {
         // ----------------------------------------------------------------------------
 
         // public Private_PublicClass            c1 = new Private_PublicClass();
-        test("" + holder.c1, idx++, "(Lp1/PublicClass;)Ljava/lang/String;");
+        test("" + holder.c1, idx++, "(Ljava/lang/String;)Ljava/lang/String;");
 
         // public Private_PublicInterface        c2 = new Private_PublicInterface();
-        test("" + holder.c2, idx++, "(Ljava/lang/Object;)Ljava/lang/String;");
+        test("" + holder.c2, idx++, "(Ljava/lang/String;)Ljava/lang/String;");
 
         // public Private_PrivateInterface1      c3 = new Private_PrivateInterface1();
-        test("" + holder.c3, idx++, "(Ljava/lang/Object;)Ljava/lang/String;");
+        test("" + holder.c3, idx++, "(Ljava/lang/String;)Ljava/lang/String;");
 
         // public Private_PrivateInterface2      c4 = new Private_PrivateInterface2();
-        test("" + holder.c4, idx++, "(Ljava/lang/Object;)Ljava/lang/String;");
+        test("" + holder.c4, idx++, "(Ljava/lang/String;)Ljava/lang/String;");
 
         // public Public_PublicClass             c5 = new Public_PublicClass();
-        test("" + holder.c5, idx++, "(Lp1/Public_PublicClass;)Ljava/lang/String;");
+        test("" + holder.c5, idx++, "(Ljava/lang/String;)Ljava/lang/String;");
 
         // public Public_PublicInterface         c6 = new Public_PublicInterface();
-        test("" + holder.c6, idx++, "(Lp1/Public_PublicInterface;)Ljava/lang/String;");
+        test("" + holder.c6, idx++, "(Ljava/lang/String;)Ljava/lang/String;");
 
         // public Public_PrivateInterface1       c7 = new Public_PrivateInterface1();
-        test("" + holder.c7, idx++, "(Lp1/Public_PrivateInterface1;)Ljava/lang/String;");
+        test("" + holder.c7, idx++, "(Ljava/lang/String;)Ljava/lang/String;");
 
         // public Public_PrivateInterface2       c8 = new Public_PrivateInterface2();
-        test("" + holder.c8, idx++, "(Lp1/Public_PrivateInterface2;)Ljava/lang/String;");
+        test("" + holder.c8, idx++, "(Ljava/lang/String;)Ljava/lang/String;");
 
         // ----------------------------------------------------------------------------
 
         // public Private_PublicClass[]          ac1 = new Private_PublicClass[0];
-        test("" + holder.ac1, idx++, "([Lp1/PublicClass;)Ljava/lang/String;");
+        test("" + holder.ac1, idx++, "(Ljava/lang/String;)Ljava/lang/String;");
 
         // public Private_PublicInterface[]      ac2 = new Private_PublicInterface[0];
-        test("" + holder.ac2, idx++, "([Ljava/lang/Object;)Ljava/lang/String;");
+        test("" + holder.ac2, idx++, "(Ljava/lang/String;)Ljava/lang/String;");
 
         // public Private_PrivateInterface1[]    ac3 = new Private_PrivateInterface1[0];
-        test("" + holder.ac3, idx++, "([Ljava/lang/Object;)Ljava/lang/String;");
+        test("" + holder.ac3, idx++, "(Ljava/lang/String;)Ljava/lang/String;");
 
         // public Private_PrivateInterface2[]    ac4 = new Private_PrivateInterface2[0];
-        test("" + holder.ac4, idx++, "([Ljava/lang/Object;)Ljava/lang/String;");
+        test("" + holder.ac4, idx++, "(Ljava/lang/String;)Ljava/lang/String;");
 
         // public Public_PublicClass[]           ac5 = new Public_PublicClass[0];
-        test("" + holder.ac5, idx++, "([Lp1/Public_PublicClass;)Ljava/lang/String;");
+        test("" + holder.ac5, idx++, "(Ljava/lang/String;)Ljava/lang/String;");
 
         // public Public_PublicInterface[]       ac6 = new Public_PublicInterface[0];
-        test("" + holder.ac6, idx++, "([Lp1/Public_PublicInterface;)Ljava/lang/String;");
+        test("" + holder.ac6, idx++, "(Ljava/lang/String;)Ljava/lang/String;");
 
         // public Public_PrivateInterface1[]     ac7 = new Public_PrivateInterface1[0];
-        test("" + holder.ac7, idx++, "([Lp1/Public_PrivateInterface1;)Ljava/lang/String;");
+        test("" + holder.ac7, idx++, "(Ljava/lang/String;)Ljava/lang/String;");
 
         // public Public_PrivateInterface2[]     ac8 = new Public_PrivateInterface2[0];
-        test("" + holder.ac8, idx++, "([Lp1/Public_PrivateInterface2;)Ljava/lang/String;");
+        test("" + holder.ac8, idx++, "(Ljava/lang/String;)Ljava/lang/String;");
 
         // ----------------------------------------------------------------------------
 
         // public Private_PublicClass[][]       aac1 = new Private_PublicClass[0][];
-        test("" + holder.aac1, idx++, "([[Lp1/PublicClass;)Ljava/lang/String;");
+        test("" + holder.aac1, idx++, "(Ljava/lang/String;)Ljava/lang/String;");
 
         // public Private_PublicInterface[][]   aac2 = new Private_PublicInterface[0][];
-        test("" + holder.aac2, idx++, "([[Ljava/lang/Object;)Ljava/lang/String;");
+        test("" + holder.aac2, idx++, "(Ljava/lang/String;)Ljava/lang/String;");
 
         // public Private_PrivateInterface1[][] aac3 = new Private_PrivateInterface1[0][];
-        test("" + holder.aac3, idx++, "([[Ljava/lang/Object;)Ljava/lang/String;");
+        test("" + holder.aac3, idx++, "(Ljava/lang/String;)Ljava/lang/String;");
 
         // public Private_PrivateInterface2[][] aac4 = new Private_PrivateInterface2[0][];
-        test("" + holder.aac4, idx++, "([[Ljava/lang/Object;)Ljava/lang/String;");
+        test("" + holder.aac4, idx++, "(Ljava/lang/String;)Ljava/lang/String;");
 
         // public Public_PublicClass[][]        aac5 = new Public_PublicClass[0][];
-        test("" + holder.aac5, idx++, "([[Lp1/Public_PublicClass;)Ljava/lang/String;");
+        test("" + holder.aac5, idx++, "(Ljava/lang/String;)Ljava/lang/String;");
 
         // public Public_PublicInterface[][]    aac6 = new Public_PublicInterface[0][];
-        test("" + holder.aac6, idx++, "([[Lp1/Public_PublicInterface;)Ljava/lang/String;");
+        test("" + holder.aac6, idx++, "(Ljava/lang/String;)Ljava/lang/String;");
 
         // public Public_PrivateInterface1[][]  aac7 = new Public_PrivateInterface1[0][];
-        test("" + holder.aac7, idx++, "([[Lp1/Public_PrivateInterface1;)Ljava/lang/String;");
+        test("" + holder.aac7, idx++, "(Ljava/lang/String;)Ljava/lang/String;");
 
         // public Public_PrivateInterface2[][]  aac8 = new Public_PrivateInterface2[0][];
-        test("" + holder.aac8, idx++, "([[Lp1/Public_PrivateInterface2;)Ljava/lang/String;");
+        test("" + holder.aac8, idx++, "(Ljava/lang/String;)Ljava/lang/String;");
 
         // ----------------------------------------------------------------------------
 
         // public PublicInterface                i1 = new Private_PublicInterface();
-        test("" + holder.i1, idx++, "(Lp1/PublicInterface;)Ljava/lang/String;");
+        test("" + holder.i1, idx++, "(Ljava/lang/String;)Ljava/lang/String;");
 
         // public PrivateInterface1              i2 = new Private_PrivateInterface1();
-        test("" + holder.i2, idx++, "(Ljava/lang/Object;)Ljava/lang/String;");
+        test("" + holder.i2, idx++, "(Ljava/lang/String;)Ljava/lang/String;");
 
         // public PrivateInterface2              i3 = new Private_PrivateInterface2();
-        test("" + holder.i3, idx++, "(Ljava/lang/Object;)Ljava/lang/String;");
+        test("" + holder.i3, idx++, "(Ljava/lang/String;)Ljava/lang/String;");
 
         // public PublicInterface[]              ai1 = new Private_PublicInterface[0];
-        test("" + holder.ai1, idx++, "([Lp1/PublicInterface;)Ljava/lang/String;");
+        test("" + holder.ai1, idx++, "(Ljava/lang/String;)Ljava/lang/String;");
 
         // public PrivateInterface1[]            ai2 = new Private_PrivateInterface1[0];
-        test("" + holder.ai2, idx++, "([Ljava/lang/Object;)Ljava/lang/String;");
+        test("" + holder.ai2, idx++, "(Ljava/lang/String;)Ljava/lang/String;");
 
         // public PrivateInterface2[]            ai3 = new Private_PrivateInterface2[0];
-        test("" + holder.ai3, idx++, "([Ljava/lang/Object;)Ljava/lang/String;");
+        test("" + holder.ai3, idx++, "(Ljava/lang/String;)Ljava/lang/String;");
 
         // public PublicInterface[][]           aai1 = new Private_PublicInterface[0][];
-        test("" + holder.aai1, idx++, "([[Lp1/PublicInterface;)Ljava/lang/String;");
+        test("" + holder.aai1, idx++, "(Ljava/lang/String;)Ljava/lang/String;");
 
         // public PrivateInterface1[][]         aai2 = new Private_PrivateInterface1[0][];
-        test("" + holder.aai2, idx++, "([[Ljava/lang/Object;)Ljava/lang/String;");
+        test("" + holder.aai2, idx++, "(Ljava/lang/String;)Ljava/lang/String;");
 
         // public PrivateInterface2[][]         aai3 = new Private_PrivateInterface2[0][];
-        test("" + holder.aai3, idx++, "([[Ljava/lang/Object;)Ljava/lang/String;");
+        test("" + holder.aai3, idx++, "(Ljava/lang/String;)Ljava/lang/String;");
 
     }
 
diff --git a/test/langtools/tools/javac/T8036019.java b/test/langtools/tools/javac/T8036019.java
new file mode 100644
index 0000000000000000000000000000000000000000..709b8abba468b025c42725c4e139dbbc5ad49981
--- /dev/null
+++ b/test/langtools/tools/javac/T8036019.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2021, 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 8036019
+ * @summary Insufficient alternatives listed in some errors produced by the parser
+ * @compile/fail/ref=T8036019.out -XDrawDiagnostics T8036019.java
+ */
+
+
+public class T8036019 {
+    enum E {
+        E(String value) {  }
+    }
+
+    interface A {}
+    interface B {}
+    public class Foo {
+        Foo foo1 = null;
+    }
+
+    @SuppressWarnings({,0})
+    public class AV {
+    }
+}
diff --git a/test/langtools/tools/javac/T8036019.out b/test/langtools/tools/javac/T8036019.out
new file mode 100644
index 0000000000000000000000000000000000000000..2c874175793c6034a7eb66727fa9ff7ccdc01d87
--- /dev/null
+++ b/test/langtools/tools/javac/T8036019.out
@@ -0,0 +1,10 @@
+T8036019.java:34:17: compiler.err.expected2: ')', ','
+T8036019.java:34:23: compiler.err.expected3: ',', '}', ';'
+T8036019.java:34:25: compiler.err.enum.constant.expected
+T8036019.java:40:24: compiler.err.expected2: >, ','
+T8036019.java:40:26: compiler.err.expected: token.identifier
+T8036019.java:40:32: compiler.err.expected: token.identifier
+T8036019.java:43:25: compiler.err.annotation.missing.element.value
+T8036019.java:43:27: compiler.err.expected4: class, interface, enum, record
+T8036019.java:46:1: compiler.err.expected4: class, interface, enum, record
+9 errors
\ No newline at end of file
diff --git a/test/langtools/tools/javac/annotations/typeAnnotations/6967002/T6967002.out b/test/langtools/tools/javac/annotations/typeAnnotations/6967002/T6967002.out
index 86480c2bfa8e41bcd1d5aa357574aed7572a9f2a..d9a3545d31deec460f0a1142b0b08ce4996f6cfa 100644
--- a/test/langtools/tools/javac/annotations/typeAnnotations/6967002/T6967002.out
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/6967002/T6967002.out
@@ -1,2 +1,2 @@
-T6967002.java:10:22: compiler.err.expected: ')'
+T6967002.java:10:22: compiler.err.expected2: ')', ','
 1 error
diff --git a/test/langtools/tools/javac/code/CharImmediateValue.java b/test/langtools/tools/javac/code/CharImmediateValue.java
new file mode 100644
index 0000000000000000000000000000000000000000..38745358be040041300d3d4fdbe8286623227b2e
--- /dev/null
+++ b/test/langtools/tools/javac/code/CharImmediateValue.java
@@ -0,0 +1,185 @@
+/*
+ * Copyright (c) 2022, 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 8280067
+ * @summary Verify constant/immediate char values are correctly enhanced to ints when used in unary
+ *          operators
+ * @library /tools/lib
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ *          jdk.compiler/com.sun.tools.javac.code
+ *          jdk.compiler/com.sun.tools.javac.comp
+ *          jdk.compiler/com.sun.tools.javac.jvm
+ *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.util
+ *          jdk.jdeps/com.sun.tools.classfile
+ *          jdk.jdeps/com.sun.tools.javap
+ * @build toolbox.JarTask toolbox.JavacTask toolbox.JavapTask toolbox.ToolBox
+ * @compile CharImmediateValue.java
+ * @run main CharImmediateValue
+ */
+
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.nio.file.DirectoryStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Objects;
+
+import com.sun.source.util.JavacTask;
+import com.sun.source.util.Plugin;
+import com.sun.source.util.TaskEvent;
+import com.sun.source.util.TaskListener;
+
+import com.sun.tools.classfile.Attribute;
+import com.sun.tools.classfile.ClassFile;
+import com.sun.tools.classfile.Code_attribute;
+import com.sun.tools.classfile.Instruction;
+import com.sun.tools.classfile.Opcode;
+
+import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;
+import com.sun.tools.javac.tree.JCTree.JCIdent;
+import com.sun.tools.javac.tree.TreeScanner;
+
+import toolbox.JarTask;
+import toolbox.ToolBox;
+
+
+public class CharImmediateValue implements Plugin {
+    public static void main(String... args) throws Exception {
+        new CharImmediateValue().runSourceTest();
+        new CharImmediateValue().runReplacementTest();
+    }
+
+    void runSourceTest() throws Exception {
+        int param = 0;
+        Character var = (char) -(false ? (char) param : (char) 2);
+    }
+
+    void runReplacementTest() throws Exception {
+        ToolBox tb = new ToolBox();
+        Path pluginClasses = Path.of("plugin-classes");
+        tb.writeFile(pluginClasses.resolve("META-INF").resolve("services").resolve(Plugin.class.getName()),
+                CharImmediateValue.class.getName() + System.lineSeparator());
+        try (DirectoryStream ds = Files.newDirectoryStream(Path.of(ToolBox.testClasses))) {
+            for (Path p : ds) {
+                if (p.getFileName().toString().startsWith("CharImmediateValue") ||
+                    p.getFileName().toString().endsWith(".class")) {
+                    Files.copy(p, pluginClasses.resolve(p.getFileName()));
+                }
+            }
+        }
+
+        Path pluginJar = Path.of("plugin.jar");
+        new JarTask(tb, pluginJar)
+                .baseDir(pluginClasses)
+                .files(".")
+                .run();
+
+        Path src = Path.of("src");
+            tb.writeJavaFiles(src,
+                    """
+                    public class Test{
+                        private static char replace; //this will be replace with a constant "1" after constant folding is done
+                        public static String run() {
+                            char c = (char) - replace;
+                            if (c < 0) {
+                                throw new AssertionError("Incorrect value!");
+                            } else {
+                                return Integer.toString(c);
+                            }
+                        }
+                    }
+                    """);
+        Path classes = Files.createDirectories(Path.of("classes"));
+
+        new toolbox.JavacTask(tb)
+                .classpath(pluginJar)
+                .options("-XDaccessInternalAPI")
+                .outdir(classes)
+                .files(tb.findJavaFiles(src))
+                .run()
+                .writeAll();
+
+        URLClassLoader cl = new URLClassLoader(new URL[] {classes.toUri().toURL()});
+
+        String actual = (String) cl.loadClass("Test")
+                                   .getMethod("run")
+                                   .invoke(null);
+        String expected = "65535";
+        if (!Objects.equals(actual, expected)) {
+            throw new AssertionError("expected: " + expected + "; but got: " + actual);
+        }
+
+        Path testClass = classes.resolve("Test.class");
+        ClassFile cf = ClassFile.read(testClass);
+        Code_attribute codeAttr =
+                (Code_attribute) cf.methods[1].attributes.get(Attribute.Code);
+        boolean seenCast = false;
+        for (Instruction i : codeAttr.getInstructions()) {
+            if (i.getOpcode() == Opcode.I2C) {
+                seenCast = true;
+            }
+        }
+        if (!seenCast) {
+            throw new AssertionError("Missing cast!");
+        }
+    }
+
+    // Plugin impl...
+
+    @Override
+    public String getName() { return "CharImmediateValue"; }
+
+    @Override
+    public void init(JavacTask task, String... args) {
+        task.addTaskListener(new TaskListener() {
+            @Override
+            public void started(TaskEvent e) {
+                if (e.getKind() == TaskEvent.Kind.GENERATE) {
+                    convert((JCCompilationUnit) e.getCompilationUnit());
+                }
+            }
+        });
+    }
+
+    @Override
+    public boolean autoStart() {
+        return true;
+    }
+
+    private void convert(JCCompilationUnit toplevel) {
+        new TreeScanner() {
+            @Override
+            public void visitIdent(JCIdent tree) {
+                if (tree.name.contentEquals("replace")) {
+                    tree.type = tree.type.constType(1);
+                }
+                super.visitIdent(tree);
+            }
+        }.scan(toplevel);
+    }
+
+}
diff --git a/test/langtools/tools/javac/diags/examples.not-yet.txt b/test/langtools/tools/javac/diags/examples.not-yet.txt
index f257b7df8e09d4ae187c5ed7a14c7f1a32dd3cd2..9f9f8f780144708d7f61108f4708b10c79cd457e 100644
--- a/test/langtools/tools/javac/diags/examples.not-yet.txt
+++ b/test/langtools/tools/javac/diags/examples.not-yet.txt
@@ -206,3 +206,4 @@ compiler.warn.source.target.conflict
 compiler.warn.target.default.source.conflict
 compiler.err.preview.not.latest
 compiler.err.preview.without.source.or.release
+compiler.misc.illegal.signature                               # the compiler can now detect more non-denotable types before class writing
diff --git a/test/langtools/tools/javac/diags/examples/AnnotationMissingElementValue.java b/test/langtools/tools/javac/diags/examples/AnnotationMissingElementValue.java
new file mode 100644
index 0000000000000000000000000000000000000000..65f24aad3167d04053f306700151019955e1092c
--- /dev/null
+++ b/test/langtools/tools/javac/diags/examples/AnnotationMissingElementValue.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2010, 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.annotation.missing.element.value
+
+@SuppressWarnings({,0})
+public class AV {
+}
diff --git a/test/langtools/tools/javac/diags/examples/IllegalSignature.java b/test/langtools/tools/javac/diags/examples/IllegalSignature.java
index a9b64b41afa68242acccb45f0aabcd9535f8c88e..96b93b6bdabbdef78199f279fe755c3b934137fb 100644
--- a/test/langtools/tools/javac/diags/examples/IllegalSignature.java
+++ b/test/langtools/tools/javac/diags/examples/IllegalSignature.java
@@ -21,8 +21,7 @@
  * questions.
  */
 
-// key: compiler.err.cannot.generate.class
-// key: compiler.misc.illegal.signature
+// key: compiler.err.enclosing.class.type.non.denotable
 
 class IllegalSignature {
     class Inner { }
diff --git a/test/langtools/tools/javac/doctree/ReferenceTest.java b/test/langtools/tools/javac/doctree/ReferenceTest.java
index 128d3e158b11f1ea90a2f528b83bdf933cd44ae2..eb635650b7678cc3c2a96d3a7beaae4e3c00d91b 100644
--- a/test/langtools/tools/javac/doctree/ReferenceTest.java
+++ b/test/langtools/tools/javac/doctree/ReferenceTest.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 7021614
+ * @bug 7021614 8278373
  * @summary extend com.sun.source API to support parsing javadoc comments
  * @summary check references in at-see and {at-link} tags
  * @modules jdk.compiler
@@ -39,19 +39,23 @@ import com.sun.source.doctree.SeeTree;
 import com.sun.source.doctree.TextTree;
 import com.sun.source.util.DocTreePath;
 import com.sun.source.util.DocTreePathScanner;
-import com.sun.source.util.DocTreeScanner;
 import com.sun.source.util.DocTrees;
 import com.sun.source.util.TreePath;
 
 import java.util.List;
 import java.util.Set;
+import java.util.stream.Collectors;
 import javax.annotation.processing.AbstractProcessor;
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.annotation.processing.RoundEnvironment;
 import javax.annotation.processing.SupportedAnnotationTypes;
 import javax.lang.model.SourceVersion;
 import javax.lang.model.element.Element;
+import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.QualifiedNameable;
 import javax.lang.model.element.TypeElement;
+import javax.lang.model.type.DeclaredType;
+import javax.lang.model.type.TypeMirror;
 import javax.tools.Diagnostic.Kind;
 
 /**
@@ -174,8 +178,18 @@ public class ReferenceTest extends AbstractProcessor {
             if (label.size() > 0 && label.get(0) instanceof TextTree)
                 expect = ((TextTree) label.get(0)).getBody();
 
-            if (!expect.equalsIgnoreCase(found == null ? "bad" : found.getKind().name())) {
-                error(tree, "Unexpected value found: " + found +", expected: " + expect);
+            if (expect.startsWith("signature:")) {
+                expect = expect.substring("signature:".length());
+
+                String signature = found.getKind().name() + ":" + elementSignature(found);
+
+                if (!expect.equalsIgnoreCase(signature)) {
+                    error(tree, "Unexpected value found: " + signature +", expected: " + expect);
+                }
+            } else {
+                if (!expect.equalsIgnoreCase(found == null ? "bad" : found.getKind().name())) {
+                    error(tree, "Unexpected value found: " + found +", expected: " + expect);
+                }
             }
         }
 
@@ -183,6 +197,29 @@ public class ReferenceTest extends AbstractProcessor {
             trees.printMessage(Kind.ERROR, msg, tree, dc, path.getCompilationUnit());
         }
     }
+
+    String elementSignature(Element el) {
+        return switch (el.getKind()) {
+            case METHOD -> elementSignature(el.getEnclosingElement()) + "." + el.getSimpleName() + "(" + executableParamNames((ExecutableElement) el) + ")";
+            case CLASS, INTERFACE -> ((QualifiedNameable) el).getQualifiedName().toString();
+            default -> throw new AssertionError("Unhandled Element kind: " + el.getKind());
+        };
+    }
+
+    String executableParamNames(ExecutableElement ee) {
+        return ee.getParameters()
+                 .stream()
+                 .map(p -> type2Name(p.asType()))
+                 .collect(Collectors.joining(", "));
+    }
+
+    String type2Name(TypeMirror type) {
+        return switch (type.getKind()) {
+            case DECLARED -> elementSignature(((DeclaredType) type).asElement());
+            case INT, LONG -> type.toString();
+            default -> throw new AssertionError("Unhandled type kind: " + type.getKind());
+        };
+    }
 }
 
 /**
@@ -199,6 +236,17 @@ public class ReferenceTest extends AbstractProcessor {
  * @see #varargs(int... args)   Method
  * @see #varargs(int[])         Method
  * @see #varargs(int[] args)    Method
+ *
+ * @see #methodSearch(String)   signature:METHOD:ReferenceTestExtras.methodSearch(java.lang.String)
+ * @see #methodSearch(StringBuilder)   signature:METHOD:ReferenceTestExtras.methodSearch(java.lang.CharSequence)
+ * @see #methodSearchPrimitive1(int, int)   signature:METHOD:ReferenceTestExtras.methodSearchPrimitive1(int, int)
+ * @see #methodSearchPrimitive1(long, int)   signature:METHOD:ReferenceTestExtras.methodSearchPrimitive1(long, int)
+ * @see #methodSearchPrimitive1(int, long)   signature:METHOD:ReferenceTestExtras.methodSearchPrimitive1(int, long)
+ * @see #methodSearchPrimitive1(long, long)   signature:METHOD:ReferenceTestExtras.methodSearchPrimitive1(long, long)
+ * @see #methodSearchPrimitive2(int, int)   signature:METHOD:ReferenceTestExtras.methodSearchPrimitive2(int, int)
+ * @see #methodSearchPrimitive2(long, int)   signature:METHOD:ReferenceTestExtras.methodSearchPrimitive2(long, int)
+ * @see #methodSearchPrimitive2(int, long)   signature:METHOD:ReferenceTestExtras.methodSearchPrimitive2(int, long)
+ * @see #methodSearchPrimitive2(long, long)   signature:METHOD:ReferenceTestExtras.methodSearchPrimitive2(long, long)
  */
 class ReferenceTestExtras {
     int ReferenceTestExtras;            // field
@@ -214,6 +262,20 @@ class ReferenceTestExtras {
     void m(int i, int j) { }
 
     void varargs(int... args) { }
+
+    void methodSearch(Object o) {}
+    void methodSearch(String s) {}
+    void methodSearch(CharSequence cs) {}
+
+    void methodSearchPrimitive1(int i, int j) {}
+    void methodSearchPrimitive1(long i, int j) {}
+    void methodSearchPrimitive1(int i, long j) {}
+    void methodSearchPrimitive1(long i, long j) {}
+
+    void methodSearchPrimitive2(long i, long j) {}
+    void methodSearchPrimitive2(int i, long j) {}
+    void methodSearchPrimitive2(long i, int j) {}
+    void methodSearchPrimitive2(int i, int j) {}
 }
 
 
diff --git a/test/langtools/tools/javac/enum/EnumMembersOrder.out b/test/langtools/tools/javac/enum/EnumMembersOrder.out
index b1e01860f3469d908676f72f2da0528ab2f63adb..94aff47aca8eeffb2bc33165c91273bc20c7965d 100644
--- a/test/langtools/tools/javac/enum/EnumMembersOrder.out
+++ b/test/langtools/tools/javac/enum/EnumMembersOrder.out
@@ -1,4 +1,4 @@
-EnumMembersOrder.java:11:16: compiler.err.expected: ')'
+EnumMembersOrder.java:11:16: compiler.err.expected2: ')', ','
 EnumMembersOrder.java:11:18: compiler.err.expected3: ',', '}', ';'
 EnumMembersOrder.java:11:20: compiler.err.enum.constant.expected
 3 errors
diff --git a/test/langtools/tools/javac/generics/diamond/neg/Neg21.out b/test/langtools/tools/javac/generics/diamond/neg/Neg21.out
index 35e1a94cc156e4fc83d5edc891ec9a476feecd59..d273f7ae713005ae9ba64a74c19832be76a81759 100644
--- a/test/langtools/tools/javac/generics/diamond/neg/Neg21.out
+++ b/test/langtools/tools/javac/generics/diamond/neg/Neg21.out
@@ -1,2 +1,3 @@
+Neg21.java:13:9: compiler.err.enclosing.class.type.non.denotable: Neg21
 Neg21.java:13:28: compiler.err.cant.apply.diamond.1: (compiler.misc.diamond: Neg21.A), (compiler.misc.diamond.invalid.arg: java.lang.Object&java.io.Serializable&java.lang.Cloneable, (compiler.misc.diamond: Neg21.A))
-1 error
+2 errors
diff --git a/test/langtools/tools/javac/lambda/CantFindSymbolImplicitLambdaAndDiamondTest.java b/test/langtools/tools/javac/lambda/CantFindSymbolImplicitLambdaAndDiamondTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..a053d7f27ab76beb250e4ed2dd1c4a15fb46c631
--- /dev/null
+++ b/test/langtools/tools/javac/lambda/CantFindSymbolImplicitLambdaAndDiamondTest.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2022, 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 symbol not found error, implicit lambdas and diamond constructor invocations
+ * @compile CantFindSymbolImplicitLambdaAndDiamondTest.java
+ */
+
+import java.util.function.Consumer;
+
+class CantFindSymbolImplicitLambdaAndDiamondTest {
+    static class B{}
+
+    static class A1 {
+         A1(Consumer cons) {}
+    }
+
+    static class A2 {
+        A2(Consumer cons) {}
+    }
+
+    public void mount() {
+        new A1(inHours ->
+                new B<>() {{
+                    System.out.println(inHours);
+                }});
+
+        new A2<>(inHours ->
+            new B<>() {{
+                System.out.println(inHours);
+            }});
+    }
+}
diff --git a/test/langtools/tools/javac/parser/7157165/T7157165.out b/test/langtools/tools/javac/parser/7157165/T7157165.out
index deb580df96c647d06dfffda4887b1d9119d3806b..7552381ba15c13fcef7ad5f97905525e43cd421f 100644
--- a/test/langtools/tools/javac/parser/7157165/T7157165.out
+++ b/test/langtools/tools/javac/parser/7157165/T7157165.out
@@ -1,4 +1,4 @@
-T7157165.java:11:20: compiler.err.expected: >
+T7157165.java:11:20: compiler.err.expected2: >, ','
 T7157165.java:11:22: compiler.err.expected: token.identifier
 T7157165.java:11:28: compiler.err.expected: token.identifier
 3 errors
diff --git a/test/langtools/tools/javac/parser/SingleCommaAnnotationValueFail.out b/test/langtools/tools/javac/parser/SingleCommaAnnotationValueFail.out
index 23d1082361bc9f8c0c7bb80ce5a9cb768f4a0137..05d27bc67df77e508ec2b9dee0fbe96b699fec68 100644
--- a/test/langtools/tools/javac/parser/SingleCommaAnnotationValueFail.out
+++ b/test/langtools/tools/javac/parser/SingleCommaAnnotationValueFail.out
@@ -1,3 +1,3 @@
-SingleCommaAnnotationValueFail.java:11:12: compiler.err.expected: '}'
+SingleCommaAnnotationValueFail.java:11:12: compiler.err.annotation.missing.element.value
 SingleCommaAnnotationValueFail.java:11:14: compiler.err.expected4: class, interface, enum, record
 2 errors
diff --git a/test/langtools/tools/javac/patterns/BindingsInitializer.java b/test/langtools/tools/javac/patterns/BindingsInitializer.java
new file mode 100644
index 0000000000000000000000000000000000000000..eaf550c3dafe004a4c7cd907b9df6568343afaa6
--- /dev/null
+++ b/test/langtools/tools/javac/patterns/BindingsInitializer.java
@@ -0,0 +1,164 @@
+/*
+ * Copyright (c) 2022, 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 8278834
+ * @summary Verify pattern matching nested inside initializers of classes nested in methods
+ *          works correctly.
+ * @library /tools/lib /tools/javac/lib
+ * @modules
+ *      jdk.compiler/com.sun.tools.javac.api
+ *      jdk.compiler/com.sun.tools.javac.file
+ *      jdk.compiler/com.sun.tools.javac.main
+ *      jdk.compiler/com.sun.tools.javac.util
+ * @build toolbox.ToolBox toolbox.JavacTask
+ * @build combo.ComboTestHelper
+ * @compile BindingsInitializer.java
+ * @run main BindingsInitializer
+ */
+
+import combo.ComboInstance;
+import combo.ComboParameter;
+import combo.ComboTask;
+import combo.ComboTestHelper;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import toolbox.ToolBox;
+
+public class BindingsInitializer extends ComboInstance {
+    protected ToolBox tb;
+
+    BindingsInitializer() {
+        super();
+        tb = new ToolBox();
+    }
+
+    public static void main(String... args) throws Exception {
+        new ComboTestHelper()
+                .withDimension("OUTER", (x, outer) -> x.outer = outer, Outer.values())
+                .withDimension("MIDDLE", (x, middle) -> x.middle = middle, Middle.values())
+                .withDimension("INNER", (x, inner) -> x.inner = inner, Inner.values())
+                .withDimension("TEST", (x, test) -> x.test = test, Test.values())
+                .run(BindingsInitializer::new);
+    }
+
+    private Outer outer;
+    private Middle middle;
+    private Inner inner;
+    private Test test;
+
+    private static final String MAIN_TEMPLATE =
+            """
+            public class Test {
+                private static Object obj = "";
+                #{OUTER}
+            }
+            """;
+
+    @Override
+    protected void doWork() throws Throwable {
+        Path base = Paths.get(".");
+
+        ComboTask task = newCompilationTask()
+                .withSourceFromTemplate(MAIN_TEMPLATE, pname -> switch (pname) {
+                        case "OUTER" -> outer;
+                        case "MIDDLE" -> middle;
+                        case "INNER" -> inner;
+                        case "TESST" -> test;
+                        default -> throw new UnsupportedOperationException(pname);
+                    });
+
+        task.generate(result -> {
+            if (result.hasErrors()) {
+                throw new AssertionError("Unexpected result: " + result.compilationInfo());
+            }
+        });
+    }
+
+    public enum Outer implements ComboParameter {
+        NONE("#{MIDDLE}"),
+        STATIC_CLASS("static class Nested { #{MIDDLE} }"),
+        CLASS("class Inner { #{MIDDLE} }");
+        private final String code;
+
+        private Outer(String code) {
+            this.code = code;
+        }
+
+        @Override
+        public String expand(String optParameter) {
+            return code;
+        }
+    }
+
+    public enum Middle implements ComboParameter {
+        STATIC_INIT("static { #{INNER} }"),
+        INIT("{ #{INNER} }"),
+        METHOD("void test() { #{INNER} }");
+        private final String code;
+
+        private Middle(String code) {
+            this.code = code;
+        }
+
+        @Override
+        public String expand(String optParameter) {
+            return code;
+        }
+    }
+
+    public enum Inner implements ComboParameter {
+        DIRECT("#{TEST}"),
+        CLASS_STATIC_INIT("class C { static { #{TEST} } }"),
+        CLASS_INIT("class C { { #{TEST} } }"),
+        CLASS_METHOD("class C { void t() { #{TEST} } }"),
+        ANNONYMOUS_CLASS_STATIC_INIT("new Object() { static { #{TEST} } };"),
+        ANNONYMOUS_CLASS_INIT("new Object() { { #{TEST} } };"),
+        ANNONYMOUS_CLASS_METHOD("new Object() { void t() { #{TEST} } };");
+        private final String code;
+
+        private Inner(String code) {
+            this.code = code;
+        }
+
+        @Override
+        public String expand(String optParameter) {
+            return code;
+        }
+    }
+
+    public enum Test implements ComboParameter {
+        TEST("if (obj instanceof String str) System.err.println(str);");
+        private final String code;
+
+        private Test(String code) {
+            this.code = code;
+        }
+
+        @Override
+        public String expand(String optParameter) {
+            return code;
+        }
+    }
+}
diff --git a/test/langtools/tools/javac/processing/model/element/TestListPackageFromAPI.java b/test/langtools/tools/javac/processing/model/element/TestListPackageFromAPI.java
new file mode 100644
index 0000000000000000000000000000000000000000..358be012617062e0884bd0a790a3796672787b21
--- /dev/null
+++ b/test/langtools/tools/javac/processing/model/element/TestListPackageFromAPI.java
@@ -0,0 +1,149 @@
+/*
+ * Copyright (c) 2022, 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 8278930
+ * @summary Check that when a package has Elements listed from both from classes and sources,
+ *          and then a nested class is completed, it is not first completed from source via
+ *          its enclosing class, and then again for itself.
+ * @library /tools/javac/lib
+ * @modules java.compiler
+ *          jdk.compiler
+ * @run main TestListPackageFromAPI
+ */
+
+import com.sun.source.util.JavacTask;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import javax.lang.model.element.PackageElement;
+import javax.tools.DiagnosticListener;
+import javax.tools.ForwardingJavaFileManager;
+import javax.tools.JavaFileManager;
+import javax.tools.JavaFileObject;
+import javax.tools.JavaFileObject.Kind;
+import javax.tools.SimpleJavaFileObject;
+import javax.tools.StandardLocation;
+import javax.tools.ToolProvider;
+
+public class TestListPackageFromAPI {
+
+    public static void main(String... args) throws IOException, URISyntaxException, InterruptedException {
+        try (JavaFileManager fm = ToolProvider.getSystemJavaCompiler().getStandardFileManager(null, null, null)) {
+            List testClasses = List.of(
+                new TestFileObject("Test"),
+                new TestFileObject("Test$Nested")
+            );
+            List testSources = List.of(
+                    new TestFileObject("Test",
+                                       """
+                                       class Test {
+                                           public static class Nested {}
+                                       }
+                                       """)
+            );
+            JavaFileManager testFM = new ForwardingJavaFileManagerImpl(fm, testClasses, testSources);
+            DiagnosticListener noErrors = d -> { throw new AssertionError("Should not happen: " + d); };
+            JavacTask task = (JavacTask) ToolProvider.getSystemJavaCompiler().getTask(null, testFM, noErrors, null, null, List.of(new TestFileObject("Input", "")));
+            PackageElement pack = task.getElements().getPackageElement("");
+            pack.getEnclosedElements().forEach(e -> System.err.println(e));
+        }
+    }
+
+    private static class TestFileObject extends SimpleJavaFileObject {
+
+        private final String className;
+        private final String code;
+
+        public TestFileObject(String className) throws URISyntaxException {
+            super(new URI("mem://" + className + ".class"), Kind.CLASS);
+            this.className = className;
+            this.code = null;
+        }
+
+        public TestFileObject(String className, String code) throws URISyntaxException {
+            super(new URI("mem://" + className + ".java"), Kind.SOURCE);
+            this.className = className;
+            this.code = code;
+        }
+
+        @Override
+        public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException {
+            if (code == null) {
+                throw new UnsupportedOperationException();
+            }
+            return code;
+        }
+
+        @Override
+        public long getLastModified() {
+            return getKind() == Kind.CLASS ? 0 : 1000;
+        }
+
+    }
+
+    private static class ForwardingJavaFileManagerImpl extends ForwardingJavaFileManager {
+
+        private final List testClasses;
+        private final List testSources;
+
+        public ForwardingJavaFileManagerImpl(JavaFileManager fileManager, List testClasses, List testSources) {
+            super(fileManager);
+            this.testClasses = testClasses;
+            this.testSources = testSources;
+        }
+
+        @Override
+        public Iterable list(JavaFileManager.Location location, String packageName, Set kinds, boolean recurse) throws IOException {
+            if (packageName.isEmpty()) {
+                List result = new ArrayList<>();
+                if (location == StandardLocation.CLASS_PATH && kinds.contains(Kind.CLASS)) {
+                    result.addAll(testClasses);
+                } else if (location == StandardLocation.SOURCE_PATH && kinds.contains(Kind.SOURCE)) {
+                    result.addAll(testSources);
+                }
+                return result;
+            }
+            return super.list(location, packageName, kinds, recurse);
+        }
+
+        @Override
+        public boolean hasLocation(Location location) {
+            return location == StandardLocation.CLASS_PATH ||
+                   location == StandardLocation.SOURCE_PATH ||
+                   super.hasLocation(location);
+        }
+
+        @Override
+        public String inferBinaryName(JavaFileManager.Location location, JavaFileObject file) {
+            if (file instanceof TestFileObject testFO) {
+                return testFO.className;
+            }
+            return super.inferBinaryName(location, file);
+        }
+    }
+}
diff --git a/test/lib-test/jdk/test/lib/TestMutuallyExclusivePlatformPredicates.java b/test/lib-test/jdk/test/lib/TestMutuallyExclusivePlatformPredicates.java
index 4be69a6566c8cf0fc3b9879d39f4ef70d8cb7505..3ca1de653a4f7e25112833d39ea693b08d59ea43 100644
--- a/test/lib-test/jdk/test/lib/TestMutuallyExclusivePlatformPredicates.java
+++ b/test/lib-test/jdk/test/lib/TestMutuallyExclusivePlatformPredicates.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2022, 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
@@ -53,7 +53,7 @@ public class TestMutuallyExclusivePlatformPredicates {
         IGNORED("isEmulatedClient", "isDebugBuild", "isFastDebugBuild",
                 "isSlowDebugBuild", "hasSA", "isRoot", "isTieredSupported",
                 "areCustomLoadersSupportedForCDS", "isDefaultCDSArchiveSupported",
-                "isSignedOSX");
+                "isHardenedOSX");
 
         public final List methodNames;
 
diff --git a/test/lib/jdk/test/lib/Platform.java b/test/lib/jdk/test/lib/Platform.java
index 7666fdcc459df904770183fdb7ddf71d886ff339..a8405c937226a178dabc5c60cd4a3e53ff427430 100644
--- a/test/lib/jdk/test/lib/Platform.java
+++ b/test/lib/jdk/test/lib/Platform.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022, 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,10 @@
 
 package jdk.test.lib;
 
+import java.io.BufferedReader;
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.io.InputStreamReader;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -242,13 +244,13 @@ public class Platform {
     }
 
     /**
-     * Return true if the test JDK is signed, otherwise false. Only valid on OSX.
+     * Return true if the test JDK is hardened, otherwise false. Only valid on OSX.
      */
-    public static boolean isSignedOSX() throws IOException {
-        // We only care about signed binaries for 10.14 and later (actually 10.14.5, but
+    public static boolean isHardenedOSX() throws IOException {
+        // We only care about hardened binaries for 10.14 and later (actually 10.14.5, but
         // for simplicity we'll also include earlier 10.14 versions).
         if (getOsVersionMajor() == 10 && getOsVersionMinor() < 14) {
-            return false; // assume not signed
+            return false; // assume not hardened
         }
 
         // Find the path to the java binary.
@@ -260,38 +262,45 @@ public class Platform {
         }
 
         // Run codesign on the java binary.
-        ProcessBuilder pb = new ProcessBuilder("codesign", "-d", "-v", javaFileName);
-        pb.redirectError(ProcessBuilder.Redirect.DISCARD);
-        pb.redirectOutput(ProcessBuilder.Redirect.DISCARD);
+        ProcessBuilder pb = new ProcessBuilder("codesign", "--display", "--verbose", javaFileName);
+        pb.redirectErrorStream(true); // redirect stderr to stdout
         Process codesignProcess = pb.start();
+        BufferedReader is = new BufferedReader(new InputStreamReader(codesignProcess.getInputStream()));
+        String line;
+        boolean isHardened = false;
+        boolean hardenedStatusConfirmed = false; // set true when we confirm whether or not hardened
+        while ((line = is.readLine()) != null) {
+            System.out.println("STDOUT: " + line);
+            if (line.indexOf("flags=0x10000(runtime)") != -1 ) {
+                hardenedStatusConfirmed = true;
+                isHardened = true;
+                System.out.println("Target JDK is hardened. Some tests may be skipped.");
+            } else if (line.indexOf("flags=0x20002(adhoc,linker-signed)") != -1 ) {
+                hardenedStatusConfirmed = true;
+                isHardened = false;
+                System.out.println("Target JDK is adhoc signed, but not hardened.");
+            } else if (line.indexOf("code object is not signed at all") != -1) {
+                hardenedStatusConfirmed = true;
+                isHardened = false;
+                System.out.println("Target JDK is not signed, therefore not hardened.");
+            }
+        }
+        if (!hardenedStatusConfirmed) {
+            System.out.println("Could not confirm if TargetJDK is hardened. Assuming not hardened.");
+            isHardened = false;
+        }
+
         try {
             if (codesignProcess.waitFor(10, TimeUnit.SECONDS) == false) {
-                System.err.println("Timed out waiting for the codesign process to complete. Assuming not signed.");
+                System.err.println("Timed out waiting for the codesign process to complete. Assuming not hardened.");
                 codesignProcess.destroyForcibly();
-                return false; // assume not signed
+                return false; // assume not hardened
             }
         } catch (InterruptedException e) {
             throw new RuntimeException(e);
         }
 
-        // Check codesign result to see if java binary is signed. Here are the
-        // exit code meanings:
-        //    0: signed
-        //    1: not signed
-        //    2: invalid arguments
-        //    3: only has meaning with the -R argument.
-        // So we should always get 0 or 1 as an exit value.
-        if (codesignProcess.exitValue() == 0) {
-            System.out.println("Target JDK is signed. Some tests may be skipped.");
-            return true; // signed
-        } else if (codesignProcess.exitValue() == 1) {
-            System.out.println("Target JDK is not signed.");
-            return false; // not signed
-        } else {
-            System.err.println("Executing codesign failed. Assuming unsigned: " +
-                               codesignProcess.exitValue());
-            return false; // not signed
-        }
+        return isHardened;
     }
 
     private static boolean isArch(String archnameRE) {
diff --git a/test/lib/jdk/test/lib/SA/SATestUtils.java b/test/lib/jdk/test/lib/SA/SATestUtils.java
index 0ba91f2a994fff1eb25a697aa617a4b20d04fb3d..d4daf5ef145dd1eb9d573187ad7307f114cda8f7 100644
--- a/test/lib/jdk/test/lib/SA/SATestUtils.java
+++ b/test/lib/jdk/test/lib/SA/SATestUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2022, 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,8 +63,8 @@ public class SATestUtils {
                     throw new SkippedException("SA Attach not expected to work. Ptrace attach not supported.");
                 }
             } else if (Platform.isOSX()) {
-                if (Platform.isSignedOSX()) {
-                    throw new SkippedException("SA Attach not expected to work. JDK is signed.");
+                if (Platform.isHardenedOSX()) {
+                    throw new SkippedException("SA Attach not expected to work. JDK is hardened.");
                 }
                 if (!Platform.isRoot() && !canAddPrivileges()) {
                     throw new SkippedException("SA Attach not expected to work. Insufficient privileges (not root and can't use sudo).");
diff --git a/test/lib/jdk/test/lib/cds/CDSArchiveUtils.java b/test/lib/jdk/test/lib/cds/CDSArchiveUtils.java
index 4c7fdd2ec961ae0b1bfae2653b339e2248444bd8..f5c504ba1c84e8465d9f5828e1478c6d9a4e27f5 100644
--- a/test/lib/jdk/test/lib/cds/CDSArchiveUtils.java
+++ b/test/lib/jdk/test/lib/cds/CDSArchiveUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022, 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
@@ -341,6 +341,18 @@ public class CDSArchiveUtils {
         return newJsaFile;
     }
 
+    public static File createMagicOnlyFile(String fileName, boolean createStatic) throws Exception {
+        File file = new File(fileName);
+        if (file.exists()) {
+            file.delete();
+        }
+        try (FileOutputStream out = new FileOutputStream(file)) {
+            ByteBuffer buffer = ByteBuffer.allocate(4).putInt(createStatic ? staticMagic: dynamicMagic);
+            out.write(buffer.array(), 0, 4);
+        }
+        return file;
+    }
+
     private static FileChannel getFileChannel(File file, boolean write) throws Exception {
         List arry = new ArrayList();
         arry.add(READ);
diff --git a/test/lib/jdk/test/lib/cds/CDSTestUtils.java b/test/lib/jdk/test/lib/cds/CDSTestUtils.java
index f7e263ba5c53a45a888e807573c072383f470383..f9391c96ee4ece72cdeceeb9024edda6da23a249 100644
--- a/test/lib/jdk/test/lib/cds/CDSTestUtils.java
+++ b/test/lib/jdk/test/lib/cds/CDSTestUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,9 @@ import java.io.IOException;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.PrintStream;
+import java.nio.file.Files;
+import java.nio.file.CopyOption;
+import java.nio.file.StandardCopyOption;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -684,4 +687,78 @@ public class CDSTestUtils {
     private static boolean isAsciiPrintable(char ch) {
         return ch >= 32 && ch < 127;
     }
+
+    // JDK utility
+
+    // Do a cheap clone of the JDK. Most files can be sym-linked. However, $JAVA_HOME/bin/java and $JAVA_HOME/lib/.../libjvm.so"
+    // must be copied, because the java.home property is derived from the canonicalized paths of these 2 files.
+    // Set a list of {jvm, "java"} which will be physically copied. If a file needs copied physically, add it to the list.
+    private static String[] phCopied = {System.mapLibraryName("jvm"), "java"};
+    public static void clone(File src, File dst) throws Exception {
+        if (dst.exists()) {
+            if (!dst.isDirectory()) {
+                throw new RuntimeException("Not a directory :" + dst);
+            }
+        } else {
+            if (!dst.mkdir()) {
+                throw new RuntimeException("Cannot create directory: " + dst);
+            }
+        }
+        // final String jvmLib = System.mapLibraryName("jvm");
+        for (String child : src.list()) {
+            if (child.equals(".") || child.equals("..")) {
+                continue;
+            }
+
+            File child_src = new File(src, child);
+            File child_dst = new File(dst, child);
+            if (child_dst.exists()) {
+                throw new RuntimeException("Already exists: " + child_dst);
+            }
+            if (child_src.isFile()) {
+                boolean needPhCopy = false;
+                for (String target : phCopied) {
+                    if (child.equals(target)) {
+                        needPhCopy = true;
+                        break;
+                    }
+                }
+                if (needPhCopy) {
+                    Files.copy(child_src.toPath(), /* copy data to -> */ child_dst.toPath(),
+                               new CopyOption[] { StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.COPY_ATTRIBUTES});
+                } else {
+                    Files.createSymbolicLink(child_dst.toPath(),  /* link to -> */ child_src.toPath());
+                }
+            } else {
+                clone(child_src, child_dst);
+            }
+        }
+    }
+
+    // modulesDir, like $JDK/lib
+    // oldName, module name under modulesDir
+    // newName, new name for oldName
+    public static void rename(File fromFile, File toFile) throws Exception {
+        if (!fromFile.exists()) {
+            throw new RuntimeException(fromFile.getName() + " does not exist");
+        }
+
+        if (toFile.exists()) {
+            throw new RuntimeException(toFile.getName() + " already exists");
+        }
+
+        boolean success = fromFile.renameTo(toFile);
+        if (!success) {
+            throw new RuntimeException("rename file " + fromFile.getName()+ " to " + toFile.getName() + " failed");
+        }
+    }
+
+    public static ProcessBuilder makeBuilder(String... args) throws Exception {
+        System.out.print("[");
+        for (String s : args) {
+            System.out.print(" " + s);
+        }
+        System.out.println(" ]");
+        return new ProcessBuilder(args);
+    }
 }
diff --git a/test/lib/jdk/test/lib/jfr/StreamingUtils.java b/test/lib/jdk/test/lib/jfr/StreamingUtils.java
index 7461cfd0b63a1903cee33d99cf2aa8e79dc458b2..427a4eb4262fb7790aa81d91106550e81c0331c0 100644
--- a/test/lib/jdk/test/lib/jfr/StreamingUtils.java
+++ b/test/lib/jdk/test/lib/jfr/StreamingUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, 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
@@ -43,8 +43,10 @@ public class StreamingUtils {
     public static Path getJfrRepository(Process process) throws Exception {
         while (true) {
             if (!process.isAlive()) {
-                String msg = String.format("Process (pid = %d) is no longer alive, exit value = %d",
+                String msg = String.format("Process (pid = %d) is no longer alive, exit value = %d\n",
                                            process.pid(), process.exitValue());
+                msg += "Stderr: " + new String(process.getErrorStream().readAllBytes()) + "\n";
+                msg += "Stdout: " + new String(process.getInputStream().readAllBytes()) + "\n";
                 throw new RuntimeException(msg);
             }
 
diff --git a/test/lib/jdk/test/lib/util/CoreUtils.java b/test/lib/jdk/test/lib/util/CoreUtils.java
index 15de012534bba7e95758e50d61c4695c05c8d0b7..c93357925934cb4dc6475221fac0976441aaeb71 100644
--- a/test/lib/jdk/test/lib/util/CoreUtils.java
+++ b/test/lib/jdk/test/lib/util/CoreUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, 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
@@ -138,12 +138,12 @@ public class CoreUtils {
             if (!coresDir.canWrite()) {
                 throw new SkippedException("Directory \"" + coresDir + "\" is not writable");
             }
-            if (Platform.isSignedOSX()) {
+            if (Platform.isHardenedOSX()) {
                 if (Platform.getOsVersionMajor() > 10 ||
                     (Platform.getOsVersionMajor() == 10 && Platform.getOsVersionMinor() >= 15))
                 {
-                    // We can't generate cores files with signed binaries on OSX 10.15 and later.
-                    throw new SkippedException("Cannot produce core file with signed binary on OSX 10.15 and later");
+                    // We can't generate cores files with hardened binaries on OSX 10.15 and later.
+                    throw new SkippedException("Cannot produce core file with hardened binary on OSX 10.15 and later");
                 }
             }
         } else if (Platform.isLinux()) {
diff --git a/test/micro/org/openjdk/bench/java/lang/Integers.java b/test/micro/org/openjdk/bench/java/lang/Integers.java
index c238ae5d735a96464303af2bc74c40bd5b01eec8..221dc79ee4c50ba7fde8a8c4e209bb0477c82e9b 100644
--- a/test/micro/org/openjdk/bench/java/lang/Integers.java
+++ b/test/micro/org/openjdk/bench/java/lang/Integers.java
@@ -53,17 +53,20 @@ public class Integers {
     private int size;
 
     private String[] strings;
+    private int[] intsTiny;
     private int[] intsSmall;
     private int[] intsBig;
 
     @Setup
     public void setup() {
-        Random r = new Random(0);
-        strings = new String[size];
+        Random r  = new Random(0);
+        strings   = new String[size];
+        intsTiny  = new int[size];
         intsSmall = new int[size];
-        intsBig = new int[size];
+        intsBig   = new int[size];
         for (int i = 0; i < size; i++) {
             strings[i] = "" + (r.nextInt(10000) - (5000));
+            intsTiny[i] = r.nextInt(99);
             intsSmall[i] = 100 * i + i + 103;
             intsBig[i] = ((100 * i + i) << 24) + 4543 + i * 4;
         }
@@ -91,6 +94,14 @@ public class Integers {
         }
     }
 
+    /** Performs toString on very small values, just one or two digits. */
+    @Benchmark
+    public void toStringTiny(Blackhole bh) {
+        for (int i : intsTiny) {
+            bh.consume(Integer.toString(i));
+        }
+    }
+
     /** Performs toString on large values, roughly 10 digits. */
     @Benchmark
     public void toStringBig(Blackhole bh) {
diff --git a/test/micro/org/openjdk/bench/java/lang/StringDecode.java b/test/micro/org/openjdk/bench/java/lang/StringDecode.java
index ace4252c7a3a310febae96f697c34994be280ef7..186d2aed6d95b99a5c1f06ab5b50c48083818075 100644
--- a/test/micro/org/openjdk/bench/java/lang/StringDecode.java
+++ b/test/micro/org/openjdk/bench/java/lang/StringDecode.java
@@ -40,59 +40,120 @@ import java.util.concurrent.TimeUnit;
 
 @BenchmarkMode(Mode.AverageTime)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
-@Fork(value = 3, jvmArgs = "-Xmx1g")
+@Fork(value = 3)
 @Warmup(iterations = 5, time = 2)
 @Measurement(iterations = 5, time = 3)
 @State(Scope.Thread)
 public class StringDecode {
 
-    @BenchmarkMode(Mode.AverageTime)
-    @OutputTimeUnit(TimeUnit.NANOSECONDS)
-    @Fork(value = 3, jvmArgs = "-Xmx1g")
-    @Warmup(iterations = 5, time = 2)
-    @Measurement(iterations = 5, time = 2)
-    @State(Scope.Thread)
-    public static class WithCharset {
-
-        @Param({"US-ASCII", "ISO-8859-1", "UTF-8", "MS932", "ISO-8859-6", "ISO-2022-KR"})
-        private String charsetName;
-
-        private Charset charset;
-        private byte[] asciiString;
-        private byte[] utf16String;
-
-        @Setup
-        public void setup() {
-            charset = Charset.forName(charsetName);
-            asciiString = "ascii string".getBytes(charset);
-            utf16String = "UTF-\uFF11\uFF16 string".getBytes(charset);
-        }
-
-        @Benchmark
-        public void decodeCharsetName(Blackhole bh) throws Exception {
-            bh.consume(new String(asciiString, charsetName));
-            bh.consume(new String(utf16String, charsetName));
-        }
-
-        @Benchmark
-        public void decodeCharset(Blackhole bh) throws Exception {
-            bh.consume(new String(asciiString, charset));
-            bh.consume(new String(utf16String, charset));
-        }
-    }
+    @Param({"US-ASCII", "ISO-8859-1", "UTF-8", "MS932", "ISO-8859-6", "ISO-2022-KR"})
+    private String charsetName;
 
-    private byte[] asciiDefaultString;
-    private byte[] utf16DefaultString;
+    private Charset charset;
+    private byte[] asciiString;
+    private byte[] utf16String;
+    private byte[] longUtf16String;
+    private byte[] longUtf16StartString;
+    private byte[] longLatin1String;
 
     @Setup
     public void setup() {
-        asciiDefaultString = "ascii string".getBytes();
-        utf16DefaultString = "UTF-\uFF11\uFF16 string".getBytes();
+        charset = Charset.forName(charsetName);
+        asciiString = "ascii string".getBytes(charset);
+        utf16String = "UTF-\uFF11\uFF16 string".getBytes(charset);
+        longUtf16String = """
+             Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam ac sem eu
+             urna egestas placerat. Etiam finibus ipsum nulla, non mattis dolor cursus a.
+             Nulla nec nisl consectetur, lacinia neque id, accumsan ante. Curabitur et
+             sapien in magna porta ultricies. Sed vel pellentesque nibh. Pellentesque dictum
+             dignissim diam eu ultricies. Class aptent taciti sociosqu ad litora torquent
+             per conubia nostra, per inceptos himenaeos. Suspendisse erat diam, fringilla
+             sed massa sed, posuere viverra orci. Suspendisse tempor libero non gravida
+             efficitur. Vivamus lacinia risus non orci viverra, at consectetur odio laoreet.
+             Suspendisse potenti.
+
+             Phasellus vel nisi iaculis, accumsan quam sed, bibendum eros. Sed venenatis
+             nulla tortor, et eleifend urna sodales id. Nullam tempus ac metus sit amet
+             sollicitudin. Nam sed ex diam. Praesent vitae eros et neque condimentum
+             consectetur eget non tortor. Praesent bibendum vel felis nec dignissim.
+             Maecenas a enim diam. Suspendisse quis ligula at nisi accumsan lacinia id
+             hendrerit sapien. \uFF11Donec aliquam mattis lectus eu ultrices. Duis eu nisl\uFF11
+             euismod, blandit mauris vel, \uFF11placerat urna. Etiam malesuada enim purus,
+             tristique mollis odio blandit quis.\uFF11 Vivamus posuere. \uFF11
+             \uFF11
+            """.getBytes(charset);
+        longUtf16StartString = """
+             \uFF11
+             Lorem ipsum dolor sit amet, \uFF11consectetur adipiscing elit. Aliquam ac sem eu
+             urna egestas \uFF11placerat. Etiam finibus ipsum nulla, non mattis dolor cursus a.
+             Nulla \uFF11nec nisl consectetur, lacinia neque id, accumsan ante. Curabitur et
+             sapien in \uFF11magna porta ultricies. \uFF11Sed vel pellentesque nibh. Pellentesque dictum
+             dignissim diam eu ultricies. Class aptent taciti sociosqu ad litora torquent
+             per conubia nostra, per inceptos himenaeos. Suspendisse erat diam, fringilla
+             sed massa sed, posuere viverra orci. Suspendisse tempor libero non gravida
+             efficitur. Vivamus lacinia risus non orci viverra, at consectetur odio laoreet.
+             Suspendisse potenti.
+
+             Phasellus vel nisi iaculis, accumsan quam sed, bibendum eros. Sed venenatis
+             nulla tortor, et eleifend urna sodales id. Nullam tempus ac metus sit amet
+             sollicitudin. Nam sed ex diam. Praesent vitae eros et neque condimentum
+             consectetur eget non tortor. Praesent bibendum vel felis nec dignissim.
+             Maecenas a enim diam. Suspendisse quis ligula at nisi accumsan lacinia id
+             hendrerit sapien. Donec aliquam mattis lectus eu ultrices. Duis eu nisl
+             euismod, blandit mauris vel, placerat urna. Etiam malesuada enim purus,
+             tristique mollis odio blandit quis. Vivamus posuere.
+            """.getBytes(charset);
+
+        longLatin1String = """
+             a\u00B6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6
+             b\u00F6\u00F6\u00B6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6
+             c\u00F6\u00F6\u00F6\u00B6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6
+             d\u00F6\u00F6\u00F6\u00F6\u00B6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6
+             e\u00F6\u00F6\u00F6\u00F6\u00F6\u00B6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6
+             f\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00B6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6
+             g\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00B6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6
+             h\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00B6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6
+             i\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00B6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6
+             j\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00B6\u00F6\u00F6\u00F6\u00F6\u00F6
+             k\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00B6\u00F6\u00F6\u00F6\u00F6
+             l\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00B6\u00F6\u00F6\u00F6
+             m\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00F6\u00B6\u00F6\u00F6
+            """.getBytes(charset);
+    }
+
+    @Benchmark
+    public String decodeAsciiCharsetName() throws Exception {
+        return new String(asciiString, charsetName);
+    }
+
+    @Benchmark
+    public String decodeAscii() throws Exception {
+        return new String(asciiString, charset);
+    }
+
+    @Benchmark
+    public String decodeLatin1Long() throws Exception {
+        return new String(longLatin1String, charset);
+    }
+
+    @Benchmark
+    public String decodeUTF16Short() throws Exception {
+        return new String(utf16String, charset);
+    }
+
+    @Benchmark
+    public String decodeUTF16LongEnd() throws Exception {
+        return new String(longUtf16String, charset);
+    }
+
+    @Benchmark
+    public String decodeUTF16LongStart() throws Exception {
+        return new String(longUtf16StartString, charset);
     }
 
     @Benchmark
-    public void decodeDefault(Blackhole bh) throws Exception {
-        bh.consume(new String(asciiDefaultString));
-        bh.consume(new String(utf16DefaultString));
+    public void decodeUTF16LongMixed(Blackhole bh) throws Exception {
+        bh.consume(new String(longUtf16StartString, charset));
+        bh.consume(new String(longUtf16String, charset));
     }
 }
diff --git a/test/micro/org/openjdk/bench/java/lang/StringEncode.java b/test/micro/org/openjdk/bench/java/lang/StringEncode.java
index 4cf5032a0dad39bec490e1db562e0a28a9e55c9d..6e67d3e8cee74134d593af283bab7e0f9ed180b4 100644
--- a/test/micro/org/openjdk/bench/java/lang/StringEncode.java
+++ b/test/micro/org/openjdk/bench/java/lang/StringEncode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022, 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
@@ -30,59 +30,97 @@ import java.util.concurrent.TimeUnit;
 
 @BenchmarkMode(Mode.AverageTime)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
-@Fork(value = 3, jvmArgs = "-Xmx1g")
+@Fork(value = 3)
 @Warmup(iterations = 5, time = 2)
 @Measurement(iterations = 5, time = 3)
 @State(Scope.Thread)
 public class StringEncode {
 
-    @BenchmarkMode(Mode.AverageTime)
-    @OutputTimeUnit(TimeUnit.NANOSECONDS)
-    @Fork(value = 3, jvmArgs = "-Xmx1g")
-    @Warmup(iterations = 5, time = 2)
-    @Measurement(iterations = 5, time = 2)
-    @State(Scope.Thread)
-    public static class WithCharset {
+    @Param({"US-ASCII", "ISO-8859-1", "UTF-8", "MS932", "ISO-8859-6"})
+    private String charsetName;
+    private Charset charset;
+    private String asciiString;
+    private String utf16String;
+    private String longUtf16String;
+    private String longUtf16StartString;
 
-        @Param({"US-ASCII", "ISO-8859-1", "UTF-8", "MS932", "ISO-8859-6"})
-        private String charsetName;
+    @Setup
+    public void setup() {
+        charset = Charset.forName(charsetName);
+        asciiString = "ascii string";
+        utf16String = "UTF-\uFF11\uFF16 string";
+        longUtf16String = """
+                 Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam ac sem eu
+                 urna egestas placerat. Etiam finibus ipsum nulla, non mattis dolor cursus a.
+                 Nulla nec nisl consectetur, lacinia neque id, accumsan ante. Curabitur et
+                 sapien in magna porta ultricies. Sed vel pellentesque nibh. Pellentesque dictum
+                 dignissim diam eu ultricies. Class aptent taciti sociosqu ad litora torquent
+                 per conubia nostra, per inceptos himenaeos. Suspendisse erat diam, fringilla
+                 sed massa sed, posuere viverra orci. Suspendisse tempor libero non gravida
+                 efficitur. Vivamus lacinia risus non orci viverra, at consectetur odio laoreet.
+                 Suspendisse potenti.
 
-        private Charset charset;
-        private String asciiString;
-        private String utf16String;
+                 Phasellus vel nisi iaculis, accumsan quam sed, bibendum eros. Sed venenatis
+                 nulla tortor, et eleifend urna sodales id. Nullam tempus ac metus sit amet
+                 sollicitudin. Nam sed ex diam. Praesent vitae eros et neque condimentum
+                 consectetur eget non tortor. Praesent bibendum vel felis nec dignissim.
+                 Maecenas a enim diam. Suspendisse quis ligula at nisi accumsan lacinia id
+                 hendrerit sapien. Donec aliquam mattis lectus eu ultrices. Duis eu nisl
+                 euismod, blandit mauris vel, placerat urna. Etiam malesuada enim purus,
+                 tristique mollis odio blandit quis. Vivamus posuere.
+                 \uFF11
+                """;
+        longUtf16StartString = """
+                 \uFF11
+                 Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam ac sem eu
+                 urna egestas placerat. Etiam finibus ipsum nulla, non mattis dolor cursus a.
+                 Nulla nec nisl consectetur, lacinia neque id, accumsan ante. Curabitur et
+                 sapien in magna porta ultricies. Sed vel pellentesque nibh. Pellentesque dictum
+                 dignissim diam eu ultricies. Class aptent taciti sociosqu ad litora torquent
+                 per conubia nostra, per inceptos himenaeos. Suspendisse erat diam, fringilla
+                 sed massa sed, posuere viverra orci. Suspendisse tempor libero non gravida
+                 efficitur. Vivamus lacinia risus non orci viverra, at consectetur odio laoreet.
+                 Suspendisse potenti.
 
-        @Setup
-        public void setup() {
-            charset = Charset.forName(charsetName);
-            asciiString = "ascii string";
-            utf16String = "UTF-\uFF11\uFF16 string";
-        }
+                 Phasellus vel nisi iaculis, accumsan quam sed, bibendum eros. Sed venenatis
+                 nulla tortor, et eleifend urna sodales id. Nullam tempus ac metus sit amet
+                 sollicitudin. Nam sed ex diam. Praesent vitae eros et neque condimentum
+                 consectetur eget non tortor. Praesent bibendum vel felis nec dignissim.
+                 Maecenas a enim diam. Suspendisse quis ligula at nisi accumsan lacinia id
+                 hendrerit sapien. Donec aliquam mattis lectus eu ultrices. Duis eu nisl
+                 euismod, blandit mauris vel, placerat urna. Etiam malesuada enim purus,
+                 tristique mollis odio blandit quis. Vivamus posuere.
+                """;
+    }
 
-        @Benchmark
-        public void encodeCharsetName(Blackhole bh) throws Exception {
-            bh.consume(asciiString.getBytes(charsetName));
-            bh.consume(utf16String.getBytes(charsetName));
-        }
+    @Benchmark
+    public byte[] encodeAsciiCharsetName() throws Exception {
+        return asciiString.getBytes(charset);
+    }
+
+    @Benchmark
+    public byte[] encodeAscii() throws Exception {
+        return asciiString.getBytes(charset);
+    }
 
-        @Benchmark
-        public void encodeCharset(Blackhole bh) throws Exception {
-            bh.consume(asciiString.getBytes(charset));
-            bh.consume(utf16String.getBytes(charset));
-        }
+    @Benchmark
+    public void encodeMix(Blackhole bh) throws Exception {
+        bh.consume(asciiString.getBytes(charset));
+        bh.consume(utf16String.getBytes(charset));
     }
 
-    private String asciiDefaultString;
-    private String utf16DefaultString;
+    @Benchmark
+    public byte[] encodeUTF16LongEnd() throws Exception {
+        return longUtf16String.getBytes(charset);
+    }
 
-    @Setup
-    public void setup() {
-        asciiDefaultString = "ascii string";
-        utf16DefaultString = "UTF-\uFF11\uFF16 string";
+    @Benchmark
+    public byte[] encodeUTF16LongStart() throws Exception {
+        return longUtf16StartString.getBytes(charset);
     }
 
     @Benchmark
-    public void encodeDefault(Blackhole bh) throws Exception {
-        bh.consume(asciiDefaultString.getBytes());
-        bh.consume(utf16DefaultString.getBytes());
+    public byte[] encodeUTF16() throws Exception {
+        return utf16String.getBytes(charset);
     }
 }
diff --git a/test/micro/org/openjdk/bench/java/nio/CharsetEncodeDecode.java b/test/micro/org/openjdk/bench/java/nio/CharsetEncodeDecode.java
index 6e129a5466e895ea2f970e74ecbec48cf31ad226..404bb0583fdc791a1ca015362bb89f9dcfa260a0 100644
--- a/test/micro/org/openjdk/bench/java/nio/CharsetEncodeDecode.java
+++ b/test/micro/org/openjdk/bench/java/nio/CharsetEncodeDecode.java
@@ -61,7 +61,7 @@ public class CharsetEncodeDecode {
     private CharsetEncoder encoder;
     private CharsetDecoder decoder;
 
-    @Param({"UTF-8", "BIG5", "ISO-8859-15", "ASCII", "UTF-16"})
+    @Param({"UTF-8", "BIG5", "ISO-8859-15", "ISO-8859-1", "ASCII", "UTF-16"})
     private String type;
 
     @Param("16384")
diff --git a/test/micro/org/openjdk/bench/jdk/incubator/foreign/LoopOverNonConstant.java b/test/micro/org/openjdk/bench/jdk/incubator/foreign/LoopOverNonConstant.java
index ada578b09ba24c757be68490f59e4883c5b33c87..1029acf7c2e3fe360a61159e35afb0dd34ee941f 100644
--- a/test/micro/org/openjdk/bench/jdk/incubator/foreign/LoopOverNonConstant.java
+++ b/test/micro/org/openjdk/bench/jdk/incubator/foreign/LoopOverNonConstant.java
@@ -26,6 +26,7 @@ import jdk.incubator.foreign.MemoryAddress;
 import jdk.incubator.foreign.MemoryLayout;
 import jdk.incubator.foreign.MemorySegment;
 import jdk.incubator.foreign.ResourceScope;
+import jdk.incubator.foreign.ValueLayout;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
@@ -61,6 +62,10 @@ public class LoopOverNonConstant {
     static final int ALLOC_SIZE = ELEM_SIZE * CARRIER_SIZE;
 
     static final VarHandle VH_int = MemoryLayout.sequenceLayout(JAVA_INT).varHandle(sequenceElement());
+
+    static final ValueLayout.OfInt JAVA_INT_ALIGNED = JAVA_INT.withBitAlignment(32);
+    static final VarHandle VH_int_aligned = MemoryLayout.sequenceLayout(JAVA_INT_ALIGNED).varHandle(sequenceElement());
+
     MemorySegment segment;
     long unsafe_addr;
 
@@ -125,6 +130,15 @@ public class LoopOverNonConstant {
         return sum;
     }
 
+    @Benchmark
+    public int segment_loop_aligned() {
+        int sum = 0;
+        for (int i = 0; i < ELEM_SIZE; i++) {
+            sum += (int) VH_int_aligned.get(segment, (long) i);
+        }
+        return sum;
+    }
+
     @Benchmark
     public int segment_loop_instance() {
         int sum = 0;
@@ -145,6 +159,15 @@ public class LoopOverNonConstant {
         return sum;
     }
 
+    @Benchmark
+    public int segment_loop_instance_aligned() {
+        int res = 0;
+        for (int i = 0; i < ELEM_SIZE; i ++) {
+            res += segment.get(JAVA_INT_ALIGNED, i * CARRIER_SIZE);
+        }
+        return res;
+    }
+
     @Benchmark
     public int segment_loop_instance_address() {
         int sum = 0;
diff --git a/test/micro/org/openjdk/bench/jdk/incubator/foreign/LoopOverNonConstantHeap.java b/test/micro/org/openjdk/bench/jdk/incubator/foreign/LoopOverNonConstantHeap.java
index 5b51db08c00b2563aff61961a10bf7cd4607c1e1..2d6b605c2c545a5db9f3589b4cf8078cc2734f9a 100644
--- a/test/micro/org/openjdk/bench/jdk/incubator/foreign/LoopOverNonConstantHeap.java
+++ b/test/micro/org/openjdk/bench/jdk/incubator/foreign/LoopOverNonConstantHeap.java
@@ -25,6 +25,7 @@ package org.openjdk.bench.jdk.incubator.foreign;
 import jdk.incubator.foreign.MemoryLayout;
 import jdk.incubator.foreign.MemorySegment;
 import jdk.incubator.foreign.ResourceScope;
+import jdk.incubator.foreign.ValueLayout;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
@@ -66,8 +67,14 @@ public class LoopOverNonConstantHeap {
     static final int UNSAFE_BYTE_BASE = unsafe.arrayBaseOffset(byte[].class);
 
     static final VarHandle VH_int = MemoryLayout.sequenceLayout(JAVA_INT).varHandle(sequenceElement());
-    MemorySegment segment;
+
+    static final ValueLayout.OfInt JAVA_INT_ALIGNED = JAVA_INT.withBitAlignment(32);
+    static final VarHandle VH_int_aligned = MemoryLayout.sequenceLayout(JAVA_INT_ALIGNED).varHandle(sequenceElement());
+    static final int UNSAFE_INT_BASE = unsafe.arrayBaseOffset(int[].class);
+
+    MemorySegment segment, alignedSegment;
     byte[] base;
+    int[] alignedBase;
 
     ByteBuffer byteBuffer;
 
@@ -95,7 +102,12 @@ public class LoopOverNonConstantHeap {
         for (int i = 0; i < ELEM_SIZE; i++) {
             unsafe.putInt(base, UNSAFE_BYTE_BASE + (i * CARRIER_SIZE) , i);
         }
+        alignedBase = new int[ELEM_SIZE];
+        for (int i = 0; i < ELEM_SIZE; i++) {
+            unsafe.putInt(base, UNSAFE_INT_BASE + (i * CARRIER_SIZE) , i);
+        }
         segment = MemorySegment.ofArray(base);
+        alignedSegment = MemorySegment.ofArray(alignedBase);
         byteBuffer = ByteBuffer.wrap(base).order(ByteOrder.nativeOrder());
     }
 
@@ -135,6 +147,15 @@ public class LoopOverNonConstantHeap {
         return sum;
     }
 
+    @Benchmark
+    public int segment_loop_aligned() {
+        int sum = 0;
+        for (int i = 0; i < ELEM_SIZE; i++) {
+            sum += (int) VH_int_aligned.get(alignedSegment, (long) i);
+        }
+        return sum;
+    }
+
     @Benchmark
     public int segment_loop_instance() {
         int res = 0;
@@ -144,6 +165,15 @@ public class LoopOverNonConstantHeap {
         return res;
     }
 
+    @Benchmark
+    public int segment_loop_instance_aligned() {
+        int res = 0;
+        for (int i = 0; i < ELEM_SIZE; i ++) {
+            res += alignedSegment.get(JAVA_INT_ALIGNED, i * CARRIER_SIZE);
+        }
+        return res;
+    }
+
     @Benchmark
     public int segment_loop_slice() {
         int sum = 0;
diff --git a/test/micro/org/openjdk/bench/jdk/incubator/foreign/LoopOverPollutedSegments.java b/test/micro/org/openjdk/bench/jdk/incubator/foreign/LoopOverPollutedSegments.java
index 4cb01f091f1cc85de3ee1bc74d2d3083fe23c58c..d2803d9d7937bbfbf531caf045f3d9496f714c8c 100644
--- a/test/micro/org/openjdk/bench/jdk/incubator/foreign/LoopOverPollutedSegments.java
+++ b/test/micro/org/openjdk/bench/jdk/incubator/foreign/LoopOverPollutedSegments.java
@@ -58,7 +58,7 @@ public class LoopOverPollutedSegments {
 
     static final Unsafe unsafe = Utils.unsafe;
 
-    MemorySegment nativeSegment, heapSegmentBytes, heapSegmentFloats;
+    MemorySegment nativeSegment, nativeSharedSegment, heapSegmentBytes, heapSegmentFloats;
     byte[] arr;
     long addr;
 
@@ -73,6 +73,7 @@ public class LoopOverPollutedSegments {
         }
         arr = new byte[ALLOC_SIZE];
         nativeSegment = MemorySegment.allocateNative(ALLOC_SIZE, 4, ResourceScope.newConfinedScope());
+        nativeSharedSegment = MemorySegment.allocateNative(ALLOC_SIZE, 4, ResourceScope.newSharedScope());
         heapSegmentBytes = MemorySegment.ofArray(new byte[ALLOC_SIZE]);
         heapSegmentFloats = MemorySegment.ofArray(new float[ELEM_SIZE]);
 
@@ -81,6 +82,8 @@ public class LoopOverPollutedSegments {
                 unsafe.putInt(arr, Unsafe.ARRAY_BYTE_BASE_OFFSET + (i * 4), i);
                 nativeSegment.setAtIndex(JAVA_INT, i, i);
                 nativeSegment.setAtIndex(JAVA_FLOAT, i, i);
+                nativeSharedSegment.setAtIndex(JAVA_INT, i, i);
+                nativeSharedSegment.setAtIndex(JAVA_FLOAT, i, i);
                 intHandle.set(nativeSegment, (long)i, i);
                 heapSegmentBytes.setAtIndex(JAVA_INT, i, i);
                 heapSegmentBytes.setAtIndex(JAVA_FLOAT, i, i);
diff --git a/test/micro/org/openjdk/bench/jdk/incubator/foreign/LoopOverSlice.java b/test/micro/org/openjdk/bench/jdk/incubator/foreign/LoopOverSlice.java
new file mode 100644
index 0000000000000000000000000000000000000000..ff5000f89c920d04f2a4f6ba8835b16778d0f369
--- /dev/null
+++ b/test/micro/org/openjdk/bench/jdk/incubator/foreign/LoopOverSlice.java
@@ -0,0 +1,259 @@
+/*
+ * Copyright (c) 2022, 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.openjdk.bench.jdk.incubator.foreign;
+
+import jdk.incubator.foreign.MemorySegment;
+import jdk.incubator.foreign.ResourceScope;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.TearDown;
+import org.openjdk.jmh.annotations.Warmup;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.IntBuffer;
+import java.util.Iterator;
+import java.util.concurrent.TimeUnit;
+
+import static jdk.incubator.foreign.MemoryLayout.PathElement.sequenceElement;
+import static jdk.incubator.foreign.ValueLayout.JAVA_INT;
+
+@BenchmarkMode(Mode.AverageTime)
+@Warmup(iterations = 5, time = 500, timeUnit = TimeUnit.MILLISECONDS)
+@Measurement(iterations = 10, time = 500, timeUnit = TimeUnit.MILLISECONDS)
+@State(org.openjdk.jmh.annotations.Scope.Thread)
+@OutputTimeUnit(TimeUnit.MILLISECONDS)
+@Fork(value = 3, jvmArgsAppend = { "--add-modules=jdk.incubator.foreign", "--enable-native-access=ALL-UNNAMED" })
+
+public class LoopOverSlice {
+
+    static final int ELEM_SIZE = 1_000_000;
+    static final int CARRIER_SIZE = (int)JAVA_INT.byteSize();
+    static final int ALLOC_SIZE = ELEM_SIZE * CARRIER_SIZE;
+
+    MemorySegment nativeSegment, heapSegment;
+    IntBuffer nativeBuffer, heapBuffer;
+    ResourceScope scope;
+
+    @Setup
+    public void setup() {
+        scope = ResourceScope.newConfinedScope();
+        nativeSegment = MemorySegment.allocateNative(ALLOC_SIZE, scope);
+        heapSegment = MemorySegment.ofArray(new int[ELEM_SIZE]);
+        nativeBuffer = ByteBuffer.allocateDirect(ALLOC_SIZE).order(ByteOrder.LITTLE_ENDIAN).asIntBuffer();
+        heapBuffer = IntBuffer.wrap(new int[ELEM_SIZE]);
+    }
+
+    @TearDown
+    public void tearDown() {
+        scope.close();
+    }
+
+    @Benchmark
+    public void native_segment_slice_loop() {
+        new NativeSegmentWrapper(nativeSegment).forEach(NativeSegmentWrapper.Element::get);
+    }
+
+    @Benchmark
+    public void native_buffer_slice_loop() {
+        new NativeBufferWrapper(nativeBuffer).forEach(NativeBufferWrapper.Element::get);
+    }
+
+    @Benchmark
+    public void heap_segment_slice_loop() {
+        new HeapSegmentWrapper(heapSegment).forEach(HeapSegmentWrapper.Element::get);
+    }
+
+    @Benchmark
+    public void heap_buffer_slice_loop() {
+        new HeapBufferWrapper(heapBuffer).forEach(HeapBufferWrapper.Element::get);
+    }
+
+    class HeapSegmentWrapper implements Iterable {
+        final MemorySegment segment;
+
+        public HeapSegmentWrapper(MemorySegment segment) {
+            this.segment = segment;
+        }
+
+        @Override
+        public Iterator iterator() {
+            return new Iterator() {
+
+                MemorySegment current = segment;
+
+                @Override
+                public boolean hasNext() {
+                    return current.byteSize() > 4;
+                }
+
+                @Override
+                public Element next() {
+                    Element element = new Element(current);
+                    current = current.asSlice(4);
+                    return element;
+                }
+            };
+        }
+
+        static class Element {
+            final MemorySegment segment;
+
+            public Element(MemorySegment segment) {
+                this.segment = segment;
+            }
+
+            int get() {
+                return segment.getAtIndex(JAVA_INT, 0);
+            }
+        }
+    }
+
+    class NativeSegmentWrapper implements Iterable {
+        final MemorySegment segment;
+
+        public NativeSegmentWrapper(MemorySegment segment) {
+            this.segment = segment;
+        }
+
+        @Override
+        public Iterator iterator() {
+            return new Iterator() {
+
+                MemorySegment current = segment;
+
+                @Override
+                public boolean hasNext() {
+                    return current.byteSize() > 4;
+                }
+
+                @Override
+                public Element next() {
+                    Element element = new Element(current);
+                    current = current.asSlice(4);
+                    return element;
+                }
+            };
+        }
+
+        static class Element {
+            final MemorySegment segment;
+
+            public Element(MemorySegment segment) {
+                this.segment = segment;
+            }
+
+            int get() {
+                return segment.getAtIndex(JAVA_INT, 0);
+            }
+        }
+    }
+
+    class NativeBufferWrapper implements Iterable {
+        final IntBuffer buffer;
+
+        public NativeBufferWrapper(IntBuffer buffer) {
+            this.buffer = buffer;
+        }
+
+        @Override
+        public Iterator iterator() {
+            return new Iterator() {
+
+                IntBuffer current = buffer;
+
+                @Override
+                public boolean hasNext() {
+                    return current.position() < current.limit();
+                }
+
+                @Override
+                public Element next() {
+                    Element element = new Element(current);
+                    int lim = current.limit();
+                    current = current.slice(1, lim - 1);
+                    return element;
+                }
+            };
+        }
+
+        static class Element {
+            final IntBuffer buffer;
+
+            public Element(IntBuffer segment) {
+                this.buffer = segment;
+            }
+
+            int get() {
+                return buffer.get( 0);
+            }
+        }
+    }
+
+    class HeapBufferWrapper implements Iterable {
+        final IntBuffer buffer;
+
+        public HeapBufferWrapper(IntBuffer buffer) {
+            this.buffer = buffer;
+        }
+
+        @Override
+        public Iterator iterator() {
+            return new Iterator() {
+
+                IntBuffer current = buffer;
+
+                @Override
+                public boolean hasNext() {
+                    return current.position() < current.limit();
+                }
+
+                @Override
+                public Element next() {
+                    Element element = new Element(current);
+                    int lim = current.limit();
+                    current = current.slice(1, lim - 1);
+                    return element;
+                }
+            };
+        }
+
+        static class Element {
+            final IntBuffer buffer;
+
+            public Element(IntBuffer segment) {
+                this.buffer = segment;
+            }
+
+            int get() {
+                return buffer.get( 0);
+            }
+        }
+    }
+}
diff --git a/test/micro/org/openjdk/bench/jdk/incubator/vector/MaskedLogicOpts.java b/test/micro/org/openjdk/bench/jdk/incubator/vector/MaskedLogicOpts.java
new file mode 100644
index 0000000000000000000000000000000000000000..97bfc5268086778a3d0ebb51e7c9f572d86b73c1
--- /dev/null
+++ b/test/micro/org/openjdk/bench/jdk/incubator/vector/MaskedLogicOpts.java
@@ -0,0 +1,331 @@
+/*
+ * Copyright (c) 2022, 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.openjdk.bench.jdk.incubator.vector;
+
+import org.openjdk.jmh.annotations.*;
+import org.openjdk.jmh.infra.*;
+
+import jdk.incubator.vector.*;
+import java.util.concurrent.TimeUnit;
+import java.util.Random;
+
+@BenchmarkMode(Mode.Throughput)
+@OutputTimeUnit(TimeUnit.SECONDS)
+@State(Scope.Thread)
+public class MaskedLogicOpts {
+    @Param({"256","512","1024"})
+    private int ARRAYLEN;
+
+    boolean [] mask_arr = {
+        false, false, false, true, false, false, false, false,
+        false, false, false, true, false, false, false, false,
+        false, false, false, true, false, false, false, false,
+        true, true, true, true, true, true, true, true,
+        true, true, true, true, true, true, true, true,
+        false, false, false, true, false, false, false, false,
+        false, false, false, true, false, false, false, false,
+        false, false, false, true, false, false, false, false
+    };
+
+    int INVOC_COUNTER = 4096;
+
+    int [] i1 = new int[ARRAYLEN];
+    int [] i2 = new int[ARRAYLEN];
+    int [] i3 = new int[ARRAYLEN];
+    int [] i4 = new int[ARRAYLEN];
+    int [] i5 = new int[ARRAYLEN];
+
+    long [] l1 = new long[ARRAYLEN];
+    long [] l2 = new long[ARRAYLEN];
+    long [] l3 = new long[ARRAYLEN];
+    long [] l4 = new long[ARRAYLEN];
+    long [] l5 = new long[ARRAYLEN];
+
+    Vector iv1;
+    Vector iv2;
+    Vector iv3;
+    Vector iv4;
+    Vector iv5;
+
+    Vector lv1;
+    Vector lv2;
+    Vector lv3;
+    Vector lv4;
+    Vector lv5;
+
+    VectorMask imask;
+    VectorMask lmask;
+
+    VectorSpecies ispecies;
+    VectorSpecies lspecies;
+
+    int int512_arr_idx;
+    int int256_arr_idx;
+    int int128_arr_idx;
+    int long256_arr_idx;
+    int long512_arr_idx;
+
+    private Random r = new Random();
+
+    @Setup(Level.Trial)
+    public void init() {
+        int512_arr_idx = 0;
+        int256_arr_idx = 0;
+        int128_arr_idx = 0;
+        long256_arr_idx = 0;
+        long512_arr_idx = 0;
+        i1 = new int[ARRAYLEN];
+        i2 = new int[ARRAYLEN];
+        i3 = new int[ARRAYLEN];
+        i4 = new int[ARRAYLEN];
+        i5 = new int[ARRAYLEN];
+
+        l1 = new long[ARRAYLEN];
+        l2 = new long[ARRAYLEN];
+        l3 = new long[ARRAYLEN];
+        l4 = new long[ARRAYLEN];
+        l5 = new long[ARRAYLEN];
+
+        for (int i=0; i SPECIES) {
+        imask = VectorMask.fromArray(SPECIES, mask_arr, 0);
+        iv2 = IntVector.fromArray(SPECIES, i2, int512_arr_idx);
+        iv3 = IntVector.fromArray(SPECIES, i3, int512_arr_idx);
+        iv4 = IntVector.fromArray(SPECIES, i4, int512_arr_idx);
+        iv5 = IntVector.fromArray(SPECIES, i5, int512_arr_idx);
+        for(int i = 0; i < INVOC_COUNTER; i++) {
+            for(int j = 0 ; j < ARRAYLEN; j+= SPECIES.length()) {
+                IntVector.fromArray(SPECIES, i1, j)
+                    .lanewise(VectorOperators.AND, iv2, imask)
+                    .lanewise(VectorOperators.OR,  iv2, imask)
+                    .lanewise(VectorOperators.AND, iv3, imask)
+                    .lanewise(VectorOperators.OR,  iv3, imask)
+                    .lanewise(VectorOperators.AND, iv4, imask)
+                    .lanewise(VectorOperators.OR,  iv4, imask)
+                    .lanewise(VectorOperators.AND, iv5, imask)
+                    .lanewise(VectorOperators.XOR, iv5, imask)
+                    .intoArray(i1, j);
+            }
+        }
+    }
+
+    @Benchmark
+    public void maskedLogicOperationsInt512() {
+       maskedLogicKernel(IntVector.SPECIES_512);
+    }
+
+    @Benchmark
+    public void maskedLogicOperationsInt256() {
+       maskedLogicKernel(IntVector.SPECIES_256);
+    }
+
+    @Benchmark
+    public void maskedLogicOperationsInt128() {
+       maskedLogicKernel(IntVector.SPECIES_128);
+    }
+
+    @CompilerControl(CompilerControl.Mode.INLINE)
+    public void partiallyMaskedLogicOperationsIntKernel(VectorSpecies SPECIES) {
+       imask = VectorMask.fromArray(SPECIES, mask_arr, 0);
+       iv2 = IntVector.fromArray(SPECIES, i2, int512_arr_idx);
+       iv3 = IntVector.fromArray(SPECIES, i3, int512_arr_idx);
+       iv4 = IntVector.fromArray(SPECIES, i4, int512_arr_idx);
+       iv5 = IntVector.fromArray(SPECIES, i5, int512_arr_idx);
+       for(int i = 0; i < INVOC_COUNTER; i++) {
+           for(int j = 0 ; j < ARRAYLEN; j+= SPECIES.length()) {
+               IntVector.fromArray(SPECIES, i1, j)
+                   .lanewise(VectorOperators.AND, iv2, imask)
+                   .lanewise(VectorOperators.OR,  iv2, imask)
+                   .lanewise(VectorOperators.AND, iv3)
+                   .lanewise(VectorOperators.OR,  iv3)
+                   .lanewise(VectorOperators.OR,  iv4, imask)
+                   .lanewise(VectorOperators.AND, iv4, imask)
+                   .lanewise(VectorOperators.XOR, iv5, imask)
+                   .intoArray(i1, j);
+           }
+       }
+    }
+
+    @Benchmark
+    public void partiallyMaskedLogicOperationsInt512() {
+        partiallyMaskedLogicOperationsIntKernel(IntVector.SPECIES_512);
+    }
+
+    @Benchmark
+    public void partiallyMaskedLogicOperationsInt256() {
+        partiallyMaskedLogicOperationsIntKernel(IntVector.SPECIES_256);
+    }
+
+    @Benchmark
+    public void partiallyMaskedLogicOperationsInt128() {
+        partiallyMaskedLogicOperationsIntKernel(IntVector.SPECIES_128);
+    }
+
+    @CompilerControl(CompilerControl.Mode.INLINE)
+    public void bitwiseBlendOperationIntKernel(VectorSpecies SPECIES) {
+       imask = VectorMask.fromArray(SPECIES, mask_arr, 0);
+       iv2 = IntVector.fromArray(SPECIES, i2, int512_arr_idx);
+       iv3 = IntVector.fromArray(SPECIES, i3, int512_arr_idx);
+       iv4 = IntVector.fromArray(SPECIES, i4, int512_arr_idx);
+       iv5 = IntVector.fromArray(SPECIES, i5, int512_arr_idx);
+       for(int i = 0; i < INVOC_COUNTER; i++) {
+           for(int j = 0 ; j < ARRAYLEN; j+= SPECIES.length()) {
+               IntVector.fromArray(SPECIES, i1, j)
+                   .lanewise(VectorOperators.BITWISE_BLEND, iv2, iv3, imask)
+                   .lanewise(VectorOperators.BITWISE_BLEND, iv3, iv4, imask)
+                   .lanewise(VectorOperators.BITWISE_BLEND, iv4, iv5, imask)
+                   .intoArray(i1, j);
+           }
+       }
+    }
+
+    @Benchmark
+    public void bitwiseBlendOperationInt512() {
+       bitwiseBlendOperationIntKernel(IntVector.SPECIES_512);
+    }
+
+    @Benchmark
+    public void bitwiseBlendOperationInt256() {
+       bitwiseBlendOperationIntKernel(IntVector.SPECIES_256);
+    }
+
+    @Benchmark
+    public void bitwiseBlendOperationInt128() {
+       bitwiseBlendOperationIntKernel(IntVector.SPECIES_128);
+    }
+
+    @CompilerControl(CompilerControl.Mode.INLINE)
+    public void maskedLogicOperationsLongKernel(VectorSpecies SPECIES) {
+       lmask = VectorMask.fromArray(SPECIES, mask_arr, 0);
+       lv2 = LongVector.fromArray(SPECIES, l2, long256_arr_idx);
+       lv3 = LongVector.fromArray(SPECIES, l3, long256_arr_idx);
+       lv4 = LongVector.fromArray(SPECIES, l4, long256_arr_idx);
+       lv5 = LongVector.fromArray(SPECIES, l5, long256_arr_idx);
+       for(int i = 0; i < INVOC_COUNTER; i++) {
+           for(int j = 0 ; j < ARRAYLEN; j+= SPECIES.length()) {
+               LongVector.fromArray(SPECIES, l1, j)
+                   .lanewise(VectorOperators.AND, lv2, lmask)
+                   .lanewise(VectorOperators.OR,  lv3, lmask)
+                   .lanewise(VectorOperators.AND, lv3, lmask)
+                   .lanewise(VectorOperators.OR,  lv4, lmask)
+                   .lanewise(VectorOperators.AND, lv4, lmask)
+                   .lanewise(VectorOperators.XOR, lv5, lmask)
+                   .intoArray(l1, j);
+           }
+       }
+    }
+
+    @Benchmark
+    public void maskedLogicOperationsLong512() {
+       maskedLogicOperationsLongKernel(LongVector.SPECIES_512);
+    }
+    @Benchmark
+    public void maskedLogicOperationsLong256() {
+       maskedLogicOperationsLongKernel(LongVector.SPECIES_256);
+    }
+
+    @CompilerControl(CompilerControl.Mode.INLINE)
+    public void partiallyMaskedLogicOperationsLongKernel(VectorSpecies SPECIES) {
+       lmask = VectorMask.fromArray(SPECIES, mask_arr, 0);
+       lv2 = LongVector.fromArray(SPECIES, l2, long512_arr_idx);
+       lv3 = LongVector.fromArray(SPECIES, l3, long512_arr_idx);
+       lv4 = LongVector.fromArray(SPECIES, l4, long512_arr_idx);
+       lv5 = LongVector.fromArray(SPECIES, l5, long512_arr_idx);
+       for(int i = 0; i < INVOC_COUNTER; i++) {
+           for(int j = 0 ; j < ARRAYLEN; j+= SPECIES.length()) {
+               LongVector.fromArray(SPECIES, l1, j)
+                   .lanewise(VectorOperators.AND, lv2, lmask)
+                   .lanewise(VectorOperators.OR,  lv2, lmask)
+                   .lanewise(VectorOperators.AND, lv3)
+                   .lanewise(VectorOperators.OR,  lv3)
+                   .lanewise(VectorOperators.AND, lv4)
+                   .lanewise(VectorOperators.OR,  lv4, lmask)
+                   .lanewise(VectorOperators.XOR, lv5, lmask)
+                   .intoArray(l1, j);
+           }
+       }
+    }
+
+    @Benchmark
+    public void partiallyMaskedLogicOperationsLong512() {
+       partiallyMaskedLogicOperationsLongKernel(LongVector.SPECIES_512);
+    }
+
+    @Benchmark
+    public void partiallyMaskedLogicOperationsLong256() {
+       partiallyMaskedLogicOperationsLongKernel(LongVector.SPECIES_256);
+    }
+
+    @CompilerControl(CompilerControl.Mode.INLINE)
+    public void bitwiseBlendOperationLongKernel(VectorSpecies SPECIES) {
+       lmask = VectorMask.fromArray(SPECIES, mask_arr, 0);
+       lv2 = LongVector.fromArray(SPECIES, l2, long512_arr_idx);
+       lv3 = LongVector.fromArray(SPECIES, l3, long512_arr_idx);
+       lv4 = LongVector.fromArray(SPECIES, l4, long512_arr_idx);
+       lv5 = LongVector.fromArray(SPECIES, l5, long512_arr_idx);
+       for(int i = 0; i < INVOC_COUNTER; i++) {
+           for(int j = 0 ; j < ARRAYLEN; j+= SPECIES.length()) {
+               LongVector.fromArray(SPECIES, l1, j)
+                   .lanewise(VectorOperators.BITWISE_BLEND, lv2, lv3, lmask)
+                   .lanewise(VectorOperators.BITWISE_BLEND, lv3, lv4, lmask)
+                   .lanewise(VectorOperators.BITWISE_BLEND, lv4, lv5, lmask)
+                   .intoArray(l1, j);
+           }
+       }
+    }
+
+    @Benchmark
+    public void bitwiseBlendOperationLong512() {
+       bitwiseBlendOperationLongKernel(LongVector.SPECIES_512);
+    }
+
+    @Benchmark
+    public void bitwiseBlendOperationLong256() {
+       bitwiseBlendOperationLongKernel(LongVector.SPECIES_256);
+    }
+}
diff --git a/test/micro/org/openjdk/bench/vm/compiler/AddIdealNotXPlusC.java b/test/micro/org/openjdk/bench/vm/compiler/AddIdealNotXPlusC.java
new file mode 100644
index 0000000000000000000000000000000000000000..057a1dc6104c3c3fa95f23e18edbc0ebc9be61ce
--- /dev/null
+++ b/test/micro/org/openjdk/bench/vm/compiler/AddIdealNotXPlusC.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright (c) 2022, 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.openjdk.bench.vm.compiler;
+
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.CompilerControl;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Warmup;
+import org.openjdk.jmh.infra.Blackhole;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Tests transformation that converts "~x + c" into "(c - 1) - x" in
+ * AddNode::IdealIL and "~(x+c)" into "(-c - 1) - x" in XorINode:Ideal
+ * and XorLNode::Ideal.
+ */
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@State(Scope.Thread)
+@Warmup(iterations = 20, time = 1, timeUnit = TimeUnit.SECONDS)
+@Measurement(iterations = 20, time = 1, timeUnit = TimeUnit.SECONDS)
+@Fork(value = 3)
+public class AddIdealNotXPlusC {
+
+    private static final int I_C = 1234567;
+
+    private static final long L_C = 123_456_789_123_456L;
+
+    private int iFld = 4711;
+
+    private long lFld = 4711 * 4711 * 4711;
+
+    private final int SIZE = 10;
+
+    @Benchmark
+    public void baselineInt(Blackhole bh) {
+        for (int i = 0; i < SIZE; i++) {
+            bh.consume(iFld);
+        }
+    }
+
+    @Benchmark
+    public void baselineLong(Blackhole bh) {
+        for (int i = 0; i < SIZE; i++) {
+            bh.consume(lFld);
+        }
+    }
+
+    // Convert "~x + c" into "(c - 1) - x" for int.
+    // (c - 1) -x + x is then converted into c - 1.
+    @Benchmark
+    public void testInt1(Blackhole bh) {
+        for (int i = 0; i < SIZE; i++) {
+            bh.consume(~iFld + I_C + iFld);
+        }
+    }
+
+    // Convert "~(x + c)" into "(-c - 1) - x" for int.
+    // (-c - 1) -x + x is then converted into -c - 1.
+    @Benchmark
+    public void testInt2(Blackhole bh) {
+        for (int i = 0; i < SIZE; i++) {
+            bh.consume(~(iFld + I_C) + iFld);
+        }
+    }
+
+    // Convert "~x + c" into "(c - 1) - x" for long.
+     // (c - 1) -x + x is then converted into c - 1.
+    @Benchmark
+    public void testLong1(Blackhole bh) {
+        for (int i = 0; i < SIZE; i++) {
+            bh.consume(~lFld + L_C + lFld);
+        }
+    }
+
+    // Convert "~(x + c)" into "(-c - 1) - x" for long.
+     // (-c - 1) -x + x is then converted into -c - 1.
+    @Benchmark
+    public void testLong2(Blackhole bh) {
+        for (int i = 0; i < SIZE; i++) {
+            bh.consume(~(lFld + L_C) + lFld);
+        }
+    }
+}
diff --git a/test/micro/org/openjdk/bench/vm/compiler/AutoVectorization2DArray.java b/test/micro/org/openjdk/bench/vm/compiler/AutoVectorization2DArray.java
new file mode 100644
index 0000000000000000000000000000000000000000..9155bfbd3de5f3169bc2a6597a583640e70a2bc6
--- /dev/null
+++ b/test/micro/org/openjdk/bench/vm/compiler/AutoVectorization2DArray.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright (C) 2022 THL A29 Limited, a Tencent company. 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.openjdk.bench.vm.compiler;
+
+import org.openjdk.jmh.annotations.*;
+import org.openjdk.jmh.infra.*;
+import java.util.concurrent.TimeUnit;
+
+@Warmup(iterations = 3, time = 5, timeUnit = TimeUnit.SECONDS)
+@Measurement(iterations = 3, time = 5, timeUnit = TimeUnit.SECONDS)
+@BenchmarkMode(Mode.Throughput)
+@OutputTimeUnit(TimeUnit.SECONDS)
+@State(Scope.Thread)
+@Fork(value=1)
+public class AutoVectorization2DArray {
+    @Param({"16", "32", "64"})
+    private int LEN;
+
+    private byte[][] a_byte;
+    private byte[][] b_byte;
+    private byte[][] c_byte;
+
+    private int[][] a_int;
+    private int[][] b_int;
+    private int[][] c_int;
+
+    private double[][] a_double;
+    private double[][] b_double;
+    private double[][] c_double;
+
+    @Setup
+    public void init() {
+        a_byte = new byte[LEN][LEN];
+        b_byte = new byte[LEN][LEN];
+        c_byte = new byte[LEN][LEN];
+
+        a_int = new int[LEN][LEN];
+        b_int = new int[LEN][LEN];
+        c_int = new int[LEN][LEN];
+
+        a_double = new double[LEN][LEN];
+        b_double = new double[LEN][LEN];
+        c_double = new double[LEN][LEN];
+    }
+
+    @CompilerControl(CompilerControl.Mode.DONT_INLINE)
+    private int run_byte(int count, byte[][] a , byte[][] b, byte[][] c) {
+        for(int i = 0; i < a.length; i++) {
+            for (int j = 0; j < a[0].length; j++) {
+                a[i][j] = (byte)(b[i][j] + c[i][j]);
+            }
+        }
+        return a[count][count];
+    }
+
+    @Benchmark
+    public void test_run_byte(Blackhole bh) {
+        int r = 0;
+        for(int i = 0 ; i < 100; i++) {
+            r += run_byte(i % a_byte.length, a_byte, b_byte, c_byte);
+        }
+        bh.consume(r);
+    }
+
+    @CompilerControl(CompilerControl.Mode.DONT_INLINE)
+    private int run_int(int count, int[][] a, int[][] b, int[][] c) {
+        for(int i = 0; i < a.length; i++) {
+            for (int j = 0; j < a[0].length; j++) {
+                a[i][j] = b[i][j] + c[i][j];
+            }
+        }
+        return a[count][count];
+    }
+
+    @Benchmark
+    public void test_run_int(Blackhole bh) {
+        int r = 0;
+        for(int i = 0 ; i < 100; i++) {
+            r += run_int(i % a_int.length, a_int, b_int, c_int);
+        }
+        bh.consume(r);
+    }
+
+    @CompilerControl(CompilerControl.Mode.DONT_INLINE)
+    private double run_double(int count, double[][] a, double[][] b, double[][] c) {
+        for(int i = 0; i < a.length; i++) {
+            for (int j = 0; j < a[0].length; j++) {
+                a[i][j] = b[i][j] + c[i][j];
+            }
+        }
+        return a[count][count];
+    }
+
+    @Benchmark
+    public void test_run_double(Blackhole bh) {
+        double r = 0;
+        for(int i = 0 ; i < 100; i++) {
+            r += run_double(i % a_double.length, a_double, b_double, c_double);
+        }
+        bh.consume(r);
+    }
+}
diff --git a/test/micro/org/openjdk/bench/vm/compiler/LShiftIdeal_XPlusX_LShiftC.java b/test/micro/org/openjdk/bench/vm/compiler/LShiftIdeal_XPlusX_LShiftC.java
new file mode 100644
index 0000000000000000000000000000000000000000..d2726706151a634d8ee63bcbc87799b9cc1b1268
--- /dev/null
+++ b/test/micro/org/openjdk/bench/vm/compiler/LShiftIdeal_XPlusX_LShiftC.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2022, 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.openjdk.bench.vm.compiler;
+
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.CompilerControl;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Warmup;
+import org.openjdk.jmh.infra.Blackhole;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Tests transformation from "(x + x) << c" to "x << (c + 1)".
+ * 
    
+ * This benchmark needs to be run with {@code
+ * JAVA_OPTIONS=-Djmh.blackhole.mode=COMPILER} to force using compiler
+ * mode blackhole, which is enabled by default and thus not necessary
+ * since JMH 1.34.
+ */
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@State(Scope.Thread)
+@Warmup(iterations = 20, time = 1, timeUnit = TimeUnit.SECONDS)
+@Measurement(iterations = 20, time = 1, timeUnit = TimeUnit.SECONDS)
+@Fork(value = 3)
+public class LShiftIdeal_XPlusX_LShiftC {
+
+    private int iFld = 4711;
+
+    private long lFld = 4711 * 4711 * 4711;
+
+    private final int SIZE = 10;
+
+    @Benchmark
+    public void baselineInt(Blackhole bh) {
+        for (int i = 0; i < SIZE; i++) {
+            bh.consume(iFld);
+        }
+    }
+
+    @Benchmark
+    public void baselineLong(Blackhole bh) {
+        for (int i = 0; i < SIZE; i++) {
+            bh.consume(lFld);
+        }
+    }
+
+    // Convert "(x + x) << 10" into "x << 11" for int.
+    // (x << 11) >>> 11 is then further converted into zero-extends.
+    @Benchmark
+    public void testInt(Blackhole bh) {
+        for (int i = 0; i < SIZE; i++) {
+            bh.consume(((iFld + iFld) << 10) >>> 11);
+        }
+    }
+
+    // Convert "(x + x) << 40" into "x << 41" for long.
+    // (x << 41) >>> 41 is then further converted into zero-extends.
+    @Benchmark
+    public void testLong(Blackhole bh) {
+        for (int i = 0; i < SIZE; i++) {
+            bh.consume(((lFld + lFld) << 40) >>> 41);
+        }
+    }
+}
diff --git a/test/micro/org/openjdk/bench/vm/compiler/MacroLogicOpt.java b/test/micro/org/openjdk/bench/vm/compiler/MacroLogicOpt.java
index 58400cadf68280226b16c04c03e4e22772caee82..40c3ba1b2bac1171b977a976dab2d6c9bd9721a5 100644
--- a/test/micro/org/openjdk/bench/vm/compiler/MacroLogicOpt.java
+++ b/test/micro/org/openjdk/bench/vm/compiler/MacroLogicOpt.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, 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
@@ -32,7 +32,7 @@ import java.util.Random;
 @OutputTimeUnit(TimeUnit.SECONDS)
 @State(Scope.Thread)
 public class MacroLogicOpt {
-  @Param({"64","128","256","512","1024","2048","4096"}) private int VECLEN;
+  @Param({"64","128","256","512","1024"}) private int VECLEN;
 
   private  int [] ai = new int[VECLEN];
   private  int [] bi = new int[VECLEN];
diff --git a/test/micro/org/openjdk/bench/vm/compiler/SharedLoopHeader.java b/test/micro/org/openjdk/bench/vm/compiler/SharedLoopHeader.java
new file mode 100644
index 0000000000000000000000000000000000000000..e84ca35ab27658767987aff6506b4e73fd6b5d7f
--- /dev/null
+++ b/test/micro/org/openjdk/bench/vm/compiler/SharedLoopHeader.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2022, Red Hat, 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.
+ */
+
+package org.openjdk.bench.vm.compiler;
+
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Mode;
+import java.util.concurrent.TimeUnit;
+
+@State(Scope.Thread)
+public class SharedLoopHeader {
+
+    private static final int size = 1000;
+    private static final boolean branch[] = new boolean[size];
+    private static final int count[] = new int[size];
+
+    @Setup
+    public void setup() {
+        for (int i = 0; i < branch.length; i++) {
+            branch[i] = ((i % 10) != 0);
+        }
+    }
+
+    @Benchmark
+    @BenchmarkMode(Mode.AverageTime)
+    @OutputTimeUnit(TimeUnit.NANOSECONDS)
+    public void sharedHeader() {
+        int i = 0;
+        while (i < branch.length) {
+            if (branch[i]) {
+                // common branch
+                count[i]++;
+                i++;
+                continue;
+            }
+            i += 2;
+        }
+    }
+
+}
diff --git a/test/micro/org/openjdk/bench/vm/compiler/StringConstructorBenchmark.java b/test/micro/org/openjdk/bench/vm/compiler/StringConstructorBenchmark.java
new file mode 100644
index 0000000000000000000000000000000000000000..4763c59629c5cd9aa10836fdd90bb830e3a59451
--- /dev/null
+++ b/test/micro/org/openjdk/bench/vm/compiler/StringConstructorBenchmark.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2022, Red Hat, 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.
+ */
+
+package org.openjdk.bench.vm.compiler;
+
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.Setup;
+import java.util.concurrent.TimeUnit;
+import java.nio.charset.StandardCharsets;
+
+@State(Scope.Thread)
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+public class StringConstructorBenchmark {
+  private byte[] array;
+  private String str;
+
+  @Setup
+  public void setup() {
+    str = "Quizdeltagerne spiste jordb\u00e6r med fl\u00f8de, mens cirkusklovnen. \u042f";//Latin1 ending with Russian
+    array = str.getBytes(StandardCharsets.UTF_8);
+  }
+
+  @Benchmark
+  public String newString()  {
+      return new String(array, 0, array.length, StandardCharsets.UTF_8);
+  }
+
+  @Benchmark
+  public String translateEscapes()  {
+      return str.translateEscapes();
+  }
+}
diff --git a/test/micro/org/openjdk/bench/vm/compiler/VectorBitCount.java b/test/micro/org/openjdk/bench/vm/compiler/VectorBitCount.java
new file mode 100644
index 0000000000000000000000000000000000000000..e16cf422a9df19a668b36567b35da01b22887e37
--- /dev/null
+++ b/test/micro/org/openjdk/bench/vm/compiler/VectorBitCount.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2022, 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.openjdk.bench.vm.compiler;
+
+import org.openjdk.jmh.annotations.*;
+import org.openjdk.jmh.infra.*;
+import java.util.concurrent.TimeUnit;
+import java.util.random.RandomGenerator;
+import java.util.random.RandomGeneratorFactory;
+
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@State(Scope.Thread)
+public abstract class VectorBitCount {
+    @Param({"1024"})
+    public int SIZE;
+
+    @Param("0")
+    private int seed;
+    private RandomGenerator rng = RandomGeneratorFactory.getDefault().create(seed);
+    private int[] bufferRandInts;
+    private long[] bufferRandLongs;
+    private int[] bitCounts;
+    @Setup
+    public void init() {
+       bufferRandInts = new int[SIZE];
+       bufferRandLongs = new long[SIZE];
+       bitCounts = new int[SIZE];
+
+        for (int i = 0; i < SIZE; i++) {
+            bufferRandInts[i] = rng.nextInt();
+            bufferRandLongs[i] = rng.nextLong();
+        }
+    }
+
+    @Benchmark
+    public int[] intBitCount() {
+        for (int i = 0; i < SIZE; i++) {
+            bitCounts[i] = Integer.bitCount(bufferRandInts[i]);
+        }
+        return bitCounts;
+    }
+
+    @Benchmark
+    public int[] longBitCount() {
+        for (int i = 0; i < SIZE; i++) {
+            bitCounts[i] = Long.bitCount(bufferRandLongs[i]);
+        }
+        return bitCounts;
+    }
+
+
+    @Fork(value = 1, jvmArgsPrepend = {
+        "-XX:+UseSuperWord"
+    })
+    public static class WithSuperword extends VectorBitCount {
+
+    }
+
+    @Fork(value = 1, jvmArgsPrepend = {
+        "-XX:-UseSuperWord"
+    })
+    public static class NoSuperword extends VectorBitCount {
+    }
+
+}
+